Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 35 additions & 0 deletions boards/renesas/ek_ra8p1/ek_ra8p1_r7ka8p1kflcac_cm33.dts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
chosen {
zephyr,sram = &sram1;
zephyr,flash = &code_mram_cm33;
zephyr,flash-controller = &mram_ctrl;
zephyr,code-partition = &slot0_partition;
zephyr,console = &uart9;
zephyr,shell-uart = &uart9;
};
Expand Down Expand Up @@ -105,4 +107,37 @@
};
};

&code_mram_cm33 {
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

boot_partition: partition@0 {
label = "mcuboot";
reg = <0x0 DT_SIZE_K(44)>;
};

slot0_partition: partition@b000 {
label = "image-0";
reg = <0xb000 DT_SIZE_K(98)>;
};

slot1_partition: partition@23800 {
label = "image-1";
reg = <0x23800 DT_SIZE_K(98)>;
};

scratch_partition: partition@3c000 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need the scratch partition unless you are using swap-using-scratch, which is not recommended.
https://docs.mcuboot.com/design.html#image-slots

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MCUboot defaults to SWAP_USING_OFFSET in Zephyr

default MCUBOOT_BOOTLOADER_MODE_SWAP_USING_OFFSET

label = "image-scratch";
reg = <0x3c000 DT_SIZE_K(8)>;
};

storage_partition: partition@3e000 {
label = "storage";
reg = <0x3e000 DT_SIZE_K(8)>;
};
};
};

pmod_sd_shield: &sdhc0 {};
35 changes: 35 additions & 0 deletions boards/renesas/ek_ra8p1/ek_ra8p1_r7ka8p1kflcac_cm85.dts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
chosen {
zephyr,sram = &sram0;
zephyr,flash = &code_mram_cm85;
zephyr,flash-controller = &mram_ctrl;
zephyr,code-partition = &slot0_partition;
zephyr,console = &uart8;
zephyr,shell-uart = &uart8;
};
Expand Down Expand Up @@ -130,6 +132,39 @@
burst-transfer = <256>;
};

&code_mram_cm85 {
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

boot_partition: partition@0 {
label = "mcuboot";
reg = <0x0 DT_SIZE_K(64)>;
};

slot0_partition: partition@10000 {
label = "image-0";
reg = <0x10000 DT_SIZE_K(272)>;
};

slot1_partition: partition@54000 {
label = "image-1";
reg = <0x54000 DT_SIZE_K(272)>;
};

scratch_partition: partition@98000 {
label = "image-scratch";
reg = <0x98000 DT_SIZE_K(16)>;
};

storage_partition: partition@9c000 {
label = "storage";
reg = <0x9c000 DT_SIZE_K(16)>;
};
};
};

zephyr_lcdif: &lcdif {};

pmod_sd_shield: &sdhc0 {};
Expand Down
35 changes: 35 additions & 0 deletions boards/renesas/mck_ra8t2/mck_ra8t2_r7ka8t2lfecac_cm85.dts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
chosen {
zephyr,sram = &sram0;
zephyr,flash = &code_mram_cm85;
zephyr,flash-controller = &mram_ctrl;
zephyr,code-partition = &slot0_partition;
zephyr,console = &uart9;
zephyr,shell-uart = &uart9;
};
Expand Down Expand Up @@ -91,3 +93,36 @@
status = "okay";
};
};

&code_mram_cm85 {
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

boot_partition: partition@0 {
label = "mcuboot";
reg = <0x0 DT_SIZE_K(64)>;
};

slot0_partition: partition@10000 {
label = "image-0";
reg = <0x10000 DT_SIZE_K(448)>;
};

slot1_partition: partition@80000 {
label = "image-1";
reg = <0x80000 DT_SIZE_K(448)>;
};

scratch_partition: partition@f0000 {
label = "image-scratch";
reg = <0xf0000 DT_SIZE_K(32)>;
};

storage_partition: partition@f8000 {
label = "storage";
reg = <0xf8000 DT_SIZE_K(32)>;
};
};
};
2 changes: 1 addition & 1 deletion dts/arm/renesas/ra/ra8/ra8x2.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
status = "okay";
};

mram: mram-controller@4013c000 {
mram_ctrl: mram-controller@4013c000 {
compatible = "renesas,ra-mram-controller";
reg = <0x4013c000 0x4000>;
#address-cells = <1>;
Expand Down
1 change: 1 addition & 0 deletions soc/renesas/ra/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ rsource "*/Kconfig"

config SOC_RA_ENABLE_START_SECOND_CORE
bool "Allows the primary core to start the secondary core"
depends on !BOOTLOADER_MCUBOOT
depends on (SOC_SERIES_RA8P1 && CPU_CORTEX_M85)
select SOC_LATE_INIT_HOOK
help
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ manifest:
- hal
- name: hal_renesas
path: modules/hal/renesas
revision: bbfc2e605ddd5838924565c76320fb39a66cff89
revision: pull/159/head
groups:
- hal
- name: hal_rpi_pico
Expand Down
Loading