diff --git a/config/boards/armsom-cm5-io.csc b/config/boards/armsom-cm5-io.csc index 2c1dd8e922ee..5b955641c960 100644 --- a/config/boards/armsom-cm5-io.csc +++ b/config/boards/armsom-cm5-io.csc @@ -10,16 +10,6 @@ BOOT_SCENARIO="spl-blobs" IMAGE_PARTITION_TABLE="gpt" BOARD_MAINTAINER="" -function post_family_config_branch_vendor__armsom-cm5-io_use_vendor_uboot() { - display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info" - - declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git" - declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1" - declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576" - declare -g BOOTDIR="u-boot-${BOARD}" - declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb" -} - function post_family_tweaks__armsom-cm5-io_naming_audios() { display_alert "$BOARD" "Renaming armsom-cm5 audios" "info" diff --git a/config/boards/armsom-cm5-rpi-cm4-io.csc b/config/boards/armsom-cm5-rpi-cm4-io.csc index ea33136b97ec..e462fc94a1b2 100644 --- a/config/boards/armsom-cm5-rpi-cm4-io.csc +++ b/config/boards/armsom-cm5-rpi-cm4-io.csc @@ -10,16 +10,6 @@ BOOT_SCENARIO="spl-blobs" IMAGE_PARTITION_TABLE="gpt" BOARD_MAINTAINER="" -function post_family_config_branch_vendor__armsom-cm5-rpi-cm4-io_use_vendor_uboot() { - display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info" - - declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git" - declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1" - declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576" - declare -g BOOTDIR="u-boot-${BOARD}" - declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb" -} - function post_family_tweaks__armsom-cm5-rpi-cm4-io_naming_audios() { display_alert "$BOARD" "Renaming armsom-cm5-rpi-cm4-io audios" "info" diff --git a/config/boards/armsom-sige5.csc b/config/boards/armsom-sige5.csc index 9aea68a3c443..629028fa2b24 100644 --- a/config/boards/armsom-sige5.csc +++ b/config/boards/armsom-sige5.csc @@ -10,16 +10,6 @@ BOOT_SCENARIO="spl-blobs" IMAGE_PARTITION_TABLE="gpt" BOARD_MAINTAINER="" -function post_family_config_branch_vendor__armsom-sige7_use_vendor_uboot() { - display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info" - - declare -g BOOTSOURCE="https://github.com/ArmSoM/u-boot.git" - declare -g BOOTBRANCH="tag:rk3576-6.1-rk3.1" - declare -g BOOTPATCHDIR="legacy/u-boot-armsom-rk3576" - declare -g BOOTDIR="u-boot-${BOARD}" - declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb" -} - function post_family_tweaks__armsom-sige7_naming_audios() { display_alert "$BOARD" "Renaming armsom-sige7 audios" "info" diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index b35a6418914d..b669a6280efc 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -139,7 +139,6 @@ case "$BOOT_SOC" in BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}" DDR_BLOB="${DDR_BLOB:-"rk35/rk3576_ddr_lp4_2112MHz_lp5_2736MHz_v1.03.bin"}" BL31_BLOB="${BL31_BLOB:-"rk35/rk3576_bl31_v1.04.elf"}" - BL32_BLOB="${BL32_BLOB:-"rk35/rk3576_bl32_v1.01.bin"}" ;; rk3588) #CPUMAX undefined? diff --git a/config/sources/families/rk35xx.conf b/config/sources/families/rk35xx.conf index 968a9b1df001..64441c7c30e4 100644 --- a/config/sources/families/rk35xx.conf +++ b/config/sources/families/rk35xx.conf @@ -10,7 +10,7 @@ source "${BASH_SOURCE%/*}/include/rockchip64_common.inc" BOOTSOURCE='https://github.com/radxa/u-boot.git' -BOOTBRANCH='branch:next-dev-v2024.03' # Always use same version as rk3588, they share a patch dir +BOOTBRANCH='branch:next-dev-v2024.10' # Always use same version as rk3588, they share a patch dir BOOTPATCHDIR="legacy/u-boot-radxa-rk35xx" OVERLAY_PREFIX='rk35xx' diff --git a/config/sources/families/rockchip-rk3588.conf b/config/sources/families/rockchip-rk3588.conf index dd6b239bed19..ae99b4bac37b 100644 --- a/config/sources/families/rockchip-rk3588.conf +++ b/config/sources/families/rockchip-rk3588.conf @@ -10,7 +10,7 @@ source "${BASH_SOURCE%/*}/include/rockchip64_common.inc" BOOTSOURCE='https://github.com/radxa/u-boot.git' -BOOTBRANCH='branch:next-dev-v2024.03' # Always use same version as rk35xx, they share a patch dir +BOOTBRANCH='branch:next-dev-v2024.10' # Always use same version as rk35xx, they share a patch dir BOOTPATCHDIR="legacy/u-boot-radxa-rk35xx" OVERLAY_PREFIX='rockchip-rk3588' diff --git a/patch/u-boot/legacy/u-boot-armsom-rk3576/0000.patching_config.yaml b/patch/u-boot/legacy/u-boot-armsom-rk3576/0000.patching_config.yaml deleted file mode 100644 index 719cf56a8c70..000000000000 --- a/patch/u-boot/legacy/u-boot-armsom-rk3576/0000.patching_config.yaml +++ /dev/null @@ -1,5 +0,0 @@ -config: - - overlay-directories: - - { source: "defconfig", target: "configs" } # copies all files in defconfig dir to the configs/ dir in the u-boot source tree - - { source: "dt", target: "arch/arm/dts" } # copies all files in dt dir to the arch/arm/dts dir in the u-boot source tree diff --git a/patch/u-boot/legacy/u-boot-armsom-rk3576/0001-cmd-source-fix-the-error-that-the-command-source-fai.patch b/patch/u-boot/legacy/u-boot-armsom-rk3576/0001-cmd-source-fix-the-error-that-the-command-source-fai.patch deleted file mode 100644 index c3c313e294ef..000000000000 --- a/patch/u-boot/legacy/u-boot-armsom-rk3576/0001-cmd-source-fix-the-error-that-the-command-source-fai.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-armsom-rk3576/0002-cmd-inconsistent-return-type-of-command_process.patch b/patch/u-boot/legacy/u-boot-armsom-rk3576/0002-cmd-inconsistent-return-type-of-command_process.patch deleted file mode 100644 index 0c2469f1c092..000000000000 --- a/patch/u-boot/legacy/u-boot-armsom-rk3576/0002-cmd-inconsistent-return-type-of-command_process.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Heinrich Schuchardt -Date: Mon, 1 Aug 2022 15:17:49 +0200 -Subject: cmd: inconsistent return type of command_process() - -The declarations in the header and in the implementation must match. - -Reported-by: Sergei Antonov -Signed-off-by: Heinrich Schuchardt -Reviewed-by: Simon Glass ---- - include/command.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/command.h b/include/command.h -index 111111111111..222222222222 100644 ---- a/include/command.h -+++ b/include/command.h -@@ -137,10 +137,10 @@ enum command_ret_t { - * is left unchanged. - * @param ticks If ticks is not null, this function set it to the - * number of ticks the command took to complete. -- * @return 0 if the command succeeded, 1 if it failed -+ * @return 0 if command succeeded, else non-zero (CMD_RET_...) - */ --int cmd_process(int flag, int argc, char * const argv[], -- int *repeatable, unsigned long *ticks); -+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-armsom-rk3576/rockchip-allow-passing-of-BL31-location-via-variable.patch b/patch/u-boot/legacy/u-boot-armsom-rk3576/rockchip-allow-passing-of-BL31-location-via-variable.patch deleted file mode 100644 index c9ff83eb2e31..000000000000 --- a/patch/u-boot/legacy/u-boot-armsom-rk3576/rockchip-allow-passing-of-BL31-location-via-variable.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Stephen Chen -Date: Tue, 21 Mar 2023 16:11:34 +0800 -Subject: rockchip: allow passing of BL31 location via variable - -Source link: https://github.com/piter75/armbian-build/blob/rock-3a-bring-up/patch/u-boot/u-boot-rk356x/general-configurable-bl31-path.patch - -Signed-off-by: Stephen Chen ---- - arch/arm/mach-rockchip/decode_bl31.py | 12 ++++++++- - arch/arm/mach-rockchip/make_fit_atf.py | 13 +++++++++- - 2 files changed, 23 insertions(+), 2 deletions(-) - -diff --git a/arch/arm/mach-rockchip/decode_bl31.py b/arch/arm/mach-rockchip/decode_bl31.py -index 301bd153753..42fa32d23d2 100755 ---- a/arch/arm/mach-rockchip/decode_bl31.py -+++ b/arch/arm/mach-rockchip/decode_bl31.py -@@ -41,7 +41,17 @@ def generate_atf_binary(bl31_file_name): - atf.write(data) - - def main(): -- bl31_elf="./bl31.elf" -+ if "BL31" in os.environ: -+ bl31_elf=os.getenv("BL31"); -+ elif os.path.isfile("./bl31.elf"): -+ bl31_elf = "./bl31.elf" -+ else: -+ os.system("echo 'int main(){}' > bl31.c") -+ os.system("${CROSS_COMPILE}gcc -c bl31.c -o bl31.elf") -+ bl31_elf = "./bl31.elf" -+ logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.DEBUG) -+ logging.warning(' BL31 file bl31.elf NOT found, resulting binary is non-functional') -+ logging.warning(' Please read Building section in doc/README.rockchip') - generate_atf_binary(bl31_elf); - - if __name__ == "__main__": -diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py -index 27b6ef75970..fac8d6f1219 100755 ---- a/arch/arm/mach-rockchip/make_fit_atf.py -+++ b/arch/arm/mach-rockchip/make_fit_atf.py -@@ -212,9 +212,20 @@ def get_bl31_segments_info(bl31_file_name): - - def main(): - uboot_elf="./u-boot" -- bl31_elf="./bl31.elf" - FIT_ITS=sys.stdout - -+ if "BL31" in os.environ: -+ bl31_elf=os.getenv("BL31"); -+ elif os.path.isfile("./bl31.elf"): -+ bl31_elf = "./bl31.elf" -+ else: -+ os.system("echo 'int main(){}' > bl31.c") -+ os.system("${CROSS_COMPILE}gcc -c bl31.c -o bl31.elf") -+ bl31_elf = "./bl31.elf" -+ logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.DEBUG) -+ logging.warning(' BL31 file bl31.elf NOT found, resulting binary is non-functional') -+ logging.warning(' Please read Building section in doc/README.rockchip') -+ - opts, args = getopt.getopt(sys.argv[1:], "o:u:b:h") - for opt, val in opts: - if opt == "-o": --- -Armbian - diff --git a/patch/u-boot/legacy/u-boot-armsom-rk3576/rockchip-allow-passing-of-BL32-location-via-variable.patch b/patch/u-boot/legacy/u-boot-armsom-rk3576/rockchip-allow-passing-of-BL32-location-via-variable.patch deleted file mode 100644 index 1adbcac91748..000000000000 --- a/patch/u-boot/legacy/u-boot-armsom-rk3576/rockchip-allow-passing-of-BL32-location-via-variable.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/arch/arm/mach-rockchip/fit_nodes.sh b/arch/arm/mach-rockchip/fit_nodes.sh -index 9639a06e1c..ceee0ccc20 100755 ---- a/arch/arm/mach-rockchip/fit_nodes.sh -+++ b/arch/arm/mach-rockchip/fit_nodes.sh -@@ -180,7 +180,7 @@ function gen_bl32_node() - fi - fi - -- TEE="tee.bin" -+ TEE="${TEE:=tee.bin}" - echo " optee { - description = \"OP-TEE\"; - data = /incbin/(\"${TEE}${SUFFIX}\"); diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_armsom-sige5/add-u-boot-pd-negotiation-support.patch b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_armsom-sige5/add-u-boot-pd-negotiation-support.patch new file mode 100644 index 000000000000..f4092b29ee57 --- /dev/null +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/board_armsom-sige5/add-u-boot-pd-negotiation-support.patch @@ -0,0 +1,41 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: amazingfate +Date: Thu, 2 May 2024 01:45:23 +0800 +Subject: add u-boot pd negotiation support + +--- + drivers/power/power_delivery/tcpm.c | 4 ++-- + include/configs/rk3576_common.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/power/power_delivery/tcpm.c b/drivers/power/power_delivery/tcpm.c +index 22334c6230c4..1b94a401836a 100644 +--- a/drivers/power/power_delivery/tcpm.c ++++ b/drivers/power/power_delivery/tcpm.c +@@ -1390,8 +1390,8 @@ static void tcpm_pd_rx_handler(struct tcpm_port *port, + */ + if (!!(le16_to_cpu(msg->header) & PD_HEADER_DATA_ROLE) == + (port->data_role == TYPEC_HOST)) { +- printf("Data role mismatch, initiating error recovery\n"); +- tcpm_set_state(port, ERROR_RECOVERY, 0); ++ printf("Data role mismatch, hard resetting...\n"); ++ tcpm_set_state(port, HARD_RESET_SEND, 0); + } else { + if (cnt) + tcpm_pd_data_request(port, msg); +diff --git a/include/configs/rk3576_common.h b/include/configs/rk3576_common.h +index 549a2583c3ad..448ae2ec6ef0 100644 +--- a/include/configs/rk3576_common.h ++++ b/include/configs/rk3576_common.h +@@ -96,7 +96,7 @@ + #define CONFIG_USB_OHCI_NEW + #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1 + +-#define CONFIG_PREBOOT ++#define CONFIG_PREBOOT "charge_pd" + #define CONFIG_LIB_HW_RAND + + #endif +-- +Armbian + diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-aim7-io-rk3588_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-aim7-io-rk3588_defconfig index 97642e9f4fa5..76c4c84c27c8 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-aim7-io-rk3588_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-aim7-io-rk3588_defconfig @@ -210,5 +210,3 @@ CONFIG_AVB_LIBAVB_AB=y CONFIG_AVB_LIBAVB_ATX=y CONFIG_AVB_LIBAVB_USER=y CONFIG_RK_AVB_LIBAVB_USER=y -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y diff --git a/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-cm5-io-rk3576_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-cm5-io-rk3576_defconfig similarity index 99% rename from patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-cm5-io-rk3576_defconfig rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-cm5-io-rk3576_defconfig index fa69a379cf38..5ee20156ada6 100644 --- a/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-cm5-io-rk3576_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-cm5-io-rk3576_defconfig @@ -217,7 +217,5 @@ CONFIG_AVB_LIBAVB_AB=y CONFIG_AVB_LIBAVB_ATX=y CONFIG_AVB_LIBAVB_USER=y CONFIG_RK_AVB_LIBAVB_USER=y -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y CONFIG_ROCKCHIP_EARLY_DISTRO_DTB=y CONFIG_ROCKCHIP_EARLY_DISTRO_DTB_PATH="/boot/dtb/rockchip/rk3576-armsom-cm5-io.dtb" diff --git a/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-cm5-rpi-cm4-io-rk3576_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-cm5-rpi-cm4-io-rk3576_defconfig similarity index 99% rename from patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-cm5-rpi-cm4-io-rk3576_defconfig rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-cm5-rpi-cm4-io-rk3576_defconfig index d2205afdfb2f..d6724380552f 100644 --- a/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-cm5-rpi-cm4-io-rk3576_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-cm5-rpi-cm4-io-rk3576_defconfig @@ -217,7 +217,5 @@ CONFIG_AVB_LIBAVB_AB=y CONFIG_AVB_LIBAVB_ATX=y CONFIG_AVB_LIBAVB_USER=y CONFIG_RK_AVB_LIBAVB_USER=y -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y CONFIG_ROCKCHIP_EARLY_DISTRO_DTB=y CONFIG_ROCKCHIP_EARLY_DISTRO_DTB_PATH="/boot/dtb/rockchip/rk3576-armsom-cm5-rpi-cm4-io.dtb" diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige3-rk3568_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige3-rk3568_defconfig index 12569e57d556..65ee0a00bcfb 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige3-rk3568_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige3-rk3568_defconfig @@ -229,8 +229,6 @@ CONFIG_AVB_LIBAVB_AB=y CONFIG_AVB_LIBAVB_ATX=y CONFIG_AVB_LIBAVB_USER=y CONFIG_RK_AVB_LIBAVB_USER=y -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y CONFIG_CMD_CHARGE_DISPLAY=y CONFIG_DM_CHARGE_DISPLAY=y CONFIG_CMD_PMIC=y diff --git a/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-sige5-rk3576_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige5-rk3576_defconfig similarity index 98% rename from patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-sige5-rk3576_defconfig rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige5-rk3576_defconfig index 73125b562a72..96d9b13f00b1 100644 --- a/patch/u-boot/legacy/u-boot-armsom-rk3576/defconfig/armsom-sige5-rk3576_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige5-rk3576_defconfig @@ -217,7 +217,8 @@ CONFIG_AVB_LIBAVB_AB=y CONFIG_AVB_LIBAVB_ATX=y CONFIG_AVB_LIBAVB_USER=y CONFIG_RK_AVB_LIBAVB_USER=y -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y CONFIG_ROCKCHIP_EARLY_DISTRO_DTB=y CONFIG_ROCKCHIP_EARLY_DISTRO_DTB_PATH="/boot/dtb/rockchip/rk3576-armsom-sige5.dtb" +CONFIG_CMD_CHARGE_DISPLAY=y +CONFIG_CMD_PMIC=y +CONFIG_CMD_REGULATOR=y diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige7-rk3588_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige7-rk3588_defconfig index 41fc8c029c67..54c242d7bfb2 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige7-rk3588_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-sige7-rk3588_defconfig @@ -217,7 +217,5 @@ CONFIG_AVB_LIBAVB_AB=y CONFIG_AVB_LIBAVB_ATX=y CONFIG_AVB_LIBAVB_USER=y CONFIG_RK_AVB_LIBAVB_USER=y -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y CONFIG_CMD_CHARGE_DISPLAY=y CONFIG_DM_CHARGE_DISPLAY=y diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-w3-rk3588_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-w3-rk3588_defconfig index e22682f5beef..9f1ae340b219 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-w3-rk3588_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/armsom-w3-rk3588_defconfig @@ -212,5 +212,3 @@ CONFIG_AVB_LIBAVB_AB=y CONFIG_AVB_LIBAVB_ATX=y CONFIG_AVB_LIBAVB_USER=y CONFIG_RK_AVB_LIBAVB_USER=y -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/hinlink_rk3528_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/hinlink_rk3528_defconfig index 7e174b3be20a..b37bc5fa7f77 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/hinlink_rk3528_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/hinlink_rk3528_defconfig @@ -191,5 +191,3 @@ CONFIG_AVB_LIBAVB_AB=y CONFIG_AVB_LIBAVB_ATX=y CONFIG_AVB_LIBAVB_USER=y CONFIG_RK_AVB_LIBAVB_USER=y -#CONFIG_OPTEE_CLIENT=y -#CONFIG_OPTEE_V2=y diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mixtile-edge2-rk3568_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mixtile-edge2-rk3568_defconfig index 175ccb7dc6ee..824220dc12ec 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mixtile-edge2-rk3568_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/mixtile-edge2-rk3568_defconfig @@ -229,8 +229,6 @@ CONFIG_AVB_LIBAVB_AB=y CONFIG_AVB_LIBAVB_ATX=y CONFIG_AVB_LIBAVB_USER=y CONFIG_RK_AVB_LIBAVB_USER=y -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y CONFIG_CMD_CHARGE_DISPLAY=y CONFIG_DM_CHARGE_DISPLAY=y CONFIG_CMD_PMIC=y diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopi-r6s-rk3588s_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopi-r6s-rk3588s_defconfig index 19bae5562928..a7a81de9d28b 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopi-r6s-rk3588s_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/nanopi-r6s-rk3588s_defconfig @@ -212,6 +212,3 @@ CONFIG_AVB_LIBAVB_AB=y CONFIG_AVB_LIBAVB_ATX=y CONFIG_AVB_LIBAVB_USER=y CONFIG_RK_AVB_LIBAVB_USER=y -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y -CONFIG_OPTEE_ALWAYS_USE_SECURITY_PARTITION=y diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-max-rk3588_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-max-rk3588_defconfig index 5de721791c2b..f336897338e2 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-max-rk3588_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-max-rk3588_defconfig @@ -251,5 +251,3 @@ CONFIG_LIBATA=y CONFIG_SCSI_AHCI=y CONFIG_SCSI=y CONFIG_MTD_BLK_U_BOOT_OFFS=0x400 -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-plus-rk3588_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-plus-rk3588_defconfig index 1d221c7efb1b..3a139c2643a7 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-plus-rk3588_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-plus-rk3588_defconfig @@ -251,5 +251,3 @@ CONFIG_LIBATA=y CONFIG_SCSI_AHCI=y CONFIG_SCSI=y CONFIG_MTD_BLK_U_BOOT_OFFS=0x400 -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-rk3588s_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-rk3588s_defconfig index c7e5e86fc4ce..580456ff6c55 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-rk3588s_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-rk3588s_defconfig @@ -250,5 +250,3 @@ CONFIG_LIBATA=y CONFIG_SCSI_AHCI=y CONFIG_SCSI=y CONFIG_MTD_BLK_U_BOOT_OFFS=0x400 -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-sata-rk3588s_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-sata-rk3588s_defconfig index 5374c4cb113e..1ef1426e17f0 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-sata-rk3588s_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5-sata-rk3588s_defconfig @@ -250,5 +250,3 @@ CONFIG_LIBATA=y CONFIG_SCSI_AHCI=y CONFIG_SCSI=y CONFIG_MTD_BLK_U_BOOT_OFFS=0x400 -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5b-rk3588s_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5b-rk3588s_defconfig index dd2c9457fb7c..6df9d0dfd85e 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5b-rk3588s_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/orangepi-5b-rk3588s_defconfig @@ -250,5 +250,3 @@ CONFIG_LIBATA=y CONFIG_SCSI_AHCI=y CONFIG_SCSI=y CONFIG_MTD_BLK_U_BOOT_OFFS=0x400 -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/radxa_e20c_rk3528_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/radxa_e20c_rk3528_defconfig index c9eb2dc349df..bd55defa9c91 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/radxa_e20c_rk3528_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/radxa_e20c_rk3528_defconfig @@ -198,5 +198,3 @@ CONFIG_AVB_LIBAVB_AB=y CONFIG_AVB_LIBAVB_ATX=y CONFIG_AVB_LIBAVB_USER=y CONFIG_RK_AVB_LIBAVB_USER=y -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/retro-lite-cm5-rk3588s_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/retro-lite-cm5-rk3588s_defconfig index 14342294775c..d536aa5eebcd 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/retro-lite-cm5-rk3588s_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/retro-lite-cm5-rk3588s_defconfig @@ -218,5 +218,3 @@ CONFIG_AVB_LIBAVB_AB=y CONFIG_AVB_LIBAVB_ATX=y CONFIG_AVB_LIBAVB_USER=y CONFIG_RK_AVB_LIBAVB_USER=y -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/rk3588-cyber-aib_defconfig b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/rk3588-cyber-aib_defconfig index 3266131385ed..cf8434b1caa3 100644 --- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/rk3588-cyber-aib_defconfig +++ b/patch/u-boot/legacy/u-boot-radxa-rk35xx/defconfig/rk3588-cyber-aib_defconfig @@ -210,5 +210,3 @@ CONFIG_AVB_LIBAVB_AB=y CONFIG_AVB_LIBAVB_ATX=y CONFIG_AVB_LIBAVB_USER=y CONFIG_RK_AVB_LIBAVB_USER=y -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y diff --git a/patch/u-boot/legacy/u-boot-armsom-rk3576/dt/rk3576-armsom-cm5-io.dts b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3576-armsom-cm5-io.dts similarity index 100% rename from patch/u-boot/legacy/u-boot-armsom-rk3576/dt/rk3576-armsom-cm5-io.dts rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3576-armsom-cm5-io.dts diff --git a/patch/u-boot/legacy/u-boot-armsom-rk3576/dt/rk3576-armsom-sige5.dts b/patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3576-armsom-sige5.dts similarity index 100% rename from patch/u-boot/legacy/u-boot-armsom-rk3576/dt/rk3576-armsom-sige5.dts rename to patch/u-boot/legacy/u-boot-radxa-rk35xx/dt/rk3576-armsom-sige5.dts