diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-11-27 16:55:13 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-11-27 16:55:13 +0000 |
| commit | 436f99b72a75e38c4a1558a23642ea838e621745 (patch) | |
| tree | 2030053c23283ddee57d7019d364e408cbb278d9 /src/mainboard/msi/ms9282 | |
| parent | c58290c2ff3a77ebca00d9d2edbe005d6e950e0f (diff) | |
| download | coreboot-436f99b72a75e38c4a1558a23642ea838e621745.tar.xz | |
Eliminate special case id.inc/id.lds in favor of a configuration variable ID_SECTION_OFFSET
which is normally set to 0x10 (the current default) and set to 0x80 (the current alternative)
where necessary (if romstraps get in the way).
For Kconfig, the special case is set per southbridge (as these define the necessity for this
workaround), for newconfig it's added to each single board.
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4962 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/msi/ms9282')
| -rw-r--r-- | src/mainboard/msi/ms9282/Config.lb | 4 | ||||
| -rw-r--r-- | src/mainboard/msi/ms9282/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/mainboard/msi/ms9282/Options.lb | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/mainboard/msi/ms9282/Config.lb b/src/mainboard/msi/ms9282/Config.lb index 8faf6117f4..ec1211e7b4 100644 --- a/src/mainboard/msi/ms9282/Config.lb +++ b/src/mainboard/msi/ms9282/Config.lb @@ -94,8 +94,8 @@ end ## ## Include an id string (For safe flashing) ## -mainboardinit southbridge/nvidia/mcp55/id.inc -ldscript /southbridge/nvidia/mcp55/id.lds +mainboardinit arch/i386/lib/id.inc +ldscript /arch/i386/lib/id.lds ## ## ROMSTRAP table for MCP55 diff --git a/src/mainboard/msi/ms9282/Makefile.inc b/src/mainboard/msi/ms9282/Makefile.inc index 510ee6f046..d04e6f5731 100644 --- a/src/mainboard/msi/ms9282/Makefile.inc +++ b/src/mainboard/msi/ms9282/Makefile.inc @@ -35,14 +35,14 @@ initobj-y += crt0.o crt0-y += ../../../../src/cpu/x86/16bit/entry16.inc crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc -crt0-y += ../../../../src/southbridge/nvidia/mcp55/id.inc +crt0-y += ../../../../src/arch/i386/lib/id.inc crt0-y += ../../../../src/cpu/amd/car/cache_as_ram.inc crt0-y += auto.inc ldscript-y += ../../../../src/arch/i386/init/ldscript_fallback_cbfs.lb ldscript-y += ../../../../src/cpu/x86/16bit/entry16.lds ldscript-y += ../../../../src/cpu/x86/16bit/reset16.lds -ldscript-y += ../../../../src/southbridge/nvidia/mcp55/id.lds +ldscript-y += ../../../../src/arch/i386/lib/id.lds ldscript-y += ../../../../src/arch/i386/lib/failover.lds ldscript-$(CONFIG_AP_CODE_IN_CAR) += ../../../../src/arch/i386/init/ldscript_apc.lb diff --git a/src/mainboard/msi/ms9282/Options.lb b/src/mainboard/msi/ms9282/Options.lb index 146cc217e0..ee8be01679 100644 --- a/src/mainboard/msi/ms9282/Options.lb +++ b/src/mainboard/msi/ms9282/Options.lb @@ -99,6 +99,8 @@ uses CONFIG_COMPRESSED_PAYLOAD_NRV2B uses CONFIG_PRECOMPRESSED_PAYLOAD uses CONFIG_USE_PRINTK_IN_CAR +uses CONFIG_ID_SECTION_OFFSET + ## CONFIG_ROM_SIZE is the size of boot ROM that this board will use. #512K bytes default CONFIG_ROM_SIZE=524288 @@ -303,5 +305,7 @@ default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8 ## Select power on after power fail setting default CONFIG_MAINBOARD_POWER_ON_AFTER_POWER_FAIL="MAINBOARD_POWER_ON" +default CONFIG_ID_SECTION_OFFSET=0x80 + ### End Options.lb end |