From f8a2dddb573faef41ad43ee111d91d4c5259ad59 Mon Sep 17 00:00:00 2001
From: Eric Biederman <ebiederm@xmission.com>
Date: Sat, 30 Oct 2004 08:05:41 +0000
Subject: - To reduce confuse rename the parts of linuxbios bios that run from 
  ram linuxbios_ram instead of linuxbios_c and linuxbios_payload... -
 Reordered the linker sections so the LinuxBIOS fallback image can take more
 the 64KiB on x86 - ROM_IMAGE_SIZE now will work when it is specified as
 larger than 64KiB. - Tweaked the reset16.inc and reset16.lds to move the
 sanity check to see if everything will work. - Start using romcc's built in
 preprocessor (This will simplify header compiler checks) - Add helper
 functions for examining all of the resources - Remove debug strings from
 chip.h - Add llshell to src/arch/i386/llshell (Sometime later I can try
 it...) - Add the ability to catch exceptions on x86 - Add gdb_stub support to
 x86 - Removed old cpu options - Added an option so we can detect movnti
 support - Remove some duplicate definitions from pci_ids.h - Remove the 64bit
 resource code in amdk8/northbridge.c in preparation for making it generic -
 Minor romcc bug fixes

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1727 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 src/arch/ppc/init/ldscript.lb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'src/arch/ppc/init')

diff --git a/src/arch/ppc/init/ldscript.lb b/src/arch/ppc/init/ldscript.lb
index a8ad86f1c0..63a32b735d 100644
--- a/src/arch/ppc/init/ldscript.lb
+++ b/src/arch/ppc/init/ldscript.lb
@@ -26,7 +26,7 @@ OUTPUT_FORMAT("elf32-powerpc")
 ENTRY(_start)
 
 TARGET(binary)
-INPUT(linuxbios_payload)
+INPUT(linuxbios_ram.rom)
 SECTIONS
 {
 	/* 
@@ -63,7 +63,7 @@ SECTIONS
 		*(.text);
 		*(.rom.data);
 		*(.rodata);
-		*(EXCLUDE_FILE(linuxbios_payload) .data);
+		*(EXCLUDE_FILE(linuxbios_ram.rom) .data);
 		. = ALIGN(16);
 		_erom = .;
 	}
@@ -71,21 +71,21 @@ SECTIONS
 	_elrom = LOADADDR(.rom) + SIZEOF(.rom);
 	
 	/*
-	 * Payload is LinuxBIOS proper.
+	 * Ram is the LinuxBIOS code that runs from RAM.
 	 */
-	.payload . : {
-		_payload = . ;
-		linuxbios_payload(*)
-		_epayload = . ;
+	.ram . : {
+		_ram = . ;
+		linuxbios_ram.rom(*)
+		_eram = . ;
 	}
 
 	/*
-	 * Absolute location of where payload will be relocated in RAM.
+	 * Absolute location of where LinuxBIOS will be relocated in RAM.
 	 */
 	_iseg = _RAMBASE;
-	_eiseg = _iseg + SIZEOF(.payload);
-	_liseg = _payload;
-	_eliseg = _epayload;
+	_eiseg = _iseg + SIZEOF(.ram);
+	_liseg = _ram;
+	_eliseg = _eram;
 
 	/DISCARD/ : {
 		*(.comment)
-- 
cgit v1.2.3