summaryrefslogtreecommitdiff
path: root/src/config
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2009-10-03 16:24:58 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2009-10-03 16:24:58 +0000
commit6768f39a4b5a5d6d1c2318f632f801fe1c8084cd (patch)
tree70ed41597c9cd4d19bec099a8ba403d48cdf4208 /src/config
parent8f3ec7b1a3771a317c2415e2366fa719582f29d1 (diff)
downloadcoreboot-6768f39a4b5a5d6d1c2318f632f801fe1c8084cd.tar.xz
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 <patrick.georgi@coresystems.de> Acked-by: Myles Watson <mylesgw@gmail.com> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4712 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/config')
-rw-r--r--src/config/Config.lb1
-rw-r--r--src/config/Options.lb46
-rw-r--r--src/config/failovercalculation.lb9
-rw-r--r--src/config/nofailovercalculation.lb9
4 files changed, 4 insertions, 61 deletions
diff --git a/src/config/Config.lb b/src/config/Config.lb
index 061c0b21a8..8c954d20bb 100644
--- a/src/config/Config.lb
+++ b/src/config/Config.lb
@@ -215,7 +215,6 @@ end
# for now, this is just 'lib', but it may be more later.
dir /lib
dir /console
-dir /stream
dir /devices
dir /pc80
dir /boot
diff --git a/src/config/Options.lb b/src/config/Options.lb
index db1a20fa91..071362a596 100644
--- a/src/config/Options.lb
+++ b/src/config/Options.lb
@@ -641,11 +641,6 @@ define CONFIG_MULTIBOOT
export always
comment "Use Multiboot (rather than ELF boot notes) to boot the payload"
end
-define CONFIG_IDE_PAYLOAD
- default 0
- export always
- comment "Boot from IDE device"
-end
define CONFIG_ROM_PAYLOAD
default 0
export always
@@ -672,47 +667,6 @@ define CONFIG_PRECOMPRESSED_PAYLOAD
export always
comment "boot image is already compressed"
end
-define CONFIG_SERIAL_PAYLOAD
- default 0
- export always
- comment "Download boot image from serial port"
-end
-define CONFIG_FS_PAYLOAD
- default 0
- export always
- comment "Boot from a filesystem"
-end
-define CONFIG_FS_EXT2
- default 0
- export always
- comment "Enable ext2 filesystem support"
-end
-define CONFIG_FS_ISO9660
- default 0
- export always
- comment "Enable ISO9660 filesystem support"
-end
-define CONFIG_FS_FAT
- default 0
- export always
- comment "Enable FAT filesystem support"
-end
-define CONFIG_CBFS
- default 1
- export always
- comment "The new CBFS file system"
-end
-define CONFIG_AUTOBOOT_DELAY
- default 2
- export always
- comment "Delay (in seconds) before autobooting"
-end
-define CONFIG_AUTOBOOT_CMDLINE
- default "hdc1:/vmlinuz root=/dev/hdc3 console=tty0 console=ttyS0,115200"
- export always
- format "\"%s\""
- comment "Default command line when autobooting"
-end
define CONFIG_USE_WATCHDOG_ON_BOOT
default 0
diff --git a/src/config/failovercalculation.lb b/src/config/failovercalculation.lb
index 7626289e2d..e5ec7e19ce 100644
--- a/src/config/failovercalculation.lb
+++ b/src/config/failovercalculation.lb
@@ -10,13 +10,8 @@ else
default CONFIG_ROM_SECTION_SIZE = CONFIG_FALLBACK_SIZE
default CONFIG_ROM_SECTION_OFFSET = ( CONFIG_ROM_SIZE - CONFIG_FALLBACK_SIZE - CONFIG_FAILOVER_SIZE )
else
- if CONFIG_CBFS
- default CONFIG_ROM_SECTION_SIZE = CONFIG_FALLBACK_SIZE
- default CONFIG_ROM_SECTION_OFFSET = ( CONFIG_ROM_SIZE - CONFIG_FALLBACK_SIZE - CONFIG_FALLBACK_SIZE - CONFIG_FAILOVER_SIZE )
- else
- default CONFIG_ROM_SECTION_SIZE = ( CONFIG_ROM_SIZE - CONFIG_FALLBACK_SIZE - CONFIG_FAILOVER_SIZE )
- default CONFIG_ROM_SECTION_OFFSET = 0
- end
+ default CONFIG_ROM_SECTION_SIZE = CONFIG_FALLBACK_SIZE
+ default CONFIG_ROM_SECTION_OFFSET = ( CONFIG_ROM_SIZE - CONFIG_FALLBACK_SIZE - CONFIG_FALLBACK_SIZE - CONFIG_FAILOVER_SIZE )
end
end
diff --git a/src/config/nofailovercalculation.lb b/src/config/nofailovercalculation.lb
index 82132f4acb..f5f8708b65 100644
--- a/src/config/nofailovercalculation.lb
+++ b/src/config/nofailovercalculation.lb
@@ -6,13 +6,8 @@ if CONFIG_USE_FALLBACK_IMAGE
default CONFIG_ROM_SECTION_SIZE = CONFIG_FALLBACK_SIZE
default CONFIG_ROM_SECTION_OFFSET = ( CONFIG_ROM_SIZE - CONFIG_FALLBACK_SIZE )
else
- if CONFIG_CBFS
- default CONFIG_ROM_SECTION_SIZE = CONFIG_FALLBACK_SIZE
- default CONFIG_ROM_SECTION_OFFSET = ( CONFIG_ROM_SIZE - CONFIG_FALLBACK_SIZE - CONFIG_FALLBACK_SIZE )
- else
- default CONFIG_ROM_SECTION_SIZE = ( CONFIG_ROM_SIZE - CONFIG_FALLBACK_SIZE )
- default CONFIG_ROM_SECTION_OFFSET = 0
- end
+ default CONFIG_ROM_SECTION_SIZE = CONFIG_FALLBACK_SIZE
+ default CONFIG_ROM_SECTION_OFFSET = ( CONFIG_ROM_SIZE - CONFIG_FALLBACK_SIZE - CONFIG_FALLBACK_SIZE )
end
##