diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-28 03:44:51 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-28 03:44:51 +0000 |
| commit | f43dfc5830b5fc9655649c6d8b965ac303bba190 (patch) | |
| tree | d58c6859efcc8583d65a5de88b60b1d7592e4fb4 /arch/mips/baget | |
| parent | efa96fef2f5dede0b65b33eb9bfb9bacd2040e27 (diff) | |
More memory initialization patches from Maciej.
Diffstat (limited to 'arch/mips/baget')
| -rw-r--r-- | arch/mips/baget/prom/init.c | 8 | ||||
| -rw-r--r-- | arch/mips/baget/setup.c | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/arch/mips/baget/prom/init.c b/arch/mips/baget/prom/init.c index 2d22860d8..bfcfff09b 100644 --- a/arch/mips/baget/prom/init.c +++ b/arch/mips/baget/prom/init.c @@ -4,16 +4,22 @@ * Copyright (C) 1998 Gleb Raiko & Vladimir Roganov */ #include <linux/init.h> +#include <asm/addrspace.h> #include <asm/bootinfo.h> char arcs_cmdline[COMMAND_LINE_SIZE]; void __init prom_init(unsigned int mem_upper) { - mips_memory_upper = mem_upper; + mem_upper = PHYSADDR(mem_upper); + mips_machgroup = MACH_GROUP_UNKNOWN; mips_machtype = MACH_UNKNOWN; arcs_cmdline[0] = 0; + + vac_memory_upper = mem_upper; + + add_memory_region(0, mem_upper, BOOT_MEM_RAM); } void prom_free_prom_memory (void) diff --git a/arch/mips/baget/setup.c b/arch/mips/baget/setup.c index dd0a7733e..f12f80a9d 100644 --- a/arch/mips/baget/setup.c +++ b/arch/mips/baget/setup.c @@ -14,7 +14,7 @@ #include <asm/baget/baget.h> -extern long mips_memory_upper; +long int vac_memory_upper; #define CACHEABLE_STR(val) ((val) ? "not cached" : "cached") #define MIN(a,b) (((a)<(b)) ? (a):(b)) @@ -172,7 +172,7 @@ static void __init vac_show(void) static void __init vac_init(void) { - unsigned short mem_limit = ((mips_memory_upper-KSEG0) >> 16); + unsigned short mem_limit = (vac_memory_upper >> 16); switch(vac_inw(VAC_ID)) { case 0x1AC0: |