diff options
| author | Jesper Nilsson <jesper@jni.nu> | 2008-06-29 23:15:19 +0200 |
|---|---|---|
| committer | Jesper Nilsson <jesper@jni.nu> | 2008-06-29 23:15:19 +0200 |
| commit | bdb144b67a7660ce5d044ae9a2fd1a8030f12523 (patch) | |
| tree | 493177c56790bdf9a0358e5e5936e5b575006cc8 /arch/cris/arch-v32 | |
| 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-v32')
| -rw-r--r-- | arch/cris/arch-v32/boot/Makefile | 1 | ||||
| -rw-r--r-- | arch/cris/arch-v32/boot/compressed/Makefile | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/boot/rescue/Makefile | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/arch/cris/arch-v32/boot/Makefile b/arch/cris/arch-v32/boot/Makefile index 3f91349c5f1..99896ad60b3 100644 --- a/arch/cris/arch-v32/boot/Makefile +++ b/arch/cris/arch-v32/boot/Makefile @@ -2,7 +2,6 @@ # arch/cris/arch-v32/boot/Makefile # -OBJCOPY = objcopy-cris OBJCOPYFLAGS = -O binary -R .note -R .comment subdir- := compressed rescue diff --git a/arch/cris/arch-v32/boot/compressed/Makefile b/arch/cris/arch-v32/boot/compressed/Makefile index 2c8c2c3039c..9138938eec3 100644 --- a/arch/cris/arch-v32/boot/compressed/Makefile +++ b/arch/cris/arch-v32/boot/compressed/Makefile @@ -2,14 +2,10 @@ # arch/cris/arch-v32/boot/compressed/Makefile # -CC = gcc-cris -mlinux -march=v32 $(LINUXINCLUDE) asflags-y += -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch ccflags-y += -O2 -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch -LD = gcc-cris -mlinux -march=v32 -nostdlib ldflags-y += -T $(obj)/decompress.ld -obj-y = head.o misc.o OBJECTS = $(obj)/head.o $(obj)/misc.o -OBJCOPY = objcopy-cris OBJCOPYFLAGS = -O binary --remove-section=.bss quiet_cmd_image = BUILD $@ diff --git a/arch/cris/arch-v32/boot/rescue/Makefile b/arch/cris/arch-v32/boot/rescue/Makefile index c0987795dcb..b548bde185d 100644 --- a/arch/cris/arch-v32/boot/rescue/Makefile +++ b/arch/cris/arch-v32/boot/rescue/Makefile @@ -9,7 +9,6 @@ asflags-y += -I $(srctree)/include/asm/arch/mach/ -I $(srctree)/include/asm/arch LD = gcc-cris -mlinux -march=v32 -nostdlib ldflags-y += -T $(obj)/rescue.ld LDPOSTFLAGS = -lgcc -OBJCOPY = objcopy-cris OBJCOPYFLAGS = -O binary --remove-section=.bss obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o OBJECT := $(obj)/head.o |