diff options
| author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2009-06-06 16:50:38 +0000 |
|---|---|---|
| committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2009-06-06 16:50:38 +0000 |
| commit | cff071ab0ed60c887ceeaafa2e722b07691fff10 (patch) | |
| tree | c09d835ab165da775675faa71b099392e059270f /src/mainboard/supermicro | |
| parent | a7d8ae3b1d91f3f77496b065a7d5158893c4dd28 (diff) | |
| download | coreboot-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/supermicro')
| -rw-r--r-- | src/mainboard/supermicro/h8dme/Config.lb | 2 | ||||
| -rw-r--r-- | src/mainboard/supermicro/h8dmr/Config.lb | 2 | ||||
| -rw-r--r-- | src/mainboard/supermicro/x6dai_g/Config.lb | 4 | ||||
| -rw-r--r-- | src/mainboard/supermicro/x6dhe_g/Config.lb | 4 | ||||
| -rw-r--r-- | src/mainboard/supermicro/x6dhe_g2/Config.lb | 4 | ||||
| -rw-r--r-- | src/mainboard/supermicro/x6dhr_ig/Config.lb | 4 | ||||
| -rw-r--r-- | src/mainboard/supermicro/x6dhr_ig2/Config.lb | 4 |
7 files changed, 19 insertions, 5 deletions
diff --git a/src/mainboard/supermicro/h8dme/Config.lb b/src/mainboard/supermicro/h8dme/Config.lb index d11487faee..c3ad78a215 100644 --- a/src/mainboard/supermicro/h8dme/Config.lb +++ b/src/mainboard/supermicro/h8dme/Config.lb @@ -16,6 +16,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +## XIP_ROM_SIZE must be a power of 2. +default XIP_ROM_SIZE = 64 * 1024 include /config/failovercalculation.lb arch i386 end diff --git a/src/mainboard/supermicro/h8dmr/Config.lb b/src/mainboard/supermicro/h8dmr/Config.lb index b9b460d46d..94d91d8810 100644 --- a/src/mainboard/supermicro/h8dmr/Config.lb +++ b/src/mainboard/supermicro/h8dmr/Config.lb @@ -19,6 +19,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +## XIP_ROM_SIZE must be a power of 2. +default XIP_ROM_SIZE = 64 * 1024 include /config/failovercalculation.lb arch i386 end diff --git a/src/mainboard/supermicro/x6dai_g/Config.lb b/src/mainboard/supermicro/x6dai_g/Config.lb index 3fca8b51a1..2a144eb96a 100644 --- a/src/mainboard/supermicro/x6dai_g/Config.lb +++ b/src/mainboard/supermicro/x6dai_g/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/supermicro/x6dhe_g/Config.lb b/src/mainboard/supermicro/x6dhe_g/Config.lb index c2efe3f90c..d972ff1ed2 100644 --- a/src/mainboard/supermicro/x6dhe_g/Config.lb +++ b/src/mainboard/supermicro/x6dhe_g/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/supermicro/x6dhe_g2/Config.lb b/src/mainboard/supermicro/x6dhe_g2/Config.lb index c014050fc4..7a5fcdf933 100644 --- a/src/mainboard/supermicro/x6dhe_g2/Config.lb +++ b/src/mainboard/supermicro/x6dhe_g2/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/supermicro/x6dhr_ig/Config.lb b/src/mainboard/supermicro/x6dhr_ig/Config.lb index 048dc63613..837beb45f4 100644 --- a/src/mainboard/supermicro/x6dhr_ig/Config.lb +++ b/src/mainboard/supermicro/x6dhr_ig/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/supermicro/x6dhr_ig2/Config.lb b/src/mainboard/supermicro/x6dhr_ig2/Config.lb index 58f3835dbb..b223a37523 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/Config.lb +++ b/src/mainboard/supermicro/x6dhr_ig2/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 |