Home Explore Help
Sign In
coolsoul
/
u-boot
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

arm: zynq: Move ZYNQ_SERIAL to Kconfig

Move cadence/zynq serial driver via Kconfig

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Michal Simek 7 years ago
parent
7fad6125e4
commit
809704eb4f
27 changed files with 30 additions and 3 deletions
Split View Show Diff Stats
  1. 1 0
      configs/syzygy_hub_defconfig
  2. 1 0
      configs/topic_miami_defconfig
  3. 1 0
      configs/topic_miamilite_defconfig
  4. 1 0
      configs/topic_miamiplus_defconfig
  5. 1 0
      configs/xilinx_zynqmp_ep_defconfig
  6. 1 0
      configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
  7. 1 0
      configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
  8. 1 0
      configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
  9. 1 0
      configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
  10. 1 0
      configs/xilinx_zynqmp_zcu102_revA_defconfig
  11. 1 0
      configs/xilinx_zynqmp_zcu102_revB_defconfig
  12. 1 0
      configs/zynq_cc108_defconfig
  13. 1 0
      configs/zynq_microzed_defconfig
  14. 1 0
      configs/zynq_picozed_defconfig
  15. 1 0
      configs/zynq_z_turn_defconfig
  16. 1 0
      configs/zynq_zc702_defconfig
  17. 1 0
      configs/zynq_zc706_defconfig
  18. 1 0
      configs/zynq_zc770_xm010_defconfig
  19. 1 0
      configs/zynq_zc770_xm011_defconfig
  20. 1 0
      configs/zynq_zc770_xm012_defconfig
  21. 1 0
      configs/zynq_zc770_xm013_defconfig
  22. 1 0
      configs/zynq_zed_defconfig
  23. 1 0
      configs/zynq_zybo_defconfig
  24. 7 0
      drivers/serial/Kconfig
  25. 0 1
      include/configs/xilinx_zynqmp.h
  26. 0 1
      include/configs/zynq-common.h
  27. 0 1
      scripts/config_whitelist.txt

+ 1 - 0
configs/syzygy_hub_defconfig
View File 

@@ -44,6 +44,7 @@ CONFIG_ZYNQ_GEM=y
 
 CONFIG_DEBUG_UART_ZYNQ=y
 
 CONFIG_DEBUG_UART_BASE=0xe0000000
 
 CONFIG_DEBUG_UART_CLOCK=50000000
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_USB=y
 
 CONFIG_USB_EHCI_HCD=y
 
 CONFIG_USB_ULPI_VIEWPORT=y

+ 1 - 0
configs/topic_miami_defconfig
View File 

@@ -39,6 +39,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_DEBUG_UART_ZYNQ=y
 
 CONFIG_DEBUG_UART_BASE=0xe0000000
 
 CONFIG_DEBUG_UART_CLOCK=100000000
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_ZYNQ_QSPI=y
 
 CONFIG_USB=y
 
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/topic_miamilite_defconfig
View File 

@@ -40,6 +40,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_DEBUG_UART_ZYNQ=y
 
 CONFIG_DEBUG_UART_BASE=0xe0000000
 
 CONFIG_DEBUG_UART_CLOCK=100000000
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_ZYNQ_QSPI=y
 
 CONFIG_USB=y
 
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/topic_miamiplus_defconfig
View File 

@@ -39,6 +39,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_DEBUG_UART_ZYNQ=y
 
 CONFIG_DEBUG_UART_BASE=0xe0000000
 
 CONFIG_DEBUG_UART_CLOCK=100000000
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_ZYNQ_QSPI=y
 
 CONFIG_USB=y
 
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/xilinx_zynqmp_ep_defconfig
View File 

@@ -72,6 +72,7 @@ CONFIG_DEBUG_UART_ZYNQ=y
 
 CONFIG_DEBUG_UART_BASE=0xff000000
 
 CONFIG_DEBUG_UART_CLOCK=25000000
 
 CONFIG_DEBUG_UART_ANNOUNCE=y
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_USB=y
 
 CONFIG_USB_XHCI_HCD=y
 
 CONFIG_USB_XHCI_DWC3=y

+ 1 - 0
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
View File 

@@ -62,6 +62,7 @@ CONFIG_DEBUG_UART_ZYNQ=y
 
 CONFIG_DEBUG_UART_BASE=0xff000000
 
 CONFIG_DEBUG_UART_CLOCK=100000000
 
 CONFIG_DEBUG_UART_ANNOUNCE=y
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_USB=y
 
 CONFIG_USB_XHCI_HCD=y
 
 CONFIG_USB_XHCI_DWC3=y

+ 1 - 0
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
View File 

@@ -60,6 +60,7 @@ CONFIG_DEBUG_UART_ZYNQ=y
 
 CONFIG_DEBUG_UART_BASE=0xff000000
 
 CONFIG_DEBUG_UART_CLOCK=100000000
 
 CONFIG_DEBUG_UART_ANNOUNCE=y
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_USB=y
 
 CONFIG_USB_XHCI_HCD=y
 
 CONFIG_USB_XHCI_DWC3=y

+ 1 - 0
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
View File 

@@ -45,3 +45,4 @@ CONFIG_DEBUG_UART_ZYNQ=y
 
 CONFIG_DEBUG_UART_BASE=0xff000000
 
 CONFIG_DEBUG_UART_CLOCK=100000000
 
 CONFIG_DEBUG_UART_ANNOUNCE=y
 
+CONFIG_ZYNQ_SERIAL=y

+ 1 - 0
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
View File 

@@ -38,4 +38,5 @@ CONFIG_DM_MMC=y
 
 CONFIG_MMC_SDHCI=y
 
 CONFIG_MMC_SDHCI_ZYNQ=y
 
 CONFIG_DM_ETH=y
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

+ 1 - 0
configs/xilinx_zynqmp_zcu102_revA_defconfig
View File 

@@ -65,6 +65,7 @@ CONFIG_DEBUG_UART_ZYNQ=y
 
 CONFIG_DEBUG_UART_BASE=0xff000000
 
 CONFIG_DEBUG_UART_CLOCK=100000000
 
 CONFIG_DEBUG_UART_ANNOUNCE=y
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_USB=y
 
 CONFIG_USB_XHCI_HCD=y
 
 CONFIG_USB_XHCI_DWC3=y

+ 1 - 0
configs/xilinx_zynqmp_zcu102_revB_defconfig
View File 

@@ -65,6 +65,7 @@ CONFIG_DEBUG_UART_ZYNQ=y
 
 CONFIG_DEBUG_UART_BASE=0xff000000
 
 CONFIG_DEBUG_UART_CLOCK=100000000
 
 CONFIG_DEBUG_UART_ANNOUNCE=y
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_USB=y
 
 CONFIG_USB_XHCI_HCD=y
 
 CONFIG_USB_XHCI_DWC3=y

+ 1 - 0
configs/zynq_cc108_defconfig
View File 

@@ -44,6 +44,7 @@ CONFIG_DEBUG_UART_ZYNQ=y
 
 CONFIG_DEBUG_UART_BASE=0xe0000000
 
 CONFIG_DEBUG_UART_CLOCK=50000000
 
 CONFIG_DEBUG_UART_ANNOUNCE=y
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_ZYNQ_QSPI=y
 
 CONFIG_USB=y
 
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/zynq_microzed_defconfig
View File 

@@ -46,6 +46,7 @@ CONFIG_SPI_FLASH_SPANSION=y
 
 CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_ZYNQ_GEM=y
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_ZYNQ_QSPI=y
 
 CONFIG_USB=y
 
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/zynq_picozed_defconfig
View File 

@@ -36,6 +36,7 @@ CONFIG_FPGA_XILINX=y
 
 CONFIG_MMC_SDHCI=y
 
 CONFIG_MMC_SDHCI_ZYNQ=y
 
 CONFIG_ZYNQ_GEM=y
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_USB=y
 
 CONFIG_USB_EHCI_HCD=y
 
 CONFIG_USB_ULPI_VIEWPORT=y

+ 1 - 0
configs/zynq_z_turn_defconfig
View File 

@@ -45,6 +45,7 @@ CONFIG_ZYNQ_GEM=y
 
 CONFIG_DEBUG_UART_ZYNQ=y
 
 CONFIG_DEBUG_UART_BASE=0xe0001000
 
 CONFIG_DEBUG_UART_CLOCK=50000000
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_ZYNQ_QSPI=y
 
 CONFIG_USB=y
 
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/zynq_zc702_defconfig
View File 

@@ -55,6 +55,7 @@ CONFIG_ZYNQ_GEM=y
 
 CONFIG_DEBUG_UART_ZYNQ=y
 
 CONFIG_DEBUG_UART_BASE=0xe0001000
 
 CONFIG_DEBUG_UART_CLOCK=50000000
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_ZYNQ_QSPI=y
 
 CONFIG_USB=y
 
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/zynq_zc706_defconfig
View File 

@@ -51,6 +51,7 @@ CONFIG_SPI_FLASH_SPANSION=y
 
 CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_ZYNQ_GEM=y
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_ZYNQ_QSPI=y
 
 CONFIG_USB=y
 
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/zynq_zc770_xm010_defconfig
View File 

@@ -49,5 +49,6 @@ CONFIG_ZYNQ_GEM=y
 
 CONFIG_DEBUG_UART_ZYNQ=y
 
 CONFIG_DEBUG_UART_BASE=0xe0001000
 
 CONFIG_DEBUG_UART_CLOCK=50000000
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_ZYNQ_SPI=y
 
 CONFIG_ZYNQ_QSPI=y

+ 1 - 0
configs/zynq_zc770_xm011_defconfig
View File 

@@ -33,3 +33,4 @@ CONFIG_FPGA_XILINX=y
 
 CONFIG_NAND=y
 
 CONFIG_NAND_ZYNQ=y
 
 CONFIG_ZYNQ_GEM=y
 
+CONFIG_ZYNQ_SERIAL=y

+ 1 - 0
configs/zynq_zc770_xm012_defconfig
View File 

@@ -32,3 +32,4 @@ CONFIG_FPGA_XILINX=y
 
 # CONFIG_MMC is not set
 
 CONFIG_MTD_NOR_FLASH=y
 
 CONFIG_ZYNQ_GEM=y
 
+CONFIG_ZYNQ_SERIAL=y

+ 1 - 0
configs/zynq_zc770_xm013_defconfig
View File 

@@ -36,4 +36,5 @@ CONFIG_SPI_FLASH_SPANSION=y
 
 CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_ZYNQ_GEM=y
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_ZYNQ_QSPI=y

+ 1 - 0
configs/zynq_zed_defconfig
View File 

@@ -47,6 +47,7 @@ CONFIG_SPI_FLASH_SPANSION=y
 
 CONFIG_SPI_FLASH_STMICRO=y
 
 CONFIG_SPI_FLASH_WINBOND=y
 
 CONFIG_ZYNQ_GEM=y
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_ZYNQ_QSPI=y
 
 CONFIG_USB=y
 
 CONFIG_USB_EHCI_HCD=y

+ 1 - 0
configs/zynq_zybo_defconfig
View File 

@@ -51,6 +51,7 @@ CONFIG_ZYNQ_GEM=y
 
 CONFIG_DEBUG_UART_ZYNQ=y
 
 CONFIG_DEBUG_UART_BASE=0xe0001000
 
 CONFIG_DEBUG_UART_CLOCK=50000000
 
+CONFIG_ZYNQ_SERIAL=y
 
 CONFIG_ZYNQ_QSPI=y
 
 CONFIG_USB=y
 
 CONFIG_USB_EHCI_HCD=y

+ 7 - 0
drivers/serial/Kconfig
View File 

@@ -537,6 +537,13 @@ config STM32X7_SERIAL
 
 	  enable its onboard serial ports, say Y to this option.
 
 	  If unsure, say N.
 
 
+config ZYNQ_SERIAL
 
+	bool "Cadence (Xilinx Zynq) UART support"
 
+	depends on DM_SERIAL && (MICROBLAZE || ARCH_ZYNQ || ARCH_ZYNQMP)
 
+	help
 
+	  This driver supports the Cadence UART. It is found e.g. in Xilinx
 
+	  Zynq/ZynqMP.
 
+
 
 config MPC8XX_CONS
 
 	bool "Console driver for MPC8XX"
 
 	depends on 8xx

+ 0 - 1
include/configs/xilinx_zynqmp.h
View File 

@@ -42,7 +42,6 @@
 
 /* Serial setup */
 
 #define CONFIG_ARM_DCC
 
 #define CONFIG_CPU_ARMV8
 
-#define CONFIG_ZYNQ_SERIAL
 
 
 #define CONFIG_CONS_INDEX		0
 
 #define CONFIG_SYS_BAUDRATE_TABLE \

+ 0 - 1
include/configs/zynq-common.h
View File 

@@ -33,7 +33,6 @@
 
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
 
 #define CONFIG_ARM_DCC
 
-#define CONFIG_ZYNQ_SERIAL
 
 
 /* Ethernet driver */
 
 #if defined(CONFIG_ZYNQ_GEM)

+ 0 - 1
scripts/config_whitelist.txt
View File 

@@ -5109,5 +5109,4 @@ CONFIG_ZYNQ_SDHCI0
 
 CONFIG_ZYNQ_SDHCI1
 
 CONFIG_ZYNQ_SDHCI_MAX_FREQ
 
 CONFIG_ZYNQ_SDHCI_MIN_FREQ
 
-CONFIG_ZYNQ_SERIAL
 
 CONFIG_eTSEC_MDIO_BUS