m68k: use non-MMU linker script for ColdFire MMU builds

Use the non-MMU linker script for ColdFire builds when we are building
for MMU enabled. The image layout is correct for loading on existing
ColdFire dev boards. The only addition required to the current non-MMU
linker script is to add support for the fixup section.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Matt Waddel <mwaddel@yahoo.com>
Acked-by: Kurt Mahan <kmahan@xmission.com>

diff --git a/arch/m68k/kernel/vmlinux-nommu.lds b/arch/m68k/kernel/vmlinux-nommu.lds
index 4e2389340837703f9fed3fa37425a386aa53d086..8e66ccb0935ee5c408e17c4614b66397cc1dbbdf 100644 (file)
--- a/arch/m68k/kernel/vmlinux-nommu.lds
+++ b/arch/m68k/kernel/vmlinux-nommu.lds
@@ -69,6 +69,7 @@ SECTIONS {
                SCHED_TEXT
                LOCK_TEXT
                *(.text..lock)
+               *(.fixup)
 
                . = ALIGN(16);          /* Exception table              */
                __start___ex_table = .;
@@ -161,6 +162,13 @@ SECTIONS {
                _edata = . ;
        } > DATA
 
+       .m68k_fixup : {
+               __start_fixup = .;
+               *(.m68k_fixup)
+               __stop_fixup = .;
+       } > DATA
+       NOTES > DATA
+
        .init.text : {
                . = ALIGN(PAGE_SIZE);
                __init_begin = .;

diff --git a/arch/m68k/kernel/vmlinux.lds.S b/arch/m68k/kernel/vmlinux.lds.S
index 3d99a04f2394550906a0fd4cc32fab953a6b7916..69ec796388706bbda7dbccfaf6e5ffa1e6f9d4a8 100644 (file)
--- a/arch/m68k/kernel/vmlinux.lds.S
+++ b/arch/m68k/kernel/vmlinux.lds.S
@@ -1,4 +1,4 @@
-#ifdef CONFIG_MMU
+#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE)
 PHDRS
 {
   text PT_LOAD FILEHDR PHDRS FLAGS (7);