Merge git://git.denx.de/u-boot-fsl-qoriq

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
	include/configs/ls1021aqds.h
	include/configs/ls1021atwr.h

diff --cc arch/arm/Kconfig
Simple merge

diff --cc include/configs/ls1012a_common.h
index ba27437116aace203c851a8b542b17afaa06dfa2,5beca458c75de0ed3453bfad366f5e4e080dbcfd..80603c9e467c568252e63d159fd38efe372f7a79
--- 1/include/configs/ls1012a_common.h
--- 2/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@@ -101,15 -98,13 +98,11 @@@
  #define CONFIG_HWCONFIG
  #define HWCONFIG_BUFFER_SIZE          128
  
 -#define CONFIG_DISPLAY_CPUINFO
 -
  /* Initial environment variables */
  #define CONFIG_EXTRA_ENV_SETTINGS             \
-       "initrd_high=0xffffffff\0"              \
        "verify=no\0"                           \
-       "hwconfig=fsl_ddr:bank_intlv=auto\0"    \
        "loadaddr=0x80100000\0"                 \
        "kernel_addr=0x100000\0"                \
-       "ramdisk_addr=0x800000\0"               \
-       "ramdisk_size=0x2000000\0"              \
        "fdt_high=0xffffffffffffffff\0"         \
        "initrd_high=0xffffffffffffffff\0"      \
        "kernel_start=0xa00000\0"               \

diff --cc include/configs/ls1021aqds.h
Simple merge

diff --cc include/configs/ls1021atwr.h
Simple merge

diff --cc include/configs/ls1043aqds.h
Simple merge

diff --cc include/configs/ls1046aqds.h
Simple merge

diff --cc include/configs/ls2080a_common.h
Simple merge

diff --cc scripts/config_whitelist.txt
Simple merge