]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge tag 'v2016.09' into master
authorMichal Simek <michal.simek@xilinx.com>
Thu, 15 Dec 2016 12:22:01 +0000 (13:22 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Fri, 16 Dec 2016 08:32:00 +0000 (09:32 +0100)
Prepare v2016.09

- Fix fpga part in spl_mmc (use mmc_get_blk_desc(mmc)
  instead of &mmc->block_dev
- Fix dependencies in defconfig

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
43 files changed:
1  2 
Kconfig
Makefile
README
arch/arm/cpu/armv8/zynqmp/Kconfig
arch/arm/dts/Makefile
arch/arm/dts/zynqmp-clk.dtsi
arch/arm/dts/zynqmp-ep108-clk.dtsi
arch/arm/include/asm/io.h
cmd/Kconfig
cmd/Makefile
common/Kconfig
common/Makefile
common/spl/Makefile
common/spl/spl.c
common/spl/spl_mmc.c
configs/xilinx_zynqmp_ep_defconfig
configs/xilinx_zynqmp_mini_emmc_defconfig
configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig
configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig
configs/xilinx_zynqmp_zc1751_xm017_dc3_defconfig
configs/xilinx_zynqmp_zc1751_xm018_dc4_defconfig
configs/xilinx_zynqmp_zc1751_xm019_dc5_defconfig
configs/xilinx_zynqmp_zcu100_defconfig
configs/xilinx_zynqmp_zcu100_revA_defconfig
configs/xilinx_zynqmp_zcu102_defconfig
configs/xilinx_zynqmp_zcu102_revB_defconfig
configs/xilinx_zynqmp_zcu106_defconfig
configs/zynq_zc702_RSA_defconfig
drivers/clk/Kconfig
drivers/clk/Makefile
drivers/mtd/cfi_flash.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/Makefile
drivers/mtd/spi/Kconfig
drivers/mtd/spi/sf_params.c
include/configs/microblaze-generic.h
include/configs/xilinx_zynqmp.h
include/configs/xilinx_zynqmp_ep.h
include/configs/zynq-common.h
include/fdtdec.h
include/spl.h
lib/fdtdec.c
scripts/Makefile.spl

diff --cc Kconfig
index 2ae065ca813d82da3091bbdc6d8ec100426ac89d,fdea71efaacc71bc92b2e582b2109b40fab67425..2beae027d5149ed1f529f9c47478423c40f3e06a
+++ b/Kconfig
@@@ -313,33 -332,34 +332,61 @@@ config SPL_LOAD_FI
          particular it can handle selecting from multiple device tree
          and passing the correct one to U-Boot.
  
+ config SPL_FIT_IMAGE_POST_PROCESS
+       bool "Enable post-processing of FIT artifacts after loading by the SPL"
+       depends on SPL_LOAD_FIT && TI_SECURE_DEVICE
+       help
+         Allows doing any sort of manipulation to blobs after they got extracted
+         from the U-Boot FIT image like stripping off headers or modifying the
+         size of the blob, verification, authentication, decryption etc. in a
+         platform or board specific way. In order to use this feature a platform
+         or board-specific implementation of board_fit_image_post_process() must
+         be provided. Also, anything done during this post-processing step would
+         need to be comprehended in how the images were prepared before being
+         injected into the FIT creation (i.e. the blobs would have been pre-
+         processed before being added to the FIT image).
+ config FIT_IMAGE_POST_PROCESS
+       bool "Enable post-processing of FIT artifacts after loading by U-Boot"
+       depends on FIT && TI_SECURE_DEVICE
+       help
+         Allows doing any sort of manipulation to blobs after they got extracted
+         from FIT images like stripping off headers or modifying the size of the
+         blob, verification, authentication, decryption etc. in a platform or
+         board specific way. In order to use this feature a platform or board-
+         specific implementation of board_fit_image_post_process() must be
+         provided. Also, anything done during this post-processing step would
+         need to be comprehended in how the images were prepared before being
+         injected into the FIT creation (i.e. the blobs would have been pre-
+         processed before being added to the FIT image).
 +config SPL_DFU_SUPPORT
 +      bool "Enable SPL with DFU to load binaries to memory device"
 +      depends on USB
 +      help
 +        Currently the SPL does not have capability to load the
 +        binaries or boot images to boot devices like ram,eMMC,SPI,etc.
 +        This feature enables the DFU (Device Firmware Upgarde) in SPL with
 +        RAM memory device support. The ROM code will load and execute
 +        the SPL built with dfu. The user can load binaries (u-boot/kernel) to
 +        selected device partition from host-pc using dfu-utils.
 +              This feature will be useful to flash the binaries to factory
 +        or bare-metal boards using USB interface.
 +
 +choice
 +      bool "DFU device selection"
 +      depends on SPL_DFU_SUPPORT
 +
 +config SPL_DFU_RAM
 +      bool "RAM device"
 +      depends on SPL_DFU_SUPPORT
 +      help
 +       select RAM/DDR memory device for loading binary images
 +       (u-boot/kernel) to the selected device partition using
 +       DFU and execute the u-boot/kernel from RAM.
 +
 +endchoice
 +
  config SYS_CLK_FREQ
        depends on ARC || ARCH_SUNXI
        int "CPU clock frequency"
diff --cc Makefile
index 88128ec72a26878740dc3ac0719252819654bea4,1cf15cefd12ce02dedfc0524e41457936c7f1f2c..1cf15cefd12ce02dedfc0524e41457936c7f1f2c
mode 100755,100644..100755
+++ b/Makefile
diff --cc README
Simple merge
index a8525ad5d0caf6528c2037f4e6dd71bb5553313d,ed3305d71821f3421f403eceddd4420ec045bc61..91886be629994b7c5f5f5fe3d9998dfd2ffbe52a
@@@ -39,61 -20,8 +39,64 @@@ config ZYNQMP_QSP
  config ZYNQMP_USB
        bool "Configure ZynqMP USB"
  
+ config SYS_MALLOC_F_LEN
+       default 0x600
 +config SPL_ZYNQMP_ALT_BOOTMODE_ENABLED
 +      bool "Overwrite SPL bootmode"
 +      depends on SPL
 +      help
 +        Overwrite bootmode selected via boot mode pins to tell SPL what should
 +        be the next boot device.
 +
 +config SPL_ZYNQMP_ALT_BOOTMODE
 +      hex
 +      default 0x0 if JTAG_MODE
 +      default 0x1 if QSPI_MODE_24BIT
 +      default 0x2 if QSPI_MODE_32BIT
 +      default 0x3 if SD_MODE
 +      default 0x4 if NAND_MODE
 +      default 0x5 if SD_MODE1
 +      default 0x6 if EMMC_MODE
 +      default 0x7 if USB_MODE
 +      default 0xa if SW_USBHOST_MODE
 +      default 0xb if SW_SATA_MODE
 +
 +choice
 +      prompt "Boot mode"
 +      depends on SPL_ZYNQMP_ALT_BOOTMODE_ENABLED
 +      default JTAG
 +
 +config JTAG_MODE
 +      bool "JTAG_MODE"
 +
 +config QSPI_MODE_24BIT
 +      bool "QSPI_MODE_24BIT"
 +
 +config QSPI_MODE_32BIT
 +      bool "QSPI_MODE_32BIT"
 +
 +config SD_MODE
 +      bool "SD_MODE"
 +
 +config SD_MODE1
 +      bool "SD_MODE1"
 +
 +config NAND_MODE
 +      bool "NAND_MODE"
 +
 +config EMMC_MODE
 +      bool "EMMC_MODE"
 +
 +config USB_MODE
 +      bool "USB"
 +
 +config SW_USBHOST_MODE
 +      bool "SW USBHOST_MODE"
 +
 +config SW_SATA_MODE
 +      bool "SW SATA_MODE"
 +
 +endchoice
  
  endif
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc cmd/Kconfig
Simple merge
diff --cc cmd/Makefile
Simple merge
diff --cc common/Kconfig
Simple merge
diff --cc common/Makefile
Simple merge
Simple merge
Simple merge
index c3af31d17d56f1d445d87a958e901cdcf287e0a1,7c7f32959b224a44b789bc8b4642c60b2e28655f..a5c60b13c1b94b443e930c8126a10e1a2eb69c1c
@@@ -221,35 -218,6 +221,35 @@@ static int mmc_load_image_raw_os(struc
  }
  #endif
  
-       err = spl_load_image_fat(&mmc->block_dev,
 +#ifdef CONFIG_SPL_FPGA_SUPPORT
 +static int mmc_load_fpga_image_fat(struct mmc *mmc)
 +{
 +      int err;
 +      int devnum = 0;
 +      const fpga_desc *const desc = fpga_get_desc(devnum);
 +      xilinx_desc *desc_xilinx = desc->devdesc;
 +
++      err = spl_load_image_fat(mmc_get_blk_desc(mmc),
 +                                      CONFIG_SYS_MMCSD_FS_BOOT_PARTITION,
 +                                      CONFIG_SPL_FPGA_LOAD_ARGS_NAME);
 +
 +      if (err) {
 +#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
 +              printf("spl: error reading image %s, err - %d\n",
 +                     CONFIG_SPL_FPGA_LOAD_ARGS_NAME, err);
 +#endif
 +              return -1;
 +      }
 +#ifdef CONFIG_SPL_FPGA_BIT
 +      return fpga_loadbitstream(devnum, (char *)spl_image.load_addr,
 +                                desc_xilinx->size, BIT_FULL);
 +#else
 +      return fpga_load(devnum, (const void *)spl_image.load_addr,
 +                       desc_xilinx->size, BIT_FULL);
 +#endif
 +}
 +#endif
 +
  #ifdef CONFIG_SYS_MMCSD_FS_BOOT_PARTITION
  int spl_mmc_do_fs_boot(struct mmc *mmc)
  {
index b0f7ae44743d8c8d6ea7404f8057a686d195da52,5f285d8150d49203e6a0ba61e952d3e035a96602..5843171cdb6230020d00034ad651ad99c5b3cd63
@@@ -2,12 -2,6 +2,7 @@@ CONFIG_ARM=
  CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_ep"
  CONFIG_ARCH_ZYNQMP=y
  CONFIG_SYS_MALLOC_F_LEN=0x8000
- CONFIG_SPL_SYS_MALLOC_SIMPLE=y
- CONFIG_SPL_DM=y
- CONFIG_DM_SPI_FLASH=y
- CONFIG_DM_I2C=y
- CONFIG_DM_GPIO=y
 +CONFIG_ZYNQMP_QSPI=y
  CONFIG_ZYNQMP_USB=y
  CONFIG_SYS_TEXT_BASE=0x8000000
  CONFIG_DEFAULT_DEVICE_TREE="zynqmp-ep108"
@@@ -49,16 -43,18 +45,22 @@@ CONFIG_CMD_FS_GENERIC=
  CONFIG_SPL_OF_CONTROL=y
  CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
+ CONFIG_SPL_DM=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
+ CONFIG_BLK=y
+ CONFIG_DM_GPIO=y
+ CONFIG_DM_I2C=y
  CONFIG_SYS_I2C_CADENCE=y
  CONFIG_DM_MMC=y
+ CONFIG_DM_MMC_OPS=y
  CONFIG_ZYNQ_SDHCI=y
  CONFIG_NAND_ARASAN=y
++CONFIG_DM_SPI_FLASH=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_DEBUG_UART=y
index 64b64c6b14d78eb11d85feb22277531f216d4686,0000000000000000000000000000000000000000..e78e99afaf249385d75a6fd00adb8e46ad91cb88
mode 100644,000000..100644
--- /dev/null
@@@ -1,41 -1,0 +1,43 @@@
- CONFIG_CMD_MMC=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-emmc"
 +CONFIG_FIT=y
 +CONFIG_SYS_EXTRA_OPTIONS="MINI_EMMC"
 +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_MMC=y
 +# 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_BLK=y
 +CONFIG_DM_MMC=y
++CONFIG_DM_MMC_OPS=y
 +CONFIG_ZYNQ_SDHCI=y
 +# CONFIG_EFI_LOADER is not set
index 7753c4f67cfc71d5deb57c7a4be2b331b26f1d96,059db84e3147251f17b841b1f8d5bc9b291fde95..586de8843bd15f8fe7a8a94bcd23ef4316de4c4f
@@@ -2,12 -2,6 +2,7 @@@ CONFIG_ARM=
  CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm015_dc1"
  CONFIG_ARCH_ZYNQMP=y
  CONFIG_SYS_MALLOC_F_LEN=0x8000
- CONFIG_SPL_SYS_MALLOC_SIMPLE=y
- CONFIG_SPL_DM=y
- CONFIG_DM_SPI_FLASH=y
- CONFIG_DM_I2C=y
- CONFIG_DM_GPIO=y
 +CONFIG_ZYNQMP_QSPI=y
  CONFIG_ZYNQMP_USB=y
  CONFIG_SYS_TEXT_BASE=0x8000000
  CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm015-dc1"
@@@ -41,10 -34,15 +37,16 @@@ CONFIG_CMD_FS_GENERIC=
  CONFIG_SPL_OF_CONTROL=y
  CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
+ CONFIG_SPL_DM=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
+ CONFIG_BLK=y
+ CONFIG_DM_GPIO=y
+ CONFIG_DM_I2C=y
  CONFIG_SYS_I2C_CADENCE=y
  CONFIG_DM_MMC=y
+ CONFIG_DM_MMC_OPS=y
  CONFIG_ZYNQ_SDHCI=y
++CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH=y
  CONFIG_SPI_FLASH_BAR=y
  CONFIG_SPI_FLASH_SPANSION=y
index 578353feb74838ae4f4fed1913fad02b52bac441,0000000000000000000000000000000000000000..c8a86bf4f16b93b6d9299fc78a6a41374f87ed13
mode 100644,000000..100644
--- /dev/null
@@@ -1,67 -1,0 +1,69 @@@
- CONFIG_SPL_SYS_MALLOC_SIMPLE=y
- CONFIG_SPL_DM=y
- CONFIG_DM_I2C=y
- CONFIG_DM_GPIO=y
 +CONFIG_ARM=y
 +CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm017_dc3"
 +CONFIG_ARCH_ZYNQMP=y
 +CONFIG_SYS_MALLOC_F_LEN=0x8000
 +CONFIG_ZYNQMP_USB=y
 +CONFIG_SYS_TEXT_BASE=0x8000000
 +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm017-dc3"
 +CONFIG_SPL=y
++CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 +CONFIG_FIT=y
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_SPL_LOAD_FIT=y
 +CONFIG_IDENT_STRING=" Xilinx ZynqMP ZC1751 xm017 dc3"
 +CONFIG_HUSH_PARSER=y
 +CONFIG_SYS_PROMPT="ZynqMP> "
 +# CONFIG_CMD_IMLS is not set
 +CONFIG_CMD_MEMTEST=y
 +# CONFIG_CMD_FLASH is not set
 +CONFIG_CMD_MMC=y
 +CONFIG_CMD_NAND=y
 +CONFIG_CMD_I2C=y
 +CONFIG_CMD_USB=y
 +CONFIG_CMD_DFU=y
 +CONFIG_CMD_GPIO=y
 +CONFIG_CMD_TFTPPUT=y
 +CONFIG_CMD_DHCP=y
 +CONFIG_CMD_MII=y
 +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_SPL_OF_CONTROL=y
 +CONFIG_OF_EMBED=y
 +CONFIG_NET_RANDOM_ETHADDR=y
++CONFIG_SPL_DM=y
 +CONFIG_SPL_DM_SEQ_ALIAS=y
++CONFIG_BLK=y
++CONFIG_DM_GPIO=y
++CONFIG_DM_I2C=y
 +CONFIG_SYS_I2C_CADENCE=y
 +CONFIG_DM_MMC=y
++CONFIG_DM_MMC_OPS=y
 +CONFIG_ZYNQ_SDHCI=y
 +CONFIG_NAND_ARASAN=y
 +CONFIG_DM_ETH=y
 +CONFIG_ZYNQ_GEM=y
 +CONFIG_DEBUG_UART=y
 +CONFIG_DEBUG_UART_ZYNQ=y
 +CONFIG_DEBUG_UART_BASE=0xff010000
 +CONFIG_DEBUG_UART_CLOCK=100000000
 +CONFIG_DEBUG_UART_ANNOUNCE=y
 +CONFIG_USB=y
 +CONFIG_USB_XHCI_HCD=y
 +CONFIG_USB_XHCI_DWC3=y
 +CONFIG_USB_DWC3=y
 +CONFIG_USB_DWC3_GADGET=y
 +CONFIG_USB_ULPI_VIEWPORT=y
 +CONFIG_USB_ULPI=y
 +CONFIG_USB_STORAGE=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_EFI_LOADER_BOUNCE_BUFFER=y
index 89b521c9130901494a4790fa70d54e8543bfdac4,3ac22cb087dbca1f1139a1b7ddeb6ae94af25d55..40c149c07c1be381d7f2cf8bdcd5ffda643c1016
@@@ -1,10 -1,7 +1,6 @@@
  CONFIG_ARM=y
 -CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zc1751_xm018_dc4"
  CONFIG_ARCH_ZYNQMP=y
  CONFIG_SYS_MALLOC_F_LEN=0x8000
- CONFIG_SPL_SYS_MALLOC_SIMPLE=y
- CONFIG_SPL_DM=y
- CONFIG_DM_I2C=y
- CONFIG_DM_GPIO=y
  CONFIG_SYS_TEXT_BASE=0x8000000
  CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zc1751-xm018-dc4"
  CONFIG_SPL=y
index 799c483583c0e8d80dedd3680147a24c9b2c41f2,0000000000000000000000000000000000000000..76593207a08def842eca8725517add05e02615de
mode 100644,000000..100644
--- /dev/null
@@@ -1,71 -1,0 +1,73 @@@
- CONFIG_SPL_SYS_MALLOC_SIMPLE=y
- CONFIG_SPL_DM=y
- CONFIG_DM_SPI_FLASH=y
- CONFIG_DM_GPIO=y
 +CONFIG_ARM=y
 +CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu100"
 +CONFIG_ARCH_ZYNQMP=y
 +CONFIG_SYS_MALLOC_F_LEN=0x8000
 +CONFIG_ZYNQMP_QSPI=y
 +CONFIG_ZYNQMP_USB=y
 +CONFIG_SYS_TEXT_BASE=0x8000000
 +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu100"
 +CONFIG_SPL=y
++CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 +CONFIG_FIT=y
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_SPL_LOAD_FIT=y
 +CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU100 RevB"
 +CONFIG_HUSH_PARSER=y
 +CONFIG_SYS_PROMPT="ZynqMP> "
 +# CONFIG_CMD_IMLS is not set
 +CONFIG_CMD_MEMTEST=y
 +# CONFIG_CMD_FLASH is not set
 +CONFIG_CMD_MMC=y
 +CONFIG_CMD_SF=y
 +CONFIG_CMD_SPI=y
 +CONFIG_CMD_I2C=y
 +CONFIG_CMD_USB=y
 +CONFIG_CMD_DFU=y
 +CONFIG_CMD_GPIO=y
 +CONFIG_CMD_TFTPPUT=y
 +CONFIG_CMD_DHCP=y
 +CONFIG_CMD_MII=y
 +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_SPL_OF_CONTROL=y
 +CONFIG_OF_EMBED=y
 +CONFIG_NET_RANDOM_ETHADDR=y
++CONFIG_SPL_DM=y
 +CONFIG_SPL_DM_SEQ_ALIAS=y
++CONFIG_BLK=y
++CONFIG_DM_GPIO=y
 +CONFIG_DM_MMC=y
++CONFIG_DM_MMC_OPS=y
 +CONFIG_ZYNQ_SDHCI=y
++CONFIG_DM_SPI_FLASH=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_DEBUG_UART=y
 +CONFIG_DEBUG_UART_ZYNQ=y
 +CONFIG_DEBUG_UART_BASE=0xff010000
 +CONFIG_DEBUG_UART_CLOCK=100000000
 +CONFIG_DEBUG_UART_ANNOUNCE=y
 +CONFIG_ZYNQ_SPI=y
 +CONFIG_USB=y
 +CONFIG_USB_XHCI_HCD=y
 +CONFIG_USB_XHCI_DWC3=y
 +CONFIG_USB_DWC3=y
 +CONFIG_USB_DWC3_GADGET=y
 +CONFIG_USB_ULPI_VIEWPORT=y
 +CONFIG_USB_ULPI=y
 +CONFIG_USB_STORAGE=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_EFI_LOADER_BOUNCE_BUFFER=y
index aa1415dcec02062f0574233e50dc0ff242ef5cd6,0000000000000000000000000000000000000000..66a16eed41e37d89c4388d5e98cae46c4020fa54
mode 100644,000000..100644
--- /dev/null
@@@ -1,72 -1,0 +1,74 @@@
- CONFIG_SPL_SYS_MALLOC_SIMPLE=y
- CONFIG_SPL_DM=y
- CONFIG_DM_SPI_FLASH=y
- CONFIG_DM_GPIO=y
 +CONFIG_ARM=y
 +CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu100"
 +CONFIG_ARCH_ZYNQMP=y
 +CONFIG_SYS_MALLOC_F_LEN=0x8000
 +CONFIG_BOOT_INIT_FILE="board/xilinx/zynqmp/zynqmp-zcu100-revA/regs.txt"
 +CONFIG_ZYNQMP_QSPI=y
 +CONFIG_ZYNQMP_USB=y
 +CONFIG_SYS_TEXT_BASE=0x8000000
 +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu100-revA"
 +CONFIG_SPL=y
++CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 +CONFIG_FIT=y
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_SPL_LOAD_FIT=y
 +CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU100 RevA"
 +CONFIG_HUSH_PARSER=y
 +CONFIG_SYS_PROMPT="ZynqMP> "
 +# CONFIG_CMD_IMLS is not set
 +CONFIG_CMD_MEMTEST=y
 +# CONFIG_CMD_FLASH is not set
 +CONFIG_CMD_MMC=y
 +CONFIG_CMD_SF=y
 +CONFIG_CMD_SPI=y
 +CONFIG_CMD_I2C=y
 +CONFIG_CMD_USB=y
 +CONFIG_CMD_DFU=y
 +CONFIG_CMD_GPIO=y
 +CONFIG_CMD_TFTPPUT=y
 +CONFIG_CMD_DHCP=y
 +CONFIG_CMD_MII=y
 +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_SPL_OF_CONTROL=y
 +CONFIG_OF_EMBED=y
 +CONFIG_NET_RANDOM_ETHADDR=y
++CONFIG_SPL_DM=y
 +CONFIG_SPL_DM_SEQ_ALIAS=y
++CONFIG_BLK=y
++CONFIG_DM_GPIO=y
 +CONFIG_DM_MMC=y
++CONFIG_DM_MMC_OPS=y
 +CONFIG_ZYNQ_SDHCI=y
++CONFIG_DM_SPI_FLASH=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_DEBUG_UART=y
 +CONFIG_DEBUG_UART_ZYNQ=y
 +CONFIG_DEBUG_UART_BASE=0xff010000
 +CONFIG_DEBUG_UART_CLOCK=100000000
 +CONFIG_DEBUG_UART_ANNOUNCE=y
 +CONFIG_ZYNQ_SPI=y
 +CONFIG_USB=y
 +CONFIG_USB_XHCI_HCD=y
 +CONFIG_USB_XHCI_DWC3=y
 +CONFIG_USB_DWC3=y
 +CONFIG_USB_DWC3_GADGET=y
 +CONFIG_USB_ULPI_VIEWPORT=y
 +CONFIG_USB_ULPI=y
 +CONFIG_USB_STORAGE=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_EFI_LOADER_BOUNCE_BUFFER=y
index 4616406bdcadc96d3af5d7e43dc000b3226a6fd4,07e29fbe4c6e9ad64968cad1ca31a86971d4a9a7..c7357c2c9271d23f2cb709562f98f505d28fcfc9
@@@ -2,12 -2,6 +2,8 @@@ CONFIG_ARM=
  CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu102"
  CONFIG_ARCH_ZYNQMP=y
  CONFIG_SYS_MALLOC_F_LEN=0x8000
- CONFIG_SPL_SYS_MALLOC_SIMPLE=y
- CONFIG_SPL_DM=y
- CONFIG_DM_SPI_FLASH=y
- CONFIG_DM_GPIO=y
 +CONFIG_PMUFW_INIT_FILE="board/xilinx/zynqmp/pmufw.bin"
 +CONFIG_ZYNQMP_QSPI=y
  CONFIG_ZYNQMP_USB=y
  CONFIG_SYS_TEXT_BASE=0x8000000
  CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102"
@@@ -41,9 -34,13 +38,14 @@@ CONFIG_CMD_FS_GENERIC=
  CONFIG_SPL_OF_CONTROL=y
  CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
+ CONFIG_SPL_DM=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
+ CONFIG_BLK=y
+ CONFIG_DM_GPIO=y
  CONFIG_DM_MMC=y
+ CONFIG_DM_MMC_OPS=y
  CONFIG_ZYNQ_SDHCI=y
++CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH=y
  CONFIG_SPI_FLASH_BAR=y
  CONFIG_SPI_FLASH_SPANSION=y
index 07b2ed3fd27574ddefd51f8bcf6dc2318671cad5,72679db144be4d2d52e576d4f66d95df62894c9f..ebc0caf9c28755bc8c9db1a9aa35a5ef0c97e3b5
@@@ -2,11 -2,6 +2,7 @@@ CONFIG_ARM=
  CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu102"
  CONFIG_ARCH_ZYNQMP=y
  CONFIG_SYS_MALLOC_F_LEN=0x8000
- CONFIG_SPL_SYS_MALLOC_SIMPLE=y
- CONFIG_SPL_DM=y
- CONFIG_DM_SPI_FLASH=y
- CONFIG_DM_GPIO=y
 +CONFIG_ZYNQMP_QSPI=y
  CONFIG_ZYNQMP_USB=y
  CONFIG_SYS_TEXT_BASE=0x8000000
  CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu102-revB"
@@@ -40,9 -34,13 +37,14 @@@ CONFIG_CMD_FS_GENERIC=
  CONFIG_SPL_OF_CONTROL=y
  CONFIG_OF_EMBED=y
  CONFIG_NET_RANDOM_ETHADDR=y
+ CONFIG_SPL_DM=y
  CONFIG_SPL_DM_SEQ_ALIAS=y
+ CONFIG_BLK=y
+ CONFIG_DM_GPIO=y
  CONFIG_DM_MMC=y
+ CONFIG_DM_MMC_OPS=y
  CONFIG_ZYNQ_SDHCI=y
++CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH=y
  CONFIG_SPI_FLASH_BAR=y
  CONFIG_SPI_FLASH_SPANSION=y
index 7f809782cc38fb07a44eb4b565674060eac51050,0000000000000000000000000000000000000000..aa204d79770625c3e8b55bde0a48d6371fe6b5d9
mode 100644,000000..100644
--- /dev/null
@@@ -1,71 -1,0 +1,73 @@@
- CONFIG_SPL_SYS_MALLOC_SIMPLE=y
- CONFIG_SPL_DM=y
- CONFIG_DM_SPI_FLASH=y
- CONFIG_DM_GPIO=y
 +CONFIG_ARM=y
 +CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_zcu106"
 +CONFIG_ARCH_ZYNQMP=y
 +CONFIG_SYS_MALLOC_F_LEN=0x8000
 +CONFIG_ZYNQMP_QSPI=y
 +CONFIG_ZYNQMP_USB=y
 +CONFIG_SYS_TEXT_BASE=0x8000000
 +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu106"
 +CONFIG_SPL=y
++CONFIG_SPL_SYS_MALLOC_SIMPLE=y
 +CONFIG_FIT=y
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_SPL_LOAD_FIT=y
 +CONFIG_IDENT_STRING=" Xilinx ZynqMP ZCU106"
 +CONFIG_HUSH_PARSER=y
 +CONFIG_SYS_PROMPT="ZynqMP> "
 +# CONFIG_CMD_IMLS is not set
 +CONFIG_CMD_MEMTEST=y
 +# 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_TFTPPUT=y
 +CONFIG_CMD_DHCP=y
 +CONFIG_CMD_MII=y
 +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_SPL_OF_CONTROL=y
 +CONFIG_OF_EMBED=y
 +CONFIG_NET_RANDOM_ETHADDR=y
++CONFIG_SPL_DM=y
 +CONFIG_SPL_DM_SEQ_ALIAS=y
++CONFIG_BLK=y
++CONFIG_DM_GPIO=y
 +CONFIG_DM_MMC=y
++CONFIG_DM_MMC_OPS=y
 +CONFIG_ZYNQ_SDHCI=y
++CONFIG_DM_SPI_FLASH=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_DEBUG_UART=y
 +CONFIG_DEBUG_UART_ZYNQ=y
 +CONFIG_DEBUG_UART_BASE=0xff000000
 +CONFIG_DEBUG_UART_CLOCK=100000000
 +CONFIG_DEBUG_UART_ANNOUNCE=y
 +CONFIG_USB=y
 +CONFIG_USB_XHCI_HCD=y
 +CONFIG_USB_XHCI_DWC3=y
 +CONFIG_USB_DWC3=y
 +CONFIG_USB_DWC3_GADGET=y
 +CONFIG_USB_ULPI_VIEWPORT=y
 +CONFIG_USB_ULPI=y
 +CONFIG_USB_STORAGE=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_EFI_LOADER_BOUNCE_BUFFER=y
index 7d23a5bb859cb28a86a52bbcbd93461f74d40e2b,0000000000000000000000000000000000000000..e4e00fd3ac88279ce0c2f257a9cdd41426c72ab1
mode 100644,000000..100644
--- /dev/null
@@@ -1,60 -1,0 +1,61 @@@
 +CONFIG_ARM=y
 +CONFIG_SYS_CONFIG_NAME="zynq_zc70x"
 +CONFIG_ARCH_ZYNQ=y
++CONFIG_SYS_MALLOC_F_LEN=0x800
 +CONFIG_DEFAULT_DEVICE_TREE="zynq-zc702"
 +CONFIG_SPL=y
 +CONFIG_FIT=y
 +CONFIG_FIT_VERBOSE=y
 +CONFIG_FIT_SIGNATURE=y
 +CONFIG_SYS_NO_FLASH=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_EHCI_HCD=y
 +CONFIG_USB_ULPI_VIEWPORT=y
 +CONFIG_USB_ULPI=y
 +CONFIG_USB_STORAGE=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 97b7c8b872a3889024cc2b8739d8743fdfdf38ff,8f3b96a97362268a346e6da11a74adeb82c3c479..98fb16a233749d8d54bbb6ec66b9899a9091227e
@@@ -20,14 -20,9 +20,16 @@@ config SPL_CL
          setting up clocks within SPL, and allows the same drivers to be
          used as U-Boot proper.
  
 +config CLK_ZYNQMP
 +      bool "Enable clock driver support for ZynqMP"
 +      depends on ARCH_ZYNQMP
 +      help
 +        This clock driver adds support for clock realted settings for
 +        ZynqMP platform.
 +
+ source "drivers/clk/tegra/Kconfig"
  source "drivers/clk/uniphier/Kconfig"
  source "drivers/clk/exynos/Kconfig"
+ source "drivers/clk/at91/Kconfig"
  
  endmenu
index 182e9de56c120d73320286dbb62d87cd5265418c,778d7486f066c9934e47e62817499914b9ccb120..86f773cc653211e0ac1d728cf3b0825154025df7
@@@ -11,6 -10,8 +10,9 @@@ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip
  obj-$(CONFIG_SANDBOX) += clk_sandbox.o
  obj-$(CONFIG_SANDBOX) += clk_sandbox_test.o
  obj-$(CONFIG_MACH_PIC32) += clk_pic32.o
 +obj-$(CONFIG_CLK_ZYNQMP) += clk_zynqmp.o
+ obj-y += tegra/
  obj-$(CONFIG_CLK_UNIPHIER) += uniphier/
  obj-$(CONFIG_CLK_EXYNOS) += exynos/
+ obj-$(CONFIG_CLK_AT91) += at91/
Simple merge
Simple merge
index ebf19b41843d8b078a21072eaf47ec57d5e94145,1df9273cdd1114f64f161a9d987ce2ae89f590d2..d8bdc9cbaa1d97c302ed8ccc570fc06497eb3f14
@@@ -66,7 -66,7 +66,8 @@@ obj-$(CONFIG_TEGRA_NAND) += tegra_nand.
  obj-$(CONFIG_NAND_OMAP_GPMC) += omap_gpmc.o
  obj-$(CONFIG_NAND_OMAP_ELM) += omap_elm.o
  obj-$(CONFIG_NAND_PLAT) += nand_plat.o
 +obj-$(CONFIG_NAND_ZYNQ) += zynq_nand.o
+ obj-$(CONFIG_NAND_SUNXI) += sunxi_nand.o
  
  else  # minimal SPL drivers
  
Simple merge
Simple merge
Simple merge
index a315e9a3cbc2db38b7d070c66aafb36f4ee8af50,02f0e4c9a9a8563e068594fa40fdc56107acc3a8..cffa69593daef253e861e714b5ffdd9352df6794
  #define CONFIG_SCSI
  #endif
  
 +#define CONFIG_ARM_SMC
 +
 +#define CONFIG_FPGA_ZYNQMPPL
 +#define CONFIG_FPGA_XILINX
 +#define CONFIG_FPGA
 +
  #define CONFIG_SYS_BOOTM_LEN  (60 * 1024 * 1024)
  
- #define CONFIG_CMD_BOOTI
  #define CONFIG_CMD_UNZIP
  
  #define CONFIG_BOARD_EARLY_INIT_R
index 6f220a2d71a6e9e6b1de392dcc91479ff369b1e2,44434aab7bf02d5fbfde7b92d13f8f7d78a2f5fc..3eb977fec31d4f761c2356d21d9e7c41383f90ae
  #define __CONFIG_ZYNQMP_EP_H
  
  #define CONFIG_ZYNQ_SDHCI_MAX_FREQ    52000000
 -#define CONFIG_ZYNQ_SDHCI_MIN_FREQ    (CONFIG_ZYNQ_SDHCI_MAX_FREQ << 9)
 +#define CONFIG_ZYNQ_SDHCI_MIN_FREQ    (CONFIG_ZYNQ_SDHCI_MAX_FREQ >> 9)
  #define CONFIG_ZYNQ_EEPROM
  #define CONFIG_AHCI
+ #define CONFIG_SATA_CEVA
  #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR, \
                                 ZYNQMP_USB1_XHCI_BASEADDR}
  
Simple merge
Simple merge
diff --cc include/spl.h
Simple merge
diff --cc lib/fdtdec.c
Simple merge
Simple merge