From 37279605acda3a2d1b64fb3d866f122c762ae490 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sun, 7 Jul 2024 23:07:36 +0200 Subject: [PATCH] mekotronics: u-boot: join rockchip-rk3588's default `u-boot-radxa-rk35xx` scheme - rebased 2 patches - moved null patches for dts & defconfigs to `dt` / `defconfig` dirs - rename defconfigs since we're at it; use board-specific only - defconfigs re-saved --- config/boards/mekotronics-r58-minipc.csc | 1 + config/boards/mekotronics-r58x-4g.csc | 4 +- config/boards/mekotronics-r58x-pro.csc | 4 +- config/boards/mekotronics-r58x.csc | 1 + .../mekotronics/mekotronics-rk3588.conf.sh | 5 +- .../mekotronics/mekotronics-rk3588.hooks.sh | 13 +- ...the-command-source-failed-to-execute.patch | 26 -- ...-optee-original-ish-by-Meko-from-EVB.patch | 257 ----------- ...vme-boot-and-working-RECOVERY-button.patch | 435 ------------------ .../1000-Fix-build-errors.patch | 39 -- .../board_mekotronics-r58-minipc | 1 + .../board_mekotronics-r58x | 1 + .../board_mekotronics-r58x-4g | 1 + ...then-ethaddr-add-a-lot-of-debugging.patch} | 24 +- ...detect-when-RECOVERY-button-pressed.patch} | 7 +- .../mekotronics_r58-rk3588_defconfig | 230 +++++++++ .../mekotronics_r58x-rk3588_defconfig | 240 ++++++++++ .../dt/rk3588-blueberry-edge-v12.dts | 159 +++++++ .../rk3566-Add-rk3566-to-soc-name.patch | 1 + 19 files changed, 658 insertions(+), 791 deletions(-) delete mode 100644 patch/u-boot/legacy/u-boot-meko-rk3588/0002-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch delete mode 100644 patch/u-boot/legacy/u-boot-meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee-original-ish-by-Meko-from-EVB.patch delete mode 100644 patch/u-boot/legacy/u-boot-meko-rk3588/0004-rk3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot-and-working-RECOVERY-button.patch delete mode 100644 patch/u-boot/legacy/u-boot-meko-rk3588/1000-Fix-build-errors.patch create mode 120000 patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58-minipc create mode 120000 patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58x create mode 120000 patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58x-4g rename patch/u-boot/legacy/{u-boot-meko-rk3588/0001-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging.patch => u-boot-radxa-rk35xx/board_mekotronics-r58x-pro/5000-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging.patch} (89%) rename patch/u-boot/legacy/{u-boot-meko-rk3588/0005-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch => u-boot-radxa-rk35xx/board_mekotronics-r58x-pro/5001-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch} (90%) create mode 100644 patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mekotronics_r58-rk3588_defconfig create mode 100644 patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mekotronics_r58x-rk3588_defconfig create mode 100644 patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-blueberry-edge-v12.dts diff --git a/config/boards/mekotronics-r58-minipc.csc b/config/boards/mekotronics-r58-minipc.csc index a5752a815..423987ca2 100644 --- a/config/boards/mekotronics-r58-minipc.csc +++ b/config/boards/mekotronics-r58-minipc.csc @@ -3,6 +3,7 @@ declare -g BOARD_NAME="Mekotronics R58 MiniPC" declare -g BOARDFAMILY="rockchip-rk3588" declare -g BOARD_MAINTAINER="monkaBlyat" declare -g KERNEL_TARGET="vendor" +declare -g BOOTCONFIG="mekotronics_r58-rk3588_defconfig" # generic ebv-ish defconfig declare -g BOOT_FDT_FILE="rockchip/rk3588-blueberry-minipc-linux.dtb" # Specific to this board declare -g UEFI_EDK2_BOARD_ID="r58-mini" # This _only_ used for uefi-edk2-rk3588 extension diff --git a/config/boards/mekotronics-r58x-4g.csc b/config/boards/mekotronics-r58x-4g.csc index ecdbab7ec..8f386760c 100644 --- a/config/boards/mekotronics-r58x-4g.csc +++ b/config/boards/mekotronics-r58x-4g.csc @@ -3,11 +3,9 @@ declare -g BOARD_NAME="Mekotronics R58X-4G" declare -g BOARDFAMILY="rockchip-rk3588" declare -g BOARD_MAINTAINER="monkaBlyat" declare -g KERNEL_TARGET="vendor" +declare -g BOOTCONFIG="mekotronics_r58x-rk3588_defconfig" # vendor u-boot; with NVMe and a DTS declare -g BOOT_FDT_FILE="rockchip/rk3588-blueberry-edge-v12-linux.dtb" # Specific to this board declare -g UEFI_EDK2_BOARD_ID="r58x" # This _only_ used for uefi-edk2-rk3588 extension # Source vendor-specific configuration source "${SRC}/config/sources/vendors/mekotronics/mekotronics-rk3588.conf.sh" - -# Board-specific override -declare -g BOOTCONFIG="rk3588_meko_r58x_defconfig" # specific, with nvme diff --git a/config/boards/mekotronics-r58x-pro.csc b/config/boards/mekotronics-r58x-pro.csc index 920206544..41a3fd810 100644 --- a/config/boards/mekotronics-r58x-pro.csc +++ b/config/boards/mekotronics-r58x-pro.csc @@ -3,11 +3,9 @@ declare -g BOARD_NAME="Mekotronics R58X-Pro" declare -g BOARDFAMILY="rockchip-rk3588" declare -g BOARD_MAINTAINER="" declare -g KERNEL_TARGET="vendor" +declare -g BOOTCONFIG="mekotronics_r58x-rk3588_defconfig" # vendor u-boot; with NVMe and a DTS declare -g BOOT_FDT_FILE="rockchip/rk3588-blueberry-edge-v12-maizhuo-linux.dtb" # Specific to this board declare -g UEFI_EDK2_BOARD_ID="r58x" # This _only_ used for uefi-edk2-rk3588 extension # Source vendor-specific configuration source "${SRC}/config/sources/vendors/mekotronics/mekotronics-rk3588.conf.sh" - -# Board-specific override -declare -g BOOTCONFIG="rk3588_meko_r58x_defconfig" # specific, with nvme diff --git a/config/boards/mekotronics-r58x.csc b/config/boards/mekotronics-r58x.csc index f3eeb6c96..dc62bd26e 100644 --- a/config/boards/mekotronics-r58x.csc +++ b/config/boards/mekotronics-r58x.csc @@ -3,6 +3,7 @@ declare -g BOARD_NAME="Mekotronics R58X" declare -g BOARDFAMILY="rockchip-rk3588" declare -g BOARD_MAINTAINER="monkaBlyat" declare -g KERNEL_TARGET="vendor" +declare -g BOOTCONFIG="mekotronics_r58x-rk3588_defconfig" # vendor u-boot; with NVMe and a DTS declare -g BOOT_FDT_FILE="rockchip/rk3588-blueberry-edge-v10-linux.dtb" # Specific to this board declare -g UEFI_EDK2_BOARD_ID="r58x" # This _only_ used for uefi-edk2-rk3588 extension diff --git a/config/sources/vendors/mekotronics/mekotronics-rk3588.conf.sh b/config/sources/vendors/mekotronics/mekotronics-rk3588.conf.sh index fa414f9b5..217516caf 100644 --- a/config/sources/vendors/mekotronics/mekotronics-rk3588.conf.sh +++ b/config/sources/vendors/mekotronics/mekotronics-rk3588.conf.sh @@ -16,9 +16,8 @@ declare -g BLUETOOTH_HCIATTACH_PARAMS="-s 115200 /dev/ttyS6 bcm43xx 1500000" # F enable_extension "bluetooth-hciattach" # Enable the bluetooth-hciattach extension # board-like config -declare -g BOOT_SCENARIO="spl-blobs" # so we don't depend on defconfig naming convention -declare -g BOOT_SOC="rk3588" # so we don't depend on defconfig naming convention -declare -g BOOTCONFIG="rk3588_meko_defconfig" # generic ebv plus distro dtb hacks +declare -g BOOT_SCENARIO="spl-blobs" # so we don't depend on defconfig naming convention +declare -g BOOT_SOC="rk3588" # so we don't depend on defconfig naming convention declare -g IMAGE_PARTITION_TABLE="gpt" # Uses default DDR_BLOB and BL31_BLOB from rockchip64_common. diff --git a/config/sources/vendors/mekotronics/mekotronics-rk3588.hooks.sh b/config/sources/vendors/mekotronics/mekotronics-rk3588.hooks.sh index cb87e78b2..e40b017d7 100644 --- a/config/sources/vendors/mekotronics/mekotronics-rk3588.hooks.sh +++ b/config/sources/vendors/mekotronics/mekotronics-rk3588.hooks.sh @@ -4,18 +4,9 @@ # This file is a part of the Armbian Build Framework https://github.com/armbian/build/ # -# Vendor u-boot, standard rockchip, plus patches. +# Vendor u-boot; use the default family (rockchip-rk3588) u-boot. See config/sources/families/rockchip-rk3588.conf function post_family_config__vendor_uboot_mekotronics() { - display_alert "$BOARD" "Configuring Mekotronics R58 ($BOARD) u-boot" "info" - - declare -g BOOTSOURCE='https://github.com/radxa/u-boot.git' - #declare -g BOOTBRANCH='branch:next-dev' # disabled, using specific commit below to avoid breakage in the future - declare -g BOOTBRANCH="commit:609a77ef6e99c56aacd4b8d8f9c3056378f9c761" # specific commit in next-dev branch; tested to work - - declare -g BOOTDIR="u-boot-meko-rk3588" # do not share u-boot directory - declare -g BOOTPATCHDIR="legacy/u-boot-meko-rk3588" # Few patches in there; MAC address & defconfig - - declare -g OVERLAY_PREFIX='rockchip-rk3588' + display_alert "$BOARD" "Configuring $BOARD vendor u-boot" "info" declare -g BOOTDELAY=1 # build injects this into u-boot config. we can then get into UMS mode and avoid the whole rockusb/rkdeveloptool thing } diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/0002-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch b/patch/u-boot/legacy/u-boot-meko-rk3588/0002-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch deleted file mode 100644 index c3c313e29..000000000 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/0002-cmd-source-fix-the-error-that-the-command-source-failed-to-execute.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Stephen -Date: Mon, 8 Nov 2021 14:30:00 +0800 -Subject: cmd: source: fix the error that the command source failed to execute - -Signed-off-by: Stephen ---- - cmd/source.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmd/source.c b/cmd/source.c -index 111111111111..222222222222 100644 ---- a/cmd/source.c -+++ b/cmd/source.c -@@ -87,7 +87,7 @@ source (ulong addr, const char *fit_uname) - * past the zero-terminated sequence of image lengths to get - * to the actual image data - */ -- while (*data++ != IMAGE_PARAM_INVAL); -+ while (*data++); - break; - #endif - #if defined(CONFIG_FIT) --- -Armbian - diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee-original-ish-by-Meko-from-EVB.patch b/patch/u-boot/legacy/u-boot-meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee-original-ish-by-Meko-from-EVB.patch deleted file mode 100644 index c389f4d5a..000000000 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/0003-rk3588_meko_defconfig-evb-sans-optee-original-ish-by-Meko-from-EVB.patch +++ /dev/null @@ -1,257 +0,0 @@ -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 (original-ish by Meko from - EVB) - ---- - configs/rk3588_meko_defconfig | 238 ++++++++++ - 1 file changed, 238 insertions(+) - -diff --git a/configs/rk3588_meko_defconfig b/configs/rk3588_meko_defconfig -new file mode 100644 -index 000000000000..111111111111 ---- /dev/null -+++ b/configs/rk3588_meko_defconfig -@@ -0,0 +1,238 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_ROCKCHIP=y -+CONFIG_SPL_GPIO_SUPPORT=y -+CONFIG_SPL_LIBCOMMON_SUPPORT=y -+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_FIT_IMAGE=y -+CONFIG_ROCKCHIP_HWID_DTB=y -+CONFIG_ROCKCHIP_VENDOR_PARTITION=y -+CONFIG_USING_KERNEL_DTB_V2=y -+CONFIG_ROCKCHIP_FIT_IMAGE_PACK=y -+CONFIG_ROCKCHIP_NEW_IDB=y -+CONFIG_PSTORE=y -+CONFIG_SPL_SERIAL_SUPPORT=y -+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y -+CONFIG_TARGET_EVB_RK3588=y -+CONFIG_SPL_LIBDISK_SUPPORT=y -+CONFIG_SPL_SPI_FLASH_SUPPORT=y -+CONFIG_SPL_SPI_SUPPORT=y -+CONFIG_DEFAULT_DEVICE_TREE="rk3588-evb" -+CONFIG_DEBUG_UART=y -+CONFIG_LOCALVERSION="-armbian" -+# CONFIG_LOCALVERSION_AUTO is not set -+CONFIG_FIT=y -+CONFIG_FIT_IMAGE_POST_PROCESS=y -+CONFIG_FIT_HW_CRYPTO=y -+CONFIG_SPL_LOAD_FIT=y -+CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y -+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 -+CONFIG_ANDROID_BOOT_IMAGE_HASH=y -+CONFIG_SPL_BOARD_INIT=y -+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set -+CONFIG_SPL_SEPARATE_BSS=y -+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y -+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=0x07000000 -+CONFIG_FASTBOOT_FLASH=y -+CONFIG_FASTBOOT_FLASH_MMC_DEV=0 -+CONFIG_CMD_BOOTZ=y -+CONFIG_CMD_DTIMG=y -+# CONFIG_CMD_ELF is not set -+# CONFIG_CMD_IMI is not set -+# CONFIG_CMD_IMLS is not set -+# CONFIG_CMD_XIMG is not set -+# CONFIG_CMD_LZMADEC is not set -+# CONFIG_CMD_UNZIP is not set -+# CONFIG_CMD_FLASH is not set -+# CONFIG_CMD_FPGA is not set -+CONFIG_CMD_GPT=y -+# CONFIG_CMD_LOADB is not set -+# CONFIG_CMD_LOADS is not set -+CONFIG_CMD_BOOT_ANDROID=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_SF=y -+CONFIG_CMD_SPI=y -+CONFIG_CMD_USB=y -+CONFIG_CMD_USB_MASS_STORAGE=y -+# CONFIG_CMD_ITEST is not set -+# CONFIG_CMD_SETEXPR is not set -+CONFIG_CMD_TFTPPUT=y -+CONFIG_CMD_TFTP_BOOTM=y -+CONFIG_CMD_TFTP_FLASH=y -+# CONFIG_CMD_MISC is not set -+CONFIG_CMD_MTD_BLK=y -+# CONFIG_SPL_DOS_PARTITION is not set -+# CONFIG_ISO_PARTITION is not set -+CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64 -+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 -+CONFIG_SYSCON=y -+CONFIG_SPL_SYSCON=y -+# CONFIG_SARADC_ROCKCHIP is not set -+CONFIG_SARADC_ROCKCHIP_V2=y -+CONFIG_CLK=y -+CONFIG_SPL_CLK=y -+CONFIG_CLK_SCMI=y -+CONFIG_SPL_CLK_SCMI=y -+CONFIG_DM_CRYPTO=y -+CONFIG_SPL_DM_CRYPTO=y -+CONFIG_ROCKCHIP_CRYPTO_V2=y -+CONFIG_SPL_ROCKCHIP_CRYPTO_V2=y -+CONFIG_DM_RNG=y -+CONFIG_RNG_ROCKCHIP=y -+CONFIG_SCMI_FIRMWARE=y -+CONFIG_SPL_SCMI_FIRMWARE=y -+CONFIG_GPIO_HOG=y -+CONFIG_ROCKCHIP_GPIO=y -+CONFIG_ROCKCHIP_GPIO_V2=y -+CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_I2C_MUX=y -+CONFIG_DM_KEY=y -+CONFIG_RK8XX_PWRKEY=y -+CONFIG_ADC_KEY=y -+CONFIG_MISC=y -+CONFIG_SPL_MISC=y -+CONFIG_MISC_DECOMPRESS=y -+CONFIG_SPL_MISC_DECOMPRESS=y -+CONFIG_ROCKCHIP_OTP=y -+CONFIG_ROCKCHIP_HW_DECOMPRESS=y -+CONFIG_SPL_ROCKCHIP_HW_DECOMPRESS=y -+CONFIG_SPL_ROCKCHIP_SECURE_OTP=y -+CONFIG_MMC_DW=y -+CONFIG_MMC_DW_ROCKCHIP=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_SDMA=y -+CONFIG_MMC_SDHCI_ROCKCHIP=y -+CONFIG_MTD=y -+CONFIG_MTD_BLK=y -+CONFIG_MTD_DEVICE=y -+CONFIG_NAND=y -+CONFIG_MTD_SPI_NAND=y -+CONFIG_SPI_FLASH=y -+CONFIG_SF_DEFAULT_SPEED=80000000 -+CONFIG_SPI_FLASH_EON=y -+CONFIG_SPI_FLASH_GIGADEVICE=y -+CONFIG_SPI_FLASH_MACRONIX=y -+CONFIG_SPI_FLASH_SST=y -+CONFIG_SPI_FLASH_WINBOND=y -+CONFIG_SPI_FLASH_XMC=y -+CONFIG_SPI_FLASH_XTX=y -+CONFIG_SPI_FLASH_MTD=y -+CONFIG_DM_ETH=y -+CONFIG_DM_ETH_PHY=y -+CONFIG_DWC_ETH_QOS=y -+CONFIG_GMAC_ROCKCHIP=y -+CONFIG_PHY_ROCKCHIP_INNO_USB2=y -+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y -+CONFIG_PHY_ROCKCHIP_USBDP=y -+CONFIG_PINCTRL=y -+CONFIG_SPL_PINCTRL=y -+CONFIG_DM_FUEL_GAUGE=y -+CONFIG_POWER_FG_CW201X=y -+CONFIG_POWER_FG_CW221X=y -+CONFIG_DM_PMIC=y -+CONFIG_PMIC_SPI_RK8XX=y -+CONFIG_DM_POWER_DELIVERY=y -+CONFIG_TYPEC_TCPM=y -+CONFIG_TYPEC_TCPCI=y -+CONFIG_TYPEC_HUSB311=y -+CONFIG_TYPEC_FUSB302=y -+CONFIG_REGULATOR_PWM=y -+CONFIG_DM_REGULATOR_FIXED=y -+CONFIG_DM_REGULATOR_GPIO=y -+CONFIG_REGULATOR_RK860X=y -+CONFIG_REGULATOR_RK806=y -+CONFIG_CHARGER_BQ25700=y -+CONFIG_CHARGER_BQ25890=y -+CONFIG_CHARGER_SC8551=y -+CONFIG_CHARGER_SGM41542=y -+CONFIG_DM_CHARGE_DISPLAY=y -+CONFIG_CHARGE_ANIMATION=y -+CONFIG_PWM_ROCKCHIP=y -+CONFIG_RAM=y -+CONFIG_SPL_RAM=y -+CONFIG_TPL_RAM=y -+CONFIG_DM_RAMDISK=y -+CONFIG_RAMDISK_RO=y -+CONFIG_DM_RESET=y -+CONFIG_SPL_DM_RESET=y -+CONFIG_SPL_RESET_ROCKCHIP=y -+CONFIG_BAUDRATE=1500000 -+CONFIG_DEBUG_UART_BASE=0xFEB50000 -+CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_DEBUG_UART_SHIFT=2 -+CONFIG_ROCKCHIP_SPI=y -+CONFIG_ROCKCHIP_SFC=y -+CONFIG_SYSRESET=y -+CONFIG_USB=y -+CONFIG_USB_XHCI_HCD=y -+CONFIG_USB_XHCI_DWC3=y -+CONFIG_USB_EHCI_HCD=y -+CONFIG_USB_EHCI_GENERIC=y -+CONFIG_USB_OHCI_HCD=y -+CONFIG_USB_OHCI_GENERIC=y -+CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GADGET=y -+CONFIG_USB_DWC3_GENERIC=y -+CONFIG_USB_STORAGE=y -+CONFIG_USB_GADGET=y -+CONFIG_USB_GADGET_MANUFACTURER="Rockchip" -+CONFIG_USB_GADGET_VENDOR_NUM=0x2207 -+CONFIG_USB_GADGET_PRODUCT_NUM=0x350a -+CONFIG_USB_GADGET_DOWNLOAD=y -+CONFIG_DM_VIDEO=y -+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 -+CONFIG_DRM_ROCKCHIP_DW_DP=y -+CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y -+CONFIG_DRM_ROCKCHIP_SAMSUNG_MIPI_DCPHY=y -+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX_HDMI=y -+CONFIG_USE_TINY_PRINTF=y -+CONFIG_LIB_RAND=y -+CONFIG_SPL_TINY_MEMSET=y -+CONFIG_RSA=y -+CONFIG_SPL_RSA=y -+CONFIG_RSA_N_SIZE=0x200 -+CONFIG_RSA_E_SIZE=0x10 -+CONFIG_RSA_C_SIZE=0x20 -+CONFIG_XBC=y -+CONFIG_LZ4=y -+CONFIG_LZMA=y -+# CONFIG_EFI_LOADER is not set -+CONFIG_AVB_LIBAVB=y -+CONFIG_AVB_LIBAVB_AB=y -+CONFIG_AVB_LIBAVB_ATX=y -+CONFIG_AVB_LIBAVB_USER=y -+CONFIG_RK_AVB_LIBAVB_USER=y --- -Armbian - diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/0004-rk3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot-and-working-RECOVERY-button.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 deleted file mode 100644 index 430e31e2e..000000000 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/0004-rk3588_meko_r58x_defconfig-and-dts-with-pci3x4-nvme-boot-and-working-RECOVERY-button.patch +++ /dev/null @@ -1,435 +0,0 @@ -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 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 | 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 000000000000..111111111111 ---- /dev/null -+++ b/arch/arm/dts/rk3588-blueberry-edge-v12.dts -@@ -0,0 +1,159 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2021 Rockchip Electronics Co., Ltd -+ * -+ */ -+ -+/dts-v1/; -+#include "rk3588.dtsi" -+#include "rk3588-u-boot.dtsi" -+#include -+ -+/ { -+ 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"; -+ regulator-name = "vcc12v_dcin"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <12000000>; -+ regulator-max-microvolt = <12000000>; -+ }; -+ -+ vcc5v0_sys: vcc5v0-sys { -+ u-boot,dm-pre-reloc; -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc5v0_sys"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ vin-supply = <&vcc12v_dcin>; -+ }; -+ -+ vcc5v0_host: vcc5v0-host-regulator { -+ u-boot,dm-pre-reloc; -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc5v0_host"; -+ regulator-boot-on; -+ regulator-always-on; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ enable-active-high; -+ gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&vcc5v0_host_en>; -+ vin-supply = <&vcc5v0_sys>; -+ }; -+ -+ vcc3v3_pcie30: vcc3v3-pcie30 { -+ u-boot,dm-pre-reloc; -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc3v3_pcie30"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ enable-active-high; -+ gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>; //hugsun gpio1_c4 -+ regulator-boot-on; -+ regulator-always-on; -+ startup-delay-us = <10000>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&vcc3v3_pcie30_en>; -+ vin-supply = <&vcc12v_dcin>; -+ }; -+ -+ /* work led is actually blue "PWR" LED and the powerbutton backlight LED */ -+ led_work: led_work { -+ u-boot,dm-pre-reloc; -+ compatible = "regulator-fixed"; -+ regulator-name = "led_work"; -+ enable-active-high; -+ gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; // Turn on work led -+ regulator-boot-on; -+ regulator-always-on; -+ vin-supply = <&vcc5v0_sys>; -+ }; -+}; -+ -+&pcie3x4 { -+ u-boot,dm-pre-reloc; -+ vpcie3v3-supply = <&vcc3v3_pcie30>; -+ reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; -+ status = "okay"; -+}; -+ -+&pcie30phy { -+ u-boot,dm-pre-reloc; -+ status = "okay"; -+}; -+ -+&combphy0_ps { -+ u-boot,dm-pre-reloc; -+ status = "okay"; -+}; -+ -+&combphy1_ps { -+ u-boot,dm-pre-reloc; -+ status = "okay"; -+}; -+ -+&combphy2_psu { -+ u-boot,dm-pre-reloc; -+ status = "okay"; -+}; -+ -+/* related to usbhost_dwc3_0 */ -+&usbhost3_0 { -+ u-boot,dm-pre-reloc; -+ status = "okay"; -+ maximum-speed = "super-speed"; -+}; -+ -+/* related to usbhost3_0 */ -+&usbhost_dwc3_0 { -+ u-boot,dm-pre-reloc; -+ dr_mode = "host"; -+ status = "okay"; -+ maximum-speed = "super-speed"; -+}; -+ -+&pinctrl { -+ usb { -+ u-boot,dm-pre-reloc; -+ vcc5v0_host_en: vcc5v0-host-en { -+ u-boot,dm-pre-reloc; -+ rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ -+ }; -+ -+ pcie { -+ u-boot,dm-spl; -+ vcc3v3_pcie30_en: vcc3v3-pcie30-en { -+ u-boot,dm-spl; -+ rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; -+ -+ }; -+}; -+ -diff --git a/configs/rk3588_meko_r58x_defconfig b/configs/rk3588_meko_r58x_defconfig -new file mode 100644 -index 000000000000..111111111111 ---- /dev/null -+++ b/configs/rk3588_meko_r58x_defconfig -@@ -0,0 +1,248 @@ -+CONFIG_ARM=y -+CONFIG_ARCH_ROCKCHIP=y -+CONFIG_SPL_GPIO_SUPPORT=y -+CONFIG_SPL_LIBCOMMON_SUPPORT=y -+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_FIT_IMAGE=y -+CONFIG_ROCKCHIP_HWID_DTB=y -+CONFIG_ROCKCHIP_VENDOR_PARTITION=y -+CONFIG_USING_KERNEL_DTB_V2=y -+CONFIG_ROCKCHIP_FIT_IMAGE_PACK=y -+CONFIG_ROCKCHIP_NEW_IDB=y -+CONFIG_PSTORE=y -+CONFIG_SPL_SERIAL_SUPPORT=y -+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y -+CONFIG_TARGET_EVB_RK3588=y -+CONFIG_SPL_LIBDISK_SUPPORT=y -+CONFIG_SPL_SPI_FLASH_SUPPORT=y -+CONFIG_SPL_SPI_SUPPORT=y -+CONFIG_DEFAULT_DEVICE_TREE="rk3588-blueberry-edge-v12" -+CONFIG_DEBUG_UART=y -+CONFIG_LOCALVERSION="-armbian" -+# CONFIG_LOCALVERSION_AUTO is not set -+CONFIG_FIT=y -+CONFIG_FIT_IMAGE_POST_PROCESS=y -+CONFIG_FIT_HW_CRYPTO=y -+CONFIG_SPL_LOAD_FIT=y -+CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y -+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 -+CONFIG_ANDROID_BOOT_IMAGE_HASH=y -+CONFIG_SPL_BOARD_INIT=y -+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set -+CONFIG_SPL_SEPARATE_BSS=y -+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y -+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=0x07000000 -+CONFIG_FASTBOOT_FLASH=y -+CONFIG_FASTBOOT_FLASH_MMC_DEV=0 -+CONFIG_CMD_BOOTZ=y -+CONFIG_CMD_DTIMG=y -+# CONFIG_CMD_ELF is not set -+# CONFIG_CMD_IMI is not set -+# CONFIG_CMD_IMLS is not set -+# CONFIG_CMD_XIMG is not set -+# CONFIG_CMD_LZMADEC is not set -+# CONFIG_CMD_UNZIP is not set -+# CONFIG_CMD_FLASH is not set -+# CONFIG_CMD_FPGA is not set -+CONFIG_CMD_GPT=y -+# CONFIG_CMD_LOADB is not set -+# CONFIG_CMD_LOADS is not set -+CONFIG_CMD_BOOT_ANDROID=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_PCI=y -+CONFIG_CMD_SF=y -+CONFIG_CMD_SPI=y -+CONFIG_CMD_USB=y -+CONFIG_CMD_USB_MASS_STORAGE=y -+# CONFIG_CMD_ITEST is not set -+# CONFIG_CMD_SETEXPR is not set -+CONFIG_CMD_TFTPPUT=y -+CONFIG_CMD_TFTP_BOOTM=y -+CONFIG_CMD_TFTP_FLASH=y -+# CONFIG_CMD_MISC is not set -+CONFIG_CMD_MTD_BLK=y -+# CONFIG_SPL_DOS_PARTITION is not set -+# CONFIG_ISO_PARTITION is not set -+CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64 -+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 -+CONFIG_SYSCON=y -+CONFIG_SPL_SYSCON=y -+# CONFIG_SARADC_ROCKCHIP is not set -+CONFIG_SARADC_ROCKCHIP_V2=y -+CONFIG_CLK=y -+CONFIG_SPL_CLK=y -+CONFIG_CLK_SCMI=y -+CONFIG_SPL_CLK_SCMI=y -+CONFIG_DM_CRYPTO=y -+CONFIG_SPL_DM_CRYPTO=y -+CONFIG_ROCKCHIP_CRYPTO_V2=y -+CONFIG_SPL_ROCKCHIP_CRYPTO_V2=y -+CONFIG_DM_RNG=y -+CONFIG_RNG_ROCKCHIP=y -+CONFIG_SCMI_FIRMWARE=y -+CONFIG_SPL_SCMI_FIRMWARE=y -+CONFIG_GPIO_HOG=y -+CONFIG_ROCKCHIP_GPIO=y -+CONFIG_ROCKCHIP_GPIO_V2=y -+CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_I2C_MUX=y -+CONFIG_DM_KEY=y -+CONFIG_RK8XX_PWRKEY=y -+CONFIG_ADC_KEY=y -+CONFIG_MISC=y -+CONFIG_SPL_MISC=y -+CONFIG_MISC_DECOMPRESS=y -+CONFIG_SPL_MISC_DECOMPRESS=y -+CONFIG_ROCKCHIP_OTP=y -+CONFIG_ROCKCHIP_HW_DECOMPRESS=y -+CONFIG_SPL_ROCKCHIP_HW_DECOMPRESS=y -+CONFIG_SPL_ROCKCHIP_SECURE_OTP=y -+CONFIG_MMC_DW=y -+CONFIG_MMC_DW_ROCKCHIP=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_SDMA=y -+CONFIG_MMC_SDHCI_ROCKCHIP=y -+CONFIG_MTD=y -+CONFIG_MTD_BLK=y -+CONFIG_MTD_DEVICE=y -+CONFIG_NAND=y -+CONFIG_MTD_SPI_NAND=y -+CONFIG_SPI_FLASH=y -+CONFIG_SF_DEFAULT_SPEED=80000000 -+CONFIG_SPI_FLASH_EON=y -+CONFIG_SPI_FLASH_GIGADEVICE=y -+CONFIG_SPI_FLASH_MACRONIX=y -+CONFIG_SPI_FLASH_SST=y -+CONFIG_SPI_FLASH_WINBOND=y -+CONFIG_SPI_FLASH_XMC=y -+CONFIG_SPI_FLASH_XTX=y -+CONFIG_SPI_FLASH_MTD=y -+CONFIG_DM_ETH=y -+CONFIG_DM_ETH_PHY=y -+CONFIG_DWC_ETH_QOS=y -+CONFIG_RGMII=y -+CONFIG_GMAC_ROCKCHIP=y -+CONFIG_NVME=y -+CONFIG_PCI=y -+CONFIG_DM_PCI=y -+CONFIG_DM_PCI_COMPAT=y -+CONFIG_PCIE_DW_ROCKCHIP=y -+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y -+CONFIG_PHY_ROCKCHIP_NANENG_USB2=y -+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y -+CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y -+CONFIG_PHY_ROCKCHIP_TYPEC=y -+CONFIG_PINCTRL=y -+CONFIG_SPL_PINCTRL=y -+CONFIG_DM_FUEL_GAUGE=y -+CONFIG_POWER_FG_CW201X=y -+CONFIG_POWER_FG_CW221X=y -+CONFIG_DM_PMIC=y -+CONFIG_PMIC_SPI_RK8XX=y -+CONFIG_DM_POWER_DELIVERY=y -+CONFIG_TYPEC_TCPM=y -+CONFIG_TYPEC_TCPCI=y -+CONFIG_TYPEC_HUSB311=y -+CONFIG_TYPEC_FUSB302=y -+CONFIG_REGULATOR_PWM=y -+CONFIG_DM_REGULATOR_FIXED=y -+CONFIG_DM_REGULATOR_GPIO=y -+CONFIG_REGULATOR_RK860X=y -+CONFIG_REGULATOR_RK806=y -+CONFIG_CHARGER_BQ25700=y -+CONFIG_CHARGER_BQ25890=y -+CONFIG_CHARGER_SC8551=y -+CONFIG_CHARGER_SGM41542=y -+CONFIG_DM_CHARGE_DISPLAY=y -+CONFIG_CHARGE_ANIMATION=y -+CONFIG_PWM_ROCKCHIP=y -+CONFIG_RAM=y -+CONFIG_SPL_RAM=y -+CONFIG_TPL_RAM=y -+CONFIG_DM_RAMDISK=y -+CONFIG_RAMDISK_RO=y -+CONFIG_DM_RESET=y -+CONFIG_SPL_DM_RESET=y -+CONFIG_SPL_RESET_ROCKCHIP=y -+CONFIG_BAUDRATE=1500000 -+CONFIG_DEBUG_UART_BASE=0xFEB50000 -+CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_DEBUG_UART_SHIFT=2 -+CONFIG_ROCKCHIP_SPI=y -+CONFIG_ROCKCHIP_SFC=y -+CONFIG_SYSRESET=y -+CONFIG_USB=y -+CONFIG_USB_XHCI_HCD=y -+CONFIG_USB_XHCI_DWC3=y -+CONFIG_USB_XHCI_PCI=y -+CONFIG_USB_EHCI_HCD=y -+CONFIG_USB_EHCI_GENERIC=y -+CONFIG_USB_OHCI_HCD=y -+CONFIG_USB_OHCI_GENERIC=y -+CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GADGET=y -+CONFIG_USB_DWC3_GENERIC=y -+CONFIG_USB_STORAGE=y -+CONFIG_USB_GADGET=y -+CONFIG_USB_GADGET_MANUFACTURER="Rockchip" -+CONFIG_USB_GADGET_VENDOR_NUM=0x2207 -+CONFIG_USB_GADGET_PRODUCT_NUM=0x350a -+CONFIG_USB_GADGET_DOWNLOAD=y -+CONFIG_DM_VIDEO=y -+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 -+CONFIG_DRM_ROCKCHIP_DW_DP=y -+CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y -+CONFIG_DRM_ROCKCHIP_SAMSUNG_MIPI_DCPHY=y -+CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX_HDMI=y -+CONFIG_USE_TINY_PRINTF=y -+CONFIG_LIB_RAND=y -+CONFIG_SPL_TINY_MEMSET=y -+CONFIG_RSA=y -+CONFIG_SPL_RSA=y -+CONFIG_RSA_N_SIZE=0x200 -+CONFIG_RSA_E_SIZE=0x10 -+CONFIG_RSA_C_SIZE=0x20 -+CONFIG_XBC=y -+CONFIG_LZ4=y -+CONFIG_LZMA=y -+# CONFIG_EFI_LOADER is not set -+CONFIG_AVB_LIBAVB=y -+CONFIG_AVB_LIBAVB_AB=y -+CONFIG_AVB_LIBAVB_ATX=y -+CONFIG_AVB_LIBAVB_USER=y -+CONFIG_RK_AVB_LIBAVB_USER=y --- -Armbian - diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/1000-Fix-build-errors.patch b/patch/u-boot/legacy/u-boot-meko-rk3588/1000-Fix-build-errors.patch deleted file mode 100644 index cfa57ba0e..000000000 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/1000-Fix-build-errors.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Muhammed Efe Cetin -Date: Tue, 2 Jul 2024 18:14:23 +0300 -Subject: Fix build errors - ---- - common/edid.c | 2 +- - include/command.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/common/edid.c b/common/edid.c -index 111111111111..222222222222 100644 ---- a/common/edid.c -+++ b/common/edid.c -@@ -3579,7 +3579,7 @@ int add_cea_modes(struct hdmi_edid_data *data, struct edid *edid) - { - const u8 *cea = drm_find_cea_extension(edid); - const u8 *db, *hdmi = NULL, *video = NULL; -- u8 dbl, hdmi_len, video_len = 0; -+ u8 dbl, hdmi_len = 0, video_len = 0; - int modes = 0; - - if (cea && cea_revision(cea) >= 3) { -diff --git a/include/command.h b/include/command.h -index 111111111111..222222222222 100644 ---- a/include/command.h -+++ b/include/command.h -@@ -139,7 +139,7 @@ enum command_ret_t { - * number of ticks the command took to complete. - * @return 0 if the command succeeded, 1 if it failed - */ --int cmd_process(int flag, int argc, char * const argv[], -+enum command_ret_t cmd_process(int flag, int argc, char * const argv[], - int *repeatable, unsigned long *ticks); - - void fixup_cmdtable(cmd_tbl_t *cmdtp, int size); --- -Armbian - diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58-minipc b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58-minipc new file mode 120000 index 000000000..9b6ca990e --- /dev/null +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58-minipc @@ -0,0 +1 @@ +board_mekotronics-r58x-pro \ No newline at end of file diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58x b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58x new file mode 120000 index 000000000..9b6ca990e --- /dev/null +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58x @@ -0,0 +1 @@ +board_mekotronics-r58x-pro \ No newline at end of file diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58x-4g b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58x-4g new file mode 120000 index 000000000..9b6ca990e --- /dev/null +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58x-4g @@ -0,0 +1 @@ +board_mekotronics-r58x-pro \ No newline at end of file diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/0001-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging.patch b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58x-pro/5000-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging.patch similarity index 89% rename from patch/u-boot/legacy/u-boot-meko-rk3588/0001-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging.patch rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58x-pro/5000-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging.patch index 7511ddf70..ac3788569 100644 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/0001-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging.patch +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58x-pro/5000-use-serial-as-base-for-MAC-address-find-serial-first-then-ethaddr-add-a-lot-of-debugging.patch @@ -12,7 +12,7 @@ diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index 111111111111..222222222222 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c -@@ -109,15 +109,55 @@ static int rockchip_set_ethaddr(void) +@@ -113,15 +113,55 @@ static int rockchip_set_ethaddr(void) char buf[ARP_HLEN_ASCII + 1], mac[16]; u8 ethaddr[ARP_HLEN * MAX_ETHERNET] = {0}; int i, ret = -EINVAL; @@ -69,7 +69,7 @@ index 111111111111..222222222222 100644 } else { if (i > 0) { memcpy(ðaddr[i * ARP_HLEN], -@@ -128,6 +168,7 @@ static int rockchip_set_ethaddr(void) +@@ -132,6 +172,7 @@ static int rockchip_set_ethaddr(void) } } @@ -77,7 +77,7 @@ index 111111111111..222222222222 100644 need_write = true; } -@@ -137,14 +178,18 @@ static int rockchip_set_ethaddr(void) +@@ -141,14 +182,18 @@ static int rockchip_set_ethaddr(void) memcpy(mac, "ethaddr", sizeof("ethaddr")); else sprintf(mac, "eth%daddr", i); @@ -96,7 +96,7 @@ index 111111111111..222222222222 100644 if (ret < 0) printf("%s: vendor_storage_write failed %d\n", __func__, ret); -@@ -162,6 +207,7 @@ static int rockchip_set_serialno(void) +@@ -166,6 +211,7 @@ static int rockchip_set_serialno(void) char serialno_str[VENDOR_SN_MAX]; int ret = 0, i; u64 serialno; @@ -104,7 +104,7 @@ index 111111111111..222222222222 100644 /* Read serial number from vendor storage part */ memset(serialno_str, 0, VENDOR_SN_MAX); -@@ -171,6 +217,7 @@ static int rockchip_set_serialno(void) +@@ -175,6 +221,7 @@ static int rockchip_set_serialno(void) ret = vendor_storage_read(SN_ID, serialno_str, (VENDOR_SN_MAX-1)); if (ret > 0) { @@ -112,7 +112,7 @@ index 111111111111..222222222222 100644 j = strlen(serialno_str); for (i = 0; i < j; i++) { if ((serialno_str[i] >= 'a' && serialno_str[i] <= 'z') || -@@ -185,11 +232,16 @@ static int rockchip_set_serialno(void) +@@ -192,11 +239,16 @@ static int rockchip_set_serialno(void) if (i > 0) { serialno_str[i + 1] = 0x0; env_set("serial#", serialno_str); @@ -129,7 +129,7 @@ index 111111111111..222222222222 100644 struct udevice *dev; /* retrieve the device */ -@@ -203,10 +255,13 @@ static int rockchip_set_serialno(void) +@@ -210,10 +262,13 @@ static int rockchip_set_serialno(void) &dev); if (ret) { @@ -142,9 +142,9 @@ index 111111111111..222222222222 100644 + printf("%s: serial gonna try read fuses\n", __func__); + /* read the cpu_id range from the efuses */ - ret = misc_read(dev, CPUID_OFF, &cpuid, sizeof(cpuid)); + ret = misc_read(dev, CFG_CPUID_OFFSET, &cpuid, sizeof(cpuid)); if (ret) { -@@ -214,12 +269,18 @@ static int rockchip_set_serialno(void) +@@ -221,12 +276,18 @@ static int rockchip_set_serialno(void) __func__, ret); return ret; } @@ -163,7 +163,7 @@ index 111111111111..222222222222 100644 for (i = 0; i < 8; i++) { low[i] = cpuid[1 + (i << 1)]; high[i] = cpuid[i << 1]; -@@ -230,6 +291,7 @@ static int rockchip_set_serialno(void) +@@ -237,6 +298,7 @@ static int rockchip_set_serialno(void) snprintf(serialno_str, sizeof(serialno_str), "%llx", serialno); env_set("serial#", serialno_str); @@ -171,7 +171,7 @@ index 111111111111..222222222222 100644 } return ret; -@@ -416,11 +478,11 @@ static void cmdline_handle(void) +@@ -454,11 +516,11 @@ static void scan_run_cmd(void) int board_late_init(void) { @@ -185,7 +185,7 @@ index 111111111111..222222222222 100644 + rockchip_set_ethaddr(); #endif setup_download_mode(); - + scan_run_cmd(); -- Armbian diff --git a/patch/u-boot/legacy/u-boot-meko-rk3588/0005-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58x-pro/5001-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch similarity index 90% rename from patch/u-boot/legacy/u-boot-meko-rk3588/0005-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58x-pro/5001-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch index f424061de..e56123b6c 100644 --- a/patch/u-boot/legacy/u-boot-meko-rk3588/0005-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_mekotronics-r58x-pro/5001-boot_rkimg-don-t-try-rockchip_u2phy_vbus_detect-when-RECOVERY-button-pressed.patch @@ -13,7 +13,7 @@ diff --git a/arch/arm/mach-rockchip/boot_rkimg.c b/arch/arm/mach-rockchip/boot_r index 111111111111..222222222222 100644 --- a/arch/arm/mach-rockchip/boot_rkimg.c +++ b/arch/arm/mach-rockchip/boot_rkimg.c -@@ -322,14 +322,17 @@ void setup_download_mode(void) +@@ -331,6 +331,9 @@ void setup_download_mode(void) boot_devtype_init(); @@ -23,6 +23,9 @@ index 111111111111..222222222222 100644 if (rockchip_dnl_key_pressed() || is_hotkey(HK_ROCKUSB_DNL)) { printf("download %skey pressed... ", is_hotkey(HK_ROCKUSB_DNL) ? "hot" : ""); +@@ -341,10 +344,10 @@ void setup_download_mode(void) + } + #ifdef CONFIG_CMD_ROCKUSB - vbus = rockchip_u2phy_vbus_detect(); + // vbus = rockchip_u2phy_vbus_detect(); // rpardini: don't do this, it fails with -19 @@ -33,7 +36,7 @@ index 111111111111..222222222222 100644 IS_ENABLED(CONFIG_CMD_ROCKUSB) ? "" : "no rockusb, "); -@@ -339,7 +342,7 @@ void setup_download_mode(void) +@@ -354,7 +357,7 @@ void setup_download_mode(void) if ((fdt_node_offset_by_compatible(blob, -1, "radxa,rockpie")) >= 0) { run_command("download", 0); } diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mekotronics_r58-rk3588_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mekotronics_r58-rk3588_defconfig new file mode 100644 index 000000000..c1ace60dc --- /dev/null +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mekotronics_r58-rk3588_defconfig @@ -0,0 +1,230 @@ +CONFIG_ARM=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SPL_GPIO_SUPPORT=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +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_FIT_IMAGE=y +CONFIG_ROCKCHIP_HWID_DTB=y +CONFIG_ROCKCHIP_VENDOR_PARTITION=y +CONFIG_USING_KERNEL_DTB_V2=y +CONFIG_ROCKCHIP_FIT_IMAGE_PACK=y +CONFIG_ROCKCHIP_NEW_IDB=y +CONFIG_PSTORE=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_TARGET_EVB_RK3588=y +CONFIG_SPL_LIBDISK_SUPPORT=y +CONFIG_SPL_SPI_FLASH_SUPPORT=y +CONFIG_SPL_SPI_SUPPORT=y +CONFIG_DEFAULT_DEVICE_TREE="rk3588-evb" +CONFIG_DEBUG_UART=y +CONFIG_LOCALVERSION="-armbian" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_FIT=y +CONFIG_FIT_IMAGE_POST_PROCESS=y +CONFIG_FIT_HW_CRYPTO=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y +CONFIG_SPL_FIT_HW_CRYPTO=y +# CONFIG_SPL_SYS_DCACHE_OFF is not set +CONFIG_BOOTDELAY=1 +CONFIG_SYS_CONSOLE_INFO_QUIET=y +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_ANDROID_BOOTLOADER=y +CONFIG_ANDROID_AVB=y +CONFIG_ANDROID_BOOT_IMAGE_HASH=y +CONFIG_SPL_BOARD_INIT=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set +CONFIG_SPL_SEPARATE_BSS=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x1 +CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_ATF=y +CONFIG_SPL_AB=y +CONFIG_FASTBOOT_BUF_ADDR=0xc00800 +CONFIG_FASTBOOT_BUF_SIZE=0x07000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=0 +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_DTIMG=y +# CONFIG_CMD_ELF is not set +# CONFIG_CMD_IMI is not set +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_XIMG is not set +# CONFIG_CMD_LZMADEC is not set +# CONFIG_CMD_UNZIP is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +CONFIG_CMD_GPT=y +# CONFIG_CMD_LOADB is not set +# CONFIG_CMD_LOADS is not set +CONFIG_CMD_BOOT_ANDROID=y +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y +# CONFIG_CMD_ITEST is not set +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_TFTP_BOOTM=y +CONFIG_CMD_TFTP_FLASH=y +# CONFIG_CMD_MISC is not set +CONFIG_CMD_MTD_BLK=y +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_ISO_PARTITION is not set +CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64 +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 +CONFIG_SYSCON=y +CONFIG_SPL_SYSCON=y +# CONFIG_SARADC_ROCKCHIP is not set +CONFIG_SARADC_ROCKCHIP_V2=y +CONFIG_CLK=y +CONFIG_SPL_CLK=y +CONFIG_CLK_SCMI=y +CONFIG_SPL_CLK_SCMI=y +CONFIG_DM_CRYPTO=y +CONFIG_SPL_DM_CRYPTO=y +CONFIG_ROCKCHIP_CRYPTO_V2=y +CONFIG_SPL_ROCKCHIP_CRYPTO_V2=y +CONFIG_DM_RNG=y +CONFIG_RNG_ROCKCHIP=y +CONFIG_SCMI_FIRMWARE=y +CONFIG_SPL_SCMI_FIRMWARE=y +CONFIG_GPIO_HOG=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_ROCKCHIP_GPIO_V2=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_I2C_MUX=y +CONFIG_DM_KEY=y +CONFIG_RK8XX_PWRKEY=y +CONFIG_ADC_KEY=y +CONFIG_MISC=y +CONFIG_SPL_MISC=y +CONFIG_MISC_DECOMPRESS=y +CONFIG_SPL_MISC_DECOMPRESS=y +CONFIG_ROCKCHIP_OTP=y +CONFIG_ROCKCHIP_HW_DECOMPRESS=y +CONFIG_SPL_ROCKCHIP_HW_DECOMPRESS=y +CONFIG_SPL_ROCKCHIP_SECURE_OTP=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_MTD=y +CONFIG_MTD_BLK=y +CONFIG_MTD_DEVICE=y +CONFIG_NAND=y +CONFIG_MTD_SPI_NAND=y +CONFIG_SPI_FLASH=y +CONFIG_SF_DEFAULT_SPEED=80000000 +CONFIG_SPI_FLASH_EON=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_SST=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_XMC=y +CONFIG_SPI_FLASH_XTX=y +CONFIG_SPI_FLASH_MTD=y +CONFIG_DM_ETH=y +CONFIG_DM_ETH_PHY=y +CONFIG_DWC_ETH_QOS=y +CONFIG_GMAC_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_INNO_USB2=y +CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y +CONFIG_PHY_ROCKCHIP_USBDP=y +CONFIG_PINCTRL=y +CONFIG_SPL_PINCTRL=y +CONFIG_DM_FUEL_GAUGE=y +CONFIG_POWER_FG_CW201X=y +CONFIG_POWER_FG_CW221X=y +CONFIG_DM_PMIC=y +CONFIG_PMIC_SPI_RK8XX=y +CONFIG_DM_POWER_DELIVERY=y +CONFIG_TYPEC_TCPM=y +CONFIG_TYPEC_TCPCI=y +CONFIG_TYPEC_HUSB311=y +CONFIG_TYPEC_FUSB302=y +CONFIG_REGULATOR_PWM=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_REGULATOR_RK860X=y +CONFIG_CHARGER_BQ25700=y +CONFIG_CHARGER_BQ25890=y +CONFIG_CHARGER_SC8551=y +CONFIG_CHARGER_SGM41542=y +CONFIG_DM_CHARGE_DISPLAY=y +CONFIG_CHARGE_ANIMATION=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_RAM=y +CONFIG_SPL_RAM=y +CONFIG_TPL_RAM=y +CONFIG_DM_RAMDISK=y +CONFIG_RAMDISK_RO=y +CONFIG_DM_RESET=y +CONFIG_SPL_DM_RESET=y +CONFIG_SPL_RESET_ROCKCHIP=y +CONFIG_BAUDRATE=1500000 +CONFIG_DEBUG_UART_BASE=0xFEB50000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_ROCKCHIP_SPI=y +CONFIG_ROCKCHIP_SFC=y +CONFIG_SYSRESET=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_GENERIC=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GADGET=y +CONFIG_USB_DWC3_GENERIC=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="Rockchip" +CONFIG_USB_GADGET_VENDOR_NUM=0x2207 +CONFIG_USB_GADGET_PRODUCT_NUM=0x350a +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_DM_VIDEO=y +CONFIG_DISPLAY=y +CONFIG_DRM_ROCKCHIP=y +CONFIG_DRM_MAXIM_MAX96745=y +CONFIG_DRM_MAXIM_MAX96755F=y +CONFIG_DRM_ROHM_BU18XL82=y +CONFIG_DRM_ROCKCHIP_DW_HDMI_QP=y +CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI2=y +CONFIG_DRM_ROCKCHIP_DW_DP=y +CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y +CONFIG_DRM_ROCKCHIP_SAMSUNG_MIPI_DCPHY=y +CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX_HDMI=y +CONFIG_USE_TINY_PRINTF=y +CONFIG_LIB_RAND=y +CONFIG_SPL_TINY_MEMSET=y +CONFIG_RSA=y +CONFIG_SPL_RSA=y +CONFIG_RSA_N_SIZE=0x200 +CONFIG_RSA_E_SIZE=0x10 +CONFIG_RSA_C_SIZE=0x20 +CONFIG_XBC=y +CONFIG_LZ4=y +CONFIG_LZMA=y +# CONFIG_EFI_LOADER is not set +CONFIG_AVB_LIBAVB=y +CONFIG_AVB_LIBAVB_AB=y +CONFIG_AVB_LIBAVB_ATX=y +CONFIG_AVB_LIBAVB_USER=y +CONFIG_RK_AVB_LIBAVB_USER=y diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mekotronics_r58x-rk3588_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mekotronics_r58x-rk3588_defconfig new file mode 100644 index 000000000..d6bca3e3b --- /dev/null +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mekotronics_r58x-rk3588_defconfig @@ -0,0 +1,240 @@ +CONFIG_ARM=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SPL_GPIO_SUPPORT=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +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_FIT_IMAGE=y +CONFIG_ROCKCHIP_HWID_DTB=y +CONFIG_ROCKCHIP_VENDOR_PARTITION=y +CONFIG_USING_KERNEL_DTB_V2=y +CONFIG_ROCKCHIP_FIT_IMAGE_PACK=y +CONFIG_ROCKCHIP_NEW_IDB=y +CONFIG_PSTORE=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_TARGET_EVB_RK3588=y +CONFIG_SPL_LIBDISK_SUPPORT=y +CONFIG_SPL_SPI_FLASH_SUPPORT=y +CONFIG_SPL_SPI_SUPPORT=y +CONFIG_DEFAULT_DEVICE_TREE="rk3588-blueberry-edge-v12" +CONFIG_DEBUG_UART=y +CONFIG_LOCALVERSION="-armbian" +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_FIT=y +CONFIG_FIT_IMAGE_POST_PROCESS=y +CONFIG_FIT_HW_CRYPTO=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y +CONFIG_SPL_FIT_HW_CRYPTO=y +# CONFIG_SPL_SYS_DCACHE_OFF is not set +CONFIG_BOOTDELAY=1 +CONFIG_SYS_CONSOLE_INFO_QUIET=y +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_ANDROID_BOOTLOADER=y +CONFIG_ANDROID_AVB=y +CONFIG_ANDROID_BOOT_IMAGE_HASH=y +CONFIG_SPL_BOARD_INIT=y +# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set +# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set +CONFIG_SPL_SEPARATE_BSS=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x1 +CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_ATF=y +CONFIG_SPL_AB=y +CONFIG_FASTBOOT_BUF_ADDR=0xc00800 +CONFIG_FASTBOOT_BUF_SIZE=0x07000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=0 +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_DTIMG=y +# CONFIG_CMD_ELF is not set +# CONFIG_CMD_IMI is not set +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_XIMG is not set +# CONFIG_CMD_LZMADEC is not set +# CONFIG_CMD_UNZIP is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +CONFIG_CMD_GPT=y +# CONFIG_CMD_LOADB is not set +# CONFIG_CMD_LOADS is not set +CONFIG_CMD_BOOT_ANDROID=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PCI=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y +# CONFIG_CMD_ITEST is not set +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_TFTP_BOOTM=y +CONFIG_CMD_TFTP_FLASH=y +# CONFIG_CMD_MISC is not set +CONFIG_CMD_MTD_BLK=y +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_ISO_PARTITION is not set +CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64 +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 +CONFIG_SYSCON=y +CONFIG_SPL_SYSCON=y +# CONFIG_SARADC_ROCKCHIP is not set +CONFIG_SARADC_ROCKCHIP_V2=y +CONFIG_CLK=y +CONFIG_SPL_CLK=y +CONFIG_CLK_SCMI=y +CONFIG_SPL_CLK_SCMI=y +CONFIG_DM_CRYPTO=y +CONFIG_SPL_DM_CRYPTO=y +CONFIG_ROCKCHIP_CRYPTO_V2=y +CONFIG_SPL_ROCKCHIP_CRYPTO_V2=y +CONFIG_DM_RNG=y +CONFIG_RNG_ROCKCHIP=y +CONFIG_SCMI_FIRMWARE=y +CONFIG_SPL_SCMI_FIRMWARE=y +CONFIG_GPIO_HOG=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_ROCKCHIP_GPIO_V2=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_I2C_MUX=y +CONFIG_DM_KEY=y +CONFIG_RK8XX_PWRKEY=y +CONFIG_ADC_KEY=y +CONFIG_MISC=y +CONFIG_SPL_MISC=y +CONFIG_MISC_DECOMPRESS=y +CONFIG_SPL_MISC_DECOMPRESS=y +CONFIG_ROCKCHIP_OTP=y +CONFIG_ROCKCHIP_HW_DECOMPRESS=y +CONFIG_SPL_ROCKCHIP_HW_DECOMPRESS=y +CONFIG_SPL_ROCKCHIP_SECURE_OTP=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_SDMA=y +CONFIG_MMC_SDHCI_ROCKCHIP=y +CONFIG_MTD=y +CONFIG_MTD_BLK=y +CONFIG_MTD_DEVICE=y +CONFIG_NAND=y +CONFIG_MTD_SPI_NAND=y +CONFIG_SPI_FLASH=y +CONFIG_SF_DEFAULT_SPEED=80000000 +CONFIG_SPI_FLASH_EON=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_SST=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_XMC=y +CONFIG_SPI_FLASH_XTX=y +CONFIG_SPI_FLASH_MTD=y +CONFIG_DM_ETH=y +CONFIG_DM_ETH_PHY=y +CONFIG_DWC_ETH_QOS=y +CONFIG_RGMII=y +CONFIG_GMAC_ROCKCHIP=y +CONFIG_NVME=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_DW_ROCKCHIP=y +CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y +CONFIG_PHY_ROCKCHIP_NANENG_USB2=y +CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX=y +CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=y +CONFIG_PHY_ROCKCHIP_TYPEC=y +CONFIG_PINCTRL=y +CONFIG_SPL_PINCTRL=y +CONFIG_DM_FUEL_GAUGE=y +CONFIG_POWER_FG_CW201X=y +CONFIG_POWER_FG_CW221X=y +CONFIG_DM_PMIC=y +CONFIG_PMIC_SPI_RK8XX=y +CONFIG_DM_POWER_DELIVERY=y +CONFIG_TYPEC_TCPM=y +CONFIG_TYPEC_TCPCI=y +CONFIG_TYPEC_HUSB311=y +CONFIG_TYPEC_FUSB302=y +CONFIG_REGULATOR_PWM=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_REGULATOR_RK860X=y +CONFIG_CHARGER_BQ25700=y +CONFIG_CHARGER_BQ25890=y +CONFIG_CHARGER_SC8551=y +CONFIG_CHARGER_SGM41542=y +CONFIG_DM_CHARGE_DISPLAY=y +CONFIG_CHARGE_ANIMATION=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_RAM=y +CONFIG_SPL_RAM=y +CONFIG_TPL_RAM=y +CONFIG_DM_RAMDISK=y +CONFIG_RAMDISK_RO=y +CONFIG_DM_RESET=y +CONFIG_SPL_DM_RESET=y +CONFIG_SPL_RESET_ROCKCHIP=y +CONFIG_BAUDRATE=1500000 +CONFIG_DEBUG_UART_BASE=0xFEB50000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_ROCKCHIP_SPI=y +CONFIG_ROCKCHIP_SFC=y +CONFIG_SYSRESET=y +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_XHCI_PCI=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_GENERIC=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_GENERIC=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_GADGET=y +CONFIG_USB_DWC3_GENERIC=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="Rockchip" +CONFIG_USB_GADGET_VENDOR_NUM=0x2207 +CONFIG_USB_GADGET_PRODUCT_NUM=0x350a +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_DM_VIDEO=y +CONFIG_DISPLAY=y +CONFIG_DRM_ROCKCHIP=y +CONFIG_DRM_MAXIM_MAX96745=y +CONFIG_DRM_MAXIM_MAX96755F=y +CONFIG_DRM_ROHM_BU18XL82=y +CONFIG_DRM_ROCKCHIP_DW_HDMI_QP=y +CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI2=y +CONFIG_DRM_ROCKCHIP_DW_DP=y +CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y +CONFIG_DRM_ROCKCHIP_SAMSUNG_MIPI_DCPHY=y +CONFIG_PHY_ROCKCHIP_SAMSUNG_HDPTX_HDMI=y +CONFIG_USE_TINY_PRINTF=y +CONFIG_LIB_RAND=y +CONFIG_SPL_TINY_MEMSET=y +CONFIG_RSA=y +CONFIG_SPL_RSA=y +CONFIG_RSA_N_SIZE=0x200 +CONFIG_RSA_E_SIZE=0x10 +CONFIG_RSA_C_SIZE=0x20 +CONFIG_XBC=y +CONFIG_LZ4=y +CONFIG_LZMA=y +# CONFIG_EFI_LOADER is not set +CONFIG_AVB_LIBAVB=y +CONFIG_AVB_LIBAVB_AB=y +CONFIG_AVB_LIBAVB_ATX=y +CONFIG_AVB_LIBAVB_USER=y +CONFIG_RK_AVB_LIBAVB_USER=y diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-blueberry-edge-v12.dts b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-blueberry-edge-v12.dts new file mode 100644 index 000000000..5dd31189e --- /dev/null +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3588-blueberry-edge-v12.dts @@ -0,0 +1,159 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2021 Rockchip Electronics Co., Ltd + * + */ + +/dts-v1/; +#include "rk3588.dtsi" +#include "rk3588-u-boot.dtsi" +#include + +/ { + 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"; + regulator-name = "vcc12v_dcin"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <12000000>; + regulator-max-microvolt = <12000000>; + }; + + vcc5v0_sys: vcc5v0-sys { + u-boot,dm-pre-reloc; + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc12v_dcin>; + }; + + vcc5v0_host: vcc5v0-host-regulator { + u-boot,dm-pre-reloc; + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_host"; + regulator-boot-on; + regulator-always-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&vcc5v0_host_en>; + vin-supply = <&vcc5v0_sys>; + }; + + vcc3v3_pcie30: vcc3v3-pcie30 { + u-boot,dm-pre-reloc; + compatible = "regulator-fixed"; + regulator-name = "vcc3v3_pcie30"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpio = <&gpio1 RK_PC4 GPIO_ACTIVE_HIGH>; //hugsun gpio1_c4 + regulator-boot-on; + regulator-always-on; + startup-delay-us = <10000>; + pinctrl-names = "default"; + pinctrl-0 = <&vcc3v3_pcie30_en>; + vin-supply = <&vcc12v_dcin>; + }; + + /* work led is actually blue "PWR" LED and the powerbutton backlight LED */ + led_work: led_work { + u-boot,dm-pre-reloc; + compatible = "regulator-fixed"; + regulator-name = "led_work"; + enable-active-high; + gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; // Turn on work led + regulator-boot-on; + regulator-always-on; + vin-supply = <&vcc5v0_sys>; + }; +}; + +&pcie3x4 { + u-boot,dm-pre-reloc; + vpcie3v3-supply = <&vcc3v3_pcie30>; + reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&pcie30phy { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&combphy0_ps { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&combphy1_ps { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&combphy2_psu { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +/* related to usbhost_dwc3_0 */ +&usbhost3_0 { + u-boot,dm-pre-reloc; + status = "okay"; + maximum-speed = "super-speed"; +}; + +/* related to usbhost3_0 */ +&usbhost_dwc3_0 { + u-boot,dm-pre-reloc; + dr_mode = "host"; + status = "okay"; + maximum-speed = "super-speed"; +}; + +&pinctrl { + usb { + u-boot,dm-pre-reloc; + vcc5v0_host_en: vcc5v0-host-en { + u-boot,dm-pre-reloc; + rockchip,pins = <4 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + }; + + pcie { + u-boot,dm-spl; + vcc3v3_pcie30_en: vcc3v3-pcie30-en { + u-boot,dm-spl; + rockchip,pins = <1 RK_PC4 RK_FUNC_GPIO &pcfg_pull_up>; + }; + + }; +}; + diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/rk3566-Add-rk3566-to-soc-name.patch b/patch/u-boot/legacy/u-boot-radxa-rk35xx/rk3566-Add-rk3566-to-soc-name.patch index 2840afa74..579f21d86 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/rk3566-Add-rk3566-to-soc-name.patch +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/rk3566-Add-rk3566-to-soc-name.patch @@ -2,6 +2,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Piotr Szczepanik Date: Mon, 6 Dec 2021 22:36:12 +0100 Subject: Add SoC based image name (rk3566) to rk35xx u-boot + --- tools/rkcommon.c | 1 + 1 file changed, 1 insertion(+)