Attention is currently required from: Jonathan Zhang, Johnny Lin, Christian Walter, Arthur Heymans, Tim Chu.
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/69229 )
Change subject: Revert "soc/intel/xeon_sp/cpx: Add get_ewl_hob() utility function" ......................................................................
Revert "soc/intel/xeon_sp/cpx: Add get_ewl_hob() utility function"
This reverts commit 3bc9fbb496c7e1ae346c8d7e98d2bcabbbbe8673.
The patch that added hob_enhancedwarningloglib.h was marked as private after the Jenkins run, so I didn't see and submit it before submitting the patch that gets reverted by this commit. Temporary revert this patch to fix the coreboot tree until the issue with the missing patch is sorted out.
Signed-off-by: Felix Held felix-coreboot@felixheld.de Change-Id: If56609dd2d91a70fe7e99ce86e0341f2b3fee3d3 --- M src/soc/intel/xeon_sp/cpx/Makefile.inc M src/soc/intel/xeon_sp/cpx/include/soc/soc_util.h M src/soc/intel/xeon_sp/cpx/soc_util.c 3 files changed, 19 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/69229/1
diff --git a/src/soc/intel/xeon_sp/cpx/Makefile.inc b/src/soc/intel/xeon_sp/cpx/Makefile.inc index 7e18b92..0cd267b 100644 --- a/src/soc/intel/xeon_sp/cpx/Makefile.inc +++ b/src/soc/intel/xeon_sp/cpx/Makefile.inc @@ -5,7 +5,7 @@ subdirs-y += ../../../../cpu/intel/turbo subdirs-y += ../../../../cpu/intel/microcode
-romstage-y += romstage.c ddr.c soc_util.c +romstage-y += romstage.c ddr.c romstage-$(CONFIG_DISPLAY_UPD_DATA) += upd_display.c romstage-$(CONFIG_DISPLAY_HOBS) += hob_display.c
diff --git a/src/soc/intel/xeon_sp/cpx/include/soc/soc_util.h b/src/soc/intel/xeon_sp/cpx/include/soc/soc_util.h index c4e2a7d..5ce3928 100644 --- a/src/soc/intel/xeon_sp/cpx/include/soc/soc_util.h +++ b/src/soc/intel/xeon_sp/cpx/include/soc/soc_util.h @@ -5,13 +5,11 @@
#include <hob_iiouds.h> #include <hob_memmap.h> -#include <hob_enhancedwarningloglib.h>
const struct SystemMemoryMapHob *get_system_memory_map(void);
uint32_t get_socket_stack_busno(uint32_t socket, uint32_t stack);
int soc_get_stack_for_port(int port); -const EWL_PRIVATE_DATA *get_ewl_hob(void);
#endif /* _SOC_UTIL_H_ */ diff --git a/src/soc/intel/xeon_sp/cpx/soc_util.c b/src/soc/intel/xeon_sp/cpx/soc_util.c index 2a8b6c9..cd1e06d 100644 --- a/src/soc/intel/xeon_sp/cpx/soc_util.c +++ b/src/soc/intel/xeon_sp/cpx/soc_util.c @@ -9,20 +9,6 @@ #include <soc/soc_util.h> #include <soc/util.h>
-const EWL_PRIVATE_DATA *get_ewl_hob(void) -{ - size_t hob_size; - static const EWL_PRIVATE_DATA *hob; - const uint8_t ewl_id_hob_guid[16] = FSP_HOB_EWLID_GUID; - - if (hob != NULL) - return hob; - - hob = fsp_find_extension_hob_by_guid(ewl_id_hob_guid, &hob_size); - assert(hob != NULL && hob_size != 0); - return hob; -} - const struct SystemMemoryMapHob *get_system_memory_map(void) { size_t hob_size;