aboutsummaryrefslogtreecommitdiff
path: root/i18n/fr_FR/projects/flashrom-cros
diff options
context:
space:
mode:
Diffstat (limited to 'i18n/fr_FR/projects/flashrom-cros')
-rw-r--r--i18n/fr_FR/projects/flashrom-cros/configs/install1
-rw-r--r--i18n/fr_FR/projects/flashrom-cros/configs/revision1
-rwxr-xr-xi18n/fr_FR/projects/flashrom-cros/flashrom-cros110
-rw-r--r--i18n/fr_FR/projects/flashrom-cros/patches/0001-programmer.h-Define-ich_generation-after-enum-declar.patch37
-rw-r--r--i18n/fr_FR/projects/flashrom-cros/patches/flashrom-arm-20170120-f5c27c4.diff33
-rw-r--r--i18n/fr_FR/projects/flashrom-cros/patches/flashrom-fcntl-20170120-702322e.diff18
-rw-r--r--i18n/fr_FR/projects/flashrom-cros/patches/flashrom-loff_t-20170120-3470be9.diff34
-rw-r--r--i18n/fr_FR/projects/flashrom-cros/patches/flashrom-makefile-20170120-1139be7.diff48
8 files changed, 282 insertions, 0 deletions
diff --git a/i18n/fr_FR/projects/flashrom-cros/configs/install b/i18n/fr_FR/projects/flashrom-cros/configs/install
new file mode 100644
index 00000000..0a129b8a
--- /dev/null
+++ b/i18n/fr_FR/projects/flashrom-cros/configs/install
@@ -0,0 +1 @@
+flashrom:flashrom
diff --git a/i18n/fr_FR/projects/flashrom-cros/configs/revision b/i18n/fr_FR/projects/flashrom-cros/configs/revision
new file mode 100644
index 00000000..6ce6b84b
--- /dev/null
+++ b/i18n/fr_FR/projects/flashrom-cros/configs/revision
@@ -0,0 +1 @@
+origin/release-R65-10323.B
diff --git a/i18n/fr_FR/projects/flashrom-cros/flashrom-cros b/i18n/fr_FR/projects/flashrom-cros/flashrom-cros
new file mode 100755
index 00000000..75b8f471
--- /dev/null
+++ b/i18n/fr_FR/projects/flashrom-cros/flashrom-cros
@@ -0,0 +1,110 @@
+#!/usr/bin/env bash
+
+# Copyright (C) 2016 Paul Kocialkowski <contact@paulk.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+usage() {
+ project_usage_actions "$project"
+}
+
+download() {
+ local repository=$project
+
+ project_download_git "$project" "$repository" "https://chromium.googlesource.com/chromiumos/third_party/flashrom" "$@"
+}
+
+download_check() {
+ local repository=$project
+
+ project_download_check_git "$project" "$repository" "$@"
+}
+
+extract() {
+ local repository=$project
+
+ project_extract "$project" "$@"
+}
+
+extract_check() {
+ local repository=$project
+
+ project_extract_check "$project" "$@"
+}
+
+update() {
+ local repository=$project
+
+ project_update_git "$project" "$repository" "$@"
+}
+
+update_check() {
+ local repository=$project
+
+ project_update_check_git "$project" "$repository" "$@"
+}
+
+build() {
+ local repository=$project
+
+ project_sources_directory_missing_empty_error "$project" "$repository" "$@"
+
+ if git_project_check "$repository"
+ then
+ git_project_checkout "$project" "$repository" "$@"
+ fi
+
+ local sources_path=$(project_sources_path "$project" "$repository" "$@")
+ local build_path=$(project_build_path "$project" "$@")
+
+ mkdir -p "$build_path"
+
+ make -C "$sources_path" CONFIG_SATAMV="no" NOWARNERROR="yes" NEED_PCI="yes" CONFIG_LINUX_SPI="yes" CONFIG_LINUX_I2C="yes" -j$TASKS
+
+ cp "$sources_path/flashrom" "$build_path"
+
+ make -C "$sources_path" CONFIG_SATAMV="no" NOWARNERROR="yes" NEED_PCI="yes" CONFIG_LINUX_SPI="yes" CONFIG_LINUX_I2C="yes" "clean"
+}
+
+build_check() {
+ project_build_check "$project" "$@"
+}
+
+install() {
+ project_install "$project" "$@"
+}
+
+install_check() {
+ project_install_check "$project" "$@"
+}
+
+release() {
+ local repository=$project
+
+ project_release_install_archive "$project" "$TOOLS" "$@"
+
+ project_release_sources_git "$project" "$repository" "$@"
+}
+
+release_check() {
+ local repository=$project
+
+ project_release_install_archive_check "$project" "$TOOLS" "$@"
+
+ project_release_check_sources_git "$project" "$repository" "$@"
+}
+
+clean() {
+ project_clean "$project" "$@"
+}
diff --git a/i18n/fr_FR/projects/flashrom-cros/patches/0001-programmer.h-Define-ich_generation-after-enum-declar.patch b/i18n/fr_FR/projects/flashrom-cros/patches/0001-programmer.h-Define-ich_generation-after-enum-declar.patch
new file mode 100644
index 00000000..8b35e9e3
--- /dev/null
+++ b/i18n/fr_FR/projects/flashrom-cros/patches/0001-programmer.h-Define-ich_generation-after-enum-declar.patch
@@ -0,0 +1,37 @@
+From f721cdd46196a99dbcc41f0f7ecaf2ee17a147fe Mon Sep 17 00:00:00 2001
+From: Paul Kocialkowski <contact@paulk.fr>
+Date: Wed, 2 Nov 2016 19:16:50 +0100
+Subject: [PATCH] programmer.h: Define ich_generation after enum declaration
+
+This moves the ich_generation definition after the declaration of its
+associated enum.
+
+Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
+---
+ programmer.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/programmer.h b/programmer.h
+index 191fb1e..86a695a 100644
+--- a/programmer.h
++++ b/programmer.h
+@@ -275,7 +275,6 @@ int board_flash_enable(const char *vendor, const char *part);
+ /* chipset_enable.c */
+ int chipset_flash_enable(void);
+ int get_target_bus_from_chipset(enum chipbustype *target_bus);
+-enum ich_chipset ich_generation;
+
+ /* processor_enable.c */
+ int processor_flash_enable(void);
+@@ -603,6 +602,8 @@ enum ich_chipset {
+ };
+
+ #if CONFIG_INTERNAL == 1
++enum ich_chipset ich_generation;
++
+ extern uint32_t ichspi_bbar;
+ int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb,
+ enum ich_chipset ich_generation);
+--
+2.10.2
+
diff --git a/i18n/fr_FR/projects/flashrom-cros/patches/flashrom-arm-20170120-f5c27c4.diff b/i18n/fr_FR/projects/flashrom-cros/patches/flashrom-arm-20170120-f5c27c4.diff
new file mode 100644
index 00000000..013efa17
--- /dev/null
+++ b/i18n/fr_FR/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/i18n/fr_FR/projects/flashrom-cros/patches/flashrom-fcntl-20170120-702322e.diff b/i18n/fr_FR/projects/flashrom-cros/patches/flashrom-fcntl-20170120-702322e.diff
new file mode 100644
index 00000000..08b1751b
--- /dev/null
+++ b/i18n/fr_FR/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/i18n/fr_FR/projects/flashrom-cros/patches/flashrom-loff_t-20170120-3470be9.diff b/i18n/fr_FR/projects/flashrom-cros/patches/flashrom-loff_t-20170120-3470be9.diff
new file mode 100644
index 00000000..f5a771f8
--- /dev/null
+++ b/i18n/fr_FR/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/i18n/fr_FR/projects/flashrom-cros/patches/flashrom-makefile-20170120-1139be7.diff b/i18n/fr_FR/projects/flashrom-cros/patches/flashrom-makefile-20170120-1139be7.diff
new file mode 100644
index 00000000..5dc0e7a4
--- /dev/null
+++ b/i18n/fr_FR/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
+