summaryrefslogtreecommitdiffstats
path: root/configs/M5373EVB_defconfig
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-10-14 10:46:36 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2015-10-14 10:46:36 +0200
commit13a3972585af60ec367d209cedbd3601e0c77467 (patch)
tree4b3312669b3e501f6bc10b39d8c7bbf516f07aac /configs/M5373EVB_defconfig
parent208bd51396fb606dbdcf45b064e6b372d7dd3e81 (diff)
parent297faccca2235e359012118495b9b73451d54bb9 (diff)
downloadtalos-obmc-uboot-13a3972585af60ec367d209cedbd3601e0c77467.tar.gz
talos-obmc-uboot-13a3972585af60ec367d209cedbd3601e0c77467.zip
Merge remote-tracking branch 'u-boot/master'
Diffstat (limited to 'configs/M5373EVB_defconfig')
-rw-r--r--configs/M5373EVB_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig
index eb7a96a47a..2fdff5bd12 100644
--- a/configs/M5373EVB_defconfig
+++ b/configs/M5373EVB_defconfig
@@ -1,5 +1,5 @@
CONFIG_M68K=y
CONFIG_TARGET_M5373EVB=y
CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16"
-# CONFIG_CMD_SETEXPR is not set
CONFIG_SYS_PROMPT="-> "
+# CONFIG_CMD_SETEXPR is not set
OpenPOWER on IntegriCloud