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

diff --combined arch/arm/Kconfig
index 77eab66fb4235e5557d4ae354be82cc0d3c9fcd8,71169b2520f8280daff405e8d8b9b756b1508ef9..72b0aa78a56a7b779e38dd5328c62b0c9841dd91
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -64,20 -64,6 +64,20 @@@ config SYS_CP
          default "sa1100" if CPU_SA1100
        default "armv8" if ARM64
  
 +config SYS_ARM_ARCH
 +      int
 +      default 4 if CPU_ARM720T
 +      default 4 if CPU_ARM920T
 +      default 5 if CPU_ARM926EJS
 +      default 5 if CPU_ARM946ES
 +      default 6 if CPU_ARM1136
 +      default 6 if CPU_ARM1176
 +      default 7 if CPU_V7
 +      default 7 if CPU_V7M
 +      default 5 if CPU_PXA
 +      default 4 if CPU_SA1100
 +      default 8 if ARM64
 +
  config SEMIHOSTING
        bool "support boot from semihosting"
        help
@@@ -710,6 -696,33 +710,33 @@@ config TARGET_HIKE
          Support for HiKey 96boards platform. It features a HI6220
          SoC, with 8xA53 CPU, mali450 gpu, and 1GB RAM.
  
+ config TARGET_LS1012AQDS
+       bool "Support ls1012aqds"
+       select ARM64
+       help
+         Support for Freescale LS1012AQDS platform.
+         The LS1012A Development System (QDS) is a high-performance
+         development platform that supports the QorIQ LS1012A
+         Layerscape Architecture processor.
+ 
+ config TARGET_LS1012ARDB
+       bool "Support ls1012ardb"
+       select ARM64
+       help
+         Support for Freescale LS1012ARDB platform.
+         The LS1012A Reference design board (RDB) is a high-performance
+         development platform that supports the QorIQ LS1012A
+         Layerscape Architecture processor.
+ 
+ config TARGET_LS1012AFRDM
+       bool "Support ls1012afrdm"
+       select ARM64
+       help
+         Support for Freescale LS1012AFRDM platform.
+         The LS1012A Freedom  board (FRDM) is a high-performance
+         development platform that supports the QorIQ LS1012A
+         Layerscape Architecture processor.
+ 
  config TARGET_LS1021AQDS
        bool "Support ls1021aqds"
        select CPU_V7
@@@ -780,7 -793,6 +807,7 @@@ config ARCH_ROCKCHI
  
  config TARGET_THUNDERX_88XX
        bool "Support ThunderX 88xx"
 +      select ARM64
        select OF_CONTROL
  
  endchoice
@@@ -867,6 -879,9 +894,9 @@@ source "board/freescale/ls1021aqds/Kcon
  source "board/freescale/ls1043aqds/Kconfig"
  source "board/freescale/ls1021atwr/Kconfig"
  source "board/freescale/ls1043ardb/Kconfig"
+ source "board/freescale/ls1012aqds/Kconfig"
+ source "board/freescale/ls1012ardb/Kconfig"
+ source "board/freescale/ls1012afrdm/Kconfig"
  source "board/freescale/mx23evk/Kconfig"
  source "board/freescale/mx25pdk/Kconfig"
  source "board/freescale/mx28evk/Kconfig"

diff --combined arch/arm/dts/Makefile
index e159475580bc963da27b0c25236f50771761201e,e8ad6c60c2f70486358d7075d6c6cd0c1f84f14d..95676806fa4802fecd4eb394fea526a86114098e
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -47,7 -47,6 +47,7 @@@ dtb-$(CONFIG_TEGRA) += tegra20-harmony.
        tegra124-jetson-tk1.dtb \
        tegra124-nyan-big.dtb \
        tegra124-venice2.dtb \
 +      tegra186-p2771-0000.dtb \
        tegra210-e2220-1170.dtb \
        tegra210-p2371-0000.dtb \
        tegra210-p2371-2180.dtb \
@@@ -108,8 -107,7 +108,8 @@@ dtb-$(CONFIG_ARCH_SOCFPGA) +=                              
        socfpga_cyclone5_de0_nano_soc.dtb                       \
        socfpga_cyclone5_sockit.dtb                     \
        socfpga_cyclone5_socrates.dtb                   \
 -      socfpga_cyclone5_sr1500.dtb
 +      socfpga_cyclone5_sr1500.dtb                     \
 +      socfpga_cyclone5_vining_fpga.dtb
  
  dtb-$(CONFIG_TARGET_DRA7XX_EVM) += dra72-evm.dtb dra7-evm.dtb
  dtb-$(CONFIG_TARGET_BEAGLE_X15) += am57xx-beagle-x15.dtb
@@@ -122,7 -120,10 +122,10 @@@ dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-
        fsl-ls2080a-rdb.dtb
  dtb-$(CONFIG_FSL_LSCH2) += fsl-ls1043a-qds-duart.dtb \
        fsl-ls1043a-qds-lpuart.dtb \
-       fsl-ls1043a-rdb.dtb
+       fsl-ls1043a-rdb.dtb \
+       fsl-ls1012a-qds.dtb \
+       fsl-ls1012a-rdb.dtb \
+       fsl-ls1012a-frdm.dtb
  
  dtb-$(CONFIG_ARCH_SNAPDRAGON) += dragonboard410c.dtb