From: Adam Ford Date: Thu, 7 Mar 2024 11:58:58 +0000 (-0600) Subject: configs: imx8mp_beacon: Fall back to using TF-A X-Git-Url: http://git.dujemihanovic.xyz/img/static/gitweb.css?a=commitdiff_plain;h=383d4b130c603d88e57e97091d03d1fd733e1403;p=u-boot.git configs: imx8mp_beacon: Fall back to using TF-A When the board was originally added, it enabled some features which allowed it to bypass Trusted Firmware, but as the feature set of Linux grew and more features became available, the U-Boot config options which bypassed TF-A caused issues, so it needs to return to the standard operating mode of using TF-A or the system no longer boots. Fixes: ab53bd43dbde ("arm64: imx: Add support for imx8mp-beacon-kit") Signed-off-by: Adam Ford Reviewed-by: Fabio Estevam --- diff --git a/configs/imx8mp_beacon_defconfig b/configs/imx8mp_beacon_defconfig index 29162ac9a4..9d09dd4a7c 100644 --- a/configs/imx8mp_beacon_defconfig +++ b/configs/imx8mp_beacon_defconfig @@ -14,7 +14,6 @@ CONFIG_ENV_OFFSET=0xFFFFDE00 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="imx8mp-beacon-kit" CONFIG_SPL_TEXT_BASE=0x920000 -CONFIG_SYS_HAS_ARMV8_SECURE_BASE=y CONFIG_TARGET_IMX8MP_BEACON=y CONFIG_SYS_MONITOR_LEN=524288 CONFIG_SPL_MMC=y @@ -23,13 +22,8 @@ CONFIG_SPL_DRIVERS_MISC=y CONFIG_SPL_STACK=0x960000 CONFIG_SPL=y CONFIG_ARMV8_SPL_EXCEPTION_VECTORS=y -CONFIG_ARMV8_MULTIENTRY=y CONFIG_ARMV8_SET_SMPEN=y # CONFIG_PSCI_RESET is not set -CONFIG_ARMV8_PSCI=y -CONFIG_ARMV8_PSCI_CPUS_PER_CLUSTER=4 -CONFIG_ARMV8_PSCI_RELOCATE=y -CONFIG_ARMV8_SECURE_BASE=0x970000 CONFIG_ARMV8_EA_EL3_FIRST=y CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_SYS_LOAD_ADDR=0x40480000 @@ -85,7 +79,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_DEV=2 CONFIG_SYS_MMC_ENV_PART=2 -CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_USE_ETHPRIME=y CONFIG_ETHPRIME="eth1" CONFIG_SPL_DM=y