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>

util/cbmem/Makefile

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

util/cbmem/cbmem.c

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