From: Alice Guo <[email protected]> Enable OF_UPSTREAM for i.MX8ULP EVK so that devicetree imported from Linux kernel release can be used.
If mailbox@29220000 is enabled, gd->arch.ele_dev will be set to this device for communication with ELE firmware. This is incorrect because mu@27020000 is the MU used for communication with the ELE firmware. To prevent misconfiguration, disable mailbox@29220000. The driver model for watchdog timer is not enabled yet, so disable wdog3 temporarily. Signed-off-by: Alice Guo <[email protected]> --- arch/arm/dts/Makefile | 3 --- arch/arm/dts/imx8ulp-evk-u-boot.dtsi | 8 ++++++++ arch/arm/mach-imx/imx8ulp/Kconfig | 1 + configs/imx8ulp_evk_defconfig | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 865ceb65f9a..b7ece30d1a3 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -880,9 +880,6 @@ dtb-$(CONFIG_ARCH_IMX8) += \ fsl-imx8qxp-mek.dtb \ imx8-capricorn-cxg3.dtb \ -dtb-$(CONFIG_ARCH_IMX8ULP) += \ - imx8ulp-evk.dtb - dtb-$(CONFIG_ARCH_IMX8M) += \ imx8mm-data-modul-edm-sbc.dtb \ imx8mm-icore-mx8mm-ctouch2.dtb \ diff --git a/arch/arm/dts/imx8ulp-evk-u-boot.dtsi b/arch/arm/dts/imx8ulp-evk-u-boot.dtsi index 2782dc7dd75..860994129ae 100644 --- a/arch/arm/dts/imx8ulp-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8ulp-evk-u-boot.dtsi @@ -22,6 +22,14 @@ bootph-all; }; +&mu { + status = "disabled"; +}; + +&wdog3 { + status = "disabled"; +}; + &per_bridge4 { bootph-pre-ram; }; diff --git a/arch/arm/mach-imx/imx8ulp/Kconfig b/arch/arm/mach-imx/imx8ulp/Kconfig index e96e34651ce..d64cfca0408 100644 --- a/arch/arm/mach-imx/imx8ulp/Kconfig +++ b/arch/arm/mach-imx/imx8ulp/Kconfig @@ -28,6 +28,7 @@ config TARGET_IMX8ULP_EVK select SUPPORT_SPL select IMX8ULP_DRAM imply BOOTSTD_FULL + imply OF_UPSTREAM endchoice diff --git a/configs/imx8ulp_evk_defconfig b/configs/imx8ulp_evk_defconfig index f8a87dde5cf..469ee928129 100644 --- a/configs/imx8ulp_evk_defconfig +++ b/configs/imx8ulp_evk_defconfig @@ -10,7 +10,7 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x400000 CONFIG_IMX_CONFIG="arch/arm/mach-imx/imx8ulp/imximage.cfg" CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="imx8ulp-evk" +CONFIG_DEFAULT_DEVICE_TREE="freescale/imx8ulp-evk" CONFIG_TARGET_IMX8ULP_EVK=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_SERIAL=y -- 2.43.0
