diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-22 03:12:37 -0400 |
| commit | 8725f25acc656c1522d48a6746055099efdaca4c (patch) | |
| tree | e241424fa58178ed6c2a95a4eb931ea83dbea33c /arch/cris/arch-v10/boot/rescue/Makefile | |
| parent | c69cccc95fe4b90dde5fe33e6a3b77880b534fa4 (diff) | |
| parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) | |
Merge commit 'origin/master'
Manually fixed up:
drivers/net/fs_enet/fs_enet-main.c
Diffstat (limited to 'arch/cris/arch-v10/boot/rescue/Makefile')
| -rw-r--r-- | arch/cris/arch-v10/boot/rescue/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/cris/arch-v10/boot/rescue/Makefile b/arch/cris/arch-v10/boot/rescue/Makefile index 2e5045b9e19c..07688da92708 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 | 7 | ldflags-y += -T $(srctree)/$(obj)/rescue.ld |
| 8 | LD = gcc-cris -mlinux -nostdlib | ||
| 9 | 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 |