diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2011-04-14 20:21:49 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2011-04-14 20:21:49 +0000 |
| commit | 8902502c4ad04909c5fdfa7b7a3384bfb696731b (patch) | |
| tree | 48c936102db57f43052a60873f3e3bd62979fbd6 | |
| parent | 61089587640646022359c97e79aede4560566305 (diff) | |
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
| -rw-r--r-- | src/arch/x86/Kconfig | 10 | ||||
| -rw-r--r-- | src/arch/x86/lib/id.lds | 2 | ||||
| -rw-r--r-- | src/cpu/x86/16bit/reset16.lds | 2 | ||||
| -rw-r--r-- | src/northbridge/via/vx800/romstrap.lds | 2 | ||||
| -rw-r--r-- | src/southbridge/nvidia/ck804/romstrap.lds | 2 | ||||
| -rw-r--r-- | src/southbridge/nvidia/mcp55/romstrap.lds | 2 | ||||
| -rw-r--r-- | src/southbridge/sis/sis966/romstrap.lds | 2 | ||||
| -rw-r--r-- | src/southbridge/via/k8t890/romstrap.lds | 2 |
8 files changed, 7 insertions, 17 deletions
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index aacc0982a6..a903827c11 100644 --- 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 d646270daf..9e31ee615c 100644 --- 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 cec03d6bc6..a31a580d12 100644 --- 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 66159e3a1c..4326b280a9 100644 --- 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 77f607caf2..c2ad368f01 100644 --- 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 c45f864152..c08aa32ca7 100644 --- 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 c45f864152..c08aa32ca7 100644 --- 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 6ce04f19ba..e2f470c8fb 100644 --- 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) } |