diff options
| author | Jesper Nilsson <jesper@jni.nu> | 2008-06-29 17:15:19 -0400 |
|---|---|---|
| committer | Jesper Nilsson <jesper@jni.nu> | 2008-06-29 17:15:19 -0400 |
| commit | bdb144b67a7660ce5d044ae9a2fd1a8030f12523 (patch) | |
| tree | 493177c56790bdf9a0358e5e5936e5b575006cc8 /arch/cris/arch-v10/boot/rescue/Makefile | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
[CRIS] Build fixes for compressed and rescue images for v10 and v32:
- Use the normal cross gcc instead of using an elf specific cris toolchain.
This removes the dependency of this second toolchain.
- Use the normal cross objcopy instead of overriding it to use elf-toolchain.
This allows compiling using "CROSS_COMPILE=$CRIS_GCC/cris-axis-linux-gnu-"
instead of just "CROSS_COMPILE=$CRIS_GCC/cris-axis-linux-gnu/bin/"
- Remove redundant rules for compiling, the implicit rules are sufficient.
- Convert the arch/cris/arch-v10/boot/compressed/head.S to format
accepted by the cris-axis-linux-gnu-gcc (registers must be prefixed
with '$', remove explicit underscore on exported symbols)
- Remove a number of unused (and duplicated) prototypes from
arch/cris/arch-v10/boot/compressed/misc.c.
- Correct memcpy and memset return values (actually return them!)
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris/arch-v10/boot/rescue/Makefile')
| -rw-r--r-- | arch/cris/arch-v10/boot/rescue/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/cris/arch-v10/boot/rescue/Makefile b/arch/cris/arch-v10/boot/rescue/Makefile index 2e5045b9e19c..bea8b9c2a7cf 100644 --- a/arch/cris/arch-v10/boot/rescue/Makefile +++ b/arch/cris/arch-v10/boot/rescue/Makefile | |||
| @@ -2,12 +2,9 @@ | |||
| 2 | # Makefile for rescue (bootstrap) code | 2 | # Makefile for rescue (bootstrap) code |
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | CC = gcc-cris -mlinux $(LINUXINCLUDE) | 5 | ccflags-y += -O2 $(LINUXINCLUDE) |
| 6 | ccflags-y += -O2 | 6 | asflags-y += $(LINUXINCLUDE) |
| 7 | asflags-y += -traditional | ||
| 8 | LD = gcc-cris -mlinux -nostdlib | ||
| 9 | ldflags-y += -T $(obj)/rescue.ld | 7 | ldflags-y += -T $(obj)/rescue.ld |
| 10 | OBJCOPY = objcopy-cris | ||
| 11 | OBJCOPYFLAGS = -O binary --remove-section=.bss | 8 | OBJCOPYFLAGS = -O binary --remove-section=.bss |
| 12 | obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o | 9 | obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o |
| 13 | OBJECT := $(obj)/head.o | 10 | OBJECT := $(obj)/head.o |