From 503a572e1420c650ea0279e3e7db1cb401239196 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Thu, 26 Oct 2017 14:25:04 -0700 Subject: flashrom: move to recipes-bsp Signed-off-by: Armin Kuster --- .../flashrom/0001-Remove-undefined-behavior.patch | 82 --------- ...fine-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch | 28 --- .../recipes-extended/flashrom/flashrom/sst26.patch | 198 --------------------- .../recipes-extended/flashrom/flashrom_0.9.9.bb | 20 --- 4 files changed, 328 deletions(-) delete mode 100644 meta-oe/recipes-extended/flashrom/flashrom/0001-Remove-undefined-behavior.patch delete mode 100644 meta-oe/recipes-extended/flashrom/flashrom/0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch delete mode 100644 meta-oe/recipes-extended/flashrom/flashrom/sst26.patch delete mode 100644 meta-oe/recipes-extended/flashrom/flashrom_0.9.9.bb (limited to 'meta-oe/recipes-extended') diff --git a/meta-oe/recipes-extended/flashrom/flashrom/0001-Remove-undefined-behavior.patch b/meta-oe/recipes-extended/flashrom/flashrom/0001-Remove-undefined-behavior.patch deleted file mode 100644 index 51397dc55e..0000000000 --- a/meta-oe/recipes-extended/flashrom/flashrom/0001-Remove-undefined-behavior.patch +++ /dev/null @@ -1,82 +0,0 @@ -From d2a03b3e43043b596a79803bcb93f70e513bbb50 Mon Sep 17 00:00:00 2001 -From: Patrick Georgi -Date: Mon, 13 Mar 2017 13:48:03 +0100 -Subject: [PATCH] Remove undefined behavior - -Per clang-3.9, the compiler fails on #define ...defined(...) statements -as they're undefined behavior (apparently with different behavior -between gcc/clang and msvc, too). - -See clang's cfe repo commit r258128 for details. - -Change-Id: I82b6235e11b425fae45eebbe06b08f81c5bdbb98 -Signed-off-by: Patrick Georgi -Reviewed-on: https://review.coreboot.org/18792 -Reviewed-by: Stefan Reinauer -Tested-by: build bot (Jenkins) ---- - hwaccess.c | 18 +++++++++++++++--- - platform.h | 18 +++++++++++++++--- - 2 files changed, 30 insertions(+), 6 deletions(-) - -diff --git a/hwaccess.c b/hwaccess.c -index aede7e3..2bf6f42 100644 ---- a/hwaccess.c -+++ b/hwaccess.c -@@ -37,9 +37,21 @@ - #error "Unknown operating system" - #endif - --#define USE_IOPL (IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__)) --#define USE_DEV_IO (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) --#define USE_IOPERM (defined(__gnu_hurd__)) -+#if IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__) -+#define USE_IOPL 1 -+#else -+#define USE_IOPL 0 -+#endif -+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) -+#define USE_DEV_IO 1 -+#else -+#define USE_DEV_IO 0 -+#endif -+#if defined(__gnu_hurd__) -+#define USE_IOPERM 1 -+#else -+#define USE_IOPERM 0 -+#endif - - #if USE_IOPERM - #include -diff --git a/platform.h b/platform.h -index c5a52ef..b2fdcd0 100644 ---- a/platform.h -+++ b/platform.h -@@ -25,9 +25,21 @@ - #define __PLATFORM_H__ 1 - - // Helper defines for operating systems --#define IS_LINUX (defined(__gnu_linux__) || defined(__linux__)) --#define IS_MACOSX (defined(__APPLE__) && defined(__MACH__)) /* yes, both. */ --#define IS_WINDOWS (defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(__WINDOWS__)) -+#if defined(__gnu_linux__) || defined(__linux__) -+#define IS_LINUX 1 -+#else -+#define IS_LINUX 0 -+#endif -+#if defined(__APPLE__) && defined(__MACH__) /* yes, both. */ -+#define IS_MACOSX 1 -+#else -+#define IS_MACOSX 0 -+#endif -+#if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(__WINDOWS__) -+#define IS_WINDOWS 1 -+#else -+#define IS_WINDOWS 0 -+#endif - - // Likewise for target architectures - #if defined (__i386__) || defined (__x86_64__) || defined(__amd64__) --- -2.13.3 - diff --git a/meta-oe/recipes-extended/flashrom/flashrom/0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch b/meta-oe/recipes-extended/flashrom/flashrom/0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch deleted file mode 100644 index 4170fefd2a..0000000000 --- a/meta-oe/recipes-extended/flashrom/flashrom/0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7c65a465a3ddeb7afb9a7c49d010ae7e5d5b1ad1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 18 Jul 2017 20:25:49 -0700 -Subject: [PATCH] spi: Define _XOPEN_SOURCE to enable ffs() libc API - -musl exposes this issue - -Signed-off-by: Khem Raj ---- - spi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spi.c b/spi.c -index 894f73f..aeb6518 100644 ---- a/spi.c -+++ b/spi.c -@@ -21,7 +21,7 @@ - /* - * Contains the generic SPI framework - */ -- -+#define _XOPEN_SOURCE - #include - #include - #include "flash.h" --- -2.13.3 - diff --git a/meta-oe/recipes-extended/flashrom/flashrom/sst26.patch b/meta-oe/recipes-extended/flashrom/flashrom/sst26.patch deleted file mode 100644 index 46a01529f7..0000000000 --- a/meta-oe/recipes-extended/flashrom/flashrom/sst26.patch +++ /dev/null @@ -1,198 +0,0 @@ ---- flashrom-0.9.9.orig/chipdrivers.h -+++ flashrom-0.9.9/chipdrivers.h -@@ -103,6 +103,7 @@ - int spi_prettyprint_status_register_sst25(struct flashctx *flash); - int spi_prettyprint_status_register_sst25vf016(struct flashctx *flash); - int spi_prettyprint_status_register_sst25vf040b(struct flashctx *flash); -+int spi_disable_blockprotect_sst26_global_unprotect(struct flashctx *flash); - - /* sfdp.c */ - int probe_spi_sfdp(struct flashctx *flash); ---- flashrom-0.9.9.orig/flashchips.c -+++ flashrom-0.9.9/flashchips.c -@@ -12564,6 +12564,120 @@ - - { - .vendor = "SST", -+ .name = "SST26VF016B(A)", -+ .bustype = BUS_SPI, -+ .manufacture_id = SST_ID, -+ .model_id = SST_SST26VF016B, -+ .total_size = 2048, -+ .page_size = 256, -+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, -+ .tested = TEST_OK_PREW, -+ .probe = probe_spi_rdid, -+ .probe_timing = TIMING_ZERO, -+ .block_erasers = -+ { -+ { -+ .eraseblocks = { {4 * 1024, 512} }, -+ .block_erase = spi_block_erase_20, -+ }, { -+ .eraseblocks = { -+ {8 * 1024, 4}, -+ {32 * 1024, 1}, -+ {64 * 1024, 30}, -+ {32 * 1024, 1}, -+ {8 * 1024, 4}, -+ }, -+ .block_erase = spi_block_erase_d8, -+ }, { -+ .eraseblocks = { {2 * 1024 * 1024, 1} }, -+ .block_erase = spi_block_erase_c7, -+ }, -+ }, -+ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ -+ .unlock = spi_disable_blockprotect_sst26_global_unprotect, -+ .write = spi_chip_write_256, /* Multi I/O supported */ -+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ -+ .voltage = {2700, 3600}, -+ }, -+ { -+ .vendor = "SST", -+ .name = "SST26VF032B(A)", -+ .bustype = BUS_SPI, -+ .manufacture_id = SST_ID, -+ .model_id = SST_SST26VF032B, -+ .total_size = 4096, -+ .page_size = 256, -+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, -+ .tested = TEST_UNTESTED, -+ .probe = probe_spi_rdid, -+ .probe_timing = TIMING_ZERO, -+ .block_erasers = -+ { -+ { -+ .eraseblocks = { {4 * 1024, 1024} }, -+ .block_erase = spi_block_erase_20, -+ }, { -+ .eraseblocks = { -+ {8 * 1024, 4}, -+ {32 * 1024, 1}, -+ {64 * 1024, 62}, -+ {32 * 1024, 1}, -+ {8 * 1024, 4}, -+ }, -+ .block_erase = spi_block_erase_d8, -+ }, { -+ .eraseblocks = { {4 * 1024 * 1024, 1} }, -+ .block_erase = spi_block_erase_c7, -+ }, -+ }, -+ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ -+ .unlock = spi_disable_blockprotect_sst26_global_unprotect, -+ .write = spi_chip_write_256, /* Multi I/O supported */ -+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ -+ .voltage = {2700, 3600}, -+ }, -+ -+ -+ { -+ .vendor = "SST", -+ .name = "SST26VF064B(A)", -+ .bustype = BUS_SPI, -+ .manufacture_id = SST_ID, -+ .model_id = SST_SST26VF064B, -+ .total_size = 8192, -+ .page_size = 256, -+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, -+ .tested = TEST_OK_PREW, -+ .probe = probe_spi_rdid, -+ .probe_timing = TIMING_ZERO, -+ .block_erasers = -+ { -+ { -+ .eraseblocks = { {4 * 1024, 2048} }, -+ .block_erase = spi_block_erase_20, -+ }, { -+ .eraseblocks = { -+ {8 * 1024, 4}, -+ {32 * 1024, 1}, -+ {64 * 1024, 126}, -+ {32 * 1024, 1}, -+ {8 * 1024, 4}, -+ }, -+ .block_erase = spi_block_erase_d8, -+ }, { -+ .eraseblocks = { {8 * 1024 * 1024, 1} }, -+ .block_erase = spi_block_erase_c7, -+ }, -+ }, -+ .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ -+ .unlock = spi_disable_blockprotect_sst26_global_unprotect, -+ .write = spi_chip_write_256, /* Multi I/O supported */ -+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ -+ .voltage = {2700, 3600}, -+ }, -+ -+ { -+ .vendor = "SST", - .name = "SST25WF512", - .bustype = BUS_SPI, - .manufacture_id = SST_ID, ---- flashrom-0.9.9.orig/flashchips.h -+++ flashrom-0.9.9/flashchips.h -@@ -697,6 +697,8 @@ - #define SST_SST25VF064C 0x254B - #define SST_SST26VF016 0x2601 - #define SST_SST26VF032 0x2602 -+#define SST_SST26VF016B 0x2641 -+#define SST_SST26VF032B 0x2642 - #define SST_SST26VF064B 0x2643 - #define SST_SST27SF512 0xA4 - #define SST_SST27SF010 0xA5 ---- flashrom-0.9.9.orig/linux_spi.c -+++ flashrom-0.9.9/linux_spi.c -@@ -141,6 +141,16 @@ - return 0; - } - -+static void print_hex(const char *msg, const void *buf, size_t len) -+{ -+ size_t i; -+ msg_pspew("%s:\n", msg); -+ for (i = 0; i < len; i++) { -+ msg_pspew(" %02x", ((uint8_t *)buf)[i]); -+ } -+ msg_pspew("\n"); -+} -+ - static int linux_spi_send_command(struct flashctx *flash, unsigned int writecnt, - unsigned int readcnt, - const unsigned char *txbuf, -@@ -172,10 +182,12 @@ - else - iocontrol_code = SPI_IOC_MESSAGE(2); - -+ print_hex("Write", txbuf, writecnt); - if (ioctl(fd, iocontrol_code, msg) == -1) { - msg_cerr("%s: ioctl: %s\n", __func__, strerror(errno)); - return -1; - } -+ if (readcnt) print_hex("Got", rxbuf, readcnt); - return 0; - } - ---- flashrom-0.9.9.orig/spi25_statusreg.c -+++ flashrom-0.9.9/spi25_statusreg.c -@@ -196,6 +196,19 @@ - return spi_disable_blockprotect_generic(flash, 0x3C, 0, 0, 0xFF); - } - -+int spi_disable_blockprotect_sst26_global_unprotect(struct flashctx *flash) -+{ -+ int result = spi_write_enable(flash); -+ if (result) -+ return result; -+ -+ static const unsigned char cmd[] = { 0x98 }; /* ULBPR */ -+ result = spi_send_command(flash, sizeof(cmd), 0, cmd, NULL); -+ if (result) -+ msg_cerr("ULBPR failed\n"); -+ return result; -+} -+ - /* A common block protection disable that tries to unset the status register bits masked by 0x0C (BP0-1) and - * protected/locked by bit #7. Useful when bits 4-5 may be non-0). */ - int spi_disable_blockprotect_bp1_srwd(struct flashctx *flash) diff --git a/meta-oe/recipes-extended/flashrom/flashrom_0.9.9.bb b/meta-oe/recipes-extended/flashrom/flashrom_0.9.9.bb deleted file mode 100644 index 4cdd8ad234..0000000000 --- a/meta-oe/recipes-extended/flashrom/flashrom_0.9.9.bb +++ /dev/null @@ -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 = "http://download.flashrom.org/releases/flashrom-${PV}.tar.bz2 \ - file://0001-spi-Define-_XOPEN_SOURCE-to-enable-ffs-libc-API.patch \ - file://sst26.patch \ - file://0001-Remove-undefined-behavior.patch \ - " -SRC_URI[md5sum] = "aab9c98925d9cfb5ffb28b67a6112530" -SRC_URI[sha256sum] = "cb3156b0f63eb192024b76c0814135930297aac41f80761a5d293de769783c45" - -inherit pkgconfig - -do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} install -} -- cgit 1.2.3-korg