diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-10-14 10:46:36 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-10-14 10:46:36 +0200 |
| commit | 13a3972585af60ec367d209cedbd3601e0c77467 (patch) | |
| tree | 4b3312669b3e501f6bc10b39d8c7bbf516f07aac /configs/grasshopper_defconfig | |
| parent | 208bd51396fb606dbdcf45b064e6b372d7dd3e81 (diff) | |
| parent | 297faccca2235e359012118495b9b73451d54bb9 (diff) | |
| download | talos-obmc-uboot-13a3972585af60ec367d209cedbd3601e0c77467.tar.gz talos-obmc-uboot-13a3972585af60ec367d209cedbd3601e0c77467.zip | |
Merge remote-tracking branch 'u-boot/master'
Diffstat (limited to 'configs/grasshopper_defconfig')
| -rw-r--r-- | configs/grasshopper_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/grasshopper_defconfig b/configs/grasshopper_defconfig index eefc5f2eba..92a73e22ee 100644 --- a/configs/grasshopper_defconfig +++ b/configs/grasshopper_defconfig @@ -1,9 +1,9 @@ CONFIG_AVR32=y CONFIG_TARGET_GRASSHOPPER=y +CONFIG_SYS_PROMPT="U-Boot> " 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_FPGA is not set # CONFIG_CMD_SETEXPR is not set -CONFIG_SYS_PROMPT="U-Boot> " |
