From: Tom Rini Date: Wed, 12 Oct 2016 12:29:42 +0000 (-0400) Subject: Merge git://git.denx.de/u-boot-fsl-qoriq X-Git-Url: http://git.dujemihanovic.xyz/%22/img/sics.gif/%22/static/git-favicon.png?a=commitdiff_plain;h=711b534120c0a5f73cdb9a25eb91f9aa0c5e09ab;p=u-boot.git Merge git://git.denx.de/u-boot-fsl-qoriq Signed-off-by: Tom Rini Conflicts: include/configs/ls1021aqds.h include/configs/ls1021atwr.h --- 711b534120c0a5f73cdb9a25eb91f9aa0c5e09ab diff --cc include/configs/ls1012a_common.h index ba27437116,5beca458c7..80603c9e46 --- a/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" \