From a835a5206cc7e2b5f1bbecf2b7d0effe1fb648ab Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Thu, 6 Feb 2025 08:47:11 -0500 Subject: [PATCH 1/5] BananaPi CM4/M2S: `Update u-boot to v2025.01` Signed-off-by: Patrick Yavitz --- config/boards/bananapicm4io.conf | 4 +- config/boards/bananapim2s.conf | 4 +- ...api-cm4-cm4io_defconfig-nvme-support.patch | 35 +++++++++++ ...m4io_defconfig-preboot-and-boot-logo.patch | 42 +++++++++++++ ...api-cm4-cm4io_defconfig-sata-support.patch | 60 +++++++++++++++++++ .../001-bananapi-m2s-fixup.patch | 38 ++++++++++++ ...-m2s_defconfig-preboot-and-boot-logo.patch | 45 ++++++++++++++ 7 files changed, 224 insertions(+), 4 deletions(-) create mode 100644 patch/u-boot/v2025.01/board_bananapicm4io/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch create mode 100644 patch/u-boot/v2025.01/board_bananapicm4io/002-configs-bananapi-cm4-cm4io_defconfig-preboot-and-boot-logo.patch create mode 100644 patch/u-boot/v2025.01/board_bananapicm4io/003-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch create mode 100644 patch/u-boot/v2025.01/board_bananapim2s/001-bananapi-m2s-fixup.patch create mode 100644 patch/u-boot/v2025.01/board_bananapim2s/002-configs-bananapi-m2s_defconfig-preboot-and-boot-logo.patch 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/v2025.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 new file mode 100644 index 000000000000..36d88361f37f --- /dev/null +++ b/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 +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/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/v2025.01/board_bananapicm4io/003-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 new file mode 100644 index 000000000000..5185fafec68a --- /dev/null +++ b/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 +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 +--- + 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 + diff --git a/patch/u-boot/v2025.01/board_bananapim2s/001-bananapi-m2s-fixup.patch b/patch/u-boot/v2025.01/board_bananapim2s/001-bananapi-m2s-fixup.patch new file mode 100644 index 000000000000..aa64d58736e8 --- /dev/null +++ b/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 +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 +--- + ...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 ++ */ ++ ++#include "meson-g12-common-u-boot.dtsi" +-- +2.39.2 + 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 + From e54bcc45bed13a7431f34dbd4fe68bdbd9554aca Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Thu, 6 Feb 2025 08:48:20 -0500 Subject: [PATCH 2/5] BananaPi CM4/M2S: `Delete old u-boot patches` Signed-off-by: Patrick Yavitz --- ...api-cm4-cm4io_defconfig-nvme-support.patch | 35 ----------- ...ude-configs-meson64-boot-target-nvme.patch | 30 ---------- ...api-cm4-cm4io_defconfig-sata-support.patch | 54 ----------------- ...oot-v2023.07.02-Bananapi-M2S-Support.patch | 53 ---------------- ...api-cm4-cm4io_defconfig-nvme-support.patch | 35 ----------- ...api-cm4-cm4io_defconfig-sata-support.patch | 60 ------------------- .../003-HACK-meson64-boot-target-nvme.patch | 30 ---------- .../001-bananapi-m2s-support-fixup.patch | 53 ---------------- ...api-cm4-cm4io_defconfig-nvme-support.patch | 35 ----------- ...api-cm4-cm4io_defconfig-sata-support.patch | 60 ------------------- .../003-HACK-meson64-boot-target-nvme.patch | 30 ---------- .../0001-bananapi-m2s-fixup.patch | 38 ------------ 12 files changed, 513 deletions(-) delete mode 100644 patch/u-boot/v2023.07.02/board_bananapicm4io/0001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch delete mode 100644 patch/u-boot/v2023.07.02/board_bananapicm4io/0002-HACK-include-configs-meson64-boot-target-nvme.patch delete mode 100644 patch/u-boot/v2023.07.02/board_bananapicm4io/0003-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch delete mode 100644 patch/u-boot/v2023.07.02/board_bananapim2s/0001-U-Boot-v2023.07.02-Bananapi-M2S-Support.patch delete mode 100644 patch/u-boot/v2024.01/board_bananapicm4io/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch delete mode 100644 patch/u-boot/v2024.01/board_bananapicm4io/002-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch delete mode 100644 patch/u-boot/v2024.01/board_bananapicm4io/003-HACK-meson64-boot-target-nvme.patch delete mode 100644 patch/u-boot/v2024.01/board_bananapim2s/001-bananapi-m2s-support-fixup.patch delete mode 100644 patch/u-boot/v2024.07/board_bananapicm4io/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch delete mode 100644 patch/u-boot/v2024.07/board_bananapicm4io/002-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch delete mode 100644 patch/u-boot/v2024.07/board_bananapicm4io/003-HACK-meson64-boot-target-nvme.patch delete mode 100644 patch/u-boot/v2024.07/board_bananapim2s/0001-bananapi-m2s-fixup.patch 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/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch b/patch/u-boot/v2024.01/board_bananapicm4io/001-configs-bananapi-cm4-cm4io_defconfig-nvme-support.patch deleted file mode 100644 index 6fef48d99186..000000000000 --- a/patch/u-boot/v2024.01/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.01/board_bananapicm4io/002-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch b/patch/u-boot/v2024.01/board_bananapicm4io/002-configs-bananapi-cm4-cm4io_defconfig-sata-support.patch deleted file mode 100644 index 8e265ab8c22c..000000000000 --- a/patch/u-boot/v2024.01/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.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.07/board_bananapim2s/0001-bananapi-m2s-fixup.patch b/patch/u-boot/v2024.07/board_bananapim2s/0001-bananapi-m2s-fixup.patch deleted file mode 100644 index 77632d112a63..000000000000 --- a/patch/u-boot/v2024.07/board_bananapim2s/0001-bananapi-m2s-fixup.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b13566a0bad7b6f14ea117b60fa090f3c6dd5931 Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -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 ---- - ...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 -+ */ -+ -+#include "meson-g12-common-u-boot.dtsi" --- -2.39.2 - From 68e822d13260ffde98409d2ffd97b3c59346308a Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Thu, 6 Feb 2025 10:48:37 -0500 Subject: [PATCH 3/5] Amper Gateway AM-GZ80x: `Update u-boot to v2025.01` Signed-off-by: Patrick Yavitz --- config/boards/gateway-gz80x.conf | 4 +- ...001-Add-board-Amper-Gateway-AM-GZ80x.patch | 480 ++++++++++++++++++ ...002-HACK-mmc-meson-gx-limit-to-24MHz.patch | 26 + ...change-clock-phase-value-on-axg-SoCs.patch | 56 ++ .../004-HACK-meson64-boot-target-usb.patch | 33 ++ 5 files changed, 597 insertions(+), 2 deletions(-) create mode 100644 patch/u-boot/v2025.01/board_gateway-gz80x/001-Add-board-Amper-Gateway-AM-GZ80x.patch create mode 100644 patch/u-boot/v2025.01/board_gateway-gz80x/002-HACK-mmc-meson-gx-limit-to-24MHz.patch create mode 100644 patch/u-boot/v2025.01/board_gateway-gz80x/003-mmc-meson-gx-change-clock-phase-value-on-axg-SoCs.patch create mode 100644 patch/u-boot/v2025.01/board_gateway-gz80x/004-HACK-meson64-boot-target-usb.patch diff --git a/config/boards/gateway-gz80x.conf b/config/boards/gateway-gz80x.conf index 6536357f6c3f..0a05cb82d075 100644 --- a/config/boards/gateway-gz80x.conf +++ b/config/boards/gateway-gz80x.conf @@ -5,8 +5,8 @@ BOARD_MAINTAINER="pyavitz" BOOTCONFIG="amper_gateway_am-gz80x_defconfig" KERNEL_TARGET="current,edge" KERNEL_TEST_TARGET="current" -BOOTBRANCH_BOARD="tag:v2024.07" -BOOTPATCHDIR="v2024.07" +BOOTBRANCH_BOARD="tag:v2025.01" +BOOTPATCHDIR="v2025.01" BOOT_FDT_FILE="amlogic/meson-axg-amper-gateway-am-gz80x.dtb" SRC_EXTLINUX="yes" SRC_CMDLINE="console=ttyAML0,115200n8 clk_ignore_unused loglevel=7" diff --git a/patch/u-boot/v2025.01/board_gateway-gz80x/001-Add-board-Amper-Gateway-AM-GZ80x.patch b/patch/u-boot/v2025.01/board_gateway-gz80x/001-Add-board-Amper-Gateway-AM-GZ80x.patch new file mode 100644 index 000000000000..65faeff8314c --- /dev/null +++ b/patch/u-boot/v2025.01/board_gateway-gz80x/001-Add-board-Amper-Gateway-AM-GZ80x.patch @@ -0,0 +1,480 @@ +From 7d170bc4d0c2fbdb01bdf5b0fd9b8201cf65b121 Mon Sep 17 00:00:00 2001 +From: Patrick Yavitz +Date: Thu, 19 Sep 2024 17:39:49 -0400 +Subject: [PATCH] Add board Amper Gateway AM-GZ80x + +Signed-off-by: Patrick Yavitz +--- + ...son-axg-amper-gateway-am-gz80x-u-boot.dtsi | 9 + + configs/amper_gateway_am-gz80x_defconfig | 69 ++++ + .../meson-axg-amper-gateway-am-gz80x.dts | 37 +++ + .../meson-axg-amper-gateway-gz80x.dtsi | 297 ++++++++++++++++++ + 4 files changed, 412 insertions(+) + create mode 100644 arch/arm/dts/meson-axg-amper-gateway-am-gz80x-u-boot.dtsi + create mode 100644 configs/amper_gateway_am-gz80x_defconfig + create mode 100644 dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-am-gz80x.dts + create mode 100644 dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-gz80x.dtsi + +diff --git a/arch/arm/dts/meson-axg-amper-gateway-am-gz80x-u-boot.dtsi b/arch/arm/dts/meson-axg-amper-gateway-am-gz80x-u-boot.dtsi +new file mode 100644 +index 0000000000..814f891bdc +--- /dev/null ++++ b/arch/arm/dts/meson-axg-amper-gateway-am-gz80x-u-boot.dtsi +@@ -0,0 +1,9 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2024 Patrick Yavitz ++ */ ++ ++&saradc { ++ status = "okay"; ++ vref-supply = <&vddio_ao18>; ++}; +diff --git a/configs/amper_gateway_am-gz80x_defconfig b/configs/amper_gateway_am-gz80x_defconfig +new file mode 100644 +index 0000000000..5991f66c29 +--- /dev/null ++++ b/configs/amper_gateway_am-gz80x_defconfig +@@ -0,0 +1,69 @@ ++CONFIG_ARM=y ++CONFIG_ARCH_MESON=y ++CONFIG_TEXT_BASE=0x01000000 ++CONFIG_NR_DRAM_BANKS=1 ++CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y ++CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 ++CONFIG_ENV_SIZE=0x2000 ++CONFIG_DM_GPIO=y ++CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-axg-amper-gateway-am-gz80x" ++CONFIG_OF_LIBFDT_OVERLAY=y ++CONFIG_DM_RESET=y ++CONFIG_MESON_AXG=y ++CONFIG_DEBUG_UART_BASE=0xff803000 ++CONFIG_DEBUG_UART_CLOCK=24000000 ++CONFIG_IDENT_STRING=" gateway-am-gz80x" ++CONFIG_SYS_LOAD_ADDR=0x01000000 ++CONFIG_DEBUG_UART=y ++CONFIG_REMAKE_ELF=y ++CONFIG_SD_BOOT=y ++CONFIG_OF_BOARD_SETUP=y ++CONFIG_USE_PREBOOT=y ++CONFIG_PREBOOT="usb start" ++# CONFIG_DISPLAY_CPUINFO is not set ++CONFIG_MISC_INIT_R=y ++CONFIG_SYS_MAXARGS=32 ++# CONFIG_CMD_BDI is not set ++# CONFIG_CMD_IMI is not set ++CONFIG_CMD_EEPROM=y ++CONFIG_CMD_ADC=y ++CONFIG_CMD_GPIO=y ++CONFIG_CMD_I2C=y ++# CONFIG_CMD_LOADS is not set ++CONFIG_CMD_MMC=y ++CONFIG_CMD_USB=y ++CONFIG_CMD_USB_MASS_STORAGE=y ++CONFIG_CMD_REGULATOR=y ++CONFIG_CMD_BTRFS=y ++CONFIG_PARTITION_TYPE_GUID=y ++CONFIG_OF_CONTROL=y ++CONFIG_SYS_RELOC_GD_ENV_ADDR=y ++CONFIG_SARADC_MESON=y ++CONFIG_DM_I2C=y ++CONFIG_SYS_I2C_MESON=y ++CONFIG_MMC_MESON_GX=y ++CONFIG_PHY_REALTEK=y ++CONFIG_ETH_DESIGNWARE_MESON8B=y ++CONFIG_MESON_GXL_USB_PHY=y ++CONFIG_PINCTRL=y ++CONFIG_PINCTRL_MESON_AXG=y ++CONFIG_DM_REGULATOR=y ++CONFIG_DM_REGULATOR_FIXED=y ++CONFIG_DEBUG_UART_ANNOUNCE=y ++CONFIG_DEBUG_UART_SKIP_INIT=y ++CONFIG_MESON_SERIAL=y ++CONFIG_USB=y ++CONFIG_DM_USB_GADGET=y ++CONFIG_USB_XHCI_HCD=y ++CONFIG_USB_XHCI_DWC3=y ++CONFIG_USB_DWC2=y ++CONFIG_USB_DWC3=y ++# CONFIG_USB_DWC3_GADGET is not set ++CONFIG_USB_DWC3_MESON_GXL=y ++CONFIG_USB_GADGET=y ++CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e ++CONFIG_USB_GADGET_PRODUCT_NUM=0xfada ++CONFIG_USB_GADGET_DWC2_OTG=y ++CONFIG_USB_GADGET_DOWNLOAD=y ++CONFIG_EXT4_WRITE=y ++CONFIG_RANDOM_UUID=y +diff --git a/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-am-gz80x.dts b/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-am-gz80x.dts +new file mode 100644 +index 0000000000..0a7b48bd03 +--- /dev/null ++++ b/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-am-gz80x.dts +@@ -0,0 +1,37 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2024 Patrick Yavitz ++ */ ++ ++/dts-v1/; ++ ++#include "meson-axg-amper-gateway-gz80x.dtsi" ++ ++/ { ++ compatible = "amper,gateway-am-gz80x", "amlogic,a113x", "amlogic,meson-axg"; ++ model = "Amper Gateway AM-GZ80x"; ++ ++ aliases { ++ serial1 = &uart_B; ++ serial2 = &uart_AO_B; ++ ethernet0 = ðmac; ++ }; ++ ++ /* 1024MB RAM */ ++ memory@0 { ++ device_type = "memory"; ++ reg = <0x0 0x0 0x0 0x40000000>; ++ }; ++}; ++ ++&sd_emmc_b { ++ sdio: wifi@1 { ++ reg = <1>; ++ }; ++}; ++ ++&uart_B { ++ status = "okay"; ++ pinctrl-0 = <&uart_b_z_pins>; ++ pinctrl-names = "default"; ++}; +diff --git a/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-gz80x.dtsi b/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-gz80x.dtsi +new file mode 100644 +index 0000000000..807238c4a6 +--- /dev/null ++++ b/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-gz80x.dtsi +@@ -0,0 +1,297 @@ ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT) ++/* ++ * Copyright (c) 2024 Patrick Yavitz ++ */ ++ ++/dts-v1/; ++ ++#include "meson-axg.dtsi" ++#include ++#include ++#include ++ ++/ { ++ aliases { ++ serial0 = &uart_AO; ++ }; ++ ++ chosen { ++ stdout-path = "serial0:115200n8"; ++ }; ++ ++ emmc_pwrseq: emmc-pwrseq { ++ compatible = "mmc-pwrseq-emmc"; ++ reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; ++ }; ++ ++ gpio-keys-polled { ++ compatible = "gpio-keys-polled"; ++ poll-interval = <100>; ++ ++ button-power { ++ label = "power"; ++ linux,code = ; ++ gpios = <&gpio_ao GPIOAO_6 GPIO_ACTIVE_HIGH>; ++ }; ++ }; ++ ++ leds { ++ compatible = "gpio-leds"; ++ ++ led-blue { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "default-on"; ++ }; ++ ++ led-green { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "mmc1"; ++ }; ++ ++ led-red { ++ color = ; ++ function = LED_FUNCTION_STATUS; ++ gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>; ++ linux,default-trigger = "usb-host"; ++ }; ++ }; ++ ++ reserved-memory { ++ linux,cma { ++ size = <0x0 0x400000>; ++ }; ++ }; ++ ++ sdio_pwrseq: sdio-pwrseq { ++ compatible = "mmc-pwrseq-simple"; ++ reset-gpios = <&gpio GPIOX_7 GPIO_ACTIVE_LOW>; ++ clocks = <&wifi32k>; ++ clock-names = "ext_clock"; ++ }; ++ ++ thermal-zones { ++ cpu_thermal: cpu-thermal { ++ polling-delay-passive = <250>; ++ polling-delay = <1000>; ++ thermal-sensors = <&scpi_sensors 0>; ++ trips { ++ cpu_passive: cpu-passive { ++ temperature = <70000>; /* millicelsius */ ++ hysteresis = <2000>; /* millicelsius */ ++ type = "passive"; ++ }; ++ ++ cpu_hot: cpu-hot { ++ temperature = <80000>; /* millicelsius */ ++ hysteresis = <2000>; /* millicelsius */ ++ type = "hot"; ++ }; ++ ++ cpu_critical: cpu-critical { ++ temperature = <100000>; /* millicelsius */ ++ hysteresis = <2000>; /* millicelsius */ ++ type = "critical"; ++ }; ++ }; ++ ++ cpu_cooling_maps: cooling-maps { ++ map0 { ++ trip = <&cpu_passive>; ++ cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, ++ <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, ++ <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, ++ <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; ++ }; ++ ++ map1 { ++ trip = <&cpu_hot>; ++ cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, ++ <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, ++ <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, ++ <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; ++ }; ++ }; ++ }; ++ }; ++ ++ usb_pwr: regulator-usb_pwr { ++ compatible = "regulator-fixed"; ++ regulator-name = "USB_PWR"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ vin-supply = <&vcc_5v>; ++ regulator-always-on; ++ ++ gpio = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>; ++ enable-active-high; ++ }; ++ ++ vcc_3v3: regulator-vcc_3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCC_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&vddao_3v3>; ++ regulator-always-on; ++ }; ++ ++ vcc_5v: regulator-vcc_5v { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCC5V"; ++ regulator-min-microvolt = <5000000>; ++ regulator-max-microvolt = <5000000>; ++ regulator-always-on; ++ }; ++ ++ vddao_3v3: regulator-vddao_3v3 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDAO_3V3"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&vcc_5v>; ++ regulator-always-on; ++ }; ++ ++ vddio_ao18: regulator-vddio_ao18 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDIO_AO18"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vddao_3v3>; ++ regulator-always-on; ++ }; ++ ++ vddio_boot: regulator-vddio_boot { ++ compatible = "regulator-fixed"; ++ regulator-name = "VDDIO_BOOT"; ++ regulator-min-microvolt = <3300000>; ++ regulator-max-microvolt = <3300000>; ++ vin-supply = <&vddao_3v3>; ++ regulator-always-on; ++ }; ++ ++ vccq_1v8: regulator-vccq_1v8 { ++ compatible = "regulator-fixed"; ++ regulator-name = "VCCQ_1V8"; ++ regulator-min-microvolt = <1800000>; ++ regulator-max-microvolt = <1800000>; ++ vin-supply = <&vddao_3v3>; ++ regulator-always-on; ++ }; ++ ++ wifi32k: wifi32k { ++ compatible = "pwm-clock"; ++ #clock-cells = <0>; ++ clock-frequency = <32768>; ++ pwms = <&pwm_ab 0 30518 0>; /* PWM_A at 32.768KHz */ ++ }; ++}; ++ ++&cpu0 { ++ #cooling-cells = <2>; ++}; ++ ++&cpu1 { ++ #cooling-cells = <2>; ++}; ++ ++&cpu2 { ++ #cooling-cells = <2>; ++}; ++ ++&cpu3 { ++ #cooling-cells = <2>; ++}; ++ ++ðmac { ++ status = "okay"; ++ pinctrl-0 = <ð_rmii_x_pins>; ++ pinctrl-names = "default"; ++ phy-mode = "rmii"; ++}; ++ ++/* Peripheral I2C bus (on motherboard) */ ++&i2c_AO { ++ status = "okay"; ++ pinctrl-0 = <&i2c_ao_sck_10_pins>, <&i2c_ao_sda_11_pins>; ++ pinctrl-names = "default"; ++}; ++ ++&pwm_ab { ++ status = "okay"; ++ pinctrl-0 = <&pwm_a_x20_pins>; ++ pinctrl-names = "default"; ++}; ++ ++/* WiFi module */ ++&sd_emmc_b { ++ status = "okay"; ++ #address-cells = <1>; ++ #size-cells = <0>; ++ ++ pinctrl-0 = <&sdio_pins>; ++ pinctrl-1 = <&sdio_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <4>; ++ cap-sd-highspeed; ++ max-frequency = <50000000>; ++ disable-wp; ++ non-removable; ++ ++ mmc-pwrseq = <&sdio_pwrseq>; ++ ++ vmmc-supply = <&vddao_3v3>; ++ vqmmc-supply = <&vddio_boot>; ++}; ++ ++/* eMMC Storage */ ++&sd_emmc_c { ++ status = "okay"; ++ pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; ++ pinctrl-1 = <&emmc_clk_gate_pins>; ++ pinctrl-names = "default", "clk-gate"; ++ ++ bus-width = <8>; ++ cap-mmc-highspeed; ++ max-frequency = <200000000>; ++ non-removable; ++ disable-wp; ++ mmc-ddr-1_8v; ++ mmc-hs200-1_8v; ++ ++ mmc-pwrseq = <&emmc_pwrseq>; ++ ++ vmmc-supply = <&vcc_3v3>; ++ vqmmc-supply = <&vccq_1v8>; ++}; ++ ++&spicc1 { ++ status = "okay"; ++ pinctrl-0 = <&spi1_x_pins>, <&spi1_ss0_x_pins>; ++ pinctrl-names = "default"; ++}; ++ ++/* UART Console */ ++&uart_AO { ++ status = "okay"; ++ pinctrl-0 = <&uart_ao_a_pins>; ++ pinctrl-names = "default"; ++}; ++ ++/* UART Wireless module */ ++&uart_AO_B { ++ status = "okay"; ++ pinctrl-0 = <&uart_ao_b_z_pins>; ++ pinctrl-names = "default"; ++ reset-gpios = <&gpio GPIOZ_6 GPIO_ACTIVE_HIGH>; ++}; ++ ++&usb { ++ status = "okay"; ++ vbus-supply = <&usb_pwr>; ++}; +-- +2.39.5 + +From ef5448afc8f03237dcc87741b241505769a8af42 Mon Sep 17 00:00:00 2001 +From: Patrick Yavitz +Date: Thu, 19 Sep 2024 17:47:20 -0400 +Subject: [PATCH] CONFIG_OF_UPSTREAM + +Compile upstream dt + +Signed-off-by: Patrick Yavitz +--- + configs/amper_gateway_am-gz80x_defconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configs/amper_gateway_am-gz80x_defconfig b/configs/amper_gateway_am-gz80x_defconfig +index 5991f66c29..d1d9749bdb 100644 +--- a/configs/amper_gateway_am-gz80x_defconfig ++++ b/configs/amper_gateway_am-gz80x_defconfig +@@ -1,3 +1,4 @@ ++CONFIG_OF_UPSTREAM=y + CONFIG_ARM=y + CONFIG_ARCH_MESON=y + CONFIG_TEXT_BASE=0x01000000 +-- +2.39.5 + diff --git a/patch/u-boot/v2025.01/board_gateway-gz80x/002-HACK-mmc-meson-gx-limit-to-24MHz.patch b/patch/u-boot/v2025.01/board_gateway-gz80x/002-HACK-mmc-meson-gx-limit-to-24MHz.patch new file mode 100644 index 000000000000..2d75c9be112c --- /dev/null +++ b/patch/u-boot/v2025.01/board_gateway-gz80x/002-HACK-mmc-meson-gx-limit-to-24MHz.patch @@ -0,0 +1,26 @@ +From b7a337d756d275f501ff8f7273b9527f52983183 Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Thu, 6 Feb 2025 10:18:26 -0500 +Subject: [PATCH] HACK: mmc: meson-gx: limit to 24MHz + +Signed-off-by: Neil Armstrong +--- + drivers/mmc/meson_gx_mmc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c +index 5852b24c6d2..818e8cf0a93 100644 +--- a/drivers/mmc/meson_gx_mmc.c ++++ b/drivers/mmc/meson_gx_mmc.c +@@ -278,7 +278,7 @@ static int meson_mmc_probe(struct udevice *dev) + cfg->host_caps = MMC_MODE_8BIT | MMC_MODE_4BIT | + MMC_MODE_HS_52MHz | MMC_MODE_HS; + cfg->f_min = DIV_ROUND_UP(SD_EMMC_CLKSRC_24M, CLK_MAX_DIV); +- cfg->f_max = 100000000; /* 100 MHz */ ++ cfg->f_max = SD_EMMC_CLKSRC_24M; + cfg->b_max = 511; /* max 512 - 1 blocks */ + cfg->name = dev->name; + +-- +2.39.5 + diff --git a/patch/u-boot/v2025.01/board_gateway-gz80x/003-mmc-meson-gx-change-clock-phase-value-on-axg-SoCs.patch b/patch/u-boot/v2025.01/board_gateway-gz80x/003-mmc-meson-gx-change-clock-phase-value-on-axg-SoCs.patch new file mode 100644 index 000000000000..d23368bb26ac --- /dev/null +++ b/patch/u-boot/v2025.01/board_gateway-gz80x/003-mmc-meson-gx-change-clock-phase-value-on-axg-SoCs.patch @@ -0,0 +1,56 @@ +From c15acb64d820ccc9edada3817d4d6c56a34a63e8 Mon Sep 17 00:00:00 2001 +From: Vyacheslav Bocharov +Date: Thu, 6 Feb 2025 10:19:22 -0500 +Subject: [PATCH] mmc: meson-gx: change clock phase value on axg SoCs + +Amlogic AXG SoCs seems doesn't work over 50MHz. When phase sets to 270', +it's working fine over 50MHz on Amlogic AXG SoCs. +Based on 0dbb54eb3257c243c7968f967a6b183b1edb56c8 by Neil Armstrong + + +To distinguish which value is used adds an u-boot only axg compatible. + +Signed-off-by: Vyacheslav Bocharov +--- + drivers/mmc/meson_gx_mmc.c | 5 +++-- + drivers/mmc/meson_gx_mmc.h | 1 + + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c +index 818e8cf0a93..74607b3201f 100644 +--- a/drivers/mmc/meson_gx_mmc.c ++++ b/drivers/mmc/meson_gx_mmc.c +@@ -67,7 +67,8 @@ static void meson_mmc_config_clock(struct mmc *mmc) + * Other SoCs use CLK_CO_PHASE_180 by default. + * It needs to find what is a proper value about each SoCs. + */ +- if (meson_gx_mmc_is_compatible(mmc->dev, MMC_COMPATIBLE_SM1)) ++ if (meson_gx_mmc_is_compatible(mmc->dev, MMC_COMPATIBLE_SM1) || ++ meson_gx_mmc_is_compatible(mmc->dev, MMC_COMPATIBLE_AXG)) + meson_mmc_clk |= CLK_CO_PHASE_270; + else + meson_mmc_clk |= CLK_CO_PHASE_180; +@@ -321,7 +322,7 @@ int meson_mmc_bind(struct udevice *dev) + + static const struct udevice_id meson_mmc_match[] = { + { .compatible = "amlogic,meson-gx-mmc", .data = MMC_COMPATIBLE_GX }, +- { .compatible = "amlogic,meson-axg-mmc", .data = MMC_COMPATIBLE_GX }, ++ { .compatible = "amlogic,meson-axg-mmc", .data = MMC_COMPATIBLE_AXG }, + { .compatible = "amlogic,meson-sm1-mmc", .data = MMC_COMPATIBLE_SM1 }, + { /* sentinel */ } + }; +diff --git a/drivers/mmc/meson_gx_mmc.h b/drivers/mmc/meson_gx_mmc.h +index 8974b78f559..53201ceddae 100644 +--- a/drivers/mmc/meson_gx_mmc.h ++++ b/drivers/mmc/meson_gx_mmc.h +@@ -12,6 +12,7 @@ + enum meson_gx_mmc_compatible { + MMC_COMPATIBLE_GX, + MMC_COMPATIBLE_SM1, ++ MMC_COMPATIBLE_AXG, + }; + + #define SDIO_PORT_A 0 +-- +2.39.5 + diff --git a/patch/u-boot/v2025.01/board_gateway-gz80x/004-HACK-meson64-boot-target-usb.patch b/patch/u-boot/v2025.01/board_gateway-gz80x/004-HACK-meson64-boot-target-usb.patch new file mode 100644 index 000000000000..b2551eac862b --- /dev/null +++ b/patch/u-boot/v2025.01/board_gateway-gz80x/004-HACK-meson64-boot-target-usb.patch @@ -0,0 +1,33 @@ +From 5f25b3fba1b7a36edf12033e922d4e95047e15cd Mon Sep 17 00:00:00 2001 +From: Patrick Yavitz +Date: Thu, 6 Feb 2025 10:21:13 -0500 +Subject: [PATCH] HACK: meson64 boot target usb + +By changing the USB boot order, it makes it possible +to recover the current install on the eMMC by booting +via USB. + +NOTE: There is no SD Card support. + +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 f3275b37a51..3ace59880bd 100644 +--- a/include/configs/meson64.h ++++ b/include/configs/meson64.h +@@ -119,8 +119,8 @@ + #define BOOT_TARGET_DEVICES(func) \ + func(ROMUSB, romusb, na) \ + func(USB_DFU, usbdfu, na) \ +- BOOT_TARGET_MMC(func) \ + BOOT_TARGET_DEVICES_USB(func) \ ++ BOOT_TARGET_MMC(func) \ + BOOT_TARGET_NVME(func) \ + BOOT_TARGET_SCSI(func) \ + BOOT_TARGET_PXE(func) \ +-- +2.39.5 + From ca333b28c1f2baa862cb88ad868c292827f46fa1 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Thu, 6 Feb 2025 10:50:31 -0500 Subject: [PATCH 4/5] Amper Gateway AM-GZ80x: `Delete old u-boot patches` Signed-off-by: Patrick Yavitz --- ...001-Add-board-Amper-Gateway-AM-GZ80x.patch | 480 ------------------ ...002-HACK-mmc-meson-gx-limit-to-24MHz.patch | 26 - ...change-clock-phase-value-on-axg-SoCs.patch | 54 -- .../004-HACK-meson64-boot-target-usb.patch | 29 -- 4 files changed, 589 deletions(-) delete mode 100644 patch/u-boot/v2024.07/board_gateway-gz80x/001-Add-board-Amper-Gateway-AM-GZ80x.patch delete mode 100644 patch/u-boot/v2024.07/board_gateway-gz80x/002-HACK-mmc-meson-gx-limit-to-24MHz.patch delete mode 100644 patch/u-boot/v2024.07/board_gateway-gz80x/003-mmc-meson-gx-change-clock-phase-value-on-axg-SoCs.patch delete mode 100644 patch/u-boot/v2024.07/board_gateway-gz80x/004-HACK-meson64-boot-target-usb.patch diff --git a/patch/u-boot/v2024.07/board_gateway-gz80x/001-Add-board-Amper-Gateway-AM-GZ80x.patch b/patch/u-boot/v2024.07/board_gateway-gz80x/001-Add-board-Amper-Gateway-AM-GZ80x.patch deleted file mode 100644 index 65faeff8314c..000000000000 --- a/patch/u-boot/v2024.07/board_gateway-gz80x/001-Add-board-Amper-Gateway-AM-GZ80x.patch +++ /dev/null @@ -1,480 +0,0 @@ -From 7d170bc4d0c2fbdb01bdf5b0fd9b8201cf65b121 Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -Date: Thu, 19 Sep 2024 17:39:49 -0400 -Subject: [PATCH] Add board Amper Gateway AM-GZ80x - -Signed-off-by: Patrick Yavitz ---- - ...son-axg-amper-gateway-am-gz80x-u-boot.dtsi | 9 + - configs/amper_gateway_am-gz80x_defconfig | 69 ++++ - .../meson-axg-amper-gateway-am-gz80x.dts | 37 +++ - .../meson-axg-amper-gateway-gz80x.dtsi | 297 ++++++++++++++++++ - 4 files changed, 412 insertions(+) - create mode 100644 arch/arm/dts/meson-axg-amper-gateway-am-gz80x-u-boot.dtsi - create mode 100644 configs/amper_gateway_am-gz80x_defconfig - create mode 100644 dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-am-gz80x.dts - create mode 100644 dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-gz80x.dtsi - -diff --git a/arch/arm/dts/meson-axg-amper-gateway-am-gz80x-u-boot.dtsi b/arch/arm/dts/meson-axg-amper-gateway-am-gz80x-u-boot.dtsi -new file mode 100644 -index 0000000000..814f891bdc ---- /dev/null -+++ b/arch/arm/dts/meson-axg-amper-gateway-am-gz80x-u-boot.dtsi -@@ -0,0 +1,9 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2024 Patrick Yavitz -+ */ -+ -+&saradc { -+ status = "okay"; -+ vref-supply = <&vddio_ao18>; -+}; -diff --git a/configs/amper_gateway_am-gz80x_defconfig b/configs/amper_gateway_am-gz80x_defconfig -new file mode 100644 -index 0000000000..5991f66c29 ---- /dev/null -+++ b/configs/amper_gateway_am-gz80x_defconfig -@@ -0,0 +1,69 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_MESON=y -+CONFIG_TEXT_BASE=0x01000000 -+CONFIG_NR_DRAM_BANKS=1 -+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 -+CONFIG_ENV_SIZE=0x2000 -+CONFIG_DM_GPIO=y -+CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-axg-amper-gateway-am-gz80x" -+CONFIG_OF_LIBFDT_OVERLAY=y -+CONFIG_DM_RESET=y -+CONFIG_MESON_AXG=y -+CONFIG_DEBUG_UART_BASE=0xff803000 -+CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_IDENT_STRING=" gateway-am-gz80x" -+CONFIG_SYS_LOAD_ADDR=0x01000000 -+CONFIG_DEBUG_UART=y -+CONFIG_REMAKE_ELF=y -+CONFIG_SD_BOOT=y -+CONFIG_OF_BOARD_SETUP=y -+CONFIG_USE_PREBOOT=y -+CONFIG_PREBOOT="usb start" -+# CONFIG_DISPLAY_CPUINFO is not set -+CONFIG_MISC_INIT_R=y -+CONFIG_SYS_MAXARGS=32 -+# CONFIG_CMD_BDI is not set -+# CONFIG_CMD_IMI is not set -+CONFIG_CMD_EEPROM=y -+CONFIG_CMD_ADC=y -+CONFIG_CMD_GPIO=y -+CONFIG_CMD_I2C=y -+# CONFIG_CMD_LOADS is not set -+CONFIG_CMD_MMC=y -+CONFIG_CMD_USB=y -+CONFIG_CMD_USB_MASS_STORAGE=y -+CONFIG_CMD_REGULATOR=y -+CONFIG_CMD_BTRFS=y -+CONFIG_PARTITION_TYPE_GUID=y -+CONFIG_OF_CONTROL=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y -+CONFIG_SARADC_MESON=y -+CONFIG_DM_I2C=y -+CONFIG_SYS_I2C_MESON=y -+CONFIG_MMC_MESON_GX=y -+CONFIG_PHY_REALTEK=y -+CONFIG_ETH_DESIGNWARE_MESON8B=y -+CONFIG_MESON_GXL_USB_PHY=y -+CONFIG_PINCTRL=y -+CONFIG_PINCTRL_MESON_AXG=y -+CONFIG_DM_REGULATOR=y -+CONFIG_DM_REGULATOR_FIXED=y -+CONFIG_DEBUG_UART_ANNOUNCE=y -+CONFIG_DEBUG_UART_SKIP_INIT=y -+CONFIG_MESON_SERIAL=y -+CONFIG_USB=y -+CONFIG_DM_USB_GADGET=y -+CONFIG_USB_XHCI_HCD=y -+CONFIG_USB_XHCI_DWC3=y -+CONFIG_USB_DWC2=y -+CONFIG_USB_DWC3=y -+# CONFIG_USB_DWC3_GADGET is not set -+CONFIG_USB_DWC3_MESON_GXL=y -+CONFIG_USB_GADGET=y -+CONFIG_USB_GADGET_VENDOR_NUM=0x1b8e -+CONFIG_USB_GADGET_PRODUCT_NUM=0xfada -+CONFIG_USB_GADGET_DWC2_OTG=y -+CONFIG_USB_GADGET_DOWNLOAD=y -+CONFIG_EXT4_WRITE=y -+CONFIG_RANDOM_UUID=y -diff --git a/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-am-gz80x.dts b/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-am-gz80x.dts -new file mode 100644 -index 0000000000..0a7b48bd03 ---- /dev/null -+++ b/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-am-gz80x.dts -@@ -0,0 +1,37 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2024 Patrick Yavitz -+ */ -+ -+/dts-v1/; -+ -+#include "meson-axg-amper-gateway-gz80x.dtsi" -+ -+/ { -+ compatible = "amper,gateway-am-gz80x", "amlogic,a113x", "amlogic,meson-axg"; -+ model = "Amper Gateway AM-GZ80x"; -+ -+ aliases { -+ serial1 = &uart_B; -+ serial2 = &uart_AO_B; -+ ethernet0 = ðmac; -+ }; -+ -+ /* 1024MB RAM */ -+ memory@0 { -+ device_type = "memory"; -+ reg = <0x0 0x0 0x0 0x40000000>; -+ }; -+}; -+ -+&sd_emmc_b { -+ sdio: wifi@1 { -+ reg = <1>; -+ }; -+}; -+ -+&uart_B { -+ status = "okay"; -+ pinctrl-0 = <&uart_b_z_pins>; -+ pinctrl-names = "default"; -+}; -diff --git a/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-gz80x.dtsi b/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-gz80x.dtsi -new file mode 100644 -index 0000000000..807238c4a6 ---- /dev/null -+++ b/dts/upstream/src/arm64/amlogic/meson-axg-amper-gateway-gz80x.dtsi -@@ -0,0 +1,297 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2024 Patrick Yavitz -+ */ -+ -+/dts-v1/; -+ -+#include "meson-axg.dtsi" -+#include -+#include -+#include -+ -+/ { -+ aliases { -+ serial0 = &uart_AO; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ emmc_pwrseq: emmc-pwrseq { -+ compatible = "mmc-pwrseq-emmc"; -+ reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; -+ }; -+ -+ gpio-keys-polled { -+ compatible = "gpio-keys-polled"; -+ poll-interval = <100>; -+ -+ button-power { -+ label = "power"; -+ linux,code = ; -+ gpios = <&gpio_ao GPIOAO_6 GPIO_ACTIVE_HIGH>; -+ }; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ led-blue { -+ color = ; -+ function = LED_FUNCTION_STATUS; -+ gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "default-on"; -+ }; -+ -+ led-green { -+ color = ; -+ function = LED_FUNCTION_STATUS; -+ gpios = <&gpio_ao GPIOAO_4 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "mmc1"; -+ }; -+ -+ led-red { -+ color = ; -+ function = LED_FUNCTION_STATUS; -+ gpios = <&gpio_ao GPIOAO_7 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "usb-host"; -+ }; -+ }; -+ -+ reserved-memory { -+ linux,cma { -+ size = <0x0 0x400000>; -+ }; -+ }; -+ -+ sdio_pwrseq: sdio-pwrseq { -+ compatible = "mmc-pwrseq-simple"; -+ reset-gpios = <&gpio GPIOX_7 GPIO_ACTIVE_LOW>; -+ clocks = <&wifi32k>; -+ clock-names = "ext_clock"; -+ }; -+ -+ thermal-zones { -+ cpu_thermal: cpu-thermal { -+ polling-delay-passive = <250>; -+ polling-delay = <1000>; -+ thermal-sensors = <&scpi_sensors 0>; -+ trips { -+ cpu_passive: cpu-passive { -+ temperature = <70000>; /* millicelsius */ -+ hysteresis = <2000>; /* millicelsius */ -+ type = "passive"; -+ }; -+ -+ cpu_hot: cpu-hot { -+ temperature = <80000>; /* millicelsius */ -+ hysteresis = <2000>; /* millicelsius */ -+ type = "hot"; -+ }; -+ -+ cpu_critical: cpu-critical { -+ temperature = <100000>; /* millicelsius */ -+ hysteresis = <2000>; /* millicelsius */ -+ type = "critical"; -+ }; -+ }; -+ -+ cpu_cooling_maps: cooling-maps { -+ map0 { -+ trip = <&cpu_passive>; -+ cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; -+ }; -+ -+ map1 { -+ trip = <&cpu_hot>; -+ cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; -+ }; -+ }; -+ }; -+ }; -+ -+ usb_pwr: regulator-usb_pwr { -+ compatible = "regulator-fixed"; -+ regulator-name = "USB_PWR"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ vin-supply = <&vcc_5v>; -+ regulator-always-on; -+ -+ gpio = <&gpio_ao GPIOAO_5 GPIO_ACTIVE_HIGH>; -+ enable-active-high; -+ }; -+ -+ vcc_3v3: regulator-vcc_3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VCC_3V3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ vin-supply = <&vddao_3v3>; -+ regulator-always-on; -+ }; -+ -+ vcc_5v: regulator-vcc_5v { -+ compatible = "regulator-fixed"; -+ regulator-name = "VCC5V"; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ regulator-always-on; -+ }; -+ -+ vddao_3v3: regulator-vddao_3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VDDAO_3V3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ vin-supply = <&vcc_5v>; -+ regulator-always-on; -+ }; -+ -+ vddio_ao18: regulator-vddio_ao18 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VDDIO_AO18"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ vin-supply = <&vddao_3v3>; -+ regulator-always-on; -+ }; -+ -+ vddio_boot: regulator-vddio_boot { -+ compatible = "regulator-fixed"; -+ regulator-name = "VDDIO_BOOT"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ vin-supply = <&vddao_3v3>; -+ regulator-always-on; -+ }; -+ -+ vccq_1v8: regulator-vccq_1v8 { -+ compatible = "regulator-fixed"; -+ regulator-name = "VCCQ_1V8"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ vin-supply = <&vddao_3v3>; -+ regulator-always-on; -+ }; -+ -+ wifi32k: wifi32k { -+ compatible = "pwm-clock"; -+ #clock-cells = <0>; -+ clock-frequency = <32768>; -+ pwms = <&pwm_ab 0 30518 0>; /* PWM_A at 32.768KHz */ -+ }; -+}; -+ -+&cpu0 { -+ #cooling-cells = <2>; -+}; -+ -+&cpu1 { -+ #cooling-cells = <2>; -+}; -+ -+&cpu2 { -+ #cooling-cells = <2>; -+}; -+ -+&cpu3 { -+ #cooling-cells = <2>; -+}; -+ -+ðmac { -+ status = "okay"; -+ pinctrl-0 = <ð_rmii_x_pins>; -+ pinctrl-names = "default"; -+ phy-mode = "rmii"; -+}; -+ -+/* Peripheral I2C bus (on motherboard) */ -+&i2c_AO { -+ status = "okay"; -+ pinctrl-0 = <&i2c_ao_sck_10_pins>, <&i2c_ao_sda_11_pins>; -+ pinctrl-names = "default"; -+}; -+ -+&pwm_ab { -+ status = "okay"; -+ pinctrl-0 = <&pwm_a_x20_pins>; -+ pinctrl-names = "default"; -+}; -+ -+/* WiFi module */ -+&sd_emmc_b { -+ status = "okay"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ pinctrl-0 = <&sdio_pins>; -+ pinctrl-1 = <&sdio_clk_gate_pins>; -+ pinctrl-names = "default", "clk-gate"; -+ -+ bus-width = <4>; -+ cap-sd-highspeed; -+ max-frequency = <50000000>; -+ disable-wp; -+ non-removable; -+ -+ mmc-pwrseq = <&sdio_pwrseq>; -+ -+ vmmc-supply = <&vddao_3v3>; -+ vqmmc-supply = <&vddio_boot>; -+}; -+ -+/* eMMC Storage */ -+&sd_emmc_c { -+ status = "okay"; -+ pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; -+ pinctrl-1 = <&emmc_clk_gate_pins>; -+ pinctrl-names = "default", "clk-gate"; -+ -+ bus-width = <8>; -+ cap-mmc-highspeed; -+ max-frequency = <200000000>; -+ non-removable; -+ disable-wp; -+ mmc-ddr-1_8v; -+ mmc-hs200-1_8v; -+ -+ mmc-pwrseq = <&emmc_pwrseq>; -+ -+ vmmc-supply = <&vcc_3v3>; -+ vqmmc-supply = <&vccq_1v8>; -+}; -+ -+&spicc1 { -+ status = "okay"; -+ pinctrl-0 = <&spi1_x_pins>, <&spi1_ss0_x_pins>; -+ pinctrl-names = "default"; -+}; -+ -+/* UART Console */ -+&uart_AO { -+ status = "okay"; -+ pinctrl-0 = <&uart_ao_a_pins>; -+ pinctrl-names = "default"; -+}; -+ -+/* UART Wireless module */ -+&uart_AO_B { -+ status = "okay"; -+ pinctrl-0 = <&uart_ao_b_z_pins>; -+ pinctrl-names = "default"; -+ reset-gpios = <&gpio GPIOZ_6 GPIO_ACTIVE_HIGH>; -+}; -+ -+&usb { -+ status = "okay"; -+ vbus-supply = <&usb_pwr>; -+}; --- -2.39.5 - -From ef5448afc8f03237dcc87741b241505769a8af42 Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -Date: Thu, 19 Sep 2024 17:47:20 -0400 -Subject: [PATCH] CONFIG_OF_UPSTREAM - -Compile upstream dt - -Signed-off-by: Patrick Yavitz ---- - configs/amper_gateway_am-gz80x_defconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configs/amper_gateway_am-gz80x_defconfig b/configs/amper_gateway_am-gz80x_defconfig -index 5991f66c29..d1d9749bdb 100644 ---- a/configs/amper_gateway_am-gz80x_defconfig -+++ b/configs/amper_gateway_am-gz80x_defconfig -@@ -1,3 +1,4 @@ -+CONFIG_OF_UPSTREAM=y - CONFIG_ARM=y - CONFIG_ARCH_MESON=y - CONFIG_TEXT_BASE=0x01000000 --- -2.39.5 - diff --git a/patch/u-boot/v2024.07/board_gateway-gz80x/002-HACK-mmc-meson-gx-limit-to-24MHz.patch b/patch/u-boot/v2024.07/board_gateway-gz80x/002-HACK-mmc-meson-gx-limit-to-24MHz.patch deleted file mode 100644 index 43cd435b143d..000000000000 --- a/patch/u-boot/v2024.07/board_gateway-gz80x/002-HACK-mmc-meson-gx-limit-to-24MHz.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 24ba56015b1ce831639f482d26aeec11ac523906 Mon Sep 17 00:00:00 2001 -From: Neil Armstrong -Date: Mon, 2 Sep 2019 15:42:04 +0200 -Subject: [PATCH 1/8] HACK: mmc: meson-gx: limit to 24MHz - -Signed-off-by: Neil Armstrong ---- - drivers/mmc/meson_gx_mmc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c -index fcf4f03d1e2..6ded4b619bf 100644 ---- a/drivers/mmc/meson_gx_mmc.c -+++ b/drivers/mmc/meson_gx_mmc.c -@@ -279,7 +279,7 @@ static int meson_mmc_probe(struct udevice *dev) - cfg->host_caps = MMC_MODE_8BIT | MMC_MODE_4BIT | - MMC_MODE_HS_52MHz | MMC_MODE_HS; - cfg->f_min = DIV_ROUND_UP(SD_EMMC_CLKSRC_24M, CLK_MAX_DIV); -- cfg->f_max = 100000000; /* 100 MHz */ -+ cfg->f_max = SD_EMMC_CLKSRC_24M; - cfg->b_max = 511; /* max 512 - 1 blocks */ - cfg->name = dev->name; - --- -2.43.2 - diff --git a/patch/u-boot/v2024.07/board_gateway-gz80x/003-mmc-meson-gx-change-clock-phase-value-on-axg-SoCs.patch b/patch/u-boot/v2024.07/board_gateway-gz80x/003-mmc-meson-gx-change-clock-phase-value-on-axg-SoCs.patch deleted file mode 100644 index 4e69e92372fb..000000000000 --- a/patch/u-boot/v2024.07/board_gateway-gz80x/003-mmc-meson-gx-change-clock-phase-value-on-axg-SoCs.patch +++ /dev/null @@ -1,54 +0,0 @@ -From d2c54d518b8b3f362a8395d2a81a2e7cef7a1ae0 Mon Sep 17 00:00:00 2001 -From: Vyacheslav Bocharov -Date: Thu, 2 Dec 2021 13:10:24 +0300 -Subject: [PATCH 2/8] mmc: meson-gx: change clock phase value on axg SoCs - -Amlogic AXG SoCs seems doesn't work over 50MHz. When phase sets to 270', -it's working fine over 50MHz on Amlogic AXG SoCs. -Based on 0dbb54eb3257c243c7968f967a6b183b1edb56c8 by Neil Armstrong - - -To distinguish which value is used adds an u-boot only axg compatible. ---- - drivers/mmc/meson_gx_mmc.c | 5 +++-- - drivers/mmc/meson_gx_mmc.h | 1 + - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c -index 6ded4b619bf..5e32c386caa 100644 ---- a/drivers/mmc/meson_gx_mmc.c -+++ b/drivers/mmc/meson_gx_mmc.c -@@ -68,7 +68,8 @@ static void meson_mmc_config_clock(struct mmc *mmc) - * Other SoCs use CLK_CO_PHASE_180 by default. - * It needs to find what is a proper value about each SoCs. - */ -- if (meson_gx_mmc_is_compatible(mmc->dev, MMC_COMPATIBLE_SM1)) -+ if (meson_gx_mmc_is_compatible(mmc->dev, MMC_COMPATIBLE_SM1) || -+ meson_gx_mmc_is_compatible(mmc->dev, MMC_COMPATIBLE_AXG)) - meson_mmc_clk |= CLK_CO_PHASE_270; - else - meson_mmc_clk |= CLK_CO_PHASE_180; -@@ -322,7 +323,7 @@ int meson_mmc_bind(struct udevice *dev) - - static const struct udevice_id meson_mmc_match[] = { - { .compatible = "amlogic,meson-gx-mmc", .data = MMC_COMPATIBLE_GX }, -- { .compatible = "amlogic,meson-axg-mmc", .data = MMC_COMPATIBLE_GX }, -+ { .compatible = "amlogic,meson-axg-mmc", .data = MMC_COMPATIBLE_AXG }, - { .compatible = "amlogic,meson-sm1-mmc", .data = MMC_COMPATIBLE_SM1 }, - { /* sentinel */ } - }; -diff --git a/drivers/mmc/meson_gx_mmc.h b/drivers/mmc/meson_gx_mmc.h -index 8974b78f559..53201ceddae 100644 ---- a/drivers/mmc/meson_gx_mmc.h -+++ b/drivers/mmc/meson_gx_mmc.h -@@ -12,6 +12,7 @@ - enum meson_gx_mmc_compatible { - MMC_COMPATIBLE_GX, - MMC_COMPATIBLE_SM1, -+ MMC_COMPATIBLE_AXG, - }; - - #define SDIO_PORT_A 0 --- -2.43.2 - diff --git a/patch/u-boot/v2024.07/board_gateway-gz80x/004-HACK-meson64-boot-target-usb.patch b/patch/u-boot/v2024.07/board_gateway-gz80x/004-HACK-meson64-boot-target-usb.patch deleted file mode 100644 index 4a2fd3525460..000000000000 --- a/patch/u-boot/v2024.07/board_gateway-gz80x/004-HACK-meson64-boot-target-usb.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4af333376c257d432f641926d74c762921186b78 Mon Sep 17 00:00:00 2001 -From: Patrick Yavitz -Date: Sat, 27 Jan 2024 22:57:03 -0500 -Subject: [PATCH] HACK: meson64 boot target usb - -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..ae1b79da0f 100644 ---- a/include/configs/meson64.h -+++ b/include/configs/meson64.h -@@ -99,10 +99,10 @@ - #define BOOT_TARGET_DEVICES(func) \ - func(ROMUSB, romusb, na) \ - func(USB_DFU, usbdfu, na) \ -+ BOOT_TARGET_DEVICES_USB(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) \ --- -2.39.2 - From 955de2627d97fdfb032f0afea48a78900a9487bd Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Fri, 7 Feb 2025 13:10:18 +0100 Subject: [PATCH 5/5] IMX8: switch u-boot sources to last known working commit due to upstream changes --- config/sources/families/imx8m.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/config/sources/families/imx8m.conf b/config/sources/families/imx8m.conf index 4804cf1666ec..953784068990 100644 --- a/config/sources/families/imx8m.conf +++ b/config/sources/families/imx8m.conf @@ -24,6 +24,7 @@ case $BOARD in ATFBRANCH="branch:TQM-lf_v2.10" BOOTSOURCE='https://github.com/tq-systems/u-boot-tqmaxx.git' # u-boot mainlining is hard and has low-priority BOOTBRANCH='branch:TQMa8-v2020.04_imx_5.4.70_2.3.0' + BOOTBRANCH='commit:673acba389cfe6c9e8639e8009fc9403492f5061' BOOTPATCHDIR="u-boot-tqma" # could be removed when distro boot patches are integrated ;; esac