diff options
author | Wolfgang Denk <wd@denx.de> | 2010-10-25 08:06:52 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-10-25 08:06:52 +0200 |
commit | c163f4478ca72f51b28b55f74addc8fe029d7b83 (patch) | |
tree | 914495b79944d55ff161fd7611d46ee7ab523978 /board/csb226/csb226.c | |
parent | 9038e0e7029e47ec1700128351281225f711545e (diff) | |
parent | 6d79c39958aa0245e59f33860cd1ddd589119968 (diff) | |
download | talos-obmc-uboot-c163f4478ca72f51b28b55f74addc8fe029d7b83.tar.gz talos-obmc-uboot-c163f4478ca72f51b28b55f74addc8fe029d7b83.zip |
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Diffstat (limited to 'board/csb226/csb226.c')
-rw-r--r-- | board/csb226/csb226.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/board/csb226/csb226.c b/board/csb226/csb226.c index 6eed9ad676..dd29e62659 100644 --- a/board/csb226/csb226.c +++ b/board/csb226/csb226.c @@ -69,8 +69,9 @@ int misc_init_r(void) int board_init (void) { - /* memory and cpu-speed are setup before relocation */ - /* so we do _nothing_ here */ + /* We have RAM, disable cache */ + dcache_disable(); + icache_disable(); /* arch number of CSB226 board */ gd->bd->bi_arch_number = MACH_TYPE_CSB226; @@ -82,21 +83,20 @@ int board_init (void) } -/** - * dram_init: - setup dynamic RAM - * - * @return: 0 in case of success - */ +extern void pxa_dram_init(void); +int dram_init(void) +{ + pxa_dram_init(); + gd->ram_size = PHYS_SDRAM_1_SIZE; + return 0; +} -int dram_init (void) +void dram_init_banksize(void) { gd->bd->bi_dram[0].start = PHYS_SDRAM_1; gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; - - return 0; } - /** * csb226_set_led: - switch LEDs on or off * |