diff options
| author | Eric Miao | 2010-06-23 03:27:32 +0200 |
|---|---|---|
| committer | Eric Miao | 2010-08-05 08:32:23 +0200 |
| commit | 9c3fca2ee6a4a89a64ac72b8159ae5c2be6bb38f (patch) | |
| tree | 7c8c0f9ea78df71af1b9e2ddb86f2aa52c798053 /arch/arm/boot | |
| parent | [ARM] pxa: move hidden Kconfig options to right place and vice versa (diff) | |
| download | kernel-qcow2-linux-9c3fca2ee6a4a89a64ac72b8159ae5c2be6bb38f.tar.gz kernel-qcow2-linux-9c3fca2ee6a4a89a64ac72b8159ae5c2be6bb38f.tar.xz kernel-qcow2-linux-9c3fca2ee6a4a89a64ac72b8159ae5c2be6bb38f.zip | |
[ARM] pxa: PXA_SHARPSL_DETECT_MACH_ID to include head-sharpsl.S
With kexec-based kernel boot loader on Zaurus, the machine ID is
actually correctly passed, and head-sharpsl.S is not necessary.
Introduce PXA_SHARPSL_DETECT_MACH_ID, and include head-sharpsl.S
only when that's explicitly enabled.
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/compressed/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 53faa9063a03..2ea1bfa40e1e 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -36,7 +36,7 @@ ifeq ($(CONFIG_CPU_XSCALE),y) OBJS += head-xscale.o endif -ifeq ($(CONFIG_PXA_SHARPSL),y) +ifeq ($(CONFIG_PXA_SHARPSL_DETECT_MACH_ID),y) OBJS += head-sharpsl.o endif |