From patchwork Tue Jun 16 23:06:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 242526 List-Id: U-Boot discussion From: trini at konsulko.com (Tom Rini) Date: Tue, 16 Jun 2020 19:06:09 -0400 Subject: [PATCHv2 09/31] bk4r1: Re-convert CONFIG_AUTOBOOT_PROMPT et al to Kconfig In-Reply-To: <20200616230631.29189-1-trini@konsulko.com> References: <20200616230631.29189-1-trini@konsulko.com> Message-ID: <20200616230631.29189-9-trini@konsulko.com> This converts the following to Kconfig: CONFIG_AUTOBOOT_PROMPT CONFIG_AUTOBOOT_KEYED CONFIG_AUTOBOOT_STOP_STR Signed-off-by: Tom Rini --- configs/bk4r1_defconfig | 3 +++ include/configs/bk4r1.h | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) 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 #include