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

diff --combined arch/arm/Kconfig
index b39bb4f,844b862..5f21b59
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -33,9 -33,6 +33,9 @@@ config CPU_V
          bool
          select HAS_VBAR
  
 +config CPU_V7M
 +      bool
 +
  config CPU_PXA
          bool
  
@@@ -50,7 -47,6 +50,7 @@@ config SYS_CP
          default "arm1136" if CPU_ARM1136
          default "arm1176" if CPU_ARM1176
          default "armv7" if CPU_V7
 +        default "armv7m" if CPU_V7M
          default "pxa" if CPU_PXA
          default "sa1100" if CPU_SA1100
        default "armv8" if ARM64
@@@ -65,6 -61,18 +65,6 @@@ config SEMIHOSTIN
  choice
        prompt "Target select"
  
 -config TARGET_INTEGRATORAP_CM720T
 -      bool "Support integratorap_cm720t"
 -      select CPU_ARM720T
 -
 -config TARGET_INTEGRATORAP_CM920T
 -      bool "Support integratorap_cm920t"
 -      select CPU_ARM920T
 -
 -config TARGET_INTEGRATORCP_CM920T
 -      bool "Support integratorcp_cm920t"
 -      select CPU_ARM920T
 -
  config ARCH_AT91
        bool "Atmel AT91"
  
@@@ -84,6 -92,14 +84,6 @@@ config TARGET_SMDK241
        bool "Support smdk2410"
        select CPU_ARM920T
  
 -config TARGET_INTEGRATORAP_CM926EJS
 -      bool "Support integratorap_cm926ejs"
 -      select CPU_ARM926EJS
 -
 -config TARGET_INTEGRATORCP_CM926EJS
 -      bool "Support integratorcp_cm926ejs"
 -      select CPU_ARM926EJS
 -
  config TARGET_ASPENITE
        bool "Support aspenite"
        select CPU_ARM926EJS
@@@ -231,6 -247,10 +231,6 @@@ config ARCH_VERSATIL
        bool "ARM Ltd. Versatile family"
        select CPU_ARM926EJS
  
 -config TARGET_INTEGRATORCP_CM1136
 -      bool "Support integratorcp_cm1136"
 -      select CPU_ARM1136
 -
  config TARGET_IMX31_PHYCORE
        bool "Support imx31_phycore"
        select CPU_ARM1136
@@@ -279,6 -299,14 +279,6 @@@ config ARCH_BCM283
        select DM_SERIAL
        select DM_GPIO
  
 -config TARGET_INTEGRATORAP_CM946ES
 -      bool "Support integratorap_cm946es"
 -      select CPU_ARM946ES
 -
 -config TARGET_INTEGRATORCP_CM946ES
 -      bool "Support integratorcp_cm946es"
 -      select CPU_ARM946ES
 -
  config TARGET_VEXPRESS_CA15_TC2
        bool "Support vexpress_ca15_tc2"
        select CPU_V7
@@@ -433,9 -461,6 +433,9 @@@ config ARCH_HIGHBAN
        bool "Calxeda Highbank"
        select CPU_V7
  
 +config ARCH_INTEGRATOR
 +      bool "ARM Ltd. Integrator family"
 +
  config ARCH_KEYSTONE
        bool "TI Keystone"
        select CPU_V7
@@@ -640,10 -665,6 +640,10 @@@ config TARGET_VF610TW
        bool "Support vf610twr"
        select CPU_V7
  
 +config TARGET_COLIBRI_VF
 +      bool "Support Colibri VF50/61"
 +      select CPU_V7
 +
  config ZYNQ
        bool "Xilinx Zynq Platform"
        select CPU_V7
@@@ -690,6 -711,28 +690,28 @@@ config TARGET_LS2085A_SIM
        select ARM64
        select ARMV8_MULTIENTRY
  
+ config TARGET_LS2085AQDS
+       bool "Support ls2085aqds"
+       select ARM64
+       select ARMV8_MULTIENTRY
+       select SUPPORT_SPL
+       help
+         Support for Freescale LS2085AQDS platform
+         The LS2085A Development System (QDS) is a high-performance
+         development platform that supports the QorIQ LS2085A
+         Layerscape Architecture processor.
+ 
+ config TARGET_LS2085ARDB
+       bool "Support ls2085ardb"
+       select ARM64
+       select ARMV8_MULTIENTRY
+       select SUPPORT_SPL
+       help
+         Support for Freescale LS2085ARDB platform.
+         The LS2085A Reference design board (RDB) is a high-performance
+         development platform that supports the QorIQ LS2085A
+         Layerscape Architecture processor.
+ 
  config TARGET_LS1021AQDS
        bool "Support ls1021aqds"
        select CPU_V7
@@@ -764,10 -807,6 +786,10 @@@ config ARCH_UNIPHIE
        select DM_SERIAL
        select DM_I2C
  
 +config TARGET_STM32F429_DISCOVERY
 +      bool "Support STM32F429 Discovery"
 +      select CPU_V7M
 +
  endchoice
  
  source "arch/arm/mach-at91/Kconfig"
@@@ -780,8 -819,6 +802,8 @@@ source "arch/arm/cpu/armv7/exynos/Kconf
  
  source "arch/arm/mach-highbank/Kconfig"
  
 +source "arch/arm/mach-integrator/Kconfig"
 +
  source "arch/arm/mach-keystone/Kconfig"
  
  source "arch/arm/mach-kirkwood/Kconfig"
@@@ -827,6 -864,7 +849,6 @@@ source "board/Marvell/db-mv784mp-gp/Kco
  source "board/Marvell/gplugd/Kconfig"
  source "board/altera/socfpga/Kconfig"
  source "board/armadeus/apf27/Kconfig"
 -source "board/armltd/integrator/Kconfig"
  source "board/armltd/vexpress/Kconfig"
  source "board/armltd/vexpress64/Kconfig"
  source "board/bachmann/ot1200/Kconfig"
@@@ -849,6 -887,8 +871,8 @@@ source "board/denx/m53evk/Kconfig
  source "board/embest/mx6boards/Kconfig"
  source "board/esg/ima3-mx53/Kconfig"
  source "board/freescale/ls2085a/Kconfig"
+ source "board/freescale/ls2085aqds/Kconfig"
+ source "board/freescale/ls2085ardb/Kconfig"
  source "board/freescale/ls1021aqds/Kconfig"
  source "board/freescale/ls1021atwr/Kconfig"
  source "board/freescale/mx23evk/Kconfig"
@@@ -906,7 -946,6 +930,7 @@@ source "board/spear/spear600/Kconfig
  source "board/spear/x600/Kconfig"
  source "board/st-ericsson/snowball/Kconfig"
  source "board/st-ericsson/u8500/Kconfig"
 +source "board/st/stm32f429-discovery/Kconfig"
  source "board/st/stv0991/Kconfig"
  source "board/sunxi/Kconfig"
  source "board/syteco/zmx25/Kconfig"
@@@ -918,7 -957,6 +942,7 @@@ source "board/ti/ti814x/Kconfig
  source "board/ti/ti816x/Kconfig"
  source "board/timll/devkit3250/Kconfig"
  source "board/toradex/colibri_pxa270/Kconfig"
 +source "board/toradex/colibri_vf/Kconfig"
  source "board/tqc/tqma6/Kconfig"
  source "board/trizepsiv/Kconfig"
  source "board/ttcontrol/vision2/Kconfig"

diff --combined common/spl/spl.c
index 6a02c9e,10b5564..690c9b0
--- 1/common/spl/spl.c
--- 2/common/spl/spl.c
+++ b/common/spl/spl.c
@@@ -125,7 -125,7 +125,7 @@@ __weak void __noreturn jump_to_image_no
        typedef void __noreturn (*image_entry_noargs_t)(void);
  
        image_entry_noargs_t image_entry =
-                       (image_entry_noargs_t) spl_image->entry_point;
+               (image_entry_noargs_t)(unsigned long)spl_image->entry_point;
  
        debug("image entry point: 0x%X\n", spl_image->entry_point);
        image_entry();
@@@ -151,8 -151,6 +151,8 @@@ static void spl_ram_load_image(void
  void board_init_r(gd_t *dummy1, ulong dummy2)
  {
        u32 boot_device;
 +      int ret;
 +
        debug(">>spl:board_init_r()\n");
  
  #if defined(CONFIG_SYS_SPL_MALLOC_START)
@@@ -160,24 -158,12 +160,24 @@@
                        CONFIG_SYS_SPL_MALLOC_SIZE);
        gd->flags |= GD_FLG_FULL_MALLOC_INIT;
  #elif defined(CONFIG_SYS_MALLOC_F_LEN)
 -      gd->malloc_limit = gd->malloc_base + CONFIG_SYS_MALLOC_F_LEN;
 +      gd->malloc_limit = CONFIG_SYS_MALLOC_F_LEN;
        gd->malloc_ptr = 0;
  #endif
 -#ifdef CONFIG_SPL_DM
 -      dm_init_and_scan(true);
 -#endif
 +      if (IS_ENABLED(CONFIG_OF_CONTROL) &&
 +                      !IS_ENABLED(CONFIG_SPL_DISABLE_OF_CONTROL)) {
 +              ret = fdtdec_setup();
 +              if (ret) {
 +                      debug("fdtdec_setup() returned error %d\n", ret);
 +                      hang();
 +              }
 +      }
 +      if (IS_ENABLED(CONFIG_SPL_DM)) {
 +              ret = dm_init_and_scan(true);
 +              if (ret) {
 +                      debug("dm_init_and_scan() returned error %d\n", ret);
 +                      hang();
 +              }
 +      }
  
  #ifndef CONFIG_PPC
        /*