micropython · mbedNoobNinja · Jan 25, 2023
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
@@ -16,48 +16,16 @@ endif
 # If the build directory is not given, make it reflect the board name.
 BUILD ?= build-$(BOARD)
 
-ifeq ($(BOARD),RA4M1_CLICKER)
-BOARD_LOW = ra4m1_ek
-CMSIS_MCU_LOW = ra4m1
-CMSIS_MCU_CAP = RA4M1
-USE_FSP_LPM = 0
-endif
-
-ifeq ($(BOARD),RA4M1_EK)
-BOARD_LOW = ra4m1_ek
-CMSIS_MCU_LOW = ra4m1
-CMSIS_MCU_CAP = RA4M1
-USE_FSP_LPM = 0
-endif
-
-ifeq ($(BOARD),RA4W1_EK)
-BOARD_LOW = ra4w1_ek
-CMSIS_MCU_LOW = ra4w1
-CMSIS_MCU_CAP = RA4W1
-USE_FSP_LPM = 1
-endif
-
-ifeq ($(BOARD),RA6M1_EK)
-BOARD_LOW = ra6m1_ek
-CMSIS_MCU_LOW = ra6m1
-CMSIS_MCU_CAP = RA6M1
-USE_FSP_LPM = 1
-endif
-
-ifeq ($(BOARD),RA6M2_EK)
-BOARD_LOW = ra6m2_ek
-CMSIS_MCU_LOW = ra6m2
-CMSIS_MCU_CAP = RA6M2
-USE_FSP_LPM = 1
-endif
-
 # select use wrapper function of FSP library
 USE_FSP_FLASH = 1
 
 include ../../py/mkenv.mk
 -include mpconfigport.mk
 include $(BOARD_DIR)/mpconfigboard.mk
 
+USE_FSP_LPM ?= 1
+FSP_BOARD_NAME ?= $(shell echo $(BOARD) | tr '[:upper:]' '[:lower:]')
+
 # Files that are generated and needed before the QSTR build.
 #QSTR_GENERATED_HEADERS = $(BUILD)/pins_qstr.h $(BUILD)/modstm_qstr.h
 QSTR_GENERATED_HEADERS = $(BUILD)/pins_qstr.h
@@ -109,6 +77,7 @@ INC += -Idebug
 
 CFLAGS += -D$(CMSIS_MCU)
 CFLAGS += -DRA_HAL_H='<$(CMSIS_MCU)_hal.h>'
+CFLAGS += -DRA_CFG_H='<$(FSP_BOARD_NAME)_conf.h>'
 
 # Basic Cortex-M flags
 CFLAGS_CORTEX_M = -mthumb
@@ -312,6 +281,7 @@ SRC_C += \
 	gccollect.c \
 	help.c \
 	machine_adc.c \
+	machine_dac.c \
 	machine_i2c.c \
 	machine_spi.c \
 	machine_uart.c \
@@ -343,10 +313,13 @@ SRC_O += \
 SRC_O += \
 	shared/runtime/gchelper_thumb2.o
 
-HAL_SRC_C += $(addprefix $(HAL_DIR)/ra/board/$(BOARD_LOW)/,\
+FSP_BOARD_DIR = $(HAL_DIR)/ra/board/$(FSP_BOARD_NAME)
+ifneq ($(wildcard $(TOP)/$(FSP_BOARD_DIR)/.),)
+HAL_SRC_C += $(addprefix $(FSP_BOARD_DIR)/,\
 	board_init.c \
 	board_leds.c \
 	)
+endif
 
 HAL_SRC_C += $(addprefix $(HAL_DIR)/ra/fsp/src/bsp/mcu/all/,\
 	bsp_clocks.c \
@@ -388,6 +361,7 @@ endif
 ifeq ($(CMSIS_MCU),$(filter $(CMSIS_MCU),RA4M1 RA4W1 RA6M1 RA6M2))
 HAL_SRC_C += $(addprefix ra/,\
 	ra_adc.c \
+	ra_dac.c \
 	ra_flash.c \
 	ra_gpio.c \
 	ra_i2c.c \
@@ -398,6 +372,7 @@ HAL_SRC_C += $(addprefix ra/,\
 	ra_sci.c \
 	ra_spi.c \
 	ra_timer.c \
+	ra_gpt.c \
 	ra_utils.c \
 	)
 

diff --git a/ports/renesas-ra/RA4M1_hal.h b/ports/renesas-ra/RA4M1_hal.h
@@ -56,8 +56,10 @@
 
 #include "ra_config.h"
 #include "ra_adc.h"
+#include "ra_dac.h"
 #include "ra_flash.h"
 #include "ra_gpio.h"
+#include "ra_gpt.h"
 #include "ra_i2c.h"
 #include "ra_icu.h"
 #include "ra_init.h"

diff --git a/ports/renesas-ra/RA4W1_hal.h b/ports/renesas-ra/RA4W1_hal.h
@@ -2,6 +2,7 @@
  * The MIT License (MIT)
  *
  * Copyright (c) 2021 Renesas Electronics Corporation
+ * Copyright (c) 2023 Vekatech Ltd.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -31,6 +32,9 @@
 // #include "hal_data.h"
 #include "bsp_api.h"
 #include "common_data.h"
+#if defined(USE_DBG_PRINT)
+#include RA_CFG_H
+#endif
 
 #define SCI_CH      0
 #define SCI_BAUD    115200
@@ -56,8 +60,10 @@
 
 #include "ra_config.h"
 #include "ra_adc.h"
+#include "ra_dac.h"
 #include "ra_flash.h"
 #include "ra_gpio.h"
+#include "ra_gpt.h"
 #include "ra_i2c.h"
 #include "ra_icu.h"
 #include "ra_init.h"
@@ -82,16 +88,16 @@ typedef enum {
 #define DEBUG_CH SCI_CH
 #endif
 #if (DEBUG_CH == 0)
-#define DEBUG_TX_PIN    P411
-#define DEBUG_RX_PIN    P410
+#define DEBUG_TX_PIN    DBG_TX0
+#define DEBUG_RX_PIN    DBG_RX0
 #endif
 #if (DEBUG_CH == 1)
-#define DEBUG_TX_PIN    P401
-#define DEBUG_RX_PIN    P402
+#define DEBUG_TX_PIN    DBG_TX1
+#define DEBUG_RX_PIN    DBG_RX1
 #endif
 #if (DEBUG_CH == 9)
-#define DEBUG_TX_PIN    P203
-#define DEBUG_RX_PIN    P202
+#define DEBUG_TX_PIN    DBG_TX9
+#define DEBUG_RX_PIN    DBG_RX9
 #endif
 #define DEBUG_TXSTR(s)  ra_sci_tx_str(DEBUG_CH, (unsigned char *)s)
 #define DEBUG_TXCH(c)   ra_sci_tx_ch(DEBUG_CH, c)

diff --git a/ports/renesas-ra/RA6M1_hal.h b/ports/renesas-ra/RA6M1_hal.h
@@ -56,8 +56,10 @@
 
 #include "ra_config.h"
 #include "ra_adc.h"
+#include "ra_dac.h"
 #include "ra_flash.h"
 #include "ra_gpio.h"
+#include "ra_gpt.h"
 #include "ra_i2c.h"
 #include "ra_icu.h"
 #include "ra_init.h"

diff --git a/ports/renesas-ra/RA6M2_hal.h b/ports/renesas-ra/RA6M2_hal.h
@@ -56,8 +56,10 @@
 
 #include "ra_config.h"
 #include "ra_adc.h"
+#include "ra_dac.h"
 #include "ra_flash.h"
 #include "ra_gpio.h"
+#include "ra_gpt.h"
 #include "ra_i2c.h"
 #include "ra_icu.h"
 #include "ra_init.h"

diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.mk b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.mk
@@ -4,6 +4,7 @@ LD_FILES = boards/RA4M1_CLICKER/ra4m1_clicker.ld
 
 # MicroPython settings
 MICROPY_VFS_FAT = 1
+USE_FSP_LPM = 0
 
 # Don't include default frozen modules because MCU is tight on flash space
 FROZEN_MANIFEST ?= boards/RA4M1_CLICKER/manifest.py
diff --git a/ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.mk b/ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.mk
@@ -4,6 +4,7 @@ LD_FILES = boards/RA4M1_EK/ra4m1_ek.ld
 
 # MicroPython settings
 MICROPY_VFS_FAT = 1
+USE_FSP_LPM = 0
 
 # Don't include default frozen modules because MCU is tight on flash space
 FROZEN_MANIFEST ?= boards/RA4M1_EK/manifest.py
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek_conf.h b/ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek_conf.h
@@ -27,4 +27,13 @@
 
 #define DEBUG_CH    0
 
+#define DBG_TX0     P411
+#define DBG_RX0     P410
+
+#define DBG_TX1     P401
+#define DBG_RX1     P402
+
+#define DBG_TX9     P203
+#define DBG_RX9     P202
+
 #endif /* RA4M1_EK_CONF_H */