summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeng Fan <peng.fan@nxp.com>2016-03-04 14:19:45 +0800
committerYe Li <ye.li@nxp.com>2016-03-25 15:05:01 +0800
commit4789f07a80fe3589316325b7c9a085503c778ca3 (patch)
treeabae4787f2e0c4471df0be6012852e8435879a03
parent64ac5fefb62aa4324e0ac02f25b5f3a4b2ca060a (diff)
downloadu-boot-imx-4789f07a80fe3589316325b7c9a085503c778ca3.zip
u-boot-imx-4789f07a80fe3589316325b7c9a085503c778ca3.tar.gz
u-boot-imx-4789f07a80fe3589316325b7c9a085503c778ca3.tar.bz2
MLK-12564-2 imx: mx7d: move MX7D to Kconfig entry
If including MX7D in CONFIG_SYS_EXTRA_OPTIONS, CONFIG_ROM_UNIFIED_SECTIONS will not effect.So move MX7D to Kconfig entry from CONFIG_SYS_EXTRA_OPTIONS to "select MX7D" to boards using i.MX7 Dual. Signed-off-by: Peng Fan <peng.fan@nxp.com>
-rw-r--r--arch/arm/cpu/armv7/mx7/Kconfig1
-rw-r--r--configs/mx7dsabresd_defconfig2
-rw-r--r--configs/mx7dsabresd_epdc_defconfig2
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/mx7/Kconfig b/arch/arm/cpu/armv7/mx7/Kconfig
index 97d6238..aa3ace8 100644
--- a/arch/arm/cpu/armv7/mx7/Kconfig
+++ b/arch/arm/cpu/armv7/mx7/Kconfig
@@ -15,6 +15,7 @@ choice
config TARGET_MX7DSABRESD
bool "mx7dsabresd"
+ select MX7D
select DM
select DM_THERMAL
diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig
index 1d262c1..6638475 100644
--- a/configs/mx7dsabresd_defconfig
+++ b/configs/mx7dsabresd_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_MX7=y
CONFIG_TARGET_MX7DSABRESD=y
CONFIG_IMX_RDC=y
CONFIG_IMX_BOOTAUX=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg,MX7D"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg"
# CONFIG_CMD_BOOTD is not set
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
diff --git a/configs/mx7dsabresd_epdc_defconfig b/configs/mx7dsabresd_epdc_defconfig
index 136541d..911beee 100644
--- a/configs/mx7dsabresd_epdc_defconfig
+++ b/configs/mx7dsabresd_epdc_defconfig
@@ -3,7 +3,7 @@ CONFIG_ARCH_MX7=y
CONFIG_TARGET_MX7DSABRESD=y
CONFIG_IMX_RDC=y
CONFIG_IMX_BOOTAUX=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg,MX7D,MXC_EPDC"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg,MXC_EPDC"
CONFIG_CMD_GPIO=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y