diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-10-14 08:46:36 (GMT) |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-10-14 08:46:36 (GMT) |
commit | 13a3972585af60ec367d209cedbd3601e0c77467 (patch) | |
tree | 4b3312669b3e501f6bc10b39d8c7bbf516f07aac /configs/zmx25_defconfig | |
parent | 208bd51396fb606dbdcf45b064e6b372d7dd3e81 (diff) | |
parent | 297faccca2235e359012118495b9b73451d54bb9 (diff) | |
download | u-boot-13a3972585af60ec367d209cedbd3601e0c77467.tar.xz |
Merge remote-tracking branch 'u-boot/master'
Diffstat (limited to 'configs/zmx25_defconfig')
-rw-r--r-- | configs/zmx25_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/zmx25_defconfig b/configs/zmx25_defconfig index c759cdf..f853308 100644 --- a/configs/zmx25_defconfig +++ b/configs/zmx25_defconfig @@ -1,8 +1,8 @@ CONFIG_ARM=y CONFIG_TARGET_ZMX25=y +CONFIG_SYS_PROMPT="zmx25> " CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="boot in %d s\n" CONFIG_AUTOBOOT_DELAY_STR="delaygs" CONFIG_AUTOBOOT_STOP_STR="stopgs" # CONFIG_CMD_SETEXPR is not set -CONFIG_SYS_PROMPT="zmx25> " |