diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-11 10:35:00 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-11 10:35:00 -0400 |
commit | 42578c82e0f1810a07ebe29cb05e874893243d8c (patch) | |
tree | e2a3811677d3594e891fc82c940438f6b6abc3e0 /arch/arm/boot/compressed/Makefile | |
parent | 2631182bf93919577730e6a6c4345308db590057 (diff) | |
parent | 85d6943af50537d3aec58b967ffbd3fec88453e9 (diff) |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel
Conflicts:
arch/arm/Kconfig
arch/arm/kernel/smp.c
arch/arm/mach-realview/Makefile
arch/arm/mach-realview/platsmp.c
Diffstat (limited to 'arch/arm/boot/compressed/Makefile')
-rw-r--r-- | arch/arm/boot/compressed/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index fbe5eef1f6c9..ce39dc540085 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile | |||
@@ -40,7 +40,7 @@ ifeq ($(CONFIG_PXA_SHARPSL),y) | |||
40 | OBJS += head-sharpsl.o | 40 | OBJS += head-sharpsl.o |
41 | endif | 41 | endif |
42 | 42 | ||
43 | ifeq ($(CONFIG_CPU_BIG_ENDIAN),y) | 43 | ifeq ($(CONFIG_CPU_ENDIAN_BE32),y) |
44 | ifeq ($(CONFIG_CPU_CP15),y) | 44 | ifeq ($(CONFIG_CPU_CP15),y) |
45 | OBJS += big-endian.o | 45 | OBJS += big-endian.o |
46 | else | 46 | else |
@@ -78,6 +78,9 @@ EXTRA_AFLAGS := -Wa,-march=all | |||
78 | # linker symbols. We only define initrd_phys and params_phys if the | 78 | # linker symbols. We only define initrd_phys and params_phys if the |
79 | # machine class defined the corresponding makefile variable. | 79 | # machine class defined the corresponding makefile variable. |
80 | LDFLAGS_vmlinux := --defsym zreladdr=$(ZRELADDR) | 80 | LDFLAGS_vmlinux := --defsym zreladdr=$(ZRELADDR) |
81 | ifeq ($(CONFIG_CPU_ENDIAN_BE8),y) | ||
82 | LDFLAGS_vmlinux += --be8 | ||
83 | endif | ||
81 | ifneq ($(INITRD_PHYS),) | 84 | ifneq ($(INITRD_PHYS),) |
82 | LDFLAGS_vmlinux += --defsym initrd_phys=$(INITRD_PHYS) | 85 | LDFLAGS_vmlinux += --defsym initrd_phys=$(INITRD_PHYS) |
83 | endif | 86 | endif |