flashrom: Upgrade 1.0 -> 1.1
PATCH 1/1 flashrom: Upgrade 1.0 -> 1.1
Patches applied upstream removed.
Signed-off-by Adrian Bunk <[email protected]>
--- ...pi-Avoid-deprecated-libusb-functions.patch | 39 ---- ...latform-Add-riscv-to-known-platforms.patch | 37 ---- .../recipes-bsp/flashrom/flashrom/sst26.patch | 198 ------------------ meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb | 20 -- meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb | 19 ++ 5 files changed, 19 insertions(+), 294 deletions(-) delete mode 100644 meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch delete mode 100644 meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch delete mode 100644 meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch delete mode 100644 meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb create mode 100644 meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb
meta-oe/recipes-bsp/flashrom/flashrom/0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch deleted +0 -39
@@ -1,39 +0,0 @@ -From e5f68189ab3602b1042cc8423fd6a3a23abd5455 Mon Sep 17 00:00:00 2001 -From: Alex James <[email protected]> -Date: Sat, 14 Apr 2018 22:59:57 -0500 -Subject: [PATCH] ch341a_spi: Avoid deprecated libusb functions - -libusb 1.0.22 marked libusb_set_debug as deprecated. For such versions -of libusb, use libusb_set_option instead. - -Change-Id: Ib71ebe812316eaf49136979a942a946ef9e4d487 -Signed-off-by: Alex James <[email protected]> -Reviewed-on: https://review.coreboot.org/25681 -Tested-by: Nico Huber <[email protected]> -Reviewed-by: David Hendricks <[email protected]> ---- -Upstream-Status: Backport - ch341a_spi.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/ch341a_spi.c b/ch341a_spi.c -index 6eb2804..d880510 100644 ---- a/ch341a_spi.c -+++ b/ch341a_spi.c -@@ -444,7 +444,12 @@ int ch341a_spi_init(void) - return -1; - } - -- libusb_set_debug(NULL, 3); // Enable information, warning and error messages (only). -+ /* Enable information, warning, and error messages (only). */ -+#if LIBUSB_API_VERSION < 0x01000106 -+ libusb_set_debug(NULL, 3); -+#else -+ libusb_set_option(NULL, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO); -+#endif - - uint16_t vid = devs_ch341a_spi[0].vendor_id; - uint16_t pid = devs_ch341a_spi[0].device_id; --- -2.17.0 -
meta-oe/recipes-bsp/flashrom/flashrom/0001-platform-Add-riscv-to-known-platforms.patch deleted +0 -37
@@ -1,37 +0,0 @@ -From d2a28dcdbd1051d2f48320e2eda3393581fe0519 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sat, 17 Mar 2018 23:08:29 -0700 -Subject: [PATCH] platform: Add riscv to known platforms - -Signed-off-by: Khem Raj <[email protected]> ---- -Upstream-Status: Submitted [https://review.coreboot.org/#/c/flashrom/+/25260/] - platform.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/platform.h b/platform.h -index b2fdcd0..2cadbb3 100644 ---- a/platform.h -+++ b/platform.h -@@ -69,6 +69,9 @@ - #elif defined (__m68k__) - #define __FLASHROM_ARCH__ "m68k" - #define IS_M68K 1 -+#elif defined (__riscv) -+ #define __FLASHROM_ARCH__ "riscv" -+ #define IS_RISCV 1 - #elif defined (__sh__) - #define __FLASHROM_ARCH__ "sh" - #define IS_SH 1 -@@ -77,7 +80,7 @@ - #define IS_S390 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_RISCV || IS_SH || IS_S390) - #error Unknown architecture - #endif - --- -2.16.2 -
meta-oe/recipes-bsp/flashrom/flashrom/sst26.patch deleted +0 -198
198 lines not on this page · raw message
meta-oe/recipes-bsp/flashrom/flashrom_1.0.bb deleted +0 -20
@@ -1,20 +0,0 @@ -DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips" -LICENSE = "GPLv2" -HOMEPAGE = "http://flashrom.org" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "pciutils libusb libusb-compat" - -SRC_URI = "https://download.flashrom.org/releases/flashrom-${PV}.tar.bz2 \ - file://sst26.patch \ - file://0001-platform-Add-riscv-to-known-platforms.patch \ - file://0001-ch341a_spi-Avoid-deprecated-libusb-functions.patch \ - " -SRC_URI[md5sum] = "42d999990c735d88653627cefcc13b9a" -SRC_URI[sha256sum] = "3702fa215ba5fb5af8e54c852d239899cfa1389194c1e51cb2a170c4dc9dee64" - -inherit pkgconfig - -do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install -}
meta-oe/recipes-bsp/flashrom/flashrom_1.1.bb new file +19 -0
@@ -0,0 +1,19 @@ +DESCRIPTION = "flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips" +LICENSE = "GPLv2" +HOMEPAGE = "http://flashrom.org" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "pciutils libusb libusb-compat" + +SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.bz2 \ + " +SRC_URI[md5sum] = "91bab6c072e38a493bb4eb673e4fe0d6" +SRC_URI[sha256sum] = "aeada9c70c22421217c669356180c0deddd0b60876e63d2224e3260b90c14e19" + +S = "${WORKDIR}/flashrom-v${PV}" + +inherit pkgconfig + +do_install() { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install +}
Signature · 1 line
2.17.1