Switch CME to use IOTA kernel by default

Change-Id: I85f8341a1f508bbe28b936a03fde6d933b58fa41
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43144
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com>
Reviewed-by: BRIAN D. VICTOR <brian.d.victor1@ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>

5 files changed, 48 insertions, 50 deletions

diff --git a/import/chips/p9/procedures/ppe_closed/cme/cme_common.mk b/import/chips/p9/procedures/ppe_closed/cme/cme_common.mk
index 5eb1624b..6c9c14df 100644
--- a/import/chips/p9/procedures/ppe_closed/cme/cme_common.mk
+++ b/import/chips/p9/procedures/ppe_closed/cme/cme_common.mk
@@ -175,60 +175,60 @@ CME_COMMONFLAGS:=
 ifeq "__PK__" "$($(IMAGE)_KERNEL)"
 # Options for PK_TRACE
 #CME_COMMONFLAGS+= -DPK_TRACE_LEVEL=0
-CME_COMMONFLAGS+= -DPK_TRACE_TIMER_OUTPUT=0
-CME_COMMONFLAGS+= -DDEV_DEBUG=0
+$(IMAGE)_COMMONFLAGS+= -DPK_TRACE_TIMER_OUTPUT=0
+$(IMAGE)_COMMONFLAGS+= -DDEV_DEBUG=0
 
 # Options for Kernel configuration
 
 # Force CME tasks to use the unified interrupt handler
-CME_COMMONFLAGS+= -DUNIFIED_IRQ_HANDLER_CME
+$(IMAGE)_COMMONFLAGS+= -DUNIFIED_IRQ_HANDLER_CME
 
 # This application will statically initialize
 # it's external interrupt table using
 # the table defined in p9_cme_main.c
-CME_COMMONFLAGS+= -DSTATIC_IRQ_TABLE
+$(IMAGE)_COMMONFLAGS+= -DSTATIC_IRQ_TABLE
 
 # This application will use the external timebase register
 # (comment this line out to use the decrementer as timebase)
-CME_COMMONFLAGS+= -DAPPCFG_USE_EXT_TIMEBASE
+$(IMAGE)_COMMONFLAGS+= -DAPPCFG_USE_EXT_TIMEBASE
 
-CME_COMMONFLAGS+= -DPK_TIMER_SUPPORT=1
-CME_COMMONFLAGS+= -DPK_THREAD_SUPPORT=1
-CME_COMMONFLAGS+= -DPK_TRACE_SUPPORT=1
-CME_COMMONFLAGS+= -DUSE_PK_APP_CFG_H=1
-CME_COMMONFLAGS+= -D__PK__=1
+$(IMAGE)_COMMONFLAGS+= -DPK_TIMER_SUPPORT=1
+$(IMAGE)_COMMONFLAGS+= -DPK_THREAD_SUPPORT=1
+$(IMAGE)_COMMONFLAGS+= -DPK_TRACE_SUPPORT=1
+$(IMAGE)_COMMONFLAGS+= -DUSE_PK_APP_CFG_H=1
+$(IMAGE)_COMMONFLAGS+= -D__PK__=1
 else
 #__IOTA__
-CME_COMMONFLAGS+= -DPK_TRACE_SUPPORT=1
-CME_COMMONFLAGS+= -DUSE_PK_APP_CFG_H=1
-CME_COMMONFLAGS+= -DPK_TIMER_SUPPORT=0
-CME_COMMONFLAGS+= -D__IOTA__
+$(IMAGE)_COMMONFLAGS+= -DPK_TRACE_SUPPORT=1
+$(IMAGE)_COMMONFLAGS+= -DUSE_PK_APP_CFG_H=1
+$(IMAGE)_COMMONFLAGS+= -DPK_TIMER_SUPPORT=0
+$(IMAGE)_COMMONFLAGS+= -D__IOTA__
 #__IOTA__
 endif
 
 ## Common to both __PK__ and __IOTA__
-CME_COMMONFLAGS+= -D__PPE_PLAT
-CME_COMMONFLAGS+= -D__PPE_CME
+$(IMAGE)_COMMONFLAGS+= -D__PPE_PLAT
+$(IMAGE)_COMMONFLAGS+= -D__PPE_CME
 # Options for Functions being skipped
 
-CME_COMMONFLAGS+= -DSPWU_AUTO=0
-CME_COMMONFLAGS+= -DSTOP_PRIME=0
+$(IMAGE)_COMMONFLAGS+= -DSPWU_AUTO=0
+$(IMAGE)_COMMONFLAGS+= -DSTOP_PRIME=0
 
-CME_COMMONFLAGS+= -DSKIP_ABORT=0
-CME_COMMONFLAGS+= -DSKIP_L2_PURGE_ABORT=0
+$(IMAGE)_COMMONFLAGS+= -DSKIP_ABORT=0
+$(IMAGE)_COMMONFLAGS+= -DSKIP_L2_PURGE_ABORT=0
 
-CME_COMMONFLAGS+= -DSKIP_ENTRY_CATCHUP=0
-CME_COMMONFLAGS+= -DSKIP_EXIT_CATCHUP=0
+$(IMAGE)_COMMONFLAGS+= -DSKIP_ENTRY_CATCHUP=0
+$(IMAGE)_COMMONFLAGS+= -DSKIP_EXIT_CATCHUP=0
 
-CME_COMMONFLAGS+= -DSKIP_ARRAYINIT=0
-CME_COMMONFLAGS+= -DSKIP_SCAN0=0
-CME_COMMONFLAGS+= -DSKIP_INITF=0
+$(IMAGE)_COMMONFLAGS+= -DSKIP_ARRAYINIT=0
+$(IMAGE)_COMMONFLAGS+= -DSKIP_SCAN0=0
+$(IMAGE)_COMMONFLAGS+= -DSKIP_INITF=0
 
-CME_COMMONFLAGS+= -DSKIP_SELF_RESTORE=0
-CME_COMMONFLAGS+= -DSKIP_RAM_HRMOR=0
+$(IMAGE)_COMMONFLAGS+= -DSKIP_SELF_RESTORE=0
+$(IMAGE)_COMMONFLAGS+= -DSKIP_RAM_HRMOR=0
 
-CME_COMMONFLAGS+= -DSKIP_BCE_SCAN_RING=0
-CME_COMMONFLAGS+= -DSKIP_BCE_SCOM_RESTORE=0
+$(IMAGE)_COMMONFLAGS+= -DSKIP_BCE_SCAN_RING=0
+$(IMAGE)_COMMONFLAGS+= -DSKIP_BCE_SCOM_RESTORE=0
 
 ## end ifdef IMAGE
 endif
diff --git a/import/chips/p9/procedures/ppe_closed/cme/cme_p9c10.mk b/import/chips/p9/procedures/ppe_closed/cme/cme_p9c10.mk
index 93ef1892..7a17a462 100644
--- a/import/chips/p9/procedures/ppe_closed/cme/cme_p9c10.mk
+++ b/import/chips/p9/procedures/ppe_closed/cme/cme_p9c10.mk
@@ -27,14 +27,15 @@ CME_TARGET := cme_p9c10
 IMAGE := $(CME_TARGET)
 
 #Select KERNEL
-#$(IMAGE)_KERNEL:=__IOTA__
-$(IMAGE)_KERNEL:=__PK__
+$(IMAGE)_KERNEL:=__IOTA__
+#$(IMAGE)_KERNEL:=__PK__
 
 # Options for Platforms specific
-$(IMAGE)_COMMONFLAGS+= -DPK_TRACE_LEVEL=0
 $(IMAGE)_COMMONFLAGS = -DNIMBUS_DD_LEVEL=0
 $(IMAGE)_COMMONFLAGS+= -DCUMULUS_DD_LEVEL=10
 
+$(IMAGE)_COMMONFLAGS+= -DPK_TRACE_LEVEL=0
+
 $(IMAGE)_COMMONFLAGS+= -DLAB_P9_TUNING=0
 $(IMAGE)_COMMONFLAGS+= -DEPM_P9_TUNING=0
 $(IMAGE)_COMMONFLAGS+= -DEPM_BROADSIDE_SCAN0=0
@@ -43,7 +44,6 @@ $(IMAGE)_COMMONFLAGS+= -DSIMICS_TUNING=0
 $(IMAGE)_COMMONFLAGS+= -DUSE_SIMICS_IO=0
 
 include $(CME_SRCDIR)/cme_common.mk
-$(IMAGE)_COMMONFLAGS+=$(CME_COMMONFLAGS)
 OBJS := $(CME_OBJS)
 
 $(call BUILD_PPEIMAGE)
diff --git a/import/chips/p9/procedures/ppe_closed/cme/cme_p9n10.mk b/import/chips/p9/procedures/ppe_closed/cme/cme_p9n10.mk
index 2e5bbb84..d0486f98 100644
--- a/import/chips/p9/procedures/ppe_closed/cme/cme_p9n10.mk
+++ b/import/chips/p9/procedures/ppe_closed/cme/cme_p9n10.mk
@@ -27,16 +27,15 @@ CME_TARGET := cme_p9n10
 IMAGE:=$(CME_TARGET)
 
 #Select KERNEL
-#$(IMAGE)_KERNEL:=__IOTA__
-$(IMAGE)_KERNEL:=__PK__
+$(IMAGE)_KERNEL:=__IOTA__
+#(IMAGE)_KERNEL:=__PK__
 
 # Options for Platforms specific DD lvl
-
-$(IMAGE)_COMMONFLAGS+= -DPK_TRACE_LEVEL=0
-
 $(IMAGE)_COMMONFLAGS = -DNIMBUS_DD_LEVEL=10
 $(IMAGE)_COMMONFLAGS+= -DCUMULUS_DD_LEVEL=0
 
+$(IMAGE)_COMMONFLAGS+= -DPK_TRACE_LEVEL=0
+
 $(IMAGE)_COMMONFLAGS+= -DLAB_P9_TUNING=0
 $(IMAGE)_COMMONFLAGS+= -DEPM_P9_TUNING=0
 $(IMAGE)_COMMONFLAGS+= -DEPM_BROADSIDE_SCAN0=0
@@ -45,7 +44,6 @@ $(IMAGE)_COMMONFLAGS+= -DSIMICS_TUNING=0
 $(IMAGE)_COMMONFLAGS+= -DUSE_SIMICS_IO=0
 
 include $(CME_SRCDIR)/cme_common.mk
-$(IMAGE)_COMMONFLAGS+=$(CME_COMMONFLAGS)
 OBJS := $(CME_OBJS)
 
 $(call BUILD_PPEIMAGE)
diff --git a/import/chips/p9/procedures/ppe_closed/cme/cme_p9n20.mk b/import/chips/p9/procedures/ppe_closed/cme/cme_p9n20.mk
index 31a8a459..2b067530 100644
--- a/import/chips/p9/procedures/ppe_closed/cme/cme_p9n20.mk
+++ b/import/chips/p9/procedures/ppe_closed/cme/cme_p9n20.mk
@@ -27,24 +27,23 @@ CME_IMAGE:=cme_p9n20
 IMAGE:=$(CME_IMAGE)
 
 #Select KERNEL
-#$(IMAGE)_KERNEL:=__IOTA__
-$(IMAGE)_KERNEL:=__PK__
+$(IMAGE)_KERNEL:=__IOTA__
+#$(IMAGE)_KERNEL:=__PK__
 
 # Options for Platforms specific tuning
+$(IMAGE)_COMMONFLAGS = -DNIMBUS_DD_LEVEL=20
+$(IMAGE)_COMMONFLAGS+= -DCUMULUS_DD_LEVEL=0
 
 $(IMAGE)_COMMONFLAGS+= -DPK_TRACE_LEVEL=2
 
-$(IMAGE)_COMMONFLAGS+= -DNIMBUS_DD_LEVEL=20
-$(IMAGE)_COMMONFLAGS+= -DCUMULUS_DD_LEVEL=0
-
 $(IMAGE)_COMMONFLAGS+= -DLAB_P9_TUNING=0
 $(IMAGE)_COMMONFLAGS+= -DEPM_P9_TUNING=0
 $(IMAGE)_COMMONFLAGS+= -DEPM_BROADSIDE_SCAN0=0
+
 $(IMAGE)_COMMONFLAGS+= -DSIMICS_TUNING=0
 $(IMAGE)_COMMONFLAGS+= -DUSE_SIMICS_IO=0
 
 include $(CME_SRCDIR)/cme_common.mk
-$(IMAGE)_COMMONFLAGS+=$(CME_COMMONFLAGS)
 OBJS := $(CME_OBJS)
 
 $(call BUILD_PPEIMAGE)
diff --git a/import/chips/p9/procedures/ppe_closed/cme/cme_p9n21.mk b/import/chips/p9/procedures/ppe_closed/cme/cme_p9n21.mk
index a339063e..0109aac8 100644
--- a/import/chips/p9/procedures/ppe_closed/cme/cme_p9n21.mk
+++ b/import/chips/p9/procedures/ppe_closed/cme/cme_p9n21.mk
@@ -28,24 +28,25 @@ IMAGE:=$(CME_IMAGE)
 IMAGE_EDITOR:=cmeImgEdit.exe
 
 #Select KERNEL
-#$(IMAGE)_KERNEL:=__IOTA__
-$(IMAGE)_KERNEL:=__PK__
+$(IMAGE)_KERNEL:=__IOTA__
+#$(IMAGE)_KERNEL:=__PK__
 
 # Options for Platforms specific tuning
 
-$(IMAGE)_COMMONFLAGS+= -DPK_TRACE_LEVEL=2
 
-$(IMAGE)_COMMONFLAGS+= -DNIMBUS_DD_LEVEL=21
+$(IMAGE)_COMMONFLAGS = -DNIMBUS_DD_LEVEL=21
 $(IMAGE)_COMMONFLAGS+= -DCUMULUS_DD_LEVEL=0
 
+$(IMAGE)_COMMONFLAGS+= -DPK_TRACE_LEVEL=2
+
 $(IMAGE)_COMMONFLAGS+= -DLAB_P9_TUNING=0
 $(IMAGE)_COMMONFLAGS+= -DEPM_P9_TUNING=0
 $(IMAGE)_COMMONFLAGS+= -DEPM_BROADSIDE_SCAN0=0
+
 $(IMAGE)_COMMONFLAGS+= -DSIMICS_TUNING=0
 $(IMAGE)_COMMONFLAGS+= -DUSE_SIMICS_IO=0
 
 include $(CME_SRCDIR)/cme_common.mk
-$(IMAGE)_COMMONFLAGS+=$(CME_COMMONFLAGS)
 OBJS := $(CME_OBJS)
 
 $(call BUILD_PPEIMAGE)