aboutsummaryrefslogtreecommitdiff
path: root/arch/cris/arch-v10/boot/rescue/Makefile
diff options
context:
space:
mode:
authorJesper Nilsson <jesper@jni.nu>2008-06-29 23:15:19 +0200
committerJesper Nilsson <jesper@jni.nu>2008-06-29 23:15:19 +0200
commitbdb144b67a7660ce5d044ae9a2fd1a8030f12523 (patch)
tree493177c56790bdf9a0358e5e5936e5b575006cc8 /arch/cris/arch-v10/boot/rescue/Makefile
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (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/Makefile7
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 2e5045b9e19..bea8b9c2a7c 100644
--- a/arch/cris/arch-v10/boot/rescue/Makefile
+++ b/arch/cris/arch-v10/boot/rescue/Makefile
@@ -2,12 +2,9 @@
# Makefile for rescue (bootstrap) code
#
-CC = gcc-cris -mlinux $(LINUXINCLUDE)
-ccflags-y += -O2
-asflags-y += -traditional
-LD = gcc-cris -mlinux -nostdlib
+ccflags-y += -O2 $(LINUXINCLUDE)
+asflags-y += $(LINUXINCLUDE)
ldflags-y += -T $(obj)/rescue.ld
-OBJCOPY = objcopy-cris
OBJCOPYFLAGS = -O binary --remove-section=.bss
obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o
OBJECT := $(obj)/head.o