diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 09:09:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 09:09:48 -0700 |
| commit | b73b636e8987f8728c6c700377615757691b9a55 (patch) | |
| tree | 554a4c799888e8934d2bf222bd0fcae2a9146bb4 /arch/cris/arch-v32/boot | |
| parent | ed09441dacc2a2d6c170aa3b1f79a041291a813f (diff) | |
| parent | 8f808417fe211648c0816e28947cdc74eb1e1032 (diff) | |
| download | op-kernel-dev-b73b636e8987f8728c6c700377615757691b9a55.zip op-kernel-dev-b73b636e8987f8728c6c700377615757691b9a55.tar.gz | |
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris:
CRIS: proper defconfig setup
[CRIS] Rename boot-linkscripts and fix the path to them.
Diffstat (limited to 'arch/cris/arch-v32/boot')
| -rw-r--r-- | arch/cris/arch-v32/boot/compressed/Makefile | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/boot/compressed/decompress.lds (renamed from arch/cris/arch-v32/boot/compressed/decompress.ld) | 0 | ||||
| -rw-r--r-- | arch/cris/arch-v32/boot/rescue/Makefile | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/boot/rescue/rescue.lds (renamed from arch/cris/arch-v32/boot/rescue/rescue.ld) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/boot/compressed/Makefile b/arch/cris/arch-v32/boot/compressed/Makefile index d6335f2..5a1b31c 100644 --- a/arch/cris/arch-v32/boot/compressed/Makefile +++ b/arch/cris/arch-v32/boot/compressed/Makefile @@ -4,7 +4,7 @@ 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 -ldflags-y += -T $(srctree)/$(obj)/decompress.ld +ldflags-y += -T $(srctree)/$(src)/decompress.lds OBJECTS = $(obj)/head.o $(obj)/misc.o OBJCOPYFLAGS = -O binary --remove-section=.bss diff --git a/arch/cris/arch-v32/boot/compressed/decompress.ld b/arch/cris/arch-v32/boot/compressed/decompress.lds index 3c837fe..3c837fe 100644 --- a/arch/cris/arch-v32/boot/compressed/decompress.ld +++ b/arch/cris/arch-v32/boot/compressed/decompress.lds diff --git a/arch/cris/arch-v32/boot/rescue/Makefile b/arch/cris/arch-v32/boot/rescue/Makefile index 44ae0ad..566aac6 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/ \ -I $(srctree)/include/asm/arch asflags-y += -I $(srctree)/include/asm/arch/mach/ -I $(srctree)/include/asm/arch LD = gcc-cris -mlinux -march=v32 -nostdlib -ldflags-y += -T $(srctree)/$(obj)/rescue.ld +ldflags-y += -T $(srctree)/$(src)/rescue.lds LDPOSTFLAGS = -lgcc OBJCOPYFLAGS = -O binary --remove-section=.bss obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o diff --git a/arch/cris/arch-v32/boot/rescue/rescue.ld b/arch/cris/arch-v32/boot/rescue/rescue.lds index 8ac646b..8ac646b 100644 --- a/arch/cris/arch-v32/boot/rescue/rescue.ld +++ b/arch/cris/arch-v32/boot/rescue/rescue.lds |
