public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Jonas Smedegaard <dr@jones.dk>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 1/2] sunxi: fix support board-specific CONFIG_PREBOOT
Date: Sun, 18 Aug 2019 17:16:06 +0200	[thread overview]
Message-ID: <20190818151607.9711-1-dr@jones.dk> (raw)

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.

Tested-by: Jonas Smedegaard <dr@jones.dk>
Signed-off-by: Jonas Smedegaard <dr@jones.dk>
Series-Cc: Jagan Teki <jagan@amarulasolutions.com>
---

 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 d7133a73fc..2069884b63 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -432,8 +432,13 @@ extern int soft_i2c_gpio_scl;
 #include <config_distro_bootcmd.h>
 
 #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 \
-- 
2.23.0.rc1

             reply	other threads:[~2019-08-18 15:16 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-18 15:16 Jonas Smedegaard [this message]
2019-08-18 15:16 ` [U-Boot] [PATCH 2/2] sun50i: a64: A64-Teres-I board detect builtin keyboard Jonas Smedegaard
2019-08-23  8:37 ` [U-Boot] [PATCH 1/2] sunxi: fix support board-specific CONFIG_PREBOOT Lukasz Majewski
2019-08-23 15:56   ` Jonas Smedegaard
2019-08-23 21:05     ` Lukasz Majewski
2020-02-27  9:45       ` Jonas Smedegaard
2020-02-27 10:05         ` Lukasz Majewski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190818151607.9711-1-dr@jones.dk \
    --to=dr@jones.dk \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox