[AVR32] rename vmlinux.lds
authorSam Ravnborg <sam@ravnborg.org>
Sat, 15 Sep 2007 20:47:02 +0000 (22:47 +0200)
committerHaavard Skinnemoen <hskinnemoen@atmel.com>
Thu, 11 Oct 2007 10:16:56 +0000 (12:16 +0200)
Rename vmlinux.lds to a .S file to match other architectures.
Simplify Makefile to match the rename and deleted the unused
USE_STANDARD_AS_RULE

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
arch/avr32/kernel/Makefile
arch/avr32/kernel/vmlinux.lds.S [new file with mode: 0644]
arch/avr32/kernel/vmlinux.lds.c [deleted file]

index 90e5afff54a2d1d537e0bf202d1effb61244e803..989fcd1fef7ed4fd048096b88b18c98d366d1237 100644 (file)
@@ -11,8 +11,3 @@ obj-y                         += signal.o sys_avr32.o process.o time.o
 obj-y                          += init_task.o switch_to.o cpu.o
 obj-$(CONFIG_MODULES)          += module.o avr32_ksyms.o
 obj-$(CONFIG_KPROBES)          += kprobes.o
-
-USE_STANDARD_AS_RULE           := true
-
-%.lds: %.lds.c FORCE
-       $(call if_changed_dep,cpp_lds_S)
diff --git a/arch/avr32/kernel/vmlinux.lds.S b/arch/avr32/kernel/vmlinux.lds.S
new file mode 100644 (file)
index 0000000..db0438f
--- /dev/null
@@ -0,0 +1,142 @@
+/*
+ * AVR32 linker script for the Linux kernel
+ *
+ * Copyright (C) 2004-2006 Atmel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#define LOAD_OFFSET 0x00000000
+#include <asm-generic/vmlinux.lds.h>
+
+OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32")
+OUTPUT_ARCH(avr32)
+ENTRY(_start)
+
+/* Big endian */
+jiffies = jiffies_64 + 4;
+
+SECTIONS
+{
+       . = CONFIG_ENTRY_ADDRESS;
+       .init           : AT(ADDR(.init) - LOAD_OFFSET) {
+               _stext = .;
+               __init_begin = .;
+                       _sinittext = .;
+                       *(.text.reset)
+                       *(.init.text)
+                       /*
+                        * .exit.text is discarded at runtime, not
+                        * link time, to deal with references from
+                        * __bug_table
+                        */
+                       *(.exit.text)
+                       _einittext = .;
+               . = ALIGN(4);
+               __tagtable_begin = .;
+                       *(.taglist.init)
+               __tagtable_end = .;
+                       *(.init.data)
+               . = ALIGN(16);
+               __setup_start = .;
+                       *(.init.setup)
+               __setup_end = .;
+               . = ALIGN(4);
+               __initcall_start = .;
+                       INITCALLS
+               __initcall_end = .;
+               __con_initcall_start = .;
+                       *(.con_initcall.init)
+               __con_initcall_end = .;
+               __security_initcall_start = .;
+                       *(.security_initcall.init)
+               __security_initcall_end = .;
+#ifdef CONFIG_BLK_DEV_INITRD
+               . = ALIGN(32);
+               __initramfs_start = .;
+                       *(.init.ramfs)
+               __initramfs_end = .;
+#endif
+               . = ALIGN(4096);
+               __init_end = .;
+       }
+
+       . = ALIGN(8192);
+       .text           : AT(ADDR(.text) - LOAD_OFFSET) {
+               _evba = .;
+               _text = .;
+               *(.ex.text)
+               . = 0x50;
+               *(.tlbx.ex.text)
+               . = 0x60;
+               *(.tlbr.ex.text)
+               . = 0x70;
+               *(.tlbw.ex.text)
+               . = 0x100;
+               *(.scall.text)
+               *(.irq.text)
+               TEXT_TEXT
+               SCHED_TEXT
+               LOCK_TEXT
+               KPROBES_TEXT
+               *(.fixup)
+               *(.gnu.warning)
+               _etext = .;
+       } = 0xd703d703
+
+       . = ALIGN(4);
+       __ex_table      : AT(ADDR(__ex_table) - LOAD_OFFSET) {
+               __start___ex_table = .;
+               *(__ex_table)
+               __stop___ex_table = .;
+       }
+
+       BUG_TABLE
+
+       RODATA
+
+       . = ALIGN(8192);
+
+       .data           : AT(ADDR(.data) - LOAD_OFFSET) {
+               _data = .;
+               _sdata = .;
+               /*
+                * First, the init task union, aligned to an 8K boundary.
+                */
+               *(.data.init_task)
+
+               /* Then, the cacheline aligned data */
+               . = ALIGN(32);
+               *(.data.cacheline_aligned)
+
+               /* And the rest... */
+               *(.data.rel*)
+               DATA_DATA
+               CONSTRUCTORS
+
+               _edata = .;
+       }
+
+
+       . = ALIGN(8);
+       .bss            : AT(ADDR(.bss) - LOAD_OFFSET) {
+               __bss_start = .;
+               *(.bss)
+               *(COMMON)
+               . = ALIGN(8);
+               __bss_stop = .;
+               _end = .;
+       }
+
+       /* When something in the kernel is NOT compiled as a module, the module
+        * cleanup code and data are put into these segments. Both can then be
+        * thrown away, as cleanup code is never called unless it's a module.
+        */
+       /DISCARD/               : {
+               *(.exit.data)
+               *(.exitcall.exit)
+       }
+
+       DWARF_DEBUG
+}
diff --git a/arch/avr32/kernel/vmlinux.lds.c b/arch/avr32/kernel/vmlinux.lds.c
deleted file mode 100644 (file)
index db0438f..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * AVR32 linker script for the Linux kernel
- *
- * Copyright (C) 2004-2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#define LOAD_OFFSET 0x00000000
-#include <asm-generic/vmlinux.lds.h>
-
-OUTPUT_FORMAT("elf32-avr32", "elf32-avr32", "elf32-avr32")
-OUTPUT_ARCH(avr32)
-ENTRY(_start)
-
-/* Big endian */
-jiffies = jiffies_64 + 4;
-
-SECTIONS
-{
-       . = CONFIG_ENTRY_ADDRESS;
-       .init           : AT(ADDR(.init) - LOAD_OFFSET) {
-               _stext = .;
-               __init_begin = .;
-                       _sinittext = .;
-                       *(.text.reset)
-                       *(.init.text)
-                       /*
-                        * .exit.text is discarded at runtime, not
-                        * link time, to deal with references from
-                        * __bug_table
-                        */
-                       *(.exit.text)
-                       _einittext = .;
-               . = ALIGN(4);
-               __tagtable_begin = .;
-                       *(.taglist.init)
-               __tagtable_end = .;
-                       *(.init.data)
-               . = ALIGN(16);
-               __setup_start = .;
-                       *(.init.setup)
-               __setup_end = .;
-               . = ALIGN(4);
-               __initcall_start = .;
-                       INITCALLS
-               __initcall_end = .;
-               __con_initcall_start = .;
-                       *(.con_initcall.init)
-               __con_initcall_end = .;
-               __security_initcall_start = .;
-                       *(.security_initcall.init)
-               __security_initcall_end = .;
-#ifdef CONFIG_BLK_DEV_INITRD
-               . = ALIGN(32);
-               __initramfs_start = .;
-                       *(.init.ramfs)
-               __initramfs_end = .;
-#endif
-               . = ALIGN(4096);
-               __init_end = .;
-       }
-
-       . = ALIGN(8192);
-       .text           : AT(ADDR(.text) - LOAD_OFFSET) {
-               _evba = .;
-               _text = .;
-               *(.ex.text)
-               . = 0x50;
-               *(.tlbx.ex.text)
-               . = 0x60;
-               *(.tlbr.ex.text)
-               . = 0x70;
-               *(.tlbw.ex.text)
-               . = 0x100;
-               *(.scall.text)
-               *(.irq.text)
-               TEXT_TEXT
-               SCHED_TEXT
-               LOCK_TEXT
-               KPROBES_TEXT
-               *(.fixup)
-               *(.gnu.warning)
-               _etext = .;
-       } = 0xd703d703
-
-       . = ALIGN(4);
-       __ex_table      : AT(ADDR(__ex_table) - LOAD_OFFSET) {
-               __start___ex_table = .;
-               *(__ex_table)
-               __stop___ex_table = .;
-       }
-
-       BUG_TABLE
-
-       RODATA
-
-       . = ALIGN(8192);
-
-       .data           : AT(ADDR(.data) - LOAD_OFFSET) {
-               _data = .;
-               _sdata = .;
-               /*
-                * First, the init task union, aligned to an 8K boundary.
-                */
-               *(.data.init_task)
-
-               /* Then, the cacheline aligned data */
-               . = ALIGN(32);
-               *(.data.cacheline_aligned)
-
-               /* And the rest... */
-               *(.data.rel*)
-               DATA_DATA
-               CONSTRUCTORS
-
-               _edata = .;
-       }
-
-
-       . = ALIGN(8);
-       .bss            : AT(ADDR(.bss) - LOAD_OFFSET) {
-               __bss_start = .;
-               *(.bss)
-               *(COMMON)
-               . = ALIGN(8);
-               __bss_stop = .;
-               _end = .;
-       }
-
-       /* When something in the kernel is NOT compiled as a module, the module
-        * cleanup code and data are put into these segments. Both can then be
-        * thrown away, as cleanup code is never called unless it's a module.
-        */
-       /DISCARD/               : {
-               *(.exit.data)
-               *(.exitcall.exit)
-       }
-
-       DWARF_DEBUG
-}