From c34385de6b2de5e80039b6e215be2487a64d64e9 Mon Sep 17 00:00:00 2001 From: Dimitris Mantzouranis Date: Mon, 10 Jan 2022 19:40:18 +0200 Subject: [PATCH] sn32: allow mcuconf to override system --- .../ext/SONiX/SN32F2xx/system_SN32F240.c | 41 ++++++++++++++++--- .../ext/SONiX/SN32F2xx/system_SN32F280.c | 31 +++++++++++++- .../ext/SONiX/SN32F2xx/system_SN32F290.c | 32 ++++++++++++++- 3 files changed, 95 insertions(+), 9 deletions(-) diff --git a/os/common/ext/SONiX/SN32F2xx/system_SN32F240.c b/os/common/ext/SONiX/SN32F2xx/system_SN32F240.c index 170eddcf..e2bc8a1d 100644 --- a/os/common/ext/SONiX/SN32F2xx/system_SN32F240.c +++ b/os/common/ext/SONiX/SN32F2xx/system_SN32F240.c @@ -91,16 +91,36 @@ // */ +#ifndef SYS_CLOCK_SETUP #define SYS_CLOCK_SETUP 1 +#endif +#ifndef SYS0_CLKCFG_VAL #define SYS0_CLKCFG_VAL 0 +#endif +#ifndef EHS_FREQ #define EHS_FREQ 10 +#endif +#ifndef PLL_MSEL #define PLL_MSEL 12 +#endif +#ifndef PLL_PSEL #define PLL_PSEL 3 +#endif +#ifndef PLL_FSEL #define PLL_FSEL 0 +#endif +#ifndef PLL_CLKIN #define PLL_CLKIN 1 +#endif +#ifndef PLL_ENABLE #define PLL_ENABLE 0 +#endif +#ifndef AHB_PRESCALAR #define AHB_PRESCALAR 0x0 +#endif +#ifndef CLKOUT_SEL_VAL #define CLKOUT_SEL_VAL 0x0 +#endif /* //-------- <<< end of configuration section >>> ------------------------------ @@ -110,12 +130,21 @@ /*---------------------------------------------------------------------------- DEFINES *----------------------------------------------------------------------------*/ -#define IHRC 0 -#define ILRC 1 -#define EHSXTAL 2 -#define ELSXTAL 3 -#define PLL 4 - +#ifndef IHRC +#define IHRC 0 +#endif +#ifndef ILRC +#define ILRC 1 +#endif +#ifndef EHSXTAL +#define EHSXTAL 2 +#endif +#ifndef ELSXTAL +#define ELSXTAL 3 +#endif +#ifndef PLL +#define PLL 4 +#endif /*---------------------------------------------------------------------------- Define clocks diff --git a/os/common/ext/SONiX/SN32F2xx/system_SN32F280.c b/os/common/ext/SONiX/SN32F2xx/system_SN32F280.c index 78773407..d68c4881 100644 --- a/os/common/ext/SONiX/SN32F2xx/system_SN32F280.c +++ b/os/common/ext/SONiX/SN32F2xx/system_SN32F280.c @@ -95,16 +95,36 @@ */ +#ifndef SYS0_CLKCFG_VAL #define SYS0_CLKCFG_VAL 0 +#endif +#ifndef EHS_FREQ #define EHS_FREQ 16 +#endif +#ifndef PLL_ENABLE #define PLL_ENABLE 0 +#endif +#ifndef PLL_MSEL #define PLL_MSEL 1 +#endif +#ifndef PLL_PSEL #define PLL_PSEL 0 +#endif +#ifndef PLL_CLKIN #define PLL_CLKIN 0 +#endif +#ifndef AHB_PRESCALAR #define AHB_PRESCALAR 0x0 +#endif +#ifndef AHB_1P5PRESCALAR #define AHB_1P5PRESCALAR 0x0 +#endif +#ifndef CLKOUT_SEL_VAL #define CLKOUT_SEL_VAL 0x0 +#endif +#ifndef CLKOUT_PRESCALAR #define CLKOUT_PRESCALAR 0x0 +#endif /* //-------- <<< end of configuration section >>> ------------------------------ @@ -114,12 +134,21 @@ /*---------------------------------------------------------------------------- DEFINES *----------------------------------------------------------------------------*/ +#ifndef IHRC #define IHRC 0 +#endif +#ifndef ILRC #define ILRC 1 +#endif +#ifndef EHSXTAL #define EHSXTAL 2 +#endif +#ifndef ELSXTAL #define ELSXTAL 3 +#endif +#ifndef PLL #define PLL 4 - +#endif /*---------------------------------------------------------------------------- Define clocks diff --git a/os/common/ext/SONiX/SN32F2xx/system_SN32F290.c b/os/common/ext/SONiX/SN32F2xx/system_SN32F290.c index c2c64a56..5b91a1ac 100644 --- a/os/common/ext/SONiX/SN32F2xx/system_SN32F290.c +++ b/os/common/ext/SONiX/SN32F2xx/system_SN32F290.c @@ -94,17 +94,36 @@ // <7=> CLKOUT selection/128 */ - +#ifndef SYS0_CLKCFG_VAL #define SYS0_CLKCFG_VAL 0 +#endif +#ifndef EHS_FREQ #define EHS_FREQ 16 +#endif +#ifndef PLL_ENABLE #define PLL_ENABLE 0 +#endif +#ifndef PLL_MSEL #define PLL_MSEL 1 +#endif +#ifndef PLL_PSEL #define PLL_PSEL 0 +#endif +#ifndef PLL_CLKIN #define PLL_CLKIN 0 +#endif +#ifndef AHB_PRESCALAR #define AHB_PRESCALAR 0x0 +#endif +#ifndef AHB_1P5PRESCALAR #define AHB_1P5PRESCALAR 0x0 +#endif +#ifndef CLKOUT_SEL_VAL #define CLKOUT_SEL_VAL 0x0 +#endif +#ifndef CLKOUT_PRESCALAR #define CLKOUT_PRESCALAR 0x0 +#endif /* //-------- <<< end of configuration section >>> ------------------------------ @@ -114,12 +133,21 @@ /*---------------------------------------------------------------------------- DEFINES *----------------------------------------------------------------------------*/ +#ifndef IHRC #define IHRC 0 +#endif +#ifndef ILRC #define ILRC 1 +#endif +#ifndef EHSXTAL #define EHSXTAL 2 +#endif +#ifndef ELSXTAL #define ELSXTAL 3 +#endif +#ifndef PLL #define PLL 4 - +#endif /*---------------------------------------------------------------------------- Define clocks