diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-09-23 21:16:32 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-09-23 21:16:32 +0200 |
| commit | d03161b455125f0581918b25fabc5fde0268ae4e (patch) | |
| tree | 67e61ba7679d82a64dbcb3d55344a31a22a7e6da /board | |
| parent | 2675244fa4a0c2c3088af279d57dbe8457bacf77 (diff) | |
| parent | 8a805df13615667ebdcc9f3a3a6fbf6c7778a992 (diff) | |
| download | u-boot-imx-d03161b455125f0581918b25fabc5fde0268ae4e.zip u-boot-imx-d03161b455125f0581918b25fabc5fde0268ae4e.tar.gz u-boot-imx-d03161b455125f0581918b25fabc5fde0268ae4e.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
Diffstat (limited to 'board')
| -rw-r--r-- | board/amcc/ebony/flash.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/board/amcc/ebony/flash.c b/board/amcc/ebony/flash.c index 8fe3ba1..79d2c4c 100644 --- a/board/amcc/ebony/flash.c +++ b/board/amcc/ebony/flash.c @@ -34,6 +34,7 @@ #include <common.h> #include <ppc4xx.h> #include <asm/processor.h> +#include <asm/io.h> #undef DEBUG #ifdef DEBUG @@ -71,6 +72,36 @@ static unsigned long flash_addr_table[8][CONFIG_SYS_MAX_FLASH_BANKS] = { */ static ulong flash_get_size(vu_long * addr, flash_info_t * info); +/* + * Override the weak default mapping function with a board specific one + */ +u32 flash_get_bank_size(int cs, int idx) +{ + u8 reg = in_8((void *)CONFIG_SYS_FPGA_BASE); + + if ((reg & BOOT_SMALL_FLASH) && !(reg & FLASH_ONBD_N)) { + /* + * cs0: small flash (512KiB) + * cs2: 2 * big flash (2 * 2MiB) + */ + if (cs == 0) + return flash_info[2].size; + if (cs == 2) + return flash_info[0].size + flash_info[1].size; + } else { + /* + * cs0: 2 * big flash (2 * 2MiB) + * cs2: small flash (512KiB) + */ + if (cs == 0) + return flash_info[0].size + flash_info[1].size; + if (cs == 2) + return flash_info[2].size; + } + + return 0; +} + unsigned long flash_init(void) { unsigned long total_b = 0; |