Skip to content

Commit

Permalink
[Whitelist/Blacklist] - Files addition
Browse files Browse the repository at this point in the history
Adding new files in SBE build and compilation unit

Change-Id: Ia19c0a2944ec46b88e657f2aa11cf302da34837f
RTC: 174252
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/40908
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Reviewed-by: AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com>
  • Loading branch information
Shakeebbk authored and sgupta2m committed Aug 26, 2017
1 parent df0e08e commit 3efc51f
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 3 deletions.
9 changes: 6 additions & 3 deletions src/build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,12 @@ $(LINK_SCRIPT_SBE): $(LINKER_DIR)/linksbe.cmd
endif

ifeq ($(img), pibmem)
all: $(OBJDIR) xml \
all: $(OBJDIR) xml security\
$(IMG_DIR)/$(IMAGE_SBE_NAME).bin \
symbols tracehash
endif
ifeq ($(img), seeprom)
all: $(OBJDIR) xml $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin \
all: $(OBJDIR) xml security $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin \
$(SBE_TOOLS) $(SBE_IPL_TOOLS) normalize compress defaultset $(IMG_DIR)/fixed.bin \
appendloader appendoverrides add_LoaderAddr symbols tracehash buildinfo \
report
Expand All @@ -197,7 +197,7 @@ tar:
@echo "Generated simics.tar in Sbe images Directory"

.PHONY: all normalize compress defaultset appendloader add_LoaderAddr symbols report \
appendoverrides xml tracehash topfixedheaders $(SUBDIRS) _sbefw_seeprom \
appendoverrides xml security tracehash topfixedheaders $(SUBDIRS) _sbefw_seeprom \
tar install

buildinfo: $(P9_XIP_TOOL) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin
Expand Down Expand Up @@ -292,6 +292,9 @@ defaultset:$(SBE_TOOLS) $(IMG_DIR)/$(IMAGE_SEEPROM_NAME).bin normalize
ppe_trace_bin:
$(MAKE) -I $(INCLUDES) -C $(PPETRACEPP_DIR) -f Makefile #$(PK trace util)

# generate whitelist and blacklist security algorithm
security:
python $(SECURITY_SRC_DIR)/securityRegListGen.py -f $(SECURITY_LIST) -o $(GENFILES_DIR)

# Build hwp_error_info.H. If the script fails then print the contents of
# the header and then delete whatever garbage the script left to force it to
Expand Down
8 changes: 8 additions & 0 deletions src/build/img_defs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,14 @@ ifndef OBJDIR-ARRAYACCESS
export OBJDIR-ARRAYACCESS = $(BASE_OBJDIR)/arrayaccess
endif

ifndef SECURITY_SRC_DIR
export SECURITY_SRC_DIR = $(BUILD_DIR)/security
endif

ifndef SECURITY_LIST
export SECURITY_LIST = $(IMPORT_SRCDIR)/chips/p9/security/p9_security_white_black_list.csv
endif

ifndef CROSS_COMPILER_PATH
$(warning The CROSS_COMPILER_PATH variable is not defined; Defaulting to IBM CTE tools path)
export CROSS_COMPILER_PATH = /afs/awd/projects/cte/tools/ppetools/prod
Expand Down
24 changes: 24 additions & 0 deletions src/build/security/securityRegListGen.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
# $Source: src/build/security/securityRegListGen.py $
#
# OpenPOWER sbe Project
#
# Contributors Listed Below - COPYRIGHT 2017
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied. See the License for the specific language governing
# permissions and limitations under the License.
#
# IBM_PROLOG_END_TAG
print "Hello World"

0 comments on commit 3efc51f

Please sign in to comment.