Commit 40c1b9cf authored by Greg Ungerer's avatar Greg Ungerer

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: default avatarGreg Ungerer <gerg@uclinux.org>
parent 45f9e2cd
#ifdef CONFIG_MMU #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 #else
#include "vmlinux.lds_no.S" #include "vmlinux-std.lds"
#endif
#else
#include "vmlinux-nommu.lds"
#endif #endif
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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment