diff options
author | roy zang <tie-fei.zang@freescale.com> | 2007-01-04 11:10:05 +0800 |
---|---|---|
committer | Zang Tiefei <roy@bus.ap.freescale.net> | 2007-01-04 11:10:05 +0800 |
commit | a41969e09b9d886091a804c2ba5f1ab84b084dd3 (patch) | |
tree | 96d4b03713537e6c0a696e4770c23f9d39792666 /board/amcc/sequoia | |
parent | d3bb5ec198edad4869ac5276a5899881b7bf5433 (diff) | |
parent | 92eb729bad876725aeea908d2addba0800620840 (diff) | |
download | u-boot-imx-a41969e09b9d886091a804c2ba5f1ab84b084dd3.zip u-boot-imx-a41969e09b9d886091a804c2ba5f1ab84b084dd3.tar.gz u-boot-imx-a41969e09b9d886091a804c2ba5f1ab84b084dd3.tar.bz2 |
Merge branch 'master' into hpc2
Diffstat (limited to 'board/amcc/sequoia')
-rw-r--r-- | board/amcc/sequoia/sequoia.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/board/amcc/sequoia/sequoia.c b/board/amcc/sequoia/sequoia.c index ccf6f0c..ff211ae 100644 --- a/board/amcc/sequoia/sequoia.c +++ b/board/amcc/sequoia/sequoia.c @@ -31,6 +31,8 @@ DECLARE_GLOBAL_DATA_PTR; extern flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ +ulong flash_get_size (ulong base, int banknum); + int board_early_init_f(void) { unsigned long sdr0_cust0; @@ -152,6 +154,11 @@ int misc_init_r(void) */ /* Re-do sizing to get full correct info */ + + /* adjust flash start and offset */ + gd->bd->bi_flashstart = 0 - gd->bd->bi_flashsize; + gd->bd->bi_flashoffset = 0; + #if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) mtdcr(ebccfga, pb3cr); #else @@ -192,9 +199,10 @@ int misc_init_r(void) #endif mtdcr(ebccfgd, pbcr); - /* adjust flash start and offset */ - gd->bd->bi_flashstart = 0 - gd->bd->bi_flashsize; - gd->bd->bi_flashoffset = 0; + /* + * Re-check to get correct base address + */ + flash_get_size(gd->bd->bi_flashstart, 0); #ifdef CFG_ENV_IS_IN_FLASH /* Monitor protection ON by default */ |