aboutsummaryrefslogtreecommitdiff
path: root/projects/flashrom-cros
diff options
context:
space:
mode:
authorseokj <manettus@icloud.com>2017-01-20 17:16:17 +0000
committerseokj <manettus@icloud.com>2017-01-20 17:16:17 +0000
commit676dd2287a00314f466c6a401fe2310238de8f2b (patch)
treefd927705137ad90b93d71a50717ebdab774e6aff /projects/flashrom-cros
parentc1841617a288468b59a021b40d855c42ee39d22f (diff)
downloadlibrebootfr-676dd2287a00314f466c6a401fe2310238de8f2b.tar.gz
librebootfr-676dd2287a00314f466c6a401fe2310238de8f2b.zip
disable -Werror, link against libusb-1.0 explicitly
Diffstat (limited to 'projects/flashrom-cros')
-rw-r--r--projects/flashrom-cros/patches/flashrom-makefile-20170120-1139be7.diff48
1 files changed, 48 insertions, 0 deletions
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
+