From 436f99b72a75e38c4a1558a23642ea838e621745 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Fri, 27 Nov 2009 16:55:13 +0000 Subject: 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 Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4962 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/sunw/ultra40/Config.lb | 4 ++-- src/mainboard/sunw/ultra40/Options.lb | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/mainboard/sunw') diff --git a/src/mainboard/sunw/ultra40/Config.lb b/src/mainboard/sunw/ultra40/Config.lb index b00c2bc331..2781be8d77 100644 --- a/src/mainboard/sunw/ultra40/Config.lb +++ b/src/mainboard/sunw/ultra40/Config.lb @@ -62,8 +62,8 @@ end ## ## Include an id string (For safe flashing) ## -mainboardinit southbridge/nvidia/ck804/id.inc -ldscript /southbridge/nvidia/ck804/id.lds +mainboardinit arch/i386/lib/id.inc +ldscript /arch/i386/lib/id.lds ## ## ROMSTRAP table for CK804 diff --git a/src/mainboard/sunw/ultra40/Options.lb b/src/mainboard/sunw/ultra40/Options.lb index c9d550ed8d..e820fd03f8 100644 --- a/src/mainboard/sunw/ultra40/Options.lb +++ b/src/mainboard/sunw/ultra40/Options.lb @@ -69,6 +69,8 @@ uses CONFIG_HT_CHAIN_END_UNITID_BASE uses CONFIG_SB_HT_CHAIN_ON_BUS0 uses CONFIG_SB_HT_CHAIN_UNITID_OFFSET_ONLY +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 @@ -272,5 +274,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 -- cgit v1.2.3