diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-07-30 01:39:14 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-07-30 01:39:14 +0200 |
| commit | dd620b26332eb1e9fc0216760909c4046ba09745 (patch) | |
| tree | dac488abee6a6768479629b2c1b2d904d0f9e309 /include/configs/P1023RDS.h | |
| parent | 84b5e8022ef62b68df360392a55c4fc2f2e568d7 (diff) | |
| parent | 57567361769bfa02d0622c06e5e9f66392e2593a (diff) | |
| download | u-boot-imx-dd620b26332eb1e9fc0216760909c4046ba09745.zip u-boot-imx-dd620b26332eb1e9fc0216760909c4046ba09745.tar.gz u-boot-imx-dd620b26332eb1e9fc0216760909c4046ba09745.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
* 'master' of /home/wd/git/u-boot/custodians:
powerpc/8xxx: Remove dependency on <usb.h>
powerpc/85xx: enable USB2 gadget mode for corenet ds board
powerpc/85xx: verify the device tree before booting Linux
MPC8xxx: drop redundant boot messages
powerpc/85xx: Fix build failure for P1023RDS
powerpc/p2041rdb: Enable SATA support
powerpc/85xx: Cleanup handling of PVR detection for e500/e500mc/e5500
powerpc/85xx: Fix up clock_freq property in CAN node of dts
85xx: enable FDT support for STX SSA board
powerpc/85xx: provide 85xx flush_icache for cmd_cache
powerpc/p2041rdb: Enable backside L2 cache support
powerpc/85xx: Handle the lack of L2 cache on P2040/P2040E
powerpc/85xx: Add support for P2041[e] XAUI in SERDES
powerpc/85xx: Rename P2040 id & SERDES to P2041
powerpc/85xx: Adding configuration for DCSRCR to enable 32M access
powerpc/85xx: Fix setting of EPAPR_MAGIC value
Diffstat (limited to 'include/configs/P1023RDS.h')
| -rw-r--r-- | include/configs/P1023RDS.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/P1023RDS.h b/include/configs/P1023RDS.h index 4f14a02..95f3a2c 100644 --- 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 |