diff --git a/bdk/exception_handlers.S b/bdk/exception_handlers.S
index 2f38bb30..50acb91a 100644
--- a/bdk/exception_handlers.S
+++ b/bdk/exception_handlers.S
@@ -41,9 +41,9 @@
  * 11111  | SYS  | r0–r7, SP,     LR,     PC, CPSR           | r0–r14,                   PC, CPSR
  */
 
-#define EXCP_EN_ADDR   0x4003FFFC
-#define EXCP_TYPE_ADDR 0x4003FFF8
-#define EXCP_LR_ADDR   0x4003FFF4
+#define EXCP_EN_ADDR   0x4003FF1C
+#define EXCP_TYPE_ADDR 0x4003FF18
+#define EXCP_LR_ADDR   0x4003FF14
 
 #define EXCP_VEC_BASE  0x6000F000
 #define EVP_COP_RESET_VECTOR          0x200
diff --git a/bdk/memory_map.h b/bdk/memory_map.h
index b5159464..0920785b 100644
--- a/bdk/memory_map.h
+++ b/bdk/memory_map.h
@@ -36,7 +36,7 @@
 #define IRQ_STACK_TOP      0x40040000
 #define IPL_RELOC_ADDR     0x4003FF00
 #define  IPL_RELOC_SZ            0x10
-#define EXCP_STORAGE_ADDR  0x4003FFF0
+#define EXCP_STORAGE_ADDR  0x4003FF10
 #define  EXCP_STORAGE_SZ         0x10
 
 /* --- DRAM START --- */
diff --git a/bdk/soc/timer.c b/bdk/soc/timer.c
index 786f1239..db4750a2 100644
--- a/bdk/soc/timer.c
+++ b/bdk/soc/timer.c
@@ -22,7 +22,7 @@
 #include <soc/t210.h>
 #include <utils/types.h>
 
-#define EXCP_TYPE_ADDR 0x4003FFF8
+#define EXCP_TYPE_ADDR 0x4003FF18
 #define  EXCP_TYPE_WDT 0x544457 // "WDT".
 
 #define USE_RTC_TIMER