diff options
author | Greg Ungerer <gerg@uclinux.org> | 2011-12-08 00:39:05 -0500 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2011-12-24 06:47:58 -0500 |
commit | 40c1b9cfeedf79b909c961e0e00a13497e80bc82 (patch) | |
tree | df8d3173c755e87558c88d2e2064b6fdba8718d3 /arch/m68k/kernel/vmlinux.lds.S | |
parent | 45f9e2cdcd958691cc691ad1ca2b1e8b9f535967 (diff) |
m68k: consolidate the vmlinux.lds linker scripts
The merge of m68knommu left the linker scripts a little disorganized.
Some consistent naming and squashing two of scripts that just include
others can simplify things a lot.
So merge the two simple including scripts, and rename the nommu script
to be consistent with the existing m68k linker scripts.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/kernel/vmlinux.lds.S')
-rw-r--r-- | arch/m68k/kernel/vmlinux.lds.S | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/m68k/kernel/vmlinux.lds.S b/arch/m68k/kernel/vmlinux.lds.S index 030dabf0bc53..3d99a04f2394 100644 --- a/arch/m68k/kernel/vmlinux.lds.S +++ b/arch/m68k/kernel/vmlinux.lds.S | |||
@@ -1,5 +1,14 @@ | |||
1 | #ifdef CONFIG_MMU | 1 | #ifdef CONFIG_MMU |
2 | #include "vmlinux.lds_mm.S" | 2 | PHDRS |
3 | { | ||
4 | text PT_LOAD FILEHDR PHDRS FLAGS (7); | ||
5 | data PT_LOAD FLAGS (7); | ||
6 | } | ||
7 | #ifdef CONFIG_SUN3 | ||
8 | #include "vmlinux-sun3.lds" | ||
3 | #else | 9 | #else |
4 | #include "vmlinux.lds_no.S" | 10 | #include "vmlinux-std.lds" |
11 | #endif | ||
12 | #else | ||
13 | #include "vmlinux-nommu.lds" | ||
5 | #endif | 14 | #endif |