summaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2011-10-19 05:50:35 +0200
committerGreg Ungerer <gerg@uclinux.org>2011-12-30 01:20:44 +0100
commited865e31a8273be200db9ddcdb6b844e48777abd (patch)
tree5e8b53988669ab4432052ad923d2a057eccf82a4 /arch/m68k/kernel/vmlinux.lds.S
parentm68k: ColdFire with MMU enabled uses same clocking code as non-MMU (diff)
downloadlinux-ed865e31a8273be200db9ddcdb6b844e48777abd.tar.xz
linux-ed865e31a8273be200db9ddcdb6b844e48777abd.zip
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>
Diffstat (limited to 'arch/m68k/kernel/vmlinux.lds.S')
-rw-r--r--arch/m68k/kernel/vmlinux.lds.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/kernel/vmlinux.lds.S b/arch/m68k/kernel/vmlinux.lds.S
index 3d99a04f2394..69ec79638870 100644
--- 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);