Commit b73b636e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents ed09441d 8f808417

arch/cris/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
# License.  See the file "COPYING" in the main directory of this archive

# for more details.



KBUILD_DEFCONFIG := etrax-100lx_v2_defconfig



arch-y := v10

arch-$(CONFIG_ETRAX_ARCH_V10) := v10

arch-$(CONFIG_ETRAX_ARCH_V32) := v32

arch/cris/arch-v10/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


asflags-y += $(LINUXINCLUDE)

ccflags-y += -O2 $(LINUXINCLUDE)

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

arch/cris/arch-v10/boot/rescue/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


ccflags-y += -O2 $(LINUXINCLUDE)

asflags-y += $(LINUXINCLUDE)

ldflags-y += -T $(srctree)/$(obj)/rescue.ld

ldflags-y += -T $(srctree)/$(src)/rescue.lds

OBJCOPYFLAGS = -O binary --remove-section=.bss

obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o

OBJECT := $(obj)/head.o