summaryrefslogtreecommitdiffstats
path: root/include/configs/T4240EMU.h
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2014-02-11 12:55:32 +0100
committerStefano Babic <sbabic@denx.de>2014-02-11 12:55:32 +0100
commit17998eff9021b7b579c0387e934d8c52603fe247 (patch)
treeedc3ef069db4cdaf9c718ae60e095caf42cd1d0d /include/configs/T4240EMU.h
parent6ba45cc0f8b46533965219cfd90864a60ec1009b (diff)
parente97f9d817e600cd6f43d1d0da76f5787e33a5c56 (diff)
downloadtalos-obmc-uboot-17998eff9021b7b579c0387e934d8c52603fe247.tar.gz
talos-obmc-uboot-17998eff9021b7b579c0387e934d8c52603fe247.zip
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/T4240EMU.h')
-rw-r--r--include/configs/T4240EMU.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/configs/T4240EMU.h b/include/configs/T4240EMU.h
index 5e228f3556..c81c4577e3 100644
--- a/include/configs/T4240EMU.h
+++ b/include/configs/T4240EMU.h
@@ -98,7 +98,7 @@
#define CONFIG_SYS_INTERLAKEN
#define CONFIG_SYS_QE_FMAN_FW_IN_NOR
-#define CONFIG_SYS_QE_FMAN_FW_ADDR 0xEFF40000
+#define CONFIG_SYS_QE_FMAN_FW_ADDR 0xEFF00000
#define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x10000
#define CONFIG_SYS_FDT_PAD (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
@@ -122,7 +122,7 @@
"bank_intlv=auto;" \
"netdev=eth0\0" \
"uboot=" __stringify(CONFIG_UBOOTPATH) "\0" \
- "ubootaddr=" __stringify(CONFIG_SYS_TEXT_BASE) "\0" \
+"ubootaddr=" __stringify(CONFIG_SYS_TEXT_BASE) "\0" \
"consoledev=ttyS0\0" \
"ramdiskaddr=2000000\0" \
"ramdiskfile=t4240emu/ramdisk.uboot\0" \
OpenPOWER on IntegriCloud