From 77ed9b2030e83fc89e1d912fbfb427443aa36785 Mon Sep 17 00:00:00 2001 From: woody Date: Mon, 15 Jun 2026 13:36:59 +0900 Subject: [PATCH] update --- .../common_family/make/arm/WoodySampleApp.bat | 49 ------- .../woody/make/renesas_woody_rules.mak | 20 +-- .../make/arm/App_Woody_Common_Sample.mak | 132 ++++++++++++++++++ 3 files changed, 142 insertions(+), 59 deletions(-) diff --git a/Src/Gen4_R-Car_MCAL/2_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/V4M/common_family/make/arm/WoodySampleApp.bat b/Src/Gen4_R-Car_MCAL/2_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/V4M/common_family/make/arm/WoodySampleApp.bat index 394a94d2..323ddbc7 100644 --- a/Src/Gen4_R-Car_MCAL/2_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/V4M/common_family/make/arm/WoodySampleApp.bat +++ b/Src/Gen4_R-Car_MCAL/2_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/V4M/common_family/make/arm/WoodySampleApp.bat @@ -286,55 +286,6 @@ REM CALL .\SampleApp.bat Cddipmmu %ARGS% REM CALL .\SampleApp.bat cddrfso %ARGS% CALL .\SampleApp.bat Woody %ARGS% -REM ECHO Cleaning Fls module... -REM cd /d %ROOT_FOLDER%\%MICRO_FAMILY%\modules\fls\sample_application\%MICRO_SUB_VARIANT%\obj\arm && make -f common.mak clean && make -f common.mak clean_all - -REM ECHO Cleaning Dio module... -REM cd /d %ROOT_FOLDER%\%MICRO_FAMILY%\modules\dio\sample_application\%MICRO_SUB_VARIANT%\obj\arm && make -f common.mak clean && make -f common.mak clean_all - -REM ECHO Cleaning Port module... -REM cd /d %ROOT_FOLDER%\%MICRO_FAMILY%\modules\port\sample_application\%MICRO_SUB_VARIANT%\obj\arm && make -f common.mak clean && make -f common.mak clean_all - -REM ECHO Cleaning Mcu module... -REM cd /d %ROOT_FOLDER%\%MICRO_FAMILY%\modules\mcu\sample_application\%MICRO_SUB_VARIANT%\obj\arm && make -f common.mak clean && make -f common.mak clean_all - -REM ECHO Cleaning Gpt module... -REM cd /d %ROOT_FOLDER%\%MICRO_FAMILY%\modules\gpt\sample_application\%MICRO_SUB_VARIANT%\obj\arm && make -f common.mak clean && make -f common.mak clean_all - -REM ECHO Cleaning Wdg module... -REM cd /d %ROOT_FOLDER%\%MICRO_FAMILY%\modules\wdg\sample_application\%MICRO_SUB_VARIANT%\obj\arm && make -f common.mak clean && make -f common.mak clean_all - -REM ECHO Cleaning Spi module... -REM cd /d %ROOT_FOLDER%\%MICRO_FAMILY%\modules\spi\sample_application\%MICRO_SUB_VARIANT%\obj\arm && make -f common.mak clean && make -f common.mak clean_all - -REM ECHO Cleaning Can module... -REM cd /d %ROOT_FOLDER%\%MICRO_FAMILY%\modules\can\sample_application\%MICRO_SUB_VARIANT%\obj\arm && make -f common.mak clean && make -f common.mak clean_all - -REM ECHO Cleaning Eth module... -REM cd /d %ROOT_FOLDER%\%MICRO_FAMILY%\modules\eth\sample_application\%MICRO_SUB_VARIANT%\obj\arm && make -f common.mak clean && make -f common.mak clean_all - -REM ECHO Cleaning Cddiccom module... -REM cd /d %ROOT_FOLDER%\%MICRO_FAMILY%\modules\cddiccom\sample_application\%MICRO_SUB_VARIANT%\obj\arm && make -f common.mak clean && make -f common.mak clean_all - -REM ECHO Cleaning Cddiic module... -REM cd /d %ROOT_FOLDER%\%MICRO_FAMILY%\modules\cddiic\sample_application\%MICRO_SUB_VARIANT%\obj\arm && make -f common.mak clean && make -f common.mak clean_all - -REM ECHO Cleaning Cddcrc module... -REM cd /d %ROOT_FOLDER%\%MICRO_FAMILY%\modules\cddcrc\sample_application\%MICRO_SUB_VARIANT%\obj\arm && make -f common.mak clean && make -f common.mak clean_all - -REM ECHO Cleaning Cddths module... -REM cd /d %ROOT_FOLDER%\%MICRO_FAMILY%\modules\cddths\sample_application\%MICRO_SUB_VARIANT%\obj\arm && make -f common.mak clean && make -f common.mak clean_all - -REM ECHO Cleaning Cddemm module... -REM cd /d %ROOT_FOLDER%\%MICRO_FAMILY%\modules\cddemm\sample_application\%MICRO_SUB_VARIANT%\obj\arm && make -f common.mak clean && make -f common.mak clean_all - -REM ECHO Cleaning Cddipmmu module... -REM cd /d %ROOT_FOLDER%\%MICRO_FAMILY%\modules\cddipmmu\sample_application\%MICRO_SUB_VARIANT%\obj\arm && make -f common.mak clean && make -f common.mak clean_all - -REM ECHO Cleaning cddrfso module... -REM cd /d %ROOT_FOLDER%\%MICRO_FAMILY%\modules\cddrfso\sample_application\%MICRO_SUB_VARIANT%\obj\arm && make -f common.mak clean && make -f common.mak clean_all - - ECHO =========================================================================== ECHO ALL MODULES CLEANED ECHO =========================================================================== diff --git a/Src/Gen4_R-Car_MCAL/2_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/modules/woody/make/renesas_woody_rules.mak b/Src/Gen4_R-Car_MCAL/2_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/modules/woody/make/renesas_woody_rules.mak index 574daac8..a66a0c6e 100644 --- a/Src/Gen4_R-Car_MCAL/2_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/modules/woody/make/renesas_woody_rules.mak +++ b/Src/Gen4_R-Car_MCAL/2_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/modules/woody/make/renesas_woody_rules.mak @@ -6,30 +6,30 @@ LIBRARIES_TO_BUILD += renesas_WOODYlib ifeq ($(MICRO_SUB_VARIANT), S4) renesas_WOODYlib_FILES = \ - $(WOODY_MODULE_CORE_PATH)\src\WOODY.c \ - $(WOODY_MODULE_CORE_PATH)\src\WOODY_Version.c + $(WOODY_MODULE_CORE_PATH)\src\Woody.c \ + $(WOODY_MODULE_CORE_PATH)\src\Woody_Version.c CC_FILES_TO_BUILD += \ - $(WOODY_MODULE_CORE_PATH)\src\WOODY.c \ - $(WOODY_MODULE_CORE_PATH)\src\WOODY_Version.c + $(WOODY_MODULE_CORE_PATH)\src\Woody.c \ + $(WOODY_MODULE_CORE_PATH)\src\Woody_Version.c else renesas_WOODYlib_FILES = \ - $(WOODY_MODULE_CORE_PATH)\src\WOODY.c \ - $(WOODY_MODULE_CORE_PATH)\src\WOODY_Version.c + $(WOODY_MODULE_CORE_PATH)\src\Woody.c \ + $(WOODY_MODULE_CORE_PATH)\src\Woody_Version.c CC_FILES_TO_BUILD += \ - $(WOODY_MODULE_CORE_PATH)\src\WOODY.c \ - $(WOODY_MODULE_CORE_PATH)\src\WOODY_Version.c + $(WOODY_MODULE_CORE_PATH)\src\Woody.c \ + $(WOODY_MODULE_CORE_PATH)\src\Woody_Version.c endif OBJECTS_LINK_ONLY += ifeq ($(WOODY_MODULE_DBASE_REQ),yes) #GENERATED_SOURCE_FILES += \ -# $(WOODY_MODULE_PROJECT_PATH)\src\WOODY_PBcfg.c \ -# $(WOODY_MODULE_PROJECT_PATH)\src\WOODY_Lcfg.c +# $(WOODY_MODULE_PROJECT_PATH)\src\Woody_PBcfg.c \ +# $(WOODY_MODULE_PROJECT_PATH)\src\Woody_Lcfg.c endif MAKE_CLEAN_RULES += WOODY_clean_generated_files diff --git a/Src/Gen4_R-Car_MCAL/2_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/modules/woody/sample_application/make/arm/App_Woody_Common_Sample.mak b/Src/Gen4_R-Car_MCAL/2_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/modules/woody/sample_application/make/arm/App_Woody_Common_Sample.mak index a133a9a2..7870af94 100644 --- a/Src/Gen4_R-Car_MCAL/2_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/modules/woody/sample_application/make/arm/App_Woody_Common_Sample.mak +++ b/Src/Gen4_R-Car_MCAL/2_Trunk/MCAL-v4m-1_19.0.11.D_release/rel/modules/woody/sample_application/make/arm/App_Woody_Common_Sample.mak @@ -93,6 +93,138 @@ include $(MODULE_CORE_PATH)\make\renesas_$(MODULE_NAME)_defs.mak include $(MODULE_CORE_PATH)\make\renesas_$(MODULE_NAME)_check.mak include $(MODULE_CORE_PATH)\make\renesas_$(MODULE_NAME)_rules.mak +################################################################################ +# MCAL Modules Integration +################################################################################ + +# ################################################################################ +# # Fls Module +# # +# FLS_CORE_PATH = $(PROJECT_ROOT)\$(MICRO_FAMILY)\modules\fls +# include $(FLS_CORE_PATH)\make\renesas_fls_defs.mak +# include $(FLS_CORE_PATH)\make\renesas_fls_check.mak +# include $(FLS_CORE_PATH)\make\renesas_fls_rules.mak + +# ################################################################################ +# # Dio Module +# # +# DIO_CORE_PATH = $(PROJECT_ROOT)\$(MICRO_FAMILY)\modules\dio +# include $(DIO_CORE_PATH)\make\renesas_dio_defs.mak +# include $(DIO_CORE_PATH)\make\renesas_dio_check.mak +# include $(DIO_CORE_PATH)\make\renesas_dio_rules.mak + +# ################################################################################ +# # Port Module +# # +# PORT_CORE_PATH = $(PROJECT_ROOT)\$(MICRO_FAMILY)\modules\port +# include $(PORT_CORE_PATH)\make\renesas_port_defs.mak +# include $(PORT_CORE_PATH)\make\renesas_port_check.mak +# include $(PORT_CORE_PATH)\make\renesas_port_rules.mak + +# ################################################################################ +# # Mcu Module +# # +# MCU_CORE_PATH = $(PROJECT_ROOT)\$(MICRO_FAMILY)\modules\mcu +# include $(MCU_CORE_PATH)\make\renesas_mcu_defs.mak +# include $(MCU_CORE_PATH)\make\renesas_mcu_check.mak +# include $(MCU_CORE_PATH)\make\renesas_mcu_rules.mak + +# ################################################################################ +# # Gpt Module +# # +# GPT_CORE_PATH = $(PROJECT_ROOT)\$(MICRO_FAMILY)\modules\gpt +# include $(GPT_CORE_PATH)\make\renesas_gpt_defs.mak +# include $(GPT_CORE_PATH)\make\renesas_gpt_check.mak +# include $(GPT_CORE_PATH)\make\renesas_gpt_rules.mak + +# ################################################################################ +# # Wdg Module +# # +# WDG_CORE_PATH = $(PROJECT_ROOT)\$(MICRO_FAMILY)\modules\wdg +# include $(WDG_CORE_PATH)\make\renesas_wdg_defs.mak +# include $(WDG_CORE_PATH)\make\renesas_wdg_check.mak +# include $(WDG_CORE_PATH)\make\renesas_wdg_rules.mak + +# ################################################################################ +# # Spi Module +# # +# SPI_CORE_PATH = $(PROJECT_ROOT)\$(MICRO_FAMILY)\modules\spi +# include $(SPI_CORE_PATH)\make\renesas_spi_defs.mak +# include $(SPI_CORE_PATH)\make\renesas_spi_check.mak +# include $(SPI_CORE_PATH)\make\renesas_spi_rules.mak + +# ################################################################################ +# # Can Module +# # +# CAN_CORE_PATH = $(PROJECT_ROOT)\$(MICRO_FAMILY)\modules\can +# include $(CAN_CORE_PATH)\make\renesas_can_defs.mak +# include $(CAN_CORE_PATH)\make\renesas_can_check.mak +# include $(CAN_CORE_PATH)\make\renesas_can_rules.mak + +# ################################################################################ +# # Eth Module +# # +# ETH_CORE_PATH = $(PROJECT_ROOT)\$(MICRO_FAMILY)\modules\eth +# include $(ETH_CORE_PATH)\make\renesas_eth_defs.mak +# include $(ETH_CORE_PATH)\make\renesas_eth_check.mak +# include $(ETH_CORE_PATH)\make\renesas_eth_rules.mak + +# ################################################################################ +# # Cddiccom Module +# # +# CDDICCOM_CORE_PATH = $(PROJECT_ROOT)\$(MICRO_FAMILY)\modules\cddiccom +# include $(CDDICCOM_CORE_PATH)\make\renesas_cddiccom_defs.mak +# include $(CDDICCOM_CORE_PATH)\make\renesas_cddiccom_check.mak +# include $(CDDICCOM_CORE_PATH)\make\renesas_cddiccom_rules.mak + +# ################################################################################ +# # Cddiic Module +# # +# CDDIIC_CORE_PATH = $(PROJECT_ROOT)\$(MICRO_FAMILY)\modules\cddiic +# include $(CDDIIC_CORE_PATH)\make\renesas_cddiic_defs.mak +# include $(CDDIIC_CORE_PATH)\make\renesas_cddiic_check.mak +# include $(CDDIIC_CORE_PATH)\make\renesas_cddiic_rules.mak + +# ################################################################################ +# # Cddcrc Module +# # +# CDDCRC_CORE_PATH = $(PROJECT_ROOT)\$(MICRO_FAMILY)\modules\cddcrc +# include $(CDDCRC_CORE_PATH)\make\renesas_cddcrc_defs.mak +# include $(CDDCRC_CORE_PATH)\make\renesas_cddcrc_check.mak +# include $(CDDCRC_CORE_PATH)\make\renesas_cddcrc_rules.mak + +# ################################################################################ +# # Cddths Module +# # +# CDDTHS_CORE_PATH = $(PROJECT_ROOT)\$(MICRO_FAMILY)\modules\cddths +# include $(CDDTHS_CORE_PATH)\make\renesas_cddths_defs.mak +# include $(CDDTHS_CORE_PATH)\make\renesas_cddths_check.mak +# include $(CDDTHS_CORE_PATH)\make\renesas_cddths_rules.mak + +# ################################################################################ +# # Cddemm Module +# # +# CDDEMM_CORE_PATH = $(PROJECT_ROOT)\$(MICRO_FAMILY)\modules\cddemm +# include $(CDDEMM_CORE_PATH)\make\renesas_cddemm_defs.mak +# include $(CDDEMM_CORE_PATH)\make\renesas_cddemm_check.mak +# include $(CDDEMM_CORE_PATH)\make\renesas_cddemm_rules.mak + +# ################################################################################ +# # Cddipmmu Module +# # +# CDDIPMMU_CORE_PATH = $(PROJECT_ROOT)\$(MICRO_FAMILY)\modules\cddipmmu +# include $(CDDIPMMU_CORE_PATH)\make\renesas_cddipmmu_defs.mak +# include $(CDDIPMMU_CORE_PATH)\make\renesas_cddipmmu_check.mak +# include $(CDDIPMMU_CORE_PATH)\make\renesas_cddipmmu_rules.mak + +# ################################################################################ +# # Cddrfso Module +# # +# CDDRFSO_CORE_PATH = $(PROJECT_ROOT)\$(MICRO_FAMILY)\modules\cddrfso +# include $(CDDRFSO_CORE_PATH)\make\renesas_cddrfso_defs.mak +# include $(CDDRFSO_CORE_PATH)\make\renesas_cddrfso_check.mak +# include $(CDDRFSO_CORE_PATH)\make\renesas_cddrfso_rules.mak + ################################################################################ # Command to generate standalone database # ################################################################################