From 24796fd364176ce8bb4f4eb727e0ba2ece188c08 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sun, 4 Oct 2009 18:55:40 +0000 Subject: This does away with CONFIG_ROM_PAYLOAD_START and CONFIG_PAYLOAD_SIZE. Both were only really used in pre-cbfs, as the payload's size isn't relevant for the build process anymore. Various calculations in {no,}failovercalculation.lb are adapted accordingly. Signed-off-by: Patrick Georgi Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4720 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- targets/arima/hdama/Config.kernelimage.lb | 2 -- targets/iwill/dk8s2/Config.lb | 8 -------- targets/iwill/dk8x/Config.lb | 8 -------- 3 files changed, 18 deletions(-) (limited to 'targets') diff --git a/targets/arima/hdama/Config.kernelimage.lb b/targets/arima/hdama/Config.kernelimage.lb index 029b32884e..d5a465985c 100644 --- a/targets/arima/hdama/Config.kernelimage.lb +++ b/targets/arima/hdama/Config.kernelimage.lb @@ -10,7 +10,6 @@ uses CONFIG_ARCH uses CONFIG_COMPRESS uses CONFIG_IOAPIC uses CONFIG_ROM_PAYLOAD -uses CONFIG_ROM_PAYLOAD_START uses CONFIG_UDELAY_TSC uses CPU_FIXUP uses CONFIG_HAVE_FALLBACK_BOOT @@ -29,7 +28,6 @@ uses CONFIG_MAINBOARD_VENDOR uses CONFIG_SMP uses CONFIG_MAX_CPUS uses CONFIG_MEMORY_HOLE -uses CONFIG_PAYLOAD_SIZE uses CONFIG_RAMBASE uses CONFIG_ROMBASE uses CONFIG_ROM_IMAGE_SIZE diff --git a/targets/iwill/dk8s2/Config.lb b/targets/iwill/dk8s2/Config.lb index e4b426fc6f..cbc45b248f 100644 --- a/targets/iwill/dk8s2/Config.lb +++ b/targets/iwill/dk8s2/Config.lb @@ -133,10 +133,6 @@ romimage "normal" option CONFIG_ROM_SECTION_SIZE = (CONFIG_ROM_SIZE - CONFIG_FALLBACK_SIZE) option CONFIG_ROM_SECTION_OFFSET= 0 - option CONFIG_PAYLOAD_SIZE = (CONFIG_ROM_SECTION_SIZE - CONFIG_ROM_IMAGE_SIZE) - option CONFIG_ROM_PAYLOAD_START = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1) - option CONFIG_ROMBASE = (CONFIG_ROM_PAYLOAD_START + CONFIG_PAYLOAD_SIZE) - # option CONFIG_XIP_ROM_SIZE = CONFIG_FALLBACK_SIZE option CONFIG_XIP_ROM_SIZE = 65536 @@ -152,10 +148,6 @@ romimage "fallback" option CONFIG_ROM_SECTION_SIZE = CONFIG_FALLBACK_SIZE option CONFIG_ROM_SECTION_OFFSET= (CONFIG_ROM_SIZE - CONFIG_FALLBACK_SIZE) - option CONFIG_PAYLOAD_SIZE = (CONFIG_ROM_SECTION_SIZE - CONFIG_ROM_IMAGE_SIZE) - option CONFIG_ROM_PAYLOAD_START = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1) - option CONFIG_ROMBASE = (CONFIG_ROM_PAYLOAD_START + CONFIG_PAYLOAD_SIZE) - # option CONFIG_XIP_ROM_SIZE = CONFIG_FALLBACK_SIZE option CONFIG_XIP_ROM_SIZE = 65536 option CONFIG_XIP_ROM_BASE = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - CONFIG_XIP_ROM_SIZE) diff --git a/targets/iwill/dk8x/Config.lb b/targets/iwill/dk8x/Config.lb index ab4ff09c60..bbc7b71d37 100644 --- a/targets/iwill/dk8x/Config.lb +++ b/targets/iwill/dk8x/Config.lb @@ -133,10 +133,6 @@ romimage "normal" option CONFIG_ROM_SECTION_SIZE = (CONFIG_ROM_SIZE - CONFIG_FALLBACK_SIZE) option CONFIG_ROM_SECTION_OFFSET= 0 - option CONFIG_PAYLOAD_SIZE = (CONFIG_ROM_SECTION_SIZE - CONFIG_ROM_IMAGE_SIZE) - option CONFIG_ROM_PAYLOAD_START = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1) - option CONFIG_ROMBASE = (CONFIG_ROM_PAYLOAD_START + CONFIG_PAYLOAD_SIZE) - # option CONFIG_XIP_ROM_SIZE = CONFIG_FALLBACK_SIZE option CONFIG_XIP_ROM_SIZE = 65536 @@ -152,10 +148,6 @@ romimage "fallback" option CONFIG_ROM_SECTION_SIZE = CONFIG_FALLBACK_SIZE option CONFIG_ROM_SECTION_OFFSET= (CONFIG_ROM_SIZE - CONFIG_FALLBACK_SIZE) - option CONFIG_PAYLOAD_SIZE = (CONFIG_ROM_SECTION_SIZE - CONFIG_ROM_IMAGE_SIZE) - option CONFIG_ROM_PAYLOAD_START = (0xffffffff - CONFIG_ROM_SIZE + CONFIG_ROM_SECTION_OFFSET + 1) - option CONFIG_ROMBASE = (CONFIG_ROM_PAYLOAD_START + CONFIG_PAYLOAD_SIZE) - # option CONFIG_XIP_ROM_SIZE = CONFIG_FALLBACK_SIZE option CONFIG_XIP_ROM_SIZE = 65536 option CONFIG_XIP_ROM_BASE = (CONFIG_ROMBASE + CONFIG_ROM_IMAGE_SIZE - CONFIG_XIP_ROM_SIZE) -- cgit v1.2.3