diff mbox series

configs/bananapi_m2_zero: bump Linux to 6.8.4 and U-Boot to 2024.04

Message ID 20240406145802.15700-1-vincent.stehle@laposte.net
State Accepted
Headers show
Series configs/bananapi_m2_zero: bump Linux to 6.8.4 and U-Boot to 2024.04 | expand

Commit Message

Vincent Stehlé April 6, 2024, 2:58 p.m. UTC 
Necessary adaptations:
- The SD card is now called mmcblk1; adapt Linux boot command accordingly.
- The DTB is now under the allwinner/ folder.
- U-Boot needs OpenSSL to build.

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

Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net>
Cc: Jagan Teki <jagan@amarulasolutions.com>
---
 board/bananapi/bananapi-m2-zero/boot.cmd |  2 +-
 configs/bananapi_m2_zero_defconfig       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

Comments

Thomas Petazzoni April 7, 2024, 7:59 a.m. UTC | #1 
On Sat,  6 Apr 2024 16:58:02 +0200
Vincent Stehlé via buildroot <buildroot@buildroot.org> wrote:

> Necessary adaptations:
> - The SD card is now called mmcblk1; adapt Linux boot command accordingly.
> - The DTB is now under the allwinner/ folder.
> - U-Boot needs OpenSSL to build.
> 
> Fixes:
> - https://gitlab.com/buildroot.org/buildroot/-/jobs/6544501111
> 
> Signed-off-by: Vincent Stehlé <vincent.stehle@laposte.net>
> Cc: Jagan Teki <jagan@amarulasolutions.com>
> ---
>  board/bananapi/bananapi-m2-zero/boot.cmd |  2 +-
>  configs/bananapi_m2_zero_defconfig       | 10 +++++-----
>  2 files changed, 6 insertions(+), 6 deletions(-)

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/board/bananapi/bananapi-m2-zero/boot.cmd b/board/bananapi/bananapi-m2-zero/boot.cmd
index 081450935b..70ccdf7045 100644
--- a/board/bananapi/bananapi-m2-zero/boot.cmd
+++ b/board/bananapi/bananapi-m2-zero/boot.cmd
@@ -1,4 +1,4 @@ 
-setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
+setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rootwait
 
 mmc dev 0
 fatload mmc 0 $kernel_addr_r zImage
diff --git a/configs/bananapi_m2_zero_defconfig b/configs/bananapi_m2_zero_defconfig
index e5c89fce40..8a3e5cd830 100644
--- a/configs/bananapi_m2_zero_defconfig
+++ b/configs/bananapi_m2_zero_defconfig
@@ -1,26 +1,26 @@ 
 BR2_arm=y
 BR2_cortex_a7=y
 BR2_ARM_FPU_NEON_VFPV4=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_9=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y
 BR2_TARGET_GENERIC_ISSUE="Welcome to Buildroot for the Bananapi M2 Zero"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/bananapi/bananapi-m2-zero/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.9.11"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.8.4"
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h2-plus-bananapi-m2-zero"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun8i-h2-plus-bananapi-m2-zero"
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="bananapi_m2_zero"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.04"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
-BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y