[commit] r5151 - trunk/src/arch/i386/init

[repository service]

Author: oxygene
Date: Tue Feb 23 20:38:44 2010
New Revision: 5151
URL: http://tracker.coreboot.org/trac/coreboot/changeset/5151

Log:
- Remove src/arch/i386/init/ldscript_cbfs.lb as it's not used anymore
- Remove _lrom and _elrom, as they're only set but never used
- Make bootblock size dynamic in the tiny bootblock case.
  It's 0.5-3K instead of 64K now.

Signed-off-by: Patrick Georgi 
Acked-by: Peter Stuge

Deleted:
   trunk/src/arch/i386/init/ldscript_cbfs.lb
Modified:
   trunk/src/arch/i386/init/ldscript_failover.lb
   trunk/src/arch/i386/init/ldscript_fallback_cbfs.lb

Modified: trunk/src/arch/i386/init/ldscript_failover.lb
==============================================================================
--- trunk/src/arch/i386/init/ldscript_failover.lb	Tue Feb 23 17:54:20 2010	(r5150)
+++ trunk/src/arch/i386/init/ldscript_failover.lb	Tue Feb 23 20:38:44 2010	(r5151)
@@ -27,33 +27,34 @@
 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
 OUTPUT_ARCH(i386)

-/*
-ENTRY(_start)
-*/
+MEMORY {
+	rom : ORIGIN = 0xffff0000, LENGTH = 64K
+}

TARGET(binary)
 SECTIONS
 {
-	. = CONFIG_ROMBASE;
+	. = 0;

/* This section might be better named .setup */
-	.rom . : {
+	.rom ROMLOC : {
    	_rom = .;
    	*(.rom.text);
    	*(.rom.data);
    	*(.rom.data.*);
    	*(.rodata.*);
-		. = ALIGN(16);
    	_erom = .;
-	}
+	} >rom =0xff

-	_lrom = LOADADDR(.rom);
-	_elrom = LOADADDR(.rom) + SIZEOF(.rom);
+	ROMLOC = 0xffffff00 - (_erom - _rom) + 1;

/DISCARD/ : {
    	*(.comment)
    	*(.note)
    	*(.comment.*)
    	*(.note.*)
+		*(.iplt)
+		*(.rel.*)
+		*(.igot.*)
    }
 }

Modified: trunk/src/arch/i386/init/ldscript_fallback_cbfs.lb
==============================================================================
--- trunk/src/arch/i386/init/ldscript_fallback_cbfs.lb	Tue Feb 23 17:54:20 2010	(r5150)
+++ trunk/src/arch/i386/init/ldscript_fallback_cbfs.lb	Tue Feb 23 20:38:44 2010	(r5151)
@@ -53,9 +53,6 @@
    	_erom = .;
    }

-	_lrom = LOADADDR(.rom);
-	_elrom = LOADADDR(.rom) + SIZEOF(.rom);
-
    /DISCARD/ : {
    	*(.comment)
    	*(.note)