hal: renesas: Add support CR8 core for RZ/V2H

Add support CR8 core for RZ/V2H

Signed-off-by: Tien Nguyen <[email protected]>

Author: tiennguyenzg

drivers/rz/CMakeLists.txt

@@ -16,7 +16,7 @@ set(include_dirs
 
 if(CONFIG_CPU_CORTEX_M)
 	set(CPU cm)
-elseif(CONFIG_CPU_CORTEX_R)
+elseif(CONFIG_CPU_AARCH32_CORTEX_R OR CONFIG_CPU_AARCH64_CORTEX_R)
 	set(CPU cr)
 elseif(CONFIG_CPU_CORTEX_A)
 	set(CPU ca)
@@ -26,6 +26,10 @@ if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/fsp/src/${SOC_SERIES_PREFIX}/bsp/mc
 	list(APPEND include_dirs "fsp/src/${SOC_SERIES_PREFIX}/bsp/mcu/all/${CPU}")
 endif()
 
+if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/fsp/src/${SOC_SERIES_PREFIX}/bsp/mcu/${CONFIG_SOC_SERIES}/${CPU}")
+	list(APPEND include_dirs "fsp/src/${SOC_SERIES_PREFIX}/bsp/mcu/${CONFIG_SOC_SERIES}/${CPU}")
+endif()
+
 zephyr_include_directories(${include_dirs})
 
 # Optional build base on feature configuration

drivers/rz/README

@@ -51,3 +51,10 @@ License:
 
 License Link:
    https://opensource.org/licenses/BSD-3-Clause
+
+Patch List:
+
+   * Change the value of __MPU_PRESENT of core CR8 of V2H from 1 to 1U to avoid macro redefinition
+     Replace the inclusion of cr/cr_compiler.h and cr/core_cr.h with core_cr8.h
+   Impacted files:
+      drivers/rz/fsp/src/rzv/bsp/cmsis/Device/RENESAS/Include/R9A09G057H.h

drivers/rz/fsp/src/rzv/CMakeLists.txt

@@ -5,7 +5,6 @@ set(srcs
 	bsp/mcu/all/bsp_clocks.c
 	bsp/mcu/all/bsp_delay.c
 	bsp/mcu/all/bsp_io.c
-	bsp/mcu/all/cm/bsp_irq.c
 )
 
 zephyr_library_sources(${srcs})

drivers/rz/fsp/src/rzv/bsp/cmsis/Device/RENESAS/Include/R9A09G057H.h

@@ -53,7 +53,7 @@ extern "C" {
 /* ==========================  Configuration of the ARM Cortex-R8 Processor and Core Peripherals  =========================== */
   #define __NVIC_PRIO_BITS          4       /*!< Number of Bits used for Priority Levels                                   */
   #define __Vendor_SysTickConfig    1       /*!< Set to 1 if different SysTick Config is used                              */
-  #define __MPU_PRESENT             1       /*!< MPU present                                                               */
+  #define __MPU_PRESENT             1U      /*!< MPU present                                                               */
   #define __FPU_PRESENT             1       /*!< FPU present                                                               */
   #define __FPU_DP                  0       /*!< Double Precision FPU                                                      */
  #endif
@@ -64,8 +64,7 @@ extern "C" {
   #include "core_cm33.h"               /*!< ARM Cortex-M33 processor and core peripherals                             */
  #endif
  #if defined(BSP_SUPPORT_CORE_CR8)
-  #include "cr/cr_compiler.h"          /*!< Compiler support for Cortex-R                                             */
-  #include "cr/core_cr.h"              /*!< Core setting for Cortex-R                                                 */
+  #include "core_cr8.h"                /*!< Core setting for Cortex-R                                                 */
  #endif
  #include "system.h"                   /*!< R9A09G057H System                                                         */
 

drivers/rz/fsp/src/rzv/bsp/cmsis/Device/RENESAS/Include/R9A09G057H/cr/iodefine.h

@@ -0,0 +1,47 @@
+/*
+* Copyright (c) 2020 - 2024 Renesas Electronics Corporation and/or its affiliates
+*
+* SPDX-License-Identifier: BSD-3-Clause
+*/
+
+/**********************************************************************************************************************
+ * File Name    : iodefine.h
+ * Version      : 1.00
+ * Description  : iodefine header
+ *********************************************************************************************************************/
+
+#ifndef __IODEFINE_HEADER__
+#define __IODEFINE_HEADER__
+
+#include "iodefines/adc_e_iodefine.h"
+#include "iodefines/canfd_iodefine.h"
+#include "iodefines/cmtw_iodefine.h"
+#include "iodefines/cpg_iodefine.h"
+#include "iodefines/crc_iodefine.h"
+#include "iodefines/dmac_b_iodefine.h"
+#include "iodefines/gpio_iodefine.h"
+#include "iodefines/gpt_iodefine.h"
+#include "iodefines/gtm_iodefine.h"
+#include "iodefines/i3c_b_iodefine.h"
+#include "iodefines/intc_iodefine.h"
+#include "iodefines/mhu_iodefine.h"
+#include "iodefines/pdm_iodefine.h"
+#include "iodefines/poeg_iodefine.h"
+#include "iodefines/riic_iodefine.h"
+#include "iodefines/rtc_iodefine.h"
+#include "iodefines/sci_b_iodefine.h"
+#include "iodefines/scifa_iodefine.h"
+#include "iodefines/spi_b_iodefine.h"
+#include "iodefines/spibsc_iodefine.h"
+#include "iodefines/ssi_iodefine.h"
+#include "iodefines/sysc_iodefine.h"
+#include "iodefines/tsu_b_iodefine.h"
+#include "iodefines/tzc_iodefine.h"
+#include "iodefines/wdt_iodefine.h"
+#include "iodefines/xspi_iodefine.h"
+#include "iodefines/cr8/global_timer_iodefine.h"
+#include "iodefines/cr8/intc_gic_iodefine.h"
+#include "iodefines/cr8/private_timer_iodefine.h"
+#include "iodefines/cr8/scu_iodefine.h"
+
+#endif                                 /* __IODEFINE_HEADER__ */