summaryrefslogtreecommitdiffstats
path: root/configs/ph1_sld8_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-07-01 15:37:56 -0400
committerTom Rini <trini@konsulko.com>2015-07-01 15:37:56 -0400
commit6762ae68887d962e1a4be193672005bdefd3ee32 (patch)
tree5fd64361a67785ea5dc57a7759ae7b14a55d1956 /configs/ph1_sld8_defconfig
parentaf6da69f47314e0e8efa3711ffadbfda8d2334aa (diff)
parent8101b98298c4232175d0d7b4c73d94b66b97ef83 (diff)
downloadtalos-obmc-uboot-6762ae68887d962e1a4be193672005bdefd3ee32.tar.gz
talos-obmc-uboot-6762ae68887d962e1a4be193672005bdefd3ee32.zip
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'configs/ph1_sld8_defconfig')
-rw-r--r--configs/ph1_sld8_defconfig4
1 files changed, 0 insertions, 4 deletions
diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig
index 90c44ac857..ee4cebcef3 100644
--- a/configs/ph1_sld8_defconfig
+++ b/configs/ph1_sld8_defconfig
@@ -7,10 +7,6 @@ CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld8-ref"
CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_HUSH_PARSER=y
-CONFIG_AUTOBOOT_KEYED=y
-CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
-CONFIG_AUTOBOOT_DELAY_STR="d"
-CONFIG_AUTOBOOT_STOP_STR=" "
# CONFIG_CMD_XIMG is not set
# CONFIG_CMD_ENV_EXISTS is not set
CONFIG_CMD_NAND=y
OpenPOWER on IntegriCloud