aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2010-12-26 14:16:22 -0500
committerKevin O'Connor <kevin@koconnor.net>2011-01-22 11:03:08 -0500
commit06d0bdd9e2e20377b3180e4986b14c8549b393e4 (patch)
tree4eef1354c8f7663469ff9b0b9bfa053b7ab27eb9
parent33abfc0ac58dc2f46def756ad5fe78c49d65a6b5 (diff)
downloadseabios-0.6.1-stable.zip
seabios-0.6.1-stable.tar.gz
seabios-0.6.1-stable.tar.bz2
Minor build fixes.rel-0.6.1.30.6.1-stable
I made these two tiny changes to SeaBIOS when I was playing with the HEAD version. The Makefile change prevents the test command from failing if CC contains a space. The coreboot change prevents a warning on our gcc 4.5.2 in certain circumstances when sizeof seems to be unsigned long int instead of unsigned int. They're both unintrusive, shouldn't have potential for breaking anything. Signed-off-by: Stefan Reinauer <stepan@coreboot.org>
-rw-r--r--Makefile2
-rw-r--r--src/coreboot.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 1543e0d..9805f85 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ vpath %.S src vgasrc
################ Build rules
# Verify the gcc configuration and test if -fwhole-program works.
-TESTGCC:=$(shell CC=$(CC) tools/test-gcc.sh)
+TESTGCC:=$(shell CC="$(CC)" tools/test-gcc.sh)
ifeq "$(TESTGCC)" "-1"
$(error "Please upgrade GCC")
endif
diff --git a/src/coreboot.c b/src/coreboot.c
index db0063b..554ea81 100644
--- a/src/coreboot.c
+++ b/src/coreboot.c
@@ -326,7 +326,7 @@ ulzma(u8 *dst, u32 maxlen, const u8 *src, u32 srclen)
u8 scratch[15980];
int need = (LzmaGetNumProbs(&state.Properties) * sizeof(CProb));
if (need > sizeof(scratch)) {
- dprintf(1, "LzmaDecode need %d have %d\n", need, sizeof(scratch));
+ dprintf(1, "LzmaDecode need %d have %d\n", need, (unsigned int)sizeof(scratch));
return -1;
}
state.Probs = (CProb *)scratch;