| Message ID | 20200616230631.29189-9-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | b120665fe9616707d16c0df19ace659fbe1fd0dd |
| Headers | show |
| Series | [PATCHv2,01/31] Convert CONFIG_AM335X_LCD to Kconfig | expand |
On Tue, Jun 16, 2020 at 07:06:09PM -0400, Tom Rini wrote: > This converts the following to Kconfig: > CONFIG_AUTOBOOT_PROMPT > CONFIG_AUTOBOOT_KEYED > CONFIG_AUTOBOOT_STOP_STR > > Signed-off-by: Tom Rini <trini at konsulko.com> Applied to u-boot/next, thanks!
diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig index 8c2bda6984ae..bcad243dd2bd 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 f88172a05c55..300b9c7b7afb 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>
This converts the following to Kconfig: CONFIG_AUTOBOOT_PROMPT CONFIG_AUTOBOOT_KEYED CONFIG_AUTOBOOT_STOP_STR Signed-off-by: Tom Rini <trini at konsulko.com> --- configs/bk4r1_defconfig | 3 +++ include/configs/bk4r1.h | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-)