From: Tom Rini Date: Mon, 27 Mar 2023 19:19:57 +0000 (-0400) Subject: Merge branch 'master' into next X-Git-Tag: baikal/mips/sdk6.2~4^2~3^2~175^2~22 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=1e60c1848b45f02774fcbf8bbd4c5b6cc4a6c5ee;p=uboot.git Merge branch 'master' into next --- 1e60c1848b45f02774fcbf8bbd4c5b6cc4a6c5ee diff --cc arch/arm/dts/rk3188-radxarock-u-boot.dtsi index fe6aba70d1,de29959827..7bcbc2967a --- a/arch/arm/dts/rk3188-radxarock-u-boot.dtsi +++ b/arch/arm/dts/rk3188-radxarock-u-boot.dtsi @@@ -52,9 -52,8 +52,8 @@@ }; &timer3 { - compatible = "rockchip,rk3368-timer", "rockchip,rk3288-timer"; clock-frequency = <24000000>; - u-boot,dm-spl; + bootph-pre-ram; }; &uart2 { diff --cc arch/arm/dts/rk356x-u-boot.dtsi index ecf88e0841,6eef99e6f7..0a764ce511 --- a/arch/arm/dts/rk356x-u-boot.dtsi +++ b/arch/arm/dts/rk356x-u-boot.dtsi @@@ -34,13 -34,8 +34,8 @@@ }; }; - &combphy1 { - /delete-property/ assigned-clocks; - /delete-property/ assigned-clock-rates; - }; - &cru { - u-boot,dm-pre-reloc; + bootph-all; status = "okay"; }; diff --cc configs/imx93_11x11_evk_defconfig index 93c478c86f,694f8c33ef..4f8777161e --- a/configs/imx93_11x11_evk_defconfig +++ b/configs/imx93_11x11_evk_defconfig @@@ -22,10 -22,11 +22,10 @@@ CONFIG_SPL_LOAD_IMX_CONTAINER= CONFIG_SYS_LOAD_ADDR=0x80400000 CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x90000000 - CONFIG_DISTRO_DEFAULTS=y CONFIG_REMAKE_ELF=y CONFIG_SYS_MONITOR_LEN=524288 + CONFIG_DISTRO_DEFAULTS=y CONFIG_DEFAULT_FDT_FILE="imx93-11x11-evk.dtb" -CONFIG_ARCH_MISC_INIT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_LATE_INIT=y CONFIG_SPL_MAX_SIZE=0x26000