GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cbmem compilation needs to use the hardened toolchain 

The appropriate compiler (provided by the build system) is used to
ensure proper toolchain options are used.

cbmem.c is being modified to suppress pointer to integer typecast
warnings.

Change-Id: Ibab2faacbd7bdfcf617ce9ea4296ebe7d7b64562
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: http://review.coreboot.org/1791
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Vadim Bendebury 2012-10-19 10:57:18 -07:00 committed by Ronald G. Minnich
parent feadfb7776
commit 7c6b6bb593
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
util/cbmem/Makefile
View File

@ -19,17 +19,16 @@
PROGRAM = cbmem PROGRAM = cbmem
ROOT = ../../src ROOT = ../../src
CC = gcc CC = $(CROSS_COMPILE)gcc
CFLAGS = -O2 -Wall -Werror -iquote $(ROOT)/include \ CFLAGS ?= -O2
-iquote $(ROOT)/src/arch/x86 CFLAGS += -Wall -Werror
LDFLAGS = CPPFLAGS += -iquote $(ROOT)/include -iquote $(ROOT)/src/arch/x86
OBJS = $(PROGRAM).o OBJS = $(PROGRAM).o
all: dep $(PROGRAM) all: $(PROGRAM)
$(PROGRAM): $(OBJS) $(PROGRAM): $(OBJS)
$(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS)
clean: clean:
rm -f $(PROGRAM) *.o *~ rm -f $(PROGRAM) *.o *~
@ -37,9 +36,9 @@ clean:
distclean: clean distclean: clean
rm -f .dependencies rm -f .dependencies
dep: .dependencies:
@$(CC) $(CFLAGS) -MM *.c > .dependencies @$(CC) $(CFLAGS) -MM *.c > .dependencies
.PHONY: all clean distclean dep .PHONY: all clean distclean
-include .dependencies -include .dependencies

2
util/cbmem/cbmem.c
View File

@ -125,7 +125,7 @@ static const struct timestamp_table *find_tstamps(u64 address)
int new_size; int new_size;
struct timestamp_table *tst_p; struct timestamp_table *tst_p;
u32 stamp_addr = (u32) u32 stamp_addr = (u32)
((u64)cbmr_p->cbmem_addr); ((uintptr_t)(cbmr_p->cbmem_addr));
readmem(buf, stamp_addr, readmem(buf, stamp_addr,
sizeof(struct timestamp_table)); sizeof(struct timestamp_table));