summaryrefslogtreecommitdiffstats
path: root/src/build
diff options
context:
space:
mode:
authorspashabk-in <shakeebbk@in.ibm.com>2017-12-11 06:41:57 -0600
committerSachin Gupta <sgupta2m@in.ibm.com>2018-08-23 04:01:52 -0500
commitd436cbc3c974610c1264c3c213e8cbed3c51b07f (patch)
tree06714cb6ff9daab70b75c52113ae65a92bc6a214 /src/build
parent20a60ab17ed62ce4c14a0f7cda61f9c2bd8f46c6 (diff)
downloadtalos-sbe-d436cbc3c974610c1264c3c213e8cbed3c51b07f.tar.gz
talos-sbe-d436cbc3c974610c1264c3c213e8cbed3c51b07f.zip
Project specific boot handling
Macro based project config for pibmem repair RTC: 187456 Change-Id: Ibea93f343d1c63cdf6199cd89b8433b4f52bbf53 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/50762 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: RAJA DAS <rajadas2@in.ibm.com> Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'src/build')
-rw-r--r--src/build/Makefile2
-rw-r--r--src/build/img_defs.mk7
-rw-r--r--src/build/power_axone_defs.mk1
-rw-r--r--src/build/power_defs.mk1
4 files changed, 10 insertions, 1 deletions
diff --git a/src/build/Makefile b/src/build/Makefile
index 61ed136a..d9c0c039 100644
--- a/src/build/Makefile
+++ b/src/build/Makefile
@@ -148,7 +148,7 @@ $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).dis: $(IMG
#create a linked ELF executable
$(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out: ppe_trace_bin buildInfo $(SUBDIRS) $(SEEPROM_SUBDIRS) $(LINK_OBJS) $(LINK_SCRIPT_SEEPROM)
$(LD) -n -T$(LINK_SCRIPT_SEEPROM) -Map $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).map \
- -Bstatic -o $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out $(BOOT_OBJDIR)/$(BOOT_OBJECTS) $(BUILDDATA_OBJDIR)/$(IMAGE_BASE_PPE_HEADER).o $(OBJS) $(LIB_DIRS) \
+ -Bstatic -o $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).out $(addprefix $(BOOT_OBJDIR)/, $(BOOT_OBJECTS)) $(BUILDDATA_OBJDIR)/$(IMAGE_BASE_PPE_HEADER).o $(OBJS) $(LIB_DIRS) \
--start-group $(LLIBS) --end-group
# pass the link command file through the C preprocessor to evaluate macros
diff --git a/src/build/img_defs.mk b/src/build/img_defs.mk
index cc22374e..5ce9cda1 100644
--- a/src/build/img_defs.mk
+++ b/src/build/img_defs.mk
@@ -509,6 +509,13 @@ include z_defs.mk
endif
############################################################################
+ifeq ($(PIBMEM_REPAIR_SCOM_P9), 1)
+PPE-CFLAGS += -DPIBMEM_REPAIR_SCOM_P9=1
+endif
+ifeq ($(PIBMEM_REPAIR_SCOM_AXONE), 1)
+PPE-CFLAGS += -DPIBMEM_REPAIR_SCOM_AXONE=1
+endif
+###########################################################################
#override the GNU Make implicit rule for going from a .C to a .o
%.o: %.C
diff --git a/src/build/power_axone_defs.mk b/src/build/power_axone_defs.mk
index 172e185e..8721933b 100644
--- a/src/build/power_axone_defs.mk
+++ b/src/build/power_axone_defs.mk
@@ -35,6 +35,7 @@ HOST_INTERFACE_AVAILABLE = 1
PERIODIC_IO_TOGGLE_SUPPORTED = 1
export SBE_S0_SUPPORT = 1
+export PIBMEM_REPAIR_SCOM_AXONE = 1
ISTEP2_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istep2
ISTEP3_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istep3
diff --git a/src/build/power_defs.mk b/src/build/power_defs.mk
index d9304180..609e809e 100644
--- a/src/build/power_defs.mk
+++ b/src/build/power_defs.mk
@@ -36,6 +36,7 @@ HOST_INTERFACE_AVAILABLE = 1
PERIODIC_IO_TOGGLE_SUPPORTED = 1
export SBE_S0_SUPPORT = 1
+export PIBMEM_REPAIR_SCOM_P9 = 1
ISTEP2_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istep2
ISTEP3_INFRA_DIR = $(IMPORT_HWP_MK_DIR)/istep3
OpenPOWER on IntegriCloud