vserver 1.9.3

[linux-2.6.git] / arch / cris / Makefile

diff --git a/arch/cris/Makefile b/arch/cris/Makefile
index 7347399..0c6944c 100644 (file)
--- a/arch/cris/Makefile
+++ b/arch/cris/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.15 2003/07/04 12:47:53 tobiasa Exp $
+# $Id: Makefile,v 1.20 2004/05/14 14:35:58 orjanf Exp $
 # cris/Makefile
 #
 # This file is included by the global makefile so that you can add your own
@@ -24,22 +24,20 @@ SARCH :=
 endif
 
 LD = $(CROSS_COMPILE)ld -mcrislinux
-LDFLAGS_BLOB   := --format binary --oformat elf32-cris \
-                  -T arch/cris/$(SARCH)/output_arch.ld
 
 OBJCOPYFLAGS := -O binary -R .note -R .comment -S
 
-AFLAGS_vmlinux.lds.o = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
+CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
 AFLAGS += -mlinux
 
 CFLAGS := $(CFLAGS) -mlinux -march=$(arch-y) -pipe
 
-ifdef CONFIG_ETRAX_KGDB
+ifdef CONFIG_FRAME_POINTER
 CFLAGS := $(subst -fomit-frame-pointer,,$(CFLAGS)) -g
 CFLAGS += -fno-omit-frame-pointer
 endif
 
-HEAD := arch/$(ARCH)/$(SARCH)/kernel/head.o
+head-y := arch/$(ARCH)/$(SARCH)/kernel/head.o
 
 LIBGCC = $(shell $(CC) $(CFLAGS) -print-file-name=libgcc.a)
 
@@ -81,7 +79,7 @@ compressed: zImage
 
 archmrproper:
 archclean:
-       $(Q)$(MAKE) -f scripts/Makefile.clean obj=arch/$(ARCH)/boot     
+       $(Q)$(MAKE) $(clean)=arch/$(ARCH)/boot
        rm -f timage vmlinux.bin cramfs.img
        rm -rf $(LD_SCRIPT).tmp
 
@@ -90,10 +88,14 @@ prepare: arch/$(ARCH)/.links include/asm-$(ARCH)/.arch \
 
 # Create some links to make all tools happy
 arch/$(ARCH)/.links:
+       @rm -rf arch/$(ARCH)/drivers
        @ln -sfn $(SARCH)/drivers arch/$(ARCH)/drivers
+       @rm -rf arch/$(ARCH)/boot
        @ln -sfn $(SARCH)/boot arch/$(ARCH)/boot
+       @rm -rf arch/$(ARCH)/lib
        @ln -sfn $(SARCH)/lib arch/$(ARCH)/lib
-       @ln -sfn $(SARCH)/vmlinux.lds.S arch/$(ARCH)/kernel/vmlinux.lds.S
+       @ln -sfn $(SARCH) arch/$(ARCH)/arch
+       @ln -sfn ../$(SARCH)/vmlinux.lds.S arch/$(ARCH)/kernel/vmlinux.lds.S
        @touch $@
 
 # Create link to sub arch includes