Merge tag 'xilinx-for-v2019.01' of git://git.denx.de/u-boot-microblaze
authorTom Rini <trini@konsulko.com>
Tue, 4 Dec 2018 00:30:54 +0000 (19:30 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 4 Dec 2018 00:30:54 +0000 (19:30 -0500)
Xilinx changes for v2019.01

microblaze:
- Use default functions for memory decoding
- Showing model from DT

zynq:
- Fix spi flash DTs
- Fix zynq_help_text with CONFIG_SYS_LONGHELP
- Tune cse/mini configurations
- Enabling cse/mini testing with current targets

zynqmp:
- Enable gzip SPL support
- Fix chip detection logic
- Tune mini configurations
- DT fixes(spi-flash, models, clocks, etc)
- Add support for OF_SEPARATE configurations
- Enabling mini testing with current targets
- Add mini mtest configuration
- Some minor config setting

nand:
- arasan: Add subpage configuration

net:
- gem: Add 64bit DMA support

1  2 
arch/arm/Kconfig
arch/arm/dts/Makefile

diff --combined arch/arm/Kconfig
@@@ -664,20 -664,6 +664,20 @@@ config ARCH_MESO
          targeted at media players and tablet computers. We currently
          support the S905 (GXBaby) 64-bit SoC.
  
 +config ARCH_MEDIATEK
 +      bool "MediaTek SoCs"
 +      select BINMAN
 +      select DM
 +      select OF_CONTROL
 +      select SPL_DM if SPL
 +      select SPL_LIBCOMMON_SUPPORT if SPL
 +      select SPL_LIBGENERIC_SUPPORT if SPL
 +      select SPL_OF_CONTROL if SPL
 +      select SUPPORT_SPL
 +      help
 +        Support for the MediaTek SoCs family developed by MediaTek Inc.
 +        Please refer to doc/README.mediatek for more information.
 +
  config ARCH_LPC32XX
        bool "NXP LPC32xx platform"
        select CPU_ARM926EJS
@@@ -942,6 -928,7 +942,7 @@@ config ARCH_ZYNQM
        select OF_CONTROL
        select SPL_BOARD_INIT if SPL
        select SPL_CLK if SPL
+       select SPL_SEPARATE_BSS if SPL
        select SUPPORT_SPL
        imply BOARD_LATE_INIT
        imply CMD_DM
@@@ -1463,8 -1450,6 +1464,8 @@@ source "arch/arm/mach-rmobile/Kconfig
  
  source "arch/arm/mach-meson/Kconfig"
  
 +source "arch/arm/mach-mediatek/Kconfig"
 +
  source "arch/arm/mach-qemu/Kconfig"
  
  source "arch/arm/mach-rockchip/Kconfig"
diff --combined arch/arm/dts/Makefile
@@@ -59,8 -59,7 +59,8 @@@ dtb-$(CONFIG_ARCH_MESON) += 
        meson-gxl-s905x-p212.dtb \
        meson-gxl-s905x-libretech-cc.dtb \
        meson-gxl-s905x-khadas-vim.dtb \
 -      meson-gxm-khadas-vim2.dtb
 +      meson-gxm-khadas-vim2.dtb \
 +      meson-axg-s400.dtb
  dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
        tegra20-medcom-wide.dtb \
        tegra20-paz00.dtb \
@@@ -157,6 -156,7 +157,7 @@@ dtb-$(CONFIG_ARCH_ZYNQ) += 
        zynq-zybo-z7.dtb
  dtb-$(CONFIG_ARCH_ZYNQMP) += \
        avnet-ultra96-rev1.dtb                  \
+       zynqmp-mini.dtb                         \
        zynqmp-mini-emmc0.dtb                   \
        zynqmp-mini-emmc1.dtb                   \
        zynqmp-mini-nand.dtb                    \
@@@ -188,8 -188,7 +189,8 @@@ dtb-$(CONFIG_AM33XX) += am335x-boneblac
        am335x-icev2.dtb \
        am335x-pxm50.dtb \
        am335x-rut.dtb \
 -      am335x-pdu001.dtb
 +      am335x-pdu001.dtb \
 +      am335x-chiliboard.dtb
  dtb-$(CONFIG_AM43XX) += am437x-gp-evm.dtb am437x-sk-evm.dtb   \
        am43x-epos-evm.dtb \
        am437x-idk-evm.dtb \
@@@ -564,10 -563,6 +565,10 @@@ dtb-$(CONFIG_TARGET_STM32MP1) += 
  
  dtb-$(CONFIG_SOC_K3_AM6) += k3-am654-base-board.dtb k3-am654-r5-base-board.dtb
  
 +dtb-$(CONFIG_ARCH_MEDIATEK) += \
 +      mt7623n-bananapi-bpi-r2.dtb \
 +      mt7629-rfb.dtb
 +
  targets += $(dtb-y)
  
  # Add any required device tree compiler flags here