Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / configs / T4240EMU.h

diff --git a/include/configs/T4240EMU.h b/include/configs/T4240EMU.h
index 9fa6b77ab10e13ee4e4f17857d8bafc32c0c9975..53c69b03dbdfcb29fe6945b8de807757c7c2086e 100644 (file)
--- a/include/configs/T4240EMU.h
+++ b/include/configs/T4240EMU.h
@@ -30,7 +30,6 @@
 #define CONFIG_DDR_CLK_FREQ    133333333
 #define CONFIG_FSL_TBCLK_EXTRA_DIV 100
 
-
 /*
  * DDR Setup
  */
@@ -76,7 +75,6 @@
 #define CONFIG_SYS_CS0_FTIM2           CONFIG_SYS_NOR_FTIM2
 #define CONFIG_SYS_CS0_FTIM3           CONFIG_SYS_NOR_FTIM3
 
-
 /* I2C */
 #define CONFIG_SYS_FSL_I2C_SPEED       4000000 /* faster speed for emulator */
 #define CONFIG_SYS_FSL_I2C2_SPEED      4000000
@@ -100,12 +98,10 @@
 #define CONFIG_SYS_INTERLAKEN
 
 #define CONFIG_SYS_QE_FMAN_FW_IN_NOR
-#define CONFIG_SYS_QE_FMAN_FW_ADDR             0xEFF40000
+#define CONFIG_SYS_FMAN_FW_ADDR                0xEFF00000
 #define CONFIG_SYS_QE_FMAN_FW_LENGTH   0x10000
 #define CONFIG_SYS_FDT_PAD             (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH)
 
-
-
 #define CONFIG_BOOTDELAY       0
 
 /*
@@ -126,14 +122,13 @@
        "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"                  \
        "fdtaddr=c00000\0"                                      \
        "fdtfile=t4240emu/t4240emu.dtb\0"                               \
-       "bdev=sda3\0"                                           \
-       "c=ffe\0"
+       "bdev=sda3\0"
 
 /*
  * For emulation this causes u-boot to jump to the start of the proof point