From d5ffbf520e11ddd510ba5121493e80579543a37a Mon Sep 17 00:00:00 2001 From: seokj Date: Fri, 20 Jan 2017 16:27:15 +0000 Subject: standard location of fcntl is not under sys --- .../patches/flashrom-fcntl-20170120-702322e.diff | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 projects/flashrom-cros/patches/flashrom-fcntl-20170120-702322e.diff (limited to 'projects/flashrom-cros/patches') diff --git a/projects/flashrom-cros/patches/flashrom-fcntl-20170120-702322e.diff b/projects/flashrom-cros/patches/flashrom-fcntl-20170120-702322e.diff new file mode 100644 index 00000000..08b1751b --- /dev/null +++ b/projects/flashrom-cros/patches/flashrom-fcntl-20170120-702322e.diff @@ -0,0 +1,18 @@ +diff --git a/linux_spi.c b/linux_spi.c +index 0199cf5..d56e8b0 100644 +--- a/linux_spi.c ++++ b/linux_spi.c +@@ -20,11 +20,12 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include + #include ++#include + #include + #include + #include -- cgit v1.2.3-70-g09d2 From 21d33559d4cdfa7edb542a461bb63c11adb0bff2 Mon Sep 17 00:00:00 2001 From: seokj Date: Fri, 20 Jan 2017 16:43:13 +0000 Subject: define loff_t by specifying _GNU_SOURCE --- .../patches/flashrom-loff_t-20170120-3470be9.diff | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 projects/flashrom-cros/patches/flashrom-loff_t-20170120-3470be9.diff (limited to 'projects/flashrom-cros/patches') diff --git a/projects/flashrom-cros/patches/flashrom-loff_t-20170120-3470be9.diff b/projects/flashrom-cros/patches/flashrom-loff_t-20170120-3470be9.diff new file mode 100644 index 00000000..f5a771f8 --- /dev/null +++ b/projects/flashrom-cros/patches/flashrom-loff_t-20170120-3470be9.diff @@ -0,0 +1,34 @@ +diff --git a/fdtmap.h b/fdtmap.h +index 68eeef9..fe75291 100644 +--- a/fdtmap.h ++++ b/fdtmap.h +@@ -36,6 +36,12 @@ + #ifndef FLASHMAP_LIB_FDTMAP_H__ + #define FLASHMAP_LIB_FDTMAP_H__ + ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif ++ ++#include ++ + #define FDTMAP_SIGNATURE "__FDTM__" + + struct romlayout; +diff --git a/fmap.h b/fmap.h +index b3c0a34..8aa82f7 100644 +--- a/fmap.h ++++ b/fmap.h +@@ -38,7 +38,12 @@ + #ifndef FLASHMAP_LIB_FMAP_H__ + #define FLASHMAP_LIB_FMAP_H__ + ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif ++ + #include ++#include + + struct flashctx; + -- cgit v1.2.3-70-g09d2 From c1841617a288468b59a021b40d855c42ee39d22f Mon Sep 17 00:00:00 2001 From: seokj Date: Fri, 20 Jan 2017 16:54:34 +0000 Subject: include sys/io.h header for arm hosts too. endian.h has been accepted as posix --- .../patches/flashrom-arm-20170120-f5c27c4.diff | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 projects/flashrom-cros/patches/flashrom-arm-20170120-f5c27c4.diff (limited to 'projects/flashrom-cros/patches') diff --git a/projects/flashrom-cros/patches/flashrom-arm-20170120-f5c27c4.diff b/projects/flashrom-cros/patches/flashrom-arm-20170120-f5c27c4.diff new file mode 100644 index 00000000..013efa17 --- /dev/null +++ b/projects/flashrom-cros/patches/flashrom-arm-20170120-f5c27c4.diff @@ -0,0 +1,33 @@ +diff --git a/hwaccess.h b/hwaccess.h +index 0299ecb..a6732c2 100644 +--- a/hwaccess.h ++++ b/hwaccess.h +@@ -24,11 +24,9 @@ + #ifndef __HWACCESS_H__ + #define __HWACCESS_H__ 1 + +-#if defined (__i386__) || defined (__x86_64__) +-#if defined(__GLIBC__) ++#if defined (__i386__) || defined (__x86_64__) || defined(__arm__) + #include + #endif +-#endif + + #if NEED_PCI == 1 + /* +@@ -72,7 +70,6 @@ + + #if !defined (__FLASHROM_BIG_ENDIAN__) && !defined (__FLASHROM_LITTLE_ENDIAN__) + /* Nonstandard libc-specific macros for determining endianness. */ +-#if defined(__GLIBC__) + #include + #if BYTE_ORDER == LITTLE_ENDIAN + #define __FLASHROM_LITTLE_ENDIAN__ 1 +@@ -80,7 +77,6 @@ + #define __FLASHROM_BIG_ENDIAN__ 1 + #endif + #endif +-#endif + + #if !defined (__FLASHROM_BIG_ENDIAN__) && !defined (__FLASHROM_LITTLE_ENDIAN__) + #error Unable to determine endianness. Please add support for your arch or libc. -- cgit v1.2.3-70-g09d2 From 676dd2287a00314f466c6a401fe2310238de8f2b Mon Sep 17 00:00:00 2001 From: seokj Date: Fri, 20 Jan 2017 17:16:17 +0000 Subject: disable -Werror, link against libusb-1.0 explicitly --- .../flashrom-makefile-20170120-1139be7.diff | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 projects/flashrom-cros/patches/flashrom-makefile-20170120-1139be7.diff (limited to 'projects/flashrom-cros/patches') diff --git a/projects/flashrom-cros/patches/flashrom-makefile-20170120-1139be7.diff b/projects/flashrom-cros/patches/flashrom-makefile-20170120-1139be7.diff new file mode 100644 index 00000000..5dc0e7a4 --- /dev/null +++ b/projects/flashrom-cros/patches/flashrom-makefile-20170120-1139be7.diff @@ -0,0 +1,48 @@ +diff --git a/Makefile b/Makefile +index a2f95cf..fcfce9b 100644 +--- a/Makefile ++++ b/Makefile +@@ -35,7 +35,7 @@ PKG_CONFIG ?= pkg-config + WARNERROR ?= yes + + ifneq ($(NOWARNERROR),yes) +-CFLAGS += -Werror ++CFLAGS += + endif + + ifeq ($(CONFIG_STATIC),yes) +@@ -354,7 +354,7 @@ CONFIG_BUSPIRATE_SPI ?= no + CONFIG_RAIDEN_DEBUG_SPI ?= no + + # Enable Linux I2C for ChromeOS EC +-CONFIG_LINUX_I2C ?= no ++CONFIG_LINUX_I2C ?= yes + + CONFIG_LINUX_MTD ?= no + +@@ -401,6 +401,7 @@ PROGRAMMER_OBJS += ichspi.o ich_descriptors.o + else + ifeq ($(ARCH),arm) + PROGRAMMER_OBJS += cros_ec_i2c.o ++CONFIG_SATAMV := no + endif + NEED_PCI := yes + endif +@@ -453,7 +454,7 @@ endif + + ifeq ($(CONFIG_FT2232_SPI), yes) + FTDILIBS := $(shell $(PKG_CONFIG) --libs libftdi1 2>/dev/null || \ +- $(PKG_CONFIG) --libs libftdi 2>/dev/null || echo "-lftdi -lusb") ++ $(PKG_CONFIG) --libs libftdi 2>/dev/null || echo "-lftdi -lusb-1.0") + FTDICFLAGS := $(shell $(PKG_CONFIG) --cflags libftdi1 2>/dev/null || \ + $(PKG_CONFIG) --cflags libftdi 2>/dev/null) + # This is a totally ugly hack. +@@ -528,7 +529,7 @@ endif + + ifeq ($(CONFIG_DEDIPROG), yes) + FEATURE_CFLAGS += -D'CONFIG_DEDIPROG=1' +-FEATURE_LIBS += -lusb ++FEATURE_LIBS += -lusb-1.0 + PROGRAMMER_OBJS += dediprog.o + endif + -- cgit v1.2.3-70-g09d2