summaryrefslogtreecommitdiffstats
path: root/src/build/tools
diff options
context:
space:
mode:
authorDan Crowell <dcrowell@us.ibm.com>2019-02-20 10:28:47 -0600
committerDaniel M. Crowell <dcrowell@us.ibm.com>2019-03-12 17:34:12 -0500
commit0b3f4e146b01dab0bdb9ed9da7a3d9c9272e3b83 (patch)
tree5a1629a1aac3590e49217643ac91ba4dc4845457 /src/build/tools
parentc96464c7d52540eda875ac62082f1ebf24de3f72 (diff)
downloadtalos-hostboot-0b3f4e146b01dab0bdb9ed9da7a3d9c9272e3b83.tar.gz
talos-hostboot-0b3f4e146b01dab0bdb9ed9da7a3d9c9272e3b83.zip
Use meaningful values for PNOR build parms
Rather than using arbitrary numbers to represent our different build modes we should use words. This makes the already confusing makefile a little easier to understand. This change also combined a few redundant pieces of information in the pnor makefile to make adding new layouts less error-prone. Change-Id: I728c1ab78c90c7af68cf7831c27277695ebcfdf8 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72189 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/build/tools')
-rwxr-xr-xsrc/build/tools/hbDistribute11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/build/tools/hbDistribute b/src/build/tools/hbDistribute
index 94816df8d..78c0f4f93 100755
--- a/src/build/tools/hbDistribute
+++ b/src/build/tools/hbDistribute
@@ -210,16 +210,13 @@ fi
# Note this file is generated in the hb config file rule in top level makefile
if [[ -f ${PROJECT_ROOT}/obj/genfiles/hb_fsp_release ]]; then
echo "FSP build, using fsp pnor xml layout"
- # PNOR_LAYOUT_SELECTED == 0 is FSP XML
- export PNOR_LAYOUT_SELECTED=0
+ export PNOR_LAYOUT_SELECTED=FSP
elif [[ -f ${PROJECT_ROOT}/obj/genfiles/hb_simics_axone_release ]]; then
echo "Axone build, using axone pnor xml layout"
- # PNOR_LAYOUT_SELECTED == 2 is AXONE XML
- export PNOR_LAYOUT_SELECTED=2
+ export PNOR_LAYOUT_SELECTED=AXONE
else
- # PNOR_LAYOUT_SELECTED == 1 is DEFAULT XML
- echo "Non FSP build, using default pnor xml layout"
- export PNOR_LAYOUT_SELECTED=1
+ echo "Non FSP build, using standalone (default) pnor xml layout"
+ export PNOR_LAYOUT_SELECTED=STANDALONE
fi
# Clean up preivous rand files. Should only be needed if a previous call failed.
OpenPOWER on IntegriCloud