Updater tool improvements, more enhancements on H7 HAL support.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@13319 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2020-01-31 16:48:57 +00:00
parent 126e2704c4
commit 5dc0db3f1f
26 changed files with 71 additions and 30 deletions

View File

@ -35,22 +35,28 @@
#define STM32H742_MCUCONF #define STM32H742_MCUCONF
#define STM32H743_MCUCONF #define STM32H743_MCUCONF
#define STM32H753_MCUCONF #define STM32H753_MCUCONF
#define STM32H745_MCUCONF
#define STM32H755_MCUCONF
#define STM32H747_MCUCONF
#define STM32H757_MCUCONF
/* /*
* General settings. * General settings.
*/ */
#define STM32_NO_INIT FALSE #define STM32_NO_INIT FALSE
#define STM32_SYS_CK_ENFORCED_VALUE STM32_HSICLK #define STM32_TARGET_CORE 1
/* /*
* Memory attributes settings. * Memory attributes settings.
*/ */
#define STM32_NOCACHE_MPU_REGION MPU_REGION_6
#define STM32_NOCACHE_SRAM1_SRAM2 FALSE #define STM32_NOCACHE_SRAM1_SRAM2 FALSE
#define STM32_NOCACHE_SRAM3 TRUE #define STM32_NOCACHE_SRAM3 TRUE
/* /*
* PWR system settings. * PWR system settings.
* Reading STM32 Reference Manual is required. * Reading STM32 Reference Manual is required, settings in PWR_CR3 are
* very critical.
* Register constants are taken from the ST header. * Register constants are taken from the ST header.
*/ */
#define STM32_ODEN STM32_ODEN_DISABLED #define STM32_ODEN STM32_ODEN_DISABLED

View File

@ -44,16 +44,19 @@
* General settings. * General settings.
*/ */
#define STM32_NO_INIT FALSE #define STM32_NO_INIT FALSE
#define STM32_TARGET_CORE 1
/* /*
* Memory attributes settings. * Memory attributes settings.
*/ */
#define STM32_NOCACHE_MPU_REGION MPU_REGION_6
#define STM32_NOCACHE_SRAM1_SRAM2 FALSE #define STM32_NOCACHE_SRAM1_SRAM2 FALSE
#define STM32_NOCACHE_SRAM3 TRUE #define STM32_NOCACHE_SRAM3 TRUE
/* /*
* PWR system settings. * PWR system settings.
* Reading STM32 Reference Manual is required. * Reading STM32 Reference Manual is required, settings in PWR_CR3 are
* very critical.
* Register constants are taken from the ST header. * Register constants are taken from the ST header.
*/ */
#define STM32_ODEN STM32_ODEN_DISABLED #define STM32_ODEN STM32_ODEN_DISABLED

View File

@ -186,7 +186,7 @@ void hal_lld_init(void) {
/* The SRAM2 bank can optionally made a non cache-able area for use by /* The SRAM2 bank can optionally made a non cache-able area for use by
DMA engines.*/ DMA engines.*/
mpuConfigureRegion(MPU_REGION_7, mpuConfigureRegion(STM32_NOCACHE_MPU_REGION,
base, base,
MPU_RASR_ATTR_AP_RW_RW | MPU_RASR_ATTR_AP_RW_RW |
MPU_RASR_ATTR_NON_CACHEABLE | MPU_RASR_ATTR_NON_CACHEABLE |

View File

@ -601,6 +601,13 @@
#define STM32_TARGET_CORE 1 #define STM32_TARGET_CORE 1
#endif #endif
/**
* @brief MPU region to be used for no-cache RAM area.
*/
#if !defined(STM32_NOCACHE_MPU_REGION) || defined(__DOXYGEN__)
#define STM32_NOCACHE_MPU_REGION MPU_REGION_6
#endif
/** /**
* @brief Add no-cache attribute to SRAM1 and SRAM2. * @brief Add no-cache attribute to SRAM1 and SRAM2.
* @note MPU region 7 is used if enabled. * @note MPU region 7 is used if enabled.

View File

@ -35,22 +35,28 @@
#define STM32H742_MCUCONF #define STM32H742_MCUCONF
#define STM32H743_MCUCONF #define STM32H743_MCUCONF
#define STM32H753_MCUCONF #define STM32H753_MCUCONF
#define STM32H745_MCUCONF
#define STM32H755_MCUCONF
#define STM32H747_MCUCONF
#define STM32H757_MCUCONF
/* /*
* General settings. * General settings.
*/ */
#define STM32_NO_INIT FALSE #define STM32_NO_INIT FALSE
#define STM32_SYS_CK_ENFORCED_VALUE STM32_HSICLK #define STM32_TARGET_CORE 1
/* /*
* Memory attributes settings. * Memory attributes settings.
*/ */
#define STM32_NOCACHE_MPU_REGION MPU_REGION_6
#define STM32_NOCACHE_SRAM1_SRAM2 FALSE #define STM32_NOCACHE_SRAM1_SRAM2 FALSE
#define STM32_NOCACHE_SRAM3 TRUE #define STM32_NOCACHE_SRAM3 TRUE
/* /*
* PWR system settings. * PWR system settings.
* Reading STM32 Reference Manual is required. * Reading STM32 Reference Manual is required, settings in PWR_CR3 are
* very critical.
* Register constants are taken from the ST header. * Register constants are taken from the ST header.
*/ */
#define STM32_ODEN STM32_ODEN_DISABLED #define STM32_ODEN STM32_ODEN_DISABLED

View File

@ -35,22 +35,28 @@
#define STM32H742_MCUCONF #define STM32H742_MCUCONF
#define STM32H743_MCUCONF #define STM32H743_MCUCONF
#define STM32H753_MCUCONF #define STM32H753_MCUCONF
#define STM32H745_MCUCONF
#define STM32H755_MCUCONF
#define STM32H747_MCUCONF
#define STM32H757_MCUCONF
/* /*
* General settings. * General settings.
*/ */
#define STM32_NO_INIT FALSE #define STM32_NO_INIT FALSE
#define STM32_SYS_CK_ENFORCED_VALUE STM32_HSICLK #define STM32_TARGET_CORE 1
/* /*
* Memory attributes settings. * Memory attributes settings.
*/ */
#define STM32_NOCACHE_MPU_REGION MPU_REGION_6
#define STM32_NOCACHE_SRAM1_SRAM2 FALSE #define STM32_NOCACHE_SRAM1_SRAM2 FALSE
#define STM32_NOCACHE_SRAM3 TRUE #define STM32_NOCACHE_SRAM3 TRUE
/* /*
* PWR system settings. * PWR system settings.
* Reading STM32 Reference Manual is required. * Reading STM32 Reference Manual is required, settings in PWR_CR3 are
* very critical.
* Register constants are taken from the ST header. * Register constants are taken from the ST header.
*/ */
#define STM32_ODEN STM32_ODEN_DISABLED #define STM32_ODEN STM32_ODEN_DISABLED

View File

@ -35,22 +35,28 @@
#define STM32H742_MCUCONF #define STM32H742_MCUCONF
#define STM32H743_MCUCONF #define STM32H743_MCUCONF
#define STM32H753_MCUCONF #define STM32H753_MCUCONF
#define STM32H745_MCUCONF
#define STM32H755_MCUCONF
#define STM32H747_MCUCONF
#define STM32H757_MCUCONF
/* /*
* General settings. * General settings.
*/ */
#define STM32_NO_INIT FALSE #define STM32_NO_INIT FALSE
#define STM32_SYS_CK_ENFORCED_VALUE STM32_HSICLK #define STM32_TARGET_CORE 1
/* /*
* Memory attributes settings. * Memory attributes settings.
*/ */
#define STM32_NOCACHE_MPU_REGION MPU_REGION_6
#define STM32_NOCACHE_SRAM1_SRAM2 FALSE #define STM32_NOCACHE_SRAM1_SRAM2 FALSE
#define STM32_NOCACHE_SRAM3 TRUE #define STM32_NOCACHE_SRAM3 TRUE
/* /*
* PWR system settings. * PWR system settings.
* Reading STM32 Reference Manual is required. * Reading STM32 Reference Manual is required, settings in PWR_CR3 are
* very critical.
* Register constants are taken from the ST header. * Register constants are taken from the ST header.
*/ */
#define STM32_ODEN STM32_ODEN_DISABLED #define STM32_ODEN STM32_ODEN_DISABLED

View File

@ -35,22 +35,28 @@
#define STM32H742_MCUCONF #define STM32H742_MCUCONF
#define STM32H743_MCUCONF #define STM32H743_MCUCONF
#define STM32H753_MCUCONF #define STM32H753_MCUCONF
#define STM32H745_MCUCONF
#define STM32H755_MCUCONF
#define STM32H747_MCUCONF
#define STM32H757_MCUCONF
/* /*
* General settings. * General settings.
*/ */
#define STM32_NO_INIT FALSE #define STM32_NO_INIT FALSE
#define STM32_SYS_CK_ENFORCED_VALUE STM32_HSICLK #define STM32_TARGET_CORE 1
/* /*
* Memory attributes settings. * Memory attributes settings.
*/ */
#define STM32_NOCACHE_MPU_REGION MPU_REGION_6
#define STM32_NOCACHE_SRAM1_SRAM2 FALSE #define STM32_NOCACHE_SRAM1_SRAM2 FALSE
#define STM32_NOCACHE_SRAM3 TRUE #define STM32_NOCACHE_SRAM3 TRUE
/* /*
* PWR system settings. * PWR system settings.
* Reading STM32 Reference Manual is required. * Reading STM32 Reference Manual is required, settings in PWR_CR3 are
* very critical.
* Register constants are taken from the ST header. * Register constants are taken from the ST header.
*/ */
#define STM32_ODEN STM32_ODEN_DISABLED #define STM32_ODEN STM32_ODEN_DISABLED

View File

@ -55,11 +55,12 @@
* General settings. * General settings.
*/ */
#define STM32_NO_INIT ${doc.STM32_NO_INIT!"FALSE"} #define STM32_NO_INIT ${doc.STM32_NO_INIT!"FALSE"}
#define STM32_TARGET_CORE ${doc.STM32_NO_INIT!"1"} #define STM32_TARGET_CORE ${doc.STM32_TARGET_CORE!"1"}
/* /*
* Memory attributes settings. * Memory attributes settings.
*/ */
#define STM32_NOCACHE_MPU_REGION ${doc.STM32_NOCACHE_MPU_REGION!"MPU_REGION_6"}
#define STM32_NOCACHE_SRAM1_SRAM2 ${doc.STM32_NOCACHE_SRAM1_SRAM2!"FALSE"} #define STM32_NOCACHE_SRAM1_SRAM2 ${doc.STM32_NOCACHE_SRAM1_SRAM2!"FALSE"}
#define STM32_NOCACHE_SRAM3 ${doc.STM32_NOCACHE_SRAM3!"TRUE"} #define STM32_NOCACHE_SRAM3 ${doc.STM32_NOCACHE_SRAM3!"TRUE"}

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32F303_MCUCONF" <<< "$conffile" if egrep -q "STM32F303_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f303xx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f303xx
then then
echo echo

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32F407_MCUCONF" <<< "$conffile" if egrep -q "STM32F407_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f407xx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f407xx
then then
echo echo

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32F413_MCUCONF" <<< "$conffile" if egrep -q "STM32F413_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f413xx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f413xx
then then
echo echo

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32F722_MCUCONF" <<< "$conffile" || egrep -q "STM32F723_MCUCONF" <<< "$conffile" || egrep -q "STM32F732_MCUCONF" <<< "$conffile" || egrep -q "STM32F733_MCUCONF" <<< "$conffile" if egrep -q "STM32F722_MCUCONF" <<< "$conffile" || egrep -q "STM32F723_MCUCONF" <<< "$conffile" || egrep -q "STM32F732_MCUCONF" <<< "$conffile" || egrep -q "STM32F733_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f72xxx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f72xxx
then then
echo echo

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32F746_MCUCONF" <<< "$conffile" || egrep -q "STM32F756_MCUCONF" <<< "$conffile" if egrep -q "STM32F746_MCUCONF" <<< "$conffile" || egrep -q "STM32F756_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f746xx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f746xx
then then
echo echo

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32F765_MCUCONF" <<< "$conffile" || egrep -q "STM32F767_MCUCONF" <<< "$conffile" || egrep -q "STM32F777_MCUCONF" <<< "$conffile" || egrep -q "STM32F769_MCUCONF" <<< "$conffile" || egrep -q "STM32F779_MCUCONF" <<< "$conffile" if egrep -q "STM32F765_MCUCONF" <<< "$conffile" || egrep -q "STM32F767_MCUCONF" <<< "$conffile" || egrep -q "STM32F777_MCUCONF" <<< "$conffile" || egrep -q "STM32F769_MCUCONF" <<< "$conffile" || egrep -q "STM32F779_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f76xxx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32f76xxx
then then
echo echo

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32G071_MCUCONF" <<< "$conffile" if egrep -q "STM32G071_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32g071xx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32g071xx
then then
echo echo

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32G431_MCUCONF" <<< "$conffile" if egrep -q "STM32G431_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32g4x1xx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32g4x1xx
then then
echo echo

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32G474_MCUCONF" <<< "$conffile" if egrep -q "STM32G474_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32g4x4xx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32g4x4xx
then then
echo echo

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32H743_MCUCONF" <<< "$conffile" if egrep -q "STM32H743_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32h743xx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32h743xx
then then
echo echo

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32L052_MCUCONF" <<< "$conffile" if egrep -q "STM32L052_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l05xxx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l05xxx
then then
echo echo

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32L072_MCUCONF" <<< "$conffile" if egrep -q "STM32L072_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l07xxx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l07xxx
then then
echo echo

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32L432_MCUCONF" <<< "$conffile" if egrep -q "STM32L432_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l432xx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l432xx
then then
echo echo

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32L452_MCUCONF" <<< "$conffile" if egrep -q "STM32L452_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l452xx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l452xx
then then
echo echo

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32L476_MCUCONF" <<< "$conffile" if egrep -q "STM32L476_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l476xx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l476xx
then then
echo echo

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32L496_MCUCONF" <<< "$conffile" if egrep -q "STM32L496_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l496xx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l496xx
then then
echo echo

View File

@ -13,7 +13,7 @@ then
if egrep -q "STM32L4R5_MCUCONF" <<< "$conffile" || egrep -q "STM32L4S5_MCUCONF" <<< "$conffile" || egrep -q "STM32L4R7_MCUCONF" <<< "$conffile" || egrep -q "STM32L4S7_MCUCONF" <<< "$conffile" || egrep -q "STM32L4R9_MCUCONF" <<< "$conffile" || egrep -q "STM32L4S9_MCUCONF" <<< "$conffile" if egrep -q "STM32L4R5_MCUCONF" <<< "$conffile" || egrep -q "STM32L4S5_MCUCONF" <<< "$conffile" || egrep -q "STM32L4R7_MCUCONF" <<< "$conffile" || egrep -q "STM32L4S7_MCUCONF" <<< "$conffile" || egrep -q "STM32L4R9_MCUCONF" <<< "$conffile" || egrep -q "STM32L4S9_MCUCONF" <<< "$conffile"
then then
echo Processing: $1 echo Processing: $1
egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[a-zA-Z0-9_]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt egrep -e "\#define\s+[a-zA-Z0-9_()]*\s+[^\s]" <<< "$conffile" | sed -r 's/\#define\s+([a-zA-Z0-9_]*)(\([^)]*\))?\s+/\1=/g' > ./values.txt
if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l4rxxx if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l4rxxx
then then
echo echo