Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied...

[linux-drm-fsl-dcu.git] / arch / s390 / Makefile

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 74ef57dcfa60b5bb9527d6651440995851aa9ebd..68441e0e74b642d4d704e1b42b29c8307c938442 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -33,6 +33,10 @@ endif
 cflags-$(CONFIG_MARCH_G5)   += $(call cc-option,-march=g5)
 cflags-$(CONFIG_MARCH_Z900) += $(call cc-option,-march=z900)
 cflags-$(CONFIG_MARCH_Z990) += $(call cc-option,-march=z990)
+cflags-$(CONFIG_MARCH_Z9_109) += $(call cc-option,-march=z9-109)
+
+#KBUILD_IMAGE is necessary for make rpm
+KBUILD_IMAGE   :=arch/s390/boot/image
 
 #
 # Prevent tail-call optimizations, to get clearer backtraces:
@@ -63,8 +67,10 @@ endif
 
 ifeq ($(call cc-option-yn,-mstack-size=8192 -mstack-guard=128),y)
 cflags-$(CONFIG_CHECK_STACK) += -mstack-size=$(STACK_SIZE)
+ifneq ($(call cc-option-yn,-mstack-size=8192),y)
 cflags-$(CONFIG_CHECK_STACK) += -mstack-guard=$(CONFIG_STACK_GUARD)
 endif
+endif
 
 ifeq ($(call cc-option-yn,-mwarn-dynamicstack),y)
 cflags-$(CONFIG_WARN_STACK) += -mwarn-dynamicstack
@@ -78,18 +84,18 @@ AFLAGS              += $(aflags-y)
 OBJCOPYFLAGS   := -O binary
 LDFLAGS_vmlinux := -e start
 
-head-y         := arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o
+head-y         := arch/s390/kernel/head.o arch/s390/kernel/init_task.o
 
-core-y         += arch/$(ARCH)/mm/ arch/$(ARCH)/kernel/ arch/$(ARCH)/crypto/ \
-                  arch/$(ARCH)/appldata/ arch/$(ARCH)/hypfs/
-libs-y         += arch/$(ARCH)/lib/
+core-y         += arch/s390/mm/ arch/s390/kernel/ arch/s390/crypto/ \
+                  arch/s390/appldata/ arch/s390/hypfs/
+libs-y         += arch/s390/lib/
 drivers-y      += drivers/s390/
-drivers-$(CONFIG_MATHEMU) += arch/$(ARCH)/math-emu/
+drivers-$(CONFIG_MATHEMU) += arch/s390/math-emu/
 
 # must be linked after kernel
 drivers-$(CONFIG_OPROFILE)     += arch/s390/oprofile/
 
-boot           := arch/$(ARCH)/boot
+boot           := arch/s390/boot
 
 all: image
 
@@ -99,6 +105,9 @@ install: vmlinux
 image: vmlinux
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
+zfcpdump:
+       $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
+
 archclean:
        $(Q)$(MAKE) $(clean)=$(boot)