From 6af657c2112ba556b6abe07a8a2974c263d7a274 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Wed, 5 Apr 2017 17:30:20 +0200 Subject: [PATCH] UPSTREAM: inteltool: #include BUG=none BRANCH=none TEST=none CQ-DEPEND=CL:535635 Change-Id: I51b34fa7492d0b60d7f06d8789b40e877170fcfe Signed-off-by: Patrick Georgi Original-Commit-Id: af83db2659948ea39fa9fb1473cfca7f2d3f6cfd Original-Change-Id: I66a243486a347313103ffd2cb2ca0447228e4054 Original-Signed-off-by: Nico Huber Original-Reviewed-on: https://review.coreboot.org/19586 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Philippe Mathieu-Daud Original-Reviewed-by: Stefan Reinauer Reviewed-on: https://chromium-review.googlesource.com/533095 Commit-Ready: Patrick Georgi Tested-by: Patrick Georgi Reviewed-by: Patrick Georgi --- util/inteltool/Makefile | 4 +++- util/inteltool/inteltool.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/util/inteltool/Makefile b/util/inteltool/Makefile index cb6d1467e0..b51f5a2ad8 100644 --- a/util/inteltool/Makefile +++ b/util/inteltool/Makefile @@ -17,10 +17,12 @@ PROGRAM = inteltool +top ?= $(abspath ../..) + CC ?= gcc INSTALL ?= /usr/bin/install PREFIX ?= /usr/local -CFLAGS ?= -O2 -g -Wall -W +CFLAGS ?= -O2 -g -Wall -W -I$(top)/src/commonlib/include LDFLAGS += -lpci -lz OBJS = inteltool.o cpu.o gpio.o rootcmplx.o powermgt.o memory.o pcie.o amb.o ivy_memory.o spi.o gfx.o ahci.o diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h index 7d6fbfa487..e463260a43 100644 --- a/util/inteltool/inteltool.h +++ b/util/inteltool/inteltool.h @@ -14,6 +14,8 @@ * GNU General Public License for more details. */ +#include + #include #if defined(__GLIBC__) @@ -208,8 +210,6 @@ static inline uint32_t inl(unsigned port) #define PCI_DEVICE_ID_INTEL_CORE_5TH_GEN_U 0x1604 /* Broadwell-ULT */ #define PCI_DEVICE_ID_INTEL_CORE_6TH_GEN_WST 0x1918 -#define ARRAY_SIZE(a) ((int)(sizeof(a) / sizeof((a)[0]))) - #if !defined(__DARWIN__) && !defined(__FreeBSD__) typedef struct { uint32_t hi, lo; } msr_t; #endif