[CRIS] Rename boot-linkscripts and fix the path to them.

This makes the CRIS-port directories follow the same naming
convention as the rest of the kernel.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>

diff --git a/arch/cris/arch-v10/boot/compressed/Makefile b/arch/cris/arch-v10/boot/compressed/Makefile
index 08d943ce4be78a779a7711e0a5c7612defd986a7..6fe0ffaf3be649af6a0c120c2a45a926a97fc6b0 100644 (file)
--- a/arch/cris/arch-v10/boot/compressed/Makefile
+++ b/arch/cris/arch-v10/boot/compressed/Makefile
@@ -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
 

diff --git a/arch/cris/arch-v10/boot/compressed/decompress.ld b/arch/cris/arch-v10/boot/compressed/decompress.ld
deleted file mode 100644 (file)
index e80f459..0000000
--- a/arch/cris/arch-v10/boot/compressed/decompress.ld
+++ /dev/null
@@ -1,30 +0,0 @@
-/* OUTPUT_FORMAT(elf32-us-cris) */
-OUTPUT_FORMAT(elf32-cris)
-
-MEMORY 
-       {
-       dram : ORIGIN = 0x40700000,
-              LENGTH = 0x00100000
-       }
-
-SECTIONS
-{
-       .text :
-       {
-               _stext = . ;
-               *(.text)
-               *(.rodata)
-               *(.rodata.*)
-               _etext = . ;
-       } > dram
-       .data :
-       {
-               *(.data)
-               _edata = . ;
-       } > dram
-       .bss :
-       {
-               *(.bss)
-               _end = ALIGN( 0x10 ) ;
-       } > dram
-}

diff --git a/arch/cris/arch-v10/boot/compressed/decompress.lds b/arch/cris/arch-v10/boot/compressed/decompress.lds
new file mode 100644 (file)
index 0000000..e80f459
--- /dev/null
+++ b/arch/cris/arch-v10/boot/compressed/decompress.lds
@@ -0,0 +1,30 @@
+/* OUTPUT_FORMAT(elf32-us-cris) */
+OUTPUT_FORMAT(elf32-cris)
+
+MEMORY 
+       {
+       dram : ORIGIN = 0x40700000,
+              LENGTH = 0x00100000
+       }
+
+SECTIONS
+{
+       .text :
+       {
+               _stext = . ;
+               *(.text)
+               *(.rodata)
+               *(.rodata.*)
+               _etext = . ;
+       } > dram
+       .data :
+       {
+               *(.data)
+               _edata = . ;
+       } > dram
+       .bss :
+       {
+               *(.bss)
+               _end = ALIGN( 0x10 ) ;
+       } > dram
+}

diff --git a/arch/cris/arch-v10/boot/rescue/Makefile b/arch/cris/arch-v10/boot/rescue/Makefile
index 07688da927080ff123bf80faeffe0522110038db..82ab59b968e5a2f6a2838cbf13fda474b8577f7b 100644 (file)
--- a/arch/cris/arch-v10/boot/rescue/Makefile
+++ b/arch/cris/arch-v10/boot/rescue/Makefile
@@ -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

diff --git a/arch/cris/arch-v10/boot/rescue/rescue.ld b/arch/cris/arch-v10/boot/rescue/rescue.ld
deleted file mode 100644 (file)
index 0b52a94..0000000
--- a/arch/cris/arch-v10/boot/rescue/rescue.ld
+++ /dev/null
@@ -1,20 +0,0 @@
-MEMORY 
-       {
-       flash : ORIGIN = 0x00000000,
-               LENGTH = 0x00100000
-       }
-
-SECTIONS
-{
-       .text :
-       {
-               stext = . ;
-               *(.text)
-               etext = . ;
-       } > flash
-       .data :
-       {
-               *(.data)
-               edata = . ;
-       } > flash
-}

diff --git a/arch/cris/arch-v10/boot/rescue/rescue.lds b/arch/cris/arch-v10/boot/rescue/rescue.lds
new file mode 100644 (file)
index 0000000..0b52a94
--- /dev/null
+++ b/arch/cris/arch-v10/boot/rescue/rescue.lds
@@ -0,0 +1,20 @@
+MEMORY 
+       {
+       flash : ORIGIN = 0x00000000,
+               LENGTH = 0x00100000
+       }
+
+SECTIONS
+{
+       .text :
+       {
+               stext = . ;
+               *(.text)
+               etext = . ;
+       } > flash
+       .data :
+       {
+               *(.data)
+               edata = . ;
+       } > flash
+}

diff --git a/arch/cris/arch-v32/boot/compressed/Makefile b/arch/cris/arch-v32/boot/compressed/Makefile
index d6335f26083bfb3e8c8317047a638bef0b145da3..5a1b31c99eaa188485b29c8dd2933278dcdd40c7 100644 (file)
--- 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.ld
deleted file mode 100644 (file)
index 3c837fe..0000000
--- a/arch/cris/arch-v32/boot/compressed/decompress.ld
+++ /dev/null
@@ -1,30 +0,0 @@
-/*#OUTPUT_FORMAT(elf32-us-cris) */
-OUTPUT_ARCH (crisv32)
-
-MEMORY
-       {
-       dram : ORIGIN = 0x40700000,
-              LENGTH = 0x00100000
-       }
-
-SECTIONS
-{
-       .text :
-       {
-               _stext = . ;
-               *(.text)
-               *(.rodata)
-               *(.rodata.*)
-               _etext = . ;
-       } > dram
-       .data :
-       {
-               *(.data)
-               _edata = . ;
-       } > dram
-       .bss :
-       {
-               *(.bss)
-               _end = ALIGN( 0x10 ) ;
-       } > dram
-}

diff --git a/arch/cris/arch-v32/boot/compressed/decompress.lds b/arch/cris/arch-v32/boot/compressed/decompress.lds
new file mode 100644 (file)
index 0000000..3c837fe
--- /dev/null
+++ b/arch/cris/arch-v32/boot/compressed/decompress.lds
@@ -0,0 +1,30 @@
+/*#OUTPUT_FORMAT(elf32-us-cris) */
+OUTPUT_ARCH (crisv32)
+
+MEMORY
+       {
+       dram : ORIGIN = 0x40700000,
+              LENGTH = 0x00100000
+       }
+
+SECTIONS
+{
+       .text :
+       {
+               _stext = . ;
+               *(.text)
+               *(.rodata)
+               *(.rodata.*)
+               _etext = . ;
+       } > dram
+       .data :
+       {
+               *(.data)
+               _edata = . ;
+       } > dram
+       .bss :
+       {
+               *(.bss)
+               _end = ALIGN( 0x10 ) ;
+       } > dram
+}

diff --git a/arch/cris/arch-v32/boot/rescue/Makefile b/arch/cris/arch-v32/boot/rescue/Makefile
index 44ae0ad61f9050636c529798d393fe092ad0c4c2..566aac663a38515108c78920204149f388354761 100644 (file)
--- 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.ld
deleted file mode 100644 (file)
index 8ac646b..0000000
--- a/arch/cris/arch-v32/boot/rescue/rescue.ld
+++ /dev/null
@@ -1,43 +0,0 @@
-/*#OUTPUT_FORMAT(elf32-us-cris) */
-OUTPUT_ARCH (crisv32)
-/* Now that NAND support has been stripped, this file could be simplified,
- * but it doesn't do any harm on the other hand so why bother. */
-
-MEMORY
-       {
-       bootblk : ORIGIN = 0x38000000,
-                 LENGTH = 0x00004000
-       intmem  : ORIGIN = 0x38004000,
-                 LENGTH = 0x00005000
-       }
-
-SECTIONS
-{
-       .text :
-       {
-               _stext = . ;
-               *(.text)
-               *(.init.text)
-               *(.rodata)
-               *(.rodata.*)
-               _etext = . ;
-       } > bootblk
-       .data :
-       {
-               *(.data)
-               _edata = . ;
-       } > bootblk
-       .bss :
-       {
-               _bss = . ;
-               *(.bss)
-               _end = ALIGN( 0x10 ) ;
-       } > intmem
-
-       /* Get rid of stuff from EXPORT_SYMBOL(foo). */
-       /DISCARD/ :
-       {
-               *(__ksymtab_strings)
-               *(__ksymtab)
-       }
-}

diff --git a/arch/cris/arch-v32/boot/rescue/rescue.lds b/arch/cris/arch-v32/boot/rescue/rescue.lds
new file mode 100644 (file)
index 0000000..8ac646b
--- /dev/null
+++ b/arch/cris/arch-v32/boot/rescue/rescue.lds
@@ -0,0 +1,43 @@
+/*#OUTPUT_FORMAT(elf32-us-cris) */
+OUTPUT_ARCH (crisv32)
+/* Now that NAND support has been stripped, this file could be simplified,
+ * but it doesn't do any harm on the other hand so why bother. */
+
+MEMORY
+       {
+       bootblk : ORIGIN = 0x38000000,
+                 LENGTH = 0x00004000
+       intmem  : ORIGIN = 0x38004000,
+                 LENGTH = 0x00005000
+       }
+
+SECTIONS
+{
+       .text :
+       {
+               _stext = . ;
+               *(.text)
+               *(.init.text)
+               *(.rodata)
+               *(.rodata.*)
+               _etext = . ;
+       } > bootblk
+       .data :
+       {
+               *(.data)
+               _edata = . ;
+       } > bootblk
+       .bss :
+       {
+               _bss = . ;
+               *(.bss)
+               _end = ALIGN( 0x10 ) ;
+       } > intmem
+
+       /* Get rid of stuff from EXPORT_SYMBOL(foo). */
+       /DISCARD/ :
+       {
+               *(__ksymtab_strings)
+               *(__ksymtab)
+       }
+}