summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2020-06-26 14:15:40 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2020-06-26 14:15:42 +0200
commite8d2e5822b4bce779fd68fbdd301e38c89d9a6aa (patch)
tree4aece86a41e5795e83b4c140ffce07cc3dc43393 /config
parent902cbe1539ee8edffe50e55efe7adb37bb602d20 (diff)
downloadptxdist-e8d2e5822b4bce779fd68fbdd301e38c89d9a6aa.tar.gz
ptxdist-e8d2e5822b4bce779fd68fbdd301e38c89d9a6aa.tar.xz
image-hdimg: add support for GPT
This adds an option to choose between GPT or MBR partition tables. This ensures, that the correct partition type is set for all default partitions. This fixes a problem with the current vfat config and GPT: Without this change both partition-type and partition-type-uuid are set. With the current genimage version, this results in a 'hybrid' partition table (both MBR and GPT). This can confuse BIOS and boot ROMs. So explicitly choose between GPT and MBR and set the correct partition type everywhere to avoid this. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'config')
-rw-r--r--config/images/hd.config3
-rw-r--r--config/images/vfat_partitions.config3
2 files changed, 3 insertions, 3 deletions
diff --git a/config/images/hd.config b/config/images/hd.config
index 6d1fd382c..8a7b0146f 100644
--- a/config/images/hd.config
+++ b/config/images/hd.config
@@ -4,10 +4,11 @@
image @IMAGE@ {
hdimage {
align = 1M
+ gpt = @GPT@
}
@BOOTLOADER_PARTITIONS@
partition root {
image = root.ext2
- partition-type = 0x83
+ partition-type@PARTITION_TYPE_SUFFIX@ = @ROOT_PARTITION_TYPE@
}
}
diff --git a/config/images/vfat_partitions.config b/config/images/vfat_partitions.config
index 0aac561de..93eb04f6d 100644
--- a/config/images/vfat_partitions.config
+++ b/config/images/vfat_partitions.config
@@ -1,6 +1,5 @@
partition boot-vfat {
image = "boot.vfat"
- partition-type = @VFAT_PARTITION_TYPE@
- partition-type-uuid = @VFAT_PARTITION_TYPE_UUID@
+ partition-type@PARTITION_TYPE_SUFFIX@ = @VFAT_PARTITION_TYPE@
bootable = true
}