summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rwxr-xr-xutil/abuild/abuild8
-rw-r--r--util/newconfig/config.g16
2 files changed, 1 insertions, 23 deletions
diff --git a/util/abuild/abuild b/util/abuild/abuild
index 9a90f6f534..00329be6e9 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -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
diff --git a/util/newconfig/config.g b/util/newconfig/config.g
index 2f5dddfc2d..2fba72be77 100644
--- a/util/newconfig/config.g
+++ b/util/newconfig/config.g
@@ -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():