From 086f9822c0d7b980c9943a9905096cf28bee49a1 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 6 Oct 2018 10:44:55 +0000 Subject: [PATCH] Renamed for consistency. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12338 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- .../mcuconf.h.ftl | 0 ..._stm32l4r5xx.sh => update_mcuconf_stm32l4rxxx.sh} | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) rename tools/ftl/processors/conf/{mcuconf_stm32l4r5xx => mcuconf_stm32l4rxxx}/mcuconf.h.ftl (100%) rename tools/updater/{update_mcuconf_stm32l4r5xx.sh => update_mcuconf_stm32l4rxxx.sh} (53%) diff --git a/tools/ftl/processors/conf/mcuconf_stm32l4r5xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32l4rxxx/mcuconf.h.ftl similarity index 100% rename from tools/ftl/processors/conf/mcuconf_stm32l4r5xx/mcuconf.h.ftl rename to tools/ftl/processors/conf/mcuconf_stm32l4rxxx/mcuconf.h.ftl diff --git a/tools/updater/update_mcuconf_stm32l4r5xx.sh b/tools/updater/update_mcuconf_stm32l4rxxx.sh similarity index 53% rename from tools/updater/update_mcuconf_stm32l4r5xx.sh rename to tools/updater/update_mcuconf_stm32l4rxxx.sh index 6b28c46dd..87122d0dc 100644 --- a/tools/updater/update_mcuconf_stm32l4r5xx.sh +++ b/tools/updater/update_mcuconf_stm32l4rxxx.sh @@ -3,18 +3,18 @@ if [ $# -eq 2 ] then if [ $1 = "rootpath" ] then - find $2 -name "mcuconf.h" -exec bash update_mcuconf_stm32l4r5xx.sh "{}" \; + find $2 -name "mcuconf.h" -exec bash update_mcuconf_stm32l4rxxx.sh "{}" \; else - echo "Usage: update_mcuconf_stm32l4r5xx.sh [rootpath ]" + echo "Usage: update_mcuconf_stm32l4rxxx.sh [rootpath ]" fi elif [ $# -eq 1 ] then declare conffile=$(<$1) - if egrep -q "STM32L4R5_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 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 - if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l4r5xx + if ! fmpp -q -C conf.fmpp -S ../ftl/processors/conf/mcuconf_stm32l4rxxx then echo echo "aborted" @@ -24,6 +24,6 @@ then rm ./mcuconf.h ./values.txt fi else - echo "Usage: update_mcuconf_stm32l4r5xx.sh [rootpath ]" - echo " update_mcuconf_stm32l4r5xx.sh ]" + echo "Usage: update_mcuconf_stm32l4rxxx.sh [rootpath ]" + echo " update_mcuconf_stm32l4rxxx.sh ]" fi