# This is a BitKeeper generated patch for the following project:
# Project Name: Linux 2.4
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.131   -> 1.132  
#	arch/ppc/kernel/pcore_setup.c	1.1     -> 1.2    
#	arch/ppc/boot/pcore/Makefile	1.1     -> 1.2    
#	arch/ppc/configs/pcore_defconfig	1.1     -> 1.2    
#	arch/ppc/kernel/pcore_pci.c	1.1     -> 1.2    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 01/06/07	trini@opus.bloom.county	1.132
# Update Force PowerCore.
# --------------------------------------------
#
diff -Nru a/arch/ppc/boot/pcore/Makefile b/arch/ppc/boot/pcore/Makefile
--- a/arch/ppc/boot/pcore/Makefile	Thu Jun  7 12:27:19 2001
+++ b/arch/ppc/boot/pcore/Makefile	Thu Jun  7 12:27:19 2001
@@ -26,8 +26,8 @@
 
 GZIP_FLAGS = -v9f
 
-OBJECTS	:= head.o ../common/misc-common.o ../common/misc-simple.o \
-		../common/ns16550.o ../common/string.o
+OBJECTS	:= head.o ../common/misc-common.o ../common/misc-simple.o ns16550.o \
+		../common/string.o
 OBJCOPY_ARGS = -O elf32-powerpc
 LIBS	:= ../lib/zlib.a
 
@@ -39,6 +39,9 @@
 ../common/misc-simple.o: ../common/misc-simple.c
 	$(CC) $(CFLAGS) -DINITRD_OFFSET=0 -DINITRD_SIZE=0 -DZIMAGE_OFFSET=0 \
 		-DZIMAGE_SIZE=0 -c -o $@ $*.c
+
+ns16550.o: ../common/ns16550.c
+	$(CC) $(CFLAGS) -DIOOFFSET=0xFE000000 -c -o $@ ../common/$*.c
 
 zvmlinux.initrd: $(OBJECTS) $(LIBS) ../images/vmlinux.gz
 	$(LD) $(ZLINKFLAGS) -o $@.tmp $(OBJECTS) $(LIBS)
diff -Nru a/arch/ppc/configs/pcore_defconfig b/arch/ppc/configs/pcore_defconfig
--- a/arch/ppc/configs/pcore_defconfig	Thu Jun  7 12:27:19 2001
+++ b/arch/ppc/configs/pcore_defconfig	Thu Jun  7 12:27:19 2001
@@ -35,11 +35,15 @@
 # CONFIG_MCPN765 is not set
 # CONFIG_MVME5100 is not set
 # CONFIG_PRPMC750 is not set
+# CONFIG_SANDPOINT is not set
 # CONFIG_K2 is not set
 # CONFIG_GEMINI is not set
+# CONFIG_ZX4500 is not set
+# CONFIG_MPC10X_STORE_GATHERING is not set
 # CONFIG_PPC601_SYNC_FIX is not set
 # CONFIG_SMP is not set
 CONFIG_ALTIVEC=y
+# CONFIG_TAU is not set
 
 #
 # General setup
@@ -67,7 +71,8 @@
 #
 # CONFIG_PARPORT is not set
 CONFIG_PPC_RTC=y
-# CONFIG_CMDLINE_BOOL is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="ip=on"
 
 #
 # Memory Technology Devices (MTD)
@@ -91,8 +96,9 @@
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_LOOP is not set
 # CONFIG_BLK_DEV_NBD is not set
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_INITRD=y
 
 #
 # Multi-device support (RAID and LVM)
@@ -121,7 +127,8 @@
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_PNP=y
-CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
@@ -321,6 +328,7 @@
 CONFIG_EEPRO100=y
 # CONFIG_EEPRO100_PM is not set
 # CONFIG_LNE390 is not set
+# CONFIG_FEALNX is not set
 # CONFIG_NATSEMI is not set
 # CONFIG_NE2K_PCI is not set
 # CONFIG_NE3210 is not set
@@ -493,6 +501,7 @@
 # CONFIG_ISO9660_FS is not set
 # CONFIG_JOLIET is not set
 # CONFIG_MINIX_FS is not set
+# CONFIG_VXFS_FS is not set
 # CONFIG_NTFS_FS is not set
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
diff -Nru a/arch/ppc/kernel/pcore_pci.c b/arch/ppc/kernel/pcore_pci.c
--- a/arch/ppc/kernel/pcore_pci.c	Thu Jun  7 12:27:19 2001
+++ b/arch/ppc/kernel/pcore_pci.c	Thu Jun  7 12:27:19 2001
@@ -116,7 +116,12 @@
 	if (!hose)
 		return 0;
 
-	mpc10x_bridge_init(hose, MPC10X_MEM_MAP_B, MPC10X_MEM_MAP_B, 0);
+	mpc10x_bridge_init(hose,
+			MPC10X_MEM_MAP_B,
+			MPC10X_MEM_MAP_B,
+			MPC10X_MAPB_EUMB_BASE);
+
+	hose->mem_resources[0].end = 0xffffffff;
 
 	/* Determine board type */
 	early_read_config_dword(hose,
diff -Nru a/arch/ppc/kernel/pcore_setup.c b/arch/ppc/kernel/pcore_setup.c
--- a/arch/ppc/kernel/pcore_setup.c	Thu Jun  7 12:27:19 2001
+++ b/arch/ppc/kernel/pcore_setup.c	Thu Jun  7 12:27:19 2001
@@ -109,21 +109,24 @@
 void __init
 pcore_setup_arch(void)
 {
-	extern char cmd_line[];
-
 	/* init to some ~sane value until calibrate_delay() runs */
 	loops_per_jiffy = 50000000/HZ;
 	
 	/* Lookup PCI host bridges */
 	board_type = pcore_find_bridges();
 	
+#ifdef CONFIG_BLK_DEV_INITRD
+	if (initrd_start)
+		ROOT_DEV = MKDEV(RAMDISK_MAJOR, 0); /* /dev/ram */
+        else
+#endif
 #ifdef CONFIG_ROOT_NFS
-	ROOT_DEV = to_kdev_t(0x00ff); /* /dev/nfs pseudo device */
+		ROOT_DEV = to_kdev_t(0x00ff); /* /dev/nfs pseudo device */
 #else
-	ROOT_DEV = to_kdev_t(0x0802); /* /dev/sda2 */
+		ROOT_DEV = to_kdev_t(0x0802); /* /dev/sda2 */
 #endif
 
-	printk("Boot arguments: %s\n", cmd_line);
+		 printk("Force PCore port (C) 2001 MontaVista Software, Inc. (source@mvista.com)\n");
 }
 
 void
@@ -219,6 +222,14 @@
 pcore_init(unsigned long r3, unsigned long r4, unsigned long r5,
 	  unsigned long r6, unsigned long r7)
 {
+#ifdef CONFIG_BLK_DEV_INITRD
+	if ( r4 )
+	{
+		initrd_start = r4 + KERNELBASE;
+		initrd_end = r5 + KERNELBASE;
+	}
+#endif
+
 	/* Copy cmd_line parameters */
 	if ( r6)
 	{