Updates files under arch/i386/boot98 in 2.5.50-ac1.
- Osamu Tomita
diff -Nru linux-2.5.50-ac1/arch/i386/boot98/Makefile linux-2.5.54/arch/i386/boot98/Makefile
--- linux-2.5.50-ac1/arch/i386/boot98/Makefile 2002-12-16 09:15:54.000000000 +0900
+++ linux-2.5.54/arch/i386/boot98/Makefile 2003-01-02 12:21:49.000000000 +0900
@@ -32,12 +32,6 @@
host-progs := tools/build
-# Default
-
-boot: bzImage
-
-include $(TOPDIR)/Rules.make
-
# ---------------------------------------------------------------------------
$(obj)/zImage: IMAGE_OFFSET := 0x1000
@@ -53,6 +47,7 @@
$(obj)/zImage $(obj)/bzImage: $(obj)/bootsect $(obj)/setup \
$(obj)/vmlinux.bin $(obj)/tools/build FORCE
$(call if_changed,image)
+ @echo 'Kernel: $@ is ready'
$(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE
$(call if_changed,objcopy)
@@ -64,9 +59,8 @@
$(call if_changed,ld)
$(obj)/compressed/vmlinux: FORCE
- +@$(call descend,$(obj)/compressed,IMAGE_OFFSET=$(IMAGE_OFFSET) \
- $(obj)/compressed/vmlinux)
-
+ $(Q)$(MAKE) -f scripts/Makefile.build obj=$(obj)/compressed \
+ IMAGE_OFFSET=$(IMAGE_OFFSET) $@
zdisk: $(BOOTIMAGE)
dd bs=8192 if=$(BOOTIMAGE) of=/dev/fd0
@@ -80,11 +74,3 @@
install: $(BOOTIMAGE)
sh $(src)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map "$(INSTALL_PATH)"
-
-archhelp:
- @echo '* bzImage - Compressed kernel image (arch/$(ARCH)/boot/bzImage)'
- @echo ' install - Install kernel using'
- @echo ' (your) ~/bin/installkernel or'
- @echo ' (distribution) /sbin/installkernel or'
- @echo ' install to $$(INSTALL_PATH) and run lilo'
-
diff -Nru linux-2.5.50-ac1/arch/i386/boot98/compressed/Makefile linux-2.5.52/arch/i386/boot98/compressed/Makefile
--- linux-2.5.50-ac1/arch/i386/boot98/compressed/Makefile 2002-12-16 09:15:54.000000000 +0900
+++ linux-2.5.52/arch/i386/boot98/compressed/Makefile 2002-12-16 11:08:13.000000000 +0900
@@ -7,12 +7,11 @@
EXTRA_TARGETS := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
EXTRA_AFLAGS := -traditional
-include $(TOPDIR)/Rules.make
-
LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup_32
$(obj)/vmlinux: $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE
$(call if_changed,ld)
+ @:
$(obj)/vmlinux.bin: vmlinux FORCE
$(call if_changed,objcopy)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/