diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-04 07:59:13 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-04 07:59:13 -0400 |
| commit | 772320e84588dcbe1600ffb83e5f328f2209ac2a (patch) | |
| tree | a7de21b79340aeaa17c58126f6b801b82c77b53a /arch/s390/boot/Makefile | |
| parent | 1ce53adf13a54375d2a5c7cdbe341b2558389615 (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge commit 'v2.6.35' into kbuild/kbuild
Conflicts:
arch/powerpc/Makefile
Diffstat (limited to 'arch/s390/boot/Makefile')
| -rw-r--r-- | arch/s390/boot/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile index 4d97eef36b8d..8800cf090694 100644 --- a/arch/s390/boot/Makefile +++ b/arch/s390/boot/Makefile | |||
| @@ -9,10 +9,18 @@ COMPILE_VERSION := __linux_compile_version_id__`hostname | \ | |||
| 9 | EXTRA_CFLAGS := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I. | 9 | EXTRA_CFLAGS := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I. |
| 10 | 10 | ||
| 11 | targets := image | 11 | targets := image |
| 12 | targets += bzImage | ||
| 13 | subdir- := compressed | ||
| 12 | 14 | ||
| 13 | $(obj)/image: vmlinux FORCE | 15 | $(obj)/image: vmlinux FORCE |
| 14 | $(call if_changed,objcopy) | 16 | $(call if_changed,objcopy) |
| 15 | 17 | ||
| 18 | $(obj)/bzImage: $(obj)/compressed/vmlinux FORCE | ||
| 19 | $(call if_changed,objcopy) | ||
| 20 | |||
| 21 | $(obj)/compressed/vmlinux: FORCE | ||
| 22 | $(Q)$(MAKE) $(build)=$(obj)/compressed $@ | ||
| 23 | |||
| 16 | install: $(CONFIGURE) $(obj)/image | 24 | install: $(CONFIGURE) $(obj)/image |
| 17 | sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/image \ | 25 | sh -x $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/image \ |
| 18 | System.map Kerntypes "$(INSTALL_PATH)" | 26 | System.map Kerntypes "$(INSTALL_PATH)" |