aboutsummaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-12-04 08:21:28 -0500
committerTom Rini <trini@konsulko.com>2015-12-04 08:21:28 -0500
commita85670e40da1ef4f299effb73c36e48d39d50106 (patch)
tree19886e80adb2c9e201387b74a042953e0070bb10 /configs
parentf5bcfe151e61558572b9f9036c67d51bd831a436 (diff)
parenta80a999c9b5c128cad2f67b4b32036bd4d667904 (diff)
downloadu-boot-a85670e40da1ef4f299effb73c36e48d39d50106.zip
u-boot-a85670e40da1ef4f299effb73c36e48d39d50106.tar.gz
u-boot-a85670e40da1ef4f299effb73c36e48d39d50106.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'configs')
-rw-r--r--configs/cgtqmx6eval_defconfig (renamed from configs/cgtqmx6qeval_defconfig)5
1 files changed, 3 insertions, 2 deletions
diff --git a/configs/cgtqmx6qeval_defconfig b/configs/cgtqmx6eval_defconfig
index 497d833..02008ea 100644
--- a/configs/cgtqmx6qeval_defconfig
+++ b/configs/cgtqmx6eval_defconfig
@@ -1,10 +1,11 @@
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_CGTQMX6EVAL=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/congatec/cgtqmx6eval/imximage.cfg,MX6Q"
-CONFIG_SYS_PROMPT="CGT-QMX6-Quad U-Boot > "
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SPL,MX6QDL"
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
+CONFIG_SYS_PROMPT="CGT-QMX6-Quad U-Boot > "
CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_DM=y