From 2187004fa49f190aa89eb1e3cc01623d62f480a8 Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Thu, 8 Dec 2011 15:39:05 +1000 Subject: [PATCH] m68k: consolidate the vmlinux.lds linker scripts commit 40c1b9cfeedf79b909c961e0e00a13497e80bc82 upstream. 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 Signed-off-by: Ben Hutchings --- .../kernel/{vmlinux.lds_no.S => vmlinux-nommu.lds} | 0 arch/m68k/kernel/vmlinux.lds.S | 13 +++++++++++-- arch/m68k/kernel/vmlinux.lds_mm.S | 10 ---------- 3 files changed, 11 insertions(+), 12 deletions(-) rename arch/m68k/kernel/{vmlinux.lds_no.S => vmlinux-nommu.lds} (100%) delete mode 100644 arch/m68k/kernel/vmlinux.lds_mm.S diff --git a/arch/m68k/kernel/vmlinux.lds_no.S b/arch/m68k/kernel/vmlinux-nommu.lds similarity index 100% rename from arch/m68k/kernel/vmlinux.lds_no.S rename to 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 -- 2.39.2