summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2010-12-26 14:16:22 -0500
committerKevin O'Connor <kevin@koconnor.net>2010-12-26 14:16:22 -0500
commit311f8876afbbe3cbe0aa04742ef41831ffcb85bb (patch)
treeb0ed16833b0bae8d4713c9a0ba052e8f8dcfe0cc
parentbca3a878467d30e13a776243c5ca3e426dc847a0 (diff)
Minor build fixes.
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 acc2385..384bf79 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,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 50d300c..cdbf337 100644
--- a/src/coreboot.c
+++ b/src/coreboot.c
@@ -320,7 +320,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;