diff options
-rw-r--r-- | arch/arm/imx-common/Kconfig | 9 | ||||
-rw-r--r-- | configs/mx7dsabresd_secure_defconfig | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/imx-common/Kconfig b/arch/arm/imx-common/Kconfig index c6b38bcaa6..1b7da5ad38 100644 --- a/arch/arm/imx-common/Kconfig +++ b/arch/arm/imx-common/Kconfig @@ -17,12 +17,3 @@ config IMX_BOOTAUX depends on ARCH_MX7 || ARCH_MX6 help bootaux [addr] to boot auxiliary core. - -config MX7_SEC - bool "Support booting MX7 in secure mode" - depends on ARCH_MX7 - help - NXP kernel requires to boot MX7 in secure mode. Select - this options if you want to boot a NXP kernel. In order - to boot a mainline kernel this option needs to be - unselected. diff --git a/configs/mx7dsabresd_secure_defconfig b/configs/mx7dsabresd_secure_defconfig index 0a3930eb40..aa92a38775 100644 --- a/configs/mx7dsabresd_secure_defconfig +++ b/configs/mx7dsabresd_secure_defconfig @@ -38,4 +38,4 @@ CONFIG_G_DNL_MANUFACTURER="FSL" CONFIG_G_DNL_VENDOR_NUM=0x0525 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5 CONFIG_OF_LIBFDT=y -CONFIG_MX7_SEC=y +CONFIG_ARMV7_BOOT_SEC_DEFAULT=y |