From 775f5126f07a015bd06f0f537dd28d6e3324f8fc Mon Sep 17 00:00:00 2001
From: Luca Burelli <l.burelli@arduino.cc>
Date: Tue, 18 Feb 2025 16:14:48 +0100
Subject: [PATCH] soc: renesas: ra: allow removal of option_bits sections

Check if the option bits DT nodes are enabled before including them in
the linker script for all RA SoCs. These must be disabled for targets
that provide a separate bootloader.

This commit adds the DT_NODE_HAS_STATUS_OKAY gates to all RA-series SoC
linker scripts, converting existing ones to the new macro.

The changes in this commit have been mechanically generated using find
and awk tools.

Signed-off-by: Luca Burelli <l.burelli@arduino.cc>
---
 soc/renesas/ra/ra2a1/sections.ld | 10 +++++-----
 soc/renesas/ra/ra4e1/sections.ld | 12 ++++++++++++
 soc/renesas/ra/ra4e2/sections.ld | 16 ++++++++++++++++
 soc/renesas/ra/ra4m1/sections.ld | 10 +++++-----
 soc/renesas/ra/ra4m2/sections.ld | 12 ++++++++++++
 soc/renesas/ra/ra4m3/sections.ld | 12 ++++++++++++
 soc/renesas/ra/ra4w1/sections.ld |  4 ++++
 soc/renesas/ra/ra6e1/sections.ld | 12 ++++++++++++
 soc/renesas/ra/ra6e2/sections.ld | 16 ++++++++++++++++
 soc/renesas/ra/ra6m1/sections.ld |  4 ++++
 soc/renesas/ra/ra6m2/sections.ld |  4 ++++
 soc/renesas/ra/ra6m3/sections.ld |  4 ++++
 soc/renesas/ra/ra6m4/sections.ld | 12 ++++++++++++
 soc/renesas/ra/ra6m5/sections.ld | 12 ++++++++++++
 soc/renesas/ra/ra8d1/sections.ld | 12 ++++++++++++
 soc/renesas/ra/ra8m1/sections.ld | 12 ++++++++++++
 soc/renesas/ra/ra8t1/sections.ld | 12 ++++++++++++
 17 files changed, 166 insertions(+), 10 deletions(-)

diff --git a/soc/renesas/ra/ra2a1/sections.ld b/soc/renesas/ra/ra2a1/sections.ld
index e3034adb244..9338be067c8 100644
--- a/soc/renesas/ra/ra2a1/sections.ld
+++ b/soc/renesas/ra/ra2a1/sections.ld
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(id_code), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(id_code))
 
 SECTION_PROLOGUE(.id_code,,)
 {
@@ -13,7 +13,7 @@ SECTION_PROLOGUE(.id_code,,)
 
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_ofs), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
 
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
@@ -28,7 +28,7 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_sas), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
 
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
@@ -39,7 +39,7 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_ns), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ns))
 
 SECTION_PROLOGUE(.option_setting_ns,,)
 {
@@ -70,7 +70,7 @@ SECTION_PROLOGUE(.option_setting_ns,,)
 
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_s), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
 
 SECTION_PROLOGUE(.option_setting_s,,)
 {
diff --git a/soc/renesas/ra/ra4e1/sections.ld b/soc/renesas/ra/ra4e1/sections.ld
index 38f0a5e25f9..24f3f69d86c 100644
--- a/soc/renesas/ra/ra4e1/sections.ld
+++ b/soc/renesas/ra/ra4e1/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra4e2/sections.ld b/soc/renesas/ra/ra4e2/sections.ld
index 8999a6524ed..78c380e9fa1 100644
--- a/soc/renesas/ra/ra4e2/sections.ld
+++ b/soc/renesas/ra/ra4e2/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -70,7 +80,13 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(id_code))
+
 SECTION_PROLOGUE(.id_code,,)
 {
     KEEP(*(.id_code*))
 } GROUP_LINK_IN(ID_CODE)
+
+#endif
diff --git a/soc/renesas/ra/ra4m1/sections.ld b/soc/renesas/ra/ra4m1/sections.ld
index e3034adb244..9338be067c8 100644
--- a/soc/renesas/ra/ra4m1/sections.ld
+++ b/soc/renesas/ra/ra4m1/sections.ld
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(id_code), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(id_code))
 
 SECTION_PROLOGUE(.id_code,,)
 {
@@ -13,7 +13,7 @@ SECTION_PROLOGUE(.id_code,,)
 
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_ofs), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
 
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
@@ -28,7 +28,7 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_sas), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
 
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
@@ -39,7 +39,7 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_ns), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ns))
 
 SECTION_PROLOGUE(.option_setting_ns,,)
 {
@@ -70,7 +70,7 @@ SECTION_PROLOGUE(.option_setting_ns,,)
 
 #endif
 
-#if DT_NODE_HAS_STATUS(DT_NODELABEL(option_setting_s), okay)
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
 
 SECTION_PROLOGUE(.option_setting_s,,)
 {
diff --git a/soc/renesas/ra/ra4m2/sections.ld b/soc/renesas/ra/ra4m2/sections.ld
index 1fe7db907a3..7859d28dea5 100644
--- a/soc/renesas/ra/ra4m2/sections.ld
+++ b/soc/renesas/ra/ra4m2/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra4m3/sections.ld b/soc/renesas/ra/ra4m3/sections.ld
index 1fe7db907a3..7859d28dea5 100644
--- a/soc/renesas/ra/ra4m3/sections.ld
+++ b/soc/renesas/ra/ra4m3/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra4w1/sections.ld b/soc/renesas/ra/ra4w1/sections.ld
index b850a64f643..f86dac778f7 100644
--- a/soc/renesas/ra/ra4w1/sections.ld
+++ b/soc/renesas/ra/ra4w1/sections.ld
@@ -19,7 +19,11 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(id_code))
+
 SECTION_PROLOGUE(.id_code,,)
 {
     KEEP(*(.id_code*))
 } GROUP_LINK_IN(ID_CODE)
+
+#endif
diff --git a/soc/renesas/ra/ra6e1/sections.ld b/soc/renesas/ra/ra6e1/sections.ld
index 1fe7db907a3..7859d28dea5 100644
--- a/soc/renesas/ra/ra6e1/sections.ld
+++ b/soc/renesas/ra/ra6e1/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra6e2/sections.ld b/soc/renesas/ra/ra6e2/sections.ld
index 8999a6524ed..78c380e9fa1 100644
--- a/soc/renesas/ra/ra6e2/sections.ld
+++ b/soc/renesas/ra/ra6e2/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -70,7 +80,13 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(id_code))
+
 SECTION_PROLOGUE(.id_code,,)
 {
     KEEP(*(.id_code*))
 } GROUP_LINK_IN(ID_CODE)
+
+#endif
diff --git a/soc/renesas/ra/ra6m1/sections.ld b/soc/renesas/ra/ra6m1/sections.ld
index 8d31894fc38..fb5ec4d7e24 100644
--- a/soc/renesas/ra/ra6m1/sections.ld
+++ b/soc/renesas/ra/ra6m1/sections.ld
@@ -11,7 +11,11 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(id_code))
+
 SECTION_PROLOGUE(.id_code,,)
 {
     KEEP(*(.id_code*))
 } GROUP_LINK_IN(ID_CODE)
+
+#endif
diff --git a/soc/renesas/ra/ra6m2/sections.ld b/soc/renesas/ra/ra6m2/sections.ld
index 8d31894fc38..fb5ec4d7e24 100644
--- a/soc/renesas/ra/ra6m2/sections.ld
+++ b/soc/renesas/ra/ra6m2/sections.ld
@@ -11,7 +11,11 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(id_code))
+
 SECTION_PROLOGUE(.id_code,,)
 {
     KEEP(*(.id_code*))
 } GROUP_LINK_IN(ID_CODE)
+
+#endif
diff --git a/soc/renesas/ra/ra6m3/sections.ld b/soc/renesas/ra/ra6m3/sections.ld
index 8d31894fc38..fb5ec4d7e24 100644
--- a/soc/renesas/ra/ra6m3/sections.ld
+++ b/soc/renesas/ra/ra6m3/sections.ld
@@ -11,7 +11,11 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(id_code))
+
 SECTION_PROLOGUE(.id_code,,)
 {
     KEEP(*(.id_code*))
 } GROUP_LINK_IN(ID_CODE)
+
+#endif
diff --git a/soc/renesas/ra/ra6m4/sections.ld b/soc/renesas/ra/ra6m4/sections.ld
index 1fe7db907a3..7859d28dea5 100644
--- a/soc/renesas/ra/ra6m4/sections.ld
+++ b/soc/renesas/ra/ra6m4/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra6m5/sections.ld b/soc/renesas/ra/ra6m5/sections.ld
index 1fe7db907a3..7859d28dea5 100644
--- a/soc/renesas/ra/ra6m5/sections.ld
+++ b/soc/renesas/ra/ra6m5/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra8d1/sections.ld b/soc/renesas/ra/ra8d1/sections.ld
index 1fe7db907a3..7859d28dea5 100644
--- a/soc/renesas/ra/ra8d1/sections.ld
+++ b/soc/renesas/ra/ra8d1/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra8m1/sections.ld b/soc/renesas/ra/ra8m1/sections.ld
index 1fe7db907a3..7859d28dea5 100644
--- a/soc/renesas/ra/ra8m1/sections.ld
+++ b/soc/renesas/ra/ra8m1/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif
diff --git a/soc/renesas/ra/ra8t1/sections.ld b/soc/renesas/ra/ra8t1/sections.ld
index 1fe7db907a3..7859d28dea5 100644
--- a/soc/renesas/ra/ra8t1/sections.ld
+++ b/soc/renesas/ra/ra8t1/sections.ld
@@ -11,6 +11,8 @@ SECTION_DATA_PROLOGUE(.fsp_dtc_vector_table,(NOLOAD),)
 	*(.fsp_dtc_vector_table)
 } GROUP_DATA_LINK_IN(RAMABLE_REGION, RAMABLE_REGION)
 
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs))
+
 SECTION_PROLOGUE(.option_setting_ofs,,)
 {
 	__OPTION_SETTING_OFS_Start = .;
@@ -22,6 +24,10 @@ SECTION_PROLOGUE(.option_setting_ofs,,)
 	__OPTION_SETTING_OFS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_OFS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_sas))
+
 SECTION_PROLOGUE(.option_setting_sas,,)
 {
 	__OPTION_SETTING_SAS_Start = .;
@@ -29,6 +35,10 @@ SECTION_PROLOGUE(.option_setting_sas,,)
 	__OPTION_SETTING_SAS_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_SAS) = 0xFF
 
+#endif
+
+#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_s))
+
 SECTION_PROLOGUE(.option_setting_s,,)
 {
 	__OPTION_SETTING_S_Start = .;
@@ -69,3 +79,5 @@ SECTION_PROLOGUE(.option_setting_s,,)
 	KEEP(*(.option_setting_bps_sel3))
 	__OPTION_SETTING_S_End = .;
 } GROUP_LINK_IN(OPTION_SETTING_S) = 0xFF
+
+#endif