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>
This commit is contained in:
parent
45f9e2cdcd
commit
40c1b9cfee
|
@ -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
|
||||
|
|
|
@ -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
|
Loading…
Reference in New Issue