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 pgeorgi@google.com --- 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;
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32954 )
Change subject: Renumber cbtable tag MMC_INFO ......................................................................
Patch Set 1: Code-Review+2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32954 )
Change subject: Renumber cbtable tag MMC_INFO ......................................................................
Patch Set 1: Code-Review+2
VBOOT_WORKBUF and TCPA_LOG still conflict, this should be fixed in a follow-up
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32954 )
Change subject: Renumber cbtable tag MMC_INFO ......................................................................
Patch Set 1: Code-Review+2
(1 comment)
https://review.coreboot.org/#/c/32954/1/src/commonlib/include/commonlib/core... File src/commonlib/include/commonlib/coreboot_tables.h:
https://review.coreboot.org/#/c/32954/1/src/commonlib/include/commonlib/core... PS1, Line 295: #define LB_TAB_VBOOT_WORKBUF 0x0034 This is another 0x34, but I don't know what an LB_TA*B* is.
Nico Huber has submitted this change and it was merged. ( 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 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 --- M payloads/libpayload/include/coreboot_tables.h M src/commonlib/include/commonlib/coreboot_tables.h 2 files changed, 2 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Arthur Heymans: Looks good to me, approved Angel Pons: Looks good to me, approved
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;
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32954 )
Change subject: Renumber cbtable tag MMC_INFO ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/#/c/32954/1/src/commonlib/include/commonlib/core... File src/commonlib/include/commonlib/coreboot_tables.h:
https://review.coreboot.org/#/c/32954/1/src/commonlib/include/commonlib/core... PS1, Line 295: #define LB_TAB_VBOOT_WORKBUF 0x0034
This is another 0x34, but I don't know what an LB_TA*B* is.
See CB:32956 :-)
-
Angel Pons (Code Review) -
Arthur Heymans (Code Review)
-
Nico Huber (Code Review)
-
Patrick Georgi (Code Review)