renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 22:24:09 +08:00
Code

m68k: consolidate the vmlinux.lds linker scripts

Browse Source 
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:
Greg Ungerer 2011-12-08 15:39:05 +10:00
parent 45f9e2cdcd
commit 40c1b9cfee
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
arch/m68k/kernel/vmlinux.lds_no.S → arch/m68k/kernel/vmlinux-nommu.lds
View File

13
arch/m68k/kernel/vmlinux.lds.S
View File

@ -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

10
arch/m68k/kernel/vmlinux.lds_mm.S
View File

@ -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