m68k: consolidate the vmlinux.lds linker scripts
authorGreg Ungerer <gerg@uclinux.org>
Thu, 8 Dec 2011 05:39:05 +0000 (15:39 +1000)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 26 Oct 2013 20:06:10 +0000 (21:06 +0100)
commit2187004fa49f190aa89eb1e3cc01623d62f480a8
tree2f1737ade7a945100ef0fbd6f1f2070355faa3c3
parent38e57772a96d382cc6783f26cb152702f686b25f
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 <gerg@uclinux.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
arch/m68k/kernel/vmlinux-nommu.lds [moved from arch/m68k/kernel/vmlinux.lds_no.S with 100% similarity]
arch/m68k/kernel/vmlinux.lds.S
arch/m68k/kernel/vmlinux.lds_mm.S [deleted file]