From d3b307787c0e6ece926d0e8c689d199d6ea02443 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 24 Sep 2012 12:00:19 +0200 Subject: [PATCH] zynq: Synchronize uart selection across all configs Signed-off-by: Michal Simek --- include/configs/zynq_afx.h | 7 ++----- include/configs/zynq_common.h | 19 ++++++++++++++++++- include/configs/zynq_cseflash.h | 8 +++++--- include/configs/zynq_ep107.h | 3 ++- include/configs/zynq_zc70x.h | 3 ++- include/configs/zynq_zc770.h | 20 ++++++++++++++------ include/configs/zynq_zed.h | 3 ++- 7 files changed, 45 insertions(+), 18 deletions(-) diff --git a/include/configs/zynq_afx.h b/include/configs/zynq_afx.h index 5a766b9091a..b11ac08c991 100644 --- a/include/configs/zynq_afx.h +++ b/include/configs/zynq_afx.h @@ -18,6 +18,8 @@ #ifndef __CONFIG_ZYNQ_AFX_H #define __CONFIG_ZYNQ_AFX_H +#define CONFIG_ZYNQ_SERIAL_UART1 + #include #if defined(CONFIG_AFX_NOR) @@ -78,11 +80,6 @@ */ #define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024) -/* - * UART Settings - */ -#define CONFIG_UART1 - /* * Ethernet Settings */ diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h index 1b97b1608ce..a38b39043f5 100644 --- a/include/configs/zynq_common.h +++ b/include/configs/zynq_common.h @@ -27,6 +27,24 @@ #define CONFIG_IPADDR 192.168.0.99 #define CONFIG_SERVERIP 192.168.0.101 +/* Zynq serial driver */ +#ifdef CONFIG_ZYNQ_SERIAL_UART0 +# define CONFIG_ZYNQ_SERIAL_BASEADDR0 0xE0000000 +# define CONFIG_ZYNQ_SERIAL_BAUDRATE0 CONFIG_BAUDRATE +# define CONFIG_ZYNQ_SERIAL_CLOCK0 50000000 +#endif + +#ifdef CONFIG_ZYNQ_SERIAL_UART1 +# define CONFIG_ZYNQ_SERIAL_BASEADDR1 0xE0001000 +# define CONFIG_ZYNQ_SERIAL_BAUDRATE1 CONFIG_BAUDRATE +# define CONFIG_ZYNQ_SERIAL_CLOCK1 50000000 +#endif + +#if defined(CONFIG_ZYNQ_SERIAL_UART0) || defined(CONFIG_ZYNQ_SERIAL_UART1) +#define CONFIG_SERIAL_MULTI +#define CONFIG_ZYNQ_SERIAL +#endif + #include #define CONFIG_SYS_TEXT_BASE 0x04000000 @@ -85,7 +103,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 38400, 115200 } #define CONFIG_BOOTDELAY 3 /* -1 to Disable autoboot */ -#define CONFIG_PSS_SERIAL #define CONFIG_RTC_XPSSRTC #define CONFIG_SYS_PROMPT "zynq-uboot> " diff --git a/include/configs/zynq_cseflash.h b/include/configs/zynq_cseflash.h index ac218fdfa9f..8f9640b1d60 100644 --- a/include/configs/zynq_cseflash.h +++ b/include/configs/zynq_cseflash.h @@ -6,6 +6,11 @@ #include +/* Disable uart console */ +#undef CONFIG_SERIAL_MULTI +#undef CONFIG_ZYNQ_SERIAL + + #define CONFIG_ARM_DCC #define CONFIG_CPU_V6 /* Required by CONFIG_ARM_DCC */ @@ -15,7 +20,6 @@ #undef CONFIG_OF_LIBFDT #undef CONFIG_ZYNQ_XIL_LQSPI -#undef CONFIG_PSS_SERIAL #undef CONFIG_RTC_XPSSRTC #undef CONFIG_SYS_NO_FLASH @@ -96,8 +100,6 @@ /* Because (at least at first) we're going to be loaded via JTAG_Tcl */ #define CONFIG_SKIP_LOWLEVEL_INIT -/* HW to use */ -#define CONFIG_UART1 #define CONFIG_TTC0 //#define CONFIG_GEM0 diff --git a/include/configs/zynq_ep107.h b/include/configs/zynq_ep107.h index e47d1df08be..b869fd95981 100644 --- a/include/configs/zynq_ep107.h +++ b/include/configs/zynq_ep107.h @@ -20,6 +20,8 @@ #define CONFIG_EP107 /* Board */ +#define CONFIG_ZYNQ_SERIAL_UART0 + #include #undef CONFIG_ZYNQ_XIL_LQSPI @@ -113,7 +115,6 @@ #endif /* HW to use */ -# define CONFIG_UART0 #define CONFIG_TTC0 #define CONFIG_GEM0 #define CONFIG_ZYNQ_GEM diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h index 40ebcfff306..e9c156a802b 100644 --- a/include/configs/zynq_zc70x.h +++ b/include/configs/zynq_zc70x.h @@ -18,6 +18,8 @@ #ifndef __CONFIG_ZYNQ_ZC70X_H #define __CONFIG_ZYNQ_ZC70X_H +#define CONFIG_ZYNQ_SERIAL_UART1 + #include #undef CONFIG_ZYNQ_XIL_LQSPI @@ -46,7 +48,6 @@ #define CONFIG_ZYNQ_IP_ENV /* HW to use */ -#define CONFIG_UART1 #define CONFIG_TTC0 #define CONFIG_GEM0 #define CONFIG_ZYNQ_GEM diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h index f71a9fec845..e9fc4f70703 100644 --- a/include/configs/zynq_zc770.h +++ b/include/configs/zynq_zc770.h @@ -18,6 +18,20 @@ #ifndef __CONFIG_ZYNQ_ZC770_H #define __CONFIG_ZYNQ_ZC770_H + +#if defined(CONFIG_ZC770_XM010) +# define CONFIG_ZYNQ_SERIAL_UART1 + +#elif defined(CONFIG_ZC770_XM011) +# define CONFIG_ZYNQ_SERIAL_UART1 + +#elif defined(CONFIG_ZC770_XM012) +# define CONFIG_ZYNQ_SERIAL_UART1 + +#else +# define CONFIG_ZYNQ_SERIAL_UART0 +#endif + #include #if defined(CONFIG_ZC770_XM012) @@ -83,12 +97,6 @@ */ #define PHYS_SDRAM_1_SIZE (1024 * 1024 * 1024) -#if defined(CONFIG_ZC770_XM010) || defined(CONFIG_ZC770_XM011) \ - || defined(CONFIG_ZC770_XM012) -#define CONFIG_UART1 -#else -#define CONFIG_UART0 -#endif /* * Ethernet Settings diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h index 6ad6887be3e..ed67ef840b3 100644 --- a/include/configs/zynq_zed.h +++ b/include/configs/zynq_zed.h @@ -18,6 +18,8 @@ #ifndef __CONFIG_ZYNQ_ZED_H #define __CONFIG_ZYNQ_ZED_H +#define CONFIG_ZYNQ_SERIAL_UART1 + #include #undef CONFIG_ZYNQ_XIL_LQSPI @@ -71,7 +73,6 @@ #define CONFIG_ZYNQ_IP_ENV /* HW to use */ -#define CONFIG_UART1 #define CONFIG_TTC0 #define CONFIG_GEM0 #define CONFIG_ZYNQ_GEM -- 2.47.3