Skip to contentSkip to conversation

configs/cubieboard2: bump U-Boot and kernel

PATCH Applied Alexey Brodkin via buildroot 2 participants 2 messages Jan 2, 2022 – Jan 4, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 configs/cubieboard2: bump U-Boot and kernel

Bump U-Boot to version 2021.10 and kernel to 5.15.11
Among other things fixes U-Boot build failure,
see https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006081:
---------------------->8-------------------
HOSTLD scripts/dtc/dtc
/usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here
collect2: error: ld returned 1 exit status
---------------------->8-------------------

---
 configs/cubieboard2_defconfig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
configs/cubieboard2_defconfig +5 -5
index 8924c88c54..a9356295c1 100644
@@ -1,16 +1,16 @@
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
-# Linux headers same as kernel, a 4.18 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y
+# Linux headers same as kernel, a 5.15 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2"
 BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!"
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.14"
-BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11"
+BR2_LINUX_KERNEL_DEFCONFIG="multi_v7"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2"
 BR2_TARGET_ROOTFS_EXT2=y
@@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 10 lines · Alexey Brodkin via buildroot

Bump U-Boot to version 2021.10 and kernel to 5.15.11
Among other things fixes U-Boot build failure,
see https://gitlab.com/buildroot.org/buildroot/-/jobs/1915006081:
---------------------->8-------------------
HOSTLD scripts/dtc/dtc
/usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here
collect2: error: ld returned 1 exit status
---------------------->8-------------------

Applied to master, thanks.

Regards,
Arnout

Quoted 31 lines
---
  configs/cubieboard2_defconfig | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
configs/cubieboard2_defconfig +4 -4
index 8924c88c54..a9356295c1 100644
@@ -1,16 +1,16 @@
  BR2_arm=y
  BR2_cortex_a7=y
  BR2_ARM_FPU_NEON_VFPV4=y
-# Linux headers same as kernel, a 4.18 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y
+# Linux headers same as kernel, a 5.15 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
  BR2_TARGET_GENERIC_HOSTNAME="Cubieboard2"
  BR2_TARGET_GENERIC_ISSUE="Welcome to Cubieboard2!"
  BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
  BR2_ROOTFS_POST_IMAGE_SCRIPT="board/cubietech/cubieboard2/post-image.sh"
  BR2_LINUX_KERNEL=y
  BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.18.14"
-BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.11"
+BR2_LINUX_KERNEL_DEFCONFIG="multi_v7"
  BR2_LINUX_KERNEL_DTS_SUPPORT=y
  BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun7i-a20-cubieboard2"
  BR2_TARGET_ROOTFS_EXT2=y

configs/cubieboard2_defconfig BR2_TARGET_ROOTFS_EXT2_4=y · line 24

Quoted 8 lines
configs/cubieboard2_defconfig +1 -1
@@ -18,7 +18,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
  BR2_TARGET_UBOOT=y
  BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
  BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.09"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10"
  BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Cubieboard2"
  BR2_TARGET_UBOOT_NEEDS_DTC=y
  BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y

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