diff options
| author | Eric Miao <eric.y.miao@gmail.com> | 2010-06-22 21:27:32 -0400 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2010-08-05 02:32:23 -0400 |
| commit | 9c3fca2ee6a4a89a64ac72b8159ae5c2be6bb38f (patch) | |
| tree | 7c8c0f9ea78df71af1b9e2ddb86f2aa52c798053 /arch/arm/boot/compressed | |
| parent | 867fc1c718c5c185282cae26d4122a51fbb20f0e (diff) | |
[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/compressed')
| -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) | |||
| 36 | OBJS += head-xscale.o | 36 | OBJS += head-xscale.o |
| 37 | endif | 37 | endif |
| 38 | 38 | ||
| 39 | ifeq ($(CONFIG_PXA_SHARPSL),y) | 39 | ifeq ($(CONFIG_PXA_SHARPSL_DETECT_MACH_ID),y) |
| 40 | OBJS += head-sharpsl.o | 40 | OBJS += head-sharpsl.o |
| 41 | endif | 41 | endif |
| 42 | 42 | ||