From cff071ab0ed60c887ceeaafa2e722b07691fff10 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Sat, 6 Jun 2009 16:50:38 +0000 Subject: 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 Acked-by: Patrick Georgi git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4348 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/via/epia-cn/Config.lb | 2 ++ src/mainboard/via/epia-m/Config.lb | 2 ++ src/mainboard/via/epia-m700/Config.lb | 16 ++-------------- src/mainboard/via/epia/Config.lb | 2 ++ src/mainboard/via/pc2500e/Config.lb | 2 ++ src/mainboard/via/vt8454c/Config.lb | 2 ++ 6 files changed, 12 insertions(+), 14 deletions(-) (limited to 'src/mainboard/via') diff --git a/src/mainboard/via/epia-cn/Config.lb b/src/mainboard/via/epia-cn/Config.lb index 649a784961..c2f5a4ebc0 100644 --- a/src/mainboard/via/epia-cn/Config.lb +++ b/src/mainboard/via/epia-cn/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/nofailovercalculation.lb arch i386 end diff --git a/src/mainboard/via/epia-m/Config.lb b/src/mainboard/via/epia-m/Config.lb index 2848c474ea..228a0265ba 100644 --- a/src/mainboard/via/epia-m/Config.lb +++ b/src/mainboard/via/epia-m/Config.lb @@ -1,3 +1,5 @@ +## XIP_ROM_SIZE must be a power of 2. +default XIP_ROM_SIZE = 64 * 1024 include /config/nofailovercalculation.lb ## diff --git a/src/mainboard/via/epia-m700/Config.lb b/src/mainboard/via/epia-m700/Config.lb index 5d0c12f1ad..2c5b80bb3b 100644 --- a/src/mainboard/via/epia-m700/Config.lb +++ b/src/mainboard/via/epia-m700/Config.lb @@ -18,21 +18,9 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -if USE_FALLBACK_IMAGE - default ROM_SECTION_SIZE = FALLBACK_SIZE - default ROM_SECTION_OFFSET = (ROM_SIZE - FALLBACK_SIZE) -else - default ROM_SECTION_SIZE = (ROM_SIZE - FALLBACK_SIZE) - default ROM_SECTION_OFFSET = 0 -end -default PAYLOAD_SIZE = (ROM_SECTION_SIZE - ROM_IMAGE_SIZE) -default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1) -default _ROMBASE = (CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE) +## XIP_ROM_SIZE must be a power of 2. default XIP_ROM_SIZE = 64 * 1024 -#default XIP_ROM_SIZE = ROM_IMAGE_SIZE -#default XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE) -default XIP_ROM_BASE = (_ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE) - +include /config/nofailovercalculation.lb arch i386 end driver mainboard.o diff --git a/src/mainboard/via/epia/Config.lb b/src/mainboard/via/epia/Config.lb index 59362238da..47b957608a 100644 --- a/src/mainboard/via/epia/Config.lb +++ b/src/mainboard/via/epia/Config.lb @@ -1,3 +1,5 @@ +## XIP_ROM_SIZE must be a power of 2. +default XIP_ROM_SIZE = 64 * 1024 include /config/nofailovercalculation.lb ## diff --git a/src/mainboard/via/pc2500e/Config.lb b/src/mainboard/via/pc2500e/Config.lb index f18e829b39..405863a456 100644 --- a/src/mainboard/via/pc2500e/Config.lb +++ b/src/mainboard/via/pc2500e/Config.lb @@ -18,6 +18,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/nofailovercalculation.lb arch i386 end diff --git a/src/mainboard/via/vt8454c/Config.lb b/src/mainboard/via/vt8454c/Config.lb index 1bd0965e43..534f910b19 100644 --- a/src/mainboard/via/vt8454c/Config.lb +++ b/src/mainboard/via/vt8454c/Config.lb @@ -19,6 +19,8 @@ ## MA 02110-1301 USA ## +## XIP_ROM_SIZE must be a power of 2. +default XIP_ROM_SIZE = 64 * 1024 include /config/nofailovercalculation.lb ## -- cgit v1.2.3