summaryrefslogtreecommitdiff
path: root/src/mainboard/intel
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2009-06-06 16:50:38 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2009-06-06 16:50:38 +0000
commitcff071ab0ed60c887ceeaafa2e722b07691fff10 (patch)
treec09d835ab165da775675faa71b099392e059270f /src/mainboard/intel
parenta7d8ae3b1d91f3f77496b065a7d5158893c4dd28 (diff)
downloadcoreboot-cff071ab0ed60c887ceeaafa2e722b07691fff10.tar.xz
When I started refactoring mainboard Config.lb, I added two different
files for targets without failover: src/config/nofailovercalculation.lb (64 kB XIP) src/config/nofailovercalculation128.lb (128 kB XIP) Targets with other XIP sizes were ignored. This patch moves XIP size back into mainboard code. Benefits from this patch: - src/config/nofailovercalculation128.lb is no longer needed - Targets with XIP sizes besides 64k and 128k benefit from refactoring - Conceptually, this makes the include files pure calculation files without settings. Abuild tested. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Patrick Georgi <patrick.georgi@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4348 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/intel')
-rw-r--r--src/mainboard/intel/jarrell/Config.lb4
-rw-r--r--src/mainboard/intel/mtarvon/Config.lb4
-rw-r--r--src/mainboard/intel/truxton/Config.lb4
-rw-r--r--src/mainboard/intel/xe7501devkit/Config.lb4
4 files changed, 12 insertions, 4 deletions
diff --git a/src/mainboard/intel/jarrell/Config.lb b/src/mainboard/intel/jarrell/Config.lb
index 8cc6e160e0..4a2468ab03 100644
--- a/src/mainboard/intel/jarrell/Config.lb
+++ b/src/mainboard/intel/jarrell/Config.lb
@@ -3,7 +3,9 @@
##
default USE_OPTION_TABLE = !USE_FALLBACK_IMAGE
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb
##
## Set all of the defaults for an x86 architecture
diff --git a/src/mainboard/intel/mtarvon/Config.lb b/src/mainboard/intel/mtarvon/Config.lb
index 70dcc2360d..dd9ea4a5a6 100644
--- a/src/mainboard/intel/mtarvon/Config.lb
+++ b/src/mainboard/intel/mtarvon/Config.lb
@@ -17,7 +17,9 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb
##
## Set all of the defaults for an x86 architecture
diff --git a/src/mainboard/intel/truxton/Config.lb b/src/mainboard/intel/truxton/Config.lb
index edfefb968f..0f57a779b5 100644
--- a/src/mainboard/intel/truxton/Config.lb
+++ b/src/mainboard/intel/truxton/Config.lb
@@ -17,7 +17,9 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb
##
## Set all of the defaults for an x86 architecture
diff --git a/src/mainboard/intel/xe7501devkit/Config.lb b/src/mainboard/intel/xe7501devkit/Config.lb
index 84c5dcea4b..bf5c938dfe 100644
--- a/src/mainboard/intel/xe7501devkit/Config.lb
+++ b/src/mainboard/intel/xe7501devkit/Config.lb
@@ -1,4 +1,6 @@
-include /config/nofailovercalculation128.lb
+## XIP_ROM_SIZE must be a power of 2.
+default XIP_ROM_SIZE = 128 * 1024
+include /config/nofailovercalculation.lb
arch i386 end