Merge tag 'u-boot-imx-20181025' of git://git.denx.de/u-boot-imx

Merged imx8 architecture, fix build for imx8 + warnings

diff --cc arch/arm/Kconfig
index 2415ae8222a650682396b2b9787d33024a5ec692,4f597b7ce6a03c8193ba5ef94f438e3aab1faf45..326d5c0daadf1615aeb200b44e6e0e03b4f5d9b6
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -658,16 -668,12 +658,22 @@@ config ARCH_MESO
          targeted at media players and tablet computers. We currently
          support the S905 (GXBaby) 64-bit SoC.
  
 +config ARCH_LPC32XX
 +      bool "NXP LPC32xx platform"
 +      select CPU_ARM926EJS
 +      select DM
 +      select DM_GPIO
 +      select DM_SERIAL
 +      select SPL_DM if SPL
 +      select SUPPORT_SPL
 +      imply CMD_DM
 +
+ config ARCH_IMX8
+       bool "NXP i.MX8 platform"
+       select ARM64
+       select DM
+       select OF_CONTROL
+ 
  config ARCH_MX8M
        bool "NXP i.MX8M platform"
        select ARM64

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/dts/Makefile
index 0de6234eec3fff37d05e6841885a6ceebbf2261a,61598bdfeb3ebe1b0586b84b924f63ab5e88f672..d36447d18d369d059ed5354347afccf3c965154b
--- 1/arch/arm/dts/Makefile
--- 2/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@@ -454,15 -452,17 +454,17 @@@ dtb-$(CONFIG_MX7) += imx7-colibri.dtb 
  
  dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-evk.dtb
  
+ dtb-$(CONFIG_ARCH_IMX8) += fsl-imx8qxp-mek.dtb
+ 
  dtb-$(CONFIG_RCAR_GEN3) += \
 -      r8a7795-h3ulcb.dtb \
 -      r8a7795-salvator-x.dtb \
 -      r8a7796-m3ulcb.dtb \
 -      r8a7796-salvator-x.dtb \
 -      r8a77965-salvator-x.dtb \
 -      r8a77970-eagle.dtb \
 -      r8a77990-ebisu.dtb \
 -      r8a77995-draak.dtb
 +      r8a7795-h3ulcb-u-boot.dtb \
 +      r8a7795-salvator-x-u-boot.dtb \
 +      r8a7796-m3ulcb-u-boot.dtb \
 +      r8a7796-salvator-x-u-boot.dtb \
 +      r8a77965-salvator-x-u-boot.dtb \
 +      r8a77970-eagle-u-boot.dtb \
 +      r8a77990-ebisu-u-boot.dtb \
 +      r8a77995-draak-u-boot.dtb
  
  dtb-$(CONFIG_SOC_KEYSTONE) += keystone-k2hk-evm.dtb \
        keystone-k2l-evm.dtb \

diff --cc arch/arm/mach-imx/syscounter.c
Simple merge

diff --cc scripts/config_whitelist.txt
Simple merge