libreboot

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README

commit 76b7edb769fb14c2fa74cef619c9b67850a6d0b8
parent c365a3d9a7139b44415b9c7aa5487e6a84f29b1f
Author: Leah Rowe <info@minifree.org>
Date:   Sun, 22 Jan 2017 05:04:49 +0100

Merge branch 'master' of seokj/libreboot into master

Diffstat:
projects/flashrom-cros/patches/flashrom-arm-20170120-f5c27c4.diff | 33+++++++++++++++++++++++++++++++++
projects/flashrom-cros/patches/flashrom-fcntl-20170120-702322e.diff | 18++++++++++++++++++
projects/flashrom-cros/patches/flashrom-loff_t-20170120-3470be9.diff | 34++++++++++++++++++++++++++++++++++
projects/flashrom-cros/patches/flashrom-makefile-20170120-1139be7.diff | 48++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 133 insertions(+), 0 deletions(-)

diff --git a/projects/flashrom-cros/patches/flashrom-arm-20170120-f5c27c4.diff 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 <sys/io.h> + #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 <endian.h> + #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. diff --git a/projects/flashrom-cros/patches/flashrom-fcntl-20170120-702322e.diff 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 <stdio.h> + #include <string.h> + #include <stdlib.h> +-#include <sys/fcntl.h> ++#include <fcntl.h> + #include <errno.h> + #include <ctype.h> + #include <unistd.h> + #include <linux/spi/spidev.h> ++#include <linux/ioctl.h> + #include <sys/ioctl.h> + #include <sys/stat.h> + #include <sys/types.h> diff --git a/projects/flashrom-cros/patches/flashrom-loff_t-20170120-3470be9.diff 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 <fcntl.h> ++ + #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 <inttypes.h> ++#include <fcntl.h> + + struct flashctx; + diff --git a/projects/flashrom-cros/patches/flashrom-makefile-20170120-1139be7.diff 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 +