diff --git a/soc/renesas/ra/ra0e1/rom_start.ld b/soc/renesas/ra/ra0e1/rom_start.ld index 9ea65b58a1fc..ec11b079ce04 100644 --- a/soc/renesas/ra/ra0e1/rom_start.ld +++ b/soc/renesas/ra/ra0e1/rom_start.ld @@ -6,8 +6,13 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + . = DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)); KEEP(*(.option_setting_ofs0)) . = DT_REG_ADDR(DT_NODELABEL(option_setting_ofs1)); KEEP(*(.option_setting_ofs1)) + +#endif diff --git a/soc/renesas/ra/ra0e1/sections.ld b/soc/renesas/ra/ra0e1/sections.ld index 20c940e95aab..d11ea44f5930 100644 --- a/soc/renesas/ra/ra0e1/sections.ld +++ b/soc/renesas/ra/ra0e1/sections.ld @@ -6,9 +6,14 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_osis)) SECTION_DATA_PROLOGUE(.option_setting_osis, DT_REG_ADDR(DT_NODELABEL(option_setting_osis)),) { KEEP(*(.option_setting_osis)) } GROUP_LINK_IN(OFS_OSIS_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra2a1/rom_start.ld b/soc/renesas/ra/ra2a1/rom_start.ld index 14d4ca673774..bd69b28fb691 100644 --- a/soc/renesas/ra/ra2a1/rom_start.ld +++ b/soc/renesas/ra/ra2a1/rom_start.ld @@ -7,6 +7,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + . = DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)); KEEP(*(.option_setting_ofs0)) @@ -15,3 +18,5 @@ KEEP(*(.option_setting_ofs1)) . = DT_REG_ADDR(DT_NODELABEL(option_setting_secmpu)); KEEP(*(.option_setting_secmpu)) + +#endif diff --git a/soc/renesas/ra/ra2a1/sections.ld b/soc/renesas/ra/ra2a1/sections.ld index 68e09b0c3a71..048a255894bb 100644 --- a/soc/renesas/ra/ra2a1/sections.ld +++ b/soc/renesas/ra/ra2a1/sections.ld @@ -7,9 +7,14 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_osis)) SECTION_DATA_PROLOGUE(.option_setting_osis, DT_REG_ADDR(DT_NODELABEL(option_setting_osis)),) { KEEP(*(.option_setting_osis)) } GROUP_LINK_IN(OFS_OSIS_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra2l1/rom_start.ld b/soc/renesas/ra/ra2l1/rom_start.ld index 835fbfe7a949..b5ed094e2e27 100644 --- a/soc/renesas/ra/ra2l1/rom_start.ld +++ b/soc/renesas/ra/ra2l1/rom_start.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + . = DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)); KEEP(*(.option_setting_ofs0)) @@ -14,3 +17,5 @@ KEEP(*(.option_setting_ofs1)) . = DT_REG_ADDR(DT_NODELABEL(option_setting_secmpu)); KEEP(*(.option_setting_secmpu)) + +#endif diff --git a/soc/renesas/ra/ra2l1/sections.ld b/soc/renesas/ra/ra2l1/sections.ld index 4bfe732fc6c7..fad171940f52 100644 --- a/soc/renesas/ra/ra2l1/sections.ld +++ b/soc/renesas/ra/ra2l1/sections.ld @@ -6,9 +6,14 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_osis)) SECTION_DATA_PROLOGUE(.option_setting_osis, DT_REG_ADDR(DT_NODELABEL(option_setting_osis)),) { KEEP(*(.option_setting_osis)) } GROUP_LINK_IN(OFS_OSIS_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra4c1/sections.ld b/soc/renesas/ra/ra4c1/sections.ld index 22766d9ae21d..18f3c6f1b843 100644 --- a/soc/renesas/ra/ra4c1/sections.ld +++ b/soc/renesas/ra/ra4c1/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -68,3 +71,5 @@ SECTION_DATA_PROLOGUE(.option_setting_bps_sel, DT_REG_ADDR(DT_NODELABEL(option_s KEEP(*(.option_setting_bps_sel)) } GROUP_LINK_IN(OFS_BPS_SEL_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra4e1/sections.ld b/soc/renesas/ra/ra4e1/sections.ld index 12b940286bcf..70680f320d69 100644 --- a/soc/renesas/ra/ra4e1/sections.ld +++ b/soc/renesas/ra/ra4e1/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -47,3 +50,5 @@ SECTION_DATA_PROLOGUE(.option_setting_bps_sel, DT_REG_ADDR(DT_NODELABEL(option_s KEEP(*(.option_setting_bps_sel)) } GROUP_LINK_IN(OFS_BPS_SEL_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra4e2/sections.ld b/soc/renesas/ra/ra4e2/sections.ld index 5bba98717fe3..a21e43737ac2 100644 --- a/soc/renesas/ra/ra4e2/sections.ld +++ b/soc/renesas/ra/ra4e2/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -40,3 +43,5 @@ SECTION_DATA_PROLOGUE(.option_setting_pbps_sec, DT_REG_ADDR(DT_NODELABEL(option_ KEEP(*(.option_setting_pbps_sec)) } GROUP_LINK_IN(OFS_PBPS_SEC_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra4l1/sections.ld b/soc/renesas/ra/ra4l1/sections.ld index 22766d9ae21d..18f3c6f1b843 100644 --- a/soc/renesas/ra/ra4l1/sections.ld +++ b/soc/renesas/ra/ra4l1/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -68,3 +71,5 @@ SECTION_DATA_PROLOGUE(.option_setting_bps_sel, DT_REG_ADDR(DT_NODELABEL(option_s KEEP(*(.option_setting_bps_sel)) } GROUP_LINK_IN(OFS_BPS_SEL_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra4m1/rom_start.ld b/soc/renesas/ra/ra4m1/rom_start.ld index 14d4ca673774..bd69b28fb691 100644 --- a/soc/renesas/ra/ra4m1/rom_start.ld +++ b/soc/renesas/ra/ra4m1/rom_start.ld @@ -7,6 +7,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + . = DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)); KEEP(*(.option_setting_ofs0)) @@ -15,3 +18,5 @@ KEEP(*(.option_setting_ofs1)) . = DT_REG_ADDR(DT_NODELABEL(option_setting_secmpu)); KEEP(*(.option_setting_secmpu)) + +#endif diff --git a/soc/renesas/ra/ra4m1/sections.ld b/soc/renesas/ra/ra4m1/sections.ld index f045ebd3ab15..1d6aa838c31f 100644 --- a/soc/renesas/ra/ra4m1/sections.ld +++ b/soc/renesas/ra/ra4m1/sections.ld @@ -7,9 +7,14 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_osis)) SECTION_DATA_PROLOGUE(.option_setting_osis, DT_REG_ADDR(DT_NODELABEL(option_setting_osis)),) { KEEP(*(.option_setting_osis)) } GROUP_LINK_IN(OFS_OSIS_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra4m2/sections.ld b/soc/renesas/ra/ra4m2/sections.ld index 09962173ae19..86432751a4e6 100644 --- a/soc/renesas/ra/ra4m2/sections.ld +++ b/soc/renesas/ra/ra4m2/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -47,3 +50,5 @@ SECTION_DATA_PROLOGUE(.option_setting_bps_sel, DT_REG_ADDR(DT_NODELABEL(option_s KEEP(*(.option_setting_bps_sel)) } GROUP_LINK_IN(OFS_BPS_SEL_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra4m3/sections.ld b/soc/renesas/ra/ra4m3/sections.ld index 3a7d36cfbe74..f50fed5ecf60 100644 --- a/soc/renesas/ra/ra4m3/sections.ld +++ b/soc/renesas/ra/ra4m3/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -61,3 +64,5 @@ SECTION_DATA_PROLOGUE(.option_setting_bps_sel, DT_REG_ADDR(DT_NODELABEL(option_s KEEP(*(.option_setting_bps_sel)) } GROUP_LINK_IN(OFS_BPS_SEL_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra4t1/sections.ld b/soc/renesas/ra/ra4t1/sections.ld index 6908242701bc..ca7c18501a2f 100644 --- a/soc/renesas/ra/ra4t1/sections.ld +++ b/soc/renesas/ra/ra4t1/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -40,3 +43,5 @@ SECTION_DATA_PROLOGUE(.option_setting_pbps_sec, DT_REG_ADDR(DT_NODELABEL(option_ KEEP(*(.option_setting_pbps_sec)) } GROUP_LINK_IN(OFS_PBPS_SEC_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra4w1/rom_start.ld b/soc/renesas/ra/ra4w1/rom_start.ld index 835fbfe7a949..b5ed094e2e27 100644 --- a/soc/renesas/ra/ra4w1/rom_start.ld +++ b/soc/renesas/ra/ra4w1/rom_start.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + . = DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)); KEEP(*(.option_setting_ofs0)) @@ -14,3 +17,5 @@ KEEP(*(.option_setting_ofs1)) . = DT_REG_ADDR(DT_NODELABEL(option_setting_secmpu)); KEEP(*(.option_setting_secmpu)) + +#endif diff --git a/soc/renesas/ra/ra4w1/sections.ld b/soc/renesas/ra/ra4w1/sections.ld index 4bfe732fc6c7..fad171940f52 100644 --- a/soc/renesas/ra/ra4w1/sections.ld +++ b/soc/renesas/ra/ra4w1/sections.ld @@ -6,9 +6,14 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_osis)) SECTION_DATA_PROLOGUE(.option_setting_osis, DT_REG_ADDR(DT_NODELABEL(option_setting_osis)),) { KEEP(*(.option_setting_osis)) } GROUP_LINK_IN(OFS_OSIS_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra6e1/sections.ld b/soc/renesas/ra/ra6e1/sections.ld index 67b396e922f8..3044f0b58c5d 100644 --- a/soc/renesas/ra/ra6e1/sections.ld +++ b/soc/renesas/ra/ra6e1/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -68,3 +71,5 @@ SECTION_DATA_PROLOGUE(.option_setting_bps_sel, DT_REG_ADDR(DT_NODELABEL(option_s KEEP(*(.option_setting_bps_sel)) } GROUP_LINK_IN(OFS_BPS_SEL_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra6e2/sections.ld b/soc/renesas/ra/ra6e2/sections.ld index 5bba98717fe3..a21e43737ac2 100644 --- a/soc/renesas/ra/ra6e2/sections.ld +++ b/soc/renesas/ra/ra6e2/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -40,3 +43,5 @@ SECTION_DATA_PROLOGUE(.option_setting_pbps_sec, DT_REG_ADDR(DT_NODELABEL(option_ KEEP(*(.option_setting_pbps_sec)) } GROUP_LINK_IN(OFS_PBPS_SEC_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra6m1/rom_start.ld b/soc/renesas/ra/ra6m1/rom_start.ld index 835fbfe7a949..b5ed094e2e27 100644 --- a/soc/renesas/ra/ra6m1/rom_start.ld +++ b/soc/renesas/ra/ra6m1/rom_start.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + . = DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)); KEEP(*(.option_setting_ofs0)) @@ -14,3 +17,5 @@ KEEP(*(.option_setting_ofs1)) . = DT_REG_ADDR(DT_NODELABEL(option_setting_secmpu)); KEEP(*(.option_setting_secmpu)) + +#endif diff --git a/soc/renesas/ra/ra6m1/sections.ld b/soc/renesas/ra/ra6m1/sections.ld index 4bfe732fc6c7..fad171940f52 100644 --- a/soc/renesas/ra/ra6m1/sections.ld +++ b/soc/renesas/ra/ra6m1/sections.ld @@ -6,9 +6,14 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_osis)) SECTION_DATA_PROLOGUE(.option_setting_osis, DT_REG_ADDR(DT_NODELABEL(option_setting_osis)),) { KEEP(*(.option_setting_osis)) } GROUP_LINK_IN(OFS_OSIS_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra6m2/rom_start.ld b/soc/renesas/ra/ra6m2/rom_start.ld index 835fbfe7a949..b5ed094e2e27 100644 --- a/soc/renesas/ra/ra6m2/rom_start.ld +++ b/soc/renesas/ra/ra6m2/rom_start.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + . = DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)); KEEP(*(.option_setting_ofs0)) @@ -14,3 +17,5 @@ KEEP(*(.option_setting_ofs1)) . = DT_REG_ADDR(DT_NODELABEL(option_setting_secmpu)); KEEP(*(.option_setting_secmpu)) + +#endif diff --git a/soc/renesas/ra/ra6m2/sections.ld b/soc/renesas/ra/ra6m2/sections.ld index 4bfe732fc6c7..fad171940f52 100644 --- a/soc/renesas/ra/ra6m2/sections.ld +++ b/soc/renesas/ra/ra6m2/sections.ld @@ -6,9 +6,14 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_osis)) SECTION_DATA_PROLOGUE(.option_setting_osis, DT_REG_ADDR(DT_NODELABEL(option_setting_osis)),) { KEEP(*(.option_setting_osis)) } GROUP_LINK_IN(OFS_OSIS_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra6m3/rom_start.ld b/soc/renesas/ra/ra6m3/rom_start.ld index 835fbfe7a949..b5ed094e2e27 100644 --- a/soc/renesas/ra/ra6m3/rom_start.ld +++ b/soc/renesas/ra/ra6m3/rom_start.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + . = DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)); KEEP(*(.option_setting_ofs0)) @@ -14,3 +17,5 @@ KEEP(*(.option_setting_ofs1)) . = DT_REG_ADDR(DT_NODELABEL(option_setting_secmpu)); KEEP(*(.option_setting_secmpu)) + +#endif diff --git a/soc/renesas/ra/ra6m3/sections.ld b/soc/renesas/ra/ra6m3/sections.ld index 4bfe732fc6c7..fad171940f52 100644 --- a/soc/renesas/ra/ra6m3/sections.ld +++ b/soc/renesas/ra/ra6m3/sections.ld @@ -6,9 +6,14 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_osis)) SECTION_DATA_PROLOGUE(.option_setting_osis, DT_REG_ADDR(DT_NODELABEL(option_setting_osis)),) { KEEP(*(.option_setting_osis)) } GROUP_LINK_IN(OFS_OSIS_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra6m4/sections.ld b/soc/renesas/ra/ra6m4/sections.ld index 67b396e922f8..3044f0b58c5d 100644 --- a/soc/renesas/ra/ra6m4/sections.ld +++ b/soc/renesas/ra/ra6m4/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -68,3 +71,5 @@ SECTION_DATA_PROLOGUE(.option_setting_bps_sel, DT_REG_ADDR(DT_NODELABEL(option_s KEEP(*(.option_setting_bps_sel)) } GROUP_LINK_IN(OFS_BPS_SEL_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra6m5/sections.ld b/soc/renesas/ra/ra6m5/sections.ld index 67b396e922f8..3044f0b58c5d 100644 --- a/soc/renesas/ra/ra6m5/sections.ld +++ b/soc/renesas/ra/ra6m5/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -68,3 +71,5 @@ SECTION_DATA_PROLOGUE(.option_setting_bps_sel, DT_REG_ADDR(DT_NODELABEL(option_s KEEP(*(.option_setting_bps_sel)) } GROUP_LINK_IN(OFS_BPS_SEL_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra8d1/sections.ld b/soc/renesas/ra/ra8d1/sections.ld index 54bfd6a8a14b..60a1c54b4277 100644 --- a/soc/renesas/ra/ra8d1/sections.ld +++ b/soc/renesas/ra/ra8d1/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -75,3 +78,5 @@ SECTION_DATA_PROLOGUE(.option_setting_bps_sel, DT_REG_ADDR(DT_NODELABEL(option_s KEEP(*(.option_setting_bps_sel)) } GROUP_LINK_IN(OFS_BPS_SEL_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra8d2/sections.ld b/soc/renesas/ra/ra8d2/sections.ld index a83eaad884aa..26081042b5a1 100644 --- a/soc/renesas/ra/ra8d2/sections.ld +++ b/soc/renesas/ra/ra8d2/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -68,3 +71,5 @@ SECTION_DATA_PROLOGUE(.option_setting_otp_pbps_sec, DT_REG_ADDR(DT_NODELABEL(opt KEEP(*(.option_setting_otp_pbps_sec)) } GROUP_LINK_IN(OFS_OTP_PBPS_SEC_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra8e1/sections.ld b/soc/renesas/ra/ra8e1/sections.ld index 4f611de592f3..2f5bf0f5538a 100644 --- a/soc/renesas/ra/ra8e1/sections.ld +++ b/soc/renesas/ra/ra8e1/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -75,3 +78,5 @@ SECTION_DATA_PROLOGUE(.option_setting_bps_sel, DT_REG_ADDR(DT_NODELABEL(option_s KEEP(*(.option_setting_bps_sel)) } GROUP_LINK_IN(OFS_BPS_SEL_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra8m1/sections.ld b/soc/renesas/ra/ra8m1/sections.ld index 54bfd6a8a14b..60a1c54b4277 100644 --- a/soc/renesas/ra/ra8m1/sections.ld +++ b/soc/renesas/ra/ra8m1/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -75,3 +78,5 @@ SECTION_DATA_PROLOGUE(.option_setting_bps_sel, DT_REG_ADDR(DT_NODELABEL(option_s KEEP(*(.option_setting_bps_sel)) } GROUP_LINK_IN(OFS_BPS_SEL_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra8m2/sections.ld b/soc/renesas/ra/ra8m2/sections.ld index a83eaad884aa..26081042b5a1 100644 --- a/soc/renesas/ra/ra8m2/sections.ld +++ b/soc/renesas/ra/ra8m2/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -68,3 +71,5 @@ SECTION_DATA_PROLOGUE(.option_setting_otp_pbps_sec, DT_REG_ADDR(DT_NODELABEL(opt KEEP(*(.option_setting_otp_pbps_sec)) } GROUP_LINK_IN(OFS_OTP_PBPS_SEC_MEMORY) #endif + +#endif diff --git a/soc/renesas/ra/ra8p1/sections.ld b/soc/renesas/ra/ra8p1/sections.ld index a83eaad884aa..8528b9afc833 100644 --- a/soc/renesas/ra/ra8p1/sections.ld +++ b/soc/renesas/ra/ra8p1/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { diff --git a/soc/renesas/ra/ra8t1/sections.ld b/soc/renesas/ra/ra8t1/sections.ld index 54bfd6a8a14b..43a873eb1567 100644 --- a/soc/renesas/ra/ra8t1/sections.ld +++ b/soc/renesas/ra/ra8t1/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { diff --git a/soc/renesas/ra/ra8t2/sections.ld b/soc/renesas/ra/ra8t2/sections.ld index a83eaad884aa..26081042b5a1 100644 --- a/soc/renesas/ra/ra8t2/sections.ld +++ b/soc/renesas/ra/ra8t2/sections.ld @@ -6,6 +6,9 @@ #include +/* Emit option setting sections only when standalone app OR MCUboot itself */ +#if !defined(CONFIG_BOOTLOADER_MCUBOOT) || defined(CONFIG_MCUBOOT) + #if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0)) SECTION_DATA_PROLOGUE(.option_setting_ofs0, DT_REG_ADDR(DT_NODELABEL(option_setting_ofs0)),) { @@ -68,3 +71,5 @@ SECTION_DATA_PROLOGUE(.option_setting_otp_pbps_sec, DT_REG_ADDR(DT_NODELABEL(opt KEEP(*(.option_setting_otp_pbps_sec)) } GROUP_LINK_IN(OFS_OTP_PBPS_SEC_MEMORY) #endif + +#endif