[U-Boot] [PATCH 2/3] serial: Migrate CONFIG_MCFUART
Tuomas Tynkkynen
tuomas at tuxera.com
Sat Apr 7 21:27:08 UTC 2018
Signed-off-by: Tuomas Tynkkynen <tuomas at tuxera.com>
---
arch/Kconfig | 1 +
drivers/serial/Kconfig | 5 +++++
include/configs/M5208EVBE.h | 1 -
include/configs/M52277EVB.h | 1 -
include/configs/M5235EVB.h | 1 -
include/configs/M5249EVB.h | 1 -
include/configs/M5253DEMO.h | 1 -
include/configs/M5253EVBE.h | 1 -
include/configs/M5272C3.h | 1 -
include/configs/M5275EVB.h | 1 -
include/configs/M5282EVB.h | 1 -
include/configs/M53017EVB.h | 1 -
include/configs/M5329EVB.h | 1 -
include/configs/M5373EVB.h | 1 -
include/configs/M54418TWR.h | 1 -
include/configs/M54451EVB.h | 1 -
include/configs/M54455EVB.h | 1 -
include/configs/M5475EVB.h | 1 -
include/configs/M5485EVB.h | 1 -
include/configs/amcore.h | 1 -
include/configs/astro_mcf5373l.h | 1 -
include/configs/cobra5272.h | 1 -
include/configs/eb_cpu5282.h | 1 -
include/configs/stmark2.h | 1 -
scripts/config_whitelist.txt | 1 -
25 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index e599e7a39c..c9310406c7 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -28,6 +28,7 @@ config M68K
select HAVE_PRIVATE_LIBGCC
select SYS_BOOT_GET_CMDLINE
select SYS_BOOT_GET_KBD
+ imply MCFUART
config MICROBLAZE
bool "MicroBlaze architecture"
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 0a01399961..9387b642b3 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -467,6 +467,11 @@ config FSL_LPUART
Select this to enable a Low Power UART for Freescale VF610 and
QorIQ Layerscape devices.
+config MCFUART
+ bool "ColdFire UART support"
+ help
+ Select this to enable UART support on some ColdFire m68k SoCs.
+
config MVEBU_A3700_UART
bool "UART support for Armada 3700"
default n
diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index 3385dcb5b7..d7d21b5708 100644
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -14,7 +14,6 @@
* High Level Configuration Options
* (easy to change)
*/
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#undef CONFIG_WATCHDOG
diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 7798b06625..16005f7ef5 100644
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -19,7 +19,6 @@
* (easy to change)
*/
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#undef CONFIG_WATCHDOG
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index d221f718f0..3600418907 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -19,7 +19,6 @@
* (easy to change)
*/
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#undef CONFIG_WATCHDOG
diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index 6b37e46c56..fa78918197 100644
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -20,7 +20,6 @@
*/
#define CONFIG_MCFTMR
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#undef CONFIG_WATCHDOG
diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h
index cf10f306c7..7b21e68dd1 100644
--- a/include/configs/M5253DEMO.h
+++ b/include/configs/M5253DEMO.h
@@ -9,7 +9,6 @@
#define CONFIG_MCFTMR
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#undef CONFIG_WATCHDOG /* disable watchdog */
diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h
index daa44b315b..4a23379be7 100644
--- a/include/configs/M5253EVBE.h
+++ b/include/configs/M5253EVBE.h
@@ -10,7 +10,6 @@
#define CONFIG_MCFTMR
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#undef CONFIG_WATCHDOG /* disable watchdog */
diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h
index 936a91e27d..bf02282e97 100644
--- a/include/configs/M5272C3.h
+++ b/include/configs/M5272C3.h
@@ -19,7 +19,6 @@
*/
#define CONFIG_MCFTMR
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#undef CONFIG_WATCHDOG
diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h
index 1babb72fd0..12836140c4 100644
--- a/include/configs/M5275EVB.h
+++ b/include/configs/M5275EVB.h
@@ -24,7 +24,6 @@
#define CONFIG_MCFTMR
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
/* Configuration for environment
diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h
index b29515077a..5a31d3d860 100644
--- a/include/configs/M5282EVB.h
+++ b/include/configs/M5282EVB.h
@@ -19,7 +19,6 @@
*/
#define CONFIG_MCFTMR
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#undef CONFIG_MONITOR_IS_IN_RAM /* define if monitor is started from a pre-loader */
diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index 96fb87bc7c..a33c91d0e4 100644
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -19,7 +19,6 @@
* (easy to change)
*/
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#undef CONFIG_WATCHDOG
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index 5a994859f1..1e0eb0c657 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -19,7 +19,6 @@
* (easy to change)
*/
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#undef CONFIG_WATCHDOG
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 7b2d1bb398..92b1f31b30 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -19,7 +19,6 @@
* (easy to change)
*/
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#undef CONFIG_WATCHDOG
diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h
index ba9ba00698..a3ba39d063 100644
--- a/include/configs/M54418TWR.h
+++ b/include/configs/M54418TWR.h
@@ -19,7 +19,6 @@
* (easy to change)
*/
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#define CONFIG_SYS_BAUDRATE_TABLE { 9600 , 19200 , 38400 , 57600, 115200 }
diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index b144332b22..273fac319d 100644
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -20,7 +20,6 @@
*/
#define CONFIG_M54451EVB /* M54451EVB board */
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#define LDS_BOARD_TEXT board/freescale/m54451evb/sbf_dram_init.o (.text*)
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index 14dd2a516e..274a83126c 100644
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -20,7 +20,6 @@
*/
#define CONFIG_M54455EVB /* M54455EVB board */
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#define LDS_BOARD_TEXT board/freescale/m54455evb/sbf_dram_init.o (.text*)
diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h
index 566f24e3b1..a04d2bc883 100644
--- a/include/configs/M5475EVB.h
+++ b/include/configs/M5475EVB.h
@@ -19,7 +19,6 @@
* (easy to change)
*/
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#undef CONFIG_HW_WATCHDOG
diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h
index 31564748bc..cbe29102af 100644
--- a/include/configs/M5485EVB.h
+++ b/include/configs/M5485EVB.h
@@ -19,7 +19,6 @@
* (easy to change)
*/
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#undef CONFIG_HW_WATCHDOG
diff --git a/include/configs/amcore.h b/include/configs/amcore.h
index 569fd982b6..865d3fee48 100644
--- a/include/configs/amcore.h
+++ b/include/configs/amcore.h
@@ -12,7 +12,6 @@
#define CONFIG_HOSTNAME AMCORE
#define CONFIG_MCFTMR
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT 0
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 4a62bce40f..1f3b457e33 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -89,7 +89,6 @@
* in u-boot command interface
*/
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (2)
#define CONFIG_SYS_UART2_ALT3_GPIO
diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h
index ee870f916f..e8bba609ee 100644
--- a/include/configs/cobra5272.h
+++ b/include/configs/cobra5272.h
@@ -50,7 +50,6 @@
* ---
*/
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
/* ---
diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h
index d79cbf7791..786458fdf7 100644
--- a/include/configs/eb_cpu5282.h
+++ b/include/configs/eb_cpu5282.h
@@ -17,7 +17,6 @@
#define CONFIG_MISC_INIT_R
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT (0)
#undef CONFIG_MONITOR_IS_IN_RAM /* starts uboot direct */
diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index d20dd9c3c5..d79d5390e1 100644
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -11,7 +11,6 @@
#define CONFIG_HOSTNAME stmark2
-#define CONFIG_MCFUART
#define CONFIG_SYS_UART_PORT 0
#define CONFIG_SYS_BAUDRATE_TABLE { 9600 , 19200 , 38400 , 57600, 115200 }
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 831b4add54..30da0122f0 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1250,7 +1250,6 @@ CONFIG_MCFFEC
CONFIG_MCFPIT
CONFIG_MCFRTC
CONFIG_MCFTMR
-CONFIG_MCFUART
CONFIG_MCLK_DIS
CONFIG_MDIO_TIMEOUT
CONFIG_MEMSIZE
--
2.16.3
More information about the U-Boot
mailing list