diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:13:07 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:13:07 +0200 |
| commit | 1730edf76c54381475e2da11f75b1ce563c4e62c (patch) | |
| tree | 1f2a9fb7a7cd9b547374d9cc3715a7f18001e1ee /nand_spl/board/amcc/bamboo | |
| parent | 5ea67393b8b554b8165c38912d753a8df043020d (diff) | |
| parent | b2815f79288d4da7a3ba18bdbd05120ce09d5622 (diff) | |
| download | u-boot-imx-1730edf76c54381475e2da11f75b1ce563c4e62c.zip u-boot-imx-1730edf76c54381475e2da11f75b1ce563c4e62c.tar.gz u-boot-imx-1730edf76c54381475e2da11f75b1ce563c4e62c.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Diffstat (limited to 'nand_spl/board/amcc/bamboo')
| -rw-r--r-- | nand_spl/board/amcc/bamboo/Makefile | 2 | ||||
| -rw-r--r-- | nand_spl/board/amcc/bamboo/sdram.c | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/nand_spl/board/amcc/bamboo/Makefile b/nand_spl/board/amcc/bamboo/Makefile index aed7960..e1c1467 100644 --- a/nand_spl/board/amcc/bamboo/Makefile +++ b/nand_spl/board/amcc/bamboo/Makefile @@ -50,7 +50,7 @@ $(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@ $(nandobj)u-boot-spl: $(OBJS) - cd $(LNDIR) && $(LD) $(LDFLAGS) $$UNDEF_SYM $(__OBJS) \ + cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) \ -Map $(nandobj)u-boot-spl.map \ -o $(nandobj)u-boot-spl diff --git a/nand_spl/board/amcc/bamboo/sdram.c b/nand_spl/board/amcc/bamboo/sdram.c index ac77d06..ca25252 100644 --- a/nand_spl/board/amcc/bamboo/sdram.c +++ b/nand_spl/board/amcc/bamboo/sdram.c @@ -36,7 +36,7 @@ static void wait_init_complete(void) } /* - * early_sdram_init() + * long int initdram(int board_type) * * As the name already indicates, this function is called very early * from start.S and configures the SDRAM with fixed values. This is needed, @@ -51,7 +51,7 @@ static void wait_init_complete(void) * modules are still plugged in. So it is recommended to remove the DIMM * modules while using the NAND booting code with the fixed SDRAM setup! */ -void early_sdram_init(void) +long int initdram(int board_type) { /* * Soft-reset SDRAM controller. @@ -87,12 +87,6 @@ void early_sdram_init(void) */ mtsdram(mem_cfg0, 0x80000000); /* DCEN=1, PMUD=0*/ wait_init_complete(); -} -long int initdram(int board_type) -{ - /* - * Nothing to do here, just return size of fixed SDRAM setup - */ return CFG_MBYTES_SDRAM << 20; } |