diff options
| author | Jesper Nilsson <jesper@jni.nu> | 2008-06-30 14:38:06 -0400 |
|---|---|---|
| committer | Jesper Nilsson <jesper@jni.nu> | 2008-06-30 14:38:06 -0400 |
| commit | 7dd071058f70d517f2d24e80cbb9d9885d565f0a (patch) | |
| tree | 6c375c118be3d88e2c2538943177da1edb148e40 /arch/cris | |
| parent | bdb144b67a7660ce5d044ae9a2fd1a8030f12523 (diff) | |
[CRIS] Correct image makefiles to allow using a separate OBJ-directory.
Make compile succeed when building with O= (srctree != objtree).
Signed-off-by: Hinko Kocevar <hinko.kocevar@cetrtapot.si>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris')
| -rw-r--r-- | arch/cris/arch-v10/boot/compressed/Makefile | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/boot/rescue/Makefile | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/boot/compressed/Makefile | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/boot/rescue/Makefile | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/cris/arch-v10/boot/compressed/Makefile b/arch/cris/arch-v10/boot/compressed/Makefile index 9ec5f87d5157..08d943ce4be7 100644 --- a/arch/cris/arch-v10/boot/compressed/Makefile +++ b/arch/cris/arch-v10/boot/compressed/Makefile | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | asflags-y += $(LINUXINCLUDE) | 5 | asflags-y += $(LINUXINCLUDE) |
| 6 | ccflags-y += -O2 $(LINUXINCLUDE) | 6 | ccflags-y += -O2 $(LINUXINCLUDE) |
| 7 | ldflags-y += -T $(obj)/decompress.ld | 7 | ldflags-y += -T $(srctree)/$(obj)/decompress.ld |
| 8 | OBJECTS = $(obj)/head.o $(obj)/misc.o | 8 | OBJECTS = $(obj)/head.o $(obj)/misc.o |
| 9 | OBJCOPYFLAGS = -O binary --remove-section=.bss | 9 | OBJCOPYFLAGS = -O binary --remove-section=.bss |
| 10 | 10 | ||
diff --git a/arch/cris/arch-v10/boot/rescue/Makefile b/arch/cris/arch-v10/boot/rescue/Makefile index bea8b9c2a7cf..07688da92708 100644 --- a/arch/cris/arch-v10/boot/rescue/Makefile +++ b/arch/cris/arch-v10/boot/rescue/Makefile | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | ccflags-y += -O2 $(LINUXINCLUDE) | 5 | ccflags-y += -O2 $(LINUXINCLUDE) |
| 6 | asflags-y += $(LINUXINCLUDE) | 6 | asflags-y += $(LINUXINCLUDE) |
| 7 | ldflags-y += -T $(obj)/rescue.ld | 7 | ldflags-y += -T $(srctree)/$(obj)/rescue.ld |
| 8 | OBJCOPYFLAGS = -O binary --remove-section=.bss | 8 | OBJCOPYFLAGS = -O binary --remove-section=.bss |
| 9 | obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o | 9 | obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o |
| 10 | OBJECT := $(obj)/head.o | 10 | OBJECT := $(obj)/head.o |
diff --git a/arch/cris/arch-v32/boot/compressed/Makefile b/arch/cris/arch-v32/boot/compressed/Makefile index 9138938eec38..d6335f26083b 100644 --- a/arch/cris/arch-v32/boot/compressed/Makefile +++ b/arch/cris/arch-v32/boot/compressed/Makefile | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | asflags-y += -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch | 5 | asflags-y += -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch |
| 6 | ccflags-y += -O2 -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch | 6 | ccflags-y += -O2 -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch |
| 7 | ldflags-y += -T $(obj)/decompress.ld | 7 | ldflags-y += -T $(srctree)/$(obj)/decompress.ld |
| 8 | OBJECTS = $(obj)/head.o $(obj)/misc.o | 8 | OBJECTS = $(obj)/head.o $(obj)/misc.o |
| 9 | OBJCOPYFLAGS = -O binary --remove-section=.bss | 9 | OBJCOPYFLAGS = -O binary --remove-section=.bss |
| 10 | 10 | ||
diff --git a/arch/cris/arch-v32/boot/rescue/Makefile b/arch/cris/arch-v32/boot/rescue/Makefile index b548bde185d7..44ae0ad61f90 100644 --- a/arch/cris/arch-v32/boot/rescue/Makefile +++ b/arch/cris/arch-v32/boot/rescue/Makefile | |||
| @@ -7,7 +7,7 @@ ccflags-y += -O2 -I $(srctree)/include/asm/arch/mach/ \ | |||
| 7 | -I $(srctree)/include/asm/arch | 7 | -I $(srctree)/include/asm/arch |
| 8 | asflags-y += -I $(srctree)/include/asm/arch/mach/ -I $(srctree)/include/asm/arch | 8 | asflags-y += -I $(srctree)/include/asm/arch/mach/ -I $(srctree)/include/asm/arch |
| 9 | LD = gcc-cris -mlinux -march=v32 -nostdlib | 9 | LD = gcc-cris -mlinux -march=v32 -nostdlib |
| 10 | ldflags-y += -T $(obj)/rescue.ld | 10 | ldflags-y += -T $(srctree)/$(obj)/rescue.ld |
| 11 | LDPOSTFLAGS = -lgcc | 11 | LDPOSTFLAGS = -lgcc |
| 12 | OBJCOPYFLAGS = -O binary --remove-section=.bss | 12 | OBJCOPYFLAGS = -O binary --remove-section=.bss |
| 13 | obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o | 13 | obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o |