Skip to contentSkip to conversation

board/orangepi/orangepi-zero-plus2: fix build after genimage update

PATCH In review Sergey Matyukevich 3 participants 7 messages Jan 31, 2022 – Feb 6, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 board/orangepi/orangepi-zero-plus2: fix build after genimage update

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

To fix the first genimage error report, change 'partition-type' entries to the appropriate 'partition-type-uuid'. Then genimage starts to complain about overlaps:

ERROR: hdimage(sdcard.img): partition [GPT array] (offset 0x100000, size 0x4000) overlaps previous partition u-boot (offset 0x2000, size 0x102000)
ERROR: hdimage(sdcard.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole.

To fix the second genimage error report, update the size of bootloader file. Do not reserve additional space for GPT partition table since new genimage is able to keep track of it.

---
 board/orangepi/orangepi-zero-plus2/genimage.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
board/orangepi/orangepi-zero-plus2/genimage.cfg +3 -3
index aee9719ae4..5a7ee7707a 100644
@@ -22,11 +22,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 = "F"
 		bootable = "true"
 		image = "boot.vfat"
 	}
@@ -34,7 +34,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 = 256M
 	}
Signature · 6 lines
2.35.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/2 configs/orangepi_zero_plus2: BSP update

Bump Linux kernel to 5.16.1 and U-Boot to 2022.01. Select option BR2_TARGET_UBOOT_NEEDS_OPENSSL since U-Boot requires openssl. Root filesystem does not fit into default 60M anymore, so increase its size.

---
 configs/orangepi_zero_plus2_defconfig | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
configs/orangepi_zero_plus2_defconfig +5 -3
index da2d3b4178..9d88b37ac9 100644
@@ -2,7 +2,7 @@ BR2_aarch64=y
 BR2_cortex_a53=y
 BR2_ARM_FPU_VFPV4=y
 
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay"
 
@@ -17,9 +17,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
 BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
@@ -33,7 +34,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-pl
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2"
@@ -56,6 +57,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2"
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
Signature · 6 lines
2.35.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#2 lore raw

Re: [Buildroot] [PATCH 2/2] configs/orangepi_zero_plus2: BSP update

Hi Sergey,

Quoted 4 lines · Sergey Matyukevich

Bump Linux kernel to 5.16.1 and U-Boot to 2022.01. Select option BR2_TARGET_UBOOT_NEEDS_OPENSSL since U-Boot requires openssl. Root filesystem does not fit into default 60M anymore, so increase its size.

Same as previous patch we need a:
Fixes:
url where you point the failure

There is the latest gitlab pipeline here, especially this board build failure:
https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478371
But this was for previous patch, sorry, so please point this ^^^ URL there. And here probably you've found the bug by yourself, correct?

Best regards

Signature · 2 lines
Giulio Benetti
Benetti Engineering sas
Quoted 47 lines
---
  configs/orangepi_zero_plus2_defconfig | 8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
configs/orangepi_zero_plus2_defconfig +5 -3
index da2d3b4178..9d88b37ac9 100644
@@ -2,7 +2,7 @@ BR2_aarch64=y
  BR2_cortex_a53=y
  BR2_ARM_FPU_VFPV4=y
 
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_16=y
  BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
  BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay"
 
@@ -17,9 +17,10 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
  BR2_TARGET_UBOOT=y
  BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
  BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01"
  BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2"
  BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
  BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
  BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
  BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
@@ -33,7 +34,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-pl
  # Kernel
  BR2_LINUX_KERNEL=y
  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.10"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16.1"
  BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
  BR2_LINUX_KERNEL_DTS_SUPPORT=y
  BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-orangepi-zero-plus2"
@@ -56,6 +57,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
  BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Zero Plus2"
  BR2_TARGET_ROOTFS_EXT2=y
  BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
  BR2_PACKAGE_HOST_DOSFSTOOLS=y
  BR2_PACKAGE_HOST_GENIMAGE=y
  BR2_PACKAGE_HOST_MTOOLS=y
Signature · 6 lines
Giulio Benetti
Benetti Engineering sas
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw
In reply to Sergey Matyukevich

Hi Sergey,

Quoted 6 lines · Sergey Matyukevich

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

To fix the first genimage error report, change 'partition-type' entries to the appropriate 'partition-type-uuid'. Then genimage starts to complain about overlaps:

Quoted 6 lines

ERROR: hdimage(sdcard.img): partition [GPT array] (offset 0x100000, size 0x4000) overlaps previous partition u-boot (offset 0x2000, size 0x102000)
ERROR: hdimage(sdcard.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole.

To fix the second genimage error report, update the size of bootloader file. Do not reserve additional space for GPT partition table since new genimage is able to keep track of it.

Here we need a:
Fixes:
url where you point the failure

Best regards

Signature · 2 lines
Giulio Benetti
Benetti Engineering sas
Quoted 24 lines
---
  board/orangepi/orangepi-zero-plus2/genimage.cfg | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
board/orangepi/orangepi-zero-plus2/genimage.cfg +2 -2
index aee9719ae4..5a7ee7707a 100644
@@ -22,11 +22,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 = "F"
  		bootable = "true"
  		image = "boot.vfat"
  	}

board/orangepi/orangepi-zero-plus2/genimage.cfg image sdcard.img { · line 40

Quoted 8 lines
board/orangepi/orangepi-zero-plus2/genimage.cfg +1 -1
@@ -34,7 +34,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 = 256M
  	}

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#4 lore raw
Quoted 12 lines

Hi Sergey,

Quoted 9 lines · Sergey Matyukevich

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

To fix the first genimage error report, change 'partition-type' entries to the appropriate 'partition-type-uuid'. Then genimage starts to complain about overlaps:

ERROR: hdimage(sdcard.img): partition [GPT array] (offset 0x100000, size 0x4000) overlaps previous partition u-boot (offset 0x2000, size 0x102000)
ERROR: hdimage(sdcard.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole.

Quoted 7 lines
Quoted 3 lines

To fix the second genimage error report, update the size of bootloader file. Do not reserve additional space for GPT partition table since new genimage is able to keep track of it.

Here we need a:
Fixes:
url where you point the failure

You are right. But I don't have a CI report for this. I noticed the problem when building images locally.

Regards,
Sergey
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#5 lore raw
Quoted 16 lines · Sergey Matyukevich
Quoted 16 lines

Hi Sergey,

Quoted 12 lines · Sergey Matyukevich

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

To fix the first genimage error report, change 'partition-type' entries to the appropriate 'partition-type-uuid'. Then genimage starts to complain about overlaps:

ERROR: hdimage(sdcard.img): partition [GPT array] (offset 0x100000, size 0x4000) overlaps previous partition u-boot (offset 0x2000, size 0x102000)
ERROR: hdimage(sdcard.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole.

To fix the second genimage error report, update the size of bootloader file. Do not reserve additional space for GPT partition table since new genimage is able to keep track of it.

Quoted 6 lines
Quoted 3 lines

Here we need a:
Fixes:
url where you point the failure

You are right. But I don't have a CI report for this. I noticed the problem when building images locally.

Check here for this patch:
https://gitlab.com/buildroot.org/buildroot/-/jobs/2021478371

for the other you've found it locally.

Signature · 6 lines
Giulio Benetti
Benetti Engineering sas
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#6 lore raw
In reply to Sergey Matyukevich
Quoted 9 lines · On Tue, 1 Feb 2022 00:24:55 +0300 Sergey Matyukevich <[email protected]>…

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

To fix the first genimage error report, change 'partition-type' entries to the appropriate 'partition-type-uuid'. Then genimage starts to complain about overlaps:

ERROR: hdimage(sdcard.img): partition [GPT array] (offset 0x100000, size 0x4000) overlaps previous partition u-boot (offset 0x2000, size 0x102000)
ERROR: hdimage(sdcard.img): bootloaders, etc. that overlap with the partition table must declare the overlapping area as a hole.

Quoted 8 lines

To fix the second genimage error report, update the size of bootloader file. Do not reserve additional space for GPT partition table since new genimage is able to keep track of it.

---
 board/orangepi/orangepi-zero-plus2/genimage.cfg | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Both applied, thanks! In the commit log of the first patch, I've added a reference to the Gitlab CI failure that the patch is fixing, as suggested by Giulio.

Thanks!

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot