summaryrefslogtreecommitdiffstats
path: root/arch/i386/boot/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-01-07 02:33:00 +0000
committer <ralf@linux-mips.org>1997-01-07 02:33:00 +0000
commitbeb116954b9b7f3bb56412b2494b562f02b864b1 (patch)
tree120e997879884e1b9d93b265221b939d2ef1ade1 /arch/i386/boot/Makefile
parent908d4681a1dc3792ecafbe64265783a86c4cccb6 (diff)
Import of Linux/MIPS 2.1.14
Diffstat (limited to 'arch/i386/boot/Makefile')
-rw-r--r--arch/i386/boot/Makefile54
1 files changed, 44 insertions, 10 deletions
diff --git a/arch/i386/boot/Makefile b/arch/i386/boot/Makefile
index b6a5f1c15..503b0cce6 100644
--- a/arch/i386/boot/Makefile
+++ b/arch/i386/boot/Makefile
@@ -8,23 +8,43 @@
# Copyright (C) 1994 by Linus Torvalds
#
-AS86 =as86 -0 -a
-LD86 =ld86 -0
+HOSTCFLAGS := $(HOSTCFLAGS) -D__BFD__
+
+ifdef SMP
+HOSTCFLAGS := $(HOSTCFLAGS) -D__SMP__
+endif
zImage: $(CONFIGURE) bootsect setup compressed/vmlinux tools/build
- tools/build bootsect setup compressed/vmlinux $(ROOT_DEV) > zImage
+ if hash $(ENCAPS) 2> /dev/null; then \
+ $(OBJDUMP) $(OBJDUMP_FLAGS) -o $(ZIMAGE_OFFSET) compressed/vmlinux > compressed/vmlinux.out; \
+ else \
+ $(OBJCOPY) compressed/vmlinux compressed/vmlinux.out; \
+ fi
+ tools/build bootsect setup compressed/vmlinux.out $(ROOT_DEV) > zImage
+ sync
+
+bzImage: $(CONFIGURE) bbootsect setup compressed/bvmlinux tools/bbuild
+ if hash $(ENCAPS) 2> /dev/null; then \
+ $(OBJDUMP) $(OBJDUMP_FLAGS) -o $(BZIMAGE_OFFSET) compressed/bvmlinux > compressed/bvmlinux.out; \
+ else \
+ $(OBJCOPY) compressed/bvmlinux compressed/bvmlinux.out; \
+ fi
+ tools/bbuild bbootsect setup compressed/bvmlinux.out $(ROOT_DEV) > bzImage
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
-zlilo: $(CONFIGURE) zImage
+zdisk: $(BOOTIMAGE)
+ dd bs=8192 if=$(BOOTIMAGE) of=/dev/fd0
+
+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
@@ -32,7 +52,10 @@ install: $(CONFIGURE) zImage
sh ./install.sh $(VERSION).$(PATCHLEVEL).$(SUBLEVEL) zImage $(TOPDIR)/System.map "$(INSTALL_PATH)"
tools/build: tools/build.c
- $(HOSTCC) $(CFLAGS) -o $@ $< -I$(TOPDIR)/include
+ $(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 $@ $<
@@ -40,7 +63,7 @@ setup: setup.o
setup.o: setup.s
$(AS86) -o $@ $<
-setup.s: setup.S $(CONFIGURE) $(TOPDIR)/include/linux/config.h Makefile
+setup.s: setup.S video.S $(CONFIGURE) $(TOPDIR)/include/linux/config.h Makefile
$(CPP) -traditional $(SVGA_MODE) $(RAMDISK) $< -o $@
bootsect: bootsect.o
@@ -52,9 +75,20 @@ bootsect.o: bootsect.s
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
+ rm -f bbootsect
+ rm -f zImage tools/build compressed/vmlinux.out
+ rm -f bzImage tools/bbuild compressed/bvmlinux.out
@$(MAKE) -C compressed clean