summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-04-04 14:34:09 -0400
committerTom Rini <trini@konsulko.com>2016-04-04 14:34:09 -0400
commit4ed6ed3c27a069a00c8a557d606a05276cc4653e (patch)
treeedb142ac2c9c220f4f422672ae115d85ee831d3e /configs
parent7e10a7c3bc382ff79bb6746944a0a4a0073a0faf (diff)
parent07654ba1e37e0de2ee3a5983ad510a8c2dd21035 (diff)
downloadtalos-obmc-uboot-4ed6ed3c27a069a00c8a557d606a05276cc4653e.tar.gz
talos-obmc-uboot-4ed6ed3c27a069a00c8a557d606a05276cc4653e.zip
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'configs')
-rw-r--r--configs/xilinx_zynqmp_ep_defconfig2
-rw-r--r--configs/zynq_microzed_defconfig1
-rw-r--r--configs/zynq_zybo_defconfig1
3 files changed, 4 insertions, 0 deletions
diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
index 33f29afab8..91ae10ab21 100644
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -1,10 +1,12 @@
CONFIG_ARM=y
+CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_ep"
CONFIG_ARCH_ZYNQMP=y
CONFIG_ZYNQMP_USB=y
CONFIG_SYS_TEXT_BASE=0x8000000
CONFIG_DEFAULT_DEVICE_TREE="zynqmp-ep108"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
+CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="ZynqMP> "
# CONFIG_CMD_CONSOLE is not set
# CONFIG_CMD_IMLS is not set
diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index 4c5152fa73..1d70e43df0 100644
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -15,6 +15,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_ZYNQ_SDHCI=y
CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y
diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index 4a59890ff3..d2f81101b9 100644
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -15,6 +15,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_ZYNQ_SDHCI=y
CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_BAR=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_ZYNQ_GEM=y
CONFIG_DEBUG_UART=y
OpenPOWER on IntegriCloud