diff --git a/doc/guides/dts/index.rst b/doc/guides/dts/index.rst
index 4e0a8261211..cf2e718d495 100644
--- a/doc/guides/dts/index.rst
+++ b/doc/guides/dts/index.rst
@@ -298,7 +298,7 @@ The full set of Zephyr-specific ``chosen`` nodes follows:
    * - ``zephyr,sram``
      - ``CONFIG_SRAM``
    * - ``zephyr,ccm``
-     - ``CONFIG_CCM``
+     - ``DT_CCM``
    * - ``zephyr,console``
      - :option:`CONFIG_UART_CONSOLE_ON_DEV_NAME`
    * - ``zephyr,shell-uart``
diff --git a/include/arch/arm/cortex_m/scripts/linker.ld b/include/arch/arm/cortex_m/scripts/linker.ld
index 9b9e1625348..61b2f1f42d6 100644
--- a/include/arch/arm/cortex_m/scripts/linker.ld
+++ b/include/arch/arm/cortex_m/scripts/linker.ld
@@ -93,8 +93,8 @@ MEMORY
 #ifdef CONFIG_TI_CCFG_PRESENT
     FLASH_CCFG            (rwx): ORIGIN = CCFG_ADDR, LENGTH = CCFG_SIZE
 #endif
-#ifdef CONFIG_CCM_BASE_ADDRESS
-    CCM                   (rw) : ORIGIN = CONFIG_CCM_BASE_ADDRESS, LENGTH = CONFIG_CCM_SIZE * 1K
+#ifdef DT_CCM_BASE_ADDRESS
+    CCM                   (rw) : ORIGIN = DT_CCM_BASE_ADDRESS, LENGTH = DT_CCM_SIZE * 1K
 #endif
     SRAM                  (wx) : ORIGIN = RAM_ADDR, LENGTH = RAM_SIZE
 
@@ -455,7 +455,7 @@ SECTIONS
 
     GROUP_END(RAMABLE_REGION)
 
-#ifdef CONFIG_CCM_BASE_ADDRESS
+#ifdef DT_CCM_BASE_ADDRESS
 
     GROUP_START(CCM)
 
@@ -492,7 +492,7 @@ SECTIONS
 
     GROUP_END(CCM)
 
-#endif /* CONFIG_CCM_BASE_ADDRESS */
+#endif /* DT_CCM_BASE_ADDRESS */
 
 #ifdef CONFIG_CUSTOM_SECTIONS_LD
 /* Located in project source directory */
diff --git a/include/linker/linker-defs.h b/include/linker/linker-defs.h
index f9ff858ba34..d07e66234d5 100644
--- a/include/linker/linker-defs.h
+++ b/include/linker/linker-defs.h
@@ -202,7 +202,7 @@ extern char __gcov_bss_size[];
 /* end address of image, used by newlib for the heap */
 extern char _end[];
 
-#ifdef CONFIG_CCM_BASE_ADDRESS
+#ifdef DT_CCM_BASE_ADDRESS
 extern char __ccm_data_rom_start[];
 extern char __ccm_start[];
 extern char __ccm_data_start[];
@@ -212,7 +212,7 @@ extern char __ccm_bss_end[];
 extern char __ccm_noinit_start[];
 extern char __ccm_noinit_end[];
 extern char __ccm_end[];
-#endif /* CONFIG_CCM_BASE_ADDRESS */
+#endif /* DT_CCM_BASE_ADDRESS */
 
 /* Used by the Security Attribution Unit to configure the
  * Non-Secure Callable region.
diff --git a/kernel/init.c b/kernel/init.c
index 458f707cbd2..59896116258 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -144,7 +144,7 @@ void _bss_zero(void)
 {
 	(void)memset(&__bss_start, 0,
 		     ((u32_t) &__bss_end - (u32_t) &__bss_start));
-#ifdef CONFIG_CCM_BASE_ADDRESS
+#ifdef DT_CCM_BASE_ADDRESS
 	(void)memset(&__ccm_bss_start, 0,
 		     ((u32_t) &__ccm_bss_end - (u32_t) &__ccm_bss_start));
 #endif
@@ -173,7 +173,7 @@ void _data_copy(void)
 {
 	(void)memcpy(&__data_ram_start, &__data_rom_start,
 		 ((u32_t) &__data_ram_end - (u32_t) &__data_ram_start));
-#ifdef CONFIG_CCM_BASE_ADDRESS
+#ifdef DT_CCM_BASE_ADDRESS
 	(void)memcpy(&__ccm_data_start, &__ccm_data_rom_start,
 		 ((u32_t) &__ccm_data_end - (u32_t) &__ccm_data_start));
 #endif
diff --git a/scripts/dts/extract/globals.py b/scripts/dts/extract/globals.py
index e81561ea826..0619d0f7366 100644
--- a/scripts/dts/extract/globals.py
+++ b/scripts/dts/extract/globals.py
@@ -22,7 +22,7 @@ old_alias_names = False
 
 regs_config = {
     'zephyr,sram'  : 'DT_SRAM',
-    'zephyr,ccm'   : 'CONFIG_CCM'
+    'zephyr,ccm'   : 'DT_CCM'
 }
 
 name_config = {