diff --git a/arch/arm/src/tiva/cc13xx/cc13x0_trim.c b/arch/arm/src/tiva/cc13xx/cc13x0_trim.c
index 9851cea7438..93a97473c4a 100644
--- a/arch/arm/src/tiva/cc13xx/cc13x0_trim.c
+++ b/arch/arm/src/tiva/cc13xx/cc13x0_trim.c
@@ -148,7 +148,7 @@ static void trim_wakeup_fromshutdown(uint32_t fcfg1_revision)
    * -Configure XOSC.
    */
 
-#if CCFG_BASE == CCFG_BASE_DEFAULT
+#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
   SetupAfterColdResetWakeupFromShutDownCfg2(fcfg1_revision,
                                             ccfg_modeconf);
 #else
@@ -208,7 +208,7 @@ static void trim_wakeup_fromshutdown(uint32_t fcfg1_revision)
    * -Configure HPOSC. -Setup the LF clock.
    */
 
-#if ( CCFG_BASE == CCFG_BASE_DEFAULT )
+#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
   SetupAfterColdResetWakeupFromShutDownCfg3(ccfg_modeconf);
 #else
   NOROM_SetupAfterColdResetWakeupFromShutDownCfg3(ccfg_modeconf);
@@ -307,7 +307,7 @@ void cc13xx_trim_device(void)
 
   /* Select correct CACHE mode and set correct CACHE configuration */
 
-#if CCFG_BASE == CCFG_BASE_DEFAULT
+#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
   SetupSetCacheModeAccordingToCcfgSetting();
 #else
   NOROM_SetupSetCacheModeAccordingToCcfgSetting();
diff --git a/arch/arm/src/tiva/cc13xx/cc13x2_v1_trim.c b/arch/arm/src/tiva/cc13xx/cc13x2_v1_trim.c
index 55ac8f6907e..bfb2f9beaa2 100644
--- a/arch/arm/src/tiva/cc13xx/cc13x2_v1_trim.c
+++ b/arch/arm/src/tiva/cc13xx/cc13x2_v1_trim.c
@@ -256,7 +256,7 @@ static void trim_wakeup_fromshutdown(uint32_t fcfg1_revision)
    * -Configure XOSC.
    */
 
-#if CCFG_BASE == CCFG_BASE_DEFAULT
+#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
   SetupAfterColdResetWakeupFromShutDownCfg2(fcfg1_revision,
                                             ccfg_modeconf);
 #else
@@ -448,7 +448,7 @@ static void trim_wakeup_fromshutdown(uint32_t fcfg1_revision)
    * -Configure HPOSC. -Setup the LF clock.
    */
 
-#if CCFG_BASE == CCFG_BASE_DEFAULT
+#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
   SetupAfterColdResetWakeupFromShutDownCfg3(ccfg_modeconf);
 #else
   NOROM_SetupAfterColdResetWakeupFromShutDownCfg3(ccfg_modeconf);
@@ -524,7 +524,7 @@ void cc13xx_trim_device(void)
 
   /* Select correct CACHE mode and set correct CACHE configuration */
 
-#if CCFG_BASE == CCFG_BASE_DEFAULT
+#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
   SetupSetCacheModeAccordingToCcfgSetting();
 #else
   NOROM_SetupSetCacheModeAccordingToCcfgSetting();
diff --git a/arch/arm/src/tiva/cc13xx/cc13x2_v2_trim.c b/arch/arm/src/tiva/cc13xx/cc13x2_v2_trim.c
index 540641c3def..0f9cc57f6d4 100644
--- a/arch/arm/src/tiva/cc13xx/cc13x2_v2_trim.c
+++ b/arch/arm/src/tiva/cc13xx/cc13x2_v2_trim.c
@@ -151,7 +151,7 @@ static void trim_wakeup_fromshutdown(uint32_t fcfg1_revision)
    * -Configure XOSC.
    */
 
-#if CCFG_BASE == CCFG_BASE_DEFAULT
+#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
   SetupAfterColdResetWakeupFromShutDownCfg2(fcfg1_revision,
                                             ccfg_ModeConfReg);
 #else
@@ -211,7 +211,7 @@ static void trim_wakeup_fromshutdown(uint32_t fcfg1_revision)
    * -Configure HPOSC. -Setup the LF clock.
    */
 
-#if CCFG_BASE == CCFG_BASE_DEFAULT
+#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
   SetupAfterColdResetWakeupFromShutDownCfg3(ccfg_ModeConfReg);
 #else
   NOROM_SetupAfterColdResetWakeupFromShutDownCfg3(ccfg_ModeConfReg);
@@ -289,7 +289,7 @@ void cc13xx_trim_device(void)
 
   /* Select correct CACHE mode and set correct CACHE configuration */
 
-#if CCFG_BASE == CCFG_BASE_DEFAULT
+#if TIVA_CCFG_BASE == CCFG_BASE_DEFAULT
   SetupSetCacheModeAccordingToCcfgSetting();
 #else
   NOROM_SetupSetCacheModeAccordingToCcfgSetting();
diff --git a/arch/arm/src/tiva/hardware/cc13x0/cc13x0_memorymap.h b/arch/arm/src/tiva/hardware/cc13x0/cc13x0_memorymap.h
index 71ca0603dc0..1dbf5342781 100644
--- a/arch/arm/src/tiva/hardware/cc13x0/cc13x0_memorymap.h
+++ b/arch/arm/src/tiva/hardware/cc13x0/cc13x0_memorymap.h
@@ -103,7 +103,7 @@
 #define TIVA_FLASH_CFG_BASE           0x50000000 /* CC26_DUMMY_COMP */
 #define TIVA_FCFG1_BASE               0x50001000 /* FCFG1 */
 #define TIVA_FCFG2_BASE               0x50002000 /* FCFG2 */
-#ifndef CCFG_BASE
+#ifndef TIVA_CCFG_BASE
 #  define TIVA_CCFG_BASE              0x50003000 /* CCFG */
 #endif
 #define TIVA_CCFG_BASE_DEFAULT        0x50003000 /* CCFG */
diff --git a/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_memorymap.h b/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_memorymap.h
index 91465b2e9a9..32b718afc03 100644
--- a/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_memorymap.h
+++ b/arch/arm/src/tiva/hardware/cc13x2_cc26x2/cc13x2_cc26x2_memorymap.h
@@ -113,7 +113,7 @@
 #define TIVA_FLASH_CFG_BASE           0x50000000 /* CC26_DUMMY_COMP */
 #define TIVA_FCFG1_BASE               0x50001000 /* FCFG1 */
 #define TIVA_FCFG2_BASE               0x50002000 /* FCFG2 */
-#ifndef CCFG_BASE
+#ifndef TIVA_CCFG_BASE
 #  define TIVA_CCFG_BASE              0x50003000 /* CCFG */
 #endif
 #define TIVA_CCFG_BASE_DEFAULT        0x50003000 /* CCFG */