Merge branch 'master' of git://git.denx.de/u-boot-i2c

[oweals/u-boot.git] / include / configs / P1023RDS.h

diff --git a/include/configs/P1023RDS.h b/include/configs/P1023RDS.h
index 4f14a02a305e3aa5ae494e07567a0cbcee7ceb9b..95f3a2c181443a0dc2924884edf14dfc670d70a3 100644 (file)
--- a/include/configs/P1023RDS.h
+++ b/include/configs/P1023RDS.h
@@ -536,16 +536,16 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_FMAN_ENET
 #endif
 
+#define CONFIG_SYS_FMAN_FW
 #ifndef CONFIG_NAND
 /* Default address of microcode for the Linux Fman driver */
 /* QE microcode/firmware address */
 #define CONFIG_SYS_FMAN_FW_ADDR                0xEF000000
-#define CONFIG_SYS_FMAN_FW_ADDR_PHYS   CONFIG_SYS_FMAN_FW_ADDR
 #else
 #define CONFIG_SYS_QE_FW_IN_NAND       0x1f00000
-#define CONFIG_SYS_FMAN_FW_ADDR                0x10000000
-#define CONFIG_SYS_FMAN_FW_LENGTH      0x10000
 #endif
+#define CONFIG_SYS_FMAN_FW_LENGTH      0x10000
+#define CONFIG_SYS_FDT_PAD             (0x3000 + CONFIG_SYS_FMAN_FW_LENGTH)
 
 #ifdef CONFIG_FMAN_ENET
 #define CONFIG_SYS_FM1_DTSEC1_PHY_ADDR 0x2