diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-01 15:37:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-01 15:37:56 -0400 |
| commit | 6762ae68887d962e1a4be193672005bdefd3ee32 (patch) | |
| tree | 5fd64361a67785ea5dc57a7759ae7b14a55d1956 /configs | |
| parent | af6da69f47314e0e8efa3711ffadbfda8d2334aa (diff) | |
| parent | 8101b98298c4232175d0d7b4c73d94b66b97ef83 (diff) | |
| download | u-boot-imx-6762ae68887d962e1a4be193672005bdefd3ee32.zip u-boot-imx-6762ae68887d962e1a4be193672005bdefd3ee32.tar.gz u-boot-imx-6762ae68887d962e1a4be193672005bdefd3ee32.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/ph1_ld4_defconfig | 4 | ||||
| -rw-r--r-- | configs/ph1_pro4_defconfig | 4 | ||||
| -rw-r--r-- | configs/ph1_sld8_defconfig | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/configs/ph1_ld4_defconfig b/configs/ph1_ld4_defconfig index 650201a..a71511c 100644 --- a/configs/ph1_ld4_defconfig +++ b/configs/ph1_ld4_defconfig @@ -7,10 +7,6 @@ CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld4-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 diff --git a/configs/ph1_pro4_defconfig b/configs/ph1_pro4_defconfig index 7d8d9cc..d02712e 100644 --- a/configs/ph1_pro4_defconfig +++ b/configs/ph1_pro4_defconfig @@ -6,10 +6,6 @@ CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-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 diff --git a/configs/ph1_sld8_defconfig b/configs/ph1_sld8_defconfig index 90c44ac..ee4cebc 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 |