[commit] r6496 - in trunk/src: arch/x86 arch/x86/lib cpu/x86/16bit northbridge/via/vx800 southbridge/nvidia/ck804 southbridge/nvidia/mcp55 southbridge/sis/sis966 southbridge/via/k8t890

[repository service]

Author: stepan
Date: Thu Apr 14 22:21:49 2011
New Revision: 6496
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6496

Log:
drop incorrectly used CONFIG_ROM_IMAGE_SIZE and unused CONFIG_ARCH

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified:
   trunk/src/arch/x86/Kconfig
   trunk/src/arch/x86/lib/id.lds
   trunk/src/cpu/x86/16bit/reset16.lds
   trunk/src/northbridge/via/vx800/romstrap.lds
   trunk/src/southbridge/nvidia/ck804/romstrap.lds
   trunk/src/southbridge/nvidia/mcp55/romstrap.lds
   trunk/src/southbridge/sis/sis966/romstrap.lds
   trunk/src/southbridge/via/k8t890/romstrap.lds

Modified: trunk/src/arch/x86/Kconfig
==============================================================================
--- trunk/src/arch/x86/Kconfig	Thu Apr 14 22:11:34 2011	(r6495)
+++ trunk/src/arch/x86/Kconfig	Thu Apr 14 22:21:49 2011	(r6496)
@@ -8,20 +8,10 @@
    default n
    depends on ARCH_X86

-# This is the name of the respective architecture subdirectory in arch/.
-config ARCH
-	string
-	default i386
-	depends on ARCH_X86
-
 config ROMBASE
    hex
    default 0xffff0000

-config ROM_IMAGE_SIZE
-	hex
-	default 0x10000
-
 config RAMBASE
    hex
    default 0x100000

Modified: trunk/src/arch/x86/lib/id.lds
==============================================================================
--- trunk/src/arch/x86/lib/id.lds	Thu Apr 14 22:11:34 2011	(r6495)
+++ trunk/src/arch/x86/lib/id.lds	Thu Apr 14 22:21:49 2011	(r6496)
@@ -1,5 +1,5 @@
 SECTIONS {
-	. = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - CONFIG_ID_SECTION_OFFSET) - (__id_end - __id_start);
+	. = (0x100000000 - CONFIG_ID_SECTION_OFFSET) - (__id_end - __id_start);
    .id (.): {
    	*(.id)
    }

Modified: trunk/src/cpu/x86/16bit/reset16.lds
==============================================================================
--- trunk/src/cpu/x86/16bit/reset16.lds	Thu Apr 14 22:11:34 2011	(r6495)
+++ trunk/src/cpu/x86/16bit/reset16.lds	Thu Apr 14 22:21:49 2011	(r6496)
@@ -5,7 +5,7 @@

SECTIONS {
    /* Trigger an error if I have an unuseable start address */
-	_bogus = ASSERT(_start >= 0xffff0000, "_start too low. Please decrease CONFIG_ROM_IMAGE_SIZE");
+	_bogus = ASSERT(_start >= 0xffff0000, "_start too low. Please report.");
    _ROMTOP = 0xfffffff0;
    . = _ROMTOP;
    .reset . : {

Modified: trunk/src/northbridge/via/vx800/romstrap.lds
==============================================================================
--- trunk/src/northbridge/via/vx800/romstrap.lds	Thu Apr 14 22:11:34 2011	(r6495)
+++ trunk/src/northbridge/via/vx800/romstrap.lds	Thu Apr 14 22:21:49 2011	(r6496)
@@ -19,7 +19,7 @@
  */

SECTIONS {
-	. = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x2c) - (__romstrap_end - __romstrap_start);
+	. = (0x100000000 - 0x2c) - (__romstrap_end - __romstrap_start);
    .romstrap (.): {
    	*(.romstrap)
    }

Modified: trunk/src/southbridge/nvidia/ck804/romstrap.lds
==============================================================================
--- trunk/src/southbridge/nvidia/ck804/romstrap.lds	Thu Apr 14 22:11:34 2011	(r6495)
+++ trunk/src/southbridge/nvidia/ck804/romstrap.lds	Thu Apr 14 22:21:49 2011	(r6496)
@@ -19,7 +19,7 @@
  */

SECTIONS {
-	. = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x10) - (__romstrap_end - __romstrap_start);
+	. = (0x100000000 - 0x10) - (__romstrap_end - __romstrap_start);
    .romstrap (.): {
    	*(.romstrap)
    }

Modified: trunk/src/southbridge/nvidia/mcp55/romstrap.lds
==============================================================================
--- trunk/src/southbridge/nvidia/mcp55/romstrap.lds	Thu Apr 14 22:11:34 2011	(r6495)
+++ trunk/src/southbridge/nvidia/mcp55/romstrap.lds	Thu Apr 14 22:21:49 2011	(r6496)
@@ -20,7 +20,7 @@
  */

SECTIONS {
-	. = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x10) - (__romstrap_end - __romstrap_start);
+	. = (0x100000000 - 0x10) - (__romstrap_end - __romstrap_start);
    .romstrap (.): {
    	*(.romstrap)
    }

Modified: trunk/src/southbridge/sis/sis966/romstrap.lds
==============================================================================
--- trunk/src/southbridge/sis/sis966/romstrap.lds	Thu Apr 14 22:11:34 2011	(r6495)
+++ trunk/src/southbridge/sis/sis966/romstrap.lds	Thu Apr 14 22:21:49 2011	(r6496)
@@ -20,7 +20,7 @@
  */

SECTIONS {
-	. = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x10) - (__romstrap_end - __romstrap_start);
+	. = (0x100000000 - 0x10) - (__romstrap_end - __romstrap_start);
    .romstrap (.): {
    	*(.romstrap)
    }

Modified: trunk/src/southbridge/via/k8t890/romstrap.lds
==============================================================================
--- trunk/src/southbridge/via/k8t890/romstrap.lds	Thu Apr 14 22:11:34 2011	(r6495)
+++ trunk/src/southbridge/via/k8t890/romstrap.lds	Thu Apr 14 22:21:49 2011	(r6496)
@@ -22,7 +22,7 @@
 /* Modified for K8T890 ROM strap by Rudolf Marek . */

SECTIONS {
-	. = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x2c) - (__romstrap_end - __romstrap_start);
+	. = (0x100000000 - 0x2c) - (__romstrap_end - __romstrap_start);
    .romstrap (.): {
    	*(.romstrap)
    }