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

Commit ed865e31 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarMatt Waddel <mwaddel@yahoo.com>
Acked-by: default avatarKurt Mahan <kmahan@xmission.com>
parent 4a13c6dc

arch/m68k/kernel/vmlinux-nommu.lds

+8 −0
Original line number Diff line number Diff line
@@ -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 = .;

arch/m68k/kernel/vmlinux.lds.S

+1 −1
Original line number Diff line number Diff line 
#ifdef CONFIG_MMU

#if defined(CONFIG_MMU) && !defined(CONFIG_COLDFIRE)

PHDRS

{

  text PT_LOAD FILEHDR PHDRS FLAGS (7);