aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Makefile35
-rw-r--r--arch/arm/tools/Makefile1
2 files changed, 20 insertions, 16 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 2f0747744236..359d224c8c3e 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -114,13 +114,16 @@ endif
114 machine-$(CONFIG_ARCH_IOP32X) := iop32x 114 machine-$(CONFIG_ARCH_IOP32X) := iop32x
115 machine-$(CONFIG_ARCH_IOP33X) := iop33x 115 machine-$(CONFIG_ARCH_IOP33X) := iop33x
116 machine-$(CONFIG_ARCH_IOP13XX) := iop13xx 116 machine-$(CONFIG_ARCH_IOP13XX) := iop13xx
117 plat-$(CONFIG_PLAT_IOP) := iop
117 machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx 118 machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx
118 machine-$(CONFIG_ARCH_IXP2000) := ixp2000 119 machine-$(CONFIG_ARCH_IXP2000) := ixp2000
119 machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx 120 machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx
120 machine-$(CONFIG_ARCH_OMAP1) := omap1 121 machine-$(CONFIG_ARCH_OMAP1) := omap1
121 machine-$(CONFIG_ARCH_OMAP2) := omap2 122 machine-$(CONFIG_ARCH_OMAP2) := omap2
122 incdir-$(CONFIG_ARCH_OMAP) := omap 123 incdir-$(CONFIG_ARCH_OMAP) := omap
123 machine-$(CONFIG_ARCH_S3C2410) := s3c2410 124 plat-$(CONFIG_ARCH_OMAP) := omap
125 machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
126 plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx
124 machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x 127 machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x
125 machine-$(CONFIG_ARCH_VERSATILE) := versatile 128 machine-$(CONFIG_ARCH_VERSATILE) := versatile
126 machine-$(CONFIG_ARCH_IMX) := imx 129 machine-$(CONFIG_ARCH_IMX) := imx
@@ -136,9 +139,11 @@ endif
136 machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood 139 machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood
137 machine-$(CONFIG_ARCH_KS8695) := ks8695 140 machine-$(CONFIG_ARCH_KS8695) := ks8695
138 incdir-$(CONFIG_ARCH_MXC) := mxc 141 incdir-$(CONFIG_ARCH_MXC) := mxc
142 plat-$(CONFIG_ARCH_MXC) := mxc
139 machine-$(CONFIG_ARCH_MX2) := mx2 143 machine-$(CONFIG_ARCH_MX2) := mx2
140 machine-$(CONFIG_ARCH_MX3) := mx3 144 machine-$(CONFIG_ARCH_MX3) := mx3
141 machine-$(CONFIG_ARCH_ORION5X) := orion5x 145 machine-$(CONFIG_ARCH_ORION5X) := orion5x
146 plat-$(CONFIG_PLAT_ORION) := orion
142 machine-$(CONFIG_ARCH_MSM7X00A) := msm 147 machine-$(CONFIG_ARCH_MSM7X00A) := msm
143 machine-$(CONFIG_ARCH_LOKI) := loki 148 machine-$(CONFIG_ARCH_LOKI) := loki
144 machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 149 machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0
@@ -154,16 +159,26 @@ endif
154TEXT_OFFSET := $(textofs-y) 159TEXT_OFFSET := $(textofs-y)
155 160
156ifeq ($(incdir-y),) 161ifeq ($(incdir-y),)
157incdir-y := $(machine-y) 162incdir-y := $(word 1,$(machine-y))
158endif 163endif
159INCDIR := arch-$(incdir-y) 164INCDIR := arch-$(incdir-y)
160 165
166# The first directory contains additional information for the boot setup code
161ifneq ($(machine-y),) 167ifneq ($(machine-y),)
162MACHINE := arch/arm/mach-$(machine-y)/ 168MACHINE := arch/arm/mach-$(word 1,$(machine-y))/
163else 169else
164MACHINE := 170MACHINE :=
165endif 171endif
166 172
173machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
174platdirs := $(patsubst %,arch/arm/plat-%/,$(plat-y))
175
176ifeq ($(KBUILD_SRC),)
177KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs))
178else
179KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs))
180endif
181
167export TEXT_OFFSET GZFLAGS MMUEXT 182export TEXT_OFFSET GZFLAGS MMUEXT
168 183
169# Do we have FASTFPE? 184# Do we have FASTFPE?
@@ -174,23 +189,11 @@ endif
174 189
175# If we have a machine-specific directory, then include it in the build. 190# If we have a machine-specific directory, then include it in the build.
176core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/ 191core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/
177core-y += $(MACHINE) 192core-y += $(machdirs) $(platdirs)
178core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2400/
179core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2412/
180core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2440/
181core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2442/
182core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2443/
183core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/ 193core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/
184core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ) 194core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ)
185core-$(CONFIG_VFP) += arch/arm/vfp/ 195core-$(CONFIG_VFP) += arch/arm/vfp/
186 196
187# If we have a common platform directory, then include it in the build.
188core-$(CONFIG_PLAT_IOP) += arch/arm/plat-iop/
189core-$(CONFIG_PLAT_ORION) += arch/arm/plat-orion/
190core-$(CONFIG_ARCH_OMAP) += arch/arm/plat-omap/
191core-$(CONFIG_PLAT_S3C24XX) += arch/arm/plat-s3c24xx/
192core-$(CONFIG_ARCH_MXC) += arch/arm/plat-mxc/
193
194drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/ 197drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/
195 198
196libs-y := arch/arm/lib/ $(libs-y) 199libs-y := arch/arm/lib/ $(libs-y)
diff --git a/arch/arm/tools/Makefile b/arch/arm/tools/Makefile
index c2a4993a724c..1dbaa29ac4d7 100644
--- a/arch/arm/tools/Makefile
+++ b/arch/arm/tools/Makefile
@@ -6,4 +6,5 @@
6 6
7include/asm-arm/mach-types.h: $(src)/gen-mach-types $(src)/mach-types 7include/asm-arm/mach-types.h: $(src)/gen-mach-types $(src)/mach-types
8 @echo ' Generating $@' 8 @echo ' Generating $@'
9 @mkdir -p $(dir $@)
9 $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; } 10 $(Q)$(AWK) -f $^ > $@ || { rm -f $@; /bin/false; }