patch-1.3.73 linux/arch/i386/boot/Makefile

Next file: linux/arch/i386/boot/bootsect.S
Previous file: linux/arch/i386/Makefile
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.72/linux/arch/i386/boot/Makefile linux/arch/i386/boot/Makefile
@@ -25,16 +25,28 @@
 endif
 	sync
 
+bzImage: $(CONFIGURE) bbootsect setup compressed/bvmlinux tools/bbuild
+ifdef CONFIG_KERNEL_ELF
+	$(OBJDUMP) $(OBJDUMP_FLAGS) -o $(IMAGE_OFFSET) compressed/bvmlinux > compressed/bvmlinux.out
+	tools/bbuild bbootsect setup compressed/bvmlinux.out $(ROOT_DEV) > bzImage
+else
+	tools/bbuild bbootsect setup compressed/bvmlinux $(ROOT_DEV) > bzImage
+endif
+	sync
+
 compressed/vmlinux: $(TOPDIR)/vmlinux
 	@$(MAKE) -C compressed vmlinux
 
-zdisk: zImage
-	dd bs=8192 if=zImage of=/dev/fd0
+compressed/bvmlinux: $(TOPDIR)/vmlinux
+	@$(MAKE) -C compressed bvmlinux
+
+zdisk: $(BOOTIMAGE)
+	dd bs=8192 if=$(BOOTIMAGE) of=/dev/fd0
 
-zlilo: $(CONFIGURE) zImage
+zlilo: $(CONFIGURE) $(BOOTIMAGE)
 	if [ -f $(INSTALL_PATH)/vmlinuz ]; then mv $(INSTALL_PATH)/vmlinuz $(INSTALL_PATH)/vmlinuz.old; fi
 	if [ -f $(INSTALL_PATH)/System.map ]; then mv $(INSTALL_PATH)/System.map $(INSTALL_PATH)/System.old; fi
-	cat zImage > $(INSTALL_PATH)/vmlinuz
+	cat $(BOOTIMAGE) > $(INSTALL_PATH)/vmlinuz
 	cp $(TOPDIR)/System.map $(INSTALL_PATH)/
 	if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi
 
@@ -44,6 +56,9 @@
 tools/build: tools/build.c
 	$(HOSTCC) $(HOSTCFLAGS) -o $@ $< -I$(TOPDIR)/include
 
+tools/bbuild: tools/build.c
+	$(HOSTCC) $(HOSTCFLAGS) -D__BIG_KERNEL__ -o $@ $< -I$(TOPDIR)/include
+
 setup: setup.o
 	$(LD86) -s -o $@ $<
 
@@ -62,9 +77,19 @@
 bootsect.s: bootsect.S $(CONFIGURE) $(TOPDIR)/include/linux/config.h Makefile
 	$(CPP) -traditional $(SVGA_MODE) $(RAMDISK) $< -o $@
 
+bbootsect: bbootsect.o
+	$(LD86) -s -o $@ $<
+
+bbootsect.o: bbootsect.s
+	$(AS86) -o $@ $<
+
+bbootsect.s: bootsect.S $(CONFIGURE) $(TOPDIR)/include/linux/config.h Makefile
+	$(CPP) -D__BIG_KERNEL__ -traditional $(SVGA_MODE) $(RAMDISK) $< -o $@
+
 dep:
 
 clean:
 	rm -f bootsect setup
 	rm -f zImage tools/build compressed/vmlinux.out
+	rm -f bzImage tools/bbuild compressed/bvmlinux.out
 	@$(MAKE) -C compressed clean

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this