enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
This commit is contained in:
Patrick Yavitz 2026-01-15 10:03:20 -05:00 committed by c0rnelius
parent 0a52e654ad
commit 2ca6da15e4
6 changed files with 212 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
patch/u-boot/v2026.01/board_bananapicm4io/001-BananaPi-CM4-Enable-NVME-PCI-SUPPORT.patch Normal file
View File

@ -0,0 +1,33 @@
From ff594396976fa80358e948a65ec1a09f708111e0 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@gmail.com>
Date: Thu, 15 Jan 2026 07:11:21 -0500
Subject: [PATCH] BananaPi CM4: Enable NVME PCI SUPPORT
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
---
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 f3f3bdd5426..52627886b16 100644
--- a/configs/bananapi-cm4-cm4io_defconfig
+++ b/configs/bananapi-cm4-cm4io_defconfig
@@ -23,6 +23,7 @@ CONFIG_FIT_VERBOSE=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
@@ -48,6 +49,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.51.0

40
patch/u-boot/v2026.01/board_bananapicm4io/002-BananaPi-CM4-Enable-PREBOOT-and-BOOT-LOGO-support.patch Normal file
View File

@ -0,0 +1,40 @@
From 32c60437e2911842792e7939250ab2dd35ec1817 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@gmail.com>
Date: Thu, 15 Jan 2026 07:12:24 -0500
Subject: [PATCH] BananaPi CM4: Enable PREBOOT and BOOT LOGO support
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
---
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 52627886b16..323eb4b3487 100644
--- a/configs/bananapi-cm4-cm4io_defconfig
+++ b/configs/bananapi-cm4-cm4io_defconfig
@@ -21,6 +21,7 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=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
@@ -78,14 +79,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.51.0

57
patch/u-boot/v2026.01/board_bananapicm4io/003-BananaPi-CM4-Enable-SATA-BOOT-support.patch Normal file
View File

@ -0,0 +1,57 @@
From 8116c94ebaf15db81d5746ab462c5ecf18bc5a86 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@gmail.com>
Date: Thu, 15 Jan 2026 07:15:48 -0500
Subject: [PATCH] BananaPi CM4: Enable SATA BOOT support
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
---
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 323eb4b3487..f63fd7299de 100644
--- a/configs/bananapi-cm4-cm4io_defconfig
+++ b/configs/bananapi-cm4-cm4io_defconfig
@@ -17,10 +17,12 @@ CONFIG_IDENT_STRING="bpi-cm4io"
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_OF_BOARD_SETUP=y
+CONFIG_SATA_BOOT=y
CONFIG_USE_PREBOOT=y
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_MISC_INIT_R=y
@@ -33,6 +35,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
@@ -41,6 +44,9 @@ CONFIG_OF_CONTROL=y
CONFIG_ENV_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
@@ -59,6 +65,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.51.0

38
patch/u-boot/v2026.01/board_bananapicm4io/004-BananaPi-M2S-Fixup.patch Normal file
View File

@ -0,0 +1,38 @@
From b13566a0bad7b6f14ea117b60fa090f3c6dd5931 Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@gmail.com>
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 <pyavitz@gmail.com>
---
...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 <narmstrong@baylibre.com>
+ */
+
+#include "meson-g12-common-u-boot.dtsi"
--
2.39.2

43
patch/u-boot/v2026.01/board_bananapicm4io/005-BananaPi-M2S-Enable-PREBOOT-and-BOOT-LOGO-support.patch Normal file
View File

@ -0,0 +1,43 @@
From b0f0171a5d1a7be8c91292dbb70d4351b0bdbced Mon Sep 17 00:00:00 2001
From: Patrick Yavitz <pyavitz@gmail.com>
Date: Thu, 15 Jan 2026 07:17:22 -0500
Subject: [PATCH] BananaPi M2S: Enable PREBOOT and BOOT LOGO support
Signed-off-by: Patrick Yavitz <pyavitz@gmail.com>
---
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 b2cb812138d..7922f458d3f 100644
--- a/configs/bananapi-m2s_defconfig
+++ b/configs/bananapi-m2s_defconfig
@@ -22,8 +22,10 @@ CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=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
@@ -74,14 +76,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.51.0

1
patch/u-boot/v2026.01/board_bananapim2s Symbolic link
View File

@ -0,0 +1 @@
board_bananapicm4io