[coreboot-gerrit] Change in ...coreboot[master]: Renumber cbtable tag MMC_INFO

[Patrick Georgi (Code Review)]

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32954

Change subject: Renumber cbtable tag MMC_INFO
......................................................................

Renumber cbtable tag MMC_INFO

We got another tag in the meantime, so resolve the conflict.

Change-Id: I64cb5e02a9bed3d8746b75e451c13a1598341ba1
Signed-off-by: Patrick Georgi 
---
M payloads/libpayload/include/coreboot_tables.h
M src/commonlib/include/commonlib/coreboot_tables.h
2 files changed, 2 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/54/32954/1

diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h
index 705e348..8e5cec0 100644
--- a/payloads/libpayload/include/coreboot_tables.h
+++ b/payloads/libpayload/include/coreboot_tables.h
@@ -287,7 +287,7 @@
    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 99ab21c..bbc8608 100644
--- a/src/commonlib/include/commonlib/coreboot_tables.h
+++ b/src/commonlib/include/commonlib/coreboot_tables.h
@@ -385,7 +385,7 @@
    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;