diff options
| author | Patrick Georgi <pgeorgi@google.com> | 2019-05-23 12:14:38 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2019-05-23 10:43:30 +0000 |
| commit | 2803346b27aafb0fec2e6c949e2ab9994c754604 (patch) | |
| tree | 74a3065ad87715319875fcf71792f4b3381e8a46 | |
| parent | ddf2bc5081e0eafc33af40a06f4217c5c851fa3f (diff) | |
Renumber cbtable tag MMC_INFO
We got another tag in the meantime, so resolve the conflict.
Change-Id: I64cb5e02a9bed3d8746b75e451c13a1598341ba1
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32954
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | payloads/libpayload/include/coreboot_tables.h | 2 | ||||
| -rw-r--r-- | src/commonlib/include/commonlib/coreboot_tables.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h index 705e348666..8e5cec04bf 100644 --- a/payloads/libpayload/include/coreboot_tables.h +++ b/payloads/libpayload/include/coreboot_tables.h @@ -287,7 +287,7 @@ struct cb_macs { struct mac_address mac_addrs[0]; }; -#define CB_TAG_MMC_INFO 0x0034 +#define CB_TAG_MMC_INFO 0x0035 struct cb_mmc_info { uint32_t tag; uint32_t size; diff --git a/src/commonlib/include/commonlib/coreboot_tables.h b/src/commonlib/include/commonlib/coreboot_tables.h index 99ab21c724..bbc8608266 100644 --- a/src/commonlib/include/commonlib/coreboot_tables.h +++ b/src/commonlib/include/commonlib/coreboot_tables.h @@ -385,7 +385,7 @@ struct mac_address { uint8_t pad[2]; /* Pad it to 8 bytes to keep it simple. */ }; -#define LB_TAG_MMC_INFO 0x0034 +#define LB_TAG_MMC_INFO 0x0035 struct lb_mmc_info { uint32_t tag; uint32_t size; |