From: Wang Mingyu <wan...@fujitsu.com> 0001-typecast-enum-conversions-explicitly.patc removed since it's included in 1.2.1
Signed-off-by: Wang Mingyu <wan...@fujitsu.com> --- ...typecast-enum-conversions-explicitly.patch | 45 ------------------- .../{flashrom_1.2.bb => flashrom_1.2.1.bb} | 4 +- 2 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch rename meta-oe/recipes-bsp/flashrom/{flashrom_1.2.bb => flashrom_1.2.1.bb} (79%) diff --git a/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch b/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch deleted file mode 100644 index f2302dbcc..000000000 --- a/meta-oe/recipes-bsp/flashrom/flashrom/0001-typecast-enum-conversions-explicitly.patch +++ /dev/null @@ -1,45 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.bur...@arm.com> - -From 3a0c1966e4c66f91e6e8551e906b6db38002acb4 Mon Sep 17 00:00:00 2001 -From: Angel Pons <th3fan...@gmail.com> -Date: Wed, 27 May 2020 12:15:51 +0200 -Subject: [PATCH] libflashrom.c: Use casts on enum conversions - -This allows flashrom to build with GCC 10. - -Change-Id: I2166cdf3681452631ef8e980face2924e9a6c81a -Signed-off-by: Angel Pons <th3fan...@gmail.com> -Reviewed-on: https://review.coreboot.org/c/flashrom/+/41775 -Tested-by: build bot (Jenkins) <no-re...@coreboot.org> -Reviewed-by: HAOUAS Elyes <ehao...@noos.fr> ---- - libflashrom.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/libflashrom.c b/libflashrom.c -index ab7e364..c20d9c7 100644 ---- a/libflashrom.c -+++ b/libflashrom.c -@@ -188,7 +188,8 @@ struct flashrom_board_info *flashrom_supported_boards(void) - for (; i < boards_known_size; ++i) { - supported_boards[i].vendor = binfo[i].vendor; - supported_boards[i].name = binfo[i].name; -- supported_boards[i].working = binfo[i].working; -+ supported_boards[i].working = -+ (enum flashrom_test_state) binfo[i].working; - } - } else { - msg_gerr("Memory allocation error!\n"); -@@ -226,7 +227,8 @@ struct flashrom_chipset_info *flashrom_supported_chipsets(void) - supported_chipsets[i].chipset = chipset[i].device_name; - supported_chipsets[i].vendor_id = chipset[i].vendor_id; - supported_chipsets[i].chipset_id = chipset[i].device_id; -- supported_chipsets[i].status = chipset[i].status; -+ supported_chipsets[i].status = -+ (enum flashrom_test_state) chipset[i].status; - } - } else { - msg_gerr("Memory allocation error!\n"); --- -2.25.1 diff --git a/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb b/meta-oe/recipes-bsp/flashrom/flashrom_1.2.1.bb similarity index 79% rename from meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb rename to meta-oe/recipes-bsp/flashrom/flashrom_1.2.1.bb index bdc3ca084..b2592d294 100644 --- a/meta-oe/recipes-bsp/flashrom/flashrom_1.2.bb +++ b/meta-oe/recipes-bsp/flashrom/flashrom_1.2.1.bb @@ -4,13 +4,11 @@ HOMEPAGE = "http://flashrom.org" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "https://download.flashrom.org/releases/flashrom-v${PV}.tar.bz2 \ - file://0001-typecast-enum-conversions-explicitly.patch \ file://meson-fixes.patch \ file://0001-flashrom-Mark-RISCV-as-non-memory-mapped-I-O-archite.patch \ file://0001-hwaccess-use-__asm__-as-is-done-elsewhere.patch \ " -SRC_URI[md5sum] = "7f8e4b87087eb12ecee0fcc5445b4956" -SRC_URI[sha256sum] = "e1f8d95881f5a4365dfe58776ce821dfcee0f138f75d0f44f8a3cd032d9ea42b" +SRC_URI[sha256sum] = "89a7ff5beb08c89b8795bbd253a51b9453547a864c31793302296b56bbc56d65" S = "${WORKDIR}/flashrom-v${PV}" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#100348): https://lists.openembedded.org/g/openembedded-devel/message/100348 Mute This Topic: https://lists.openembedded.org/mt/96022523/21656 Group Owner: openembedded-devel+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-