summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-02-20 17:32:48 -0500
committerTom Rini <trini@konsulko.com>2016-02-20 17:32:48 -0500
commit20680b560a17fb29c862de77930cfbf76b24f83c (patch)
treef66975032b21063ad86fd01553983b3c79b398cf /configs
parentdb6ce2312dcae87619136457d1f9df56789f630a (diff)
parent2a0b9ea3067b00366455b0504056cb6728a0b865 (diff)
downloadtalos-obmc-uboot-20680b560a17fb29c862de77930cfbf76b24f83c.tar.gz
talos-obmc-uboot-20680b560a17fb29c862de77930cfbf76b24f83c.zip
Merge branch 'master' of git://git.denx.de/u-boot-atmel
Diffstat (limited to 'configs')
-rw-r--r--configs/ma5d4evk_defconfig11
-rw-r--r--configs/smartweb_defconfig5
-rw-r--r--configs/vinco_defconfig13
3 files changed, 28 insertions, 1 deletions
diff --git a/configs/ma5d4evk_defconfig b/configs/ma5d4evk_defconfig
new file mode 100644
index 0000000000..88102d9329
--- /dev/null
+++ b/configs/ma5d4evk_defconfig
@@ -0,0 +1,11 @@
+CONFIG_ARM=y
+CONFIG_ARCH_AT91=y
+CONFIG_TARGET_MA5D4EVK=y
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4"
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_SPI_FLASH=y
diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig
index ee4340fd85..654bb4b385 100644
--- a/configs/smartweb_defconfig
+++ b/configs/smartweb_defconfig
@@ -3,4 +3,7 @@ CONFIG_ARCH_AT91=y
CONFIG_TARGET_SMARTWEB=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260"
-CONFIG_SYS_PROMPT="U-Boot> "
+CONFIG_SYS_PROMPT="U-Boot# "
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press \"<Esc><Esc>\" to stop\n"
+CONFIG_AUTOBOOT_STOP_STR="\x1b\x1b"
diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig
new file mode 100644
index 0000000000..7cae79b314
--- /dev/null
+++ b/configs/vinco_defconfig
@@ -0,0 +1,13 @@
+CONFIG_ARM=y
+CONFIG_ARCH_AT91=y
+CONFIG_TARGET_VINCO=y
+CONFIG_SYS_EXTRA_OPTIONS="SAMA5D4,SYS_USE_SERIALFLASH"
+CONFIG_SYS_PROMPT="vinco => "
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_LOADS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_SPI_FLASH=y
+CONFIG_NETDEVICES=y
+CONFIG_ETH_DESIGNWARE=y
OpenPOWER on IntegriCloud