Merge branch 'master' of git://git.denx.de/u-boot-imx
Conflicts: board/logicpd/imx31_litekit/config.mk boards.cfg Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
@@ -1 +1 @@
|
||||
CONFIG_SYS_TEXT_BASE = 0x87f00000
|
||||
CONFIG_SYS_TEXT_BASE = 0xa0000000
|
||||
|
||||
@@ -31,12 +31,18 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
int dram_init (void)
|
||||
{
|
||||
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
|
||||
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
|
||||
gd->ram_size = PHYS_SDRAM_1_SIZE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
dram_init_banksize (void)
|
||||
{
|
||||
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
|
||||
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
|
||||
}
|
||||
|
||||
int board_init (void)
|
||||
{
|
||||
__REG(CSCR_U(0)) = 0x0000cf03; /* CS0: Nor Flash */
|
||||
|
||||
Reference in New Issue
Block a user