]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge tag 'v2016.05' into master
authorMichal Simek <michal.simek@xilinx.com>
Mon, 11 Jul 2016 14:02:29 +0000 (16:02 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Mon, 11 Jul 2016 14:02:29 +0000 (16:02 +0200)
Prepare v2016.05

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
52 files changed:
1  2 
Makefile
README
arch/arm/Kconfig
arch/arm/cpu/armv8/zynqmp/Kconfig
arch/arm/dts/Makefile
arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts
arch/arm/dts/zynqmp.dtsi
arch/arm/include/asm/io.h
arch/microblaze/lib/bootm.c
board/xilinx/zynq/board.c
board/xilinx/zynqmp/zynqmp.c
cmd/Kconfig
cmd/Makefile
common/spl/spl.c
common/spl/spl_mmc.c
configs/xilinx_zynqmp_ep_defconfig
configs/xilinx_zynqmp_mini_nand_defconfig
configs/xilinx_zynqmp_mini_qspi_defconfig
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
configs/xilinx_zynqmp_zcu102_defconfig
configs/xilinx_zynqmp_zcu102_revB_defconfig
configs/zynq_cse_nand_defconfig
configs/zynq_cse_nor_defconfig
configs/zynq_cse_qspi_defconfig
configs/zynq_microzed_defconfig
configs/zynq_picozed_defconfig
configs/zynq_zc702_RSA_defconfig
configs/zynq_zc702_defconfig
configs/zynq_zc706_RSA_defconfig
configs/zynq_zc706_defconfig
configs/zynq_zc770_xm010_defconfig
configs/zynq_zc770_xm011_defconfig
configs/zynq_zc770_xm012_defconfig
configs/zynq_zc770_xm013_defconfig
configs/zynq_zed_RSA_defconfig
configs/zynq_zed_defconfig
configs/zynq_zybo_defconfig
drivers/fpga/Makefile
drivers/gpio/zynq_gpio.c
drivers/mmc/sdhci.c
drivers/mtd/cfi_flash.c
drivers/mtd/spi/spi_flash.c
drivers/net/zynq_gem.c
fs/fat/fat.c
include/config_cmd_all.h
include/configs/microblaze-generic.h
include/configs/xilinx_zynqmp.h
include/configs/xilinx_zynqmp_mini.h
include/configs/zynq-common.h
include/spl.h
scripts/Makefile.spl

diff --cc Makefile
index ad9d566dab348a6499d517ddf16e2ac6c862e531,954a865381afa0a6a13602c072afc214f973c381..954a865381afa0a6a13602c072afc214f973c381
mode 100755,100644..100755
+++ b/Makefile
diff --cc README
Simple merge
index 7da675a4b0486dfc665509eae88d0ec169a4687e,6b65d8e76a46fcf259c13bfe5fec77b0219816bd..400265896ec8b51eceb9ca4dfe04fdd6247ecf29
@@@ -573,11 -592,8 +592,10 @@@ config ARCH_ZYNQM
        bool "Support Xilinx ZynqMP Platform"
        select ARM64
        select DM
-       select DM_SPI
-       select DM_SPI_FLASH
+       select OF_CONTROL
        select DM_SERIAL
 +      select OF_CONTROL
 +      select SPL_DISABLE_OF_CONTROL
  
  config TEGRA
        bool "NVIDIA Tegra"
index f8f7b85d38de751e4399aef5a0e0abec42b9b965,6c71d7840eb5428778660cb29633f91823dd3180..c170e31323142eafefe364d9b7df1bdd65a31d5d
@@@ -17,12 -17,6 +17,10 @@@ config SYS_CONFIG_NAM
          Based on this option include/configs/<CONFIG_SYS_CONFIG_NAME>.h header
          will be used for board configuration.
  
- config NAND_ARASAN
-       bool "Configure Arasan Nand"
 +config ZYNQMP_QSPI
 +      bool "Configure ZynqMP QSPI"
++      select DM_SPI
 +
  config ZYNQMP_USB
        bool "Configure ZynqMP USB"
  
Simple merge
index 52f327f2e7c619d43d3e8cbdd51dcc40c42738be,c68a41bea79aed85acd4441c5e3b13436bf6a00d..2da93f7ff1c9b8aa525c9a53e34b219762069259
  /* ULPI SMSC USB3320 */
  &usb0 {
        status = "okay";
 +};
 +
 +&dwc3_0 {
 +      status = "okay";
 +      dr_mode = "host";
 +      phy-names = "usb3-phy";
 +      phys = <&lane2 PHY_TYPE_USB3 0 2 26000000>;
+       dr_mode = "host";
  };
  
  &xilinx_drm {
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc cmd/Kconfig
Simple merge
diff --cc cmd/Makefile
Simple merge
Simple merge
Simple merge
index 1505d61ebc47917e50d2de5698442bd90d2e0a92,b185593dc99df2fbd613f96df13f66ff76df611b..285e30ed46dbb5c2fdf668cebfadc019bb0d5ca1
@@@ -2,9 -2,8 +2,10 @@@ CONFIG_ARM=
  CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_ep"
  CONFIG_ARCH_ZYNQMP=y
  CONFIG_SYS_MALLOC_F_LEN=0x4000
+ CONFIG_DM_I2C=y
  CONFIG_DM_GPIO=y
- CONFIG_NAND_ARASAN=y
++CONFIG_DM_SPI_FLASH=y
 +CONFIG_ZYNQMP_QSPI=y
  CONFIG_ZYNQMP_USB=y
  CONFIG_SYS_TEXT_BASE=0x8000000
  CONFIG_DEFAULT_DEVICE_TREE="zynqmp-ep108"
@@@ -27,15 -33,25 +35,31 @@@ CONFIG_CMD_MII=
  CONFIG_CMD_PING=y
  CONFIG_CMD_TIME=y
  CONFIG_CMD_TIMER=y
+ CONFIG_CMD_EXT2=y
+ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_FS_GENERIC=y
++CONFIG_CMD_SF=y
  CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
+ CONFIG_SYS_I2C_CADENCE=y
  CONFIG_DM_MMC=y
  CONFIG_ZYNQ_SDHCI=y
+ CONFIG_NAND_ARASAN=y
 +CONFIG_SPI_FLASH=y
 +CONFIG_SPI_FLASH_BAR=y
 +CONFIG_SPI_FLASH_SPANSION=y
 +CONFIG_SPI_FLASH_STMICRO=y
 +CONFIG_SPI_FLASH_WINBOND=y
  CONFIG_DM_ETH=y
  CONFIG_ZYNQ_GEM=y
+ CONFIG_USB=y
+ CONFIG_USB_DWC3=y
+ CONFIG_USB_DWC3_GADGET=y
+ CONFIG_USB_GADGET=y
+ CONFIG_USB_GADGET_DOWNLOAD=y
+ CONFIG_G_DNL_MANUFACTURER="Xilinx"
+ CONFIG_G_DNL_VENDOR_NUM=0x03fd
+ CONFIG_G_DNL_PRODUCT_NUM=0x0300
  # CONFIG_REGEX is not set
index 098df6ba060efa8224f88f7c4594b46b59f229cc,0000000000000000000000000000000000000000..3f392ae7ac5e7eed93399b7cb1f030c93f5fc45b
mode 100644,000000..100644
--- /dev/null
@@@ -1,38 -1,0 +1,39 @@@
- CONFIG_NAND_ARASAN=y
 +CONFIG_ARM=y
 +CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini"
 +CONFIG_ARCH_ZYNQMP=y
 +CONFIG_SYS_TEXT_BASE=0x10000
 +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-nand"
 +CONFIG_FIT=y
 +CONFIG_SYS_EXTRA_OPTIONS="MINI_NAND"
 +CONFIG_SYS_PROMPT="ZynqMP> "
 +# CONFIG_CMD_BDI is not set
 +# CONFIG_CMD_CONSOLE is not set
 +# CONFIG_CMD_BOOTD is not set
 +# CONFIG_CMD_BOOTM is not set
 +# CONFIG_CMD_GO is not set
 +# CONFIG_CMD_RUN is not set
 +# CONFIG_CMD_IMI is not set
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_XIMG is not set
 +# CONFIG_CMD_EXPORTENV is not set
 +# CONFIG_CMD_IMPORTENV is not set
 +# CONFIG_CMD_EDITENV is not set
 +# CONFIG_CMD_SAVEENV is not set
 +# CONFIG_CMD_ENV_EXISTS is not set
 +# CONFIG_CMD_CRC32 is not set
 +# CONFIG_CMD_DM is not set
 +# CONFIG_CMD_LOADB is not set
 +# CONFIG_CMD_LOADS is not set
 +# CONFIG_CMD_FLASH is not set
 +# CONFIG_CMD_FPGA is not set
 +# CONFIG_CMD_ECHO is not set
 +# CONFIG_CMD_ITEST is not set
 +# CONFIG_CMD_SOURCE is not set
 +# CONFIG_CMD_SETEXPR is not set
 +# CONFIG_CMD_NET is not set
 +# CONFIG_CMD_NFS is not set
 +CONFIG_OF_EMBED=y
 +# CONFIG_DM_WARN is not set
 +# CONFIG_DM_DEVICE_REMOVE is not set
++CONFIG_NAND_ARASAN=y
++# CONFIG_EFI_LOADER is not set
index 00612de57cff92e38585ee32b96d7698df7f7efe,0000000000000000000000000000000000000000..49fab29e6afb054aec74260097c4d2f2da0cff4f
mode 100644,000000..100644
--- /dev/null
@@@ -1,44 -1,0 +1,45 @@@
 +CONFIG_ARM=y
 +CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini"
 +CONFIG_ARCH_ZYNQMP=y
 +CONFIG_ZYNQMP_QSPI=y
 +CONFIG_SYS_TEXT_BASE=0xFFFC0000
 +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-qspi"
 +CONFIG_SYS_EXTRA_OPTIONS="MINI_QSPI"
 +CONFIG_SYS_PROMPT="ZynqMP> "
 +# CONFIG_CMD_BDI is not set
 +# CONFIG_CMD_CONSOLE is not set
 +# CONFIG_CMD_BOOTD is not set
 +# CONFIG_CMD_BOOTM is not set
 +# CONFIG_CMD_ELF is not set
 +# CONFIG_CMD_GO is not set
 +# CONFIG_CMD_RUN is not set
 +# CONFIG_CMD_IMI is not set
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_XIMG is not set
 +# CONFIG_CMD_EXPORTENV is not set
 +# CONFIG_CMD_IMPORTENV is not set
 +# CONFIG_CMD_EDITENV is not set
 +# CONFIG_CMD_SAVEENV is not set
 +# CONFIG_CMD_ENV_EXISTS is not set
 +# CONFIG_CMD_CRC32 is not set
 +# CONFIG_CMD_DM is not set
 +# CONFIG_CMD_LOADB is not set
 +# CONFIG_CMD_LOADS is not set
 +# CONFIG_CMD_FLASH is not set
 +# CONFIG_CMD_FPGA is not set
 +# CONFIG_CMD_ECHO is not set
 +# CONFIG_CMD_ITEST is not set
 +# CONFIG_CMD_SOURCE is not set
 +# CONFIG_CMD_SETEXPR is not set
 +# CONFIG_CMD_NET is not set
 +# CONFIG_CMD_NFS is not set
 +# CONFIG_CMD_MISC is not set
 +CONFIG_OF_EMBED=y
 +# CONFIG_DM_WARN is not set
 +# CONFIG_DM_DEVICE_REMOVE is not set
 +CONFIG_SPI_FLASH=y
 +CONFIG_SPI_FLASH_BAR=y
 +CONFIG_SPI_FLASH_SPANSION=y
 +CONFIG_SPI_FLASH_STMICRO=y
 +CONFIG_SPI_FLASH_WINBOND=y
++# CONFIG_EFI_LOADER is not set
index 359d7dc7b36f7f2aeff6b8107a03af0246354596,cc08b03842d49491fce13598b798e1e11e54d3ce..14534bee939510ebe9b153071f8c0bcd78f96b8e
@@@ -1,8 -1,8 +1,10 @@@
  CONFIG_ARM=y
  CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm015_dc1"
  CONFIG_ARCH_ZYNQMP=y
+ CONFIG_DM_I2C=y
  CONFIG_DM_GPIO=y
++CONFIG_DM_SPI_FLASH=y
 +CONFIG_ZYNQMP_QSPI=y
  CONFIG_ZYNQMP_USB=y
  CONFIG_SYS_TEXT_BASE=0x8000000
  CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm015-dc1"
@@@ -15,12 -19,20 +21,21 @@@ CONFIG_CMD_DFU=
  CONFIG_CMD_GPIO=y
  CONFIG_CMD_TFTPPUT=y
  CONFIG_CMD_DHCP=y
+ CONFIG_CMD_MII=y
  CONFIG_CMD_PING=y
++CONFIG_CMD_SF=y
  CONFIG_CMD_TIME=y
  CONFIG_CMD_TIMER=y
+ CONFIG_CMD_EXT2=y
+ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_FS_GENERIC=y
  CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
+ CONFIG_SYS_I2C_CADENCE=y
  CONFIG_DM_MMC=y
+ CONFIG_ZYNQ_SDHCI=y
  CONFIG_SPI_FLASH=y
  CONFIG_SPI_FLASH_BAR=y
  CONFIG_SPI_FLASH_SPANSION=y
index 197de6215fdd0f2e3be126e51dc6860358804ffb,14d24a03bfba1e92ee35a590ae435445a3ad661e..97bd1d9c4ced715d01bd93a97c9ea3aa654b6928
@@@ -1,8 -1,8 +1,9 @@@
  CONFIG_ARM=y
  CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm016_dc2"
  CONFIG_ARCH_ZYNQMP=y
+ CONFIG_DM_I2C=y
  CONFIG_DM_GPIO=y
 +CONFIG_NAND_ARASAN=y
  CONFIG_ZYNQMP_USB=y
  CONFIG_SYS_TEXT_BASE=0x8000000
  CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm016-dc2"
@@@ -18,9 -22,16 +23,15 @@@ CONFIG_CMD_MII=
  CONFIG_CMD_PING=y
  CONFIG_CMD_TIME=y
  CONFIG_CMD_TIMER=y
+ CONFIG_CMD_EXT2=y
+ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_FS_GENERIC=y
  CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
+ CONFIG_SYS_I2C_CADENCE=y
  CONFIG_DM_MMC=y
 -CONFIG_NAND_ARASAN=y
  CONFIG_SPI_FLASH=y
  CONFIG_SPI_FLASH_BAR=y
  CONFIG_SPI_FLASH_SST=y
index 1cec270c34db41bfe52c50c91496f5e8a3f03f7e,6f1cff8c65d805485b1a48fc9bf19e6142032b10..c5cb276c7b22ea7a00a44a5350d142b23b0eb64e
@@@ -2,7 -2,6 +2,8 @@@ CONFIG_ARM=
  CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu102"
  CONFIG_ARCH_ZYNQMP=y
  CONFIG_DM_GPIO=y
++CONFIG_DM_SPI_FLASH=y
 +CONFIG_ZYNQMP_QSPI=y
  CONFIG_ZYNQMP_USB=y
  CONFIG_SYS_TEXT_BASE=0x8000000
  CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102"
@@@ -15,9 -18,15 +20,16 @@@ CONFIG_CMD_DFU=
  CONFIG_CMD_GPIO=y
  CONFIG_CMD_TFTPPUT=y
  CONFIG_CMD_DHCP=y
+ CONFIG_CMD_MII=y
  CONFIG_CMD_PING=y
++CONFIG_CMD_SF=y
  CONFIG_CMD_TIME=y
  CONFIG_CMD_TIMER=y
+ CONFIG_CMD_EXT2=y
+ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_FS_GENERIC=y
  CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_DM_MMC=y
index 3499d8cec9abc727ecc4a3002ce5fe7533e5058d,a8982a04a56e550b5f12d83fed4c9fb6df785f21..1e679343c2acb9429f69313535b7d3c15e3ad79f
@@@ -2,7 -2,6 +2,8 @@@ CONFIG_ARM=
  CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu102"
  CONFIG_ARCH_ZYNQMP=y
  CONFIG_DM_GPIO=y
++CONFIG_DM_SPI_FLASH=y
 +CONFIG_ZYNQMP_QSPI=y
  CONFIG_ZYNQMP_USB=y
  CONFIG_SYS_TEXT_BASE=0x8000000
  CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-revB"
@@@ -15,9 -18,15 +20,16 @@@ CONFIG_CMD_DFU=
  CONFIG_CMD_GPIO=y
  CONFIG_CMD_TFTPPUT=y
  CONFIG_CMD_DHCP=y
+ CONFIG_CMD_MII=y
  CONFIG_CMD_PING=y
++CONFIG_CMD_SF=y
  CONFIG_CMD_TIME=y
  CONFIG_CMD_TIMER=y
+ CONFIG_CMD_EXT2=y
+ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_FS_GENERIC=y
  CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_DM_MMC=y
index 3f7188b7cbb18a9873df6098c27dd48fbbb6995d,0000000000000000000000000000000000000000..b36240f4a59d02e9add9253a65252235158d8de2
mode 100644,000000..100644
--- /dev/null
@@@ -1,10 -1,0 +1,11 @@@
 +CONFIG_ARM=y
 +CONFIG_ARCH_ZYNQ=y
 +CONFIG_TARGET_ZYNQ_CSE=y
 +CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nand"
 +CONFIG_SYS_EXTRA_OPTIONS="CSE_NAND"
 +CONFIG_SYS_PROMPT="Zynq> "
 +# CONFIG_CMD_BOOTD is not set
 +# CONFIG_CMD_BOOTM is not set
 +# CONFIG_CMD_GO is not set
 +CONFIG_OF_EMBED=y
++# CONFIG_EFI_LOADER is not set
index 967e4663f72f4092f5a540025ba1d4118c29592b,0000000000000000000000000000000000000000..657890ebdc3b0942af85e219824a0c2786d03eaa
mode 100644,000000..100644
--- /dev/null
@@@ -1,10 -1,0 +1,11 @@@
 +CONFIG_ARM=y
 +CONFIG_ARCH_ZYNQ=y
 +CONFIG_TARGET_ZYNQ_CSE=y
 +CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-nor"
 +CONFIG_SYS_EXTRA_OPTIONS="CSE_NOR"
 +CONFIG_SYS_PROMPT="Zynq> "
 +# CONFIG_CMD_BOOTD is not set
 +# CONFIG_CMD_BOOTM is not set
 +# CONFIG_CMD_GO is not set
 +CONFIG_OF_EMBED=y
++# CONFIG_EFI_LOADER is not set
index 306b5592d0e08427eacca32f04b3ecbaca636ca9,0000000000000000000000000000000000000000..3e3aeebd3cff755e1768d18cf5a6b6ab66898bc7
mode 100644,000000..100644
--- /dev/null
@@@ -1,42 -1,0 +1,43 @@@
 +CONFIG_ARM=y
 +CONFIG_ARCH_ZYNQ=y
 +CONFIG_TARGET_ZYNQ_CSE=y
 +CONFIG_DEFAULT_DEVICE_TREE="zynq-cse-qspi"
 +CONFIG_SYS_EXTRA_OPTIONS="CSE_QSPI"
 +CONFIG_SYS_PROMPT="Zynq> "
 +# CONFIG_CMD_BDI is not set
 +# CONFIG_CMD_CONSOLE is not set
 +# CONFIG_CMD_BOOTD is not set
 +# CONFIG_CMD_BOOTM is not set
 +# CONFIG_CMD_GO is not set
 +# CONFIG_CMD_RUN is not set
 +# CONFIG_CMD_IMI is not set
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_XIMG is not set
 +# CONFIG_CMD_EXPORTENV is not set
 +# CONFIG_CMD_IMPORTENV is not set
 +# CONFIG_CMD_EDITENV is not set
 +# CONFIG_CMD_SAVEENV is not set
 +# CONFIG_CMD_ENV_EXISTS is not set
 +# CONFIG_CMD_CRC32 is not set
 +# CONFIG_CMD_DM is not set
 +# CONFIG_CMD_LOADB is not set
 +# CONFIG_CMD_LOADS is not set
 +# CONFIG_CMD_FLASH is not set
 +# CONFIG_CMD_FPGA is not set
 +# CONFIG_CMD_ECHO is not set
 +# CONFIG_CMD_ITEST is not set
 +# CONFIG_CMD_SOURCE is not set
 +# CONFIG_CMD_SETEXPR is not set
 +# CONFIG_CMD_NET is not set
 +# CONFIG_CMD_NFS is not set
 +# CONFIG_CMD_MISC is not set
 +CONFIG_OF_EMBED=y
 +CONFIG_SPI_FLASH=y
 +CONFIG_SPI_FLASH_BAR=y
 +CONFIG_SPI_FLASH_ISSI=y
 +CONFIG_SPI_FLASH_MACRONIX=y
 +CONFIG_SPI_FLASH_SPANSION=y
 +CONFIG_SPI_FLASH_STMICRO=y
 +CONFIG_SPI_FLASH_WINBOND=y
 +CONFIG_ZYNQ_QSPI=y
++# CONFIG_EFI_LOADER is not set
index d79e5a22bfd5585983ab26d21421f74b02030bf1,7c66247d3eefe5d6b4a89a5c6f08a09d69ce8d78..968a0fd56cdc7c67257a758ee087e8f006a3ff05
@@@ -9,9 -10,22 +10,23 @@@ CONFIG_HUSH_PARSER=
  CONFIG_SYS_PROMPT="Zynq> "
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
+ CONFIG_CMD_MMC=y
+ CONFIG_CMD_SF=y
+ CONFIG_CMD_USB=y
+ CONFIG_CMD_DFU=y
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
+ CONFIG_CMD_TFTPPUT=y
+ CONFIG_CMD_DHCP=y
+ CONFIG_CMD_MII=y
+ CONFIG_CMD_PING=y
+ CONFIG_CMD_CACHE=y
+ CONFIG_CMD_EXT2=y
+ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_FS_GENERIC=y
 +CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
  CONFIG_ZYNQ_SDHCI=y
index 8d58a572bfbb7956c1a2315b430e95b55f9eab1c,b46ab44b7848cfeb12031bd3b208f7719dcfc2ff..537294e7447904aa4255f3c79c3cb55d1bea8b54
@@@ -6,9 -7,21 +7,22 @@@ CONFIG_HUSH_PARSER=
  CONFIG_SYS_PROMPT="Zynq> "
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
+ CONFIG_CMD_MMC=y
+ CONFIG_CMD_USB=y
+ CONFIG_CMD_DFU=y
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
+ CONFIG_CMD_TFTPPUT=y
+ CONFIG_CMD_DHCP=y
+ CONFIG_CMD_MII=y
+ CONFIG_CMD_PING=y
+ CONFIG_CMD_CACHE=y
+ CONFIG_CMD_EXT2=y
+ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_FS_GENERIC=y
 +CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
  CONFIG_ZYNQ_SDHCI=y
index 57e932278c9ed857239c4868e14718906e7c58b7,0000000000000000000000000000000000000000..aff10de2654bb2620a6fc119e3678cff49b8a0eb
mode 100644,000000..100644
--- /dev/null
@@@ -1,30 -1,0 +1,56 @@@
 +CONFIG_ARM=y
 +CONFIG_ARCH_ZYNQ=y
 +CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
 +CONFIG_SPL=y
 +CONFIG_FIT=y
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_FIT_SIGNATURE=y
++CONFIG_HUSH_PARSER=y
 +CONFIG_SYS_PROMPT="Zynq> "
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_FLASH is not set
++CONFIG_CMD_MMC=y
++CONFIG_CMD_SF=y
++CONFIG_CMD_I2C=y
++CONFIG_CMD_USB=y
++CONFIG_CMD_DFU=y
 +CONFIG_CMD_GPIO=y
 +# CONFIG_CMD_SETEXPR is not set
++CONFIG_CMD_TFTPPUT=y
++CONFIG_CMD_DHCP=y
++CONFIG_CMD_MII=y
++CONFIG_CMD_PING=y
++CONFIG_CMD_CACHE=y
 +CONFIG_CMD_ZYNQ_AES=y
 +CONFIG_CMD_ZYNQ_RSA=y
++CONFIG_CMD_EXT2=y
++CONFIG_CMD_EXT4=y
++CONFIG_CMD_EXT4_WRITE=y
++CONFIG_CMD_FAT=y
++CONFIG_CMD_FS_GENERIC=y
 +CONFIG_OF_EMBED=y
 +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_ISSI=y
 +CONFIG_SPI_FLASH_MACRONIX=y
 +CONFIG_SPI_FLASH_SPANSION=y
 +CONFIG_SPI_FLASH_STMICRO=y
 +CONFIG_SPI_FLASH_WINBOND=y
 +CONFIG_ZYNQ_GEM=y
 +CONFIG_DEBUG_UART=y
 +CONFIG_DEBUG_UART_ZYNQ=y
 +CONFIG_DEBUG_UART_BASE=0xe0001000
 +CONFIG_DEBUG_UART_CLOCK=50000000
 +CONFIG_ZYNQ_QSPI=y
++CONFIG_USB=y
++CONFIG_USB_ULPI_VIEWPORT=y
++CONFIG_USB_ULPI=y
++CONFIG_USB_GADGET=y
++CONFIG_CI_UDC=y
++CONFIG_USB_GADGET_DOWNLOAD=y
++CONFIG_G_DNL_MANUFACTURER="Xilinx"
++CONFIG_G_DNL_VENDOR_NUM=0x03fd
++CONFIG_G_DNL_PRODUCT_NUM=0x0300
index 355630dab210db8fadae09bbed74cd3face3e6c2,052679a1dc9c22569adea1fd35629727948c1259..691b96ba8a3e05a5528f6416600e33a5e47b98e6
@@@ -8,9 -9,23 +9,24 @@@ CONFIG_HUSH_PARSER=
  CONFIG_SYS_PROMPT="Zynq> "
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
+ CONFIG_CMD_MMC=y
+ CONFIG_CMD_SF=y
+ CONFIG_CMD_I2C=y
+ CONFIG_CMD_USB=y
+ CONFIG_CMD_DFU=y
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
+ CONFIG_CMD_TFTPPUT=y
+ CONFIG_CMD_DHCP=y
+ CONFIG_CMD_MII=y
+ CONFIG_CMD_PING=y
+ CONFIG_CMD_CACHE=y
+ CONFIG_CMD_EXT2=y
+ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_FS_GENERIC=y
 +CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
  CONFIG_ZYNQ_SDHCI=y
index 70d7a054249dd4cc1b7798f214b2f491e69dae3f,0000000000000000000000000000000000000000..042821c22a156acc418c8b7aeea05d3fc7e7594e
mode 100644,000000..100644
--- /dev/null
@@@ -1,27 -1,0 +1,53 @@@
 +CONFIG_ARM=y
 +CONFIG_ARCH_ZYNQ=y
 +CONFIG_TARGET_ZYNQ_ZC706=y
 +CONFIG_DEFAULT_DEVICE_TREE="zynq-zc706"
 +CONFIG_SPL=y
 +CONFIG_FIT=y
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_FIT_SIGNATURE=y
++CONFIG_HUSH_PARSER=y
 +CONFIG_SYS_PROMPT="Zynq> "
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_FLASH is not set
++CONFIG_CMD_MMC=y
++CONFIG_CMD_SF=y
++CONFIG_CMD_I2C=y
++CONFIG_CMD_USB=y
++CONFIG_CMD_DFU=y
 +CONFIG_CMD_GPIO=y
 +# CONFIG_CMD_SETEXPR is not set
++CONFIG_CMD_TFTPPUT=y
++CONFIG_CMD_DHCP=y
++CONFIG_CMD_MII=y
++CONFIG_CMD_PING=y
++CONFIG_CMD_CACHE=y
 +CONFIG_CMD_ZYNQ_AES=y
 +CONFIG_CMD_ZYNQ_RSA=y
++CONFIG_CMD_EXT2=y
++CONFIG_CMD_EXT4=y
++CONFIG_CMD_EXT4_WRITE=y
++CONFIG_CMD_FAT=y
++CONFIG_CMD_FS_GENERIC=y
 +CONFIG_OF_EMBED=y
 +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_ISSI=y
 +CONFIG_SPI_FLASH_MACRONIX=y
 +CONFIG_SPI_FLASH_SPANSION=y
 +CONFIG_SPI_FLASH_STMICRO=y
 +CONFIG_SPI_FLASH_WINBOND=y
 +CONFIG_ZYNQ_GEM=y
 +CONFIG_ZYNQ_QSPI=y
++CONFIG_USB=y
++CONFIG_USB_ULPI_VIEWPORT=y
++CONFIG_USB_ULPI=y
++CONFIG_USB_GADGET=y
++CONFIG_CI_UDC=y
++CONFIG_USB_GADGET_DOWNLOAD=y
++CONFIG_G_DNL_MANUFACTURER="Xilinx"
++CONFIG_G_DNL_VENDOR_NUM=0x03fd
++CONFIG_G_DNL_PRODUCT_NUM=0x0300
index 0d5b235c772bd0df356d8acacce24818508fcfa4,3539f0547f5bbfeee7ed9bfc7f1e5a6b6af8439b..55029a33eca6d65071febf0c488285e2f6a5d09a
@@@ -9,9 -10,23 +10,24 @@@ CONFIG_HUSH_PARSER=
  CONFIG_SYS_PROMPT="Zynq> "
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
+ CONFIG_CMD_MMC=y
+ CONFIG_CMD_SF=y
+ CONFIG_CMD_I2C=y
+ CONFIG_CMD_USB=y
+ CONFIG_CMD_DFU=y
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
+ CONFIG_CMD_TFTPPUT=y
+ CONFIG_CMD_DHCP=y
+ CONFIG_CMD_MII=y
+ CONFIG_CMD_PING=y
+ CONFIG_CMD_CACHE=y
+ CONFIG_CMD_EXT2=y
+ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_FS_GENERIC=y
 +CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
  CONFIG_ZYNQ_SDHCI=y
index 340d8fb0639394488b0a945171a19be06e333438,6a4726cb9a3616a9a53969b91c972aaadd853b29..5284e5e55f0620e4becee2e32b11582ce87871c5
@@@ -10,9 -11,20 +11,21 @@@ CONFIG_HUSH_PARSER=
  CONFIG_SYS_PROMPT="Zynq> "
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
+ CONFIG_CMD_MMC=y
+ CONFIG_CMD_SF=y
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
+ CONFIG_CMD_TFTPPUT=y
+ CONFIG_CMD_DHCP=y
+ CONFIG_CMD_MII=y
+ CONFIG_CMD_PING=y
+ CONFIG_CMD_CACHE=y
+ CONFIG_CMD_EXT2=y
+ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_FS_GENERIC=y
 +CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
  CONFIG_ZYNQ_SDHCI=y
index 7706c10121a8ec4c9dde457a509543e0d51af8d8,46dd6bee191cd7b9c74119ab9b71212ec8425aa7..cf427b89b88829f27d2b4ea2d4f1cf8c5d4b3eaa
@@@ -12,7 -13,11 +13,12 @@@ CONFIG_SYS_PROMPT="Zynq> 
  # CONFIG_CMD_FLASH is not set
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
+ CONFIG_CMD_TFTPPUT=y
+ CONFIG_CMD_DHCP=y
+ CONFIG_CMD_MII=y
+ CONFIG_CMD_PING=y
+ CONFIG_CMD_CACHE=y
 +CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
  CONFIG_ZYNQ_GEM=y
index 21f1685fb6712c86698e328c8683b8a7d7e18f95,12f0e2ca3bb80cde3b2f04e0f067e2082dfe6d02..7036530a0e89b6a52ecc68fadea21353db7ce264
@@@ -7,11 -7,15 +7,17 @@@ CONFIG_FIT=
  CONFIG_FIT_VERBOSE=y
  CONFIG_FIT_SIGNATURE=y
  CONFIG_SYS_EXTRA_OPTIONS="ZC770_XM012"
+ CONFIG_HUSH_PARSER=y
  CONFIG_SYS_PROMPT="Zynq> "
 +# CONFIG_CMD_IMLS is not set
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
+ CONFIG_CMD_TFTPPUT=y
+ CONFIG_CMD_DHCP=y
+ CONFIG_CMD_MII=y
+ CONFIG_CMD_PING=y
+ CONFIG_CMD_CACHE=y
 +CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
  CONFIG_ZYNQ_GEM=y
index 8a375013f30d4f4aa337ad5eac6d5241c7b682d3,8c7efe53208c546923a808120dd331bc503afbaf..cb682c4a7fe3e3cda3b78054428903397200d3cb
@@@ -11,7 -13,11 +13,12 @@@ CONFIG_SYS_PROMPT="Zynq> 
  # CONFIG_CMD_FLASH is not set
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
+ CONFIG_CMD_TFTPPUT=y
+ CONFIG_CMD_DHCP=y
+ CONFIG_CMD_MII=y
+ CONFIG_CMD_PING=y
+ CONFIG_CMD_CACHE=y
 +CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
  CONFIG_SPI_FLASH=y
index 80c68ad14f3f8a771df3e431891b83c7ee7f75e4,0000000000000000000000000000000000000000..e22fecedffbfc402c5efb4cad8c97299aa521227
mode 100644,000000..100644
--- /dev/null
@@@ -1,23 -1,0 +1,50 @@@
- CONFIG_SPI_FLASH_ISSI=y
- CONFIG_SPI_FLASH_MACRONIX=y
 +CONFIG_ARM=y
 +CONFIG_ARCH_ZYNQ=y
 +CONFIG_TARGET_ZYNQ_ZED=y
 +CONFIG_DEFAULT_DEVICE_TREE="zynq-zed"
 +CONFIG_SPL=y
 +CONFIG_FIT=y
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_FIT_SIGNATURE=y
++CONFIG_HUSH_PARSER=y
 +CONFIG_SYS_PROMPT="Zynq> "
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_FLASH is not set
++CONFIG_CMD_MMC=y
++CONFIG_CMD_SF=y
++CONFIG_CMD_USB=y
++CONFIG_CMD_DFU=y
++CONFIG_CMD_GPIO=y
 +# CONFIG_CMD_SETEXPR is not set
++CONFIG_CMD_TFTPPUT=y
++CONFIG_CMD_DHCP=y
++CONFIG_CMD_MII=y
++CONFIG_CMD_PING=y
++CONFIG_CMD_CACHE=y
 +CONFIG_CMD_ZYNQ_AES=y
 +CONFIG_CMD_ZYNQ_RSA=y
++CONFIG_CMD_EXT2=y
++CONFIG_CMD_EXT4=y
++CONFIG_CMD_EXT4_WRITE=y
++CONFIG_CMD_FAT=y
++CONFIG_CMD_FS_GENERIC=y
 +CONFIG_OF_EMBED=y
++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
 +CONFIG_SPI_FLASH_STMICRO=y
 +CONFIG_SPI_FLASH_WINBOND=y
++CONFIG_ZYNQ_GEM=y
 +CONFIG_ZYNQ_QSPI=y
++CONFIG_USB=y
++CONFIG_USB_ULPI_VIEWPORT=y
++CONFIG_USB_ULPI=y
++CONFIG_USB_GADGET=y
++CONFIG_CI_UDC=y
++CONFIG_USB_GADGET_DOWNLOAD=y
++CONFIG_G_DNL_MANUFACTURER="Xilinx"
++CONFIG_G_DNL_VENDOR_NUM=0x03fd
++CONFIG_G_DNL_PRODUCT_NUM=0x0300
index cd2c1fe5414e16dbb70638fd3a959c47736c4bdc,7976e07c3b9e4209e5e30c792cd896f11daf277e..ec0aeb6cffef21abae1b338b75fe44530337e5ea
@@@ -9,9 -10,22 +10,23 @@@ CONFIG_HUSH_PARSER=
  CONFIG_SYS_PROMPT="Zynq> "
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
+ CONFIG_CMD_MMC=y
+ CONFIG_CMD_SF=y
+ CONFIG_CMD_USB=y
+ CONFIG_CMD_DFU=y
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
+ CONFIG_CMD_TFTPPUT=y
+ CONFIG_CMD_DHCP=y
+ CONFIG_CMD_MII=y
+ CONFIG_CMD_PING=y
+ CONFIG_CMD_CACHE=y
+ CONFIG_CMD_EXT2=y
+ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_FS_GENERIC=y
 +CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
  CONFIG_ZYNQ_SDHCI=y
index b852dfc01529c122286aed86192590f1002912bf,cd222c5a7b072b32428b91e3569d8b5443c2ce27..4fedf4b66241bedc65440bfe0d9f281c252dd37d
@@@ -9,9 -10,23 +10,24 @@@ CONFIG_HUSH_PARSER=
  CONFIG_SYS_PROMPT="Zynq> "
  # CONFIG_CMD_IMLS is not set
  # CONFIG_CMD_FLASH is not set
+ CONFIG_CMD_MMC=y
+ CONFIG_CMD_SF=y
+ CONFIG_CMD_I2C=y
+ CONFIG_CMD_USB=y
+ CONFIG_CMD_DFU=y
  CONFIG_CMD_GPIO=y
  # CONFIG_CMD_SETEXPR is not set
+ CONFIG_CMD_TFTPPUT=y
+ CONFIG_CMD_DHCP=y
+ CONFIG_CMD_MII=y
+ CONFIG_CMD_PING=y
+ CONFIG_CMD_CACHE=y
+ CONFIG_CMD_EXT2=y
+ CONFIG_CMD_EXT4=y
+ CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_CMD_FAT=y
+ CONFIG_CMD_FS_GENERIC=y
 +CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
  CONFIG_ZYNQ_SDHCI=y
Simple merge
index 4ab23560810494a386a0b76bad285aa5d9b523ff,3a995f610cb3e8acae8f7a6f8220c2365272e5d3..05d4d3019dc5a35eb27572cc81143dd7d5e34cd3
@@@ -324,8 -304,6 +324,7 @@@ static const struct dm_gpio_ops gpio_zy
        .direction_output       = zynq_gpio_direction_output,
        .get_value              = zynq_gpio_get_value,
        .set_value              = zynq_gpio_set_value,
 +      .get_function           = zynq_gpio_get_function,
  };
  
  static const struct udevice_id zynq_gpio_ids[] = {
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/fat/fat.c
Simple merge
index eea9b68d4ebb8d5eeea114f907d2dd422bdaed1a,ed502a191ff6cebc9b077d27e63c6cf8d0c6a769..255f6693ee9d2ff4667a1503e22956fa12717815
@@@ -69,9 -52,6 +52,8 @@@
  #define CONFIG_CMD_UBIFS      /* UBIFS Support                */
  #define CONFIG_CMD_UNIVERSE   /* Tundra Universe Support      */
  #define CONFIG_CMD_UNZIP      /* unzip from memory to memory  */
- #define CONFIG_CMD_USB                /* USB Support                  */
  #define CONFIG_CMD_ZFS                /* ZFS Support                  */
 +#define CONFIG_CMD_ZYNQ_AES   /* AES support for Zynq         */
 +#define CONFIG_CMD_ZYNQ_RSA   /* RSA-AES support for Zynq     */
  
  #endif        /* _CONFIG_CMD_ALL_H */
Simple merge
index b449994e8d901428b0fd0638dafa9dd84192b43f,060bca985e058d4457c4941ab2dee5a79468dd80..7b9f1e61a0a6f13f4cc1d72a050d10a659e8fc00
  #if !defined(CONFIG_IDENT_STRING)
  # define CONFIG_IDENT_STRING          " Xilinx ZynqMP"
  #endif
 +#define CONFIG_BOOTP_VCI_STRING               "U-boot.armv8.Xilinx_ZynqMP"
  
 +/* Text base on 16MB for now - 0 doesn't work */
  #define CONFIG_SYS_INIT_SP_ADDR               CONFIG_SYS_TEXT_BASE
  
- /* Flat Device Tree Definitions */
- #define CONFIG_OF_LIBFDT
  /* Generic Timer Definitions - setup in EL3. Setup by ATF for other cases */
  #if !defined(COUNTER_FREQUENCY)
  # define COUNTER_FREQUENCY            100000000
  #define CONFIG_BOOTP_MAY_FAIL
  #define CONFIG_BOOTP_SERVERIP
  
- /* SPI */
- #ifdef CONFIG_ZYNQ_SPI
- # define CONFIG_CMD_SPI
- # define CONFIG_CMD_SF
- #endif
 +#ifdef CONFIG_ZYNQMP_QSPI
 +# define CONFIG_SPI_GENERIC
 +# define CONFIG_SF_DEFAULT_SPEED      30000000
 +# define CONFIG_SF_DUAL_FLASH
- # define CONFIG_CMD_SPI
- # define CONFIG_CMD_SF
 +# define CONFIG_CMD_SF_TEST
 +#endif
 +
 +/* NAND */
 +#ifdef CONFIG_NAND_ARASAN
 +# define CONFIG_CMD_NAND
 +# define CONFIG_CMD_NAND_LOCK_UNLOCK
 +# define CONFIG_SYS_MAX_NAND_DEVICE   1
 +# define CONFIG_SYS_NAND_SELF_INIT
 +# define CONFIG_SYS_NAND_ONFI_DETECTION
 +# define CONFIG_MTD_DEVICE
 +#endif
 +
  #if defined(CONFIG_ZYNQ_SDHCI)
  # define CONFIG_MMC
  # define CONFIG_GENERIC_MMC
  # define CONFIG_SDHCI
- # define CONFIG_CMD_MMC
 +# define CONFIG_SUPPORT_EMMC_BOOT
  # ifndef CONFIG_ZYNQ_SDHCI_MAX_FREQ
  #  define CONFIG_ZYNQ_SDHCI_MAX_FREQ  200000000
  # endif
  #endif
  
  /* Initial environment variables */
 +#ifndef CONFIG_EXTRA_ENV_SETTINGS
  #define CONFIG_EXTRA_ENV_SETTINGS \
 -      "kernel_addr=0x80000\0" \
 -      "fdt_addr=0x7000000\0" \
 +      "kernel_addr=0x200000\0" \
 +      "initrd_addr=0xa00000\0" \
 +      "initrd_size=0x2000000\0" \
 +      "fdt_addr=4000000\0" \
        "fdt_high=0x10000000\0" \
-       "loadbootenv_addr=0x100000\0" \
+       CONFIG_KERNEL_FDT_OFST_SIZE \
        "sdbootdev=0\0"\
 -      "sdboot=mmc dev $sdbootdev && mmcinfo && load mmc $sdbootdev:$partid $fdt_addr system.dtb && " \
 +      CONFIG_KERNEL_FDT_OFST_SIZE \
 +      "bootenv=uEnv.txt\0" \
 +      "loadbootenv=load mmc $sdbootdev:$partid ${loadbootenv_addr} ${bootenv}\0" \
 +      "importbootenv=echo Importing environment from SD ...; " \
 +              "env import -t ${loadbootenv_addr} $filesize\0" \
 +      "sd_uEnvtxt_existence_test=test -e mmc $sdbootdev:$partid /uEnv.txt\0" \
 +      "sata_root=if test $scsidevs -gt 0; then setenv bootargs $bootargs root=/dev/sda rw rootfstype=ext4; fi\0" \
 +      "sataboot=load scsi 0 80000 boot/Image && load scsi 0 $fdt_addr boot/system.dtb && booti 80000 - $fdt_addr\0" \
 +      "veloce=fdt addr f000000 && fdt resize" \
 +              "fdt set /amba/misc_clk clock-frequency <48000> && "\
 +              "fdt set /timer clock-frequency <240000> && " \
 +              "fdt set /amba/i2c_clk clock-frequency <240000> && " \
 +              "booti 80000 - f000000\0" \
 +      "netboot=tftpboot 10000000 image.ub && bootm\0" \
 +      "qspiboot=sf probe 0 0 0 && sf read $fdt_addr $fdt_offset $fdt_size && " \
 +                "sf read $kernel_addr $kernel_offset $kernel_size && " \
 +                "booti $kernel_addr - $fdt_addr\0" \
 +      "uenvboot=" \
 +              "if run sd_uEnvtxt_existence_test; then " \
 +                      "run loadbootenv; " \
 +                      "echo Loaded environment from ${bootenv}; " \
 +                      "run importbootenv; " \
 +              "fi\0" \
 +      "sdboot=mmc dev $sdbootdev && mmcinfo && run uenvboot; " \
 +              "load mmc $sdbootdev:$partid $fdt_addr system.dtb && " \
                "load mmc $sdbootdev:$partid $kernel_addr Image && " \
                "booti $kernel_addr - $fdt_addr\0" \
 +      "nandboot=nand info && nand read $fdt_addr $fdt_offset $fdt_size && " \
 +                "nand read $kernel_addr $kernel_offset $kernel_size && " \
 +                "booti $kernel_addr - $fdt_addr\0" \
 +      "xen=tftpb $fdt_addr system.dtb && fdt addr $fdt_addr && fdt resize && " \
 +              "tftpb 0x80000 Image && " \
 +              "fdt set /chosen/dom0 reg <0x80000 0x$filesize> && "\
 +              "tftpb 6000000 xen.ub && bootm 6000000 - $fdt_addr\0" \
 +      "jtagboot=tftpboot 80000 Image && tftpboot $fdt_addr system.dtb && " \
 +               "tftpboot 6000000 rootfs.cpio.ub && booti 80000 6000000 $fdt_addr\0" \
 +      "nosmp=setenv bootargs $bootargs maxcpus=1\0" \
 +      "nfsroot=setenv bootargs $bootargs root=/dev/nfs nfsroot=$serverip:/mnt/sata,tcp ip=$ipaddr:$serverip:$serverip:255.255.255.0:zynqmp:eth0:off rw\0" \
 +      "sdroot=setenv bootargs $bootargs root=/dev/mmcblk0p2 rw rootwait\0" \
 +      "sdroot1=setenv bootargs $bootargs root=/dev/mmcblk1p2 rw rootwait\0" \
 +      "android=setenv bootargs $bootargs init=/init androidboot.selinux=disabled androidboot.hardware=$board\0" \
 +      "android_debug=run android && setenv bootargs $bootargs video=DP-1:1024x768@60 drm.debug=0xf\0" \
 +      "usbhostboot=usb start && load usb 0 $fdt_addr system.dtb && " \
 +                   "load usb 0 $kernel_addr Image && " \
 +                   "booti $kernel_addr - $fdt_addr\0" \
        DFU_ALT_INFO
 +#endif
  
 -#define CONFIG_PREBOOT                "run bootargs"
 +#define CONFIG_PREBOOT                "run setup"
  #define CONFIG_BOOTCOMMAND    "run $modeboot"
  #define CONFIG_BOOTDELAY      3
  
index e52363ad82246595d43dbf78c5951e48e6a7b42f,0000000000000000000000000000000000000000..702c59267495a7d1208b5da3f1b4ec04cef2d5fd
mode 100644,000000..100644
--- /dev/null
@@@ -1,98 -1,0 +1,98 @@@
- #define CONFIG_SYS_DCACHE_OFF
 +/*
 + * Configuration for Xilinx ZynqMP Flash utility
 + *
 + * (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_MINI_H
 +#define __CONFIG_ZYNQMP_MINI_H
 +
 +#define CONFIG_SYS_NO_FLASH
 +#define _CONFIG_CMD_DEFAULT_H
++/* #define CONFIG_SYS_DCACHE_OFF */
 +#define CONFIG_SYS_ICACHE_OFF
 +#define CONFIG_FIT_DISABLE_SHA256
 +
 +#include <configs/xilinx_zynqmp.h>
 +
 +/* Undef unneeded configs */
 +#undef CONFIG_EXTRA_ENV_SETTINGS
 +#undef CONFIG_BOARD_LATE_INIT
 +#undef CONFIG_CMD_BOOTZ
 +#undef CONFIG_BOOTCOMMAND
 +#undef CONFIG_SYS_HUSH_PARSER
 +#undef CONFIG_SYS_PROMPT_HUSH_PS2
 +#undef CONFIG_BOOTDELAY
 +#undef CONFIG_PREBOOT
 +#undef CONFIG_SYS_MALLOC_LEN
 +#undef CONFIG_ENV_SIZE
 +#undef CONFIG_CMDLINE_EDITING
 +#undef CONFIG_AUTO_COMPLETE
 +#undef CONFIG_ZLIB
 +#undef CONFIG_GZIP
 +#undef CONFIG_CMD_SPL
 +#undef CONFIG_CMD_ENV
 +#undef CONFIG_CMD_EXT2
 +#undef CONFIG_CMD_EXT4
 +#undef CONFIG_CMD_FAT
 +#undef CONFIG_CMD_FS_GENERIC
 +#undef CONFIG_CMD_MEMORY
 +#undef CONFIG_DOS_PARTITION
 +#undef CONFIG_CMD_ELF
 +#undef CONFIG_MP
 +#undef CONFIG_SYS_MEMTEST_START
 +#undef CONFIG_SYS_MEMTEST_END
 +#undef CONFIG_SYS_CACHELINE_SIZE
 +#undef CONFIG_SYS_INIT_SP_ADDR
 +#undef CONFIG_SYS_LONGHELP
 +#undef CONFIG_CMD_CACHE
 +#undef CONFIG_FPGA_ZYNQMPPL
 +#undef CONFIG_FPGA_XILINX
 +#undef CONFIG_FPGA
 +#undef CONFIG_CMD_SF_TEST
 +#undef CONFIG_CMD_GPIO
 +#undef CONFIG_CMD_SPI
 +#undef CONFIG_FIT_VERBOSE
 +#undef CONFIG_ZYNQ_SERIAL
 +#undef CONFIG_CMD_MII
 +
 +/* BOOTP options */
 +#undef CONFIG_BOOTP_BOOTFILESIZE
 +#undef CONFIG_BOOTP_BOOTPATH
 +#undef CONFIG_BOOTP_GATEWAY
 +#undef CONFIG_BOOTP_HOSTNAME
 +#undef CONFIG_BOOTP_MAY_FAIL
 +#undef CONFIG_BOOTP_SERVERIP
 +#undef CONFIG_CMD_BOOTI
 +#undef CONFIG_CMD_UNZIP
 +
 +/* Define needed configs */
 +#define CONFIG_CMD_MEMORY
 +#define CONFIG_BOOTDELAY      -1 /* -1 to Disable autoboot */
 +
 +#undef CONFIG_NR_DRAM_BANKS
 +#define CONFIG_NR_DRAM_BANKS  1
 +
 +#if defined(CONFIG_MINI_QSPI)
 +# define CONFIG_SYS_SDRAM_SIZE                (256 * 1024)
 +# define CONFIG_SYS_SDRAM_BASE                0xFFFC0000
 +# define CONFIG_ENV_SIZE              1400
 +# define CONFIG_SYS_INIT_SP_ADDR      (CONFIG_SYS_SDRAM_BASE + 0x20000)
 +# define CONFIG_SYS_MALLOC_LEN                0x2000
 +
 +#elif defined(CONFIG_MINI_NAND)
 +# define CONFIG_SYS_SDRAM_SIZE                0x1000000
 +# define CONFIG_SYS_SDRAM_BASE                0
 +# define CONFIG_ENV_SIZE              0x10000
 +# define CONFIG_SYS_INIT_SP_ADDR      (CONFIG_SYS_SDRAM_BASE + 0x40000)
 +# define CONFIG_SYS_MALLOC_LEN                0x800000
 +
 +#endif
 +
 +#endif /* __CONFIG_ZYNQMP_MINI_H */
index 9d9e5e75aedf4a8d0017a8d1cb15a1324e20469f,a3e4aecb571e5269c93cd71aa7c2154173973132..4c3ef06a58e51e75dee212eeff2d087188e4598f
@@@ -62,8 -59,7 +59,7 @@@
  /* QSPI */
  #ifdef CONFIG_ZYNQ_QSPI
  # define CONFIG_SF_DEFAULT_SPEED      30000000
- # define CONFIG_CMD_SF
 -# define CONFIG_SPI_FLASH_ISSI
 +# define CONFIG_SF_DUAL_FLASH
  #endif
  
  /* NOR */
  
  #if defined(CONFIG_ZYNQ_SDHCI) || defined(CONFIG_ZYNQ_USB)
  # define CONFIG_SUPPORT_VFAT
- # define CONFIG_CMD_FAT
- # define CONFIG_CMD_EXT2
  # define CONFIG_FAT_WRITE
  # define CONFIG_DOS_PARTITION
- # define CONFIG_CMD_EXT4
- # define CONFIG_CMD_EXT4_WRITE
- # define CONFIG_CMD_FS_GENERIC
  #endif
  
 +/* NAND */
 +#ifdef CONFIG_NAND_ZYNQ
 +# define CONFIG_CMD_NAND
 +# define CONFIG_CMD_NAND_LOCK_UNLOCK
 +# define CONFIG_SYS_MAX_NAND_DEVICE 1
 +# define CONFIG_SYS_NAND_SELF_INIT
 +# define CONFIG_SYS_NAND_ONFI_DETECTION
 +# define CONFIG_MTD_DEVICE
 +#endif
 +
  #if defined(CONFIG_ZYNQ_I2C0) || defined(CONFIG_ZYNQ_I2C1)
  #define CONFIG_SYS_I2C_ZYNQ
  #endif
  # endif
  
  # define CONFIG_ENV_SECT_SIZE         CONFIG_ENV_SIZE
 -# define CONFIG_ENV_OFFSET            0xE0000
 +# ifndef CONFIG_ENV_OFFSET
 +#  define CONFIG_ENV_OFFSET           0xE0000
 +# endif
  #endif
  
+ /* enable preboot to be loaded before CONFIG_BOOTDELAY */
+ #define CONFIG_PREBOOT
  /* Default environment */
  #ifndef CONFIG_EXTRA_ENV_SETTINGS
  #define CONFIG_EXTRA_ENV_SETTINGS     \
  #define CONFIG_SYS_LDSCRIPT  "arch/arm/mach-zynq/u-boot.lds"
  
  /* Commands */
- #ifdef CONFIG_SYS_ENET
- # define CONFIG_CMD_PING
- # define CONFIG_CMD_DHCP
- # define CONFIG_CMD_MII
- # define CONFIG_CMD_TFTPPUT
- #else
- # undef CONFIG_CMD_NET
- # undef CONFIG_CMD_NFS
- #endif
 +#if defined(CONFIG_CMD_ZYNQ_RSA)
 +# ifndef CONFIG_RSA
 +#  define CONFIG_RSA
 +# endif
 +#define CONFIG_SHA256
 +#endif
 +
 +#define CONFIG_CMD_BOOTZ
 +#undef CONFIG_BOOTM_NETBSD
 +
 +#define CONFIG_SYS_HZ                 1000
 +
 +/* For development/debugging */
 +#ifdef DEBUG
 +# define CONFIG_CMD_REGINFO
 +# define CONFIG_PANIC_HANG
 +#endif
  
  /* SPL part */
  #define CONFIG_CMD_SPL
diff --cc include/spl.h
Simple merge
Simple merge