summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/HBconfig5
-rw-r--r--src/build/configs/fsprelease.config2
-rw-r--r--src/include/usr/isteps/istepmasterlist.H12
3 files changed, 17 insertions, 2 deletions
diff --git a/src/HBconfig b/src/HBconfig
index f45ae2a2f..46d3b1d18 100644
--- a/src/HBconfig
+++ b/src/HBconfig
@@ -42,3 +42,8 @@ config INCLUDE_XML_OPENPOWER
Indicates that a build should include the contents
of attribute_types_openpower.xml and
target_types_openpower.xml
+
+config FSP_BUILD
+ default n
+ help
+ Indicates that this is an FSP build
diff --git a/src/build/configs/fsprelease.config b/src/build/configs/fsprelease.config
index 593fd11b2..4c50b930f 100644
--- a/src/build/configs/fsprelease.config
+++ b/src/build/configs/fsprelease.config
@@ -11,8 +11,8 @@ set START_OCC_DURING_BOOT
unset NO_SBE_UPDATES
unset BMC_BT_LPC_IPMI
unset HTMGT
+set FSP_BUILD
# OpenPower checkstop analysis
unset ENABLE_CHECKSTOP_ANALYSIS
unset IPLTIME_CHECKSTOP_ANALYSIS
-
diff --git a/src/include/usr/isteps/istepmasterlist.H b/src/include/usr/isteps/istepmasterlist.H
index d77f39e47..25189cae2 100644
--- a/src/include/usr/isteps/istepmasterlist.H
+++ b/src/include/usr/isteps/istepmasterlist.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2011,2016 */
+/* Contributors Listed Below - COPYRIGHT 2011,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -81,6 +81,8 @@
#include "istep20list.H"
#include "istep21list.H"
+#include "config.h"
+
namespace INITSERVICE
{
@@ -104,9 +106,17 @@ const ExtTaskInfo g_isteps[] = {
INITSERVICE::g_istep15TaskList, // IStep 15
INITSERVICE::g_istep16TaskList, // IStep 16
{ NULL, 0, NULL}, // FSP IStep 17
+#ifdef CONFIG_FSP_BUILD
+ { NULL, 0, NULL}, // FSP IStep 18
+#else
INITSERVICE::g_istep18TaskList, // IStep 18
+#endif
{ NULL, 0, NULL }, // FSP IStep 19
+#ifdef CONFIG_FSP_BUILD
+ { NULL, 0, NULL}, // FSP IStep 20
+#else
INITSERVICE::g_istep20TaskList, // IStep 20
+#endif
INITSERVICE::g_istep21TaskList // IStep 21
//
// add further istep lists at the end.
OpenPOWER on IntegriCloud