Convert CONFIG_PL011_SERIAL et al to Kconfig

This converts the following to Kconfig:
   CONFIG_PL011_SERIAL
   CONFIG_PL01X_SERIAL

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index 6b57aa310ae0c71d1881fe226defcf64a52d4622..9606a8b3acf5477e1417c15ff9a072568093f05e 100644 (file)
--- a/README
+++ b/README
@@ -606,10 +606,6 @@ The following options need to be configured:
                                        controller register space
 
 - Serial Ports:
-               CONFIG_PL011_SERIAL
-
-               Define this if you want support for Amba PrimeCell PL011 UARTs.
-
                CONFIG_PL011_CLOCK
 
                If you have Amba PrimeCell PL011 UARTs, set this variable to

diff --git a/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig b/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig
index e502f61f4d7509d8fe560e611859b6faca5b241e..261154b5e69ae0c014f86e6199fbb7fca9acccfa 100644 (file)
--- a/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig
+++ b/configs/lx2160aqds_tfa_SECURE_BOOT_defconfig
@@ -82,6 +82,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y
+CONFIG_PL01X_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y

diff --git a/configs/lx2160aqds_tfa_defconfig b/configs/lx2160aqds_tfa_defconfig
index 98ad60abc7d103ecbeecca93fb4040fdf9e73dac..ddcf6812550eb894affbe78ae53fe085b067e826 100644 (file)
--- a/configs/lx2160aqds_tfa_defconfig
+++ b/configs/lx2160aqds_tfa_defconfig
@@ -89,6 +89,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y
+CONFIG_PL01X_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y

diff --git a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig
index 153b020a87913bede5d24c86b10582218e10d49e..a8af790286930d7f73d8cbc870cba62a99abd127 100644 (file)
--- a/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig
+++ b/configs/lx2160ardb_tfa_SECURE_BOOT_defconfig
@@ -74,6 +74,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y
+CONFIG_PL01X_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_NXP_FSPI=y

diff --git a/configs/lx2160ardb_tfa_defconfig b/configs/lx2160ardb_tfa_defconfig
index a1524244df0871e45b2a5954e471b5acb91a3866..d81a4b10b1493e4b42a255d18dee2b4a5b7d8b50 100644 (file)
--- a/configs/lx2160ardb_tfa_defconfig
+++ b/configs/lx2160ardb_tfa_defconfig
@@ -83,6 +83,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y
+CONFIG_PL01X_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_NXP_FSPI=y

diff --git a/configs/lx2160ardb_tfa_stmm_defconfig b/configs/lx2160ardb_tfa_stmm_defconfig
index 4cdf4112b00c56e100130f0ccf43b24e7a6ce53e..1d6ed44140286ca3bc881898f77d9b6bd7c78e6b 100644 (file)
--- a/configs/lx2160ardb_tfa_stmm_defconfig
+++ b/configs/lx2160ardb_tfa_stmm_defconfig
@@ -83,6 +83,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y
+CONFIG_PL01X_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_NXP_FSPI=y

diff --git a/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig b/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig
index 047ef6f8d0b3960be8f6352003b7341f6585e7cc..38e2307766e24c76e23342cf18efe68d03f6e63e 100644 (file)
--- a/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig
+++ b/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig
@@ -84,6 +84,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y
+CONFIG_PL01X_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y

diff --git a/configs/lx2162aqds_tfa_defconfig b/configs/lx2162aqds_tfa_defconfig
index bd05d513df65cd195fa1ef66b2d8cac11a910885..2028bfc5241bf02f4fc6b5edfbac7c3e41179139 100644 (file)
--- a/configs/lx2162aqds_tfa_defconfig
+++ b/configs/lx2162aqds_tfa_defconfig
@@ -92,6 +92,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y
+CONFIG_PL01X_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y

diff --git a/configs/lx2162aqds_tfa_verified_boot_defconfig b/configs/lx2162aqds_tfa_verified_boot_defconfig
index 654c9b20158539a3eaae7d3059dd62bb7920093b..0b08589ef23cae43c85e5e9d3368d60312a6ee16 100644 (file)
--- a/configs/lx2162aqds_tfa_verified_boot_defconfig
+++ b/configs/lx2162aqds_tfa_verified_boot_defconfig
@@ -93,6 +93,7 @@ CONFIG_DM_RTC=y
 CONFIG_RTC_PCF2127=y
 CONFIG_DM_SCSI=y
 CONFIG_DM_SERIAL=y
+CONFIG_PL01X_SERIAL=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_FSL_DSPI=y

diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index a9d826b87ae16687c729c3837eb0148105293e5d..7173fe6ba656a5a1a5a7ec53ca09ee6994c8968a 100644 (file)
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -55,7 +55,6 @@
 #define COUNTER_FREQUENCY              25000000        /* 25MHz */
 
 /* Serial Port */
-#define CONFIG_PL01X_SERIAL
 #define CONFIG_PL011_CLOCK             (get_bus_freq(0) / 4)
 #define CONFIG_SYS_SERIAL0             0x21c0000
 #define CONFIG_SYS_SERIAL1             0x21d0000

diff --git a/include/configs/synquacer.h b/include/configs/synquacer.h
index 43379cc03e5d33bfbbc540adb0b7f46f8f732997..713eda282138241a3aa59e2d0d32a56548d4e7c4 100644 (file)
--- a/include/configs/synquacer.h
+++ b/include/configs/synquacer.h
@@ -34,7 +34,6 @@
 /* Serial (pl011)       */
 #define UART_CLK                       (62500000)
 #define CONFIG_SERIAL_MULTI
-#define CONFIG_PL011_SERIAL
 #define CONFIG_PL011_CLOCK             UART_CLK
 #define CONFIG_PL01x_PORTS             {(void *)(0x2a400000)}