diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee.patch b/patch/u-boot/legacy/u-boot-meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee-original-ish-by-Meko-from-EVB.patch similarity index 98% rename from patch/u-boot/legacy/u-boot-meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee.patch rename to patch/u-boot/legacy/u-boot-meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee-original-ish-by-Meko-from-EVB.patch index 0f3a162deb..809fcf205f 100644 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee.patch +++ b/patch/u-boot/legacy/u-boot-meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee-original-ish-by-Meko-from-EVB.patch @@ -1,7 +1,8 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sat, 1 Jul 2023 10:49:27 +0200 -Subject: rk3588_meko_defconfig - evb sans optee +Subject: rk3588_meko_defconfig - evb sans optee (original-ish by Meko from + EVB) --- configs/rk3588_meko_defconfig | 238 ++++++++++ diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/0004-rk3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot.patch b/patch/u-boot/legacy/u-boot-meko-rk3588/0004-rk3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot-and-working-RECOVERY-button.patch similarity index 89% rename from patch/u-boot/legacy/u-boot-meko-rk3588/0004-rk3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot.patch rename to patch/u-boot/legacy/u-boot-meko-rk3588/0004-rk3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot-and-working-RECOVERY-button.patch index b4c3a1e9ef..cf54024960 100644 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/0004-rk3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot.patch +++ b/patch/u-boot/legacy/u-boot-meko-rk3588/0004-rk3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot-and-working-RECOVERY-button.patch @@ -1,19 +1,22 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Thu, 5 Oct 2023 15:31:11 +0200 -Subject: rk3588_meko_r58x_defconfig and dts with pci3x4 nvme boot +Subject: rk3588_meko_r58x_defconfig and dts with pci3x4 nvme boot and working + RECOVERY button +- rk3588-blueberry-edge-v12.dts: add KEY_VOLUMEUP adc-keys for RECOVERY button to work again +- rk3588_meko_r58x_defconfig: equalize with rk3588_meko_defconfig --- - arch/arm/dts/rk3588-blueberry-edge-v12.dts | 142 ++++++ - configs/rk3588_meko_r58x_defconfig | 242 ++++++++++ - 2 files changed, 384 insertions(+) + arch/arm/dts/rk3588-blueberry-edge-v12.dts | 159 ++++++ + configs/rk3588_meko_r58x_defconfig | 248 ++++++++++ + 2 files changed, 407 insertions(+) diff --git a/arch/arm/dts/rk3588-blueberry-edge-v12.dts b/arch/arm/dts/rk3588-blueberry-edge-v12.dts new file mode 100644 -index 00000000000..27ea53a7f93 +index 00000000000..5dd31189e3d --- /dev/null +++ b/arch/arm/dts/rk3588-blueberry-edge-v12.dts -@@ -0,0 +1,142 @@ +@@ -0,0 +1,159 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2021 Rockchip Electronics Co., Ltd @@ -29,6 +32,23 @@ index 00000000000..27ea53a7f93 + model = "Mekotronics R58X-4G (RK3588 EDGE LP4x V1.2 BlueBerry Board)"; + compatible = "rockchip,rk3588-blueberry-edge-v12-linux", "rockchip,rk3588"; + ++ // This is needed for the RECOVERY button to actually trigger LOADER mode when pressed during boot ++ adc-keys { ++ compatible = "adc-keys"; ++ io-channels = <&saradc 1>; ++ io-channel-names = "buttons"; ++ keyup-threshold-microvolt = <1800000>; ++ u-boot,dm-pre-reloc; ++ status = "okay"; ++ ++ volumeup-key { ++ u-boot,dm-pre-reloc; ++ linux,code = ; ++ label = "volume up"; ++ press-threshold-microvolt = <1750>; ++ }; ++ }; ++ + vcc12v_dcin: vcc12v-dcin { + u-boot,dm-pre-reloc; + compatible = "regulator-fixed"; @@ -158,10 +178,10 @@ index 00000000000..27ea53a7f93 + diff --git a/configs/rk3588_meko_r58x_defconfig b/configs/rk3588_meko_r58x_defconfig new file mode 100644 -index 00000000000..21d768e5777 +index 00000000000..b03ffa9437c --- /dev/null +++ b/configs/rk3588_meko_r58x_defconfig -@@ -0,0 +1,242 @@ +@@ -0,0 +1,248 @@ +CONFIG_ARM=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SPL_GPIO_SUPPORT=y @@ -170,7 +190,6 @@ index 00000000000..21d768e5777 +CONFIG_SYS_MALLOC_F_LEN=0x80000 +CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh" +CONFIG_ROCKCHIP_RK3588=y -+CONFIG_ROCKCHIP_USB_BOOT=y +CONFIG_ROCKCHIP_FIT_IMAGE=y +CONFIG_ROCKCHIP_HWID_DTB=y +CONFIG_ROCKCHIP_VENDOR_PARTITION=y @@ -197,6 +216,10 @@ index 00000000000..21d768e5777 +# CONFIG_SPL_SYS_DCACHE_OFF is not set +CONFIG_BOOTDELAY=1 +CONFIG_SYS_CONSOLE_INFO_QUIET=y ++CONFIG_LOG=y ++CONFIG_SPL_LOG=y ++CONFIG_LOG_MAX_LEVEL=7 ++CONFIG_SPL_LOG_MAX_LEVEL=6 +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_ANDROID_BOOTLOADER=y +CONFIG_ANDROID_AVB=y @@ -210,8 +233,9 @@ index 00000000000..21d768e5777 +CONFIG_SPL_MMC_WRITE=y +CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_ATF=y ++CONFIG_SPL_AB=y +CONFIG_FASTBOOT_BUF_ADDR=0xc00800 -+CONFIG_FASTBOOT_BUF_SIZE=0x04000000 ++CONFIG_FASTBOOT_BUF_SIZE=0x07000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=0 +CONFIG_CMD_BOOTZ=y @@ -248,6 +272,7 @@ index 00000000000..21d768e5777 +CONFIG_SPL_DTB_MINIMUM=y +CONFIG_OF_LIVE=y +CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" ++CONFIG_OF_U_BOOT_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +# CONFIG_NET_TFTP_VARS is not set +CONFIG_REGMAP=y +CONFIG_SPL_REGMAP=y @@ -303,7 +328,6 @@ index 00000000000..21d768e5777 +CONFIG_SPI_FLASH_XMC=y +CONFIG_SPI_FLASH_XTX=y +CONFIG_SPI_FLASH_MTD=y -+CONFIG_PHY_REALTEK=y +CONFIG_DM_ETH=y +CONFIG_DM_ETH_PHY=y +CONFIG_DWC_ETH_QOS=y @@ -380,6 +404,8 @@ index 00000000000..21d768e5777 +CONFIG_DRM_ROCKCHIP=y +CONFIG_DRM_MAXIM_MAX96745=y +CONFIG_DRM_MAXIM_MAX96755F=y ++CONFIG_DRM_PANEL_ROHM_BU18RL82=y ++CONFIG_DRM_PANEL_MAXIM_MAX96752F=y +CONFIG_DRM_ROHM_BU18XL82=y +CONFIG_DRM_ROCKCHIP_DW_HDMI_QP=y +CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI2=y diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/0005-boot_rkimg-add-debugs-for-download-button-not-working.patch b/patch/u-boot/legacy/u-boot-meko-rk3588/0005-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch similarity index 70% rename from patch/u-boot/legacy/u-boot-meko-rk3588/0005-boot_rkimg-add-debugs-for-download-button-not-working.patch rename to patch/u-boot/legacy/u-boot-meko-rk3588/0005-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch index 7f23f8be3c..800e7f3259 100644 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/0005-boot_rkimg-add-debugs-for-download-button-not-working.patch +++ b/patch/u-boot/legacy/u-boot-meko-rk3588/0005-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch @@ -1,28 +1,31 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sun, 18 Feb 2024 14:33:37 +0100 -Subject: boot_rkimg: add debugs for download button not working +Subject: boot_rkimg: don't try rockchip_u2phy_vbus_detect when RECOVERY button + pressed +- boot_rkimg: add debugs for download button not working --- - arch/arm/mach-rockchip/boot_rkimg.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) + arch/arm/mach-rockchip/boot_rkimg.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-rockchip/boot_rkimg.c b/arch/arm/mach-rockchip/boot_rkimg.c -index 9e6c3556a9e..f1a683d4e8e 100644 +index 9e6c3556a9e..f79aed467bc 100644 --- a/arch/arm/mach-rockchip/boot_rkimg.c +++ b/arch/arm/mach-rockchip/boot_rkimg.c -@@ -322,6 +322,9 @@ void setup_download_mode(void) +@@ -322,14 +322,17 @@ void setup_download_mode(void) boot_devtype_init(); -+ printf("setup_download_mode checking if download %skey pressed... ", ++ printf("setup_download_mode checking if download %skey pressed...\n", + is_hotkey(HK_ROCKUSB_DNL) ? "is HOT YES" : "is NOT HOT"); + if (rockchip_dnl_key_pressed() || is_hotkey(HK_ROCKUSB_DNL)) { printf("download %skey pressed... ", is_hotkey(HK_ROCKUSB_DNL) ? "hot" : ""); -@@ -329,7 +332,7 @@ void setup_download_mode(void) - vbus = rockchip_u2phy_vbus_detect(); + #ifdef CONFIG_CMD_ROCKUSB +- vbus = rockchip_u2phy_vbus_detect(); ++ // vbus = rockchip_u2phy_vbus_detect(); // rpardini: don't do this, it fails with -19 #endif if (vbus > 0) { - printf("%sentering download mode...\n", diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/0006-rk3588_meko_r58x_defconfig-equalize-with-rk3588_meko_defconfig.patch b/patch/u-boot/legacy/u-boot-meko-rk3588/0006-rk3588_meko_r58x_defconfig-equalize-with-rk3588_meko_defconfig.patch deleted file mode 100644 index 36b37581ae..0000000000 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/0006-rk3588_meko_r58x_defconfig-equalize-with-rk3588_meko_defconfig.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ricardo Pardini -Date: Sun, 18 Feb 2024 14:37:21 +0100 -Subject: rk3588_meko_r58x_defconfig: equalize with rk3588_meko_defconfig - ---- - configs/rk3588_meko_r58x_defconfig | 12 +++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/configs/rk3588_meko_r58x_defconfig b/configs/rk3588_meko_r58x_defconfig -index 21d768e5777..b03ffa9437c 100644 ---- a/configs/rk3588_meko_r58x_defconfig -+++ b/configs/rk3588_meko_r58x_defconfig -@@ -6,7 +6,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y - CONFIG_SYS_MALLOC_F_LEN=0x80000 - CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh" - CONFIG_ROCKCHIP_RK3588=y --CONFIG_ROCKCHIP_USB_BOOT=y - CONFIG_ROCKCHIP_FIT_IMAGE=y - CONFIG_ROCKCHIP_HWID_DTB=y - CONFIG_ROCKCHIP_VENDOR_PARTITION=y -@@ -33,6 +32,10 @@ CONFIG_SPL_FIT_HW_CRYPTO=y - # CONFIG_SPL_SYS_DCACHE_OFF is not set - CONFIG_BOOTDELAY=1 - CONFIG_SYS_CONSOLE_INFO_QUIET=y -+CONFIG_LOG=y -+CONFIG_SPL_LOG=y -+CONFIG_LOG_MAX_LEVEL=7 -+CONFIG_SPL_LOG_MAX_LEVEL=6 - # CONFIG_DISPLAY_CPUINFO is not set - CONFIG_ANDROID_BOOTLOADER=y - CONFIG_ANDROID_AVB=y -@@ -46,8 +49,9 @@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x1 - CONFIG_SPL_MMC_WRITE=y - CONFIG_SPL_MTD_SUPPORT=y - CONFIG_SPL_ATF=y -+CONFIG_SPL_AB=y - CONFIG_FASTBOOT_BUF_ADDR=0xc00800 --CONFIG_FASTBOOT_BUF_SIZE=0x04000000 -+CONFIG_FASTBOOT_BUF_SIZE=0x07000000 - CONFIG_FASTBOOT_FLASH=y - CONFIG_FASTBOOT_FLASH_MMC_DEV=0 - CONFIG_CMD_BOOTZ=y -@@ -84,6 +88,7 @@ CONFIG_SPL_OF_CONTROL=y - CONFIG_SPL_DTB_MINIMUM=y - CONFIG_OF_LIVE=y - CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -+CONFIG_OF_U_BOOT_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" - # CONFIG_NET_TFTP_VARS is not set - CONFIG_REGMAP=y - CONFIG_SPL_REGMAP=y -@@ -139,7 +144,6 @@ CONFIG_SPI_FLASH_WINBOND=y - CONFIG_SPI_FLASH_XMC=y - CONFIG_SPI_FLASH_XTX=y - CONFIG_SPI_FLASH_MTD=y --CONFIG_PHY_REALTEK=y - CONFIG_DM_ETH=y - CONFIG_DM_ETH_PHY=y - CONFIG_DWC_ETH_QOS=y -@@ -216,6 +220,8 @@ CONFIG_DISPLAY=y - CONFIG_DRM_ROCKCHIP=y - CONFIG_DRM_MAXIM_MAX96745=y - CONFIG_DRM_MAXIM_MAX96755F=y -+CONFIG_DRM_PANEL_ROHM_BU18RL82=y -+CONFIG_DRM_PANEL_MAXIM_MAX96752F=y - CONFIG_DRM_ROHM_BU18XL82=y - CONFIG_DRM_ROCKCHIP_DW_HDMI_QP=y - CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI2=y --- -Armbian - diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/0007-rk3588-blueberry-edge-v12.dts-add-KEY_VOLUMEUP-adc-keys-for-RECOVERY-button-to-work-again.patch b/patch/u-boot/legacy/u-boot-meko-rk3588/0007-rk3588-blueberry-edge-v12.dts-add-KEY_VOLUMEUP-adc-keys-for-RECOVERY-button-to-work-again.patch deleted file mode 100644 index ed02224dbb..0000000000 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/0007-rk3588-blueberry-edge-v12.dts-add-KEY_VOLUMEUP-adc-keys-for-RECOVERY-button-to-work-again.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ricardo Pardini -Date: Sun, 18 Feb 2024 14:37:47 +0100 -Subject: rk3588-blueberry-edge-v12.dts: add KEY_VOLUMEUP adc-keys for RECOVERY - button to work again - ---- - arch/arm/dts/rk3588-blueberry-edge-v12.dts | 17 ++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/arch/arm/dts/rk3588-blueberry-edge-v12.dts b/arch/arm/dts/rk3588-blueberry-edge-v12.dts -index 27ea53a7f93..5dd31189e3d 100644 ---- a/arch/arm/dts/rk3588-blueberry-edge-v12.dts -+++ b/arch/arm/dts/rk3588-blueberry-edge-v12.dts -@@ -13,6 +13,23 @@ - model = "Mekotronics R58X-4G (RK3588 EDGE LP4x V1.2 BlueBerry Board)"; - compatible = "rockchip,rk3588-blueberry-edge-v12-linux", "rockchip,rk3588"; - -+ // This is needed for the RECOVERY button to actually trigger LOADER mode when pressed during boot -+ adc-keys { -+ compatible = "adc-keys"; -+ io-channels = <&saradc 1>; -+ io-channel-names = "buttons"; -+ keyup-threshold-microvolt = <1800000>; -+ u-boot,dm-pre-reloc; -+ status = "okay"; -+ -+ volumeup-key { -+ u-boot,dm-pre-reloc; -+ linux,code = ; -+ label = "volume up"; -+ press-threshold-microvolt = <1750>; -+ }; -+ }; -+ - vcc12v_dcin: vcc12v-dcin { - u-boot,dm-pre-reloc; - compatible = "regulator-fixed"; --- -Armbian - diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/0008-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch b/patch/u-boot/legacy/u-boot-meko-rk3588/0008-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch deleted file mode 100644 index 44f13dbdde..0000000000 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/0008-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ricardo Pardini -Date: Sun, 18 Feb 2024 15:01:10 +0100 -Subject: boot_rkimg: don't try rockchip_u2phy_vbus_detect when RECOVERY button - pressed - ---- - arch/arm/mach-rockchip/boot_rkimg.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/mach-rockchip/boot_rkimg.c b/arch/arm/mach-rockchip/boot_rkimg.c -index f1a683d4e8e..f79aed467bc 100644 ---- a/arch/arm/mach-rockchip/boot_rkimg.c -+++ b/arch/arm/mach-rockchip/boot_rkimg.c -@@ -322,14 +322,14 @@ void setup_download_mode(void) - - boot_devtype_init(); - -- printf("setup_download_mode checking if download %skey pressed... ", -+ printf("setup_download_mode checking if download %skey pressed...\n", - is_hotkey(HK_ROCKUSB_DNL) ? "is HOT YES" : "is NOT HOT"); - - if (rockchip_dnl_key_pressed() || is_hotkey(HK_ROCKUSB_DNL)) { - printf("download %skey pressed... ", - is_hotkey(HK_ROCKUSB_DNL) ? "hot" : ""); - #ifdef CONFIG_CMD_ROCKUSB -- vbus = rockchip_u2phy_vbus_detect(); -+ // vbus = rockchip_u2phy_vbus_detect(); // rpardini: don't do this, it fails with -19 - #endif - if (vbus > 0) { - printf("%sentering download mode vbus > 0...\n", --- -Armbian -