All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v4 01/29] zynq: Enable CONFIG_FIT_VERBOSE
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 02/29] zynq: Enable Boot FreeBSD/vxWorks Jagannadha Sutradharudu Teki
                   ` (27 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

Enabled fit_format_{error,warning}()

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 include/configs/zynq.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/configs/zynq.h b/include/configs/zynq.h
index 82ec826..6019c4a 100644
--- a/include/configs/zynq.h
+++ b/include/configs/zynq.h
@@ -127,6 +127,7 @@
 
 /* OF */
 #define CONFIG_FIT
+#define CONFIG_FIT_VERBOSE	1 /* enable fit_format_{error,warning}() */
 #define CONFIG_OF_LIBFDT
 
 /* Commands */
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 02/29] zynq: Enable Boot FreeBSD/vxWorks
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 01/29] zynq: Enable CONFIG_FIT_VERBOSE Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 03/29] zynq: Cleanup on miscellaneous configs Jagannadha Sutradharudu Teki
                   ` (26 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

This enabled Boot FreeBSD/vxWorks from an ELF image support

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 include/configs/zynq.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/configs/zynq.h b/include/configs/zynq.h
index 6019c4a..0492818 100644
--- a/include/configs/zynq.h
+++ b/include/configs/zynq.h
@@ -130,6 +130,13 @@
 #define CONFIG_FIT_VERBOSE	1 /* enable fit_format_{error,warning}() */
 #define CONFIG_OF_LIBFDT
 
+/* Boot FreeBSD/vxWorks from an ELF image */
+#if defined(CONFIG_ZYNQ_BOOT_FREEBSD)
+# define CONFIG_API
+# define CONFIG_CMD_ELF
+# define CONFIG_SYS_MMC_MAX_DEVICE	1
+#endif
+
 /* Commands */
 #include <config_cmd_default.h>
 
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 03/29] zynq: Cleanup on miscellaneous configs
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 01/29] zynq: Enable CONFIG_FIT_VERBOSE Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 02/29] zynq: Enable Boot FreeBSD/vxWorks Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 04/29] zynq: Cleanup on memory configs Jagannadha Sutradharudu Teki
                   ` (25 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

Cleanup on miscellaneous configurable options:
- Rename SYS_PROMPT as "zynq-uboot"
- Add comment
- Re-order configs

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 include/configs/zynq.h | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/include/configs/zynq.h b/include/configs/zynq.h
index 0492818..e34024d 100644
--- a/include/configs/zynq.h
+++ b/include/configs/zynq.h
@@ -111,19 +111,20 @@
 						CONFIG_SYS_INIT_RAM_SIZE - \
 						GENERATED_GBL_DATA_SIZE)
 
-#define CONFIG_SYS_PROMPT	"U-Boot> "
-#define CONFIG_SYS_CBSIZE	256 /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + \
+/* Miscellaneous configurable options */
+#define CONFIG_SYS_PROMPT		"zynq-uboot> "
+#define CONFIG_SYS_HUSH_PARSER
+
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_MAXARGS		15 /* max number of command args */
+#define CONFIG_SYS_CBSIZE		256 /* Console I/O Buffer Size */
+#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 
 #define CONFIG_SYS_LOAD_ADDR	0
-#define CONFIG_SYS_MAXARGS	15 /* max number of command args */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
 
-#define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 
 /* OF */
 #define CONFIG_FIT
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 04/29] zynq: Cleanup on memory configs
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (2 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 03/29] zynq: Cleanup on miscellaneous configs Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 05/29] zynq: Minor config cleanup Jagannadha Sutradharudu Teki
                   ` (24 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

Cleanup on memory configuration options:
- Add comment
- Re-order configs

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 include/configs/zynq.h | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/include/configs/zynq.h b/include/configs/zynq.h
index e34024d..8be52df 100644
--- a/include/configs/zynq.h
+++ b/include/configs/zynq.h
@@ -13,14 +13,6 @@
 /* CPU clock */
 #define CONFIG_CPU_FREQ_HZ	800000000
 
-/* Ram */
-#define CONFIG_NR_DRAM_BANKS		1
-#define CONFIG_SYS_TEXT_BASE		0
-#define CONFIG_SYS_SDRAM_BASE		0
-#define CONFIG_SYS_SDRAM_SIZE		0x40000000
-#define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
-#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_SDRAM_BASE + 0x1000)
-
 /* The following table includes the supported baudrates */
 #define CONFIG_SYS_BAUDRATE_TABLE  \
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
@@ -105,11 +97,6 @@
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_SYS_MALLOC_LEN		0x400000
-#define CONFIG_SYS_INIT_RAM_ADDR	CONFIG_SYS_SDRAM_BASE
-#define CONFIG_SYS_INIT_RAM_SIZE	CONFIG_SYS_MALLOC_LEN
-#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR + \
-						CONFIG_SYS_INIT_RAM_SIZE - \
-						GENERATED_GBL_DATA_SIZE)
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_PROMPT		"zynq-uboot> "
@@ -125,7 +112,21 @@
 
 #define CONFIG_SYS_LOAD_ADDR	0
 
+/* Physical Memory map */
+#define CONFIG_SYS_TEXT_BASE		0
 
+#define CONFIG_NR_DRAM_BANKS		1
+#define CONFIG_SYS_SDRAM_BASE		0
+#define CONFIG_SYS_SDRAM_SIZE		0x40000000
+
+#define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
+#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_SDRAM_BASE + 0x1000)
+
+#define CONFIG_SYS_INIT_RAM_ADDR	CONFIG_SYS_SDRAM_BASE
+#define CONFIG_SYS_INIT_RAM_SIZE	CONFIG_SYS_MALLOC_LEN
+#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR + \
+					CONFIG_SYS_INIT_RAM_SIZE - \
+					GENERATED_GBL_DATA_SIZE)
 /* OF */
 #define CONFIG_FIT
 #define CONFIG_FIT_VERBOSE	1 /* enable fit_format_{error,warning}() */
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 05/29] zynq: Minor config cleanup
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (3 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 04/29] zynq: Cleanup on memory configs Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 06/29] zynq: Enable cache options Jagannadha Sutradharudu Teki
                   ` (23 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

Cleanups mostly on:
- Add comments
- Re-order configs
- Remove #define CONFIG_ZYNQ_SDHCI

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 include/configs/zynq.h | 76 ++++++++++++++++++++++++++------------------------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/include/configs/zynq.h b/include/configs/zynq.h
index 8be52df..c8ab06f 100644
--- a/include/configs/zynq.h
+++ b/include/configs/zynq.h
@@ -7,33 +7,51 @@
 #ifndef __CONFIG_ZYNQ_H
 #define __CONFIG_ZYNQ_H
 
-#define CONFIG_ARMV7 /* This is an ARM V7 CPU core */
+/* High Level configuration Options */
+#define CONFIG_ARMV7
 #define CONFIG_ZYNQ
 
 /* CPU clock */
-#define CONFIG_CPU_FREQ_HZ	800000000
+#ifndef CONFIG_CPU_FREQ_HZ
+# define CONFIG_CPU_FREQ_HZ	800000000
+#endif
 
+/* Serial drivers */
+#define CONFIG_BAUDRATE		115200
 /* The following table includes the supported baudrates */
 #define CONFIG_SYS_BAUDRATE_TABLE  \
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
-#define CONFIG_BAUDRATE		115200
-
-/* XPSS Serial driver */
+/* Zynq Serial driver */
 #define CONFIG_ZYNQ_SERIAL
 #define CONFIG_ZYNQ_SERIAL_BASEADDR0	0xE0001000
 #define CONFIG_ZYNQ_SERIAL_BAUDRATE0	CONFIG_BAUDRATE
 #define CONFIG_ZYNQ_SERIAL_CLOCK0	50000000
 
+/* DCC driver */
+#if defined(CONFIG_ZYNQ_DCC)
+# define CONFIG_ARM_DCC
+# define CONFIG_CPU_V6 /* Required by CONFIG_ARM_DCC */
+#endif
+
 /* Ethernet driver */
 #define CONFIG_NET_MULTI
 #define CONFIG_ZYNQ_GEM
 #define CONFIG_ZYNQ_GEM0
 #define CONFIG_ZYNQ_GEM_PHY_ADDR0	7
 
-#define CONFIG_ZYNQ_SDHCI
-#define CONFIG_ZYNQ_SDHCI0
+#define CONFIG_ZYNQ_SPI
+/* SPI */
+#ifdef CONFIG_ZYNQ_SPI
+# define CONFIG_SPI_FLASH
+# define CONFIG_SPI_FLASH_SST
+# define CONFIG_CMD_SF
+#endif
+
+/* NOR */
+#define CONFIG_SYS_NO_FLASH
 
+#define CONFIG_ZYNQ_SDHCI0
 /* MMC */
 #if defined(CONFIG_ZYNQ_SDHCI0) || defined(CONFIG_ZYNQ_SDHCI1)
 # define CONFIG_MMC
@@ -48,7 +66,6 @@
 #endif
 
 #define CONFIG_ZYNQ_I2C0
-
 /* I2C */
 #if defined(CONFIG_ZYNQ_I2C0) || defined(CONFIG_ZYNQ_I2C1)
 # define CONFIG_CMD_I2C
@@ -58,26 +75,6 @@
 # define CONFIG_SYS_I2C_ZYNQ_SLAVE		1
 #endif
 
-#if defined(CONFIG_ZYNQ_DCC)
-# define CONFIG_ARM_DCC
-# define CONFIG_CPU_V6 /* Required by CONFIG_ARM_DCC */
-#endif
-
-#define CONFIG_ZYNQ_SPI
-
-/* SPI */
-#ifdef CONFIG_ZYNQ_SPI
-# define CONFIG_SPI_FLASH
-# define CONFIG_SPI_FLASH_SST
-# define CONFIG_CMD_SF
-#endif
-
-/* Enable the PL to be downloaded */
-#define CONFIG_FPGA
-#define CONFIG_FPGA_XILINX
-#define CONFIG_FPGA_ZYNQPL
-#define CONFIG_CMD_FPGA
-
 #define CONFIG_BOOTP_SERVERIP
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_GATEWAY
@@ -91,12 +88,9 @@
 #define CONFIG_PHY_MARVELL
 
 /* Environment */
+#define CONFIG_ENV_SIZE		0x10000 /* Env. sector size */
 #define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_ENV_SIZE 0x10000
-
-#define CONFIG_SYS_NO_FLASH
-
-#define CONFIG_SYS_MALLOC_LEN		0x400000
+#define CONFIG_SYS_LOAD_ADDR	0
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_PROMPT		"zynq-uboot> "
@@ -110,8 +104,6 @@
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 
-#define CONFIG_SYS_LOAD_ADDR	0
-
 /* Physical Memory map */
 #define CONFIG_SYS_TEXT_BASE		0
 
@@ -122,15 +114,25 @@
 #define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_SDRAM_BASE + 0x1000)
 
+#define CONFIG_SYS_MALLOC_LEN		0x400000
 #define CONFIG_SYS_INIT_RAM_ADDR	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_INIT_RAM_SIZE	CONFIG_SYS_MALLOC_LEN
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_INIT_RAM_ADDR + \
 					CONFIG_SYS_INIT_RAM_SIZE - \
 					GENERATED_GBL_DATA_SIZE)
-/* OF */
+
+/* Enable the PL to be downloaded */
+#define CONFIG_FPGA
+#define CONFIG_FPGA_XILINX
+#define CONFIG_FPGA_ZYNQPL
+#define CONFIG_CMD_FPGA
+
+/* Open Firmware flat tree */
+#define CONFIG_OF_LIBFDT
+
+/* FIT support */
 #define CONFIG_FIT
 #define CONFIG_FIT_VERBOSE	1 /* enable fit_format_{error,warning}() */
-#define CONFIG_OF_LIBFDT
 
 /* Boot FreeBSD/vxWorks from an ELF image */
 #if defined(CONFIG_ZYNQ_BOOT_FREEBSD)
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 06/29] zynq: Enable cache options
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (4 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 05/29] zynq: Minor config cleanup Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 07/29] zynq: Add UART0, UART1 configs support Jagannadha Sutradharudu Teki
                   ` (22 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

- Enable cache command
- Turn-off L2 cache
- Turn-on D-cache

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 include/configs/zynq.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/include/configs/zynq.h b/include/configs/zynq.h
index c8ab06f..6e545e5 100644
--- a/include/configs/zynq.h
+++ b/include/configs/zynq.h
@@ -16,6 +16,16 @@
 # define CONFIG_CPU_FREQ_HZ	800000000
 #endif
 
+/* Cache options */
+#define CONFIG_CMD_CACHE
+#define CONFIG_SYS_CACHELINE_SIZE	32
+
+#define CONFIG_SYS_L2CACHE_OFF
+#ifndef CONFIG_SYS_L2CACHE_OFF
+# define CONFIG_SYS_L2_PL310
+# define CONFIG_SYS_PL310_BASE		0xf8f02000
+#endif
+
 /* Serial drivers */
 #define CONFIG_BAUDRATE		115200
 /* The following table includes the supported baudrates */
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 07/29] zynq: Add UART0, UART1 configs support
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (5 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 06/29] zynq: Enable cache options Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 08/29] zynq: Add GEM0, GEM1 " Jagannadha Sutradharudu Teki
                   ` (21 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

Zynq uart controller support two serial ports like
CONFIG_ZYNQ_SERIAL_UART0 and CONFIG_ZYNQ_SERIAL_UART1
enabled both so-that the respective board will define
these macros based on their usage.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 include/configs/zynq.h | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/include/configs/zynq.h b/include/configs/zynq.h
index 6e545e5..f104558 100644
--- a/include/configs/zynq.h
+++ b/include/configs/zynq.h
@@ -33,10 +33,22 @@
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
 /* Zynq Serial driver */
-#define CONFIG_ZYNQ_SERIAL
-#define CONFIG_ZYNQ_SERIAL_BASEADDR0	0xE0001000
-#define CONFIG_ZYNQ_SERIAL_BAUDRATE0	CONFIG_BAUDRATE
-#define CONFIG_ZYNQ_SERIAL_CLOCK0	50000000
+#define CONFIG_ZYNQ_SERIAL_UART1
+#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_ZYNQ_SERIAL
+#endif
 
 /* DCC driver */
 #if defined(CONFIG_ZYNQ_DCC)
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 08/29] zynq: Add GEM0, GEM1 configs support
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (6 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 07/29] zynq: Add UART0, UART1 configs support Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 09/29] zynq-common: Rename zynq with zynq-common Jagannadha Sutradharudu Teki
                   ` (20 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

Zynq ethernet controller support two GEM's like
CONFIG_ZYNQ_GEM0 and CONFIG_ZYNQ_GEM1 enabled
both so-that the respective board will define
these macros based on their usage.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 include/configs/zynq.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/configs/zynq.h b/include/configs/zynq.h
index f104558..ea25159 100644
--- a/include/configs/zynq.h
+++ b/include/configs/zynq.h
@@ -57,10 +57,16 @@
 #endif
 
 /* Ethernet driver */
-#define CONFIG_NET_MULTI
-#define CONFIG_ZYNQ_GEM
 #define CONFIG_ZYNQ_GEM0
 #define CONFIG_ZYNQ_GEM_PHY_ADDR0	7
+#if defined(CONFIG_ZYNQ_GEM0) || defined(CONFIG_ZYNQ_GEM1)
+# define CONFIG_NET_MULTI
+# define CONFIG_ZYNQ_GEM
+# define CONFIG_MII
+# define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
+# define CONFIG_PHYLIB
+# define CONFIG_PHY_MARVELL
+#endif
 
 #define CONFIG_ZYNQ_SPI
 /* SPI */
@@ -103,12 +109,6 @@
 #define CONFIG_BOOTP_HOSTNAME
 #define CONFIG_BOOTP_MAY_FAIL
 
-/* MII and Phylib */
-#define CONFIG_MII
-#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
-#define CONFIG_PHYLIB
-#define CONFIG_PHY_MARVELL
-
 /* Environment */
 #define CONFIG_ENV_SIZE		0x10000 /* Env. sector size */
 #define CONFIG_ENV_IS_NOWHERE
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 09/29] zynq-common: Rename zynq with zynq-common
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (7 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 08/29] zynq: Add GEM0, GEM1 " Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 16:04   ` Albert ARIBAUD
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 10/29] doc: zynq: Add information on zynq u-boot Jagannadha Sutradharudu Teki
                   ` (19 subsequent siblings)
  28 siblings, 1 reply; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

zynq.h -> zynq-common.h, zynq-common is Common
configuration options for all Zynq boards.

zynq.h is no longer exists hense removed from boards.cfg

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 boards.cfg                                | 2 --
 include/configs/{zynq.h => zynq-common.h} | 9 ++++++---
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename include/configs/{zynq.h => zynq-common.h} (95%)

diff --git a/boards.cfg b/boards.cfg
index 18faf09..faaac0a 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -354,8 +354,6 @@ Active  arm         armv7          socfpga     altera          socfpga
 Active  arm         armv7          u8500       st-ericsson     snowball            snowball                             -                                                                                                                                 Mathieu Poirier <mathieu.poirier@linaro.org>
 Active  arm         armv7          u8500       st-ericsson     u8500               u8500_href                           -                                                                                                                                 -
 Active  arm         armv7          vf610       freescale       vf610twr            vf610twr                             vf610twr:IMX_CONFIG=board/freescale/vf610twr/imximage.cfg                                                                         Alison Wang <b18965@freescale.com>
-Active  arm         armv7          zynq        xilinx          zynq                zynq                                 -                                                                                                                                 Michal Simek <monstr@monstr.eu>
-Active  arm         armv7          zynq        xilinx          zynq                zynq_dcc                             zynq:ZYNQ_DCC                                                                                                                     Michal Simek <monstr@monstr.eu>
 Active  arm         armv7:arm720t  tegra114    nvidia          dalmore             dalmore                              -                                                                                                                                 Tom Warren <twarren@nvidia.com>
 Active  arm         armv7:arm720t  tegra20     avionic-design  medcom-wide         medcom-wide                          -                                                                                                                                 Thierry Reding <thierry.reding@avionic-design.de>
 Active  arm         armv7:arm720t  tegra20     avionic-design  plutux              plutux                               -                                                                                                                                 Thierry Reding <thierry.reding@avionic-design.de>
diff --git a/include/configs/zynq.h b/include/configs/zynq-common.h
similarity index 95%
rename from include/configs/zynq.h
rename to include/configs/zynq-common.h
index ea25159..9fe06e8 100644
--- a/include/configs/zynq.h
+++ b/include/configs/zynq-common.h
@@ -1,11 +1,14 @@
 /*
  * (C) Copyright 2012 Michal Simek <monstr@monstr.eu>
+ * (C) Copyright 2013 Xilinx, Inc.
+ *
+ * Common configuration options for all Zynq boards.
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#ifndef __CONFIG_ZYNQ_H
-#define __CONFIG_ZYNQ_H
+#ifndef __CONFIG_ZYNQ_COMMON_H
+#define __CONFIG_ZYNQ_COMMON_H
 
 /* High Level configuration Options */
 #define CONFIG_ARMV7
@@ -170,4 +173,4 @@
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_MII
 
-#endif /* __CONFIG_ZYNQ_H */
+#endif /* __CONFIG_ZYNQ_COMMON_H */
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 10/29] doc: zynq: Add information on zynq u-boot
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (8 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 09/29] zynq-common: Rename zynq with zynq-common Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 11/29] zynq: Add zynq zc70x board support Jagannadha Sutradharudu Teki
                   ` (18 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

Information on zynq u-boot about
- zynq boards
- mainline status
- TODO

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 doc/README.zynq | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 doc/README.zynq

diff --git a/doc/README.zynq b/doc/README.zynq
new file mode 100644
index 0000000..56a74b4
--- /dev/null
+++ b/doc/README.zynq
@@ -0,0 +1,60 @@
+#
+# Xilinx ZYNQ U-Boot
+#
+# (C) Copyright 2013 Xilinx, Inc.
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+1. About this
+
+This document describes the information about Xilinx Zynq U-Boot -
+like supported boards, ML status and TODO list.
+
+2. Zynq boards
+
+Xilinx Zynq-7000 All Programmable SoCs enable extensive system level
+differentiation, integration, and flexibility through hardware, software,
+and I/O programmability.
+
+* zc70x
+  - zc702 (single qspi, gem0, mmc) [1]
+  - zc706 (dual parallel qspi, gem0, mmc) [2]
+* zed (single qspi, gem0, mmc) [3]
+* microzed (single qspi, gem0, mmc) [4]
+* zc770
+  - zc770-xm010 (single qspi, gem0, mmc)
+  - zc770-xm011 (8 or 16 bit nand)
+  - zc770-xm012 (nor)
+  - zc770-xm013 (dual parallel qspi, gem1)
+
+3. Mainline status
+
+- Added basic board configurations support.
+- Added zynq u-boot bsp code - arch/arm/cpu/armv7/zynq
+- Added zynq boards named - zynq, zynq_dcc
+- Added zynq drivers:
+  serial - drivers/serial/serial_zynq.c
+  net - drivers/net/zynq_gem.c
+  mmc - drivers/mmc/zynq_sdhci.c
+  mmc - drivers/mmc/zynq_sdhci.c
+  spi-  drivers/spi/zynq_spi.c
+  i2c - drivers/i2c/zynq_i2c.c
+
+4. TODO
+
+- Add zynq boards support - zc70x, zed, microzed, zc770
+- Add zynq qspi controller driver
+- Add zynq nand controller driver
+- d-cache support for zynq_gem.c
+- FDT support for zynq boards
+- Need proper cleanups on board configurations
+
+[1] http://www.xilinx.com/products/boards-and-kits/EK-Z7-ZC702-G.htm
+[2] http://www.xilinx.com/products/boards-and-kits/EK-Z7-ZC706-G.htm
+[3] http://zedboard.org/product/zedboard
+[4] http://zedboard.org/product/microzed
+
+--
+Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
+Sun Dec 15 14:52:41 IST 2013
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 11/29] zynq: Add zynq zc70x board support
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (9 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 10/29] doc: zynq: Add information on zynq u-boot Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 12/29] zynq: Add zynq zed " Jagannadha Sutradharudu Teki
                   ` (17 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

The Zynq-7000 APSOC zc702 and zc706 enabled complte embedded
processing includes ASIC and FPGA design.

ZC702-:

APSOC:
- XC7Z020-CLG484-1
Memory:
- DDR3 Component Memory 1GB
- 16MB Quad SPI Flash
- IIC - 1 KB EEPROM
Connectivity:
- Gigabit Ethernet GMII, RGMII and SGMII.
- USB OTG - Host USB
- IIC Bus Headers/HUB
- 1 CAN with Wake on CAN
- USB-UART
Video/Display:
- HDMI Video OUT
- 8X LEDs
Control & I/O:
- 3 User Push Buttons
- 2 User Switches
- 8 User LEDs

For more info on zc702 board:
- http://www.xilinx.com/products/boards-and-kits/EK-Z7-ZC702-G.htm

ZC706-:

APSOC:
- XC7Z045 FFG900 -2 AP SoC
Memory:
- DDR3 Component Memory 1GB (PS)
- DDR3 SODIM Memory 1GB (PL)
- 2X16MB Quad SPI Flash (dual parallel)
- IIC - 1 KB EEPROM
Connectivity:
- PCIe Gen2x4
- SFP+ and SMA Pairs
- GigE RGMII Ethernet (PS)
- USB OTG 1 (PS) - Host USB
- IIC Bus Headers/HUB (PS)
- 1 CAN with Wake on CAN (PS)
- USB-UART
Video/Display:
- HDMI 8 color RGB 4.4.4 1080P-60 OUT
- HDMI IN 8 color RGB 4.4.4
Control & I/O:
- 2 User Push Buttons/Dip Switch, 2 User LEDs
- IIC access to GPIO
- SDIO (SD Card slot)
- 3 User Push Buttons, 2 User Switches, 8 User LEDs

For more info on zc706 board:
- http://www.xilinx.com/products/boards-and-kits/EK-Z7-ZC706-G.htm

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 boards.cfg                    |  1 +
 include/configs/zynq-common.h |  9 ---------
 include/configs/zynq_zc70x.h  | 25 +++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 include/configs/zynq_zc70x.h

diff --git a/boards.cfg b/boards.cfg
index faaac0a..5ef2045 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -354,6 +354,7 @@ Active  arm         armv7          socfpga     altera          socfpga
 Active  arm         armv7          u8500       st-ericsson     snowball            snowball                             -                                                                                                                                 Mathieu Poirier <mathieu.poirier@linaro.org>
 Active  arm         armv7          u8500       st-ericsson     u8500               u8500_href                           -                                                                                                                                 -
 Active  arm         armv7          vf610       freescale       vf610twr            vf610twr                             vf610twr:IMX_CONFIG=board/freescale/vf610twr/imximage.cfg                                                                         Alison Wang <b18965@freescale.com>
+Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zc70x				-                                                                                                                                 Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
 Active  arm         armv7:arm720t  tegra114    nvidia          dalmore             dalmore                              -                                                                                                                                 Tom Warren <twarren@nvidia.com>
 Active  arm         armv7:arm720t  tegra20     avionic-design  medcom-wide         medcom-wide                          -                                                                                                                                 Thierry Reding <thierry.reding@avionic-design.de>
 Active  arm         armv7:arm720t  tegra20     avionic-design  plutux              plutux                               -                                                                                                                                 Thierry Reding <thierry.reding@avionic-design.de>
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 9fe06e8..bce1094 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -36,7 +36,6 @@
 	{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
 /* Zynq Serial driver */
-#define CONFIG_ZYNQ_SERIAL_UART1
 #ifdef CONFIG_ZYNQ_SERIAL_UART0
 # define CONFIG_ZYNQ_SERIAL_BASEADDR0	0xE0000000
 # define CONFIG_ZYNQ_SERIAL_BAUDRATE0	CONFIG_BAUDRATE
@@ -60,8 +59,6 @@
 #endif
 
 /* Ethernet driver */
-#define CONFIG_ZYNQ_GEM0
-#define CONFIG_ZYNQ_GEM_PHY_ADDR0	7
 #if defined(CONFIG_ZYNQ_GEM0) || defined(CONFIG_ZYNQ_GEM1)
 # define CONFIG_NET_MULTI
 # define CONFIG_ZYNQ_GEM
@@ -71,7 +68,6 @@
 # define CONFIG_PHY_MARVELL
 #endif
 
-#define CONFIG_ZYNQ_SPI
 /* SPI */
 #ifdef CONFIG_ZYNQ_SPI
 # define CONFIG_SPI_FLASH
@@ -79,10 +75,6 @@
 # define CONFIG_CMD_SF
 #endif
 
-/* NOR */
-#define CONFIG_SYS_NO_FLASH
-
-#define CONFIG_ZYNQ_SDHCI0
 /* MMC */
 #if defined(CONFIG_ZYNQ_SDHCI0) || defined(CONFIG_ZYNQ_SDHCI1)
 # define CONFIG_MMC
@@ -96,7 +88,6 @@
 # define CONFIG_DOS_PARTITION
 #endif
 
-#define CONFIG_ZYNQ_I2C0
 /* I2C */
 #if defined(CONFIG_ZYNQ_I2C0) || defined(CONFIG_ZYNQ_I2C1)
 # define CONFIG_CMD_I2C
diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
new file mode 100644
index 0000000..9910804
--- /dev/null
+++ b/include/configs/zynq_zc70x.h
@@ -0,0 +1,25 @@
+/*
+ * (C) Copyright 2013 Xilinx, Inc.
+ *
+ * Configuration settings for the Xilinx Zynq ZC702 and ZC706 boards
+ * See zynq_common.h for Zynq common configs
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __CONFIG_ZYNQ_ZC70X_H
+#define __CONFIG_ZYNQ_ZC70X_H
+
+#define CONFIG_ZYNQ_SERIAL_UART1
+#define CONFIG_ZYNQ_GEM0
+#define CONFIG_ZYNQ_GEM_PHY_ADDR0	7
+
+#define CONFIG_SYS_NO_FLASH
+
+#define CONFIG_ZYNQ_SDHCI0
+#define CONFIG_ZYNQ_I2C0
+#define CONFIG_ZYNQ_BOOT_FREEBSD
+
+#include <configs/zynq-common.h>
+
+#endif /* __CONFIG_ZYNQ_ZC70X_H */
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 12/29] zynq: Add zynq zed board support
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (10 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 11/29] zynq: Add zynq zc70x board support Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 13/29] zynq: Move CONFIG_SYS_SDRAM_SIZE to pre-board configs Jagannadha Sutradharudu Teki
                   ` (16 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

Zed is a complete development board based on the
Xilinx Zynq-7000 All Programmable SoC.

APSOC:
- XC7Z020-CLG484-1
Memory:
- 512 MB DDR3
- 256 Mb Quad-SPI Flash(
- Full size SD/MMC card cage
Connectivity:
- 10/100/1000 Ethernet
- USB OTG (Device/Host/OTG)
- USB-UART
Expansion:
- FMC (Low Pin Count)
- Pmod. headers (2x6)
Video/Display:
- HDMI output (1080p60 + audio)
- VGA connector
- 128 x 32 OLED
- User LEDs (9)
User inputs:
- Slide switches (8)
- Push button switches (7)
Audio:
- 24-bit stereo audio CODEC
- Stereo line in/out
- Headphone
- Microphone input
Analog:
- Xilinx XADC header
- Supports 4 analog inputs
- 2 Differential / 4 Single-ended
Debug:
- On-board USB JTAG programming port
- ARM Debug Access Port (DAP)

For more info - http://zedboard.org/product/zedboard

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 boards.cfg                 |  1 +
 include/configs/zynq_zed.h | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 include/configs/zynq_zed.h

diff --git a/boards.cfg b/boards.cfg
index 5ef2045..720aad6 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -355,6 +355,7 @@ Active  arm         armv7          u8500       st-ericsson     snowball
 Active  arm         armv7          u8500       st-ericsson     u8500               u8500_href                           -                                                                                                                                 -
 Active  arm         armv7          vf610       freescale       vf610twr            vf610twr                             vf610twr:IMX_CONFIG=board/freescale/vf610twr/imximage.cfg                                                                         Alison Wang <b18965@freescale.com>
 Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zc70x				-                                                                                                                                 Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
+Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zed				-                                                                                                                                 Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
 Active  arm         armv7:arm720t  tegra114    nvidia          dalmore             dalmore                              -                                                                                                                                 Tom Warren <twarren@nvidia.com>
 Active  arm         armv7:arm720t  tegra20     avionic-design  medcom-wide         medcom-wide                          -                                                                                                                                 Thierry Reding <thierry.reding@avionic-design.de>
 Active  arm         armv7:arm720t  tegra20     avionic-design  plutux              plutux                               -                                                                                                                                 Thierry Reding <thierry.reding@avionic-design.de>
diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
new file mode 100644
index 0000000..278db1e
--- /dev/null
+++ b/include/configs/zynq_zed.h
@@ -0,0 +1,24 @@
+/*
+ * (C) Copyright 2013 Xilinx, Inc.
+ *
+ * Configuration for Zynq Evaluation and Development Board - ZedBoard
+ * See zynq_common.h for Zynq common configs
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __CONFIG_ZYNQ_ZED_H
+#define __CONFIG_ZYNQ_ZED_H
+
+#define CONFIG_ZYNQ_SERIAL_UART1
+#define CONFIG_ZYNQ_GEM0
+#define CONFIG_ZYNQ_GEM_PHY_ADDR0	0
+
+#define CONFIG_SYS_NO_FLASH
+
+#define CONFIG_ZYNQ_SDHCI0
+#define CONFIG_ZYNQ_BOOT_FREEBSD
+
+#include <configs/zynq-common.h>
+
+#endif /* __CONFIG_ZYNQ_ZED_H */
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 13/29] zynq: Move CONFIG_SYS_SDRAM_SIZE to pre-board configs
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (11 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 12/29] zynq: Add zynq zed " Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 14/29] zynq-common: Define exact TEXT_BASE Jagannadha Sutradharudu Teki
                   ` (15 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

CONFIG_SYS_SDRAM_SIZE is specific to a board hence moved
to specific pre-config board files.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 include/configs/zynq-common.h | 1 -
 include/configs/zynq_zc70x.h  | 2 ++
 include/configs/zynq_zed.h    | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index bce1094..bb9e337 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -125,7 +125,6 @@
 
 #define CONFIG_NR_DRAM_BANKS		1
 #define CONFIG_SYS_SDRAM_BASE		0
-#define CONFIG_SYS_SDRAM_SIZE		0x40000000
 
 #define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_SDRAM_BASE + 0x1000)
diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index 9910804..6950d41 100644
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -10,6 +10,8 @@
 #ifndef __CONFIG_ZYNQ_ZC70X_H
 #define __CONFIG_ZYNQ_ZC70X_H
 
+#define CONFIG_SYS_SDRAM_SIZE		(1024 * 1024 * 1024)
+
 #define CONFIG_ZYNQ_SERIAL_UART1
 #define CONFIG_ZYNQ_GEM0
 #define CONFIG_ZYNQ_GEM_PHY_ADDR0	7
diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index 278db1e..31926df 100644
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -10,6 +10,8 @@
 #ifndef __CONFIG_ZYNQ_ZED_H
 #define __CONFIG_ZYNQ_ZED_H
 
+#define CONFIG_SYS_SDRAM_SIZE		(512 * 1024 * 1024)
+
 #define CONFIG_ZYNQ_SERIAL_UART1
 #define CONFIG_ZYNQ_GEM0
 #define CONFIG_ZYNQ_GEM_PHY_ADDR0	0
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 14/29] zynq-common: Define exact TEXT_BASE
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (12 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 13/29] zynq: Move CONFIG_SYS_SDRAM_SIZE to pre-board configs Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 15/29] zynq: zc70x: Add Catalyst 24WC08 EEPROM config support Jagannadha Sutradharudu Teki
                   ` (14 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

Defined TEXT_BASE for u-boot starts from 0x4000000
w.r.t zynq memory-map.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 include/configs/zynq-common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index bb9e337..e5b1e1d 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -121,7 +121,7 @@
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 
 /* Physical Memory map */
-#define CONFIG_SYS_TEXT_BASE		0
+#define CONFIG_SYS_TEXT_BASE		0x4000000
 
 #define CONFIG_NR_DRAM_BANKS		1
 #define CONFIG_SYS_SDRAM_BASE		0
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 15/29] zynq: zc70x: Add Catalyst 24WC08 EEPROM config support
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (13 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 14/29] zynq-common: Define exact TEXT_BASE Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 16/29] zynq: Add zynq microzed board support Jagannadha Sutradharudu Teki
                   ` (13 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

Adds configurations for Catalyst 24WC08 EEPROM, which
is present on the zynq boards.

Enable EEPROM support for zc70x boards.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 include/configs/zynq-common.h | 10 ++++++++++
 include/configs/zynq_zc70x.h  |  1 +
 2 files changed, 11 insertions(+)

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index e5b1e1d..cf96333 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -97,6 +97,16 @@
 # define CONFIG_SYS_I2C_ZYNQ_SLAVE		1
 #endif
 
+/* EEPROM */
+#ifdef CONFIG_ZYNQ_EEPROM
+# define CONFIG_CMD_EEPROM
+# define CONFIG_SYS_I2C_EEPROM_ADDR_LEN		1
+# define CONFIG_SYS_I2C_EEPROM_ADDR		0x54
+# define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS	4
+# define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS	5
+# define CONFIG_SYS_EEPROM_SIZE			1024 /* Bytes */
+#endif
+
 #define CONFIG_BOOTP_SERVERIP
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_GATEWAY
diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index 6950d41..0a7fa97 100644
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -20,6 +20,7 @@
 
 #define CONFIG_ZYNQ_SDHCI0
 #define CONFIG_ZYNQ_I2C0
+#define CONFIG_ZYNQ_EEPROM
 #define CONFIG_ZYNQ_BOOT_FREEBSD
 
 #include <configs/zynq-common.h>
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 16/29] zynq: Add zynq microzed board support
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (14 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 15/29] zynq: zc70x: Add Catalyst 24WC08 EEPROM config support Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 17/29] zynq: Add zynq_zc770 xm010 " Jagannadha Sutradharudu Teki
                   ` (12 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

MicroZed is a low-cost development board based on
the Xilinx Zynq-7000 All Programmable SoC.

APSOC:
- XC7Z010-1CLG400C
Memory:
- 1 GB of DDR3 SDRAM
- 128Mb of QSPI flash(S25FL128SAGBHI200)
- Micro SD card interface
Communication:
- 10/100/1000 Ethernet
- USB 2.0
- USB-UART
User I/O:
- 100 User I/O (50 per connector)
- Configurable as up to 48 LVDS pairs or 100 single-ended I/O
Misc:
- Xilinx PC4 JTAG configuration port
- PS JTAG pins accessible via Pmod
- 33.33 MHz oscillator
- User LED and push switch

For more info - http://zedboard.org/product/microzed

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 boards.cfg                      |  1 +
 include/configs/zynq_microzed.h | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 include/configs/zynq_microzed.h

diff --git a/boards.cfg b/boards.cfg
index 720aad6..1c7cdf3 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -356,6 +356,7 @@ Active  arm         armv7          u8500       st-ericsson     u8500
 Active  arm         armv7          vf610       freescale       vf610twr            vf610twr                             vf610twr:IMX_CONFIG=board/freescale/vf610twr/imximage.cfg                                                                         Alison Wang <b18965@freescale.com>
 Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zc70x				-                                                                                                                                 Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
 Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zed				-                                                                                                                                 Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
+Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_microzed			-                                                                                                                                 Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
 Active  arm         armv7:arm720t  tegra114    nvidia          dalmore             dalmore                              -                                                                                                                                 Tom Warren <twarren@nvidia.com>
 Active  arm         armv7:arm720t  tegra20     avionic-design  medcom-wide         medcom-wide                          -                                                                                                                                 Thierry Reding <thierry.reding@avionic-design.de>
 Active  arm         armv7:arm720t  tegra20     avionic-design  plutux              plutux                               -                                                                                                                                 Thierry Reding <thierry.reding@avionic-design.de>
diff --git a/include/configs/zynq_microzed.h b/include/configs/zynq_microzed.h
new file mode 100644
index 0000000..549a664
--- /dev/null
+++ b/include/configs/zynq_microzed.h
@@ -0,0 +1,25 @@
+/*
+ * (C) Copyright 2013 Xilinx, Inc.
+ *
+ * Configuration for Micro Zynq Evaluation and Development Board - MicroZedBoard
+ * See zynq-common.h for Zynq common configs
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __CONFIG_ZYNQ_MICROZED_H
+#define __CONFIG_ZYNQ_MICROZED_H
+
+#define CONFIG_SYS_SDRAM_SIZE		(1024 * 1024 * 1024)
+
+#define CONFIG_ZYNQ_SERIAL_UART1
+#define CONFIG_ZYNQ_GEM0
+#define CONFIG_ZYNQ_GEM_PHY_ADDR0	0
+
+#define CONFIG_SYS_NO_FLASH
+
+#define CONFIG_ZYNQ_SDHCI0
+
+#include <configs/zynq-common.h>
+
+#endif /* __CONFIG_ZYNQ_MICROZED_H */
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 17/29] zynq: Add zynq_zc770 xm010 board support
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (15 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 16/29] zynq: Add zynq microzed board support Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 18/29] zynq: Add zynq_zc770 xm013 " Jagannadha Sutradharudu Teki
                   ` (11 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

ZC770 is a complete development board based on the Xilinx Zynq-7000
All Programmable SoC, similar to ZC70x board but which has four
different daughter cards, like XM010, XM011, XM012 and XM013

ZC770 XM010:
- 1Gb DDR3
- 1Mb SST SPI flash
- 128 Mb Quad-SPI Flash
- 8 Mb SST SI flash
- Full size SD/MMC card cage
- 10/100/1000 Ethernet
- USB-UART

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 boards.cfg                   |  1 +
 include/configs/zynq_zc770.h | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 include/configs/zynq_zc770.h

diff --git a/boards.cfg b/boards.cfg
index 1c7cdf3..4e88dfe 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -357,6 +357,7 @@ Active  arm         armv7          vf610       freescale       vf610twr
 Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zc70x				-                                                                                                                                 Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
 Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zed				-                                                                                                                                 Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
 Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_microzed			-                                                                                                                                 Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
+Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zc770_xm010			zynq_zc770:ZC770_XM010                                                                                                            Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
 Active  arm         armv7:arm720t  tegra114    nvidia          dalmore             dalmore                              -                                                                                                                                 Tom Warren <twarren@nvidia.com>
 Active  arm         armv7:arm720t  tegra20     avionic-design  medcom-wide         medcom-wide                          -                                                                                                                                 Thierry Reding <thierry.reding@avionic-design.de>
 Active  arm         armv7:arm720t  tegra20     avionic-design  plutux              plutux                               -                                                                                                                                 Thierry Reding <thierry.reding@avionic-design.de>
diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
new file mode 100644
index 0000000..8589d9d
--- /dev/null
+++ b/include/configs/zynq_zc770.h
@@ -0,0 +1,30 @@
+/*
+ * (C) Copyright 2013 Xilinx, Inc.
+ *
+ * Configuration settings for the Xilinx Zynq ZC770 board.
+ * See zynq-common.h for Zynq common configs
+ *
+ * SPDX-License-Identifier:     GPL-2.0+
+ */
+
+#ifndef __CONFIG_ZYNQ_ZC770_H
+#define __CONFIG_ZYNQ_ZC770_H
+
+#define CONFIG_SYS_SDRAM_SIZE		(1024 * 1024 * 1024)
+
+#define CONFIG_SYS_NO_FLASH
+
+#if defined(CONFIG_ZC770_XM010)
+# define CONFIG_ZYNQ_SERIAL_UART1
+# define CONFIG_ZYNQ_GEM0
+# define CONFIG_ZYNQ_GEM_PHY_ADDR0	7
+# define CONFIG_ZYNQ_SDHCI0
+# define CONFIG_ZYNQ_SPI
+
+#else
+# define CONFIG_ZYNQ_SERIAL_UART0
+#endif
+
+#include <configs/zynq-common.h>
+
+#endif /* __CONFIG_ZYNQ_ZC770_H */
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 18/29] zynq: Add zynq_zc770 xm013 board support
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (16 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 17/29] zynq: Add zynq_zc770 xm010 " Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 19/29] zynq: Add zynq_zc770 xm012 " Jagannadha Sutradharudu Teki
                   ` (10 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

ZC770 is a complete development board based on the Xilinx Zynq-7000
All Programmable SoC, similar to ZC70x board but which has four
different daughter cards, like XM010, XM011, XM012 and XM013

ZC770 XM013:
- 1GB DDR3
- 128 Mb Quad-SPI Flash(dual parallel)
- USB-UART

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 boards.cfg                   | 1 +
 include/configs/zynq_zc770.h | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/boards.cfg b/boards.cfg
index 4e88dfe..86e4e6e 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -358,6 +358,7 @@ Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zc70x				-
 Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zed				-                                                                                                                                 Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
 Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_microzed			-                                                                                                                                 Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
 Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zc770_xm010			zynq_zc770:ZC770_XM010                                                                                                            Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
+Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zc770_xm013			zynq_zc770:ZC770_XM013                                                                                                            Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
 Active  arm         armv7:arm720t  tegra114    nvidia          dalmore             dalmore                              -                                                                                                                                 Tom Warren <twarren@nvidia.com>
 Active  arm         armv7:arm720t  tegra20     avionic-design  medcom-wide         medcom-wide                          -                                                                                                                                 Thierry Reding <thierry.reding@avionic-design.de>
 Active  arm         armv7:arm720t  tegra20     avionic-design  plutux              plutux                               -                                                                                                                                 Thierry Reding <thierry.reding@avionic-design.de>
diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index 8589d9d..181f9fb 100644
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -21,6 +21,11 @@
 # define CONFIG_ZYNQ_SDHCI0
 # define CONFIG_ZYNQ_SPI
 
+#elif defined(CONFIG_ZC770_XM013)
+# define CONFIG_ZYNQ_SERIAL_UART0
+# define CONFIG_ZYNQ_GEM1
+# define CONFIG_ZYNQ_GEM_PHY_ADDR1	7
+
 #else
 # define CONFIG_ZYNQ_SERIAL_UART0
 #endif
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 19/29] zynq: Add zynq_zc770 xm012 board support
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (17 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 18/29] zynq: Add zynq_zc770 xm013 " Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 20/29] zynq: Add support to find bootmode Jagannadha Sutradharudu Teki
                   ` (9 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

ZC770 is a complete development board based on the Xilinx Zynq-7000
All Programmable SoC, similar to ZC70x board but which has four
different daughter cards, like XM010, XM011, XM012 and XM013

ZC770 XM012:
- 1GB DDR3
- 64MiB Numonyx NOR flash
- USB-UART

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Cc: Stefan Roese <sr@denx.de>
---
 boards.cfg                    |  1 +
 include/configs/zynq-common.h | 16 ++++++++++++++++
 include/configs/zynq_zc770.h  |  4 ++++
 3 files changed, 21 insertions(+)

diff --git a/boards.cfg b/boards.cfg
index 86e4e6e..9ad2601 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -358,6 +358,7 @@ Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zc70x				-
 Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zed				-                                                                                                                                 Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
 Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_microzed			-                                                                                                                                 Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
 Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zc770_xm010			zynq_zc770:ZC770_XM010                                                                                                            Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
+Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zc770_xm012			zynq_zc770:ZC770_XM012                                                                                                            Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
 Active  arm	    armv7	   zynq	       xilinx	       zynq	   	   zynq_zc770_xm013			zynq_zc770:ZC770_XM013                                                                                                            Michal Simek <monstr@monstr.eu>:Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
 Active  arm         armv7:arm720t  tegra114    nvidia          dalmore             dalmore                              -                                                                                                                                 Tom Warren <twarren@nvidia.com>
 Active  arm         armv7:arm720t  tegra20     avionic-design  medcom-wide         medcom-wide                          -                                                                                                                                 Thierry Reding <thierry.reding@avionic-design.de>
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index cf96333..db47c42 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -75,6 +75,22 @@
 # define CONFIG_CMD_SF
 #endif
 
+/* NOR */
+#ifndef CONFIG_SYS_NO_FLASH
+# define CONFIG_SYS_FLASH_BASE		0xE2000000
+# define CONFIG_SYS_FLASH_SIZE		(16 * 1024 * 1024)
+# define CONFIG_SYS_MAX_FLASH_BANKS	1
+# define CONFIG_SYS_MAX_FLASH_SECT	512
+# define CONFIG_SYS_FLASH_ERASE_TOUT	1000
+# define CONFIG_SYS_FLASH_WRITE_TOUT	5000
+# define CONFIG_FLASH_SHOW_PROGRESS	10
+# define CONFIG_SYS_FLASH_CFI
+# undef CONFIG_SYS_FLASH_EMPTY_INFO
+# define CONFIG_FLASH_CFI_DRIVER
+# undef CONFIG_SYS_FLASH_PROTECTION
+# define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
+#endif
+
 /* MMC */
 #if defined(CONFIG_ZYNQ_SDHCI0) || defined(CONFIG_ZYNQ_SDHCI1)
 # define CONFIG_MMC
diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index 181f9fb..16b9047 100644
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -21,6 +21,10 @@
 # define CONFIG_ZYNQ_SDHCI0
 # define CONFIG_ZYNQ_SPI
 
+#elif defined(CONFIG_ZC770_XM012)
+# define CONFIG_ZYNQ_SERIAL_UART1
+# undef CONFIG_SYS_NO_FLASH
+
 #elif defined(CONFIG_ZC770_XM013)
 # define CONFIG_ZYNQ_SERIAL_UART0
 # define CONFIG_ZYNQ_GEM1
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 20/29] zynq: Add support to find bootmode
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (18 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 19/29] zynq: Add zynq_zc770 xm012 " Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 21/29] zynq-common: Define default environment Jagannadha Sutradharudu Teki
                   ` (8 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

Added support to find the bootmodes by reading
slcr bootmode register. this can be helpful to
autoboot the configurations w.r.t a specified bootmode.

Added this functionality on board_late_init as it's not
needed for normal initializtion part.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 arch/arm/cpu/armv7/zynq/slcr.c             |  6 ++++++
 arch/arm/include/asm/arch-zynq/sys_proto.h |  1 +
 board/xilinx/zynq/board.c                  | 25 +++++++++++++++++++++++++
 doc/README.zynq                            | 25 +++++++++++++++++++++++--
 include/configs/zynq-common.h              |  1 +
 5 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/arch/arm/cpu/armv7/zynq/slcr.c b/arch/arm/cpu/armv7/zynq/slcr.c
index 717ec65..b4c11c3 100644
--- a/arch/arm/cpu/armv7/zynq/slcr.c
+++ b/arch/arm/cpu/armv7/zynq/slcr.c
@@ -101,6 +101,12 @@ void zynq_slcr_devcfg_enable(void)
 	zynq_slcr_lock();
 }
 
+u32 zynq_slcr_get_boot_mode(void)
+{
+	/* Get the bootmode register value */
+	return readl(&slcr_base->boot_mode);
+}
+
 u32 zynq_slcr_get_idcode(void)
 {
 	return (readl(&slcr_base->pss_idcode) & SLCR_IDCODE_MASK) >>
diff --git a/arch/arm/include/asm/arch-zynq/sys_proto.h b/arch/arm/include/asm/arch-zynq/sys_proto.h
index 110de90..8f925af 100644
--- a/arch/arm/include/asm/arch-zynq/sys_proto.h
+++ b/arch/arm/include/asm/arch-zynq/sys_proto.h
@@ -13,6 +13,7 @@ extern void zynq_slcr_cpu_reset(void);
 extern void zynq_slcr_gem_clk_setup(u32 gem_id, u32 rclk, u32 clk);
 extern void zynq_slcr_devcfg_disable(void);
 extern void zynq_slcr_devcfg_enable(void);
+extern u32 zynq_slcr_get_boot_mode(void);
 extern u32 zynq_slcr_get_idcode(void);
 extern void zynq_ddrc_init(void);
 
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 5119c09..a5b9bde 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -12,6 +12,12 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+/* Bootmode setting values */
+#define ZYNQ_BM_MASK		0x0F
+#define ZYNQ_BM_NOR		0x02
+#define ZYNQ_BM_SD		0x05
+#define ZYNQ_BM_JTAG		0x0
+
 #ifdef CONFIG_FPGA
 Xilinx_desc fpga;
 
@@ -59,6 +65,25 @@ int board_init(void)
 	return 0;
 }
 
+int board_late_init(void)
+{
+	switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) {
+	case ZYNQ_BM_NOR:
+		setenv("modeboot", "norboot");
+		break;
+	case ZYNQ_BM_SD:
+		setenv("modeboot", "sdboot");
+		break;
+	case ZYNQ_BM_JTAG:
+		setenv("modeboot", "jtagboot");
+		break;
+	default:
+		setenv("modeboot", "");
+		break;
+	}
+
+	return 0;
+}
 
 #ifdef CONFIG_CMD_NET
 int board_eth_init(bd_t *bis)
diff --git a/doc/README.zynq b/doc/README.zynq
index 56a74b4..ea1c8c1 100644
--- a/doc/README.zynq
+++ b/doc/README.zynq
@@ -28,7 +28,27 @@ and I/O programmability.
   - zc770-xm012 (nor)
   - zc770-xm013 (dual parallel qspi, gem1)
 
-3. Mainline status
+3. Bootmode
+
+Zynq has a facility to read the bootmode from the slcr bootmode register
+once user is setting through jumpers on the board - see page no:1546 on [5]
+
+All possible bootmode values are defined in Table 6-2:Boot_Mode MIO Pins
+on [5].
+
+board_late_init() will read the bootmode values using slcr bootmode register
+at runtime and assign the modeboot variable to specific bootmode string which
+is intern used in autoboot.
+
+SLCR bootmode register Bit[3:0] values
+#define ZYNQ_BM_NOR		0x02
+#define ZYNQ_BM_SD		0x05
+#define ZYNQ_BM_JTAG		0x0
+
+"modeboot" variable can assign any of "norboot", "sdboot" or "jtagboot"
+bootmode strings at runtime.
+
+4. Mainline status
 
 - Added basic board configurations support.
 - Added zynq u-boot bsp code - arch/arm/cpu/armv7/zynq
@@ -41,7 +61,7 @@ and I/O programmability.
   spi-  drivers/spi/zynq_spi.c
   i2c - drivers/i2c/zynq_i2c.c
 
-4. TODO
+5. TODO
 
 - Add zynq boards support - zc70x, zed, microzed, zc770
 - Add zynq qspi controller driver
@@ -54,6 +74,7 @@ and I/O programmability.
 [2] http://www.xilinx.com/products/boards-and-kits/EK-Z7-ZC706-G.htm
 [3] http://zedboard.org/product/zedboard
 [4] http://zedboard.org/product/microzed
+[5] http://www.xilinx.com/support/documentation/user_guides/ug585-Zynq-7000-TRM.pdf
 
 --
 Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index db47c42..b1fa0cb 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -140,6 +140,7 @@
 
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_AUTO_COMPLETE
+#define CONFIG_BOARD_LATE_INIT
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_SYS_MAXARGS		15 /* max number of command args */
 #define CONFIG_SYS_CBSIZE		256 /* Console I/O Buffer Size */
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 21/29] zynq-common: Define default environment
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (19 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 20/29] zynq: Add support to find bootmode Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 22/29] zynq-common: Change Env. Sector size to 128Kb Jagannadha Sutradharudu Teki
                   ` (7 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

Defined default env. for autoboot FIT image from
respective boot devices.

Default settings:
fit_image=fit.itb
load_addr=0x2000000
fit_size=0x800000
flash_off=0x100000
nor_flash_off=0xE2100000

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 include/configs/zynq-common.h | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index b1fa0cb..1eaf17d 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -132,7 +132,28 @@
 /* Environment */
 #define CONFIG_ENV_SIZE		0x10000 /* Env. sector size */
 #define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_SYS_LOAD_ADDR	0
+
+/* Default environment */
+#define CONFIG_EXTRA_ENV_SETTINGS	\
+	"fit_image=fit.itb\0"		\
+	"load_addr=0x2000000\0"		\
+	"fit_size=0x800000\0"		\
+	"flash_off=0x100000\0"		\
+	"nor_flash_off=0xE2100000\0"	\
+	"fdt_high=0x20000000\0"		\
+	"initrd_high=0x20000000\0"	\
+	"norboot=echo Copying FIT from NOR flash to RAM... && " \
+		"cp.b ${nor_flash_off} ${load_addr} ${fit_size} && " \
+		"bootm ${load_addr}\0" \
+	"sdboot=echo Copying FIT from SD to RAM... && " \
+		"fatload mmc 0 ${load_addr} ${fit_image} && " \
+		"bootm ${load_addr}\0" \
+	"jtagboot=echo TFTPing FIT to RAM... && " \
+		"tftp ${load_addr} ${fit_image} && " \
+		"bootm ${load_addr}\0"
+#define CONFIG_BOOTCOMMAND		"run $modeboot"
+#define CONFIG_BOOTDELAY		3 /* -1 to Disable autoboot */
+#define CONFIG_SYS_LOAD_ADDR		0 /* default? */
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_PROMPT		"zynq-uboot> "
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 22/29] zynq-common: Change Env. Sector size to 128Kb
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (20 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 21/29] zynq-common: Define default environment Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 23/29] zynq-common: Define flash env. partition Jagannadha Sutradharudu Teki
                   ` (6 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

Changed Env. Sector size from 0x10000 to 128Kb

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 include/configs/zynq-common.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 1eaf17d..402009e 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -129,8 +129,10 @@
 #define CONFIG_BOOTP_HOSTNAME
 #define CONFIG_BOOTP_MAY_FAIL
 
+/* Total Size of Environment Sector */
+#define CONFIG_ENV_SIZE			(128 << 10)
+
 /* Environment */
-#define CONFIG_ENV_SIZE		0x10000 /* Env. sector size */
 #define CONFIG_ENV_IS_NOWHERE
 
 /* Default environment */
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 23/29] zynq-common: Define flash env. partition
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (21 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 22/29] zynq-common: Change Env. Sector size to 128Kb Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 24/29] zynq-common: Define CONFIG_ENV_OVERWRITE Jagannadha Sutradharudu Teki
                   ` (5 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

Last 128Kb sector of 1Mb flash is defined as u-boot
environment partition.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 include/configs/zynq-common.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 402009e..568c49f 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -133,7 +133,17 @@
 #define CONFIG_ENV_SIZE			(128 << 10)
 
 /* Environment */
-#define CONFIG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
+# ifndef CONFIG_SYS_NO_FLASH
+#  define CONFIG_ENV_IS_IN_FLASH
+# elif defined(CONFIG_SYS_NO_FLASH)
+#  define CONFIG_ENV_IS_NOWHERE
+# endif
+
+# define CONFIG_ENV_SECT_SIZE		CONFIG_ENV_SIZE
+# define CONFIG_ENV_OFFSET		0xE0000
+# define CONFIG_CMD_SAVEENV
+#endif
 
 /* Default environment */
 #define CONFIG_EXTRA_ENV_SETTINGS	\
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 24/29] zynq-common: Define CONFIG_ENV_OVERWRITE
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (22 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 23/29] zynq-common: Define flash env. partition Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 25/29] dts: zynq: Add basic fdt support Jagannadha Sutradharudu Teki
                   ` (4 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

Defined CONFIG_ENV_OVERWRITE, which allow to
overwrite serial baudrate and ethaddr.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 include/configs/zynq-common.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 568c49f..184d4ba 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -132,6 +132,9 @@
 /* Total Size of Environment Sector */
 #define CONFIG_ENV_SIZE			(128 << 10)
 
+/* Allow to overwrite serial and ethaddr */
+#define CONFIG_ENV_OVERWRITE
+
 /* Environment */
 #ifndef CONFIG_ENV_IS_NOWHERE
 # ifndef CONFIG_SYS_NO_FLASH
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 25/29] dts: zynq: Add basic fdt support
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (23 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 24/29] zynq-common: Define CONFIG_ENV_OVERWRITE Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 26/29] gpio: zynq: Add dummy gpio routines Jagannadha Sutradharudu Teki
                   ` (3 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

This patch provides a basic fdt support for zynq u-boot.

zynq-7000.dtsi-> initial arch dts file
zynq-zed.dts -> initial zed board dts file
more devices should be added in subsequent patches.

u-boot build: once configuring of a board done
for building dtb with zynq-zed.dts as an input
zynq-uboot> make DEVICE_TREE=zynq-zed

Enabled CONFIG_OF_SEPARATE for building dtb separately.
There is a new binary called u-boot-dtb.bin which is a u-boot
with devicetree supported.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 arch/arm/dts/zynq-7000.dtsi   | 13 +++++++++++++
 board/xilinx/dts/zynq-zed.dts | 14 ++++++++++++++
 include/configs/zynq-common.h |  5 +++++
 3 files changed, 32 insertions(+)
 create mode 100644 arch/arm/dts/zynq-7000.dtsi
 create mode 100644 board/xilinx/dts/zynq-zed.dts

diff --git a/arch/arm/dts/zynq-7000.dtsi b/arch/arm/dts/zynq-7000.dtsi
new file mode 100644
index 0000000..f20b8bd
--- /dev/null
+++ b/arch/arm/dts/zynq-7000.dtsi
@@ -0,0 +1,13 @@
+/*
+ * Xilinx Zynq 7000 DTSI
+ * Describes the hardware common to all Zynq 7000-based boards.
+ *
+ * Copyright (C) 2013 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+/include/ "skeleton.dtsi"
+
+/ {
+	compatible = "xlnx,zynq-7000";
+};
diff --git a/board/xilinx/dts/zynq-zed.dts b/board/xilinx/dts/zynq-zed.dts
new file mode 100644
index 0000000..91a5deb
--- /dev/null
+++ b/board/xilinx/dts/zynq-zed.dts
@@ -0,0 +1,14 @@
+/*
+ * Xilinx ZED board DTS
+ *
+ * Copyright (C) 2013 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+	model = "Zynq ZED Board";
+	compatible = "xlnx,zynq-zed", "xlnx,zynq-7000";
+};
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 184d4ba..8707bc0 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -212,6 +212,11 @@
 #define CONFIG_FIT
 #define CONFIG_FIT_VERBOSE	1 /* enable fit_format_{error,warning}() */
 
+/* FDT support */
+#define CONFIG_OF_CONTROL
+#define CONFIG_OF_SEPARATE
+#define CONFIG_DISPLAY_BOARDINFO_LATE
+
 /* Boot FreeBSD/vxWorks from an ELF image */
 #if defined(CONFIG_ZYNQ_BOOT_FREEBSD)
 # define CONFIG_API
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 26/29] gpio: zynq: Add dummy gpio routines
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (24 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 25/29] dts: zynq: Add basic fdt support Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 27/29] zynq-common: Enable verified boot(RSA) Jagannadha Sutradharudu Teki
                   ` (2 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

GPIO dummy routines are required for fdt build, may be removed
these dependencies once the u-boot fdt is fully optimized.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 arch/arm/include/asm/arch-zynq/gpio.h | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 arch/arm/include/asm/arch-zynq/gpio.h

diff --git a/arch/arm/include/asm/arch-zynq/gpio.h b/arch/arm/include/asm/arch-zynq/gpio.h
new file mode 100644
index 0000000..2dbba75
--- /dev/null
+++ b/arch/arm/include/asm/arch-zynq/gpio.h
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2013 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef _ZYNQ_GPIO_H
+#define _ZYNQ_GPIO_H
+
+inline int gpio_get_value(unsigned gpio)
+{
+	return 0;
+}
+
+inline int gpio_set_value(unsigned gpio, int val)
+{
+	return 0;
+}
+
+inline int gpio_request(unsigned gpio, const char *label)
+{
+	return 0;
+}
+
+#endif /* _ZYNQ_GPIO_H */
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 27/29] zynq-common: Enable verified boot(RSA)
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (25 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 26/29] gpio: zynq: Add dummy gpio routines Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 28/29] dts: zynq: Add more zynq dts files Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 29/29] doc: Update the zynq u-boot status Jagannadha Sutradharudu Teki
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

CONFIG_FIT_SIGNATURE - signature node support in FIT image
CONFIG_RSA - RSA lib support

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 include/configs/zynq-common.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 8707bc0..e7a8e9f 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -217,6 +217,10 @@
 #define CONFIG_OF_SEPARATE
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 
+/* RSA support */
+#define CONFIG_FIT_SIGNATURE
+#define CONFIG_RSA
+
 /* Boot FreeBSD/vxWorks from an ELF image */
 #if defined(CONFIG_ZYNQ_BOOT_FREEBSD)
 # define CONFIG_API
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 28/29] dts: zynq: Add more zynq dts files
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (26 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 27/29] zynq-common: Enable verified boot(RSA) Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 29/29] doc: Update the zynq u-boot status Jagannadha Sutradharudu Teki
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

This patch adds initial dts support for supported
zynq boards.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 board/xilinx/dts/zynq-microzed.dts    | 14 ++++++++++++++
 board/xilinx/dts/zynq-zc702.dts       | 14 ++++++++++++++
 board/xilinx/dts/zynq-zc706.dts       | 14 ++++++++++++++
 board/xilinx/dts/zynq-zc770-xm010.dts | 14 ++++++++++++++
 board/xilinx/dts/zynq-zc770-xm012.dts | 14 ++++++++++++++
 board/xilinx/dts/zynq-zc770-xm013.dts | 14 ++++++++++++++
 6 files changed, 84 insertions(+)
 create mode 100644 board/xilinx/dts/zynq-microzed.dts
 create mode 100644 board/xilinx/dts/zynq-zc702.dts
 create mode 100644 board/xilinx/dts/zynq-zc706.dts
 create mode 100644 board/xilinx/dts/zynq-zc770-xm010.dts
 create mode 100644 board/xilinx/dts/zynq-zc770-xm012.dts
 create mode 100644 board/xilinx/dts/zynq-zc770-xm013.dts

diff --git a/board/xilinx/dts/zynq-microzed.dts b/board/xilinx/dts/zynq-microzed.dts
new file mode 100644
index 0000000..6da71c1
--- /dev/null
+++ b/board/xilinx/dts/zynq-microzed.dts
@@ -0,0 +1,14 @@
+/*
+ * Xilinx MicroZED board DTS
+ *
+ * Copyright (C) 2013 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+	model = "Zynq MicroZED Board";
+	compatible = "xlnx,zynq-microzed", "xlnx,zynq-7000";
+};
diff --git a/board/xilinx/dts/zynq-zc702.dts b/board/xilinx/dts/zynq-zc702.dts
new file mode 100644
index 0000000..667dc28
--- /dev/null
+++ b/board/xilinx/dts/zynq-zc702.dts
@@ -0,0 +1,14 @@
+/*
+ * Xilinx ZC702 board DTS
+ *
+ * Copyright (C) 2013 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+	model = "Zynq ZC702 Board";
+	compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000";
+};
diff --git a/board/xilinx/dts/zynq-zc706.dts b/board/xilinx/dts/zynq-zc706.dts
new file mode 100644
index 0000000..526fc88
--- /dev/null
+++ b/board/xilinx/dts/zynq-zc706.dts
@@ -0,0 +1,14 @@
+/*
+ * Xilinx ZC706 board DTS
+ *
+ * Copyright (C) 2013 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+	model = "Zynq ZC706 Board";
+	compatible = "xlnx,zynq-zc706", "xlnx,zynq-7000";
+};
diff --git a/board/xilinx/dts/zynq-zc770-xm010.dts b/board/xilinx/dts/zynq-zc770-xm010.dts
new file mode 100644
index 0000000..8b542a1
--- /dev/null
+++ b/board/xilinx/dts/zynq-zc770-xm010.dts
@@ -0,0 +1,14 @@
+/*
+ * Xilinx ZC770 XM010 board DTS
+ *
+ * Copyright (C) 2013 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+	model = "Zynq ZC770 XM010 Board";
+	compatible = "xlnx,zynq-zc770-xm010", "xlnx,zynq-7000";
+};
diff --git a/board/xilinx/dts/zynq-zc770-xm012.dts b/board/xilinx/dts/zynq-zc770-xm012.dts
new file mode 100644
index 0000000..0379a07
--- /dev/null
+++ b/board/xilinx/dts/zynq-zc770-xm012.dts
@@ -0,0 +1,14 @@
+/*
+ * Xilinx ZC770 XM012 board DTS
+ *
+ * Copyright (C) 2013 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+	model = "Zynq ZC770 XM012 Board";
+	compatible = "xlnx,zynq-zc770-xm012", "xlnx,zynq-7000";
+};
diff --git a/board/xilinx/dts/zynq-zc770-xm013.dts b/board/xilinx/dts/zynq-zc770-xm013.dts
new file mode 100644
index 0000000..a4f9e05
--- /dev/null
+++ b/board/xilinx/dts/zynq-zc770-xm013.dts
@@ -0,0 +1,14 @@
+/*
+ * Xilinx ZC770 XM013 board DTS
+ *
+ * Copyright (C) 2013 Xilinx, Inc.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+/dts-v1/;
+#include "zynq-7000.dtsi"
+
+/ {
+	model = "Zynq ZC770 XM013 Board";
+	compatible = "xlnx,zynq-zc770-xm013", "xlnx,zynq-7000";
+};
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 29/29] doc: Update the zynq u-boot status
       [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
                   ` (27 preceding siblings ...)
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 28/29] dts: zynq: Add more zynq dts files Jagannadha Sutradharudu Teki
@ 2014-01-08 10:23 ` Jagannadha Sutradharudu Teki
  28 siblings, 0 replies; 30+ messages in thread
From: Jagannadha Sutradharudu Teki @ 2014-01-08 10:23 UTC (permalink / raw)
  To: u-boot

Updated doc/README.zynq to current status.

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 doc/README.zynq | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/doc/README.zynq b/doc/README.zynq
index ea1c8c1..6330408 100644
--- a/doc/README.zynq
+++ b/doc/README.zynq
@@ -28,7 +28,16 @@ and I/O programmability.
   - zc770-xm012 (nor)
   - zc770-xm013 (dual parallel qspi, gem1)
 
-3. Bootmode
+3. Building
+
+ # Configure for microzed board
+   $ make zynq_microzed_config
+     Configuring for zynq_microzed board...
+
+ # Building
+   $ make DEVICE_TREE=zynq-microzed
+
+4. Bootmode
 
 Zynq has a facility to read the bootmode from the slcr bootmode register
 once user is setting through jumpers on the board - see page no:1546 on [5]
@@ -48,11 +57,11 @@ SLCR bootmode register Bit[3:0] values
 "modeboot" variable can assign any of "norboot", "sdboot" or "jtagboot"
 bootmode strings at runtime.
 
-4. Mainline status
+5. Mainline status
 
 - Added basic board configurations support.
 - Added zynq u-boot bsp code - arch/arm/cpu/armv7/zynq
-- Added zynq boards named - zynq, zynq_dcc
+- Added zynq boards named - zc70x, zed, microzed, zc770_xm010, zc770_xm012, zc770_xm013
 - Added zynq drivers:
   serial - drivers/serial/serial_zynq.c
   net - drivers/net/zynq_gem.c
@@ -60,15 +69,16 @@ bootmode strings at runtime.
   mmc - drivers/mmc/zynq_sdhci.c
   spi-  drivers/spi/zynq_spi.c
   i2c - drivers/i2c/zynq_i2c.c
+- Done proper cleanups on board configurations
+- Added basic FDT support for zynq boards
+- d-cache support for zynq_gem.c
 
-5. TODO
+6. TODO
 
-- Add zynq boards support - zc70x, zed, microzed, zc770
+- Add zynq boards support - zc770_xm011
 - Add zynq qspi controller driver
 - Add zynq nand controller driver
-- d-cache support for zynq_gem.c
-- FDT support for zynq boards
-- Need proper cleanups on board configurations
+- Add FDT support on individual drivers
 
 [1] http://www.xilinx.com/products/boards-and-kits/EK-Z7-ZC702-G.htm
 [2] http://www.xilinx.com/products/boards-and-kits/EK-Z7-ZC706-G.htm
-- 
1.8.3

^ permalink raw reply related	[flat|nested] 30+ messages in thread

* [U-Boot] [PATCH v4 09/29] zynq-common: Rename zynq with zynq-common
  2014-01-08 10:23 ` [U-Boot] [PATCH v4 09/29] zynq-common: Rename zynq with zynq-common Jagannadha Sutradharudu Teki
@ 2014-01-08 16:04   ` Albert ARIBAUD
  0 siblings, 0 replies; 30+ messages in thread
From: Albert ARIBAUD @ 2014-01-08 16:04 UTC (permalink / raw)
  To: u-boot

Hi Jagannadha,

On Wed, 8 Jan 2014 15:53:16 +0530, Jagannadha Sutradharudu Teki
<jagannadha.sutradharudu-teki@xilinx.com> wrote:

> zynq.h -> zynq-common.h, zynq-common is Common
> configuration options for all Zynq boards.
> 
> zynq.h is no longer exists hense removed from boards.cfg

Note this did not cleanly apply to arm/master and had to be manually
fixed.

Amicalement,
-- 
Albert.

^ permalink raw reply	[flat|nested] 30+ messages in thread

end of thread, other threads:[~2014-01-08 16:04 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <1389176616-15709-1-git-send-email-jaganna@xilinx.com>
2014-01-08 10:23 ` [U-Boot] [PATCH v4 01/29] zynq: Enable CONFIG_FIT_VERBOSE Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 02/29] zynq: Enable Boot FreeBSD/vxWorks Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 03/29] zynq: Cleanup on miscellaneous configs Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 04/29] zynq: Cleanup on memory configs Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 05/29] zynq: Minor config cleanup Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 06/29] zynq: Enable cache options Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 07/29] zynq: Add UART0, UART1 configs support Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 08/29] zynq: Add GEM0, GEM1 " Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 09/29] zynq-common: Rename zynq with zynq-common Jagannadha Sutradharudu Teki
2014-01-08 16:04   ` Albert ARIBAUD
2014-01-08 10:23 ` [U-Boot] [PATCH v4 10/29] doc: zynq: Add information on zynq u-boot Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 11/29] zynq: Add zynq zc70x board support Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 12/29] zynq: Add zynq zed " Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 13/29] zynq: Move CONFIG_SYS_SDRAM_SIZE to pre-board configs Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 14/29] zynq-common: Define exact TEXT_BASE Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 15/29] zynq: zc70x: Add Catalyst 24WC08 EEPROM config support Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 16/29] zynq: Add zynq microzed board support Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 17/29] zynq: Add zynq_zc770 xm010 " Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 18/29] zynq: Add zynq_zc770 xm013 " Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 19/29] zynq: Add zynq_zc770 xm012 " Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 20/29] zynq: Add support to find bootmode Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 21/29] zynq-common: Define default environment Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 22/29] zynq-common: Change Env. Sector size to 128Kb Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 23/29] zynq-common: Define flash env. partition Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 24/29] zynq-common: Define CONFIG_ENV_OVERWRITE Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 25/29] dts: zynq: Add basic fdt support Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 26/29] gpio: zynq: Add dummy gpio routines Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 27/29] zynq-common: Enable verified boot(RSA) Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 28/29] dts: zynq: Add more zynq dts files Jagannadha Sutradharudu Teki
2014-01-08 10:23 ` [U-Boot] [PATCH v4 29/29] doc: Update the zynq u-boot status Jagannadha Sutradharudu Teki

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.