- fix problems with sockets not initialized (disabling

  hotplug support -> cardmgr handles sockets)
- fix problems with PCMCIA net adapters now using PCI
  modules, by adding PCMCIA base code in `network.img'

4 files changed, 11 insertions, 13 deletions

diff --git a/make_boot_img b/make_boot_img
index 71ebf2277..64bcfe013 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -116,8 +116,7 @@ sub initrd {
 	_ "$sudo mknod $mnt/dev/ttyp0 c 3 0";
     }
 
-    my $ftype = $type =~ /^(all)$/ ? "pcmcia" : $type;
-    if ($ftype eq "pcmcia" && $arch !~ /ppc/ && $arch !~ /ia64/) {
+    if (member($type, qw(pcmcia all network)) && $arch !~ /ppc/ && $arch !~ /ia64/) {
 	 _ "$sudo cp -a /etc/pcmcia $mnt/etc";
 	 patch_pcmcia_config("$mnt/etc");
     }
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index cedaef119..8eeb8c80c 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -185,7 +185,7 @@ stage1-disk: $(STAGE1OBJS-DISK) $(STAGE1_OWN_LIBS) $(FRONTEND_LINK) $(STAGE1_LIB
 	$(CC) $(LDFLAGS_STAGE1) -o $@ $^
 	$(STRIPCMD) $@
 
-stage1-network: $(STAGE1OBJS-NETWORK) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(STAGE1_LIBC)
+stage1-network: $(STAGE1OBJS-NETWORK) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC)
 	$(CC) $(LDFLAGS_STAGE1) -o $@ $^
 	$(STRIPCMD) $@
 
@@ -208,7 +208,7 @@ $(STAGE1OBJS-DISK): %-DISK.o: %.c
 	$(COMPILE) $(INCLUDES) $(DISK_DEFS) -c $< -o $@
 
 $(STAGE1OBJS-NETWORK): %-NETWORK.o: %.c
-	$(COMPILE) $(INCLUDES) $(NETWORK_DEFS) -c $< -o $@
+	$(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(PCMCIA_DEFS) -c $< -o $@
 
 $(STAGE1OBJS-USB): %-USB.o: %.c
 	$(COMPILE) $(INCLUDES) $(USB_DEFS) -c $< -o $@
diff --git a/mdk-stage1/pcmcia_/cardmgr.c b/mdk-stage1/pcmcia_/cardmgr.c
index 37598015c..1db18b55b 100644
--- a/mdk-stage1/pcmcia_/cardmgr.c
+++ b/mdk-stage1/pcmcia_/cardmgr.c
@@ -339,8 +339,8 @@ static void write_stab(void)
 	fprintf(f, "Socket %d: ", i);
 	if (!(s->state & SOCKET_PRESENT)) {
 	    fprintf(f, "empty\n");
-	} else if (s->state & SOCKET_HOTPLUG) {
-	    fprintf(f, "CardBus hotplug device\n");
+//mdk-stage1// 	} else if (s->state & SOCKET_HOTPLUG) {
+//mdk-stage1// 	    fprintf(f, "CardBus hotplug device\n");
 	} else if (!s->card) {
 	    fprintf(f, "unsupported card\n");
 	} else {
@@ -547,10 +547,10 @@ static card_info_t *lookup_card(int ns)
 	    }
 	} else {
 	    /* this is a 2.4 kernel; hotplug handles these cards */
-	    s->state |= SOCKET_HOTPLUG;
+//mdk-stage1//	    s->state |= SOCKET_HOTPLUG;
 	    log_message("CM: socket %d: CardBus hotplug device", ns);
 	    //beep(BEEP_TIME, BEEP_OK);
-	    return NULL;
+//mdk-stage1//	    return NULL;
 	}
     }
 
diff --git a/update_kernel b/update_kernel
index 698b6ce46..3c8f82957 100755
--- a/update_kernel
+++ b/update_kernel
@@ -69,7 +69,10 @@ f "pcmcia net usb usbnet usbstorage cdrom scsi disk keepbig" ; ALL_DRIVERS=$v
 [ $ARCH == "i386" ] && DOSMODULES="vfat.o fat.o"
 echo "done."
 
-NETWORK_MODULES="  $NETWORK_DRIVERS"
+PCMCIA_COREMODULES="pcmcia_core.o tcic.o ds.o i82365.o yenta_socket.o"
+GENERIC_MODULES="isa-pnp.o floppy.o"
+
+NETWORK_MODULES="  $NETWORK_DRIVERS $PCMCIA_COREMODULES cb_enabler.o"
 USB_MODULES="      $USB_DRIVERS usbkbd.o keybdev.o input.o"
 CDROM_MODULES="    $CD_DRIVERS"
 HD_MODULES="       $DOSMODULES $SCSI_DRIVERS $DISK_DRIVERS loop.o isofs.o reiserfs.o"
@@ -80,10 +83,6 @@ ALL_MODULES="      $DOSMODULES $ALL_DRIVERS loop.o isofs.o reiserfs.o"
 [ "$ARCH" == "ppc" ] && ALL_MODULES="$ALL_MODULES hfs.o"
 NOT_USEFULL_IN_STAGE1="nls_*.o parport_probe.o raid*.o serial.o smbfs.o"
 
-GENERIC_MODULES="isa-pnp.o floppy.o"
-
-PCMCIA_COREMODULES="pcmcia_core.o tcic.o ds.o i82365.o yenta_socket.o"
-
 
 if [ "$ARCH" == "i386" ]; then
     for i in $ALL_KERNELS/*/boot/vmlinuz*; do