From 6768f39a4b5a5d6d1c2318f632f801fe1c8084cd Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sat, 3 Oct 2009 16:24:58 +0000 Subject: Remove: - CONFIG_CBFS - anything that's conditional on CONFIG_CBFS == 0 - files that were only included for CONFIG_CBFS == 0 In particular: - elfboot - stream boot code - mini-filo and filesystems (depends on stream boot code) After this commit, there is no way to build an image that is not using CBFS anymore. Signed-off-by: Patrick Georgi Acked-by: Myles Watson Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4712 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- targets/kontron/986lcd-m/Config.lb | 1 - targets/lippert/roadrunner-lx/Config.lb | 8 -------- targets/lippert/spacerunner-lx/Config.lb | 8 -------- 3 files changed, 17 deletions(-) (limited to 'targets') diff --git a/targets/kontron/986lcd-m/Config.lb b/targets/kontron/986lcd-m/Config.lb index 8cb6b98b4c..5a4fd47350 100644 --- a/targets/kontron/986lcd-m/Config.lb +++ b/targets/kontron/986lcd-m/Config.lb @@ -5,7 +5,6 @@ mainboard kontron/986lcd-m ## (normal AND fallback images and payloads). option CONFIG_ROM_SIZE = 1024 * 1024 -option CONFIG_CBFS=1 option HAVE_HIGH_TABLES=1 option MAXIMUM_CONSOLE_LOGLEVEL=9 option DEFAULT_CONSOLE_LOGLEVEL=9 diff --git a/targets/lippert/roadrunner-lx/Config.lb b/targets/lippert/roadrunner-lx/Config.lb index 92b825c407..1fb1bbb3ff 100644 --- a/targets/lippert/roadrunner-lx/Config.lb +++ b/targets/lippert/roadrunner-lx/Config.lb @@ -30,14 +30,6 @@ option CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1 option CONFIG_COMPRESSED_PAYLOAD_NRV2B = 0 option CONFIG_COMPRESSED_PAYLOAD_LZMA = 0 -## Load payload (e.g. Linux) from IDE. -#option CONFIG_ROM_PAYLOAD = 0 -#option CONFIG_IDE = 1 -#option CONFIG_FS_PAYLOAD = 1 -#option CONFIG_FS_EXT2 = 1 -#option CONFIG_AUTOBOOT_DELAY = 0 -#option CONFIG_AUTOBOOT_CMDLINE = "hda1:/payload.elf" - # Leave 36k for VSA. Usually board is equipped with a 512 KB FWH (LPC) flash, # however it can be replaced with a 1 MB chip. option CONFIG_ROM_SIZE = (512 * 1024) - (36 * 1024) diff --git a/targets/lippert/spacerunner-lx/Config.lb b/targets/lippert/spacerunner-lx/Config.lb index 6719c212f0..9fa4b5a44e 100644 --- a/targets/lippert/spacerunner-lx/Config.lb +++ b/targets/lippert/spacerunner-lx/Config.lb @@ -31,14 +31,6 @@ option CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 = 1 option CONFIG_COMPRESSED_PAYLOAD_NRV2B = 0 option CONFIG_COMPRESSED_PAYLOAD_LZMA = 0 -## Load payload (e.g. Linux) from IDE. -#option CONFIG_ROM_PAYLOAD = 0 -#option CONFIG_IDE = 1 -#option CONFIG_FS_PAYLOAD = 1 -#option CONFIG_FS_EXT2 = 1 -#option CONFIG_AUTOBOOT_DELAY = 0 -#option CONFIG_AUTOBOOT_CMDLINE = "hda1:/payload.elf" - # Leave 36k for VSA. Board is equipped with a 1 MB SPI flash, however, due to # limitations of the IT8712F Super I/O, only the top 512 KB are directly mapped. option CONFIG_ROM_SIZE = (512 * 1024) - (36 * 1024) -- cgit v1.2.3