Browse Source

Merge pull request #9362 from neheb/tg43ht

flashrom: Add ARC support
lilik-openwrt-22.03
Rosen Penev 5 years ago
committed by GitHub
parent
commit
385e48aec2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 61 additions and 17 deletions
  1. +6
    -6
      utils/flashrom/Makefile
  2. +0
    -10
      utils/flashrom/patches/0002-fix-io-h-include.patch
  3. +1
    -1
      utils/flashrom/patches/0003-ch341a_spi-avoid-deprecated-libusb-functions.patch
  4. +54
    -0
      utils/flashrom/patches/010-add-arc.patch

+ 6
- 6
utils/flashrom/Makefile View File

@ -9,20 +9,20 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=flashrom
PKG_VERSION:=1.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://download.flashrom.org/releases
PKG_SOURCE_URL:=https://download.flashrom.org/releases
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_HASH:=3702fa215ba5fb5af8e54c852d239899cfa1389194c1e51cb2a170c4dc9dee64
PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)
PKG_LICENSE:=GPL-2.0
PKG_MAINTAINER:=Álvaro Fernández Rojas <noltari@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
include flashrom.mk
@ -37,7 +37,7 @@ define Package/flashrom/default
SECTION:=utils
CATEGORY:=Utilities
TITLE:=FlashROM Utility
URL:=http://www.flashrom.org/
URL:=https://www.flashrom.org/
endef
define Package/flashrom


+ 0
- 10
utils/flashrom/patches/0002-fix-io-h-include.patch View File

@ -1,10 +0,0 @@
--- a/flash.h
+++ b/flash.h
@@ -30,6 +30,7 @@
#include <stdio.h>
#include <stdint.h>
#include <stddef.h>
+#include <sys/io.h>
#include <stdarg.h>
#include <stdbool.h>
#if IS_WINDOWS

+ 1
- 1
utils/flashrom/patches/0003-ch341a_spi-avoid-deprecated-libusb-functions.patch View File

@ -21,7 +21,7 @@ diff --git a/ch341a_spi.c b/ch341a_spi.c
index 95e9c95..ee18624 100644
--- a/ch341a_spi.c
+++ b/ch341a_spi.c
@@ -441,7 +441,12 @@ int ch341a_spi_init(void)
@@ -444,7 +444,12 @@ int ch341a_spi_init(void)
return -1;
}


+ 54
- 0
utils/flashrom/patches/010-add-arc.patch View File

@ -0,0 +1,54 @@
--- a/Makefile
+++ b/Makefile
@@ -420,7 +420,7 @@ endif
# Disable all drivers needing raw access (memory, PCI, port I/O) on
# architectures with unknown raw access properties.
# Right now those architectures are alpha hppa m68k sh s390
-ifneq ($(ARCH),$(filter $(ARCH),x86 mips ppc arm sparc))
+ifneq ($(ARCH),$(filter $(ARCH),x86 mips ppc arm sparc arc))
ifeq ($(CONFIG_INTERNAL), yes)
UNSUPPORTED_FEATURES += CONFIG_INTERNAL=yes
else
--- a/hwaccess.h
+++ b/hwaccess.h
@@ -87,6 +87,13 @@
/* SPARC is big endian in general (but allows to access data in little endian too). */
#define __FLASHROM_BIG_ENDIAN__ 1
+#elif IS_ARC
+#ifdef __arceb__
+#define __FLASHROM_BIG_ENDIAN__ 1
+#else
+#define __FLASHROM_LITTLE_ENDIAN__ 1
+#endif
+
#endif /* IS_? */
#if !defined (__FLASHROM_BIG_ENDIAN__) && !defined (__FLASHROM_LITTLE_ENDIAN__)
@@ -378,6 +385,8 @@ int libpayload_wrmsr(int addr, msr_t msr);
/* Non memory mapped I/O is not supported on ARM. */
+#elif IS_ARC
+
#else
#error Unknown architecture, please check if it supports PCI port IO.
diff --git a/platform.h b/platform.h
index b2fdcd0..2e68e71 100644
--- a/platform.h
+++ b/platform.h
@@ -75,9 +75,12 @@
#elif defined(__s390__) || defined(__s390x__) || defined(__zarch__)
#define __FLASHROM_ARCH__ "s390"
#define IS_S390 1
+#elif defined (__arc__)
+ #define __FLASHROM_ARCH__ "arc"
+ #define IS_ARC 1
#endif
-#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_SH || IS_S390)
+#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_SH || IS_S390 || IS_ARC)
#error Unknown architecture
#endif

Loading…
Cancel
Save