[PATCH] s390: Makefiles.

Makefile changes by Sam Ravnborg. Summary of changes:
o Added FORCE prerequisite in boot/Makefile
o Do not use shorthand targets when calling the boot/Makefile
o No longer use BOOT_IMAGE, not needed now
o Use kbuild clean infrastructure when cleaning up in boot
o Offset generation shrinked with one rule
o removed inclusion of Rules.make in all Makefiles
o no longer use the descend macro, use $(Q)$(MAKE) as replacement

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 78aad352ce0697ac0e8cf683b161db9d98877d74..67e82769a2f0d41a79a61c9fedbb0624c322ce7e 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -20,36 +20,37 @@ LDFLAGS_BLOB        := --format binary --oformat elf32-s390
 
 CFLAGS += -pipe -fno-strength-reduce
 
-HEAD := arch/s390/kernel/head.o arch/s390/kernel/init_task.o
+HEAD := arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o
 
-core-y                         += arch/s390/mm/ arch/s390/kernel/
-drivers-y                      += drivers/s390/
-drivers-$(CONFIG_MATHEMU)      += arch/s390/math-emu/
-libs-y                         += arch/s390/lib/
+core-y         += arch/$(ARCH)/mm/ arch/$(ARCH)/kernel/
+libs-y         += arch/$(ARCH)/lib/
+drivers-y      += drivers/s390/
+drivers-$(CONFIG_MATHEMU) += arch/$(ARCH)/math-emu/
+
+
+makeboot =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/$(ARCH)/boot $(1)
 
 all: image listing
 
-makeboot = $(call descend,arch/$(ARCH)/boot,$(1))
-BOOTIMAGE= arch/$(ARCH)/boot/image
+listing image: vmlinux
+       $(call makeboot,arch/$(ARCH)/boot/$@)
 
-listing install image: vmlinux
-       +@$(call makeboot,BOOTIMAGE=$(BOOTIMAGE) $@)
+install: vmlinux
+       $(call makeboot, $@)
 
+archmrproper:
 archclean:
-       +@$(call makeboot,clean)
+       $(Q)$(MAKE) -f scripts/Makefile.clean obj=arch/$(ARCH)/boot
 
-archmrproper:
 
 prepare: include/asm-$(ARCH)/offsets.h
 
 arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
                                   include/config/MARKER
 
-include/asm-$(ARCH)/offsets.h.tmp: arch/$(ARCH)/kernel/asm-offsets.s
-       @$(generate-asm-offsets.h) < $< > $@
-
-include/asm-$(ARCH)/offsets.h: include/asm-$(ARCH)/offsets.h.tmp
+include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
        @echo -n '  Generating $@'
+       @$(generate-asm-offsets.h) < $< > $@.tmp
        @$(update-if-changed)
 
 CLEAN_FILES += include/asm-$(ARCH)/offsets.h.tmp \

diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile
index 322943f0f239ea67c2b13f68b8d71da1b462fe9e..5c364fb0dde580e85caf6f06490841ff7dab9a6d 100644 (file)
--- a/arch/s390/boot/Makefile
+++ b/arch/s390/boot/Makefile
@@ -2,26 +2,21 @@
 # Makefile for the linux s390-specific parts of the memory manager.
 #
 
-EXTRA_AFLAGS := -traditional
+EXTRA_TARGETS := image listing
+EXTRA_AFLAGS  := -traditional
 
-include $(TOPDIR)/Rules.make
 
-quiet_cmd_listing = OBJDUMP $(echo_target)
-cmd_listing      = $(OBJDUMP) --disassemble --disassemble-all \
-                       --disassemble-zeroes --reloc vmlinux > $@
+quiet_cmd_listing = OBJDUMP $@
+      cmd_listing = $(OBJDUMP) --disassemble --disassemble-all \
+                              --disassemble-zeroes --reloc vmlinux > $@
 
-$(obj)/image: vmlinux
+$(obj)/image: vmlinux FORCE
        $(call if_changed,objcopy)
 
-$(obj)/listing: vmlinux
+$(obj)/listing: vmlinux FORCE
        $(call if_changed,listing)
 
-image: $(obj)/image
 
-listing: $(obj)/listing
-
-clean:
-       rm -f $(obj)/image $(obj)/listing
-
-install: $(CONFIGURE) $(BOOTIMAGE)
-       sh -x $(obj)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map Kerntypes "$(INSTALL_PATH)"
+install: $(CONFIGURE) $(obj)/image
+       sh -x $(obj)/install.sh $(KERNELRELEASE) $(obj)/image \
+             System.map Kerntypes "$(INSTALL_PATH)"

diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index 20ebed299095539624dbec4c1aeca5c530d31eaf..770b544d333eb2ddad2cdd7e1f5df1be84d98334 100644 (file)
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -321,6 +321,8 @@ CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_DES is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
 # CONFIG_CRYPTO_TEST is not set
 
 #

diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index f771591a94c5409426a9f6d86076b3867ae3001c..527a4febcc08bd1ef4e4b4ac51ba67b67f3f67c6 100644 (file)
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -17,5 +17,3 @@ obj-$(CONFIG_SMP)             += smp.o
 # Kernel debugging
 #
 obj-$(CONFIG_REMOTE_DEBUG)     += gdb-stub.o #gdb-low.o 
-
-include $(TOPDIR)/Rules.make

diff --git a/arch/s390/lib/Makefile b/arch/s390/lib/Makefile
index 4972d861f0bd1ac8b75eff4a5fdca9eafedfd62e..1c43a04ee3ccdca96daf113f56bc221bd94f8e80 100644 (file)
--- a/arch/s390/lib/Makefile
+++ b/arch/s390/lib/Makefile
@@ -7,6 +7,3 @@ L_TARGET = lib.a
 EXTRA_AFLAGS := -traditional
 
 obj-y = delay.o memset.o strcmp.o strncpy.o uaccess.o
-
-include $(TOPDIR)/Rules.make
-

diff --git a/arch/s390/math-emu/Makefile b/arch/s390/math-emu/Makefile
index a79ab96c66a41a8e10274956d747de903a672cd3..c10df144f2ab44fe298b60ab1192ad08d8edd115 100644 (file)
--- a/arch/s390/math-emu/Makefile
+++ b/arch/s390/math-emu/Makefile
@@ -4,9 +4,5 @@
 
 obj-$(CONFIG_MATHEMU) := math.o qrnnd.o
 
-EXTRA_CFLAGS = -I. -I$(TOPDIR)/include/math-emu -w
-EXTRA_AFLAGS   := -traditional
-
-include $(TOPDIR)/Rules.make
-
-
+EXTRA_CFLAGS := -I$(src) -Iinclude/math-emu -w
+EXTRA_AFLAGS := -traditional

diff --git a/arch/s390/mm/Makefile b/arch/s390/mm/Makefile
index 4e5305ea56433e7ed6d9b147f0b00b8f1d9ae6f3..2e0c10b51d84d2577929c19203a2b2e441471014 100644 (file)
--- a/arch/s390/mm/Makefile
+++ b/arch/s390/mm/Makefile
@@ -3,5 +3,3 @@
 #
 
 obj-y   := init.o fault.o ioremap.o extable.o
-
-include $(TOPDIR)/Rules.make

diff --git a/arch/s390x/Makefile b/arch/s390x/Makefile
index a110b8bc2389e1ca477927313d04b3bfd3e562d1..fdb57f106e78d677995128d4e8bb02ffe66c896d 100644 (file)
--- a/arch/s390x/Makefile
+++ b/arch/s390x/Makefile
@@ -21,35 +21,36 @@ LDFLAGS_BLOB        := --format binary --oformat elf64-s390
 
 CFLAGS += -pipe -fno-strength-reduce
 
-HEAD := arch/s390x/kernel/head.o arch/s390x/kernel/init_task.o
+HEAD := arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o
 
-core-y         += arch/s390x/mm/ arch/s390x/kernel/
+core-y         += arch/$(ARCH)/mm/ arch/$(ARCH)/kernel/
+libs-y         += arch/$(ARCH)/lib/
 drivers-y      += drivers/s390/
-libs-y         += arch/s390x/lib/
+
+
+makeboot =$(Q)$(MAKE) -f scripts/Makefile.build obj=arch/$(ARCH)/boot $(1)
 
 all: image listing
 
-makeboot = $(call descend,arch/$(ARCH)/boot,$(1))
-BOOTIMAGE= arch/$(ARCH)/boot/image
+listing image: vmlinux
+       $(call makeboot,arch/$(ARCH)/boot/$@)
 
-listing install image: vmlinux
-       +@$(call makeboot,BOOTIMAGE=$(BOOTIMAGE) $@)
+install: vmlinux
+       $(call makeboot, $@)
 
+archmrproper:
 archclean:
-       +@$(call makeboot,clean)
+       $(Q)$(MAKE) -f scripts/Makefile.clean obj=arch/$(ARCH)/boot
 
-archmrproper:
 
 prepare: include/asm-$(ARCH)/offsets.h
 
 arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
                                   include/config/MARKER
 
-include/asm-$(ARCH)/offsets.h.tmp: arch/$(ARCH)/kernel/asm-offsets.s
-       @$(generate-asm-offsets.h) < $< > $@
-
-include/asm-$(ARCH)/offsets.h: include/asm-$(ARCH)/offsets.h.tmp
+include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
        @echo -n '  Generating $@'
+       @$(generate-asm-offsets.h) < $< > $@.tmp
        @$(update-if-changed)
 
 CLEAN_FILES += include/asm-$(ARCH)/offsets.h.tmp \

diff --git a/arch/s390x/boot/Makefile b/arch/s390x/boot/Makefile
index 322943f0f239ea67c2b13f68b8d71da1b462fe9e..5c364fb0dde580e85caf6f06490841ff7dab9a6d 100644 (file)
--- a/arch/s390x/boot/Makefile
+++ b/arch/s390x/boot/Makefile
@@ -2,26 +2,21 @@
 # Makefile for the linux s390-specific parts of the memory manager.
 #
 
-EXTRA_AFLAGS := -traditional
+EXTRA_TARGETS := image listing
+EXTRA_AFLAGS  := -traditional
 
-include $(TOPDIR)/Rules.make
 
-quiet_cmd_listing = OBJDUMP $(echo_target)
-cmd_listing      = $(OBJDUMP) --disassemble --disassemble-all \
-                       --disassemble-zeroes --reloc vmlinux > $@
+quiet_cmd_listing = OBJDUMP $@
+      cmd_listing = $(OBJDUMP) --disassemble --disassemble-all \
+                              --disassemble-zeroes --reloc vmlinux > $@
 
-$(obj)/image: vmlinux
+$(obj)/image: vmlinux FORCE
        $(call if_changed,objcopy)
 
-$(obj)/listing: vmlinux
+$(obj)/listing: vmlinux FORCE
        $(call if_changed,listing)
 
-image: $(obj)/image
 
-listing: $(obj)/listing
-
-clean:
-       rm -f $(obj)/image $(obj)/listing
-
-install: $(CONFIGURE) $(BOOTIMAGE)
-       sh -x $(obj)/install.sh $(KERNELRELEASE) $(BOOTIMAGE) System.map Kerntypes "$(INSTALL_PATH)"
+install: $(CONFIGURE) $(obj)/image
+       sh -x $(obj)/install.sh $(KERNELRELEASE) $(obj)/image \
+             System.map Kerntypes "$(INSTALL_PATH)"

diff --git a/arch/s390x/defconfig b/arch/s390x/defconfig
index 50d355e02d09287ba567759119497a2a2b8851c0..3665eb944eb15602addb2fae9affc752093da78f 100644 (file)
--- a/arch/s390x/defconfig
+++ b/arch/s390x/defconfig
@@ -382,6 +382,8 @@ CONFIG_CRYPTO=y
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_DES is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
 # CONFIG_CRYPTO_TEST is not set
 
 #

diff --git a/arch/s390x/kernel/Makefile b/arch/s390x/kernel/Makefile
index 2a8f31e5190911d2310307437edfe7c380572a59..f75b227f8071d70bd3aeec7ef34a6226eba6019c 100644 (file)
--- a/arch/s390x/kernel/Makefile
+++ b/arch/s390x/kernel/Makefile
@@ -24,8 +24,6 @@ obj-$(CONFIG_S390_SUPPORT)    += linux32.o signal32.o ioctl32.o wrapper32.o \
                                         exec32.o exec_domain32.o
 obj-$(CONFIG_BINFMT_ELF32)     += binfmt_elf32.o
 
-include $(TOPDIR)/Rules.make
-
 #
 # This is just to get the dependencies...
 #

diff --git a/arch/s390x/lib/Makefile b/arch/s390x/lib/Makefile
index 4972d861f0bd1ac8b75eff4a5fdca9eafedfd62e..1c43a04ee3ccdca96daf113f56bc221bd94f8e80 100644 (file)
--- a/arch/s390x/lib/Makefile
+++ b/arch/s390x/lib/Makefile
@@ -7,6 +7,3 @@ L_TARGET = lib.a
 EXTRA_AFLAGS := -traditional
 
 obj-y = delay.o memset.o strcmp.o strncpy.o uaccess.o
-
-include $(TOPDIR)/Rules.make
-

diff --git a/arch/s390x/mm/Makefile b/arch/s390x/mm/Makefile
index efc16d7c3a7554a392265282b68a0c29ae0d8589..2e0c10b51d84d2577929c19203a2b2e441471014 100644 (file)
--- a/arch/s390x/mm/Makefile
+++ b/arch/s390x/mm/Makefile
@@ -1,7 +1,5 @@
 #
-# Makefile for the linux i386-specific parts of the memory manager.
+# Makefile for the linux s390-specific parts of the memory manager.
 #
 
 obj-y   := init.o fault.o ioremap.o extable.o
-
-include $(TOPDIR)/Rules.make

diff --git a/drivers/s390/Makefile b/drivers/s390/Makefile
index c7d97f7a1755fa4215ac26cf208016130adb852d..3a35a9fbd8aff7134129b6f049ea7176733a1ca4 100644 (file)
--- a/drivers/s390/Makefile
+++ b/drivers/s390/Makefile
@@ -3,7 +3,7 @@
 #
 
 obj-y += s390mach.o sysinfo.o
-obj-y += cio/ block/ char/ misc/ net/
+obj-y += cio/ block/ char/ net/
 
 drivers-y += drivers/s390/built-in.o
 

diff --git a/drivers/s390/misc/Makefile b/drivers/s390/misc/Makefile
deleted file mode 100644 (file)
index a2c6f43..0000000
--- a/drivers/s390/misc/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# S/390 miscellaneous devices
-#
-
-# placeholder for stuff to come...
-
-include $(TOPDIR)/Rules.make