diff options
-rw-r--r-- | Makefile.toolchain | 16 | ||||
-rw-r--r-- | util/ec_uartd.c | 3 |
2 files changed, 17 insertions, 2 deletions
diff --git a/Makefile.toolchain b/Makefile.toolchain index fd64ff5c26..8b2de15a85 100644 --- a/Makefile.toolchain +++ b/Makefile.toolchain @@ -15,6 +15,7 @@ CPP=$(CROSS_COMPILE)cpp LD=$(CROSS_COMPILE)ld OBJCOPY=$(CROSS_COMPILE)objcopy OBJDUMP=$(CROSS_COMPILE)objdump +PKG_CONFIG?=pkg-config BUILDCC?=gcc HOSTCC?=$(HOST_CROSS_COMPILE)gcc @@ -33,7 +34,18 @@ CFLAGS_DEFINE=-DOUTDIR=$(out) -DCHIP=$(CHIP) -DBOARD_TASKFILE=ec.tasklist \ -DCHIP_VARIANT_$(CHIP_VARIANT) -DPROJECT=$(PROJECT) CPPFLAGS=$(CFLAGS_DEFINE) $(CFLAGS_INCLUDE) $(CFLAGS_TEST) $(EXTRA_CFLAGS) CFLAGS=$(CPPFLAGS) $(CFLAGS_CPU) $(CFLAGS_DEBUG) $(CFLAGS_WARN) $(CFLAGS_y) -BUILD_CFLAGS=$(CPPFLAGS) -O3 $(CFLAGS_DEBUG) $(CFLAGS_WARN) + +FTDIVERSION=$(shell $(PKG_CONFIG) --modversion libftdi1 2>/dev/null) +ifneq ($(FTDIVERSION),) + LIBFTDI_NAME=ftdi1 +else + LIBFTDI_NAME=ftdi +endif + +LIBFTDI_CFLAGS=$(shell $(PKG_CONFIG) --cflags lib${LIBFTDI_NAME}) +LIBFTDI_LDLIBS=$(shell $(PKG_CONFIG) --libs lib${LIBFTDI_NAME}) + +BUILD_CFLAGS= $(LIBFTDI_CFLAGS) $(CPPFLAGS) -O3 $(CFLAGS_DEBUG) $(CFLAGS_WARN) HOST_CFLAGS=$(CPPFLAGS) -O3 $(CFLAGS_DEBUG) $(CFLAGS_WARN) LDFLAGS=-nostdlib -X -BUILD_LDFLAGS=-lftdi +BUILD_LDFLAGS=$(LIBFTDI_LDLIBS) diff --git a/util/ec_uartd.c b/util/ec_uartd.c index 24949545f5..e930a34e69 100644 --- a/util/ec_uartd.c +++ b/util/ec_uartd.c @@ -19,8 +19,11 @@ #endif #include <fcntl.h> +#pragma GCC diagnostic ignored "-Wstrict-prototypes" #include <ftdi.h> +#pragma GCC diagnostic pop #include <getopt.h> +#include <limits.h> #include <stdio.h> #include <stdlib.h> #include <sys/stat.h> |