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/digitallogic/adl855pc/Config.lb | 2 ++ src/mainboard/digitallogic/msm586seg/Config.lb | 33 ++------------------------ src/mainboard/digitallogic/msm800sev/Config.lb | 2 ++ 3 files changed, 6 insertions(+), 31 deletions(-) (limited to 'src/mainboard/digitallogic') diff --git a/src/mainboard/digitallogic/adl855pc/Config.lb b/src/mainboard/digitallogic/adl855pc/Config.lb index 55068cfda1..91e0b844ec 100644 --- a/src/mainboard/digitallogic/adl855pc/Config.lb +++ b/src/mainboard/digitallogic/adl855pc/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/digitallogic/msm586seg/Config.lb b/src/mainboard/digitallogic/msm586seg/Config.lb index b0109085e5..8f649b7964 100644 --- a/src/mainboard/digitallogic/msm586seg/Config.lb +++ b/src/mainboard/digitallogic/msm586seg/Config.lb @@ -1,38 +1,9 @@ -## -## Compute the location and size of where this firmware image -## (coreboot plus bootloader) will live in the boot rom chip. -## default ROM_SIZE = 512 * 1024 default FALLBACK_SIZE = 0x10000 -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 - -## -## Compute the start location and size size of -## The coreboot bootloader. -## -default PAYLOAD_SIZE = ( ROM_SECTION_SIZE - ROM_IMAGE_SIZE ) -default CONFIG_ROM_PAYLOAD_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1) - -## -## Compute where this copy of coreboot will start in the boot rom -## -default _ROMBASE = ( CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE ) -## -## Compute a range of ROM that can cached to speed up coreboot, -## execution speed. -## ## XIP_ROM_SIZE must be a power of 2. -## XIP_ROM_BASE must be a multiple of XIP_ROM_SIZE -## -default XIP_ROM_SIZE=32*1024 -default XIP_ROM_BASE = ( _ROMBASE + ROM_IMAGE_SIZE - XIP_ROM_SIZE ) +default XIP_ROM_SIZE = 32 * 1024 +include /config/nofailovercalculation.lb ## ## Set all of the defaults for an x86 architecture diff --git a/src/mainboard/digitallogic/msm800sev/Config.lb b/src/mainboard/digitallogic/msm800sev/Config.lb index d2217c6c9e..5256f09f54 100644 --- a/src/mainboard/digitallogic/msm800sev/Config.lb +++ b/src/mainboard/digitallogic/msm800sev/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 ## -- cgit v1.2.3