Merge 4.16

Change-Id: I11db70a8e25a6656c5ec640a703e7b06d5a3672e
2022-03-04 07:19:45 -07:00
parent af64e5d166
commit d97e25ac13
3138 changed files with 317025 additions and 23253 deletions
--- a/payloads/libpayload/include/coreboot_tables.h
+++ b/payloads/libpayload/include/coreboot_tables.h
@@ -321,6 +321,16 @@ struct cb_boot_media_params {
 	uint64_t boot_media_size;
 };

+
+struct cb_cbmem_entry {
+	uint32_t tag;
+	uint32_t size;
+
+	uint64_t address;
+	uint32_t entry_size;
+	uint32_t id;
+};
+
 struct cb_tsc_info {
 	uint32_t tag;
 	uint32_t size;
@@ -443,6 +453,4 @@ static inline const char *cb_mb_part_string(const struct cb_mainboard *cbm)
 	(void *)(((u8 *) (_rec)) + sizeof(*(_rec)) \
 		+ (sizeof((_rec)->map[0]) * (_idx)))

-/* Helper functions */
-uintptr_t get_cbmem_addr(const void *cbmem_tab_entry);
 #endif