[CRIS] Remove links from CRIS build

Remove the links to architecture and machine dependent directories
(boot, lib, drivers, arch, mach)

The links were created and used mostly from the arch/cris/Makefile,
so why not dispense with them altogether?
Changed $(ARCH) to "cris" in Makefile, it is easier to read this way.

The CRISv32 head.S common files for the kernel and compressed images
needed to be modified to use ifdefs instead of using the now removed
mach link. Since there are only two versions, this is not a huge loss
in readability.

The link to vmlinux.lds.S is also replaced with a merged version
which uses ifdefs to select the correct layout.
System.map before and after are identical.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>

1 files changed, 151 insertions, 0 deletions

diff --git a/arch/cris/kernel/vmlinux.lds.S b/arch/cris/kernel/vmlinux.lds.S
new file mode 100644
index 000000000000..0d2adfc794d4
--- /dev/null
+++ b/arch/cris/kernel/vmlinux.lds.S
@@ -0,0 +1,151 @@
+/* ld script to make the Linux/CRIS kernel
+ * Authors: Bjorn Wesen (bjornw@axis.com)
+ *
+ * It is VERY DANGEROUS to fiddle around with the symbols in this
+ * script. It is for example quite vital that all generated sections
+ * that are used are actually named here, otherwise the linker will
+ * put them at the end, where the init stuff is which is FREED after
+ * the kernel has booted.
+ */
+
+#include <linux/autoconf.h>
+#include <asm-generic/vmlinux.lds.h>
+#include <asm/page.h>
+
+#ifdef CONFIG_ETRAX_VMEM_SIZE
+#define __CONFIG_ETRAX_VMEM_SIZE CONFIG_ETRAX_VMEM_SIZE
+#else
+#define __CONFIG_ETRAX_VMEM_SIZE 0
+#endif
+
+
+jiffies = jiffies_64;
+SECTIONS
+{
+        . = DRAM_VIRTUAL_BASE;
+        dram_start = .;
+#ifdef CONFIG_ETRAX_ARCH_V10
+        ibr_start = .;
+#else
+        ebp_start = .;
+        /* The boot section is only necessary until the VCS top */
+        /* level testbench includes both flash and DRAM. */
+        .boot : { *(.boot) }
+#endif
+
+        /* see head.S and pages reserved at the start */
+        . = DRAM_VIRTUAL_BASE + 0x4000;
+
+        _text = .;                      /* Text and read-only data. */
+        text_start = .;                 /* Lots of aliases. */
+        _stext = .;
+        __stext = .;
+        .text : {
+                TEXT_TEXT
+                SCHED_TEXT
+                LOCK_TEXT
+                *(.fixup)
+                *(.text.__*)
+        }
+
+        _etext = . ;                    /* End of text section. */
+        __etext = .;
+
+        . = ALIGN(4);                   /* Exception table. */
+        __start___ex_table = .;
+        __ex_table : { *(__ex_table) }
+        __stop___ex_table = .;
+
+        RODATA
+
+        . = ALIGN (4);
+        ___data_start = . ;
+        __Sdata = . ;
+        .data : {                       /* Data */
+                DATA_DATA
+        }
+        __edata = . ;                   /* End of data section. */
+        _edata = . ;
+
+        . = ALIGN(PAGE_SIZE);   /* init_task and stack, must be aligned. */
+        .data.init_task : { *(.data.init_task) }
+
+        . = ALIGN(PAGE_SIZE);           /* Init code and data. */
+        __init_begin = .;
+        .init.text : {
+                   _sinittext = .;
+                   INIT_TEXT
+                   _einittext = .;
+        }
+        .init.data : { INIT_DATA }
+        . = ALIGN(16);
+        __setup_start = .;
+        .init.setup : { *(.init.setup) }
+        __setup_end = .;
+#ifdef CONFIG_ETRAX_ARCH_V32
+        __start___param = .;
+        __param : { *(__param) }
+        __stop___param = .;
+#endif
+        .initcall.init : {
+                __initcall_start = .;
+                INITCALLS
+                __initcall_end = .;
+        }
+
+        .con_initcall.init : {
+                __con_initcall_start = .;
+                *(.con_initcall.init)
+                __con_initcall_end = .;
+        }
+        SECURITY_INIT
+
+#ifdef CONFIG_ETRAX_ARCH_V10
+#ifdef CONFIG_BLK_DEV_INITRD
+        .init.ramfs : {
+                __initramfs_start = .;
+                *(.init.ramfs)
+                __initramfs_end = .;
+        }
+#endif
+#endif
+        __vmlinux_end = .;              /* Last address of the physical file. */
+#ifdef CONFIG_ETRAX_ARCH_V32
+        PERCPU(PAGE_SIZE)
+
+        .init.ramfs : {
+                __initramfs_start = .;
+                *(.init.ramfs)
+                __initramfs_end = .;
+        }
+#endif
+
+        /*
+         * We fill to the next page, so we can discard all init
+         * pages without needing to consider what payload might be
+         * appended to the kernel image.
+         */
+        . = ALIGN(PAGE_SIZE);
+
+        __init_end = .;
+
+        __data_end = . ;                /* Move to _edata ? */
+        __bss_start = .;                /* BSS. */
+        .bss : {
+                *(COMMON)
+                *(.bss)
+        }
+
+        . =  ALIGN (0x20);
+        _end = .;
+        __end = .;
+
+        /* Sections to be discarded */
+        /DISCARD/ : {
+                EXIT_TEXT
+                EXIT_DATA
+                *(.exitcall.exit)
+        }
+
+        dram_end = dram_start + (CONFIG_ETRAX_DRAM_SIZE - __CONFIG_ETRAX_VMEM_SIZE)*1024*1024;
+}