zynqmp: Define ep config for ZynqMP

Define a new config "zynqmp_ep" for ZynqMP instead
of xilinx_zynqmp. This config supports all emulation
platforms of ZynqMP.

Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7511e79efef7a107bd1c889746ecffdba99ad17b..9f99737d7f169c46d4f9b458422b5c504923f6a6 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -622,7 +622,7 @@ config ZYNQ
        select CPU_V7
        select SUPPORT_SPL
 
-config TARGET_XILINX_ZYNQMP
+config ARCH_ZYNQMP
        bool "Support Xilinx ZynqMP Platform"
        select ARM64
 

diff --git a/arch/arm/cpu/armv8/Makefile b/arch/arm/cpu/armv8/Makefile
index dee5e258b6c33580e8ee118130b3c3a3d9b086ec..6466ebb4606b2b6d65c7a5e2173ee78d4c0a5a95 100644 (file)
--- a/arch/arm/cpu/armv8/Makefile
+++ b/arch/arm/cpu/armv8/Makefile
@@ -16,4 +16,4 @@ obj-y += tlb.o
 obj-y  += transition.o
 
 obj-$(CONFIG_FSL_LSCH3) += fsl-lsch3/
-obj-$(CONFIG_TARGET_XILINX_ZYNQMP) += zynqmp/
+obj-$(CONFIG_ARCH_ZYNQMP) += zynqmp/

diff --git a/arch/arm/cpu/armv8/zynqmp/Kconfig b/arch/arm/cpu/armv8/zynqmp/Kconfig
index b07932e80583e28b2c35e3f078eedbc15b92d8c5..c8fcfb6abbc115521ccacc8bd0d94e788f8a366f 100644 (file)
--- a/arch/arm/cpu/armv8/zynqmp/Kconfig
+++ b/arch/arm/cpu/armv8/zynqmp/Kconfig
@@ -1,4 +1,12 @@
-if TARGET_XILINX_ZYNQMP
+if ARCH_ZYNQMP
+
+choice
+       prompt "Xilinx ZynqMP board select"
+
+config TARGET_ZYNQMP_EP
+       bool "ZynqMP EP Board"
+
+endchoice
 
 config SYS_BOARD
        default "zynqmp"
@@ -10,6 +18,6 @@ config SYS_SOC
        default "zynqmp"
 
 config SYS_CONFIG_NAME
-       default "xilinx_zynqmp"
+       default "xilinx_zynqmp_ep" if TARGET_ZYNQMP_EP
 
 endif

diff --git a/board/xilinx/zynqmp/MAINTAINERS b/board/xilinx/zynqmp/MAINTAINERS
index da33340459443d8041bedd03484168472ead4f4e..20ca6522e5700fb47b67a8a80843ca4dcb18734a 100644 (file)
--- a/board/xilinx/zynqmp/MAINTAINERS
+++ b/board/xilinx/zynqmp/MAINTAINERS
@@ -1,6 +1,7 @@
-XILINX_ZYNQMP BOARD
+XILINX_ZYNQMP_EP BOARD
 M:     Michal Simek <michal.simek@xilinx.com>
 S:     Maintained
 F:     board/xilinx/zynqmp/
 F:     include/configs/xilinx_zynqmp.h
-F:     configs/xilinx_zynqmp_defconfig
+F:     include/configs/xilinx_zynqmp_ep.h
+F:     configs/xilinx_zynqmp_ep_defconfig

diff --git a/configs/xilinx_zynqmp_defconfig b/configs/xilinx_zynqmp_ep_defconfig
similarity index 81%
rename from configs/xilinx_zynqmp_defconfig
rename to configs/xilinx_zynqmp_ep_defconfig
index 124a4e16c3837aea9d9d1dd67e3492b85329f356..d3d3ee3f15339510a769c174072db1e6ba953e89 100644 (file)
--- a/configs/xilinx_zynqmp_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
-CONFIG_TARGET_XILINX_ZYNQMP=y
+CONFIG_ARCH_ZYNQMP=y
+CONFIG_DEFAULT_DEVICE_TREE="zynqmp-ep"
 CONFIG_CMD_BDI=y
 CONFIG_CMD_BOOTD=y
 CONFIG_CMD_RUN=y
@@ -15,4 +16,3 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_MISC=y
 CONFIG_CMD_TIMER=y
-CONFIG_DEFAULT_DEVICE_TREE="zynqmp"

diff --git a/drivers/mtd/spi/sf_params.c b/drivers/mtd/spi/sf_params.c
index 46d631d91ad811012b809d6343fa72ebc00938e8..dbe8d42cbeb3c46610c12c720f2e7bfdaa4b8584 100644 (file)
--- a/drivers/mtd/spi/sf_params.c
+++ b/drivers/mtd/spi/sf_params.c
@@ -87,7 +87,7 @@ const struct spi_flash_params spi_flash_params_table[] = {
        {"N25Q256",        0x20ba19, 0x0,       64 * 1024,   512, RD_FULL,         WR_QPP | SECT_4K},
        {"N25Q256A",       0x20bb19, 0x0,       64 * 1024,   512, RD_FULL,         WR_QPP | SECT_4K},
        {"N25Q512",        0x20ba20, 0x0,       64 * 1024,  1024, RD_FULL, WR_QPP | E_FSR | SECT_4K},
-#ifdef CONFIG_TARGET_XILINX_ZYNQMP
+#ifdef CONFIG_ARCH_ZYNQMP
        {"N25Q512A",       0x20bb20, 0x0,       64 * 1024,  1024, RD_FULL,           WR_QPP | E_FSR},
 #else
        {"N25Q512A",       0x20bb20, 0x0,       64 * 1024,  1024, RD_FULL, WR_QPP | E_FSR | SECT_4K},

diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 0092691bd5a38602aac8ad3d1cd4aa0921eb672d..f56ea4c5a445376b3f64f85e4145bf3d9f002584 100644 (file)
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -56,14 +56,14 @@
 #define ZYNQ_GEM_NWCFG_SPEED1000       0x000000400 /* 1Gbps operation */
 #define ZYNQ_GEM_NWCFG_FDEN            0x000000002 /* Full Duplex mode */
 #define ZYNQ_GEM_NWCFG_FSREM           0x000020000 /* FCS removal */
-#ifdef CONFIG_TARGET_XILINX_ZYNQMP
+#ifdef CONFIG_ARM64
 #define ZYNQ_GEM_NWCFG_MDCCLKDIV       0x0001C0000 /* Div pclk by 224, 540MHz */
 #else
 #define ZYNQ_GEM_NWCFG_MDCCLKDIV       0x000080000 /* Div pclk by 32, 80MHz */
 #endif
 #define ZYNQ_GEM_NWCFG_MDCCLKDIV2      0x0000c0000 /* Div pclk by 48, 120MHz */
 
-#ifdef CONFIG_TARGET_XILINX_ZYNQMP
+#ifdef CONFIG_ARM64
 # define ZYNQ_GEM_DBUS_WIDTH   (1 << 21) /* 64 bit bus */
 #else
 # define ZYNQ_GEM_DBUS_WIDTH   (0 << 21) /* 32 bit bus */
@@ -348,7 +348,7 @@ static int zynq_gem_init(struct eth_device *dev, bd_t * bis)
                priv->init++;
        }
 
-#ifdef CONFIG_TARGET_XILINX_ZYNQMP
+#ifdef CONFIG_ARM64
        if (!priv->init) {
 #endif
        phy_detection(dev);
@@ -384,11 +384,11 @@ static int zynq_gem_init(struct eth_device *dev, bd_t * bis)
                clk_rate = ZYNQ_GEM_FREQUENCY_10;
                break;
        }
-#ifdef CONFIG_TARGET_XILINX_ZYNQMP
+#ifdef CONFIG_ARM64
        }
 #endif
 
-#ifndef CONFIG_TARGET_XILINX_ZYNQMP
+#ifndef CONFIG_ARM64
        /* Change the rclk and clk only not using EMIO interface */
        if (!priv->emio)
                zynq_slcr_gem_clk_setup(dev->iobase !=

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index eb67dbb1a16cc659ac4087ab97d7387afc7a4e0c..0cca7ee0f96f2bec6140d9dabc30d248763a6f8b 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -55,7 +55,6 @@
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 0x800000)
 
 /* Serial setup */
-#define CONFIG_ZYNQ_SERIAL_UART0
 #define CONFIG_ZYNQ_SERIAL
 
 #define CONFIG_CONS_INDEX              0
@@ -63,10 +62,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE \
        { 4800, 9600, 19200, 38400, 57600, 115200 }
 
-#define CONFIG_ZYNQMP_QSPI
-#define CONFIG_ZYNQ_SDHCI0
-#define CONFIG_NAND_ARASAN
-
 /* Command line configuration */
 #define CONFIG_CMD_ENV
 #define CONFIG_CMD_EXT2
@@ -191,9 +186,6 @@
 /* max command args */
 #define CONFIG_SYS_MAXARGS             64
 
-#define CONFIG_ZYNQ_GEM0
-#define CONFIG_ZYNQ_GEM_PHY_ADDR0      7
-
 /* Ethernet driver */
 #if defined(CONFIG_ZYNQ_GEM0) || defined(CONFIG_ZYNQ_GEM1) || \
        defined(CONFIG_ZYNQ_GEM2) || defined(CONFIG_ZYNQ_GEM3)
@@ -205,9 +197,6 @@
 # define CONFIG_PHY_MARVELL
 #endif
 
-#define CONFIG_ZYNQ_I2C0
-#define CONFIG_SYS_I2C_ZYNQ
-
 /* I2C */
 #if defined(CONFIG_SYS_I2C_ZYNQ)
 # define CONFIG_CMD_I2C
@@ -216,8 +205,6 @@
 # define CONFIG_SYS_I2C_ZYNQ_SLAVE             0
 #endif
 
-#define CONFIG_ZYNQMP_EEPROM
-
 /* EEPROM */
 #ifdef CONFIG_ZYNQMP_EEPROM
 # define CONFIG_CMD_EEPROM
@@ -239,7 +226,6 @@
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_CLOCKS
 
-#define CONFIG_AHCI
 #ifdef CONFIG_AHCI
 #define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI

diff --git a/include/configs/xilinx_zynqmp_ep.h b/include/configs/xilinx_zynqmp_ep.h
new file mode 100644 (file)
index 0000000..de7c448
--- /dev/null
+++ b/include/configs/xilinx_zynqmp_ep.h
@@ -0,0 +1,32 @@
+/*
+ * Configuration for Xilinx ZynqMP emulation
+ * platforms. See zynqmp-common.h for ZynqMP
+ * common configs
+ *
+ * (C) Copyright 2014 - 2015 Xilinx, Inc.
+ * Michal Simek <michal.simek@xilinx.com>
+ * Siva Durga Prasad Paladugu <sivadur@xilinx.com>
+ *
+ * Based on Configuration for Versatile Express
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef __CONFIG_ZYNQMP_EP_H
+#define __CONFIG_ZYNQMP_EP_H
+
+#define CONFIG_ZYNQ_GEM0
+#define CONFIG_ZYNQ_GEM_PHY_ADDR0      7
+
+#define CONFIG_ZYNQ_SERIAL_UART0
+#define CONFIG_ZYNQMP_QSPI
+#define CONFIG_ZYNQ_SDHCI0
+#define CONFIG_ZYNQ_I2C0
+#define CONFIG_SYS_I2C_ZYNQ
+#define CONFIG_ZYNQ_EEPROM
+#define CONFIG_AHCI
+#define CONFIG_NAND_ARASAN
+
+#include <configs/xilinx_zynqmp.h>
+
+#endif /* __CONFIG_ZYNQMP_EP_H */