diff --git a/soc/arm/st_stm32/common/CMakeLists.txt b/soc/arm/st_stm32/common/CMakeLists.txt
index 4b17720ae53..aba6a428e35 100644
--- a/soc/arm/st_stm32/common/CMakeLists.txt
+++ b/soc/arm/st_stm32/common/CMakeLists.txt
@@ -3,4 +3,4 @@
 zephyr_sources_ifdef(CONFIG_ARM_MPU arm_mpu_regions.c)
 zephyr_sources(stm32cube_hal.c)
 
-zephyr_linker_sources_ifdef(DT_CCM_BASE_ADDRESS SECTIONS ccm.ld)
+zephyr_linker_sources_ifdef(CONFIG_STM32_CCM SECTIONS ccm.ld)
diff --git a/soc/arm/st_stm32/common/Kconfig.soc b/soc/arm/st_stm32/common/Kconfig.soc
new file mode 100644
index 00000000000..10e1b792fa9
--- /dev/null
+++ b/soc/arm/st_stm32/common/Kconfig.soc
@@ -0,0 +1,10 @@
+# Kconfig - ST Microelectronics Common Kconfig
+
+# Copyright (c) 2019 Linaro Ltd.
+# SPDX-License-Identifier: Apache-2.0
+
+# Workaround for not being able to have commas in macro arguments
+DT_CHOSEN_Z_CCM := zephyr,ccm
+
+config STM32_CCM
+	def_bool $(dt_chosen_enabled,$(DT_CHOSEN_Z_CCM))