RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 18:12:46 +01:00
Code Releases Activity

boards/hifive1: use MHZ utility macro for clock frequency

Browse Source
This commit is contained in:
Alexandre Abadie 2020-08-31 10:59:33 +02:00
parent c190426a0e
commit ace160a2a3
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
boards/hifive1/include/periph_conf.h
View File

@ -80,25 +80,25 @@ extern "C" {
#endif #endif
#if CONFIG_USE_CLOCK_HFXOSC_PLL #if CONFIG_USE_CLOCK_HFXOSC_PLL
#define CLOCK_PLL_INPUT_CLOCK (16000000UL) #define CLOCK_PLL_INPUT_CLOCK MHZ(16)
#define CLOCK_PLL_REFR (CLOCK_PLL_INPUT_CLOCK / (CONFIG_CLOCK_PLL_R + 1)) #define CLOCK_PLL_REFR (CLOCK_PLL_INPUT_CLOCK / (CONFIG_CLOCK_PLL_R + 1))
#define CLOCK_PLL_VCO (CLOCK_PLL_REFR * (2 * (CONFIG_CLOCK_PLL_F + 1))) #define CLOCK_PLL_VCO (CLOCK_PLL_REFR * (2 * (CONFIG_CLOCK_PLL_F + 1)))
#define CLOCK_PLL_OUT (CLOCK_PLL_VCO / (1 << CONFIG_CLOCK_PLL_Q)) #define CLOCK_PLL_OUT (CLOCK_PLL_VCO / (1 << CONFIG_CLOCK_PLL_Q))
#define CLOCK_CORECLOCK (CLOCK_PLL_OUT) /* 320000000Hz with the values used above */ #define CLOCK_CORECLOCK (CLOCK_PLL_OUT) /* 320000000Hz with the values used above */
/* Check PLL settings */ /* Check PLL settings */
#if CLOCK_PLL_REFR != 8000000 #if CLOCK_PLL_REFR != MHZ(8)
#error "Only R=2 can be used when using HFXOSC" #error "Only R=2 can be used when using HFXOSC"
#endif #endif
#if (CLOCK_PLL_VCO < 384000000) || (CLOCK_PLL_VCO > 768000000) #if (CLOCK_PLL_VCO < MHZ(384)) || (CLOCK_PLL_VCO > MHZ(768))
#error "VCO frequency must be in the range [384MHz - 768MHz], check the CLOCK_PLL_F value" #error "VCO frequency must be in the range [384MHz - 768MHz], check the CLOCK_PLL_F value"
#endif #endif
#if (CLOCK_PLL_OUT < 48000000) || (CLOCK_PLL_OUT > 384000000) #if (CLOCK_PLL_OUT < MHZ(48)) || (CLOCK_PLL_OUT > MHZ(384))
#error "PLL output frequency must be in the range [48MHz - 384MHz], check the CLOCK_PLL_Q value" #error "PLL output frequency must be in the range [48MHz - 384MHz], check the CLOCK_PLL_Q value"
#endif #endif
#elif CONFIG_USE_CLOCK_HFXOSC #elif CONFIG_USE_CLOCK_HFXOSC
#define CLOCK_CORECLOCK (16000000UL) #define CLOCK_CORECLOCK MHZ(16)
#endif #endif
/* /*
@ -106,7 +106,7 @@ extern "C" {
call cpu_freq() to get the configured CPU frequency. call cpu_freq() to get the configured CPU frequency.
*/ */
#ifndef CONFIG_CLOCK_DESIRED_FREQUENCY #ifndef CONFIG_CLOCK_DESIRED_FREQUENCY
#define CONFIG_CLOCK_DESIRED_FREQUENCY (320000000UL) #define CONFIG_CLOCK_DESIRED_FREQUENCY MHZ(320)
#endif #endif
#ifndef CONFIG_CLOCK_HFROSC_TRIM #ifndef CONFIG_CLOCK_HFROSC_TRIM

12
boards/hifive1b/include/periph_conf.h
View File

@ -81,25 +81,25 @@ extern "C" {
#endif #endif
#if CONFIG_USE_CLOCK_HFXOSC_PLL #if CONFIG_USE_CLOCK_HFXOSC_PLL
#define CLOCK_PLL_INPUT_CLOCK (16000000UL) #define CLOCK_PLL_INPUT_CLOCK MHZ(16)
#define CLOCK_PLL_REFR (CLOCK_PLL_INPUT_CLOCK / (CONFIG_CLOCK_PLL_R + 1)) #define CLOCK_PLL_REFR (CLOCK_PLL_INPUT_CLOCK / (CONFIG_CLOCK_PLL_R + 1))
#define CLOCK_PLL_VCO (CLOCK_PLL_REFR * (2 * (CONFIG_CLOCK_PLL_F + 1))) #define CLOCK_PLL_VCO (CLOCK_PLL_REFR * (2 * (CONFIG_CLOCK_PLL_F + 1)))
#define CLOCK_PLL_OUT (CLOCK_PLL_VCO / (1 << CONFIG_CLOCK_PLL_Q)) #define CLOCK_PLL_OUT (CLOCK_PLL_VCO / (1 << CONFIG_CLOCK_PLL_Q))
#define CLOCK_CORECLOCK (CLOCK_PLL_OUT) /* 320000000Hz with the values used above */ #define CLOCK_CORECLOCK (CLOCK_PLL_OUT) /* 320000000Hz with the values used above */
/* Check PLL settings */ /* Check PLL settings */
#if CLOCK_PLL_REFR != 8000000 #if CLOCK_PLL_REFR != MHZ(8)
#error "Only R=2 can be used when using HFXOSC" #error "Only R=2 can be used when using HFXOSC"
#endif #endif
#if (CLOCK_PLL_VCO < 384000000) || (CLOCK_PLL_VCO > 768000000) #if (CLOCK_PLL_VCO < MHZ(384)) || (CLOCK_PLL_VCO > MHZ(768))
#error "VCO frequency must be in the range [384MHz - 768MHz], check the CLOCK_PLL_F value" #error "VCO frequency must be in the range [384MHz - 768MHz], check the CLOCK_PLL_F value"
#endif #endif
#if (CLOCK_PLL_OUT < 48000000) || (CLOCK_PLL_OUT > 384000000) #if (CLOCK_PLL_OUT < MHZ(48)) || (CLOCK_PLL_OUT > MHZ(384))
#error "PLL output frequency must be in the range [48MHz - 384MHz], check the CLOCK_PLL_Q value" #error "PLL output frequency must be in the range [48MHz - 384MHz], check the CLOCK_PLL_Q value"
#endif #endif
#elif CONFIG_USE_CLOCK_HFXOSC #elif CONFIG_USE_CLOCK_HFXOSC
#define CLOCK_CORECLOCK (16000000UL) #define CLOCK_CORECLOCK MHZ(16)
#endif #endif
/* /*
@ -107,7 +107,7 @@ extern "C" {
call cpu_freq() to get the configured CPU frequency. call cpu_freq() to get the configured CPU frequency.
*/ */
#ifndef CONFIG_CLOCK_DESIRED_FREQUENCY #ifndef CONFIG_CLOCK_DESIRED_FREQUENCY
#define CONFIG_CLOCK_DESIRED_FREQUENCY (320000000UL) #define CONFIG_CLOCK_DESIRED_FREQUENCY MHZ(320)
#endif #endif
#ifndef CONFIG_CLOCK_HFROSC_TRIM #ifndef CONFIG_CLOCK_HFROSC_TRIM

1
cpu/fe310/include/cpu.h
View File

@ -26,6 +26,7 @@
#define CPU_H #define CPU_H
#include "thread.h" #include "thread.h"
#include "macros/units.h"
#include "vendor/platform.h" #include "vendor/platform.h"
#include "vendor/plic_driver.h" #include "vendor/plic_driver.h"