[Linux-mips-commits]CVS: linux/arch/mips/sibyte/swarm setup.c,1.8,1.9

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/sibyte/swarm
In directory usw-pr-cvs1:/tmp/cvs-serv2322

Modified Files:
	setup.c 
Log Message:
Set MAX_RAM_SIZE correctly for 64-bit kernel. Delete some more of the now unused standalone code.

Index: setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/sibyte/swarm/setup.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- setup.c	12 Feb 2002 18:04:27 -0000	1.8
+++ setup.c	19 Feb 2002 17:34:24 -0000	1.9
@@ -58,14 +58,17 @@
 /* Max ram addressable in 32-bit segments */
 #ifdef CONFIG_HIGHMEM
 #ifdef CONFIG_64BIT_PHYS_ADDR
-/* #define MAX_RAM_SIZE (0xffffffffffffffff) */
 #define MAX_RAM_SIZE (~0ULL)
 #else
 #define MAX_RAM_SIZE (0xffffffffULL)
 #endif
 #else
+#ifdef CONFIG_MIPS64
+#define MAX_RAM_SIZE (~0ULL)
+#else
 #define MAX_RAM_SIZE (0x1fffffffULL)
 #endif
+#endif
 
 
 #ifndef CONFIG_SWARM_STANDALONE
@@ -400,9 +403,6 @@
  */
 __init int prom_init(int argc, char **argv, char **envp, int *prom_vec)
 {
-#ifdef CONFIG_SWARM_STANDALONE
-	strcpy(arcs_cmdline, "root=/dev/ram0 ");
-#else	
 	/* 
 	 * This should go away.  Detect if we're booting
 	 * straight from cfe without a loader.  If we
@@ -427,7 +427,7 @@
 			panic("LINUX_CMDLINE not defined in cfe.");
 		}
 	}
-	
+
 #ifdef CONFIG_BLK_DEV_INITRD
 	{
 		char *ptr;
@@ -448,7 +448,6 @@
 		}
 	}
 #endif /* CONFIG_BLK_DEV_INITRD */
-#endif /* CONFIG_SWARM_STANDALONE */
 
 	/* Not sure this is needed, but it's the safe way. */
 	arcs_cmdline[CL_SIZE-1] = 0;