diff options
| author | Tom Rini | 2020-06-16 19:06:09 -0400 |
|---|---|---|
| committer | Tom Rini | 2020-06-26 10:29:05 -0400 |
| commit | b120665fe9616707d16c0df19ace659fbe1fd0dd (patch) | |
| tree | bc8dbd0eae28140f97854d946c187c32c443c8c1 | |
| parent | f61e2e414c8484fa65fc0d9a11bbc15c87824694 (diff) | |
bk4r1: Re-convert CONFIG_AUTOBOOT_PROMPT et al to Kconfig
This converts the following to Kconfig:
CONFIG_AUTOBOOT_PROMPT
CONFIG_AUTOBOOT_KEYED
CONFIG_AUTOBOOT_STOP_STR
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | configs/bk4r1_defconfig | 3 | ||||
| -rw-r--r-- | include/configs/bk4r1.h | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig index 8c2bda6984a..bcad243dd2b 100644 --- a/configs/bk4r1_defconfig +++ b/configs/bk4r1_defconfig @@ -18,6 +18,9 @@ CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Enter passphrase to stop autoboot, booting in %d seconds\n" +CONFIG_AUTOBOOT_STOP_STR="123" # CONFIG_CMD_ELF is not set CONFIG_CMD_MEMTEST=y CONFIG_SYS_MEMTEST_START=0x80010000 diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h index f88172a05c5..300b9c7b7af 100644 --- a/include/configs/bk4r1.h +++ b/include/configs/bk4r1.h @@ -57,12 +57,6 @@ "saveenv; " \ "fi; " -/* Autoboot options */ -#define CONFIG_AUTOBOOT_KEYED -#define CONFIG_AUTOBOOT_PROMPT \ - "Enter passphrase to stop autoboot, booting in %d seconds\n" -#define CONFIG_AUTOBOOT_STOP_STR "123" - #include <asm/arch/imx-regs.h> #include <linux/sizes.h> |