summaryrefslogtreecommitdiffstats
path: root/src/build
diff options
context:
space:
mode:
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