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/nand_boot.c | |
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/nand_boot.c')
-rw-r--r-- | nand_spl/nand_boot.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nand_spl/nand_boot.c b/nand_spl/nand_boot.c index bc57725..563a80b 100644 --- a/nand_spl/nand_boot.c +++ b/nand_spl/nand_boot.c @@ -221,20 +221,19 @@ static int nand_load(struct mtd_info *mtd, int offs, int uboot_size, uchar *dst) return 0; } +/* + * The main entry for NAND booting. It's necessary that SDRAM is already + * configured and available since this code loads the main U-Boot image + * from NAND into SDRAM and starts it from there. + */ void nand_boot(void) { - ulong mem_size; struct nand_chip nand_chip; nand_info_t nand_info; int ret; void (*uboot)(void); /* - * Init sdram, so we have access to memory - */ - mem_size = initdram(0); - - /* * Init board specific nand support */ nand_info.priv = &nand_chip; |