vserver 1.9.3

[linux-2.6.git] / arch / ppc64 / boot / Makefile

diff --git a/arch/ppc64/boot/Makefile b/arch/ppc64/boot/Makefile
index 9d6431d..8f99c9d 100644 (file)
--- a/arch/ppc64/boot/Makefile
+++ b/arch/ppc64/boot/Makefile
@@ -25,11 +25,11 @@ CROSS32_COMPILE ?=
 
 BOOTCC         := $(CROSS32_COMPILE)gcc
 HOSTCC         := gcc
-BOOTCFLAGS     := $(HOSTCFLAGS) -Iinclude -fno-builtin 
+BOOTCFLAGS     := $(HOSTCFLAGS) $(LINUXINCLUDE) -fno-builtin 
 BOOTAS         := $(CROSS32_COMPILE)as
 BOOTAFLAGS     := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional
 BOOTLD         := $(CROSS32_COMPILE)ld
-BOOTLFLAGS     := -Ttext 0x00400000 -e _start -T $(obj)/zImage.lds
+BOOTLFLAGS     := -Ttext 0x00400000 -e _start -T $(srctree)/$(src)/zImage.lds
 BOOTOBJCOPY    := $(CROSS32_COMPILE)objcopy
 OBJCOPYFLAGS    := contents,alloc,load,readonly,data
 
@@ -51,36 +51,31 @@ $(patsubst %.S,%.o, $(filter %.S, $(src-boot))): %.o: %.S
 #-----------------------------------------------------------
 # ELF sections within the zImage bootloader/wrapper
 #-----------------------------------------------------------
-required := vmlinux .config System.map
+required := vmlinux.strip
 initrd   := initrd
 
 obj-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.o, $(section)))
 src-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.c, $(section)))
 gz-sec  = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.gz, $(section)))
 
-host-progs             := piggy addnote addSystemMap addRamDisk
+hostprogs-y            := piggy addnote addRamDisk
 targets                += zImage zImage.initrd imagesize.c \
                           $(patsubst $(obj)/%,%, $(call obj-sec, $(required) $(initrd))) \
                           $(patsubst $(obj)/%,%, $(call src-sec, $(required) $(initrd))) \
                           $(patsubst $(obj)/%,%, $(call gz-sec, $(required) $(initrd))) \
-                          vmlinux.sm vmlinux.initrd vmlinux.sminitrd
-extra-y                        := sysmap.o initrd.o
-
-quiet_cmd_sysmap = SYSMAP   $@
-      cmd_sysmap = $(obj)/addSystemMap System.map $< $@
-$(obj)/vmlinux.sm: vmlinux $(obj)/addSystemMap System.map FORCE
-       $(call if_changed,sysmap)
+                          vmlinux.initrd
+extra-y                        := initrd.o
 
 quiet_cmd_ramdisk = RAMDISK $@
-      cmd_ramdisk = $(obj)/addRamDisk $(obj)/ramdisk.image.gz System.map $< $@
-$(obj)/vmlinux.initrd: vmlinux $(obj)/addRamDisk $(obj)/ramdisk.image.gz System.map FORCE
-       $(call if_changed,ramdisk)
+      cmd_ramdisk = $(obj)/addRamDisk $(obj)/ramdisk.image.gz $< $@
 
-$(obj)/vmlinux.sminitrd: $(obj)/vmlinux.sm $(obj)/addRamDisk $(obj)/ramdisk.image.gz FORCE
-       $(call if_changed,ramdisk)
+quiet_cmd_stripvm = STRIP $@
+      cmd_stripvm = $(STRIP) -s $< -o $@
 
-$(obj)/sysmap.o: System.map $(obj)/piggyback FORCE
-       $(call if_changed,piggy)
+vmlinux.strip: vmlinux FORCE
+       $(call if_changed,stripvm)
+$(obj)/vmlinux.initrd: vmlinux.strip $(obj)/addRamDisk $(obj)/ramdisk.image.gz FORCE
+       $(call if_changed,ramdisk)
 
 addsection = $(BOOTOBJCOPY) $(1) \
                --add-section=.kernel:$(strip $(patsubst $(obj)/kernel-%.o,%, $(1)))=$(patsubst %.o,%.gz, $(1)) \
@@ -113,9 +108,9 @@ $(obj)/zImage.initrd: obj-boot += $(call obj-sec, $(required) $(initrd))
 $(obj)/zImage.initrd: $(call obj-sec, $(required) $(initrd)) $(obj-boot) $(obj)/addnote FORCE
        $(call if_changed,addnote)
 
-$(obj)/imagesize.c: vmlinux
+$(obj)/imagesize.c: vmlinux.strip
        @echo Generating $@
-       ls -l vmlinux | \
+       ls -l vmlinux.strip | \
        awk '{printf "/* generated -- do not edit! */\n" \
                "unsigned long vmlinux_filesize = %d;\n", $$5}' > $(obj)/imagesize.c
        $(CROSS_COMPILE)nm -n vmlinux | tail -n 1 | \
@@ -123,6 +118,6 @@ $(obj)/imagesize.c: vmlinux
                >> $(obj)/imagesize.c
 
 install: $(CONFIGURE) $(obj)/$(BOOTIMAGE)
-       sh -x $(src)/install.sh "$(KERNELRELEASE)" "$(obj)/$(BOOTIMAGE)" "$(TOPDIR)/System.map" "$(INSTALL_PATH)"
+       sh -x $(src)/install.sh "$(KERNELRELEASE)" "$(obj)/$(BOOTIMAGE)" "$(INSTALL_PATH)"
 
-clean-files := $(patsubst $(obj)/%,%, $(obj-boot))
+clean-files := $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip)