summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rwxr-xr-xutil/abuild/abuild12
-rw-r--r--util/romcc/romcc.c5
-rw-r--r--util/x86emu/biosemu.c0
3 files changed, 10 insertions, 7 deletions
diff --git a/util/abuild/abuild b/util/abuild/abuild
index 1942bf539a..a9633c9215 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -162,15 +162,16 @@ function create_config
echo "CONFIG_MAINBOARD_DIR=\"$VENDOR/$MAINBOARD\"" >> .config
if [ "$PAYLOAD" != "/dev/null" ]; then
echo "# CONFIG_PAYLOAD_NONE is not set" >> .config
- echo "CONFIG_PAYLOAD_ELF=\"$PAYLOAD\"" >> .config
+ echo "CONFIG_PAYLOAD_ELF=y" >> .config
+ echo "CONFIG_FALLBACK_PAYLOAD_FILE=\"$PAYLOAD\"" >> .config
fi
if [ "$loglevel" != "default" ]; then
printf "(loglevel override) "
- echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL_$loglevel=y"
- echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=$loglevel"
- echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL_$loglevel=y"
- echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL=$loglevel"
+ echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL_$loglevel=y" >> .config
+ echo "CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=$loglevel" >> .config
+ echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL_$loglevel=y" >> .config
+ echo "CONFIG_DEFAULT_CONSOLE_LOGLEVEL=$loglevel" >> .config
fi
fi
@@ -223,7 +224,6 @@ function compile_target
ret=$?
mv .config ${build_dir}/config.build
mv .xcompile ${build_dir}/xcompile.build
- mv ..config.tmp ${build_dir}/config.deps
cd $TARGET/${VENDOR}_${MAINBOARD}
etime=`perl -e 'print time();' 2>/dev/null || date +%s`
duration=$(( $etime - $stime ))
diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c
index bac0cf1d14..2691036c18 100644
--- a/util/romcc/romcc.c
+++ b/util/romcc/romcc.c
@@ -22449,7 +22449,10 @@ static unsigned arch_type_to_regcm(struct compile_state *state, struct type *typ
static int is_imm32(struct triple *imm)
{
- return ((imm->op == OP_INTCONST) && (imm->u.cval <= 0xffffffffUL)) ||
+ // second condition commented out to prevent compiler warning:
+ // imm->u.cval is always 32bit unsigned, so the comparison is
+ // always true.
+ return ((imm->op == OP_INTCONST) /* && (imm->u.cval <= 0xffffffffUL) */ ) ||
(imm->op == OP_ADDRCONST);
}
diff --git a/util/x86emu/biosemu.c b/util/x86emu/biosemu.c
deleted file mode 100644
index e69de29bb2..0000000000
--- a/util/x86emu/biosemu.c
+++ /dev/null