Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/m68k/kernel/vmlinux.lds.S

+11 −2
Original line number Diff line number Diff line 
#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

arch/m68k/kernel/vmlinux.lds_mm.S

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
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