drop incorrectly used CONFIG_ROM_IMAGE_SIZE and unused CONFIG_ARCH

Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Acked-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6496 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index aacc0982a6c01b8646ef9f12222a02f954ac4de3..a903827c1148cebf9143e4209b3b14b3e0b362b0 100644 (file)
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -8,20 +8,10 @@ config AP_IN_SIPI_WAIT
        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

diff --git a/src/arch/x86/lib/id.lds b/src/arch/x86/lib/id.lds
index d646270dafa05d95793a03acbe8b5105ff5cf887..9e31ee615c87ab04b05b767c1f7a47a3b701fee1 100644 (file)
--- a/src/arch/x86/lib/id.lds
+++ b/src/arch/x86/lib/id.lds
@@ -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)
        }

diff --git a/src/cpu/x86/16bit/reset16.lds b/src/cpu/x86/16bit/reset16.lds
index cec03d6bc6612fa4ddfa7a6c0a3d0949238f5f0c..a31a580d120d842df046183507dd23d44654d133 100644 (file)
--- a/src/cpu/x86/16bit/reset16.lds
+++ b/src/cpu/x86/16bit/reset16.lds
@@ -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 . : {

diff --git a/src/northbridge/via/vx800/romstrap.lds b/src/northbridge/via/vx800/romstrap.lds
index 66159e3a1c80e4a7f1efb47b89020de12b6c3bb7..4326b280a92caa06507b22c699e578b5882e642c 100644 (file)
--- a/src/northbridge/via/vx800/romstrap.lds
+++ b/src/northbridge/via/vx800/romstrap.lds
@@ -19,7 +19,7 @@
  */
 
 SECTIONS {
-       . = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x2c) - (__romstrap_end - __romstrap_start);
+       . = (0x100000000 - 0x2c) - (__romstrap_end - __romstrap_start);
        .romstrap (.): {
                *(.romstrap)
        }

diff --git a/src/southbridge/nvidia/ck804/romstrap.lds b/src/southbridge/nvidia/ck804/romstrap.lds
index 77f607caf29ddbbd7571c1664b5613ab874cd0be..c2ad368f017df32c393810b2c43ea329a8ae42e6 100644 (file)
--- a/src/southbridge/nvidia/ck804/romstrap.lds
+++ b/src/southbridge/nvidia/ck804/romstrap.lds
@@ -19,7 +19,7 @@
  */
 
 SECTIONS {
-       . = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x10) - (__romstrap_end - __romstrap_start);
+       . = (0x100000000 - 0x10) - (__romstrap_end - __romstrap_start);
        .romstrap (.): {
                *(.romstrap)
        }

diff --git a/src/southbridge/nvidia/mcp55/romstrap.lds b/src/southbridge/nvidia/mcp55/romstrap.lds
index c45f864152a85a3387b0bda31ba47b562273beeb..c08aa32ca7ad66d73eaa41e91daccea7108fdbe7 100644 (file)
--- a/src/southbridge/nvidia/mcp55/romstrap.lds
+++ b/src/southbridge/nvidia/mcp55/romstrap.lds
@@ -20,7 +20,7 @@
  */
 
 SECTIONS {
-       . = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x10) - (__romstrap_end - __romstrap_start);
+       . = (0x100000000 - 0x10) - (__romstrap_end - __romstrap_start);
        .romstrap (.): {
                *(.romstrap)
        }

diff --git a/src/southbridge/sis/sis966/romstrap.lds b/src/southbridge/sis/sis966/romstrap.lds
index c45f864152a85a3387b0bda31ba47b562273beeb..c08aa32ca7ad66d73eaa41e91daccea7108fdbe7 100644 (file)
--- a/src/southbridge/sis/sis966/romstrap.lds
+++ b/src/southbridge/sis/sis966/romstrap.lds
@@ -20,7 +20,7 @@
  */
 
 SECTIONS {
-       . = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x10) - (__romstrap_end - __romstrap_start);
+       . = (0x100000000 - 0x10) - (__romstrap_end - __romstrap_start);
        .romstrap (.): {
                *(.romstrap)
        }

diff --git a/src/southbridge/via/k8t890/romstrap.lds b/src/southbridge/via/k8t890/romstrap.lds
index 6ce04f19ba60c48ac9247dd8444a5130d84b8141..e2f470c8fb054425069a0cb9266c1abcd2a01d66 100644 (file)
--- a/src/southbridge/via/k8t890/romstrap.lds
+++ b/src/southbridge/via/k8t890/romstrap.lds
@@ -22,7 +22,7 @@
 /* Modified for K8T890 ROM strap by Rudolf Marek <r.marek@assembler.cz>. */
 
 SECTIONS {
-       . = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - 0x2c) - (__romstrap_end - __romstrap_start);
+       . = (0x100000000 - 0x2c) - (__romstrap_end - __romstrap_start);
        .romstrap (.): {
                *(.romstrap)
        }