remove other.img & usb.img, add hd_usb.img & network_gigabit_usb.img

3 files changed, 19 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 7d252daa1..d805fc54f 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ ARCH := $(patsubst i%86,i386,$(shell uname -m))
 ARCH := $(patsubst sparc%,sparc,$(ARCH))
 
 ifeq (i386,$(ARCH))
-    BOOT_IMG = cdrom.img hd.img network.img usb.img blank.img pcmcia.img other.img
+    BOOT_IMG = cdrom.img hd.img hd_usb.img network.img network_gigabit_usb.img blank.img pcmcia.img
 endif
 ifeq (sparc,$(ARCH))
     BOOT_IMG  = cdrom.img   hd.img   network.img   live.img   tftp.img   tftprd.img
diff --git a/make_boot_img b/make_boot_img
index 2b1834f77..173f1745e 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-@ARGV >= 2 or die "usage: $0 <image> all|other|cdrom|hd|network|usb|blank|pcmcia|live|tftp|tftprd\n";
+@ARGV >= 2 or die "usage: $0 <image> all|cdrom|hd|hd_usb|network|network_gigabit_usb|blank|pcmcia|live|tftp|tftprd\n";
 
 use Config;
 use MDK::Common;
@@ -34,16 +34,16 @@ _ "$sudo mkdir ${mnt}2" unless -e "${mnt}2";
 
 $install = $ {{
     all => "stage1-full",
-    other => "stage1-full",
     blank => "stage1-full",
     live => "stage1-full",
     tftp => "stage1-full",
     tftprd => "stage1-full",
     pcmcia => "stage1-full",
     network => "stage1-network",
-    usb => "stage1-usb",
+    network_gigabit_usb => "stage1-network-usb",
     cdrom => "stage1-cdrom",
     hd => "stage1-disk",
+    hd_usb => "stage1-disk-usb",
     live64 => "stage1-full",
     tftp64 => "stage1-full",
     tftprd64 => "stage1-full",
@@ -56,7 +56,7 @@ $install = $ {{
 mkdir "images";
 chomp($main = `cat kernel/all.kernels/.main`);
 
-if ($img =~ /blank|other|pcmcia/) {
+if ($img =~ /blank|pcmcia/) {
     @kernels = $main;
 } else {
     @kernels = map { m|kernel/all.kernels/(.*)| } glob('kernel/all.kernels/*');
@@ -105,7 +105,7 @@ sub initrd {
     install_stripped("$instdir/init", "$mnt/sbin");
     install_stripped("$instdir/$install", "$mnt/sbin/stage1");
 
-    if (member($type, qw(network usb all other blank))) {
+    if (member($type, qw(network network_gigabit_usb all blank))) {
 	install_stripped("$instdir/ppp/pppd-bin", "$mnt/sbin/pppd");
 	install_stripped("$instdir/rp-pppoe/pppoe-bin", "$mnt/sbin/pppoe");
 	_ "$sudo mknod $mnt/dev/ppp c 108 0";
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile
index 68505ff7c..75c00c0ef 100644
--- a/mdk-stage1/Makefile
+++ b/mdk-stage1/Makefile
@@ -113,17 +113,17 @@ CDROM_DEFS = -DDISABLE_DISK -DDISABLE_NETWORK
 
 
 STAGE1OBJS-DISK = $(subst .c,-DISK.o,$(STAGE1SRC) $(DISKSRC))
+STAGE1OBJS-DISK-USB = $(subst .c,-DISK-USB.o,$(STAGE1SRC) $(DISKSRC))
 
 DISK_DEFS = -DDISABLE_CDROM -DDISABLE_NETWORK
 
 
 STAGE1OBJS-NETWORK = $(subst .c,-NETWORK.o,$(STAGE1SRC) $(NETWORKSRC))
+STAGE1OBJS-NETWORK-USB = $(subst .c,-NETWORK-USB.o,$(STAGE1SRC) $(NETWORKSRC))
 
 NETWORK_DEFS = -DDISABLE_CDROM -DDISABLE_DISK
 
 
-STAGE1OBJS-USB = $(subst .c,-USB.o,$(STAGE1SRC) $(CDROMSRC) $(DISKSRC) $(NETWORKSRC))
-
 STAGE1OBJS-FULL = $(subst .c,-FULL.o,$(STAGE1SRC) $(CDROMSRC) $(DISKSRC) $(NETWORKSRC))
 
 
@@ -143,7 +143,7 @@ endif
 BINS = init stage1-full
 
 ifeq (i386, $(ARCH))
-BINS += stage1-cdrom stage1-disk stage1-network stage1-usb
+BINS += stage1-cdrom stage1-disk stage1-network stage1-network-usb stage1-disk-usb
 endif
 
 ifneq (ia64, $(ARCH))
@@ -185,11 +185,15 @@ stage1-disk: $(STAGE1OBJS-DISK) $(STAGE1_OWN_LIBS) $(FRONTEND_LINK) $(STAGE1_LIB
 	$(CC) $(LDFLAGS_STAGE1) -o $@ $^
 	$(STRIPCMD) $@
 
+stage1-disk-usb: $(STAGE1OBJS-DISK-USB) $(STAGE1_OWN_LIBS) $(FRONTEND_LINK) $(STAGE1_LIBC)
+	$(CC) $(LDFLAGS_STAGE1) -o $@ $^
+	$(STRIPCMD) $@
+
 stage1-network: $(STAGE1OBJS-NETWORK) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC)
 	$(CC) $(LDFLAGS_STAGE1) -o $@ $^
 	$(STRIPCMD) $@
 
-stage1-usb: $(STAGE1OBJS-USB) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(STAGE1_LIBC)
+stage1-network-usb: $(STAGE1OBJS-NETWORK-USB) $(STAGE1_OWN_LIBS) $(STAGE1_NETWORK_LIBS) $(FRONTEND_LINK) $(PCMCIA_LIB) $(STAGE1_LIBC)
 	$(CC) $(LDFLAGS_STAGE1) -o $@ $^
 	$(STRIPCMD) $@
 
@@ -207,11 +211,14 @@ $(STAGE1OBJS-CDROM): %-CDROM.o: %.c
 $(STAGE1OBJS-DISK): %-DISK.o: %.c
 	$(COMPILE) $(INCLUDES) $(DISK_DEFS) -c $< -o $@
 
+$(STAGE1OBJS-DISK-USB): %-DISK-USB.o: %.c
+	$(COMPILE) $(INCLUDES) $(DISK_DEFS) $(USB_DEFS_GEN) -c $< -o $@
+
 $(STAGE1OBJS-NETWORK): %-NETWORK.o: %.c
 	$(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(PCMCIA_DEFS) -c $< -o $@
 
-$(STAGE1OBJS-USB): %-USB.o: %.c
-	$(COMPILE) $(INCLUDES) $(USB_DEFS) -c $< -o $@
+$(STAGE1OBJS-NETWORK-USB): %-NETWORK-USB.o: %.c
+	$(COMPILE) $(INCLUDES) $(NETWORK_DEFS) $(USB_DEFS_GEN) -c $< -o $@
 
 $(STAGE1OBJS-FULL): %-FULL.o: %.c
 	$(COMPILE) $(INCLUDES) $(USB_DEFS_GEN) $(PCMCIA_DEFS) -c $< -o $@