Skip to content

soc: renesas: ra: don't emit option settings when chain-loaded by MCUboot #114429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabiobaltieri merged 1 commit into from
Jul 28, 2026
Merged

soc: renesas: ra: don't emit option settings when chain-loaded by MCUboot #114429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra0e1/rom_start.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@

#include <zephyr/devicetree.h>

/* 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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra0e1/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@

#include <zephyr/devicetree.h>

/* 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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra2a1/rom_start.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@

#include <zephyr/devicetree.h>

/* 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))

Expand All @@ -15,3 +18,5 @@ KEEP(*(.option_setting_ofs1))

. = DT_REG_ADDR(DT_NODELABEL(option_setting_secmpu));
KEEP(*(.option_setting_secmpu))

#endif
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra2a1/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@

#include <zephyr/devicetree.h>

/* 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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra2l1/rom_start.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

#include <zephyr/devicetree.h>

/* 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))

Expand All @@ -14,3 +17,5 @@ KEEP(*(.option_setting_ofs1))

. = DT_REG_ADDR(DT_NODELABEL(option_setting_secmpu));
KEEP(*(.option_setting_secmpu))

#endif
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra2l1/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@

#include <zephyr/devicetree.h>

/* 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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra4c1/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

#include <zephyr/devicetree.h>

/* 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)),)
{
Expand Down Expand Up @@ -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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra4e1/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

#include <zephyr/devicetree.h>

/* 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)),)
{
Expand Down Expand Up @@ -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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra4e2/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

#include <zephyr/devicetree.h>

/* 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)),)
{
Expand Down Expand Up @@ -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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra4l1/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

#include <zephyr/devicetree.h>

/* 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)),)
{
Expand Down Expand Up @@ -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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra4m1/rom_start.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@

#include <zephyr/devicetree.h>

/* 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))

Expand All @@ -15,3 +18,5 @@ KEEP(*(.option_setting_ofs1))

. = DT_REG_ADDR(DT_NODELABEL(option_setting_secmpu));
KEEP(*(.option_setting_secmpu))

#endif
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra4m1/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@

#include <zephyr/devicetree.h>

/* 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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra4m2/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

#include <zephyr/devicetree.h>

/* 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)),)
{
Expand Down Expand Up @@ -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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra4m3/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

#include <zephyr/devicetree.h>

/* 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)),)
{
Expand Down Expand Up @@ -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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra4t1/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

#include <zephyr/devicetree.h>

/* 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)),)
{
Expand Down Expand Up @@ -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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra4w1/rom_start.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

#include <zephyr/devicetree.h>

/* 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))

Expand All @@ -14,3 +17,5 @@ KEEP(*(.option_setting_ofs1))

. = DT_REG_ADDR(DT_NODELABEL(option_setting_secmpu));
KEEP(*(.option_setting_secmpu))

#endif
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra4w1/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@

#include <zephyr/devicetree.h>

/* 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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra6e1/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

#include <zephyr/devicetree.h>

/* 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)),)
{
Expand Down Expand Up @@ -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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra6e2/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

#include <zephyr/devicetree.h>

/* 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)),)
{
Expand Down Expand Up @@ -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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra6m1/rom_start.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

#include <zephyr/devicetree.h>

/* 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))

Expand All @@ -14,3 +17,5 @@ KEEP(*(.option_setting_ofs1))

. = DT_REG_ADDR(DT_NODELABEL(option_setting_secmpu));
KEEP(*(.option_setting_secmpu))

#endif
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra6m1/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@

#include <zephyr/devicetree.h>

/* 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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra6m2/rom_start.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

#include <zephyr/devicetree.h>

/* 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))

Expand All @@ -14,3 +17,5 @@ KEEP(*(.option_setting_ofs1))

. = DT_REG_ADDR(DT_NODELABEL(option_setting_secmpu));
KEEP(*(.option_setting_secmpu))

#endif
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra6m2/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@

#include <zephyr/devicetree.h>

/* 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
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra6m3/rom_start.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

#include <zephyr/devicetree.h>

/* 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))

Expand All @@ -14,3 +17,5 @@ KEEP(*(.option_setting_ofs1))

. = DT_REG_ADDR(DT_NODELABEL(option_setting_secmpu));
KEEP(*(.option_setting_secmpu))

#endif
5 changes: 5 additions & 0 deletions soc/renesas/ra/ra6m3/sections.ld
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@

#include <zephyr/devicetree.h>

/* 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
Loading
Loading