mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-30 22:11:59 -09:00
Code Issues Packages Projects Releases Wiki Activity

board/orangepi/orangepi-r1/genimage.cfg: fix build after move to genimage 15

Browse Source 
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>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Peter Korsgaard
2021-12-19 15:20:32 +01:00
committed by Thomas Petazzoni
parent 5df540d3a5
commit 50963f8f2f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
board/orangepi/orangepi-r1/genimage.cfg
View File

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