diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-01-25 21:13:04 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-01-25 21:13:04 +0100 |
| commit | 5aebe3b07254d9ec8f7ae23a4525a6c535a7f858 (patch) | |
| tree | 398660b7a43c39cee91c51e54678eab46aa7103d /include/configs/corenet_ds.h | |
| parent | d6a5e6d531e357dd8016141f73d370d02886a7eb (diff) | |
| parent | 92966835e96af324fed574815036e481be807d04 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'include/configs/corenet_ds.h')
| -rw-r--r-- | include/configs/corenet_ds.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 23bbd42af2..bff212e40d 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -41,6 +41,10 @@ #define CONFIG_SYS_TEXT_BASE 0xeff80000 #endif +#ifndef CONFIG_RESET_VECTOR_ADDRESS +#define CONFIG_RESET_VECTOR_ADDRESS 0xeffffffc +#endif + #define CONFIG_SYS_FSL_CPC /* Corenet Platform Cache */ #define CONFIG_SYS_NUM_CPC CONFIG_NUM_DDR_CONTROLLERS #define CONFIG_FSL_ELBC /* Has Enhanced localbus controller */ @@ -76,7 +80,7 @@ #define CONFIG_BACKSIDE_L2_CACHE #define CONFIG_SYS_INIT_L2CSR0 L2CSR0_L2E #define CONFIG_BTB /* toggle branch predition */ -/*#define CONFIG_DDR_ECC*/ +#define CONFIG_DDR_ECC #ifdef CONFIG_DDR_ECC #define CONFIG_ECC_INIT_VIA_DDRCONTROLLER #define CONFIG_MEM_INIT_VALUE 0xdeadbeef @@ -442,13 +446,11 @@ #define CONFIG_SYS_FM1_DTSEC4_PHY_ADDR 0x1f #define CONFIG_SYS_FM1_10GEC1_PHY_ADDR 4 -#if (CONFIG_SYS_NUM_FMAN == 2) #define CONFIG_SYS_FM2_DTSEC1_PHY_ADDR 0x1c #define CONFIG_SYS_FM2_DTSEC2_PHY_ADDR 0x1d #define CONFIG_SYS_FM2_DTSEC3_PHY_ADDR 0x1e #define CONFIG_SYS_FM2_DTSEC4_PHY_ADDR 0x1f #define CONFIG_SYS_FM2_10GEC1_PHY_ADDR 0 -#endif #define CONFIG_SYS_TBIPA_VALUE 8 #define CONFIG_MII /* MII PHY management */ |