aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rwxr-xr-xutil/abuild/abuild7
-rw-r--r--util/newconfig/config.g2
2 files changed, 8 insertions, 1 deletions
diff --git a/util/abuild/abuild b/util/abuild/abuild
index 5f6120faa8..47decf61eb 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -176,14 +176,20 @@ EOF
cat <<EOF
romimage "normal"
option USE_FALLBACK_IMAGE=0
+if CONFIG_CBFS
+else
option ROM_IMAGE_SIZE=0x17000
+end
option COREBOOT_EXTRA_VERSION=".0-normal"
payload __PAYLOAD__
end
romimage "fallback"
option USE_FALLBACK_IMAGE=1
+if CONFIG_CBFS
+else
option ROM_IMAGE_SIZE=0x17000
+end
option COREBOOT_EXTRA_VERSION=".0-fallback"
payload __PAYLOAD__
end
@@ -375,6 +381,7 @@ function build_target
CC="$CC -Wa,--divide"
fi
CROSS_COMPILE="$TARCH-elf-"
+ CC=gcc
echo using $CROSS_COMPILE$CC
found_crosscompiler=true
fi
diff --git a/util/newconfig/config.g b/util/newconfig/config.g
index 2bd4ca6c4b..dd14f95e0c 100644
--- a/util/newconfig/config.g
+++ b/util/newconfig/config.g
@@ -2293,7 +2293,7 @@ def writemakefile(path):
# build the bootblock here.
file.write("\n\tcat")
for j in i.roms:
- file.write(" %s/coreboot.strip " % j)
+ file.write(" %s/coreboot.rom " % j)
file.write("> %s.bootblock\n\n" %i.name)
file.write("\t./cbfstool %s create %s %s %s.bootblock\n"
%(i.name, romsize, bootblocksize, i.name))