Andrew Geissler | 32b1199 | 2021-03-31 13:37:05 -0500 | [diff] [blame] | 1 | Upstream-Status: Backport |
| 2 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 3 | |
Andrew Geissler | 32b1199 | 2021-03-31 13:37:05 -0500 | [diff] [blame] | 4 | From 3a0c1966e4c66f91e6e8551e906b6db38002acb4 Mon Sep 17 00:00:00 2001 |
| 5 | From: Angel Pons <th3fanbus@gmail.com> |
| 6 | Date: Wed, 27 May 2020 12:15:51 +0200 |
| 7 | Subject: [PATCH] libflashrom.c: Use casts on enum conversions |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 8 | |
Andrew Geissler | 32b1199 | 2021-03-31 13:37:05 -0500 | [diff] [blame] | 9 | This allows flashrom to build with GCC 10. |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 10 | |
Andrew Geissler | 32b1199 | 2021-03-31 13:37:05 -0500 | [diff] [blame] | 11 | Change-Id: I2166cdf3681452631ef8e980face2924e9a6c81a |
| 12 | Signed-off-by: Angel Pons <th3fanbus@gmail.com> |
| 13 | Reviewed-on: https://review.coreboot.org/c/flashrom/+/41775 |
| 14 | Tested-by: build bot (Jenkins) <no-reply@coreboot.org> |
| 15 | Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 16 | --- |
Andrew Geissler | 32b1199 | 2021-03-31 13:37:05 -0500 | [diff] [blame] | 17 | libflashrom.c | 6 ++++-- |
| 18 | 1 file changed, 4 insertions(+), 2 deletions(-) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 19 | |
| 20 | diff --git a/libflashrom.c b/libflashrom.c |
Andrew Geissler | 32b1199 | 2021-03-31 13:37:05 -0500 | [diff] [blame] | 21 | index ab7e364..c20d9c7 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 22 | --- a/libflashrom.c |
| 23 | +++ b/libflashrom.c |
Andrew Geissler | 32b1199 | 2021-03-31 13:37:05 -0500 | [diff] [blame] | 24 | @@ -188,7 +188,8 @@ struct flashrom_board_info *flashrom_supported_boards(void) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 25 | for (; i < boards_known_size; ++i) { |
| 26 | supported_boards[i].vendor = binfo[i].vendor; |
| 27 | supported_boards[i].name = binfo[i].name; |
| 28 | - supported_boards[i].working = binfo[i].working; |
Andrew Geissler | 32b1199 | 2021-03-31 13:37:05 -0500 | [diff] [blame] | 29 | + supported_boards[i].working = |
| 30 | + (enum flashrom_test_state) binfo[i].working; |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 31 | } |
| 32 | } else { |
| 33 | msg_gerr("Memory allocation error!\n"); |
Andrew Geissler | 32b1199 | 2021-03-31 13:37:05 -0500 | [diff] [blame] | 34 | @@ -226,7 +227,8 @@ struct flashrom_chipset_info *flashrom_supported_chipsets(void) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 35 | supported_chipsets[i].chipset = chipset[i].device_name; |
| 36 | supported_chipsets[i].vendor_id = chipset[i].vendor_id; |
| 37 | supported_chipsets[i].chipset_id = chipset[i].device_id; |
| 38 | - supported_chipsets[i].status = chipset[i].status; |
Andrew Geissler | 32b1199 | 2021-03-31 13:37:05 -0500 | [diff] [blame] | 39 | + supported_chipsets[i].status = |
| 40 | + (enum flashrom_test_state) chipset[i].status; |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 41 | } |
| 42 | } else { |
| 43 | msg_gerr("Memory allocation error!\n"); |
| 44 | -- |
| 45 | 2.25.1 |