sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove:

Browse Source 
- 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
This commit is contained in:
Patrick Georgi
2009-10-03 16:24:58 +00:00
parent 8f3ec7b1a3
commit 6768f39a4b
150 changed files with 41 additions and 4723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
util/abuild/abuild
View File

@@ -176,20 +176,12 @@ EOF
cat <<EOF
romimage "normal"
option CONFIG_USE_FALLBACK_IMAGE=0
if CONFIG_CBFS
else
option CONFIG_ROM_IMAGE_SIZE=0x17000
end
option COREBOOT_EXTRA_VERSION=".0-normal"
payload __PAYLOAD__
end
romimage "fallback"
option CONFIG_USE_FALLBACK_IMAGE=1
if CONFIG_CBFS
else
option CONFIG_ROM_IMAGE_SIZE=0x17000
end
option COREBOOT_EXTRA_VERSION=".0-fallback"
payload __PAYLOAD__
end

16
util/newconfig/config.g
View File

@@ -2247,7 +2247,7 @@ def writemakefile(path):
file = safe_open(makefilepath, 'w+')
writemakefileheader(file, makefilepath)
# Hack to get the necessary settings (CONFIG_CBFS):
# Hack to get the necessary settings (CONFIG_COMPRESSED_PAYLOAD_LZMA):
file.write("include %s/Makefile.settings\n\n" % romimages.keys()[0])
# main rule
@@ -2275,7 +2275,6 @@ def writemakefile(path):
file.write("base-clean:\n")
file.write("\trm -f romcc*\n\n")
file.write("ifeq \"$(CONFIG_CBFS)\" \"1\"\n\n")
file.write("CBFS_COMPRESS_FLAG:=\n")
file.write("CBFS_STAGE_COMPRESS_FLAG:=\n")
file.write("ifeq \"$(CONFIG_COMPRESSED_PAYLOAD_LZMA)\" \"1\"\nCBFS_COMPRESS_FLAG:=l\nendif\n\n")
@@ -2309,19 +2308,6 @@ def writemakefile(path):
file.write("\tif [ -f %s/coreboot_apc ]; then ./cbfs/cbfstool %s add-stage %s/coreboot_apc %s/coreboot_apc $(CBFS_COMPRESS_FLAG); fi\n" % (j, i.name, j, j,))
file.write("\t./cbfs/cbfstool %s print\n" % i.name)
file.write("\n")
file.write("else\n\n")
for i in buildroms:
file.write("%s:" % i.name)
for j in i.roms:
file.write(" %s/coreboot.rom " % j)
file.write("\n")
file.write("\t cat ")
for j in i.roms:
file.write(" %s/coreboot.rom " % j)
file.write("> %s\n\n" %i.name)
file.write("endif\n\n")
file.write(".PHONY: all clean cbfstool")
for i in romimages.keys():