diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-12-08 06:39:05 +0100 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-12-24 12:47:58 +0100 |
| commit | 40c1b9cfeedf79b909c961e0e00a13497e80bc82 (patch) | |
| tree | df8d3173c755e87558c88d2e2064b6fdba8718d3 /arch/m68k/kernel/vmlinux.lds.S | |
| parent | m68knommu: remove unused anchor.h include file (diff) | |
| download | linux-40c1b9cfeedf79b909c961e0e00a13497e80bc82.tar.xz linux-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>
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 @@ #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 |