diff options
author | Bob Liu <lliubbo@gmail.com> | 2012-07-11 03:28:11 -0400 |
---|---|---|
committer | Bob Liu <lliubbo@gmail.com> | 2012-07-24 01:39:53 -0400 |
commit | acb3166dab2bc6755408a015d69e4b47626741df (patch) | |
tree | b2b61e69f4b2eaa14b7a72bbe7f83b482002f763 /arch/blackfin | |
parent | 06051fdefddf25e0bbf983aac40680f835829db7 (diff) |
blackfin: cplb-nompu: fix ROM cplb size for bf609-ezkit
In user xip test, there is a cplb error when ROMKERNEL try to mount romfs
using 'mount -t romfs /dev/mtdblock2 /mnt', becasue the CPLB setting is not
correct.
Signed-off-by: Bob Liu <lliubbo@gmail.com>
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/kernel/cplb-nompu/cplbinit.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/arch/blackfin/kernel/cplb-nompu/cplbinit.c index 3e366dc2d6e1..34e96ce02aa9 100644 --- a/arch/blackfin/kernel/cplb-nompu/cplbinit.c +++ b/arch/blackfin/kernel/cplb-nompu/cplbinit.c | |||
@@ -58,12 +58,20 @@ void __init generate_cplb_tables_cpu(unsigned int cpu) | |||
58 | 58 | ||
59 | #ifdef CONFIG_ROMKERNEL | 59 | #ifdef CONFIG_ROMKERNEL |
60 | /* Cover kernel XIP flash area */ | 60 | /* Cover kernel XIP flash area */ |
61 | #ifdef CONFIG_BF60x | ||
62 | addr = CONFIG_ROM_BASE & ~(16 * 1024 * 1024 - 1); | ||
63 | d_tbl[i_d].addr = addr; | ||
64 | d_tbl[i_d++].data = SDRAM_DGENERIC | PAGE_SIZE_16MB; | ||
65 | i_tbl[i_i].addr = addr; | ||
66 | i_tbl[i_i++].data = SDRAM_IGENERIC | PAGE_SIZE_16MB; | ||
67 | #else | ||
61 | addr = CONFIG_ROM_BASE & ~(4 * 1024 * 1024 - 1); | 68 | addr = CONFIG_ROM_BASE & ~(4 * 1024 * 1024 - 1); |
62 | d_tbl[i_d].addr = addr; | 69 | d_tbl[i_d].addr = addr; |
63 | d_tbl[i_d++].data = SDRAM_DGENERIC | PAGE_SIZE_4MB; | 70 | d_tbl[i_d++].data = SDRAM_DGENERIC | PAGE_SIZE_4MB; |
64 | i_tbl[i_i].addr = addr; | 71 | i_tbl[i_i].addr = addr; |
65 | i_tbl[i_i++].data = SDRAM_IGENERIC | PAGE_SIZE_4MB; | 72 | i_tbl[i_i++].data = SDRAM_IGENERIC | PAGE_SIZE_4MB; |
66 | #endif | 73 | #endif |
74 | #endif | ||
67 | 75 | ||
68 | /* Cover L1 memory. One 4M area for code and data each is enough. */ | 76 | /* Cover L1 memory. One 4M area for code and data each is enough. */ |
69 | if (cpu == 0) { | 77 | if (cpu == 0) { |