diff --git a/bsp/renesas/ra6m3-ek/board/lvgl/lv_port_disp.c b/bsp/renesas/ra6m3-ek/board/lvgl/lv_port_disp.c
index ed55596715..15ed301098 100644
--- a/bsp/renesas/ra6m3-ek/board/lvgl/lv_port_disp.c
+++ b/bsp/renesas/ra6m3-ek/board/lvgl/lv_port_disp.c
@@ -14,7 +14,7 @@
#include "lv_port_gpu.h"
#endif
-#ifdef BSP_USING_SPI_LCD
+#ifdef PKG_USING_ILI9341
#include "lcd_ili9341.h"
#else
#include "lcd_port.h"
@@ -48,7 +48,7 @@ static void color_to16_maybe(lv_color16_t *dst, lv_color_t *src)
static void disp_flush(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p)
{
-#ifdef BSP_USING_SPI_LCD
+#ifdef PKG_USING_ILI9341
lcd_fill_array_spi(area->x1, area->y1, area->x2, area->y2, color_p);
#elif DLG_LVGL_USE_GPU_RA6M3
lv_port_gpu_flush();
@@ -100,7 +100,7 @@ static void disp_flush(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_
void lv_port_disp_init(void)
{
-#ifdef BSP_USING_SPI_LCD
+#ifdef PKG_USING_ILI9341
spi_lcd_init(20);
#else
static rt_device_t device;
diff --git a/bsp/renesas/ra6m3-ek/buildinfo.gpdsc b/bsp/renesas/ra6m3-ek/buildinfo.gpdsc
index 1e4223b52e..75232d3a70 100644
--- a/bsp/renesas/ra6m3-ek/buildinfo.gpdsc
+++ b/bsp/renesas/ra6m3-ek/buildinfo.gpdsc
@@ -58,13 +58,11 @@
-
-
@@ -124,7 +122,6 @@
-
diff --git a/bsp/renesas/ra6m4-cpk/board/lvgl/lv_port_disp.c b/bsp/renesas/ra6m4-cpk/board/lvgl/lv_port_disp.c
index 3ed47e59c8..625f6de5cb 100644
--- a/bsp/renesas/ra6m4-cpk/board/lvgl/lv_port_disp.c
+++ b/bsp/renesas/ra6m4-cpk/board/lvgl/lv_port_disp.c
@@ -10,7 +10,7 @@
#include
#include "hal_data.h"
-#ifdef BSP_USING_SPI_LCD
+#ifdef PKG_USING_ILI9341
#include "lcd_ili9341.h"
#endif
@@ -29,7 +29,7 @@ static lv_color_t buf_2[COLOR_BUFFER];
static void disp_flush(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_t *color_p)
{
-#ifdef BSP_USING_SPI_LCD
+#ifdef PKG_USING_ILI9341
lcd_fill_array_spi(area->x1, area->y1, area->x2, area->y2, color_p);
#endif
lv_disp_flush_ready(disp_drv);
@@ -37,7 +37,7 @@ static void disp_flush(lv_disp_drv_t *disp_drv, const lv_area_t *area, lv_color_
void lv_port_disp_init(void)
{
-#ifdef BSP_USING_SPI_LCD
+#ifdef PKG_USING_ILI9341
spi_lcd_init(20);
#endif
/*Initialize `disp_buf` with the buffer(s). With only one buffer use NULL instead buf_2 */
diff --git a/bsp/renesas/ra6m4-cpk/buildinfo.gpdsc b/bsp/renesas/ra6m4-cpk/buildinfo.gpdsc
index f0fab019bd..ed18fa2506 100644
--- a/bsp/renesas/ra6m4-cpk/buildinfo.gpdsc
+++ b/bsp/renesas/ra6m4-cpk/buildinfo.gpdsc
@@ -57,56 +57,73 @@
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
@@ -114,15 +131,16 @@
-
+
+
diff --git a/bsp/renesas/ra6m4-cpk/configuration.xml b/bsp/renesas/ra6m4-cpk/configuration.xml
index 8c62a55178..fbde369a97 100644
--- a/bsp/renesas/ra6m4-cpk/configuration.xml
+++ b/bsp/renesas/ra6m4-cpk/configuration.xml
@@ -1,7 +1,7 @@
-
+
@@ -170,6 +170,14 @@
External Interrupt
Renesas.RA.3.5.0.pack
+
+ Data Transfer Controller
+ Renesas.RA.3.5.0.pack
+
+
+ Serial Peripheral Interface
+ Renesas.RA.3.5.0.pack
+
@@ -217,10 +225,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -228,12 +293,21 @@
+
+
+
+
+
+
+
+
+
@@ -407,8 +481,6 @@
-
-
@@ -469,7 +541,6 @@
-
diff --git a/bsp/renesas/ra6m4-cpk/ra_cfg/fsp_cfg/bsp/board_cfg.h b/bsp/renesas/ra6m4-cpk/ra_cfg/fsp_cfg/bsp/board_cfg.h
new file mode 100644
index 0000000000..a2094445ae
--- /dev/null
+++ b/bsp/renesas/ra6m4-cpk/ra_cfg/fsp_cfg/bsp/board_cfg.h
@@ -0,0 +1,5 @@
+/* generated configuration header file - do not edit */
+#ifndef BOARD_CFG_H_
+#define BOARD_CFG_H_
+#include "../../../ra/board/ra6m4_cpk/board.h"
+#endif /* BOARD_CFG_H_ */
diff --git a/bsp/renesas/ra6m4-cpk/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/bsp/renesas/ra6m4-cpk/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
index aeb3060418..48c4b5099e 100644
--- a/bsp/renesas/ra6m4-cpk/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
+++ b/bsp/renesas/ra6m4-cpk/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
@@ -3,6 +3,7 @@
#define BSP_CFG_H_
#include "bsp_clock_cfg.h"
#include "bsp_mcu_family_cfg.h"
+ #include "board_cfg.h"
#define RA_NOT_DEFINED 0
#ifndef BSP_CFG_RTOS
#if (RA_NOT_DEFINED) != (RA_NOT_DEFINED)
diff --git a/bsp/renesas/ra6m4-cpk/ra_gen/pin_data.c b/bsp/renesas/ra6m4-cpk/ra_gen/pin_data.c
index f97d4a86a8..9885f407a0 100644
--- a/bsp/renesas/ra6m4-cpk/ra_gen/pin_data.c
+++ b/bsp/renesas/ra6m4-cpk/ra_gen/pin_data.c
@@ -76,10 +76,6 @@ const ioport_pin_cfg_t g_bsp_pin_cfg_data[] = {
.pin = BSP_IO_PORT_02_PIN_04,
.pin_cfg = ((uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_SPI)
},
- {
- .pin = BSP_IO_PORT_02_PIN_05,
- .pin_cfg = ((uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_SPI)
- },
{
.pin = BSP_IO_PORT_03_PIN_00,
.pin_cfg = ((uint32_t) IOPORT_CFG_PERIPHERAL_PIN | (uint32_t) IOPORT_PERIPHERAL_DEBUG)
diff --git a/bsp/renesas/ra6m4-cpk/template.uvoptx b/bsp/renesas/ra6m4-cpk/template.uvoptx
index 853ddaf732..544a3fc739 100644
--- a/bsp/renesas/ra6m4-cpk/template.uvoptx
+++ b/bsp/renesas/ra6m4-cpk/template.uvoptx
@@ -89,7 +89,7 @@
1
1
1
- 0
+ 1
1
1
1
@@ -117,6 +117,11 @@
Segger\JL2CM3.dll
+
+ 0
+ UL2V8M
+ UL2V8M(-S0 -C0 -P0 -FD20000000 -FC2000 -FN3 -FF0RA6M4_1M -FS00 -FL0100000 -FF1RA6M4_DATA_C1M -FS18000000 -FL12000 -FF2RA6M4_CONF -FS2100A000 -FL2300 -FP0($$Device:R7FA6M4AF$Flash\RA6M4_1M.FLM) -FP1($$Device:R7FA6M4AF$Flash\RA6M4_DATA_C1M.FLM) -FP2($$Device:R7FA6M4AF$Flash\RA6M4_CONF.FLM))
+
0
JL2CM3
diff --git a/bsp/renesas/ra6m4-cpk/template.uvprojx b/bsp/renesas/ra6m4-cpk/template.uvprojx
index 18fd1fb763..e95b98f89c 100644
--- a/bsp/renesas/ra6m4-cpk/template.uvprojx
+++ b/bsp/renesas/ra6m4-cpk/template.uvprojx
@@ -14,14 +14,14 @@
1
- R7FA6M4AF3CFB
+ R7FA6M4AF
Renesas
- Renesas.RA_DFP.3.1.0
+ Renesas.RA_DFP.4.2.0
https://www2.renesas.eu/Keil_MDK_Packs/
- CPUTYPE("Cortex-M33") FPU3(SFPU) DSP TZ CLOCK(12000000) ELITTLE
+ IRAM(0x20000000,0x040000) IROM(0x00000000,0x100000) CPUTYPE("Cortex-M33") FPU3(SFPU) DSP TZ CLOCK(12000000) ELITTLE
-
+ UL2V8M(-S0 -C0 -P0 -FD20000000 -FC2000 -FN3 -FF0RA6M4_1M -FS00 -FL0100000 -FF1RA6M4_DATA_C1M -FS18000000 -FL12000 -FF2RA6M4_CONF -FS2100A000 -FL2300 -FP0($$Device:R7FA6M4AF$Flash\RA6M4_1M.FLM) -FP1($$Device:R7FA6M4AF$Flash\RA6M4_DATA_C1M.FLM) -FP2($$Device:R7FA6M4AF$Flash\RA6M4_CONF.FLM))
0
@@ -33,7 +33,7 @@
- $$Device:R7FA6M4AF3CFB$SVD\R7FA6M4AF.svd
+ $$Device:R7FA6M4AF$SVD\R7FA6M4AF.svd
0
0
@@ -113,10 +113,10 @@
- SARMCM3.DLL
+ SARMV8M.DLL
-MPU
TCM.DLL
- -pCM4
+ -pCM33
@@ -132,12 +132,12 @@
0
1
0
- 0
+ 1
1
- -1
+ 4102
1
-
+ BIN\UL2V8M.DLL
"" ()
@@ -179,8 +179,8 @@
0
0
0
- 0
- 0
+ 1
+ 1
0
0
2
@@ -188,13 +188,13 @@
0
0
0
- 0
+ 8
1
0
0
0
- 0
- 0
+ 3
+ 3
0
0
0
@@ -205,12 +205,12 @@
0
0
0
- 0
+ 1
0
0
0
0
- 0
+ 1
0
@@ -245,13 +245,13 @@
0
- 0x0
- 0x0
+ 0x20000000
+ 0x40000
- 0
+ 1
0x0
- 0x0
+ 0x100000
0
@@ -276,7 +276,7 @@
1
0x0
- 0x0
+ 0x100000
1
@@ -300,8 +300,8 @@
0
- 0x0
- 0x0
+ 0x20000000
+ 0x40000
0
@@ -408,7 +408,7 @@
-
+