varl/qmk_firmware
1
0
Fork 0
forked from forks/qmk_firmware
Code Pull requests Activity

ChibiOS 20.3.2 (#11495)

Browse source 
* Update ChibiOS submodule

* Update ChibiOS-Contrib submodule

* Update ChibiOS config files
This commit is contained in:
Nick Brassel 2021-01-20 00:59:12 +11:00 committed by GitHub
parent 19c180ef88
commit a7c45daeb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 146 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/chibios

@ -1 +1 @@
Subproject commit 313416b8fda90d9973a749a0a35970956852c286 Subproject commit ffe54d63cb10a355add318f8e922e39f1c3d4bfd

2
lib/chibios-contrib

@ -1 +1 @@
Subproject commit e3a3a24047717af33b098266e11c2e4e5102206a Subproject commit 61baa6b036138c155f7cfc5646d833d9423f3243

86
platforms/chibios/QMK_PROTON_C/configs/chconf.h
View file

@ -29,7 +29,7 @@
#define CHCONF_H #define CHCONF_H
#define _CHIBIOS_RT_CONF_ #define _CHIBIOS_RT_CONF_
#define _CHIBIOS_RT_CONF_VER_6_0_ #define _CHIBIOS_RT_CONF_VER_6_1_
/*===========================================================================*/ /*===========================================================================*/
/** /**
@ -108,21 +108,6 @@
#define CH_CFG_TIME_QUANTUM 0 #define CH_CFG_TIME_QUANTUM 0
#endif #endif
/**
* @brief Managed RAM size.
* @details Size of the RAM area to be managed by the OS. If set to zero
* then the whole available RAM is used. The core memory is made
* available to the heap allocator and/or can be used directly through
* the simplified core memory allocator.
*
* @note In order to let the OS manage the whole RAM the linker script must
* provide the @p __heap_base__ and @p __heap_end__ symbols.
* @note Requires @p CH_CFG_USE_MEMCORE.
*/
#if !defined(CH_CFG_MEMCORE_SIZE)
#define CH_CFG_MEMCORE_SIZE 0
#endif
/** /**
* @brief Idle thread automatic spawn suppression. * @brief Idle thread automatic spawn suppression.
* @details When this option is activated the function @p chSysInit() * @details When this option is activated the function @p chSysInit()
@ -311,6 +296,28 @@
#define CH_CFG_USE_MESSAGES_PRIORITY TRUE #define CH_CFG_USE_MESSAGES_PRIORITY TRUE
#endif #endif
/**
* @brief Dynamic Threads APIs.
* @details If enabled then the dynamic threads creation APIs are included
* in the kernel.
*
* @note The default is @p TRUE.
* @note Requires @p CH_CFG_USE_WAITEXIT.
* @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
*/
#if !defined(CH_CFG_USE_DYNAMIC)
#define CH_CFG_USE_DYNAMIC TRUE
#endif
/** @} */
/*===========================================================================*/
/**
* @name OSLIB options
* @{
*/
/*===========================================================================*/
/** /**
* @brief Mailboxes APIs. * @brief Mailboxes APIs.
* @details If enabled then the asynchronous messages (mailboxes) APIs are * @details If enabled then the asynchronous messages (mailboxes) APIs are
@ -334,6 +341,21 @@
#define CH_CFG_USE_MEMCORE TRUE #define CH_CFG_USE_MEMCORE TRUE
#endif #endif
/**
* @brief Managed RAM size.
* @details Size of the RAM area to be managed by the OS. If set to zero
* then the whole available RAM is used. The core memory is made
* available to the heap allocator and/or can be used directly through
* the simplified core memory allocator.
*
* @note In order to let the OS manage the whole RAM the linker script must
* provide the @p __heap_base__ and @p __heap_end__ symbols.
* @note Requires @p CH_CFG_USE_MEMCORE.
*/
#if !defined(CH_CFG_MEMCORE_SIZE)
#define CH_CFG_MEMCORE_SIZE 0
#endif
/** /**
* @brief Heap Allocator APIs. * @brief Heap Allocator APIs.
* @details If enabled then the memory heap allocator APIs are included * @details If enabled then the memory heap allocator APIs are included
@ -382,16 +404,36 @@
#endif #endif
/** /**
* @brief Dynamic Threads APIs. * @brief Objects Caches APIs.
* @details If enabled then the dynamic threads creation APIs are included * @details If enabled then the objects caches APIs are included
* in the kernel. * in the kernel.
* *
* @note The default is @p TRUE. * @note The default is @p TRUE.
* @note Requires @p CH_CFG_USE_WAITEXIT.
* @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
*/ */
#if !defined(CH_CFG_USE_DYNAMIC) #if !defined(CH_CFG_USE_OBJ_CACHES)
#define CH_CFG_USE_DYNAMIC TRUE #define CH_CFG_USE_OBJ_CACHES FALSE
#endif
/**
* @brief Delegate threads APIs.
* @details If enabled then the delegate threads APIs are included
* in the kernel.
*
* @note The default is @p TRUE.
*/
#if !defined(CH_CFG_USE_DELEGATES)
#define CH_CFG_USE_DELEGATES FALSE
#endif
/**
* @brief Jobs Queues APIs.
* @details If enabled then the jobs queues APIs are included
* in the kernel.
*
* @note The default is @p TRUE.
*/
#if !defined(CH_CFG_USE_JOBS)
#define CH_CFG_USE_JOBS FALSE
#endif #endif
/** @} */ /** @} */

10
platforms/chibios/QMK_PROTON_C/configs/halconf.h
View file

@ -29,7 +29,7 @@
#define HALCONF_H #define HALCONF_H
#define _CHIBIOS_HAL_CONF_ #define _CHIBIOS_HAL_CONF_
#define _CHIBIOS_HAL_CONF_VER_7_0_ #define _CHIBIOS_HAL_CONF_VER_7_1_
#include <mcuconf.h> #include <mcuconf.h>
@ -68,6 +68,13 @@
#define HAL_USE_DAC TRUE #define HAL_USE_DAC TRUE
#endif #endif
/**
* @brief Enables the EFlash subsystem.
*/
#if !defined(HAL_USE_EFL) || defined(__DOXYGEN__)
#define HAL_USE_EFL FALSE
#endif
/** /**
* @brief Enables the GPT subsystem. * @brief Enables the GPT subsystem.
*/ */
@ -451,7 +458,6 @@
#define SPI_USE_CIRCULAR FALSE #define SPI_USE_CIRCULAR FALSE
#endif #endif
/** /**
* @brief Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs. * @brief Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
* @note Disabling this option saves both code and data space. * @note Disabling this option saves both code and data space.

86
platforms/chibios/common/configs/chconf.h
View file

@ -29,7 +29,7 @@
#define CHCONF_H #define CHCONF_H
#define _CHIBIOS_RT_CONF_ #define _CHIBIOS_RT_CONF_
#define _CHIBIOS_RT_CONF_VER_6_0_ #define _CHIBIOS_RT_CONF_VER_6_1_
/*===========================================================================*/ /*===========================================================================*/
/** /**
@ -108,21 +108,6 @@
#define CH_CFG_TIME_QUANTUM 0 #define CH_CFG_TIME_QUANTUM 0
#endif #endif
/**
* @brief Managed RAM size.
* @details Size of the RAM area to be managed by the OS. If set to zero
* then the whole available RAM is used. The core memory is made
* available to the heap allocator and/or can be used directly through
* the simplified core memory allocator.
*
* @note In order to let the OS manage the whole RAM the linker script must
* provide the @p __heap_base__ and @p __heap_end__ symbols.
* @note Requires @p CH_CFG_USE_MEMCORE.
*/
#if !defined(CH_CFG_MEMCORE_SIZE)
#define CH_CFG_MEMCORE_SIZE 0
#endif
/** /**
* @brief Idle thread automatic spawn suppression. * @brief Idle thread automatic spawn suppression.
* @details When this option is activated the function @p chSysInit() * @details When this option is activated the function @p chSysInit()
@ -311,6 +296,28 @@
#define CH_CFG_USE_MESSAGES_PRIORITY FALSE #define CH_CFG_USE_MESSAGES_PRIORITY FALSE
#endif #endif
/**
* @brief Dynamic Threads APIs.
* @details If enabled then the dynamic threads creation APIs are included
* in the kernel.
*
* @note The default is @p TRUE.
* @note Requires @p CH_CFG_USE_WAITEXIT.
* @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
*/
#if !defined(CH_CFG_USE_DYNAMIC)
#define CH_CFG_USE_DYNAMIC FALSE
#endif
/** @} */
/*===========================================================================*/
/**
* @name OSLIB options
* @{
*/
/*===========================================================================*/
/** /**
* @brief Mailboxes APIs. * @brief Mailboxes APIs.
* @details If enabled then the asynchronous messages (mailboxes) APIs are * @details If enabled then the asynchronous messages (mailboxes) APIs are
@ -334,6 +341,21 @@
#define CH_CFG_USE_MEMCORE FALSE #define CH_CFG_USE_MEMCORE FALSE
#endif #endif
/**
* @brief Managed RAM size.
* @details Size of the RAM area to be managed by the OS. If set to zero
* then the whole available RAM is used. The core memory is made
* available to the heap allocator and/or can be used directly through
* the simplified core memory allocator.
*
* @note In order to let the OS manage the whole RAM the linker script must
* provide the @p __heap_base__ and @p __heap_end__ symbols.
* @note Requires @p CH_CFG_USE_MEMCORE.
*/
#if !defined(CH_CFG_MEMCORE_SIZE)
#define CH_CFG_MEMCORE_SIZE 0
#endif
/** /**
* @brief Heap Allocator APIs. * @brief Heap Allocator APIs.
* @details If enabled then the memory heap allocator APIs are included * @details If enabled then the memory heap allocator APIs are included
@ -382,16 +404,36 @@
#endif #endif
/** /**
* @brief Dynamic Threads APIs. * @brief Objects Caches APIs.
* @details If enabled then the dynamic threads creation APIs are included * @details If enabled then the objects caches APIs are included
* in the kernel. * in the kernel.
* *
* @note The default is @p TRUE. * @note The default is @p TRUE.
* @note Requires @p CH_CFG_USE_WAITEXIT.
* @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
*/ */
#if !defined(CH_CFG_USE_DYNAMIC) #if !defined(CH_CFG_USE_OBJ_CACHES)
#define CH_CFG_USE_DYNAMIC FALSE #define CH_CFG_USE_OBJ_CACHES FALSE
#endif
/**
* @brief Delegate threads APIs.
* @details If enabled then the delegate threads APIs are included
* in the kernel.
*
* @note The default is @p TRUE.
*/
#if !defined(CH_CFG_USE_DELEGATES)
#define CH_CFG_USE_DELEGATES FALSE
#endif
/**
* @brief Jobs Queues APIs.
* @details If enabled then the jobs queues APIs are included
* in the kernel.
*
* @note The default is @p TRUE.
*/
#if !defined(CH_CFG_USE_JOBS)
#define CH_CFG_USE_JOBS FALSE
#endif #endif
/** @} */ /** @} */

10
platforms/chibios/common/configs/halconf.h
View file

@ -29,7 +29,7 @@
#define HALCONF_H #define HALCONF_H
#define _CHIBIOS_HAL_CONF_ #define _CHIBIOS_HAL_CONF_
#define _CHIBIOS_HAL_CONF_VER_7_0_ #define _CHIBIOS_HAL_CONF_VER_7_1_
#include <mcuconf.h> #include <mcuconf.h>
@ -68,6 +68,13 @@
#define HAL_USE_DAC FALSE #define HAL_USE_DAC FALSE
#endif #endif
/**
* @brief Enables the EFlash subsystem.
*/
#if !defined(HAL_USE_EFL) || defined(__DOXYGEN__)
#define HAL_USE_EFL FALSE
#endif
/** /**
* @brief Enables the GPT subsystem. * @brief Enables the GPT subsystem.
*/ */
@ -451,7 +458,6 @@
#define SPI_USE_CIRCULAR FALSE #define SPI_USE_CIRCULAR FALSE
#endif #endif
/** /**
* @brief Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs. * @brief Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
* @note Disabling this option saves both code and data space. * @note Disabling this option saves both code and data space.