s390/decompressor: avoid packing *.o.chkbss files into startup.a

[linux-2.6-microblaze.git] / arch / s390 / boot / Makefile

diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile
index 5cf30b7..9e6668e 100644 (file)
--- a/arch/s390/boot/Makefile
+++ b/arch/s390/boot/Makefile
@@ -17,6 +17,8 @@ KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR)
 ifneq ($(CC_FLAGS_MARCH),-march=z900)
 AFLAGS_REMOVE_head.o           += $(CC_FLAGS_MARCH)
 AFLAGS_head.o                  += -march=z900
+AFLAGS_REMOVE_mem.o            += $(CC_FLAGS_MARCH)
+AFLAGS_mem.o                   += -march=z900
 CFLAGS_REMOVE_als.o            += $(CC_FLAGS_MARCH)
 CFLAGS_als.o                   += -march=z900
 CFLAGS_REMOVE_sclp_early_core.o        += $(CC_FLAGS_MARCH)
@@ -25,8 +27,8 @@ endif
 
 CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char
 
-obj-y  := head.o als.o ebcdic.o sclp_early_core.o
-targets        := bzImage setup.a $(obj-y)
+obj-y  := head.o als.o ebcdic.o sclp_early_core.o mem.o
+targets        := bzImage startup.a $(obj-y)
 subdir-        := compressed
 
 OBJECTS := $(addprefix $(obj)/,$(obj-y))
@@ -38,7 +40,7 @@ $(obj)/compressed/vmlinux: $(obj)/startup.a FORCE
        $(Q)$(MAKE) $(build)=$(obj)/compressed $@
 
 quiet_cmd_ar = AR      $@
-      cmd_ar = rm -f $@; $(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(filter-out FORCE, $^)
+      cmd_ar = rm -f $@; $(AR) rcsTP$(KBUILD_ARFLAGS) $@ $(filter $(OBJECTS), $^)
 
 $(obj)/startup.a: $(OBJECTS) FORCE
        $(call if_changed,ar)
@@ -46,3 +48,7 @@ $(obj)/startup.a: $(OBJECTS) FORCE
 install: $(CONFIGURE) $(obj)/bzImage
        sh -x  $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \
              System.map "$(INSTALL_PATH)"
+
+chkbss := $(OBJECTS)
+chkbss-target := $(obj)/startup.a
+include $(srctree)/arch/s390/scripts/Makefile.chkbss