diff --git a/include/arch/arm/cortex_m/scripts/linker.ld b/include/arch/arm/cortex_m/scripts/linker.ld
index 5d1891acced..5116b298ad6 100644
--- a/include/arch/arm/cortex_m/scripts/linker.ld
+++ b/include/arch/arm/cortex_m/scripts/linker.ld
@@ -137,12 +137,6 @@ SECTIONS
 
     SECTION_PROLOGUE(_TEXT_SECTION_NAME,,)
 	{
-#if defined(CONFIG_CC3220SF_DEBUG) || defined(CONFIG_CC3235SF_DEBUG)
-	/* Add CC32xx flash header to disable flash verification */
-	. = 0x0;
-	KEEP(*(.dbghdr))
-	KEEP(*(".dbghdr.*"))
-#endif
 
 	. = CONFIG_TEXT_SECTION_OFFSET;
 
diff --git a/include/arch/arm/cortex_r/scripts/linker.ld b/include/arch/arm/cortex_r/scripts/linker.ld
index 7fec36c4a2b..6fd186585d5 100644
--- a/include/arch/arm/cortex_r/scripts/linker.ld
+++ b/include/arch/arm/cortex_r/scripts/linker.ld
@@ -134,13 +134,6 @@ SECTIONS
 
     SECTION_PROLOGUE(_TEXT_SECTION_NAME,,)
 	{
-#ifdef CONFIG_CC3220SF_DEBUG
-	/* Add CC3220SF flash header to disable flash verification */
-	. = 0x0;
-	KEEP(*(.dbghdr))
-	KEEP(*(".dbghdr.*"))
-#endif
-
 	. = CONFIG_TEXT_SECTION_OFFSET;
 
 /* Located in generated directory. This file is populated by the
diff --git a/soc/arm/ti_simplelink/cc32xx/CMakeLists.txt b/soc/arm/ti_simplelink/cc32xx/CMakeLists.txt
index 9486f255912..341bb0c1e2f 100644
--- a/soc/arm/ti_simplelink/cc32xx/CMakeLists.txt
+++ b/soc/arm/ti_simplelink/cc32xx/CMakeLists.txt
@@ -1,3 +1,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_sources(soc.c)
+
+if (DEFINED CONFIG_CC3220SF_DEBUG OR DEFINED CONFIG_CC3235SF_DEBUG)
+  zephyr_linker_sources(TEXT_START SORT_KEY 0 cc32xx_debug.ld)
+endif()
diff --git a/soc/arm/ti_simplelink/cc32xx/cc32xx_debug.ld b/soc/arm/ti_simplelink/cc32xx/cc32xx_debug.ld
new file mode 100644
index 00000000000..a668646a403
--- /dev/null
+++ b/soc/arm/ti_simplelink/cc32xx/cc32xx_debug.ld
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2019 Texas Instruments Incorporated
+ * Copyright (c) 2019 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/* Add CC32xx flash header to disable flash verification */
+. = 0x0;
+KEEP(*(.dbghdr))
+KEEP(*(".dbghdr.*"))
\ No newline at end of file