From 5f3a6af91cbbb4e0a63c5fa6828cc2bd56ac5415 Mon Sep 17 00:00:00 2001
From: TOKITA Hiroshi <tokita.hiroshi@gmail.com>
Date: Sat, 23 Oct 2021 01:06:46 -0700
Subject: [PATCH] modules: Add Configurations for GD32VF103

Add configuration for GD32VF103 SoC.

- Add compiler definition HXTAL_VALUE for compile GigaDevice's HAL.
- Redefine gd32_cmsis_dir for source commonize.

Signed-off-by: TOKITA Hiroshi <tokita.hiroshi@gmail.com>
---
 modules/hal_gigadevice/CMakeLists.txt | 22 +++++++++++++++++---
 modules/hal_gigadevice/Kconfig        | 30 +++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/modules/hal_gigadevice/CMakeLists.txt b/modules/hal_gigadevice/CMakeLists.txt
index eb929e8aa74..488da7648f9 100644
--- a/modules/hal_gigadevice/CMakeLists.txt
+++ b/modules/hal_gigadevice/CMakeLists.txt
@@ -6,7 +6,13 @@ if(CONFIG_HAS_GD32_HAL)
 string(TOUPPER ${CONFIG_SOC} gd32_soc_uc)
 
 set(gd32_soc_dir     ${ZEPHYR_HAL_GIGADEVICE_MODULE_DIR}/${CONFIG_SOC_SERIES})
-set(gd32_cmsis_dir   ${gd32_soc_dir}/cmsis/gd/${CONFIG_SOC_SERIES})
+if(CONFIG_SOC_FAMILY_GD32_ARM)
+  set(gd32_soc_sys_dir   ${gd32_soc_dir}/cmsis/gd/${CONFIG_SOC_SERIES})
+elseif(CONFIG_SOC_SERIES_GD32VF103)
+  set(gd32_soc_sys_dir   ${gd32_soc_dir}/riscv)
+  zephyr_include_directories(${gd32_soc_dir}/riscv/drivers)
+endif()
+
 set(gd32_std_dir     ${gd32_soc_dir}/standard_peripheral)
 set(gd32_std_src_dir ${gd32_std_dir}/source)
 
@@ -14,12 +20,22 @@ zephyr_library_named(hal_gigadevice)
 
 zephyr_compile_definitions(${gd32_soc_uc})
 
+# The header files of GigaDevice firmware are reference HXTAL_VALUE.
+# The HXTAL_VALUE has the possibility of being referenced from any files
+# via that header files.
+# Therefore, we need to define HXTAL_VALUE for all compilations.
+if(${CONFIG_GD32_HXTAL_8MHZ})
+  zephyr_compile_definitions(HXTAL_VALUE=8000000 HXTAL_VALUE_25M=8000000)
+elseif(${CONFIG_GD32_HXTAL_25MHZ})
+  zephyr_compile_definitions(HXTAL_VALUE=25000000 HXTAL_VALUE_8M=25000000)
+endif()
+
 # Global includes to be used outside hal_gigadevice
-zephyr_include_directories(${gd32_cmsis_dir}/include)
+zephyr_include_directories(${gd32_soc_sys_dir}/include)
 zephyr_include_directories(${gd32_std_dir}/include)
 zephyr_include_directories(${ZEPHYR_HAL_GIGADEVICE_MODULE_DIR}/include)
 
-zephyr_library_sources(${gd32_cmsis_dir}/source/system_${CONFIG_SOC_SERIES}.c)
+zephyr_library_sources(${gd32_soc_sys_dir}/source/system_${CONFIG_SOC_SERIES}.c)
 
 zephyr_library_sources_ifdef(CONFIG_USE_GD32_ADC    ${gd32_std_src_dir}/${CONFIG_SOC_SERIES}_adc.c)
 zephyr_library_sources_ifdef(CONFIG_USE_GD32_BKP    ${gd32_std_src_dir}/${CONFIG_SOC_SERIES}_bkp.c)
diff --git a/modules/hal_gigadevice/Kconfig b/modules/hal_gigadevice/Kconfig
index 80b81926740..41f7f8facb3 100644
--- a/modules/hal_gigadevice/Kconfig
+++ b/modules/hal_gigadevice/Kconfig
@@ -20,6 +20,36 @@ config HAS_GD32_HAL
 
 if HAS_GD32_HAL
 
+choice GD32_HXTAL_FREQUENCY
+	prompt "High speed external oscillator clock frequency"
+	default GD32_HXTAL_FIRMWARE_DEFINED if !SOC_SERIES_GD32VF103
+	default GD32_HXTAL_25MHZ if SOC_SERIES_GD32VF103
+	help
+	  Define value of high speed crystal oscillator (HXTAL) in Hz
+	  This value sets the frequency of the oscillator.
+
+config GD32_HXTAL_FIRMWARE_DEFINED
+	bool "Firmware defined"
+	depends on !SOC_SERIES_GD32VF103
+	help
+	  Use default frequency defined in firmware for HXTAL
+	  This is using for SoCs (e.g. gd32f4xx, gd32f3x0, etc ...)
+	  that have default HXTAL definitions in firmware.
+
+config GD32_HXTAL_8MHZ
+	bool "8MHz"
+	depends on SOC_SERIES_GD32VF103
+	help
+	  Use 8MHz oscillator for HXTAL
+
+config GD32_HXTAL_25MHZ
+	bool "25MHz"
+	depends on SOC_SERIES_GD32VF103
+	help
+	  Use 25MHz oscillator for HXTAL
+
+endchoice
+
 config USE_GD32_ADC
 	bool
 	help