From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Fri, 30 Sep 2016 06:44:03 +0200 Subject: [U-Boot] [PATCH v3 05/29] config: Drop CONFIG_CONSOLE In-Reply-To: <1475180609-14716-6-git-send-email-sjg@chromium.org> References: <1475180609-14716-1-git-send-email-sjg@chromium.org> <1475180609-14716-6-git-send-email-sjg@chromium.org> Message-ID: <57EDED93.5090307@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Simon, Am 29.09.2016 um 22:23 schrieb Simon Glass: > This is not really a config. Rename it to avoid confusion. > > Signed-off-by: Simon Glass > Reviewed-by: Tom Rini > --- > > Changes in v3: None > Changes in v2: None > > include/configs/MPC8349ITX.h | 6 +++--- > scripts/config_whitelist.txt | 1 - > 2 files changed, 3 insertions(+), 4 deletions(-) good catch Reviewed-by: Heiko Schocher bye, Heiko > > diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h > index 177718e..0fbc1fd 100644 > --- a/include/configs/MPC8349ITX.h > +++ b/include/configs/MPC8349ITX.h > @@ -358,7 +358,7 @@ boards, we say we have two, but don't display a message if we find only one. */ > #define CONFIG_SYS_BAUDRATE_TABLE \ > {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 115200} > > -#define CONFIG_CONSOLE ttyS0 > +#define CONSOLE ttyS0 > #define CONFIG_BAUDRATE 115200 > > #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x4500) > @@ -740,10 +740,10 @@ boards, we say we have two, but don't display a message if we find only one. */ > __stringify(CONFIG_GATEWAYIP) ":" \ > __stringify(CONFIG_NETMASK) ":" \ > CONFIG_HOSTNAME ":" CONFIG_NETDEV ":off" \ > - " console=" __stringify(CONFIG_CONSOLE) "," __stringify(CONFIG_BAUDRATE) > + " console=" __stringify(CONSOLE) "," __stringify(CONFIG_BAUDRATE) > > #define CONFIG_EXTRA_ENV_SETTINGS \ > - "console=" __stringify(CONFIG_CONSOLE) "\0" \ > + "console=" __stringify(CONSOLE) "\0" \ > "netdev=" CONFIG_NETDEV "\0" \ > "uboot=" CONFIG_UBOOTPATH "\0" \ > "tftpflash=tftpboot $loadaddr $uboot; " \ > diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt > index 5e2f8ce..d66282a 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -674,7 +674,6 @@ CONFIG_COMMON_ENV_SETTINGS > CONFIG_COMMON_ENV_UBI > CONFIG_COMPACT_FLASH > CONFIG_COMPAT > -CONFIG_CONSOLE > CONFIG_CONSOLE_DEV > CONFIG_CONSOLE_EXTRA_INFO > CONFIG_CONSOLE_INFO_QUIET > -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany