diff options
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 2a0b2c8a1fe0..000f1100b553 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -15,6 +15,8 @@ CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET) | |||
15 | OBJCOPYFLAGS :=-O binary -R .note -R .comment -S | 15 | OBJCOPYFLAGS :=-O binary -R .note -R .comment -S |
16 | GZFLAGS :=-9 | 16 | GZFLAGS :=-9 |
17 | #CFLAGS +=-pipe | 17 | #CFLAGS +=-pipe |
18 | # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: | ||
19 | CFLAGS +=$(call cc-option,-marm,) | ||
18 | 20 | ||
19 | # Do not use arch/arm/defconfig - it's always outdated. | 21 | # Do not use arch/arm/defconfig - it's always outdated. |
20 | # Select a platform tht is kept up-to-date | 22 | # Select a platform tht is kept up-to-date |
@@ -108,6 +110,7 @@ endif | |||
108 | machine-$(CONFIG_ARCH_CLPS711X) := clps711x | 110 | machine-$(CONFIG_ARCH_CLPS711X) := clps711x |
109 | machine-$(CONFIG_ARCH_IOP32X) := iop32x | 111 | machine-$(CONFIG_ARCH_IOP32X) := iop32x |
110 | machine-$(CONFIG_ARCH_IOP33X) := iop33x | 112 | machine-$(CONFIG_ARCH_IOP33X) := iop33x |
113 | machine-$(CONFIG_ARCH_IOP13XX) := iop13xx | ||
111 | machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx | 114 | machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx |
112 | machine-$(CONFIG_ARCH_IXP2000) := ixp2000 | 115 | machine-$(CONFIG_ARCH_IXP2000) := ixp2000 |
113 | machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx | 116 | machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx |
@@ -174,11 +177,13 @@ libs-y := arch/arm/lib/ $(libs-y) | |||
174 | 177 | ||
175 | # Default target when executing plain make | 178 | # Default target when executing plain make |
176 | ifeq ($(CONFIG_XIP_KERNEL),y) | 179 | ifeq ($(CONFIG_XIP_KERNEL),y) |
177 | all: xipImage | 180 | KBUILD_IMAGE := xipImage |
178 | else | 181 | else |
179 | all: zImage | 182 | KBUILD_IMAGE := zImage |
180 | endif | 183 | endif |
181 | 184 | ||
185 | all: $(KBUILD_IMAGE) | ||
186 | |||
182 | boot := arch/arm/boot | 187 | boot := arch/arm/boot |
183 | 188 | ||
184 | # Update machine arch and proc symlinks if something which affects | 189 | # Update machine arch and proc symlinks if something which affects |