diff options
author | Greg Ungerer <gerg@uclinux.org> | 2011-12-08 15:39:05 +1000 |
---|---|---|
committer | Greg Ungerer <gerg@uclinux.org> | 2011-12-24 21:47:58 +1000 |
commit | 40c1b9cfeedf79b909c961e0e00a13497e80bc82 (patch) | |
tree | df8d3173c755e87558c88d2e2064b6fdba8718d3 | |
parent | 45f9e2cdcd958691cc691ad1ca2b1e8b9f535967 (diff) | |
download | linux-stable-40c1b9cfeedf79b909c961e0e00a13497e80bc82.tar.gz linux-stable-40c1b9cfeedf79b909c961e0e00a13497e80bc82.tar.bz2 linux-stable-40c1b9cfeedf79b909c961e0e00a13497e80bc82.zip |
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>
-rw-r--r-- | arch/m68k/kernel/vmlinux-nommu.lds (renamed from arch/m68k/kernel/vmlinux.lds_no.S) | 0 | ||||
-rw-r--r-- | arch/m68k/kernel/vmlinux.lds.S | 13 | ||||
-rw-r--r-- | arch/m68k/kernel/vmlinux.lds_mm.S | 10 |
3 files changed, 11 insertions, 12 deletions
diff --git a/arch/m68k/kernel/vmlinux.lds_no.S b/arch/m68k/kernel/vmlinux-nommu.lds index 4e2389340837..4e2389340837 100644 --- a/arch/m68k/kernel/vmlinux.lds_no.S +++ b/arch/m68k/kernel/vmlinux-nommu.lds 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 @@ #ifdef CONFIG_MMU -#include "vmlinux.lds_mm.S" +PHDRS +{ + text PT_LOAD FILEHDR PHDRS FLAGS (7); + data PT_LOAD FLAGS (7); +} +#ifdef CONFIG_SUN3 +#include "vmlinux-sun3.lds" #else -#include "vmlinux.lds_no.S" +#include "vmlinux-std.lds" +#endif +#else +#include "vmlinux-nommu.lds" #endif diff --git a/arch/m68k/kernel/vmlinux.lds_mm.S b/arch/m68k/kernel/vmlinux.lds_mm.S deleted file mode 100644 index 99ba315bd0a8..000000000000 --- a/arch/m68k/kernel/vmlinux.lds_mm.S +++ /dev/null @@ -1,10 +0,0 @@ -PHDRS -{ - text PT_LOAD FILEHDR PHDRS FLAGS (7); - data PT_LOAD FLAGS (7); -} -#ifdef CONFIG_SUN3 -#include "vmlinux-sun3.lds" -#else -#include "vmlinux-std.lds" -#endif |