aboutsummaryrefslogtreecommitdiff
path: root/arch/m68k/kernel/vmlinux-nommu.lds
diff options
context:
space:
mode:
authorGreg Ungerer2011-10-19 13:50:35 +1000
committerGreg Ungerer2011-12-30 10:20:44 +1000
commited865e31a8273be200db9ddcdb6b844e48777abd (patch)
tree5e8b53988669ab4432052ad923d2a057eccf82a4 /arch/m68k/kernel/vmlinux-nommu.lds
parent4a13c6dc6443786b135c9e9b3f9dc87421cc1ae3 (diff)
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-nommu.lds')
-rw-r--r--arch/m68k/kernel/vmlinux-nommu.lds8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/m68k/kernel/vmlinux-nommu.lds b/arch/m68k/kernel/vmlinux-nommu.lds
index 4e2389340837..8e66ccb0935e 100644
--- 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 = .;