diff options
| author | Fabio Estevam <fabio.estevam@nxp.com> | 2016-07-22 15:21:12 -0300 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2016-07-28 12:08:22 +0200 |
| commit | 5c392017f5d9ff52bd822880abd81ca2843ffdca (patch) | |
| tree | 9ac9b775fe2ae43f95932d4aa14bc9728577c391 | |
| parent | d2c4c6bcfa5c9e36a6e00b1c7b997cd06eb09a6c (diff) | |
mx7dsabresd_secure_defconfig: Use CONFIG_ARMV7_BOOT_SEC_DEFAULT
There is no need for introducing MX7_SEC, as there is the
CONFIG_ARMV7_BOOT_SEC_DEFAULT option for this purpose.
Switch to CONFIG_ARMV7_BOOT_SEC_DEFAULT and get rid of
MX7_SEC.
Tested by booting a 4.1.15 NXP kernel with mx7dsabresd_secure_defconfig
target.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Stefan Agner <stefan.agner@toradex.com>
| -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 |