Workaround for MMIO BARs passed to Bootloader

Change-Id: I2ef14753d5681ce18c65ec6aa486d763bdc690e6
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41574
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

src/bootloader/bootloader.C

@@ -124,9 +124,9 @@ namespace Bootloader{
 
         // Copy values for MMIO BARs
         g_blData->blToHbData.xscomBAR
-            = (l_blConfigData->version >= MMIO_BARS_ADDED)
+            = /* (l_blConfigData->version >= MMIO_BARS_ADDED)
             ? l_blConfigData->xscomBAR
-            : MMIO_GROUP0_CHIP0_XSCOM_BASE_ADDR;
+            : @fixme-RTC:149250-Remove */ MMIO_GROUP0_CHIP0_XSCOM_BASE_ADDR;
         /* lpcBAR already copied in main() */
 
         // Only set rest of BlToHbData if SecureROM is valid
@@ -290,12 +290,13 @@ namespace Bootloader{
         // @TODO RTC:138268 Support multiple sides of PNOR in bootloader
 
         // Copy SBE BL shared data into BL HB shared data
-        const auto l_blConfigData = reinterpret_cast<BootloaderConfigData_t *>(
+/*        const auto l_blConfigData = reinterpret_cast<BootloaderConfigData_t *>(
                                                               SBE_HB_COMM_ADDR);
+        @fixme-RTC:149250-Remove */ 
         g_blData->blToHbData.lpcBAR
-            = (l_blConfigData->version >= MMIO_BARS_ADDED)
+            = /* (l_blConfigData->version >= MMIO_BARS_ADDED)
             ? l_blConfigData->lpcBAR
-            : MMIO_GROUP0_CHIP0_LPC_BASE_ADDR;
+            : @fixme-RTC:149250-Remove */ MMIO_GROUP0_CHIP0_LPC_BASE_ADDR;
 
         //pnorEnd is the end of flash, which is base of lpc, plus
         //the offset of the FW space, plus the TOP memory address in FW space