From b78b33c5a32ac5c12ca0fd980f054a86258eec00 Mon Sep 17 00:00:00 2001 From: Claus Michael Olsen Date: Wed, 5 Apr 2017 05:16:51 -0500 Subject: Code restruct: TOR API Key_Cronus_Test=XIP_REGRESS Code restructuring aiming at: - utilizing TOR magic header info - enforce a common approach for - extracting metadata for all image,chipType combinations - traversing images for all image,chipType combinations - shrinking code size by reusing common code segments - improve readability by - separating more clearly metadata extraction and image traversal - slight rearrange of certain code segments - remove leftover hardcoded assumptions about ring/TOR data and structs - variables appropriately renamed and now all using camel style Change-Id: I50ace8b2fdb340a97ce6d74ce545c5e1acd21c40 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/38863 Tested-by: HWSV CI Tested-by: PPE CI Tested-by: Jenkins Server Tested-by: Cronus HW CI Tested-by: FSP CI Jenkins Tested-by: Hostboot CI Reviewed-by: GIRISANKAR PAULRAJ Reviewed-by: Thi N. Tran Reviewed-by: Jennifer A. Stofer Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43251 Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Daniel M. Crowell --- src/usr/isteps/pm/pm.mk | 5 +++-- src/usr/sbe/makefile | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src/usr') diff --git a/src/usr/isteps/pm/pm.mk b/src/usr/isteps/pm/pm.mk index b6ea71771..9b167ea08 100644 --- a/src/usr/isteps/pm/pm.mk +++ b/src/usr/isteps/pm/pm.mk @@ -46,6 +46,7 @@ HWP_XIP_PATH += ${ROOTPATH}/src/import/chips/p9/xip EXTRAINCDIR += ${HWP_XIP_PATH} HWP_IMAGEPROCS_PATH += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/ HWP_CEN_IMAGEPROCS_PATH += ${ROOTPATH}/src/import/chips/centaur/utils/imageProcs/ +HWP_COMMON_IMAGEPROCS_PATH += ${ROOTPATH}/src/import/chips/common/utils/imageProcs/ HWP_STOPUTIL_PATH += ${ROOTPATH}/src/import/chips/p9/procedures/utils/stopreg/ EXTRAINCDIR += ${HWP_STOPUTIL_PATH} NEST_UTIL_PATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/nest @@ -66,8 +67,7 @@ OBJS += occCheckstop.o ## NOTE: add a new directory onto the vpaths when you add a new HWP VPATH += ${HWP_PM_PATH} ${HWP_CUST_PATH} ${HWP_ACC_PATH} -VPATH += ${HWP_XIP_PATH} ${HWP_IMAGEPROCS_PATH} -VPATH += ${HWP_XIP_PATH} ${HWP_IMAGEPROCS_PATH} ${HWP_CEN_IMAGEPROCS_PATH} ${HWP_STOPUTIL_PATH} +VPATH += ${HWP_XIP_PATH} ${HWP_IMAGEPROCS_PATH} ${HWP_CEN_IMAGEPROCS_PATH} ${HWP_COMMON_IMAGEPROCS_PATH} ${HWP_STOPUTIL_PATH} VPATH += ${NEST_UTIL_PATH} # TODO RTC: 164237 @@ -107,6 +107,7 @@ include ${HWP_IMAGEPROCS_PATH}/p9_tor.mk include ${HWP_IMAGEPROCS_PATH}/p9_ring_identification.mk include ${HWP_IMAGEPROCS_PATH}/p9_ringId.mk include ${HWP_CEN_IMAGEPROCS_PATH}/cen_ringId.mk +include ${HWP_COMMON_IMAGEPROCS_PATH}/common_ringId.mk include ${HWP_STOPUTIL_PATH}/p9_stop_util.mk include ${HWP_STOPUTIL_PATH}/p9_stop_api.mk include ${HWP_IMAGEPROCS_PATH}/p9_scan_compression.mk diff --git a/src/usr/sbe/makefile b/src/usr/sbe/makefile index f484185e2..a8abf2d85 100644 --- a/src/usr/sbe/makefile +++ b/src/usr/sbe/makefile @@ -44,6 +44,7 @@ HWP_XIP_PATH += ${ROOTPATH}/src/import/chips/p9/xip EXTRAINCDIR += ${HWP_XIP_PATH}/ UTILS_PATH += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs CEN_UTILS_PATH += ${ROOTPATH}/src/import/chips/centaur/utils/imageProcs +COMMON_UTILS_PATH += ${ROOTPATH}/src/import/chips/common/utils/imageProcs OBJS += sbe_update.o @@ -51,7 +52,7 @@ SUBDIRS += test.d ## NOTE: add a new directory onto the vpaths when you add a new HWP VPATH += ${HWP_CUSTOMIZE_PATH} ${HWP_ACCESSORS_PATH} ${HWP_XIP_PATH} -VPATH += ${UTILS_PATH} ${CEN_UTILS_PATH} +VPATH += ${UTILS_PATH} ${CEN_UTILS_PATH} ${COMMON_UTILS_PATH} include ${ROOTPATH}/procedure.rules.mk @@ -64,6 +65,7 @@ include ${HWP_XIP_PATH}/p9_xip_image.mk include ${UTILS_PATH}/p9_ring_identification.mk include ${UTILS_PATH}/p9_ringId.mk include ${CEN_UTILS_PATH}/cen_ringId.mk +include ${COMMON_UTILS_PATH}/common_ringId.mk include ${UTILS_PATH}/p9_scan_compression.mk include ${UTILS_PATH}/p9_tor.mk -- cgit v1.2.3