All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] board/orangepi/orangepi-r1/genimage.cfg: fix build after move to genimage 15
@ 2021-12-19 14:20 Peter Korsgaard
  2021-12-19 14:20 ` [Buildroot] [PATCH 2/2] board/*/genimage.cfg: use partition-table-type = "gpt" for genimage-15 Peter Korsgaard
  2021-12-27 14:43 ` [Buildroot] [PATCH 1/2] board/orangepi/orangepi-r1/genimage.cfg: fix build after move to genimage 15 Thomas Petazzoni
  0 siblings, 2 replies; 7+ messages in thread
From: Peter Korsgaard @ 2021-12-19 14:20 UTC (permalink / raw)
  To: buildroot

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/1865935239

ERROR: hdimage(sdcard.img): part boot: 'partition-type' is only valid for mbr and hybrid partition-table-type

So change to partition-type-uuid instead.  With that fixed, genimage-15 then
also complains about the overlap between the u-boot partition and the GPT:

ERROR: hdimage(sdcard.img): partition [GPT array] (offset 0x100000, size 0x4000) overlaps previous partition u-boot (offset 0x2000, size 0x102000)

So adjust the u-boot partition to end just before the GPT.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 board/orangepi/orangepi-r1/genimage.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/orangepi/orangepi-r1/genimage.cfg b/board/orangepi/orangepi-r1/genimage.cfg
index a2ad618557..e42c37d5fd 100644
--- a/board/orangepi/orangepi-r1/genimage.cfg
+++ b/board/orangepi/orangepi-r1/genimage.cfg
@@ -24,11 +24,11 @@ image sdcard.img {
 		in-partition-table = "no"
 		image = "u-boot-sunxi-with-spl.bin"
 		offset = 8K
-		size = 1032K # 1MB - 8KB + 16KB(GPT)
+		size = 1016K # 1MB - 8KB
 	}
 
 	partition boot {
-		partition-type = 0xC
+		partition-type-uuid = "U"
 		bootable = "true"
 		image = "boot.vfat"
 	}
@@ -36,7 +36,7 @@ image sdcard.img {
 	# 'rootfs' will be used as the partition label, used
 	# with root=PARTLABEL=rootfs kernel command line
 	partition rootfs {
-		partition-type = 0x83
+		partition-type-uuid = "L"
 		image = "rootfs.ext4"
 		size = 512M
 	}
-- 
2.20.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2021-12-27 14:44 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-19 14:20 [Buildroot] [PATCH 1/2] board/orangepi/orangepi-r1/genimage.cfg: fix build after move to genimage 15 Peter Korsgaard
2021-12-19 14:20 ` [Buildroot] [PATCH 2/2] board/*/genimage.cfg: use partition-table-type = "gpt" for genimage-15 Peter Korsgaard
2021-12-25 13:49   ` Sergey Matyukevich
2021-12-25 13:58     ` Sergey Matyukevich
2021-12-27 14:43     ` Thomas Petazzoni
2021-12-27 14:43   ` Thomas Petazzoni
2021-12-27 14:43 ` [Buildroot] [PATCH 1/2] board/orangepi/orangepi-r1/genimage.cfg: fix build after move to genimage 15 Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.