| Message ID | 20211108035951.3580952-18-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | 1914075c88fb645987955f6d0595c56e3a78a1c0 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [01/20] Convert CONFIG_ARCH_CPU_INIT to Kconfig | expand |
On Sun, Nov 07, 2021 at 10:59:49PM -0500, Tom Rini wrote: > This converts the following to Kconfig: > CONFIG_PL011_SERIAL > CONFIG_PL01X_SERIAL > > Signed-off-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks!
diff --git a/README b/README index d3a47e7d85ec..d0f775033920 100644 --- a/README +++ b/README @@ -605,10 +605,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 e502f61f4d75..261154b5e69a 100644 --- 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 98ad60abc7d1..ddcf6812550e 100644 --- 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 153b020a8791..a8af79028693 100644 --- 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 a1524244df08..d81a4b10b149 100644 --- 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 4cdf4112b00c..1d6ed4414028 100644 --- 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 b14d69426fb6..bb96c6ff2f34 100644 --- a/configs/lx2162aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/lx2162aqds_tfa_SECURE_BOOT_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_FSL_DSPI=y diff --git a/configs/lx2162aqds_tfa_defconfig b/configs/lx2162aqds_tfa_defconfig index be33ee0c3399..a3448c84561d 100644 --- a/configs/lx2162aqds_tfa_defconfig +++ b/configs/lx2162aqds_tfa_defconfig @@ -91,6 +91,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 3aafc74a92c7..0adaf2642cb0 100644 --- a/configs/lx2162aqds_tfa_verified_boot_defconfig +++ b/configs/lx2162aqds_tfa_verified_boot_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/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index a9d826b87ae1..7173fe6ba656 100644 --- 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 43379cc03e5d..713eda282138 100644 --- 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)}
This converts the following to Kconfig: CONFIG_PL011_SERIAL CONFIG_PL01X_SERIAL Signed-off-by: Tom Rini <trini@konsulko.com> --- README | 4 ---- configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160aqds_tfa_defconfig | 1 + configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160ardb_tfa_defconfig | 1 + configs/lx2160ardb_tfa_stmm_defconfig | 1 + configs/lx2162aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2162aqds_tfa_defconfig | 1 + configs/lx2162aqds_tfa_verified_boot_defconfig | 1 + include/configs/lx2160a_common.h | 1 - include/configs/synquacer.h | 1 - 11 files changed, 8 insertions(+), 6 deletions(-)