summaryrefslogtreecommitdiffstats
path: root/arch/i386/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-05-07 02:55:41 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-05-07 02:55:41 +0000
commitdcec8a13bf565e47942a1751a9cec21bec5648fe (patch)
tree548b69625b18cc2e88c3e68d0923be546c9ebb03 /arch/i386/Makefile
parent2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff)
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash. o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'arch/i386/Makefile')
-rw-r--r--arch/i386/Makefile17
1 files changed, 7 insertions, 10 deletions
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 359c20b9b..98bde850f 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -58,9 +58,6 @@ SUBDIRS := $(SUBDIRS) arch/i386/math-emu
DRIVERS := $(DRIVERS) arch/i386/math-emu/math.a
endif
-memsize: dummy
- @echo "__kernel_offset__ = (0x1000-$(CONFIG_MAX_MEMSIZE))*1024*1024;" > arch/i386/.kernel_offset.lds
-
arch/i386/kernel: dummy
$(MAKE) linuxsubdirs SUBDIRS=arch/i386/kernel
@@ -69,27 +66,27 @@ arch/i386/mm: dummy
MAKEBOOT = $(MAKE) -C arch/$(ARCH)/boot
-zImage: memsize vmlinux
+zImage: vmlinux
@$(MAKEBOOT) zImage
-bzImage: memsize vmlinux
+bzImage: vmlinux
@$(MAKEBOOT) bzImage
compressed: zImage
-zlilo: memsize vmlinux
+zlilo: vmlinux
@$(MAKEBOOT) BOOTIMAGE=zImage zlilo
-bzlilo: memsize vmlinux
+bzlilo: vmlinux
@$(MAKEBOOT) BOOTIMAGE=bzImage zlilo
-zdisk: memsize vmlinux
+zdisk: vmlinux
@$(MAKEBOOT) BOOTIMAGE=zImage zdisk
-bzdisk: memsize vmlinux
+bzdisk: vmlinux
@$(MAKEBOOT) BOOTIMAGE=bzImage zdisk
-install: memsize vmlinux
+install: vmlinux
@$(MAKEBOOT) BOOTIMAGE=bzImage install
archclean: