diff --git a/linux/ipcore/PdecHandler.cpp b/linux/ipcore/PdecHandler.cpp
index 8f86ee9c..d5f45ae7 100644
--- a/linux/ipcore/PdecHandler.cpp
+++ b/linux/ipcore/PdecHandler.cpp
@@ -24,7 +24,8 @@ using namespace pdec;
 uint32_t PdecHandler::CURRENT_FAR = 0;
 
 PdecHandler::PdecHandler(object_id_t objectId, object_id_t tcDestinationId,
-                         LinuxLibgpioIF* gpioComIF, gpioId_t pdecReset, UioNames names)
+                         LinuxLibgpioIF* gpioComIF, gpioId_t pdecReset, UioNames names,
+                         uint32_t cfgMemPhyAddr, uint32_t pdecRamPhyAddr)
     : SystemObject(objectId),
       tcDestinationId(tcDestinationId),
       gpioComIF(gpioComIF),
diff --git a/linux/ipcore/PdecHandler.h b/linux/ipcore/PdecHandler.h
index 19968da6..3a802cdd 100644
--- a/linux/ipcore/PdecHandler.h
+++ b/linux/ipcore/PdecHandler.h
@@ -68,7 +68,7 @@ class PdecHandler : public SystemObject,
    * @param uioregsiters  String of uio device file same mapped to the PDEC register space
    */
   PdecHandler(object_id_t objectId, object_id_t tcDestinationId, LinuxLibgpioIF* gpioComIF,
-              gpioId_t pdecReset, UioNames names);
+              gpioId_t pdecReset, UioNames names, uint32_t cfgMemPhyAddr, uint32_t pdecRamPhyAddr);
 
   virtual ~PdecHandler();
 
@@ -103,12 +103,6 @@ class PdecHandler : public SystemObject,
   static const size_t MAX_TC_SEGMENT_SIZE = 1017;
   static const uint8_t MAP_ID_MASK = 0x3F;
 
-#ifdef TE0720_1CFA
-  static const uint32_t PHYSICAL_RAM_BASE_ADDRESS = 0x32000000;
-#else
-  static const uint32_t PHYSICAL_RAM_BASE_ADDRESS = 0x26000000;
-#endif
-
   // Expected value stored in FAR register after reset
   static const uint32_t FAR_RESET = 0x7FE0;
 
@@ -152,6 +146,8 @@ class PdecHandler : public SystemObject,
 
   LinuxLibgpioIF* gpioComIF = nullptr;
 
+  uint32_t cfgMemBaseAddr = 0x0;
+  uint32_t pdecRamBaseAddr = 0x0;
   uint32_t interruptCounter = 0;
   Countdown interruptWindowCd = Countdown(1000);
 
diff --git a/tmtc b/tmtc
index 60f7ae54..8f8bcde9 160000
--- a/tmtc
+++ b/tmtc
@@ -1 +1 @@
-Subproject commit 60f7ae5453b387ee5ebcf6a338c34284004dbce7
+Subproject commit 8f8bcde90e3b9113388cfedc47775426888d0781