From b8394ea057006aaee7246f521a560589a2803475 Mon Sep 17 00:00:00 2001 From: Marty Gloff Date: Thu, 8 Jun 2017 16:38:15 -0500 Subject: [PATCH] Workaround for MMIO BARs passed to Bootloader Change-Id: I2ef14753d5681ce18c65ec6aa486d763bdc690e6 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41574 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- src/bootloader/bootloader.C | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/bootloader/bootloader.C b/src/bootloader/bootloader.C index 772279bc90f..bf8ca180a64 100644 --- a/src/bootloader/bootloader.C +++ b/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( +/* const auto l_blConfigData = reinterpret_cast( 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