From 98af87997670af840ef178f76b4d6888534a6700 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 17 Oct 2016 20:12:35 -0600 Subject: Convert SILENT_CONSOLE options to Kconfig Move these option to Kconfig and tidy up existing uses. The Power PC boards don't have a suitable common element: the common header files don't appear to line up with the Kconfig files as far as I can tell. This results in a lot of defconfig changes. Signed-off-by: Simon Glass Reviewed-by: Jagan Teki [trini: Re-migrate, update common/console.c logic] Signed-off-by: Tom Rini --- include/configs/T102xQDS.h | 1 - include/configs/T102xRDB.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/TQM5200.h | 1 - include/configs/UCP1020.h | 4 ---- include/configs/a4m072.h | 1 - include/configs/bfin_adi_common.h | 1 - include/configs/cm5200.h | 1 - include/configs/exynos5-common.h | 1 - include/configs/exynos7420-common.h | 1 - include/configs/ls1021aqds.h | 3 --- include/configs/ls1021atwr.h | 3 --- include/configs/pdm360ng.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/sandbox.h | 1 - include/configs/tricorder.h | 2 -- 17 files changed, 25 deletions(-) (limited to 'include') diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index ed0838b3cd..38a457dfb3 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -33,7 +33,6 @@ #define CONFIG_DEEP_SLEEP #if defined(CONFIG_DEEP_SLEEP) -#define CONFIG_SILENT_CONSOLE #define CONFIG_BOARD_EARLY_INIT_F #endif diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index da739be64e..29df5bddcb 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -38,7 +38,6 @@ #define CONFIG_DEEP_SLEEP #endif #if defined(CONFIG_DEEP_SLEEP) -#define CONFIG_SILENT_CONSOLE #define CONFIG_BOARD_EARLY_INIT_F #endif diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index c2d0facb75..4aa2f2b738 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -45,7 +45,6 @@ /* support deep sleep */ #define CONFIG_DEEP_SLEEP #if defined(CONFIG_DEEP_SLEEP) -#define CONFIG_SILENT_CONSOLE #define CONFIG_BOARD_EARLY_INIT_F #endif diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index ab97c74fc8..6bff7cba86 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -159,7 +159,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_DEEP_SLEEP #if defined(CONFIG_DEEP_SLEEP) #define CONFIG_BOARD_EARLY_INIT_F -#define CONFIG_SILENT_CONSOLE #endif #ifndef CONFIG_SYS_TEXT_BASE diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index df12dc11ae..297a9ef57c 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -51,7 +51,6 @@ #ifdef CONFIG_FO300 #define CONFIG_SYS_DEVICE_NULLDEV 1 /* enable null device */ -#define CONFIG_SILENT_CONSOLE 1 /* enable silent startup */ #define CONFIG_BOARD_EARLY_INIT_F 1 /* used to detect S1 switch position */ #define CONFIG_USB_BIN_FIXUP 1 /* for a buggy USB device */ #if 0 diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index d62c9b3163..e15e8370b3 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -52,10 +52,6 @@ #define CONFIG_LAST_STAGE_INIT -#if !defined(CONFIG_DONGLE) -#define CONFIG_SILENT_CONSOLE -#endif - #endif #if defined(CONFIG_TARGET_UCP1020) diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index b5be7b2806..f7bb29e955 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -35,7 +35,6 @@ #define CONFIG_BAUDRATE 9600 /* ... at 9600 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* define to enable silent console */ -#define CONFIG_SILENT_CONSOLE #define CONFIG_SYS_DEVICE_NULLDEV 1 /* include nulldev device */ /* diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 502ddad96b..c401b731e8 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -78,7 +78,6 @@ #define CONFIG_AUTO_COMPLETE 1 #define CONFIG_LOADS_ECHO 1 #define CONFIG_JTAG_CONSOLE -#define CONFIG_SILENT_CONSOLE #ifndef CONFIG_BAUDRATE # define CONFIG_BAUDRATE 57600 #endif diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index a054fafb55..b65ca3e290 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -33,7 +33,6 @@ #define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */ #define CONFIG_BAUDRATE 57600 /* ... at 57600 bps */ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } -#define CONFIG_SILENT_CONSOLE 1 /* needed to silence i2c_init() */ /* * Ethernet configuration diff --git a/include/configs/exynos5-common.h b/include/configs/exynos5-common.h index 51a0d190db..111b23d879 100644 --- a/include/configs/exynos5-common.h +++ b/include/configs/exynos5-common.h @@ -42,7 +42,6 @@ /* select serial console configuration */ #define CONFIG_BAUDRATE 115200 #define EXYNOS5_DEFAULT_UART_OFFSET 0x010000 -#define CONFIG_SILENT_CONSOLE #define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_CONSOLE_MUX diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h index d112fbcaa7..475d6ca570 100644 --- a/include/configs/exynos7420-common.h +++ b/include/configs/exynos7420-common.h @@ -53,7 +53,6 @@ /* select serial console configuration */ #define CONFIG_BAUDRATE 115200 -#define CONFIG_SILENT_CONSOLE #define CONFIG_SYS_CONSOLE_IS_IN_ENV #define CONFIG_CONSOLE_MUX diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index eefd93df6c..5aa823ff83 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -19,9 +19,6 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_DEEP_SLEEP -#if defined(CONFIG_DEEP_SLEEP) -#define CONFIG_SILENT_CONSOLE -#endif /* * Size of malloc() pool diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index da07329079..a6a0173e46 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -18,9 +18,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_DEEP_SLEEP -#ifdef CONFIG_DEEP_SLEEP -#define CONFIG_SILENT_CONSOLE -#endif /* * Size of malloc() pool diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h index 2e72889b47..97916652e1 100644 --- a/include/configs/pdm360ng.h +++ b/include/configs/pdm360ng.h @@ -36,7 +36,6 @@ /* Used for silent command in environment */ #define CONFIG_SYS_DEVICE_NULLDEV -#define CONFIG_SILENT_CONSOLE /* Video */ #define CONFIG_VIDEO diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index afd325778d..55c213e264 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -38,7 +38,6 @@ #define CONFIG_SPL_STACK 0xff718000 #define CONFIG_SPL_TEXT_BASE 0xff704004 -#define CONFIG_SILENT_CONSOLE #ifndef CONFIG_SPL_BUILD # define CONFIG_SYS_CONSOLE_IS_IN_ENV # define CONFIG_CONSOLE_MUX diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 94e024bfb2..bd005fc503 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -67,7 +67,6 @@ #define CONFIG_SYS_LONGHELP /* #undef to save memory */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ -#define CONFIG_SILENT_CONSOLE /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index ac7b31b895..6cd3ca5328 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -39,8 +39,6 @@ #include /* get chip and board defs */ #include -#define CONFIG_SILENT_CONSOLE - /* Clock Defines */ #define V_OSCK 26000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1) -- cgit