1 files changed, 12 insertions, 0 deletions
diff --git a/src/kernel/bltohbdatamgr.C b/src/kernel/bltohbdatamgr.C
index 537958214..3d33715b2 100644
--- a/src/kernel/bltohbdatamgr.C
+++ b/src/kernel/bltohbdatamgr.C
@@ -182,6 +182,13 @@ printk("lpc=%lX, xscom=%lX, iv_data=%p\n", iv_data.lpcBAR, iv_data.xscomBAR,
         iv_data.sizeOfStructure = Bootloader::INITIAL_BLTOHB_PADDED_SIZE;
     }
 
+    if(iv_data.version >= Bootloader::BLTOHB_KEYADDR)
+    {
+        memcpy(&iv_data.keyAddrStashData,
+               &i_data.keyAddrStashData,
+               sizeof(Bootloader::keyAddrPair_t));
+    }
+
     // Size of data that needs to be preserved and pinned.
     iv_preservedSize = ALIGN_PAGE(iv_data.secureRomSize +
                                  iv_data.hwKeysHashSize +
@@ -346,6 +353,11 @@ const uint64_t BlToHbDataManager::getXscomBAR() const
     return reinterpret_cast<uint64_t>(iv_data.xscomBAR);
 }
 
+const Bootloader::keyAddrPair_t BlToHbDataManager::getKeyAddrPairs() const
+{
+    return iv_data.keyAddrStashData;
+}
+
 const size_t BlToHbDataManager::getBlToHbDataSize() const
 {
     return iv_data.sizeOfStructure;