diff --git a/config/boards/bananapicm4io.conf b/config/boards/bananapicm4io.conf index d0f248f7f969..0c4f7a64ea41 100644 --- a/config/boards/bananapicm4io.conf +++ b/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 diff --git a/config/boards/bananapim2s.conf b/config/boards/bananapim2s.conf index f2ed94728c0f..353b1ef746b2 100644 --- a/config/boards/bananapim2s.conf +++ b/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 diff --git a/patch/u-boot/v2023.07.02/board_bananapicm4io/0001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch b/patch/u-boot/v2023.07.02/board_bananapicm4io/0001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch deleted file mode 100644 index 2e2cfde68d69..000000000000 --- a/patch/u-boot/v2023.07.02/board_bananapicm4io/0001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7bb76be10f204d422a766ff08fc5e9cfc24eab88 Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -Date: Sun, 15 Oct 2023 09:22:12 -0400 -Subject: [PATCH] configs: bananapi-cm4-cm4io_defconfig: nvme support - -Enable NVME PCI SUPPORT. - -Signed-off-by: Patrick Yavitz ---- - 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 bb43cc41e5..066c5dca4a 100644 ---- a/configs/bananapi-cm4-cm4io_defconfig -+++ b/configs/bananapi-cm4-cm4io_defconfig -@@ -20,6 +20,7 @@ CONFIG_REMAKE_ELF=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 -@@ -43,6 +44,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 - diff --git a/patch/u-boot/v2023.07.02/board_bananapicm4io/0002-HACK-include-configs-meson64-boot-target-nvme.patch b/patch/u-boot/v2023.07.02/board_bananapicm4io/0002-HACK-include-configs-meson64-boot-target-nvme.patch deleted file mode 100644 index 7d02ef2d4911..000000000000 --- a/patch/u-boot/v2023.07.02/board_bananapicm4io/0002-HACK-include-configs-meson64-boot-target-nvme.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c70fd3829e8625898b493ac083ab41adcc875946 Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -Date: Sun, 15 Oct 2023 09:08:48 -0400 -Subject: [PATCH] meson64 boot target nvme - -Signed-off-by: Patrick Yavitz ---- - include/configs/meson64.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/configs/meson64.h b/include/configs/meson64.h -index 801cdae470..0c3fc676dd 100644 ---- a/include/configs/meson64.h -+++ b/include/configs/meson64.h -@@ -74,11 +74,11 @@ - #ifndef BOOT_TARGET_DEVICES - #define BOOT_TARGET_DEVICES(func) \ - func(ROMUSB, romusb, na) \ -+ BOOT_TARGET_NVME(func) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) \ - func(MMC, mmc, 2) \ - BOOT_TARGET_DEVICES_USB(func) \ -- BOOT_TARGET_NVME(func) \ - BOOT_TARGET_SCSI(func) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) --- -2.39.2 - diff --git a/patch/u-boot/v2023.07.02/board_bananapicm4io/0003-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch b/patch/u-boot/v2023.07.02/board_bananapicm4io/0003-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch deleted file mode 100644 index 7bc85a688a65..000000000000 --- a/patch/u-boot/v2023.07.02/board_bananapicm4io/0003-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch +++ /dev/null @@ -1,54 +0,0 @@ -From e8a4d76bcb33bcaebfc6a3b552338eb3af47603d Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -Date: Tue, 9 Jan 2024 16:22:12 -0500 -Subject: [PATCH] configs: bananapi-cm4-cm4io_defconfig: sata support - -Signed-off-by: Patrick Yavitz ---- - 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 066c5dca4a..876e37f714 100644 ---- a/configs/bananapi-cm4-cm4io_defconfig -+++ b/configs/bananapi-cm4-cm4io_defconfig -@@ -17,7 +17,9 @@ CONFIG_SYS_LOAD_ADDR=0x1000000 - CONFIG_PCI=y - CONFIG_DEBUG_UART=y - CONFIG_REMAKE_ELF=y -+CONFIG_AHCI=y - CONFIG_OF_BOARD_SETUP=y -+CONFIG_SATA_BOOT=y - # CONFIG_DISPLAY_CPUINFO is not set - CONFIG_MISC_INIT_R=y - CONFIG_PCI_INIT_R=y -@@ -28,6 +30,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 -@@ -36,6 +39,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_MMC_MESON_GX=y -@@ -53,6 +59,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 - diff --git a/patch/u-boot/v2023.07.02/board_bananapim2s/0001-U-Boot-v2023.07.02-Bananapi-M2S-Support.patch b/patch/u-boot/v2023.07.02/board_bananapim2s/0001-U-Boot-v2023.07.02-Bananapi-M2S-Support.patch deleted file mode 100644 index 761bce9ae086..000000000000 --- a/patch/u-boot/v2023.07.02/board_bananapim2s/0001-U-Boot-v2023.07.02-Bananapi-M2S-Support.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 39024aa2928b3d5d598573acb10b18b4d9a4e89f Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -Date: Fri, 21 Jul 2023 09:47:00 -0400 -Subject: [PATCH] U-Boot v2023.07.02 Bananapi M2S Support - -Allow meson-g12b-s922x-bananapi-m2s.dtb to be compiled. - -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 ---- - arch/arm/dts/Makefile | 1 + - ...boot.dtsi => meson-g12b-a311d-bananapi-m2s-u-boot.dtsi} | 0 - arch/arm/dts/meson-g12b-s922x-bananapi-m2s-u-boot.dtsi | 7 +++++++ - 3 files changed, 8 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/Makefile b/arch/arm/dts/Makefile -index 480269fa60..b3095c7b02 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -221,6 +221,7 @@ dtb-$(CONFIG_ARCH_MESON) += \ - meson-g12b-odroid-n2l.dtb \ - meson-g12b-odroid-n2-plus.dtb \ - meson-g12b-radxa-zero2.dtb \ -+ meson-g12b-s922x-bananapi-m2s.dtb \ - meson-sm1-bananapi-m2-pro.dtb \ - meson-sm1-bananapi-m5.dtb \ - meson-sm1-khadas-vim3l.dtb \ -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 -+ */ -+ -+#include "meson-g12-common-u-boot.dtsi" --- -2.39.2 - diff --git a/patch/u-boot/v2024.01/board_bananapicm4io/003-HACK-meson64-boot-target-nvme.patch b/patch/u-boot/v2024.01/board_bananapicm4io/003-HACK-meson64-boot-target-nvme.patch deleted file mode 100644 index 591ae9241b4b..000000000000 --- a/patch/u-boot/v2024.01/board_bananapicm4io/003-HACK-meson64-boot-target-nvme.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 293427d2bc690ec4a656e57f0d6d8c8c68db14aa Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -Date: Tue, 30 Jan 2024 06:11:13 -0500 -Subject: [PATCH] HACK: meson64 boot target nvme - -Signed-off-by: Patrick Yavitz ---- - include/configs/meson64.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/configs/meson64.h b/include/configs/meson64.h -index efab9a624d..57ac2e8b1a 100644 ---- a/include/configs/meson64.h -+++ b/include/configs/meson64.h -@@ -99,11 +99,11 @@ - #define BOOT_TARGET_DEVICES(func) \ - func(ROMUSB, romusb, na) \ - func(USB_DFU, usbdfu, na) \ -+ BOOT_TARGET_NVME(func) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) \ - func(MMC, mmc, 2) \ - BOOT_TARGET_DEVICES_USB(func) \ -- BOOT_TARGET_NVME(func) \ - BOOT_TARGET_SCSI(func) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) --- -2.39.2 - diff --git a/patch/u-boot/v2024.01/board_bananapim2s/001-bananapi-m2s-support-fixup.patch b/patch/u-boot/v2024.01/board_bananapim2s/001-bananapi-m2s-support-fixup.patch deleted file mode 100644 index 10d3d9da3143..000000000000 --- a/patch/u-boot/v2024.01/board_bananapim2s/001-bananapi-m2s-support-fixup.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0da3cd83c43f6dc06f58326410d90b66722459d8 Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -Date: Tue, 30 Jan 2024 06:27:38 -0500 -Subject: [PATCH] bananapi m2s support fixup - -Allow meson-g12b-s922x-bananapi-m2s.dtb to be compiled. - -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 ---- - arch/arm/dts/Makefile | 1 + - ...boot.dtsi => meson-g12b-a311d-bananapi-m2s-u-boot.dtsi} | 0 - arch/arm/dts/meson-g12b-s922x-bananapi-m2s-u-boot.dtsi | 7 +++++++ - 3 files changed, 8 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/Makefile b/arch/arm/dts/Makefile -index 9d28a485be..8559c70810 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -245,6 +245,7 @@ dtb-$(CONFIG_ARCH_MESON) += \ - meson-g12b-odroid-n2l.dtb \ - meson-g12b-odroid-n2-plus.dtb \ - meson-g12b-radxa-zero2.dtb \ -+ meson-g12b-s922x-bananapi-m2s.dtb \ - meson-sm1-bananapi-m2-pro.dtb \ - meson-sm1-bananapi-m5.dtb \ - meson-sm1-khadas-vim3l.dtb \ -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 -+ */ -+ -+#include "meson-g12-common-u-boot.dtsi" --- -2.39.2 - diff --git a/patch/u-boot/v2024.07/board_bananapicm4io/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch b/patch/u-boot/v2024.07/board_bananapicm4io/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch deleted file mode 100644 index 724564fb4888..000000000000 --- a/patch/u-boot/v2024.07/board_bananapicm4io/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9e4305436135989881f289800bef31fd3d689fc4 Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -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 ---- - 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 - diff --git a/patch/u-boot/v2024.07/board_bananapicm4io/002-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch b/patch/u-boot/v2024.07/board_bananapicm4io/002-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch deleted file mode 100644 index a3fcae5758dd..000000000000 --- a/patch/u-boot/v2024.07/board_bananapicm4io/002-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5f3f93f1a32c5969b35e320d6761af257d6c0c39 Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -Date: Thu, 1 Feb 2024 14:23:22 -0500 -Subject: [PATCH] configs: bananapi-cm4-cm4io_defconfig: sata support - -Enable SATA BOOT SUPPORT. - -Signed-off-by: Patrick Yavitz ---- - 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 2016b94bce..92eb446812 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_DISPLAY_CPUINFO is not set - CONFIG_MISC_INIT_R=y - CONFIG_PCI_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_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 -@@ -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.39.2 - diff --git a/patch/u-boot/v2024.07/board_bananapicm4io/003-HACK-meson64-boot-target-nvme.patch b/patch/u-boot/v2024.07/board_bananapicm4io/003-HACK-meson64-boot-target-nvme.patch deleted file mode 100644 index 803e9062cf1f..000000000000 --- a/patch/u-boot/v2024.07/board_bananapicm4io/003-HACK-meson64-boot-target-nvme.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 293427d2bc690ec4a656e57f0d6d8c8c68db14aa Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -Date: Tue, 30 Jan 2024 06:11:13 -0500 -Subject: [PATCH] HACK: meson64 boot target nvme - -Signed-off-by: Patrick Yavitz ---- - include/configs/meson64.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/configs/meson64.h b/include/configs/meson64.h -index efab9a624d..57ac2e8b1a 100644 ---- a/include/configs/meson64.h -+++ b/include/configs/meson64.h -@@ -99,11 +99,11 @@ - #define BOOT_TARGET_DEVICES(func) \ - func(ROMUSB, romusb, na) \ - func(USB_DFU, usbdfu, na) \ -+ BOOT_TARGET_NVME(func) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) \ - func(MMC, mmc, 2) \ - BOOT_TARGET_DEVICES_USB(func) \ -- BOOT_TARGET_NVME(func) \ - BOOT_TARGET_SCSI(func) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) --- -2.39.2 - diff --git a/patch/u-boot/v2024.01/board_bananapicm4io/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch b/patch/u-boot/v2025.01/board_bananapicm4io/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch similarity index 91% rename from patch/u-boot/v2024.01/board_bananapicm4io/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch rename to patch/u-boot/v2025.01/board_bananapicm4io/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch index 6fef48d99186..36d88361f37f 100644 --- a/patch/u-boot/v2024.01/board_bananapicm4io/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch +++ b/patch/u-boot/v2025.01/board_bananapicm4io/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch @@ -1,11 +1,11 @@ From 9e4305436135989881f289800bef31fd3d689fc4 Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz +From: Patrick Yavitz 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 +Signed-off-by: Patrick Yavitz --- configs/bananapi-cm4-cm4io_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patch/u-boot/v2025.01/board_bananapicm4io/002-configs-bananapi-cm4-cm4io_defconfig-preboot-and-boot-logo.patch b/patch/u-boot/v2025.01/board_bananapicm4io/002-configs-bananapi-cm4-cm4io_defconfig-preboot-and-boot-logo.patch new file mode 100644 index 000000000000..c3b0da019e2d --- /dev/null +++ b/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 +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 +--- + 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 + diff --git a/patch/u-boot/v2024.01/board_bananapicm4io/002-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch b/patch/u-boot/v2025.01/board_bananapicm4io/003-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch similarity index 77% rename from patch/u-boot/v2024.01/board_bananapicm4io/002-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch rename to patch/u-boot/v2025.01/board_bananapicm4io/003-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch index 8e265ab8c22c..5185fafec68a 100644 --- a/patch/u-boot/v2024.01/board_bananapicm4io/002-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch +++ b/patch/u-boot/v2025.01/board_bananapicm4io/003-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch @@ -1,17 +1,17 @@ -From 5f3f93f1a32c5969b35e320d6761af257d6c0c39 Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -Date: Thu, 1 Feb 2024 14:23:22 -0500 +From bdf6fe2c9236ff49284eaf54defa78c547fa43b9 Mon Sep 17 00:00:00 2001 +From: Patrick Yavitz +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 +Signed-off-by: Patrick Yavitz --- 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 2016b94bce..92eb446812 100644 +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 @@ -25,10 +25,10 @@ index 2016b94bce..92eb446812 100644 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 - CONFIG_PCI_INIT_R=y -@@ -33,6 +35,7 @@ CONFIG_CMD_GPIO=y +@@ -34,6 +36,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_LOADS is not set CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y @@ -36,7 +36,7 @@ index 2016b94bce..92eb446812 100644 CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set -@@ -41,6 +44,9 @@ CONFIG_OF_CONTROL=y +@@ -42,6 +45,9 @@ CONFIG_OF_CONTROL=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ADC=y CONFIG_SARADC_MESON=y @@ -46,7 +46,7 @@ index 2016b94bce..92eb446812 100644 CONFIG_BUTTON=y CONFIG_BUTTON_ADC=y CONFIG_DFU_RAM=y -@@ -59,6 +65,8 @@ CONFIG_POWER_DOMAIN=y +@@ -60,6 +66,8 @@ CONFIG_POWER_DOMAIN=y CONFIG_MESON_EE_POWER_DOMAIN=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/patch/u-boot/v2024.07/board_bananapim2s/0001-bananapi-m2s-fixup.patch b/patch/u-boot/v2025.01/board_bananapim2s/001-bananapi-m2s-fixup.patch similarity index 93% rename from patch/u-boot/v2024.07/board_bananapim2s/0001-bananapi-m2s-fixup.patch rename to patch/u-boot/v2025.01/board_bananapim2s/001-bananapi-m2s-fixup.patch index 77632d112a63..aa64d58736e8 100644 --- a/patch/u-boot/v2024.07/board_bananapim2s/0001-bananapi-m2s-fixup.patch +++ b/patch/u-boot/v2025.01/board_bananapim2s/001-bananapi-m2s-fixup.patch @@ -1,5 +1,5 @@ From b13566a0bad7b6f14ea117b60fa090f3c6dd5931 Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz +From: Patrick Yavitz Date: Sat, 13 Jul 2024 15:11:08 -0400 Subject: [PATCH] bananapi m2s fixup @@ -8,7 +8,7 @@ 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 +Signed-off-by: Patrick Yavitz --- ...boot.dtsi => meson-g12b-a311d-bananapi-m2s-u-boot.dtsi} | 0 arch/arm/dts/meson-g12b-s922x-bananapi-m2s-u-boot.dtsi | 7 +++++++ diff --git a/patch/u-boot/v2025.01/board_bananapim2s/002-configs-bananapi-m2s_defconfig-preboot-and-boot-logo.patch b/patch/u-boot/v2025.01/board_bananapim2s/002-configs-bananapi-m2s_defconfig-preboot-and-boot-logo.patch new file mode 100644 index 000000000000..196ba41b8159 --- /dev/null +++ b/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 +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 +--- + 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 +