imx7dsabresd: Use mx7dsabresd_config configuration for sd devices

Defconfig mx7dsabresd_secure_config was removed on U-Boot:

commit feb14c6348caadfd7bbb1e972f0c484faffa5a72
Author: Fabio Estevam <fabio.estevam@nxp.com>
Date:   Thu Apr 19 17:34:10 2018 -0300

    mx7dsabresd: Remove the mx7dsabresd_secure_defconfig target

    mx7dsabresd_secure_defconfig was introduced to allow booting NXP kernel
    that has CAAM support and needs to boot in secure mode.

    Instead of keeping two different config targets for the same board,
    remove mx7dsabresd_secure_defconfig and select
    CONFIG_ARMV7_BOOT_SEC_DEFAULT inside mx7dsabresd_defconfig so that
    this target could be used to boot both mainline and the vendor kernel.

    This makes maintenance task easier and avoid potentially confusion
    for the end user.

    Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
    Acked-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit 88f4d66820251bc706ab65680ec10572b73a29f2)

diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index f77e537ebbdeedb12614b2af69324abce1eb5bfa..be9a670380e700e807c7ec2ecdb34853d233bacc 100644 (file)
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -19,7 +19,7 @@ KERNEL_DEVICETREE = "imx7d-sdb.dtb imx7d-sdb-epdc.dtb imx7d-sdb-gpmi-weim.dtb \
 KERNEL_DEVICETREE_use-mainline-bsp = "imx7d-sdb.dtb"
 
 UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "mx7dsabresd_secure_config,sdcard"
+UBOOT_CONFIG[sd] = "mx7dsabresd_config,sdcard"
 UBOOT_CONFIG[qspi1] = "mx7dsabresd_qspi1_config"
 UBOOT_CONFIG[nand] = "mx7dsabresd_nand_config,ubifs"
 UBOOT_CONFIG[epdc] = "mx7dsabresd_epdc_config"