BananaPi CM4/M2S: Update u-boot to v2025.01

Signed-off-by: Patrick Yavitz <[email protected]>

config/boards/bananapicm4io.conf

@@ -10,8 +10,8 @@ FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="amlogic/meson-g12b-bananapi-cm4-cm4io.dtb"
-BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"
 
 function post_family_tweaks_bsp__bananapi_rtl_bt() {
 	if [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then

config/boards/bananapim2s.conf

@@ -10,8 +10,8 @@ FULL_DESKTOP="yes"
 SERIALCON="ttyAML0"
 BOOT_LOGO="desktop"
 BOOT_FDT_FILE="amlogic/meson-g12b-a311d-bananapi-m2s.dtb"
-BOOTBRANCH_BOARD="tag:v2024.07"
-BOOTPATCHDIR="v2024.07"
+BOOTBRANCH_BOARD="tag:v2025.01"
+BOOTPATCHDIR="v2025.01"
 
 function post_family_tweaks_bsp__bananapi_rtl_bt() {
 	if [[ -d "$SRC/packages/bsp/bananapi/rtl_bt" ]]; then

patch/u-boot/v2025.01/board_bananapicm4io/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch

@@ -0,0 +1,35 @@
+From 9e4305436135989881f289800bef31fd3d689fc4 Mon Sep 17 00:00:00 2001
+From: Patrick Yavitz <[email protected]>
+Date: Tue, 30 Jan 2024 06:06:27 -0500
+Subject: [PATCH] configs: bananapi-cm4-cm4io_defconfig: nvme support
+
+Enable NVME PCI SUPPORT.
+
+Signed-off-by: Patrick Yavitz <[email protected]>
+---
+ configs/bananapi-cm4-cm4io_defconfig | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configs/bananapi-cm4-cm4io_defconfig b/configs/bananapi-cm4-cm4io_defconfig
+index 116147fc9a..2016b94bce 100644
+--- a/configs/bananapi-cm4-cm4io_defconfig
++++ b/configs/bananapi-cm4-cm4io_defconfig
+@@ -24,6 +24,7 @@ CONFIG_LEGACY_IMAGE_FORMAT=y
+ CONFIG_OF_BOARD_SETUP=y
+ # CONFIG_DISPLAY_CPUINFO is not set
+ CONFIG_MISC_INIT_R=y
++CONFIG_PCI_INIT_R=y
+ CONFIG_SYS_MAXARGS=32
+ # CONFIG_CMD_BDI is not set
+ # CONFIG_CMD_IMI is not set
+@@ -49,6 +50,7 @@ CONFIG_DM_MDIO=y
+ CONFIG_DM_MDIO_MUX=y
+ CONFIG_ETH_DESIGNWARE_MESON8B=y
+ CONFIG_MDIO_MUX_MESON_G12A=y
++CONFIG_NVME_PCI=y
+ CONFIG_PCIE_DW_MESON=y
+ CONFIG_MESON_G12A_USB_PHY=y
+ CONFIG_PINCTRL=y
+-- 
+2.39.2
+

patch/u-boot/v2025.01/board_bananapicm4io/002-configs-bananapi-cm4-cm4io_defconfig-preboot-and-boot-logo.patch

@@ -0,0 +1,42 @@
+From 22961f0d6f59d0d87a43eadf2a175ad43174f0d8 Mon Sep 17 00:00:00 2001
+From: Patrick Yavitz <[email protected]>
+Date: Tue, 30 Jan 2024 06:07:02 -0500
+Subject: [PATCH] configs: bananapi-cm4-cm4io_defconfig: preboot and boot logo
+
+Enable PREBOOT and BOOT LOGO SUPPORT.
+
+Signed-off-by: Patrick Yavitz <[email protected]>
+---
+ configs/bananapi-cm4-cm4io_defconfig | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/configs/bananapi-cm4-cm4io_defconfig b/configs/bananapi-cm4-cm4io_defconfig
+index 2016b94bce..d552f5b640 100644
+--- a/configs/bananapi-cm4-cm4io_defconfig
++++ b/configs/bananapi-cm4-cm4io_defconfig
+@@ -22,6 +22,7 @@ CONFIG_FIT_SIGNATURE=y
+ CONFIG_FIT_VERBOSE=y
+ CONFIG_LEGACY_IMAGE_FORMAT=y
+ CONFIG_OF_BOARD_SETUP=y
++CONFIG_USE_PREBOOT=y
+ # CONFIG_DISPLAY_CPUINFO is not set
+ CONFIG_MISC_INIT_R=y
+ CONFIG_PCI_INIT_R=y
+@@ -79,14 +80,9 @@ CONFIG_USB_GADGET_DWC2_OTG=y
+ CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
+ CONFIG_USB_GADGET_DOWNLOAD=y
+ CONFIG_VIDEO=y
+-# CONFIG_VIDEO_BPP8 is not set
+-# CONFIG_VIDEO_BPP16 is not set
+ CONFIG_SYS_WHITE_ON_BLACK=y
+ CONFIG_VIDEO_MESON=y
+ CONFIG_VIDEO_DT_SIMPLEFB=y
+-CONFIG_SPLASH_SCREEN=y
+-CONFIG_SPLASH_SCREEN_ALIGN=y
+-CONFIG_VIDEO_BMP_RLE8=y
+ CONFIG_BMP_16BPP=y
+ CONFIG_BMP_24BPP=y
+ CONFIG_BMP_32BPP=y
+-- 
+2.39.2
+

patch/u-boot/v2025.01/board_bananapicm4io/003-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch

@@ -0,0 +1,60 @@
+From bdf6fe2c9236ff49284eaf54defa78c547fa43b9 Mon Sep 17 00:00:00 2001
+From: Patrick Yavitz <[email protected]>
+Date: Tue, 30 Jan 2024 06:10:07 -0500
+Subject: [PATCH] configs: bananapi-cm4-cm4io_defconfig: sata support
+
+Enable SATA BOOT SUPPORT.
+
+Signed-off-by: Patrick Yavitz <[email protected]>
+---
+ configs/bananapi-cm4-cm4io_defconfig | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/configs/bananapi-cm4-cm4io_defconfig b/configs/bananapi-cm4-cm4io_defconfig
+index d552f5b640..6ceb460ec1 100644
+--- a/configs/bananapi-cm4-cm4io_defconfig
++++ b/configs/bananapi-cm4-cm4io_defconfig
+@@ -17,11 +17,13 @@ CONFIG_SYS_LOAD_ADDR=0x1000000
+ CONFIG_PCI=y
+ CONFIG_DEBUG_UART=y
+ CONFIG_REMAKE_ELF=y
++CONFIG_AHCI=y
+ CONFIG_FIT=y
+ CONFIG_FIT_SIGNATURE=y
+ CONFIG_FIT_VERBOSE=y
+ CONFIG_LEGACY_IMAGE_FORMAT=y
+ CONFIG_OF_BOARD_SETUP=y
++CONFIG_SATA_BOOT=y
+ CONFIG_USE_PREBOOT=y
+ # CONFIG_DISPLAY_CPUINFO is not set
+ CONFIG_MISC_INIT_R=y
+@@ -34,6 +36,7 @@ CONFIG_CMD_GPIO=y
+ # CONFIG_CMD_LOADS is not set
+ CONFIG_CMD_MMC=y
+ CONFIG_CMD_PCI=y
++CONFIG_CMD_SATA=y
+ CONFIG_CMD_USB=y
+ CONFIG_CMD_USB_MASS_STORAGE=y
+ # CONFIG_CMD_SETEXPR is not set
+@@ -42,6 +45,9 @@ CONFIG_OF_CONTROL=y
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+ CONFIG_ADC=y
+ CONFIG_SARADC_MESON=y
++CONFIG_SATA=y
++CONFIG_SCSI_AHCI=y
++CONFIG_AHCI_PCI=y
+ CONFIG_BUTTON=y
+ CONFIG_BUTTON_ADC=y
+ CONFIG_DFU_RAM=y
+@@ -60,6 +66,8 @@ CONFIG_POWER_DOMAIN=y
+ CONFIG_MESON_EE_POWER_DOMAIN=y
+ CONFIG_DM_REGULATOR=y
+ CONFIG_DM_REGULATOR_FIXED=y
++CONFIG_SCSI=y
++CONFIG_DM_SCSI=y
+ CONFIG_DEBUG_UART_ANNOUNCE=y
+ CONFIG_DEBUG_UART_SKIP_INIT=y
+ CONFIG_MESON_SERIAL=y
+-- 
+2.39.2
+

patch/u-boot/v2025.01/board_bananapim2s/001-bananapi-m2s-fixup.patch

@@ -0,0 +1,38 @@
+From b13566a0bad7b6f14ea117b60fa090f3c6dd5931 Mon Sep 17 00:00:00 2001
+From: Patrick Yavitz <[email protected]>
+Date: Sat, 13 Jul 2024 15:11:08 -0400
+Subject: [PATCH] bananapi m2s fixup
+
+HDMI doesn't come up until handing off to the kernel, at
+which point it only displays in green and magenta. Removing
+the default *-u-boot.dtsi and adding one specific to each variant
+corrects the issue.
+
+Signed-off-by: Patrick Yavitz <[email protected]>
+---
+ ...boot.dtsi => meson-g12b-a311d-bananapi-m2s-u-boot.dtsi} | 0
+ arch/arm/dts/meson-g12b-s922x-bananapi-m2s-u-boot.dtsi     | 7 +++++++
+ 2 files changed, 7 insertions(+)
+ rename arch/arm/dts/{meson-g12b-bananapi-u-boot.dtsi => meson-g12b-a311d-bananapi-m2s-u-boot.dtsi} (100%)
+ create mode 100644 arch/arm/dts/meson-g12b-s922x-bananapi-m2s-u-boot.dtsi
+
+diff --git a/arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi b/arch/arm/dts/meson-g12b-a311d-bananapi-m2s-u-boot.dtsi
+similarity index 100%
+rename from arch/arm/dts/meson-g12b-bananapi-u-boot.dtsi
+rename to arch/arm/dts/meson-g12b-a311d-bananapi-m2s-u-boot.dtsi
+diff --git a/arch/arm/dts/meson-g12b-s922x-bananapi-m2s-u-boot.dtsi b/arch/arm/dts/meson-g12b-s922x-bananapi-m2s-u-boot.dtsi
+new file mode 100644
+index 0000000000..236f2468dc
+--- /dev/null
++++ b/arch/arm/dts/meson-g12b-s922x-bananapi-m2s-u-boot.dtsi
+@@ -0,0 +1,7 @@
++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
++/*
++ * Copyright (c) 2019 BayLibre, SAS.
++ * Author: Neil Armstrong <[email protected]>
++ */
++
++#include "meson-g12-common-u-boot.dtsi"
+-- 
+2.39.2
+

patch/u-boot/v2025.01/board_bananapim2s/002-configs-bananapi-m2s_defconfig-preboot-and-boot-logo.patch

@@ -0,0 +1,45 @@
+From 2c3063d6df6fc6ffa77c2251b20fca6895c95bb7 Mon Sep 17 00:00:00 2001
+From: Patrick Yavitz <[email protected]>
+Date: Tue, 30 Jan 2024 06:29:46 -0500
+Subject: [PATCH] configs: bananapi-m2s_defconfig: preboot and boot logo
+
+Enable PREBOOT and BOOT LOGO SUPPORT.
+
+Signed-off-by: Patrick Yavitz <[email protected]>
+---
+ configs/bananapi-m2s_defconfig | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/configs/bananapi-m2s_defconfig b/configs/bananapi-m2s_defconfig
+index af8daced62..9c354daf6d 100644
+--- a/configs/bananapi-m2s_defconfig
++++ b/configs/bananapi-m2s_defconfig
+@@ -23,8 +23,10 @@ CONFIG_FIT_SIGNATURE=y
+ CONFIG_FIT_VERBOSE=y
+ CONFIG_LEGACY_IMAGE_FORMAT=y
+ CONFIG_OF_BOARD_SETUP=y
++CONFIG_USE_PREBOOT=y
+ # CONFIG_DISPLAY_CPUINFO is not set
+ CONFIG_MISC_INIT_R=y
++CONFIG_PCI_INIT_R=y
+ CONFIG_SYS_MAXARGS=32
+ # CONFIG_CMD_BDI is not set
+ # CONFIG_CMD_IMI is not set
+@@ -75,14 +77,9 @@ CONFIG_USB_GADGET_DWC2_OTG=y
+ CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
+ CONFIG_USB_GADGET_DOWNLOAD=y
+ CONFIG_VIDEO=y
+-# CONFIG_VIDEO_BPP8 is not set
+-# CONFIG_VIDEO_BPP16 is not set
+ CONFIG_SYS_WHITE_ON_BLACK=y
+ CONFIG_VIDEO_MESON=y
+ CONFIG_VIDEO_DT_SIMPLEFB=y
+-CONFIG_SPLASH_SCREEN=y
+-CONFIG_SPLASH_SCREEN_ALIGN=y
+-CONFIG_VIDEO_BMP_RLE8=y
+ CONFIG_BMP_16BPP=y
+ CONFIG_BMP_24BPP=y
+ CONFIG_BMP_32BPP=y
+-- 
+2.39.2
+