From patchwork Sat Feb 29 15:58:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonas Smedegaard X-Patchwork-Id: 237025 List-Id: U-Boot discussion From: dr at jones.dk (Jonas Smedegaard) Date: Sat, 29 Feb 2020 16:58:55 +0100 Subject: [PATCH v2 1/2] sunxi: fix support board-specific CONFIG_PREBOOT Message-ID: <20200229155857.2622367-1-dr@jones.dk> commit 37304aaf60bf ("Convert CONFIG_USE_PREBOOT and CONFIG_PREBOOT to Kconfig") intended to support CONFIG_PREBOOT, but include/configs/sunxi-common.h hardcodes preboot as part of internally defined CONSOLE_STDIN_SETTINGS, silently ignoring any board-specific CONFIG_PREBOOT. Simply moving CONFIG_PREBOOT to Kconfig does not work here, as that would loose the logic of implicitly setting a conditional default. This commit implements support for explicit CONFIG_PREBOOT for sunxi boards, while keeping as fallback the implicity default preboot value. Tested-by: Jonas Smedegaard Signed-off-by: Jonas Smedegaard Series-Cc: Jagan Teki --- Changes in v2: - Rephrase commit message to clarify relationship with KConfig entries --- include/configs/sunxi-common.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 0ef289fd64..5edde29d1c 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -428,8 +428,13 @@ extern int soft_i2c_gpio_scl; #include #ifdef CONFIG_USB_KEYBOARD +#ifdef CONFIG_USE_PREBOOT +#ifndef CONFIG_PREBOOT +#define CONFIG_PREBOOT \ + "usb start" +#endif +#endif #define CONSOLE_STDIN_SETTINGS \ - "preboot=usb start\0" \ "stdin=serial,usbkbd\0" #else #define CONSOLE_STDIN_SETTINGS \