diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-11-12 22:24:06 +0100 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-11-12 22:24:06 +0100 | 
| commit | d963e84c92a63b4e6c4f2f80482a5ecbe9b24fe0 (patch) | |
| tree | 07dd5889d73f4b66ad608815adcf6f2f953d9501 /board/csb226/csb226.c | |
| parent | 66fca016057b1c6b697552cc7220ebada9d4f82d (diff) | |
| parent | 0c0892be0d93a5a892b93739c5eb3bf692fed4ff (diff) | |
| download | olio-uboot-2014.01-d963e84c92a63b4e6c4f2f80482a5ecbe9b24fe0.tar.xz olio-uboot-2014.01-d963e84c92a63b4e6c4f2f80482a5ecbe9b24fe0.zip | |
Merge branch 'master' of /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 6eed9ad67..dd29e6265 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   * |