diff --git a/boards/renesas/ek_ra8p1/ek_ra8p1_r7ka8p1kflcac_cm33.dts b/boards/renesas/ek_ra8p1/ek_ra8p1_r7ka8p1kflcac_cm33.dts index 2a3ef5e9a1a6e..9fb17712a4753 100644 --- a/boards/renesas/ek_ra8p1/ek_ra8p1_r7ka8p1kflcac_cm33.dts +++ b/boards/renesas/ek_ra8p1/ek_ra8p1_r7ka8p1kflcac_cm33.dts @@ -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; }; @@ -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 { + 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 {}; diff --git a/boards/renesas/ek_ra8p1/ek_ra8p1_r7ka8p1kflcac_cm85.dts b/boards/renesas/ek_ra8p1/ek_ra8p1_r7ka8p1kflcac_cm85.dts index 8b2508aab3101..e5c6516704ee1 100644 --- a/boards/renesas/ek_ra8p1/ek_ra8p1_r7ka8p1kflcac_cm85.dts +++ b/boards/renesas/ek_ra8p1/ek_ra8p1_r7ka8p1kflcac_cm85.dts @@ -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; }; @@ -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 {}; diff --git a/boards/renesas/mck_ra8t2/mck_ra8t2_r7ka8t2lfecac_cm85.dts b/boards/renesas/mck_ra8t2/mck_ra8t2_r7ka8t2lfecac_cm85.dts index 0452cd712d686..b03069b37c8e3 100644 --- a/boards/renesas/mck_ra8t2/mck_ra8t2_r7ka8t2lfecac_cm85.dts +++ b/boards/renesas/mck_ra8t2/mck_ra8t2_r7ka8t2lfecac_cm85.dts @@ -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; }; @@ -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)>; + }; + }; +}; diff --git a/dts/arm/renesas/ra/ra8/ra8x2.dtsi b/dts/arm/renesas/ra/ra8/ra8x2.dtsi index 4cd7145f9e1f3..fde16b35ee32c 100644 --- a/dts/arm/renesas/ra/ra8/ra8x2.dtsi +++ b/dts/arm/renesas/ra/ra8/ra8x2.dtsi @@ -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>; diff --git a/soc/renesas/ra/Kconfig b/soc/renesas/ra/Kconfig index 792981ba5b575..aff411a9fc11d 100644 --- a/soc/renesas/ra/Kconfig +++ b/soc/renesas/ra/Kconfig @@ -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 diff --git a/tests/drivers/flash/common/boards/ek_ra8p1_r7ka8p1kflcac_cm33.overlay b/tests/drivers/flash/common/boards/ek_ra8p1_r7ka8p1kflcac_cm33.overlay deleted file mode 100644 index 00535b53a46e2..0000000000000 --- a/tests/drivers/flash/common/boards/ek_ra8p1_r7ka8p1kflcac_cm33.overlay +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2025 Renesas Electronics Corporation - * SPDX-License-Identifier: Apache-2.0 - */ - -&code_mram_cm33 { - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - storage_partition: partition@48000 { - label = "storage"; - reg = <0x48000 DT_SIZE_K(32)>; - }; - }; -}; diff --git a/tests/drivers/flash/common/boards/ek_ra8p1_r7ka8p1kflcac_cm85.overlay b/tests/drivers/flash/common/boards/ek_ra8p1_r7ka8p1kflcac_cm85.overlay deleted file mode 100644 index b4956f06463dc..0000000000000 --- a/tests/drivers/flash/common/boards/ek_ra8p1_r7ka8p1kflcac_cm85.overlay +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2025 Renesas Electronics Corporation - * SPDX-License-Identifier: Apache-2.0 - */ - -&code_mram_cm85 { - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - storage_partition: partition@98000 { - label = "storage"; - reg = <0x98000 DT_SIZE_K(32)>; - }; - }; -}; diff --git a/tests/drivers/flash/common/boards/mck_ra8t2_r7ka8t2lfecac_cm85.overlay b/tests/drivers/flash/common/boards/mck_ra8t2_r7ka8t2lfecac_cm85.overlay deleted file mode 100644 index b4956f06463dc..0000000000000 --- a/tests/drivers/flash/common/boards/mck_ra8t2_r7ka8t2lfecac_cm85.overlay +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2025 Renesas Electronics Corporation - * SPDX-License-Identifier: Apache-2.0 - */ - -&code_mram_cm85 { - partitions { - compatible = "fixed-partitions"; - #address-cells = <1>; - #size-cells = <1>; - - storage_partition: partition@98000 { - label = "storage"; - reg = <0x98000 DT_SIZE_K(32)>; - }; - }; -}; diff --git a/west.yml b/west.yml index 882a15ba4e733..d7a3dadbd6c04 100644 --- a/west.yml +++ b/west.yml @@ -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