summaryrefslogtreecommitdiffstats
path: root/configs/platform-v7a/config/images
diff options
context:
space:
mode:
Diffstat (limited to 'configs/platform-v7a/config/images')
-rw-r--r--configs/platform-v7a/config/images/at91-sd.config11
-rw-r--r--configs/platform-v7a/config/images/beaglebone.config11
-rw-r--r--configs/platform-v7a/config/images/gf.config11
-rw-r--r--configs/platform-v7a/config/images/hd.config6
-rw-r--r--configs/platform-v7a/config/images/riotboard.config11
-rw-r--r--configs/platform-v7a/config/images/rpi2.config15
-rw-r--r--configs/platform-v7a/config/images/rpi3.config30
-rw-r--r--configs/platform-v7a/config/images/rpicm3.config30
-rw-r--r--configs/platform-v7a/config/images/sabrelite.config11
-rw-r--r--configs/platform-v7a/config/images/stm32mp-optee.config61
-rw-r--r--configs/platform-v7a/config/images/stm32mp.config50
-rw-r--r--configs/platform-v7a/config/images/udoo-neo.config11
-rw-r--r--configs/platform-v7a/config/images/vexpress-nor.config16
-rw-r--r--configs/platform-v7a/config/images/vexpress.config24
14 files changed, 143 insertions, 155 deletions
diff --git a/configs/platform-v7a/config/images/at91-sd.config b/configs/platform-v7a/config/images/at91-sd.config
index 6108a20..335273d 100644
--- a/configs/platform-v7a/config/images/at91-sd.config
+++ b/configs/platform-v7a/config/images/at91-sd.config
@@ -9,22 +9,17 @@ image @IMAGE@-boot.vfat {
image @IMAGE@ {
hdimage {
align = 1M
- disk-signature = 0x67823abf
+ partition-table-type = hybrid
}
partition boot {
image = @IMAGE@-boot.vfat
- size = 3M
partition-type = 0xc
+ partition-type-uuid = F
bootable = true
}
partition root-A {
image = root.ext2
- partition-type = 0x83
- size = 512M
- }
- partition data {
- partition-type = 0x83
- size = 512M
+ partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
}
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/beaglebone.config b/configs/platform-v7a/config/images/beaglebone.config
index d3e85f2..32abd0b 100644
--- a/configs/platform-v7a/config/images/beaglebone.config
+++ b/configs/platform-v7a/config/images/beaglebone.config
@@ -9,22 +9,17 @@ image beaglebone-boot.vfat {
image @IMAGE@ {
hdimage {
align = 1M
- disk-signature = 0xabe26147
+ partition-table-type = hybrid
}
partition boot {
image = beaglebone-boot.vfat
- size = 32M
partition-type = 0xc
+ partition-type-uuid = F
bootable = true
}
partition root-A {
image = root.ext2
- partition-type = 0x83
- size = 512M
- }
- partition data {
- partition-type = 0x83
- size = 512M
+ partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
}
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/gf.config b/configs/platform-v7a/config/images/gf.config
index 0b46c21..95c5a54 100644
--- a/configs/platform-v7a/config/images/gf.config
+++ b/configs/platform-v7a/config/images/gf.config
@@ -9,22 +9,17 @@ image gf-boot.vfat {
image @IMAGE@ {
hdimage {
align = 1M
- disk-signature = 0x74823abf
+ partition-table-type = hybrid
}
partition boot {
image = gf-boot.vfat
- size = 32M
partition-type = 0xc
+ partition-type-uuid = F
bootable = true
}
partition root-A {
image = root.ext2
- partition-type = 0x83
- size = 512M
- }
- partition data {
- partition-type = 0x83
- size = 512M
+ partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
}
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/hd.config b/configs/platform-v7a/config/images/hd.config
index 03cf37a..1d041a0 100644
--- a/configs/platform-v7a/config/images/hd.config
+++ b/configs/platform-v7a/config/images/hd.config
@@ -4,11 +4,11 @@
image @IMAGE@ {
hdimage {
align = 1M
- disk-signature = 0xdfb978e3
+ partition-table-type = "@PARTITION_TABLE_TYPE@"
}
@BOOTLOADER_PARTITIONS@
- partition root {
+ partition root-A {
image = root.ext2
- partition-type = 0x83
+ partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
}
}
diff --git a/configs/platform-v7a/config/images/riotboard.config b/configs/platform-v7a/config/images/riotboard.config
index fff1f60..bff2528 100644
--- a/configs/platform-v7a/config/images/riotboard.config
+++ b/configs/platform-v7a/config/images/riotboard.config
@@ -1,23 +1,20 @@
image @IMAGE@ {
hdimage {
align = 1M
- disk-signature = 0x67bac764
+ partition-table-type = gpt
+ gpt-location = 2M
}
partition barebox {
in-partition-table = false
image = "barebox-embest-imx6s-riotboard.img"
size = 2M
+ holes = {"(440; 1K)"}
}
partition root-A {
image = root.ext2
- partition-type = 0x83
- size = 512M
- }
- partition data {
- partition-type = 0x83
- size = 512M
+ partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
}
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/rpi2.config b/configs/platform-v7a/config/images/rpi2.config
index 3e45e1a..68ee0d0 100644
--- a/configs/platform-v7a/config/images/rpi2.config
+++ b/configs/platform-v7a/config/images/rpi2.config
@@ -1,7 +1,8 @@
image rpi2-boot.vfat {
vfat {
files = { @FIRMWARE_RPI2@ }
- file barebox.img { image = barebox-raspberry-pi-2.img }
+ file barebox.img { image = barebox-raspberry-pi.img }
+ file bcm2711-rpi-4-b.dtb { image = bcm2711-rpi-4.dtb-bb }
}
size = 32M
}
@@ -9,22 +10,18 @@ image rpi2-boot.vfat {
image @IMAGE@ {
hdimage {
align = 1M
- disk-signature = 0xbedf7893
+ partition-table-type = hybrid
}
partition boot {
+ offset = 4M
image = rpi2-boot.vfat
- size = 32M
partition-type = 0xc
+ partition-type-uuid = F
bootable = true
}
partition root-A {
image = root.ext2
- partition-type = 0x83
- size = 512M
- }
- partition data {
- partition-type = 0x83
- size = 512M
+ partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
}
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/rpi3.config b/configs/platform-v7a/config/images/rpi3.config
deleted file mode 100644
index 7bd1dae..0000000
--- a/configs/platform-v7a/config/images/rpi3.config
+++ /dev/null
@@ -1,30 +0,0 @@
-image rpi3-boot.vfat {
- vfat {
- files = { @FIRMWARE_RPI3@ }
- file barebox.img { image = barebox-raspberry-pi-3.img }
- }
- size = 32M
-}
-
-image @IMAGE@ {
- hdimage {
- align = 1M
- disk-signature = 0xbedf7893
- }
- partition boot {
- image = rpi3-boot.vfat
- size = 32M
- partition-type = 0xc
- bootable = true
- }
- partition root-A {
- image = root.ext2
- partition-type = 0x83
- size = 512M
- }
- partition data {
- partition-type = 0x83
- size = 512M
- }
-}
-/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/rpicm3.config b/configs/platform-v7a/config/images/rpicm3.config
deleted file mode 100644
index 4c10ac4..0000000
--- a/configs/platform-v7a/config/images/rpicm3.config
+++ /dev/null
@@ -1,30 +0,0 @@
-image rpicm3-boot.vfat {
- vfat {
- files = { @FIRMWARE_RPI3@ }
- file barebox.img { image = barebox-raspberry-pi-cm3.img }
- }
- size = 32M
-}
-
-image @IMAGE@ {
- hdimage {
- align = 1M
- disk-signature = 0xbedf7893
- }
- partition boot {
- image = rpicm3-boot.vfat
- size = 32M
- partition-type = 0xc
- bootable = true
- }
- partition root-A {
- image = root.ext2
- partition-type = 0x83
- size = 512M
- }
- partition data {
- partition-type = 0x83
- size = 512M
- }
-}
-/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/sabrelite.config b/configs/platform-v7a/config/images/sabrelite.config
index df979d6..6d71c41 100644
--- a/configs/platform-v7a/config/images/sabrelite.config
+++ b/configs/platform-v7a/config/images/sabrelite.config
@@ -1,23 +1,20 @@
image @IMAGE@ {
hdimage {
align = 1M
- disk-signature = 0x67bac764
+ partition-table-type = gpt
+ gpt-location = 2M
}
partition barebox {
in-partition-table = false
image = "barebox-freescale-imx6q-sabrelite.img"
size = 2M
+ holes = {"(440; 1K)"}
}
partition root-A {
image = root.ext2
- partition-type = 0x83
- size = 512M
- }
- partition data {
- partition-type = 0x83
- size = 512M
+ partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
}
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/stm32mp-optee.config b/configs/platform-v7a/config/images/stm32mp-optee.config
new file mode 100644
index 0000000..be3a4b6
--- /dev/null
+++ b/configs/platform-v7a/config/images/stm32mp-optee.config
@@ -0,0 +1,61 @@
+image @IMAGE@ {
+ hdimage {
+ align = 1M
+ partition-table-type = gpt
+ gpt-no-backup = true
+ }
+
+ /* below three partitions are unused when booting from eMMC boot partition */
+ partition fsbl1 {
+ image = "stm32mp1-tf-a-@STM32MP_BOARD@.stm32"
+ size = 256K
+ }
+ partition fsbl2 {
+ image = "stm32mp1-tf-a-@STM32MP_BOARD@.stm32"
+ size = 256K
+ }
+ partition fip {
+ image = "@STM32MP_BOARD@.fip"
+ size = 2M
+ }
+
+ partition barebox-environment {
+ partition-type-uuid = 6c3737f2-07f8-45d1-ad45-15d260aab24d
+ size = 1M
+ }
+ partition barebox-state {
+ partition-type-uuid = barebox-state
+ size = 1M
+ }
+ partition root-A {
+ partition-type-uuid = root-arm
+ image = root.ext2
+ }
+}
+
+image @STM32MP_BOARD@-emmcboot.img {
+ hdimage {
+ partition-table = false
+ }
+
+ partition fsbl {
+ image = "stm32mp1-tf-a-@STM32MP_BOARD@.stm32"
+ size = 256K
+ }
+
+ partition fip {
+ image = "@STM32MP_BOARD@.fip"
+ offset = 256K
+ }
+}
+
+image @STM32MP_BOARD@.fip {
+ fip {
+ fw-config = "stm32mp1-@STM32MP_BOARD@-fw-config.dtb"
+ hw-config = "@STM32MP_BOARD@.dtb-bb"
+ nt-fw = "barebox-stm32mp-generic-bl33.img"
+ tos-fw = { "tee-header_v2.bin", "tee-pager_v2.bin", "tee-pageable_v2.bin" }
+ }
+ size = 2M
+}
+/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/stm32mp.config b/configs/platform-v7a/config/images/stm32mp.config
index cbf9658..45d3c00 100644
--- a/configs/platform-v7a/config/images/stm32mp.config
+++ b/configs/platform-v7a/config/images/stm32mp.config
@@ -1,30 +1,62 @@
image @IMAGE@ {
hdimage {
align = 1M
- gpt = true
+ partition-table-type = gpt
gpt-no-backup = true
}
+
+ /* below three partitions are unused when booting from eMMC boot partition */
partition fsbl1 {
- image = "stm32mp1-tf-a-@STM32MP_BOARD_FSBL@.stm32"
+ image = "stm32mp1-tf-a-@STM32MP_BOARD@.stm32"
size = 256K
}
partition fsbl2 {
- image = "stm32mp1-tf-a-@STM32MP_BOARD_FSBL@.stm32"
+ image = "stm32mp1-tf-a-@STM32MP_BOARD@.stm32"
size = 256K
}
- partition ssbl {
- image = "barebox-@STM32MP_BOARD_SSBL@.img"
+ partition fip {
+ image = "@STM32MP_BOARD@.fip"
size = 1M
}
+
partition barebox-environment {
+ partition-type-uuid = "6c3737f2-07f8-45d1-ad45-15d260aab24d"
size = 1M
}
- partition root {
+ partition barebox-state {
+ partition-type-uuid = "4778ed65-bf42-45fa-9c5b-287a1dc4aab1"
+ size = 1M
+ }
+ partition root-A {
+ partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
image = root.ext2
- size = 512M
}
- partition data {
- size = 100M
+}
+
+image @STM32MP_BOARD@-emmcboot.img {
+ hdimage {
+ partition-table = false
+ }
+
+ partition fsbl {
+ image = "stm32mp1-tf-a-@STM32MP_BOARD@.stm32"
+ size = 256K
+ }
+
+ partition fip {
+ image = "@STM32MP_BOARD@.fip"
+ offset = 256K
+ }
+}
+
+image @STM32MP_BOARD@.fip {
+ fip {
+ fw-config = "stm32mp1-@STM32MP_BOARD@-fw-config.dtb"
+ hw-config = "@STM32MP_BOARD@.dtb-bb"
+ nt-fw = "barebox-stm32mp-generic-bl33.img"
+ tos-fw = { "stm32mp1-bl32.bin" }
+ tos-fw-config = "stm32mp1-@STM32MP_BOARD@-bl32.dtb"
}
+ size = 1M
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/udoo-neo.config b/configs/platform-v7a/config/images/udoo-neo.config
index de5aae9..2e0f91f 100644
--- a/configs/platform-v7a/config/images/udoo-neo.config
+++ b/configs/platform-v7a/config/images/udoo-neo.config
@@ -1,23 +1,20 @@
image @IMAGE@ {
hdimage {
align = 1M
- disk-signature = 0x374ac764
+ partition-table-type = gpt
+ gpt-location = 2M
}
partition barebox {
in-partition-table = false
image = "barebox-udoo-neo.img"
size = 2M
+ holes = {"(440; 1K)"}
}
partition root-A {
image = root.ext2
- partition-type = 0x83
- size = 512M
- }
- partition data {
- partition-type = 0x83
- size = 512M
+ partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
}
}
/* vim: set tabstop=8 noexpandtab : */
diff --git a/configs/platform-v7a/config/images/vexpress-nor.config b/configs/platform-v7a/config/images/vexpress-nor.config
index 7711851..58bbbfc 100644
--- a/configs/platform-v7a/config/images/vexpress-nor.config
+++ b/configs/platform-v7a/config/images/vexpress-nor.config
@@ -1,6 +1,9 @@
image @IMAGE@ {
+ /* Note: qemu will complain if the SD card size is not a power of two */
+ size = 64M
hdimage {
- partition-table = false
+ partition-table-type = none
+ fill = true
}
partition barebox {
image = barebox-vexpress-ca9.img
@@ -10,21 +13,14 @@ image @IMAGE@ {
partition barebox-environment {
/* empty environment -> use barebox builtin */
image = barebox-zero-env-vexpress
- offset = 0x80000 /* 512 KiB */
+ offset = 512K
in-partition-table = false
}
partition barebox-state {
image = /dev/null
- offset = 0x100000 /* 1 MiB */
+ offset = 1M
in-partition-table = false
- size = 0x100000 /* 1 MiB */
- }
- /* expand image size to 64 MiB; dummy size, results in 0 bytes length */
- partition end {
- image = /dev/null
- offset = 64M
size = 1M
- in-partition-table = false
}
}
diff --git a/configs/platform-v7a/config/images/vexpress.config b/configs/platform-v7a/config/images/vexpress.config
index 17fcf5e..b982ae2 100644
--- a/configs/platform-v7a/config/images/vexpress.config
+++ b/configs/platform-v7a/config/images/vexpress.config
@@ -1,28 +1,14 @@
image @IMAGE@ {
+ /* Note: qemu will complain if the SD card size is not a power of two */
+ size = 1G
hdimage {
align = 1M
- disk-signature = 0x74823abf
+ fill = true
+ partition-table-type = gpt
}
partition root-A {
image = root.ext2
- partition-type = 0x83
- size = 64M
- }
- partition data {
- partition-type = 0x83
- size = 63M
- }
- /* genimage does not write zeros at the end of an image to save space,
- * but the kernel in qemu will complain if the image file is smaller
- * than the partition sizes, and qemu will complain if the SD card size
- * is not a power of 2. work around this issues by adding an empty
- * partition at the end.
- */
- partition end {
- image = /dev/null
- size = 1M
- offset = 128M
- in-partition-table = false
+ partition-type-uuid = 69dad710-2ce4-4e3c-b16c-21a1d49abed3 # root-arm
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 23:27:02 +0000