aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mm/init.c
diff options
context:
space:
mode:
authorYi Li <yi.li@analog.com>2008-02-08 13:26:01 -0500
committerBryan Wu <bryan.wu@analog.com>2008-02-08 13:26:01 -0500
commit856783b37a958086c83ea44544d366affd0c2c4b (patch)
tree3dd18cc8a023240cd36478a76a55648ae6dde9d5 /arch/blackfin/mm/init.c
parentc605999bd9a90a7a9915666f4531c60928cbc368 (diff)
[Blackfin] arch: add "memmap=nn[KMG]@ss[KMG]" and "memmap=nn[KMG]$ss[KMG]" options to blackfin, based on arch/i386/kernel/e820.c
Signed-off-by: Yi Li <yi.li@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'arch/blackfin/mm/init.c')
-rw-r--r--arch/blackfin/mm/init.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c
index eb1a12ac9e33..1f516c55bde6 100644
--- a/arch/blackfin/mm/init.c
+++ b/arch/blackfin/mm/init.c
@@ -138,8 +138,7 @@ void __init mem_init(void)
138 138
139 start_mem = PAGE_ALIGN(start_mem); 139 start_mem = PAGE_ALIGN(start_mem);
140 max_mapnr = num_physpages = MAP_NR(high_memory); 140 max_mapnr = num_physpages = MAP_NR(high_memory);
141 printk(KERN_INFO "Kernel managed physical pages: %lu\n", 141 printk(KERN_DEBUG "Kernel managed physical pages: %lu\n", num_physpages);
142 num_physpages);
143 142
144 /* This will put all memory onto the freelists. */ 143 /* This will put all memory onto the freelists. */
145 totalram_pages = free_all_bootmem(); 144 totalram_pages = free_all_bootmem();
@@ -153,8 +152,7 @@ void __init mem_init(void)
153 /* do not count in kernel image between _rambase and _ramstart */ 152 /* do not count in kernel image between _rambase and _ramstart */
154 reservedpages -= (_ramstart - _rambase) >> PAGE_SHIFT; 153 reservedpages -= (_ramstart - _rambase) >> PAGE_SHIFT;
155#if (defined(CONFIG_BFIN_ICACHE) && ANOMALY_05000263) 154#if (defined(CONFIG_BFIN_ICACHE) && ANOMALY_05000263)
156 reservedpages += (_ramend - memory_end - DMA_UNCACHED_REGION) >> 155 reservedpages += (_ramend - memory_end - DMA_UNCACHED_REGION) >> PAGE_SHIFT;
157 PAGE_SHIFT;
158#endif 156#endif
159 157
160 codek = (_etext - _stext) >> 10; 158 codek = (_etext - _stext) >> 10;
@@ -163,11 +161,9 @@ void __init mem_init(void)
163 161
164 printk(KERN_INFO 162 printk(KERN_INFO
165 "Memory available: %luk/%luk RAM, " 163 "Memory available: %luk/%luk RAM, "
166 "(%uk init code, %uk kernel code, " 164 "(%uk init code, %uk kernel code, %uk data, %uk dma, %uk reserved)\n",
167 "%uk data, %uk dma, %uk reserved)\n",
168 (unsigned long) freepages << (PAGE_SHIFT-10), _ramend >> 10, 165 (unsigned long) freepages << (PAGE_SHIFT-10), _ramend >> 10,
169 initk, codek, datak, DMA_UNCACHED_REGION >> 10, 166 initk, codek, datak, DMA_UNCACHED_REGION >> 10, (reservedpages << (PAGE_SHIFT-10)));
170 (reservedpages << (PAGE_SHIFT-10)));
171 167
172 /* Initialize the blackfin L1 Memory. */ 168 /* Initialize the blackfin L1 Memory. */
173 l1sram_init(); 169 l1sram_init();