Fix PVR check for Nimbus DD1

Added check for bit 18 to distinguish between Nimbus DD1.0 and
Cumulus DD1.0
Consolidated Nimbus DD1 checking to a common function
Added printk output that shows which CPU we're running on
Modified some existing printk output to use fewer characters

Change-Id: I1c42df0051fc2d9cc5fa54d95f68c3bd26b86462
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39876
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Martin Gloff <mgloff@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/kernel/kernel.C b/src/kernel/kernel.C
index f470723ce..b14181caf 100644
--- a/src/kernel/kernel.C
+++ b/src/kernel/kernel.C
@@ -40,6 +40,7 @@
 #include <util/align.H>
 #include <securerom/sha512.H>
 #include <kernel/bltohbdatamgr.H>
+#include <kernel/cpuid.H>
 
 #include <stdlib.h>
 
@@ -47,6 +48,7 @@ extern "C" void kernel_dispatch_task();
 extern void* init_main(void* unused);
 extern uint64_t kernel_other_thread_spinlock;
 
+
 class Kernel
 {
     public:
@@ -63,6 +65,8 @@ extern "C"
 int main()
 {
     printk("Booting %s kernel...\n\n", "Hostboot");
+    printk("CPU=%s\n",
+           ProcessorCoreTypeStrings[CpuID::getCpuType()]);
 
     // Erase task-pointer so that TaskManager::getCurrentTask() returns NULL.
     setSPRG3(NULL);
@@ -76,7 +80,7 @@ int main()
 
     if ( Bootloader::BlToHbDataValid(l_pBltoHbData) )
     {
-        printk("Valid BL to HB communication data\n");
+        printk("BL to HB comm valid\n");
 
         // Make copy of structure so to not modify original pointers
         auto l_blToHbDataCopy = *l_pBltoHbData;
@@ -112,7 +116,7 @@ int main()
     }
     else
     {
-        printk("Invalid BL to HB communication data\n");
+        printk("BL to HB commun invalid\n");
         // Force invalidation of securebootdata
         g_BlToHbDataManager.initInvalid();
     }