summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-02-02 07:24:52 -0500
committerTom Rini <trini@konsulko.com>2016-02-02 07:24:52 -0500
commit161b1fe745394f34c4aa506edc964089785919f6 (patch)
tree8d7c40866bfd9df6e5ed6e848469e43ed9f77b42 /configs
parent008e61f5120e7d3acb937953b1322e3aee3160d4 (diff)
parent37dadbca0c8b9bff00f892fd87a978cbe0a98b3a (diff)
downloadblackbird-obmc-uboot-161b1fe745394f34c4aa506edc964089785919f6.tar.gz
blackbird-obmc-uboot-161b1fe745394f34c4aa506edc964089785919f6.zip
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'configs')
-rw-r--r--configs/sama5d2_xplained_mmc_defconfig1
-rw-r--r--configs/sama5d2_xplained_spiflash_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig
index c1dcbefcc3..75b17131be 100644
--- a/configs/sama5d2_xplained_mmc_defconfig
+++ b/configs/sama5d2_xplained_mmc_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_SAMA5D2_XPLAINED=y
+CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_MMC"
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig
index 0271e8ef8d..6d61a7eb23 100644
--- a/configs/sama5d2_xplained_spiflash_defconfig
+++ b/configs/sama5d2_xplained_spiflash_defconfig
@@ -1,6 +1,7 @@
CONFIG_ARM=y
CONFIG_ARCH_AT91=y
CONFIG_TARGET_SAMA5D2_XPLAINED=y
+CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2,SYS_USE_SERIALFLASH"
# CONFIG_CMD_IMI is not set
# CONFIG_CMD_IMLS is not set
OpenPOWER on IntegriCloud