diff options
| author | Jesper Nilsson <jesper@jni.nu> | 2008-06-30 18:13:54 -0400 |
|---|---|---|
| committer | Jesper Nilsson <jesper@jni.nu> | 2008-06-30 18:13:54 -0400 |
| commit | fea72637c665f2143adcf8455fffa55160c2cad2 (patch) | |
| tree | 101b5fb5e40eb3d0ef8f4b0fd8b574311652d33e /arch/cris/arch-v32 | |
| parent | 53e43d014cb7d5a3bd53dbdbf0e74977e7dda923 (diff) | |
| parent | f3c4b53d5ec6bd2ae0f284c1e6371bff545f0f80 (diff) | |
Merge branch 'build_fix' into cris
Diffstat (limited to 'arch/cris/arch-v32')
| -rw-r--r-- | arch/cris/arch-v32/boot/compressed/Makefile | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v32/boot/rescue/Makefile | 2 |
2 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 9138938eec38..d6335f26083b 100644 --- a/arch/cris/arch-v32/boot/compressed/Makefile +++ b/arch/cris/arch-v32/boot/compressed/Makefile | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | asflags-y += -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch | 5 | asflags-y += -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch |
| 6 | ccflags-y += -O2 -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch | 6 | ccflags-y += -O2 -I $(srctree)/include/asm/mach/ -I $(srctree)/include/asm/arch |
| 7 | ldflags-y += -T $(obj)/decompress.ld | 7 | ldflags-y += -T $(srctree)/$(obj)/decompress.ld |
| 8 | OBJECTS = $(obj)/head.o $(obj)/misc.o | 8 | OBJECTS = $(obj)/head.o $(obj)/misc.o |
| 9 | OBJCOPYFLAGS = -O binary --remove-section=.bss | 9 | OBJCOPYFLAGS = -O binary --remove-section=.bss |
| 10 | 10 | ||
diff --git a/arch/cris/arch-v32/boot/rescue/Makefile b/arch/cris/arch-v32/boot/rescue/Makefile index b548bde185d7..44ae0ad61f90 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/ \ | |||
| 7 | -I $(srctree)/include/asm/arch | 7 | -I $(srctree)/include/asm/arch |
| 8 | asflags-y += -I $(srctree)/include/asm/arch/mach/ -I $(srctree)/include/asm/arch | 8 | asflags-y += -I $(srctree)/include/asm/arch/mach/ -I $(srctree)/include/asm/arch |
| 9 | LD = gcc-cris -mlinux -march=v32 -nostdlib | 9 | LD = gcc-cris -mlinux -march=v32 -nostdlib |
| 10 | ldflags-y += -T $(obj)/rescue.ld | 10 | ldflags-y += -T $(srctree)/$(obj)/rescue.ld |
| 11 | LDPOSTFLAGS = -lgcc | 11 | LDPOSTFLAGS = -lgcc |
| 12 | OBJCOPYFLAGS = -O binary --remove-section=.bss | 12 | OBJCOPYFLAGS = -O binary --remove-section=.bss |
| 13 | obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o | 13 | obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o |