From 93ff4cbbfc243a45e0926b139786206793436e3f Mon Sep 17 00:00:00 2001 From: Prachi Gupta Date: Tue, 31 May 2016 08:47:07 -0500 Subject: Move p9_ringId.H from chips/p9/utils to chips/p9/utils/imageProcs to sync with ekb and use the latest copy RTC:154163 Change-Id: I1a6ffccd8358f2e385802b5aeccf10a0e4d9c05d Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25174 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Christian R. Geddes Reviewed-by: Daniel M. Crowell --- src/usr/fapi2/fapi2.mk | 1 + src/usr/fapi2/test/fapi2Test.mk | 1 + src/usr/isteps/istep06/makefile | 1 + src/usr/isteps/istep06/thread_activate/makefile | 1 + src/usr/isteps/istep08/makefile | 1 + src/usr/isteps/istep09/makefile | 1 + src/usr/isteps/istep13/makefile | 1 + src/usr/isteps/istep14/makefile | 1 + src/usr/isteps/istep15/makefile | 1 + src/usr/isteps/istep16/makefile | 1 + 10 files changed, 10 insertions(+) (limited to 'src/usr') diff --git a/src/usr/fapi2/fapi2.mk b/src/usr/fapi2/fapi2.mk index 92f18dad3..f604fa475 100755 --- a/src/usr/fapi2/fapi2.mk +++ b/src/usr/fapi2/fapi2.mk @@ -32,6 +32,7 @@ GENPATH?=$(ROOTPATH)/obj/genfiles EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include/ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/ +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/ EXTRAINCDIR += $(ROOTPATH)/src/import/chips/p9/procedures/hwp/pm/ include ${ROOTPATH}/src/build/mkrules/verbose.rules.mk diff --git a/src/usr/fapi2/test/fapi2Test.mk b/src/usr/fapi2/test/fapi2Test.mk index 5acdb7802..b7544564a 100644 --- a/src/usr/fapi2/test/fapi2Test.mk +++ b/src/usr/fapi2/test/fapi2Test.mk @@ -32,6 +32,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include/ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/ EXTRAINCDIR += ${ROOTPATH}/src/usr/fapi2/test/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/ +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/pm/ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/targeting/common/ diff --git a/src/usr/isteps/istep06/makefile b/src/usr/isteps/istep06/makefile index 4e0126217..2c08e6038 100644 --- a/src/usr/isteps/istep06/makefile +++ b/src/usr/isteps/istep06/makefile @@ -47,6 +47,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/secureboot EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/nest EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/ EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include #Required include before all the procedure.mk are included diff --git a/src/usr/isteps/istep06/thread_activate/makefile b/src/usr/isteps/istep06/thread_activate/makefile index 85ca98711..3ed73fc97 100644 --- a/src/usr/isteps/istep06/thread_activate/makefile +++ b/src/usr/isteps/istep06/thread_activate/makefile @@ -33,6 +33,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/ ## pointer to common HWP files EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/ +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/isteps/ ## Include sub dirs diff --git a/src/usr/isteps/istep08/makefile b/src/usr/isteps/istep08/makefile index d65a7a8be..6b147db97 100644 --- a/src/usr/isteps/istep08/makefile +++ b/src/usr/isteps/istep08/makefile @@ -36,6 +36,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include/ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/ +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/ EXTRAINCDIR += ${ROOTPATH}/src/usr/isteps/ OBJS += call_host_slave_sbe_config.o diff --git a/src/usr/isteps/istep09/makefile b/src/usr/isteps/istep09/makefile index 24e658568..de7302642 100644 --- a/src/usr/isteps/istep09/makefile +++ b/src/usr/isteps/istep09/makefile @@ -29,6 +29,7 @@ MODULE = istep09 EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/nest/ EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/io/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/ +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/ EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include/ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/ diff --git a/src/usr/isteps/istep13/makefile b/src/usr/isteps/istep13/makefile index 15ebc8091..3e4121d0a 100644 --- a/src/usr/isteps/istep13/makefile +++ b/src/usr/isteps/istep13/makefile @@ -31,6 +31,7 @@ PROCEDURES_PATH = ${ROOTPATH}/src/import/chips/p9/procedures EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/ +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/ EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/ EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/memory/lib diff --git a/src/usr/isteps/istep14/makefile b/src/usr/isteps/istep14/makefile index a77514874..53ae6ae5c 100644 --- a/src/usr/isteps/istep14/makefile +++ b/src/usr/isteps/istep14/makefile @@ -32,6 +32,7 @@ EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/ EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2 EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs EXTRAINCDIR += ${PROCEDURE_PATH}/hwp/nest EXTRAINCDIR += ${PROCEDURE_PATH}/hwp/memory EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/ diff --git a/src/usr/isteps/istep15/makefile b/src/usr/isteps/istep15/makefile index c71f03ee3..879803703 100644 --- a/src/usr/isteps/istep15/makefile +++ b/src/usr/isteps/istep15/makefile @@ -34,6 +34,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/ EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/xip/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/ +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/ EXTRAINCDIR += ${ROOTPATH}/obj/genfiles/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/pmlib/include/registers/ diff --git a/src/usr/isteps/istep16/makefile b/src/usr/isteps/istep16/makefile index 848ee0377..c421ee007 100644 --- a/src/usr/isteps/istep16/makefile +++ b/src/usr/isteps/istep16/makefile @@ -34,6 +34,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include/ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/ +EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/utils/imageProcs/ OBJS += call_host_activate_master.o OBJS += call_host_activate_slave_cores.o -- cgit v1.2.1