| Message ID | 1518046203-27747-3-git-send-email-jcmvbkbc@gmail.com |
|---|---|
| State | Accepted |
| Commit | 64c26fee05b11d26e37255165785a9e2708264c4 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | .travis.yml changes for building/testing xtensa port | expand |
On Wed, Feb 07, 2018 at 03:30:02PM -0800, Max Filippov wrote: > Remove CONFIG_BOOT_RETRY_TIME as it doesn't do much good and enable > CONFIG_HUSH_PARSER in xtfpga_defconfig. > > Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Applied to u-boot/master, thanks!
diff --git a/configs/xtfpga_defconfig b/configs/xtfpga_defconfig index 4f77e23ef5c5..759b4a5524f7 100644 --- a/configs/xtfpga_defconfig +++ b/configs/xtfpga_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_CPU="dc233c" CONFIG_XTFPGA_KC705=y CONFIG_BOOTDELAY=10 CONFIG_VERSION_VARIABLE=y +CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="U-Boot> " CONFIG_AUTOBOOT_KEYED=y CONFIG_AUTOBOOT_PROMPT="Autobooting in %d seconds, press <SPACE> to stop\n" diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h index 3119f007971e..79cc1e8fc1b8 100644 --- a/include/configs/xtfpga.h +++ b/include/configs/xtfpga.h @@ -122,8 +122,6 @@ /* U-Boot autoboot configuration */ /*==============================*/ -#define CONFIG_BOOT_RETRY_TIME 60 /* retry after 60 secs */ - #define CONFIG_AUTO_COMPLETE /* Support tab autocompletion */ #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP
Remove CONFIG_BOOT_RETRY_TIME as it doesn't do much good and enable CONFIG_HUSH_PARSER in xtfpga_defconfig. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> --- Changes v1->v2: - new patch configs/xtfpga_defconfig | 1 + include/configs/xtfpga.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)