diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-06-04 22:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-06-04 22:59:44 +0200 |
| commit | c0c292b2852a12e9d93e99b3aaf5b0dac5f36fdc (patch) | |
| tree | 980a8236578172e3eb8dd680f3f0f2539d7d3ea7 /board/amcc/sequoia | |
| parent | f61137937da9afb543a55ca44b7178f2feee34cf (diff) | |
| parent | e3cbe1f93c5722f8ebbad468e30c069a2b511097 (diff) | |
Merge with /home/wd/git/u-boot/custodian/u-boot-ppc4xx
Diffstat (limited to 'board/amcc/sequoia')
| -rw-r--r-- | board/amcc/sequoia/sdram.c | 4 | ||||
| -rw-r--r-- | board/amcc/sequoia/sequoia.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/board/amcc/sequoia/sdram.c b/board/amcc/sequoia/sdram.c index d045df1872..78e2cb42a9 100644 --- a/board/amcc/sequoia/sdram.c +++ b/board/amcc/sequoia/sdram.c @@ -387,7 +387,11 @@ void denali_core_search_data_eye(unsigned long memory_size) long int initdram (int board_type) { #if !defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) +#if !defined(CONFIG_NAND_SPL) ulong speed = get_bus_freq(0); +#else + ulong speed = 133333333; /* 133MHz is on the safe side */ +#endif mtsdram(DDR0_02, 0x00000000); diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index 870401458e..ba365aea31 100644 --- a/board/amcc/sequoia/sequoia.c +++ b/board/amcc/sequoia/sequoia.c @@ -132,12 +132,6 @@ int board_early_init_f(void) (0x80000000 >> (28 + CFG_NAND_CS)); mtsdr(SDR0_CUST0, sdr0_cust0); - /* Update EBC speed after booting from i2c bootstrap settings - * on newer boards with 33.333 MHZ Clocks - */ - if (in8(CFG_BCSR_BASE + 3) & 0x80) - mtcpr(0xe0, 0x02000000); - return 0; } |