Merge branch 'master' of git://git.denx.de/u-boot-video

diff --git a/arch/arm/dts/zynq-microzed.dts b/arch/arm/dts/zynq-microzed.dts
index e841a1d61665610f75bb3f7348a72468b53b1072..793ab44eae2439f7cbcf4abbdc38f8fd10d2cee8 100644 (file)
--- a/arch/arm/dts/zynq-microzed.dts
+++ b/arch/arm/dts/zynq-microzed.dts
@@ -24,6 +24,7 @@
 };
 
 &qspi {
+       u-boot,dm-pre-reloc;
        status = "okay";
 };
 

diff --git a/arch/arm/dts/zynq-zc706.dts b/arch/arm/dts/zynq-zc706.dts
index 1ba3a1c6e8dc642191127bef66854cfe41cf4994..1610520f7a7d15046422f834c38e6e89fe279e66 100644 (file)
--- a/arch/arm/dts/zynq-zc706.dts
+++ b/arch/arm/dts/zynq-zc706.dts
@@ -306,6 +306,7 @@
 };
 
 &qspi {
+       u-boot,dm-pre-reloc;
        status = "okay";
 };
 

diff --git a/arch/arm/dts/zynq-zed.dts b/arch/arm/dts/zynq-zed.dts
index 5ec59e2b4c6fdcf5deec58bd4d04effa2c094704..ec9b2f7b547206bc396ad36fdcab9980012da11f 100644 (file)
--- a/arch/arm/dts/zynq-zed.dts
+++ b/arch/arm/dts/zynq-zed.dts
@@ -61,6 +61,7 @@
 };
 
 &qspi {
+       u-boot,dm-pre-reloc;
        status = "okay";
 };
 

diff --git a/arch/arm/dts/zynq-zybo.dts b/arch/arm/dts/zynq-zybo.dts
index fbbb8911910bcd1905f60811aa582966f16b3133..d04e9625d29eb6b709285ae2c06c04b5df2ab9cb 100644 (file)
--- a/arch/arm/dts/zynq-zybo.dts
+++ b/arch/arm/dts/zynq-zybo.dts
@@ -31,8 +31,9 @@
        };
 
        usb_phy0: phy0 {
-               compatible = "usb-nop-xceiv";
                #phy-cells = <0>;
+               compatible = "usb-nop-xceiv";
+               reset-gpios = <&gpio0 46 1>;
        };
 };
 

diff --git a/arch/arm/include/asm/arch-zynqmp/hardware.h b/arch/arm/include/asm/arch-zynqmp/hardware.h
index e223988b7d977049585889bc4b2783458b37a3de..35964d603b386c16b6ab93a3c5d0ff038faf5cb0 100644 (file)
--- a/arch/arm/include/asm/arch-zynqmp/hardware.h
+++ b/arch/arm/include/asm/arch-zynqmp/hardware.h
@@ -13,9 +13,6 @@
 #define ZYNQ_GEM_BASEADDR2     0xFF0D0000
 #define ZYNQ_GEM_BASEADDR3     0xFF0E0000
 
-#define ZYNQ_SPI_BASEADDR0     0xFF040000
-#define ZYNQ_SPI_BASEADDR1     0xFF050000
-
 #define ZYNQ_I2C_BASEADDR0     0xFF020000
 #define ZYNQ_I2C_BASEADDR1     0xFF030000
 

diff --git a/arch/arm/mach-zynq/include/mach/hardware.h b/arch/arm/mach-zynq/include/mach/hardware.h
index 830e1fea1809bbaa02a148eeff301a2a642e7d3c..79347a83eaffb68d0d99408b116cb11ece4f38ab 100644 (file)
--- a/arch/arm/mach-zynq/include/mach/hardware.h
+++ b/arch/arm/mach-zynq/include/mach/hardware.h
@@ -14,8 +14,6 @@
 #define ZYNQ_GEM_BASEADDR1             0xE000C000
 #define ZYNQ_I2C_BASEADDR0             0xE0004000
 #define ZYNQ_I2C_BASEADDR1             0xE0005000
-#define ZYNQ_SPI_BASEADDR0             0xE0006000
-#define ZYNQ_SPI_BASEADDR1             0xE0007000
 #define ZYNQ_QSPI_BASEADDR             0xE000D000
 #define ZYNQ_SMC_BASEADDR              0xE000E000
 #define ZYNQ_NAND_BASEADDR             0xE1000000

diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 01bae5d67e3f9ee686013a4db934a7ff9cac9144..2f17e977a4b3627370633362cd23cf7d279c2cf9 100644 (file)
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -100,7 +100,6 @@ int checkboard(void)
 
 int dram_init(void)
 {
-#if CONFIG_IS_ENABLED(OF_CONTROL)
        int node;
        fdt_addr_t addr;
        fdt_size_t size;
@@ -118,9 +117,6 @@ int dram_init(void)
                return -1;
        }
        gd->ram_size = size;
-#else
-       gd->ram_size = CONFIG_SYS_SDRAM_SIZE;
-#endif
        zynq_ddrc_init();
 
        return 0;

diff --git a/cmd/i2c.c b/cmd/i2c.c
index b3bb64408fe18af0c2a754ed653384bd55dee880..18ce789d7edd916bd704e776b70afedaa3b446d7 100644 (file)
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -1141,7 +1141,7 @@ static void decode_bits (u_char const b, char const *str[], int const do_once)
  */
 static int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
-       enum { unknown, EDO, SDRAM, DDR2 } type;
+       enum { unknown, EDO, SDRAM, DDR, DDR2, DDR3, DDR4 } type;
 
        uint    chip;
        u_char  data[128];
@@ -1228,10 +1228,22 @@ static int do_sdram (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
                type = SDRAM;
                puts ("SDRAM\n");
                break;
+       case 7:
+               type = DDR;
+               puts("DDR\n");
+               break;
        case 8:
                type = DDR2;
                puts ("DDR2\n");
                break;
+       case 11:
+               type = DDR3;
+               puts("DDR3\n");
+               break;
+       case 12:
+               type = DDR4;
+               puts("DDR4\n");
+               break;
        default:
                type = unknown;
                puts ("unknown\n");

diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig
index 281191809ab141fdc8d7e786bfe5561b29a7fc88..c2bbb47487fa576e2d67d976ce50d32a847b3f8e 100644 (file)
--- a/configs/xilinx_zynqmp_ep_defconfig
+++ b/configs/xilinx_zynqmp_ep_defconfig
@@ -25,5 +25,6 @@ CONFIG_CMD_TIME=y
 CONFIG_CMD_TIMER=y
 CONFIG_OF_EMBED=y
 CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_ZYNQ_SDHCI=y
 CONFIG_ZYNQ_GEM=y
 # CONFIG_REGEX is not set

diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
index a3a66ec41a377e2e4cb32681d57f17fe80cc31fb..4c5152fa73e7ba4cc82b7c98f020b11d0b5a8d19 100644 (file)
--- a/configs/zynq_microzed_defconfig
+++ b/configs/zynq_microzed_defconfig
@@ -13,6 +13,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_ZYNQ_SDHCI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_SPI_FLASH_STMICRO=y

diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
index fbc603fd95cddcb668ef97170dd6ebbc54bdd404..f34e2e3e265ad0112293b365f18a2943223cac37 100644 (file)
--- a/configs/zynq_picozed_defconfig
+++ b/configs/zynq_picozed_defconfig
@@ -10,4 +10,5 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_ZYNQ_SDHCI=y
 CONFIG_ZYNQ_GEM=y

diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
index 3540653e2270c0659c32092e475cd46a229af51d..f01874f23f941137788952a8084063315032387c 100644 (file)
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@@ -12,6 +12,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_ZYNQ_SDHCI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y

diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index f333b7a2bfedaada5294c1027bb838112f509e2b..215f00dae9f9589eeba31239bb6b4403854ef694 100644 (file)
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -13,6 +13,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_ZYNQ_SDHCI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y

diff --git a/configs/zynq_zc770_xm010_defconfig b/configs/zynq_zc770_xm010_defconfig
index ebfdeb098b5bedf22f36e661105601360f616699..cec722f38b3521d3106e1a50e6ee2a966345c36d 100644 (file)
--- a/configs/zynq_zc770_xm010_defconfig
+++ b/configs/zynq_zc770_xm010_defconfig
@@ -14,6 +14,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_ZYNQ_SDHCI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y

diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index 58680127aa5d22d6b3037e1ca93346fe1b0b9d68..4a2a2fc3ce45ed4e715d04d46a6cf10ceb12d265 100644 (file)
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -13,6 +13,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_ZYNQ_SDHCI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y

diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index ebaae49da1d4e8611f0bd63c72e8569fd4a0738a..7c23feca4239ed1e58f880765aeed4bb940edc23 100644 (file)
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -13,6 +13,7 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_ZYNQ_SDHCI=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SPANSION=y
 CONFIG_ZYNQ_GEM=y

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 9f4b766f7a473b5b5b9d744b2c425391cba7894a..9d3f7e908fb2bdd10b827065482771acc11694e4 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -37,4 +37,10 @@ config PIC32_SDHCI
        help
          Support for Microchip PIC32 SDHCI controller.
 
+config ZYNQ_SDHCI
+       bool "Arasan SDHCI controller support"
+       depends on DM_MMC && OF_CONTROL
+       help
+         Support for Arasan SDHCI host controller on Zynq/ZynqMP ARM SoCs platform
+
 endmenu

diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index bba48da4099fda91558008d77e19bf373cfc7341..259a87fcc59ed4bd29c7c96cfc88e865ab975473 100644 (file)
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -203,6 +203,14 @@ static int rtl8211x_startup(struct phy_device *phydev)
        return 0;
 }
 
+static int rtl8211e_startup(struct phy_device *phydev)
+{
+       genphy_update_link(phydev);
+       genphy_parse_link(phydev);
+
+       return 0;
+}
+
 static int rtl8211f_startup(struct phy_device *phydev)
 {
        /* Read the Status (2x to make sure link is right) */
@@ -230,7 +238,7 @@ static struct phy_driver RTL8211E_driver = {
        .mask = 0xffffff,
        .features = PHY_GBIT_FEATURES,
        .config = &rtl8211x_config,
-       .startup = &rtl8211x_startup,
+       .startup = &rtl8211e_startup,
        .shutdown = &genphy_shutdown,
 };
 

diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index 93dad338b37597aeea3303c9b395ba1f333a6207..28da9ddfd8592ecff03c98a89a8ec6d6d1dd91a0 100644 (file)
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -105,7 +105,7 @@ static void ns16550_writeb(NS16550_t port, int offset, int value)
         * As far as we know it doesn't make sense to support selection of
         * these options at run-time, so use the existing CONFIG options.
         */
-       serial_out_shift(addr, plat->reg_shift, value);
+       serial_out_shift(addr + plat->reg_offset, plat->reg_shift, value);
 }
 
 static int ns16550_readb(NS16550_t port, int offset)
@@ -116,7 +116,7 @@ static int ns16550_readb(NS16550_t port, int offset)
        offset *= 1 << plat->reg_shift;
        addr = map_physmem(plat->base, 0, MAP_NOCACHE) + offset;
 
-       return serial_in_shift(addr, plat->reg_shift);
+       return serial_in_shift(addr + plat->reg_offset, plat->reg_shift);
 }
 
 /* We can clean these up once everything is moved to driver model */
@@ -401,6 +401,8 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
                return -EINVAL;
 
        plat->base = addr;
+       plat->reg_offset = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+                                    "reg-offset", 0);
        plat->reg_shift = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
                                         "reg-shift", 0);
        plat->clock = fdtdec_get_int(gd->fdt_blob, dev->of_offset,

diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c
index e79d997cbab722580f2c8c2876a7f518577a1f41..66d54e32ab3884df382ba452889d686236dc1fdf 100644 (file)
--- a/drivers/serial/serial_zynq.c
+++ b/drivers/serial/serial_zynq.c
@@ -19,7 +19,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define ZYNQ_UART_SR_TXFULL    0x00000010 /* TX FIFO full */
+#define ZYNQ_UART_SR_TXEMPTY   (1 << 3) /* TX FIFO empty */
 #define ZYNQ_UART_SR_TXACTIVE  (1 << 11)  /* TX active */
 #define ZYNQ_UART_SR_RXEMPTY   0x00000002 /* RX FIFO empty */
 
@@ -97,7 +97,7 @@ static void _uart_zynq_serial_init(struct uart_zynq *regs)
 
 static int _uart_zynq_serial_putc(struct uart_zynq *regs, const char c)
 {
-       if (readl(&regs->channel_sts) & ZYNQ_UART_SR_TXFULL)
+       if (!(readl(&regs->channel_sts) & ZYNQ_UART_SR_TXEMPTY))
                return -EAGAIN;
 
        writel(c, &regs->tx_rx_fifo);

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 28622dec18821e51a00783ad8bdae3c12ea9cd17..da868b82371f4da1e40107f516d90a5665aab679 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -89,18 +89,14 @@
 # define CONFIG_CMD_SF
 #endif
 
-#if defined(CONFIG_ZYNQ_SDHCI0) || defined(CONFIG_ZYNQ_SDHCI1)
+#if defined(CONFIG_ZYNQ_SDHCI)
 # define CONFIG_MMC
 # define CONFIG_GENERIC_MMC
 # define CONFIG_SDHCI
-# define CONFIG_ZYNQ_SDHCI
 # define CONFIG_CMD_MMC
 # ifndef CONFIG_ZYNQ_SDHCI_MAX_FREQ
 #  define CONFIG_ZYNQ_SDHCI_MAX_FREQ   200000000
 # endif
-#endif
-
-#if defined(CONFIG_ZYNQ_SDHCI)
 # define CONFIG_FAT_WRITE
 # define CONFIG_CMD_EXT4_WRITE
 #endif

diff --git a/include/configs/xilinx_zynqmp_ep.h b/include/configs/xilinx_zynqmp_ep.h
index 9906c426f50f05d135f64a70f1dd1e17c2e4c9e0..337312e58c0a72213b133ad959b7e5c005481e41 100644 (file)
--- a/include/configs/xilinx_zynqmp_ep.h
+++ b/include/configs/xilinx_zynqmp_ep.h
@@ -13,7 +13,6 @@
 #ifndef __CONFIG_ZYNQMP_EP_H
 #define __CONFIG_ZYNQMP_EP_H
 
-#define CONFIG_ZYNQ_SDHCI0
 #define CONFIG_ZYNQ_SDHCI_MAX_FREQ     52000000
 #define CONFIG_ZYNQ_SDHCI_MIN_FREQ     (CONFIG_ZYNQ_SDHCI_MAX_FREQ << 9)
 #define CONFIG_ZYNQ_I2C0

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index e8c3ef0c387222ad0c507a90451bd09ae68d058c..638be2f00828adb1e064ef5f835e02bee10aa5fb 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -50,6 +50,7 @@
 # define CONFIG_MII
 # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
 # define CONFIG_PHY_MARVELL
+# define CONFIG_PHY_REALTEK
 # define CONFIG_BOOTP_SERVERIP
 # define CONFIG_BOOTP_BOOTPATH
 # define CONFIG_BOOTP_GATEWAY
@@ -86,11 +87,10 @@
 #endif
 
 /* MMC */
-#if defined(CONFIG_ZYNQ_SDHCI0) || defined(CONFIG_ZYNQ_SDHCI1)
+#if defined(CONFIG_ZYNQ_SDHCI)
 # define CONFIG_MMC
 # define CONFIG_GENERIC_MMC
 # define CONFIG_SDHCI
-# define CONFIG_ZYNQ_SDHCI
 # define CONFIG_CMD_MMC
 # define CONFIG_ZYNQ_SDHCI_MAX_FREQ    52000000
 #endif
@@ -131,7 +131,7 @@
        "dfu_ram=run dfu_ram_info && dfu 0 ram 0\0" \
        "thor_ram=run dfu_ram_info && thordown 0 ram 0\0"
 
-# if defined(CONFIG_ZYNQ_SDHCI0) || defined(CONFIG_ZYNQ_SDHCI1)
+# if defined(CONFIG_ZYNQ_SDHCI)
 #  define CONFIG_DFU_MMC
 #  define DFU_ALT_INFO_MMC \
        "dfu_mmc_info=" \
@@ -227,8 +227,7 @@
        "usbboot=if usb start; then " \
                        "echo Copying FIT from USB to RAM... && " \
                        "load usb 0 ${load_addr} ${fit_image} && " \
-                       "bootm ${load_addr}\0" \
-               "fi\0" \
+                       "bootm ${load_addr}; fi\0" \
                DFU_ALT_INFO
 
 #define CONFIG_BOOTCOMMAND             "run $modeboot"
@@ -288,9 +287,7 @@
 #define CONFIG_SYS_BOOTM_LEN   (60 * 1024 * 1024)
 
 /* Boot FreeBSD/vxWorks from an ELF image */
-#if defined(CONFIG_ZYNQ_BOOT_FREEBSD)
-# define CONFIG_SYS_MMC_MAX_DEVICE     1
-#endif
+#define CONFIG_SYS_MMC_MAX_DEVICE      1
 
 #define CONFIG_SYS_LDSCRIPT  "arch/arm/mach-zynq/u-boot.lds"
 
@@ -307,11 +304,12 @@
 #define CONFIG_SPL_LIBGENERIC_SUPPORT
 #define CONFIG_SPL_SERIAL_SUPPORT
 #define CONFIG_SPL_BOARD_INIT
+#define CONFIG_SPL_RAM_DEVICE
 
 #define CONFIG_SPL_LDSCRIPT    "arch/arm/mach-zynq/u-boot-spl.lds"
 
 /* MMC support */
-#ifdef CONFIG_ZYNQ_SDHCI0
+#ifdef CONFIG_ZYNQ_SDHCI
 #define CONFIG_SPL_MMC_SUPPORT
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS      0x200 /* 256 KB */

diff --git a/include/configs/zynq_microzed.h b/include/configs/zynq_microzed.h
index 169ee36d3f577b3d58d4f0d6104514b2b39f7ddc..e66088da4f795961ec4bc30e6b41de4a281a2c83 100644 (file)
--- a/include/configs/zynq_microzed.h
+++ b/include/configs/zynq_microzed.h
@@ -10,12 +10,8 @@
 #ifndef __CONFIG_ZYNQ_MICROZED_H
 #define __CONFIG_ZYNQ_MICROZED_H
 
-#define CONFIG_SYS_SDRAM_SIZE          (1024 * 1024 * 1024)
-
 #define CONFIG_SYS_NO_FLASH
 
-#define CONFIG_ZYNQ_SDHCI0
-
 #include <configs/zynq-common.h>
 
 #endif /* __CONFIG_ZYNQ_MICROZED_H */

diff --git a/include/configs/zynq_picozed.h b/include/configs/zynq_picozed.h
index 47fad66acdde35dc503185a8c6cfd748b6365e52..adc4d0f11e675199fbf3e6ca5d4de11c4749e9e4 100644 (file)
--- a/include/configs/zynq_picozed.h
+++ b/include/configs/zynq_picozed.h
@@ -10,13 +10,9 @@
 #ifndef __CONFIG_ZYNQ_PICOZED_H
 #define __CONFIG_ZYNQ_PICOZED_H
 
-#define CONFIG_SYS_SDRAM_SIZE          (1024 * 1024 * 1024)
-
 #define CONFIG_SYS_NO_FLASH
 
-#define CONFIG_ZYNQ_SDHCI1
 #define CONFIG_ZYNQ_USB
-#define CONFIG_ZYNQ_BOOT_FREEBSD
 
 #include <configs/zynq-common.h>
 

diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index c52a6552e78bc8495377886613a2bd1843102b19..8a045900f62dce7af24a46593b4a49ca7e190f9a 100644 (file)
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -10,15 +10,11 @@
 #ifndef __CONFIG_ZYNQ_ZC70X_H
 #define __CONFIG_ZYNQ_ZC70X_H
 
-#define CONFIG_SYS_SDRAM_SIZE          (1024 * 1024 * 1024)
-
 #define CONFIG_SYS_NO_FLASH
 
-#define CONFIG_ZYNQ_SDHCI0
 #define CONFIG_ZYNQ_USB
 #define CONFIG_ZYNQ_I2C0
 #define CONFIG_ZYNQ_EEPROM
-#define CONFIG_ZYNQ_BOOT_FREEBSD
 
 #include <configs/zynq-common.h>
 

diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index 32ea1f37d6a49aa496a567198a85b99ce56bdc4f..35622ae34649955f5953baae00f7ebd1ce6ea468 100644 (file)
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -10,20 +10,11 @@
 #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_SDHCI0
-
-#elif defined(CONFIG_ZC770_XM011)
-
-#elif defined(CONFIG_ZC770_XM012)
+#if defined(CONFIG_ZC770_XM012)
 # undef CONFIG_SYS_NO_FLASH
 
-#elif defined(CONFIG_ZC770_XM013)
-
 #endif
 
 #include <configs/zynq-common.h>

diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index 1488bfe165d9d5fbba8aeff709eb06eccfcd0670..150cb4a0df9733003ff3f7620dd4655d7994af8e 100644 (file)
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -10,13 +10,9 @@
 #ifndef __CONFIG_ZYNQ_ZED_H
 #define __CONFIG_ZYNQ_ZED_H
 
-#define CONFIG_SYS_SDRAM_SIZE          (512 * 1024 * 1024)
-
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_ZYNQ_USB
-#define CONFIG_ZYNQ_SDHCI0
-#define CONFIG_ZYNQ_BOOT_FREEBSD
 
 #include <configs/zynq-common.h>
 

diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
index c53ba79d48b07ba8010ce3d5cae71b5f3091b27a..0882fe36bd82ef68b9515c0c265fc4015d673496 100644 (file)
--- a/include/configs/zynq_zybo.h
+++ b/include/configs/zynq_zybo.h
@@ -11,13 +11,14 @@
 #ifndef __CONFIG_ZYNQ_ZYBO_H
 #define __CONFIG_ZYNQ_ZYBO_H
 
-#define CONFIG_SYS_SDRAM_SIZE (512 * 1024 * 1024)
-
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_ZYNQ_USB
-#define CONFIG_ZYNQ_SDHCI0
-#define CONFIG_ZYNQ_BOOT_FREEBSD
+#define CONFIG_ZYNQ_I2C0
+#define CONFIG_ZYNQ_I2C1
+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
+#define CONFIG_DISPLAY
+#define CONFIG_I2C_EDID
 
 /* Define ZYBO PS Clock Frequency to 50MHz */
 #define CONFIG_ZYNQ_PS_CLK_FREQ        50000000UL

diff --git a/include/ns16550.h b/include/ns16550.h
index 4e620676c453c6a4e0df04332befc0a1b34da592..5eeacd6ff945d48f46e8f839a1eb120336d5bb93 100644 (file)
--- a/include/ns16550.h
+++ b/include/ns16550.h
@@ -54,6 +54,7 @@
  */
 struct ns16550_platdata {
        unsigned long base;
+       int reg_offset;
        int reg_shift;
        int clock;
 };