Axone image suffix

Change-Id: I9978bc6c7a6fd232aad3fa055929e3875082465e Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/65135 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: RAJA DAS <rajadas2@in.ibm.com> Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
open-power · Aug 28, 2018 · cf180c5 · cf180c5
1 parent ef27d8b
commit cf180c5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/build/img_defs.mk b/src/build/img_defs.mk
@@ -172,7 +172,7 @@ export IMAGEPROCS_CEN_SRCDIR = $(IMPORT_SRCDIR)/chips/centaur/utils/imageProcs
 endif
 
 ifndef BASE_OBJDIR
-export BASE_OBJDIR = $(SBE_ROOT_DIR)/obj/$(project)/$(IMAGE_SUFFIX)
+export BASE_OBJDIR = $(SBE_ROOT_DIR)/obj/$(project)
 endif
 
 ifndef TAR_OBJDIR
@@ -366,7 +366,7 @@ FAPI_TRACE_LEVEL_DEF = $(FAPI_TRACE_LEVEL_ENV)
 endif
 
 
-GCC-DEFS += -DIMAGE_NAME=$(IMAGE_SEEPROM_NAME)
+GCC-DEFS += -DIMAGE_NAME=SBE_TRACE
 GCC-DEFS += -DPK_TIMER_SUPPORT=$(PK_TIMER_SUPPORT)
 GCC-DEFS += -DPK_THREAD_SUPPORT=$(PK_THREAD_SUPPORT)
 GCC-DEFS += -DPK_TRACE_SUPPORT=$(PK_TRACE_SUPPORT)
@@ -389,7 +389,6 @@ ifdef PK_TRACE_SZ
 GCC-DEFS += -DPK_TRACE_SZ=$(PK_TRACE_SZ)
 endif
 
-DEFS += $(GCC-DEFS)
 export LD_LIBRARY_PATH+=:$(CROSS_COMPILER_PATH)/lib
 ############################################################################
 
@@ -477,10 +476,6 @@ ifeq ($(SBE_S0_SUPPORT), 1)
 GCC-DEFS += -D_S0_=$(SBE_S0_SUPPORT)
 endif
 
-ifeq ($(project),power_axone)
-GCC-DEFS += -DSBE_AXONE_CONFIG
-endif
-
 ############################################################################
 CFLAGS =
 PPE-CFLAGS = $(CFLAGS) -c $(GCC-CFLAGS) $(PIPE-CFLAGS) $(GCC-O-LEVEL) $(INCLUDES)
@@ -515,6 +510,8 @@ endif
 ifeq ($(PIBMEM_REPAIR_SCOM_AXONE), 1)
 PPE-CFLAGS += -DPIBMEM_REPAIR_SCOM_AXONE=1
 endif
+
+DEFS += $(GCC-DEFS)
 ###########################################################################
 
 #override the GNU Make implicit rule for going from a .C to a .o

diff --git a/src/build/power_axone_defs.mk b/src/build/power_axone_defs.mk
@@ -6,6 +6,7 @@
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2017,2018
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -83,12 +84,14 @@ PROJ_LLIBS += -larrayaccess
 #########################################################
 # mandatory defines                                     #
 #########################################################
-IMAGE_SUFFIX := DD2
+IMAGE_SUFFIX := AXONE
 GCC-DEFS += -DDD2
+GCC-DEFS += -DSBE_AXONE_CONFIG
+
 IMAGE_SEEPROM_NAME := sbe_seeprom_$(IMAGE_SUFFIX)
 IMAGE_SBE_NAME := sbe_pibmem_$(IMAGE_SUFFIX)
 
-IMAGE_LOADER_NAME := sbe_loader
+IMAGE_LOADER_NAME := sbe_loader_$(IMAGE_SUFFIX)
 IMAGE_OTPROM_NAME := sbe_otprom_$(IMAGE_SUFFIX)
 IMAGE_BASE_PPE_HEADER := base_ppe_header