Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10112
-gerrit
commit bdca403485ffca417b3ce3ea4cbd385985834ca2 Author: Stefan Reinauer stefan.reinauer@coreboot.org Date: Tue May 5 13:35:18 2015 -0700
vgabios: fix compilation
This utility links in coreboot code, and has been broken for a long time. These changes get it to compile again.
Change-Id: I69445a8b3cbfc9a2b560c68b8de2e080837ec502 Signed-off-by: Stefan Reinauer stefan.reinauer@coreboot.org --- util/vgabios/Makefile | 4 ++-- util/vgabios/include/stdtypes.h | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/util/vgabios/Makefile b/util/vgabios/Makefile index e187122..8c8ddff 100644 --- a/util/vgabios/Makefile +++ b/util/vgabios/Makefile @@ -12,7 +12,7 @@ CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes CFLAGS += -Wwrite-strings -Wredundant-decls -Wno-trigraphs CFLAGS += -Wstrict-aliasing -Wshadow -Wextra
-INCLUDES = -Iinclude -I../../src/device/oprom/include/ +INCLUDES = -Iinclude -I../../src/device/oprom/include/ -I../../src --include include/stdtypes.h
INTOBJS = int10.o int15.o int16.o int1a.o inte6.o X86EMUOBJS = sys.o decode.o ops.o ops2.o prim_ops.o fpu.o debug.o @@ -33,7 +33,7 @@ helper_exec.o: helper_exec.c test.h clean: rm -f *.o *~ testbios
-%.o: ../../src/devices/oprom/x86emu/%.c +%.o: ../../src/device/oprom/x86emu/%.c $(CC) $(CFLAGS) $(INCLUDES) -include stdio.h -c -o $@ $^
%.o: %.c diff --git a/util/vgabios/include/stdtypes.h b/util/vgabios/include/stdtypes.h new file mode 100644 index 0000000..62c254d --- /dev/null +++ b/util/vgabios/include/stdtypes.h @@ -0,0 +1,18 @@ +#ifndef _STDTYPES_H +#define _STDTYPES_H + +#include <stdint.h> + +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint32_t u32; +typedef uint64_t u64; +typedef int8_t s8; +typedef int16_t s16; +typedef int32_t s32; + +typedef uint8_t bool; +#define true 1 +#define false 0 + +#endif /* _STDTYPES_H */
-
Patrick Georgi