← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to arch/s390/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno, Martin Michlmayr
  • Date: 2011-04-06 13:53:30 UTC
  • mfrom: (43.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20110406135330-wjufxhd0tvn3zx4z
Tags: 2.6.38-3
http://bugs.debian.org/620124
http://bugs.debian.org/620284
http://bugs.debian.org/620204
[ Ben Hutchings ]
* [ppc64] Add to linux-tools package architectures (Closes: #620124)
* [amd64] Save cr4 to mmu_cr4_features at boot time (Closes: #620284)
* appletalk: Fix bugs introduced when removing use of BKL
* ALSA: Fix yet another race in disconnection
* cciss: Fix lost command issue
* ath9k: Fix kernel panic in AR2427
* ses: Avoid kernel panic when lun 0 is not mapped
* PCI/ACPI: Report ASPM support to BIOS if not disabled from command line

[ Aurelien Jarno ]
* rtlwifi: fix build when PCI is not enabled.

[ Martin Michlmayr ]
* rtlwifi: Eliminate udelay calls with too large values (Closes: #620204)

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/s390/Makefile
14
14
#
15
15
 
16
16
ifndef CONFIG_64BIT
 
17
LD_BFD          := elf32-s390
17
18
LDFLAGS         := -m elf_s390
18
19
KBUILD_CFLAGS   += -m31
19
20
KBUILD_AFLAGS   += -m31
21
22
STACK_SIZE      := 8192
22
23
CHECKFLAGS      += -D__s390__ -msize-long
23
24
else
 
25
LD_BFD          := elf64-s390
24
26
LDFLAGS         := -m elf64_s390
25
 
MODFLAGS        += -fpic -D__PIC__
 
27
KBUILD_AFLAGS_MODULE += -fpic -D__PIC__
 
28
KBUILD_CFLAGS_MODULE += -fpic -D__PIC__
26
29
KBUILD_CFLAGS   += -m64
27
30
KBUILD_AFLAGS   += -m64
28
31
UTS_MACHINE     := s390x
30
33
CHECKFLAGS      += -D__s390__ -D__s390x__
31
34
endif
32
35
 
 
36
export LD_BFD
 
37
 
33
38
cflags-$(CONFIG_MARCH_G5)   += $(call cc-option,-march=g5)
34
39
cflags-$(CONFIG_MARCH_Z900) += $(call cc-option,-march=z900)
35
40
cflags-$(CONFIG_MARCH_Z990) += $(call cc-option,-march=z990)
36
41
cflags-$(CONFIG_MARCH_Z9_109) += $(call cc-option,-march=z9-109)
37
42
cflags-$(CONFIG_MARCH_Z10) += $(call cc-option,-march=z10)
 
43
cflags-$(CONFIG_MARCH_Z196) += $(call cc-option,-march=z196)
38
44
 
39
45
#KBUILD_IMAGE is necessary for make rpm
40
46
KBUILD_IMAGE    :=arch/s390/boot/image
85
91
OBJCOPYFLAGS    := -O binary
86
92
LDFLAGS_vmlinux := -e start
87
93
 
88
 
head-y          := arch/s390/kernel/head.o arch/s390/kernel/init_task.o
 
94
head-y          := arch/s390/kernel/head.o
 
95
head-y          += arch/s390/kernel/$(if $(CONFIG_64BIT),head64.o,head31.o)
 
96
head-y          += arch/s390/kernel/init_task.o
89
97
 
90
 
core-y          += arch/s390/mm/ arch/s390/kernel/ arch/s390/crypto/ \
91
 
                   arch/s390/appldata/ arch/s390/hypfs/ arch/s390/kvm/
 
98
# See arch/s390/Kbuild for content of core part of the kernel
 
99
core-y          += arch/s390/
92
100
 
93
101
libs-y          += arch/s390/lib/
94
102
drivers-y       += drivers/s390/
99
107
 
100
108
boot            := arch/s390/boot
101
109
 
102
 
all: image
 
110
all: image bzImage
103
111
 
104
112
install: vmlinux
105
113
        $(Q)$(MAKE) $(build)=$(boot) $@
106
114
 
107
 
image: vmlinux
 
115
image bzImage: vmlinux
108
116
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
109
117
 
110
118
zfcpdump:
111
119
        $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
112
120
 
 
121
vdso_install:
 
122
ifeq ($(CONFIG_64BIT),y)
 
123
        $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@
 
124
endif
 
125
        $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@
 
126
 
113
127
archclean:
114
128
        $(Q)$(MAKE) $(clean)=$(boot)
115
129
 
116
130
# Don't use tabs in echo arguments
117
131
define archhelp
118
132
  echo  '* image           - Kernel image for IPL ($(boot)/image)'
 
133
  echo  '* bzImage         - Compressed kernel image for IPL ($(boot)/bzImage)'
119
134
endef