Update of /cvsroot/linux-vax/kernel-2.4/arch/mips/baget/prom
In directory usw-pr-cvs1:/tmp/cvs-serv16972/mips/baget/prom
Modified Files:
Makefile init.c
Log Message:
synch 2.4.15
Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/baget/prom/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile 14 Jan 2001 19:28:53 -0000 1.1.1.1
+++ Makefile 10 Apr 2002 14:38:04 -0000 1.2
@@ -1,4 +1,4 @@
-# $Id$
+#
# Makefile for the Baget/MIPS prom emulator library routines.
#
# Note! Dependencies are done automagically by 'make dep', which also
@@ -7,9 +7,8 @@
#
# Note 2! The CFLAGS definitions are now in the main makefile...
-O_TARGET := bagetlib.a
-O_OBJS := init.o
+L_TARGET := bagetlib.a
-all: $(O_TARGET)
+obj-y := init.o
include $(TOPDIR)/Rules.make
Index: init.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/baget/prom/init.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- init.c 14 Jan 2001 19:28:53 -0000 1.1.1.1
+++ init.c 10 Apr 2002 14:38:04 -0000 1.2
@@ -2,25 +2,24 @@
* init.c: PROM library initialisation code.
*
* Copyright (C) 1998 Gleb Raiko & Vladimir Roganov
- *
- * $Id$
*/
#include <linux/init.h>
+#include <asm/addrspace.h>
#include <asm/bootinfo.h>
-char arcs_cmdline[CL_SIZE];
+char arcs_cmdline[COMMAND_LINE_SIZE];
-int __init prom_init(unsigned int mem_upper)
+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;
- return 0;
-}
-void __init prom_fixup_mem_map(unsigned long start, unsigned long end)
-{
+ vac_memory_upper = mem_upper;
+
+ add_memory_region(0, mem_upper, BOOT_MEM_RAM);
}
void prom_free_prom_memory (void)
|
