Merge pull request #7474 from heitbaum/flashrom

flashrom: update to 1.3.0

packages/tools/flashrom/package.mk

@@ -2,18 +2,16 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="flashrom"
-PKG_VERSION="1.2"
-PKG_SHA256="e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b"
+PKG_VERSION="1.3.0"
+PKG_SHA256="a053234453ccd012e79f3443bdcc61625cf97b7fd7cb4cdd8bfbffbe8b149623"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.flashrom.org/Flashrom"
 PKG_URL="https://download.flashrom.org/releases/${PKG_NAME}-v${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain libusb-compat"
 PKG_LONGDESC="flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips. It is designed to flash BIOS/EFI/coreboot/firmware/optionROM images on mainboards, network/graphics/storage controller cards, and various other programmer devices."
 
-PKG_MESON_OPTS_TARGET="-Dpciutils=false \
-                       -Dusb=false \
-                       -Dconfig_ft2232_spi=false \
-                       -Dconfig_usbblaster_spi=false"
+PKG_MESON_OPTS_TARGET="--wrap-mode=nodownload \
+                       -Dprogrammer=dummy,serprog,buspirate_spi,pony_spi,linux_mtd,linux_spi"
 
 makeinstall_target() {
   mkdir -p ${INSTALL}/usr/sbin

packages/tools/flashrom/patches/flashrom-0000-fix-1.2-build-without-usb.patch

@@ -1,21 +0,0 @@
-From 689d136c2806188d4a8bdaf9b5a7a57c2d889050 Mon Sep 17 00:00:00 2001
-From: MilhouseVH <milhouseVH.github@nmacleod.com>
-Date: Fri, 21 Feb 2020 03:02:31 +0000
-Subject: [PATCH] meson build: fails to build stlinkv3 when usb is disabled
-
----
- meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/meson.build b/meson.build
-index 375089c30..3c5296c5f 100644
---- a/meson.build
-+++ b/meson.build
-@@ -91,6 +91,7 @@ else
-   config_digilent_spi = false
-   config_developerbox_spi = false
-   config_pickit2_spi = false
-+  config_stlinkv3_spi = false
- endif
- 
- # some programmers require libpci