diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-06 08:49:58 +0100 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-01-06 08:49:58 +0100 |
commit | a891601ce51edbafa1a2750c96a618e4fcbca1c2 (patch) | |
tree | 9a5d44eb1fcca45dfd30557318f786b66392a8f3 /include/configs/wandboard.h | |
parent | 2931fa4db349c97f882ffda42e901208654b5ca9 (diff) | |
parent | 4611d5bab26f93471b84f6f33967cef69b3f723a (diff) | |
download | u-boot-imx-a891601ce51edbafa1a2750c96a618e4fcbca1c2.zip u-boot-imx-a891601ce51edbafa1a2750c96a618e4fcbca1c2.tar.gz u-boot-imx-a891601ce51edbafa1a2750c96a618e4fcbca1c2.tar.bz2 |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
include/micrel.h
The conflict above was trivial, caused by four lines being
added in both branches with different whitepace.
Diffstat (limited to 'include/configs/wandboard.h')
-rw-r--r-- | include/configs/wandboard.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index e9c7e64..ae8480d 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -9,6 +9,7 @@ #ifndef __CONFIG_H #define __CONFIG_H +#include "mx6_common.h" #include <asm/arch/imx-regs.h> #include <asm/imx-common/gpio.h> #include <asm/sizes.h> @@ -113,7 +114,7 @@ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "fdt_addr=0x11000000\0" \ + "fdt_addr=0x18000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ |