stm32h7_m4: create a generic variant

This allows having all the generic code in a single place, including the needed clock configuration override

Author: facchinm

boards.txt

@@ -74,7 +74,7 @@ envie_m7.menu.target_core.cm7.build.fpu=-mfpu=fpv5-d16
 envie_m7.menu.target_core.cm7.build.architecture=cortex-m7
 envie_m7.menu.target_core.cm7.compiler.mbed.arch.define=
 
-envie_m7.menu.target_core.cm4.build.variant=PORTENTA_H7_M4
+envie_m7.menu.target_core.cm4.build.variant=GENERIC_STM32H747_M4
 envie_m7.menu.target_core.cm4.build.mcu=cortex-m4
 envie_m7.menu.target_core.cm4.build.fpu=-mfpu=fpv4-sp-d16
 envie_m7.menu.target_core.cm4.build.architecture=cortex-m4
@@ -99,7 +99,7 @@ envie_m7.compiler.mbed.defines={build.variant.path}/defines.txt
 envie_m7.compiler.mbed.ldflags={build.variant.path}/ldflags.txt
 envie_m7.compiler.mbed.cflags={build.variant.path}/cflags.txt
 envie_m7.compiler.mbed.cxxflags={build.variant.path}/cxxflags.txt
-envie_m7.compiler.mbed.includes={build.variant.path}/includes.txt
+envie_m7.compiler.mbed.includes={build.variant.path}/../PORTENTA_H7_M7/includes.txt
 envie_m7.compiler.mbed.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
 envie_m7.compiler.mbed="{build.variant.path}/libs/libmbed.a"
 envie_m7.vid.0=0x2341
@@ -492,7 +492,7 @@ nicla_vision.menu.target_core.cm7.build.fpu=-mfpu=fpv5-d16
 nicla_vision.menu.target_core.cm7.build.architecture=cortex-m7
 nicla_vision.menu.target_core.cm7.compiler.mbed.arch.define=
 
-nicla_vision.menu.target_core.cm4.build.variant=PORTENTA_H7_M4
+nicla_vision.menu.target_core.cm4.build.variant=GENERIC_STM32H747_M4
 nicla_vision.menu.target_core.cm4.build.mcu=cortex-m4
 nicla_vision.menu.target_core.cm4.build.fpu=-mfpu=fpv4-sp-d16
 nicla_vision.menu.target_core.cm4.build.architecture=cortex-m4
@@ -510,7 +510,7 @@ nicla_vision.compiler.mbed.defines={build.variant.path}/defines.txt
 nicla_vision.compiler.mbed.ldflags={build.variant.path}/ldflags.txt
 nicla_vision.compiler.mbed.cflags={build.variant.path}/cflags.txt
 nicla_vision.compiler.mbed.cxxflags={build.variant.path}/cxxflags.txt
-nicla_vision.compiler.mbed.includes={build.variant.path}/includes.txt
+nicla_vision.compiler.mbed.includes={build.variant.path}/../NICLA_VISION/includes.txt
 nicla_vision.compiler.mbed.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
 nicla_vision.compiler.mbed="{build.variant.path}/libs/libmbed.a"
 nicla_vision.vid.0=0x2341
@@ -590,7 +590,7 @@ opta.menu.target_core.cm7.build.fpu=-mfpu=fpv5-d16
 opta.menu.target_core.cm7.build.architecture=cortex-m7
 opta.menu.target_core.cm7.compiler.mbed.arch.define=
 
-opta.menu.target_core.cm4.build.variant=PORTENTA_H7_M4
+opta.menu.target_core.cm4.build.variant=GENERIC_STM32H747_M4
 opta.menu.target_core.cm4.build.mcu=cortex-m4
 opta.menu.target_core.cm4.build.fpu=-mfpu=fpv4-sp-d16
 opta.menu.target_core.cm4.build.architecture=cortex-m4
@@ -617,7 +617,7 @@ opta.compiler.mbed.defines={build.variant.path}/defines.txt
 opta.compiler.mbed.ldflags={build.variant.path}/ldflags.txt
 opta.compiler.mbed.cflags={build.variant.path}/cflags.txt
 opta.compiler.mbed.cxxflags={build.variant.path}/cxxflags.txt
-opta.compiler.mbed.includes={build.variant.path}/includes.txt
+opta.compiler.mbed.includes={build.variant.path}/../OPTA/includes.txt
 opta.compiler.mbed.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
 opta.compiler.mbed="{build.variant.path}/libs/libmbed.a"
 opta.vid.0=0x2341
@@ -716,7 +716,7 @@ giga.menu.target_core.cm7.build.fpu=-mfpu=fpv5-d16
 giga.menu.target_core.cm7.build.architecture=cortex-m7
 giga.menu.target_core.cm7.compiler.mbed.arch.define=
 
-giga.menu.target_core.cm4.build.variant=PORTENTA_H7_M4
+giga.menu.target_core.cm4.build.variant=GENERIC_STM32H747_M4
 giga.menu.target_core.cm4.build.mcu=cortex-m4
 giga.menu.target_core.cm4.build.fpu=-mfpu=fpv4-sp-d16
 giga.menu.target_core.cm4.build.architecture=cortex-m4
@@ -739,7 +739,7 @@ giga.compiler.mbed.defines={build.variant.path}/defines.txt
 giga.compiler.mbed.ldflags={build.variant.path}/ldflags.txt
 giga.compiler.mbed.cflags={build.variant.path}/cflags.txt
 giga.compiler.mbed.cxxflags={build.variant.path}/cxxflags.txt
-giga.compiler.mbed.includes={build.variant.path}/includes.txt
+giga.compiler.mbed.includes={build.variant.path}/../GIGA/includes.txt
 giga.compiler.mbed.extra_ldflags=-lstdc++ -lsupc++ -lm -lc -lgcc -lnosys
 giga.compiler.mbed="{build.variant.path}/libs/libmbed.a"
 giga.vid.0=0x2341

giga.variables

@@ -1,5 +1,5 @@
 export FLAVOUR="giga"
-export VARIANTS=("GIGA PORTENTA_H7_M4")
+export VARIANTS=("GIGA GENERIC_STM32H747_M4")
 export FQBNS=("giga")
 export LIBRARIES=("MRI Portenta_SDRAM SPI WiFi ea_malloc openamp_arduino STM32H747_System ThreadDebug Himax_HM01B0 PDM Arduino_H7_Video USBAudio KernelDebug Portenta_Audio RPC USBHID Wire Portenta_lvgl Camera rpclib OV7670 mbed-memory-status Scheduler USBMSD USBMIDI SocketWrapper MCUboot Arduino_CAN")
 export BOOTLOADERS=("GIGA")

libraries/Arduino_CAN/src/Arduino_CAN.h

@@ -24,7 +24,7 @@
  * COMPILE TIME CHECKS
  **************************************************************************************/
 
-#if !(defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4) || defined(ARDUINO_GIGA))
+#if !(defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_GIGA))
 # error "CAN only available on Arduino Portenta H7 and Arduino Giga (of all ArduinoCore-mbed enabled boards)."
 #endif
 

libraries/Camera/src/camera.cpp

@@ -28,7 +28,7 @@
 #define ALIGN_PTR(p,a)   ((p & (a-1)) ?(((uintptr_t)p + a) & ~(uintptr_t)(a-1)) : p)
 
 // Include all image sensor drivers here.
-#if defined (ARDUINO_PORTENTA_H7_M7) || defined (ARDUINO_PORTENTA_H7_M4)
+#if defined (ARDUINO_PORTENTA_H7_M7)
 
 #define DCMI_TIM                    (TIM1)
 #define DCMI_TIM_PIN                (GPIO_PIN_1)
@@ -80,7 +80,7 @@ arduino::MbedI2C CameraWire(I2C_SDA1, I2C_SCL1);
 
 // DCMI GPIO pins struct
 static const struct { GPIO_TypeDef *port; uint16_t pin; } dcmi_pins[] = {
-    #if defined (ARDUINO_PORTENTA_H7_M7) || defined (ARDUINO_PORTENTA_H7_M4)
+    #if defined (ARDUINO_PORTENTA_H7_M7)
     {GPIOA,     GPIO_PIN_4  },
     {GPIOA,     GPIO_PIN_6  },
     {GPIOI,     GPIO_PIN_4  },
@@ -175,7 +175,7 @@ void HAL_DCMI_MspInit(DCMI_HandleTypeDef *hdcmi)
     hgpio.Speed     = GPIO_SPEED_FREQ_VERY_HIGH;
     hgpio.Alternate = GPIO_AF13_DCMI;
 
-    #if defined (ARDUINO_PORTENTA_H7_M7) || defined (ARDUINO_PORTENTA_H7_M4)
+    #if defined (ARDUINO_PORTENTA_H7_M7)
     /* Enable GPIO clocks */
     __HAL_RCC_GPIOA_CLK_ENABLE();
     __HAL_RCC_GPIOH_CLK_ENABLE();

libraries/SocketWrapper/src/utility/wl_definitions.h

@@ -70,9 +70,9 @@ enum wl_enc_type {  /* Values map to 802.11 encryption suites... */
         ENC_TYPE_AUTO = 8
 };
 
-#if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4)
+#if defined(ARDUINO_PORTENTA_H7_M7)
 #include "whd_version.h"
 #define WIFI_FIRMWARE_LATEST_VERSION WHD_VERSION
 #endif
 
-#endif /* WL_DEFINITIONS_H_ */
+#endif /* WL_DEFINITIONS_H_ */

libraries/WiFi/src/utility/wl_definitions.h

@@ -70,9 +70,9 @@ enum wl_enc_type {  /* Values map to 802.11 encryption suites... */
         ENC_TYPE_AUTO = 8
 };
 
-#if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_PORTENTA_H7_M4)
+#if defined(ARDUINO_PORTENTA_H7_M7)
 #include "whd_version.h"
 #define WIFI_FIRMWARE_LATEST_VERSION WHD_VERSION
 #endif
 
-#endif /* WL_DEFINITIONS_H_ */
+#endif /* WL_DEFINITIONS_H_ */

mbed-os-to-arduino

@@ -183,7 +183,7 @@ generate_flags () {
 	for fl in c cxx ld; do
 		jq -r '.flags | .[] | select(. != "-MMD")' ./BUILD/"$BOARDNAME"/GCC_ARM${PROFILE}/.profile-${fl} \
 		> "$ARDUINOVARIANT"/${fl}flags.txt
-		if [[ $ARDUINOVARIANT == *PORTENTA* || $ARDUINOVARIANT == *GIGA* || $ARDUINOVARIANT == *NICLA_VISION* || $ARDUINOVARIANT == *OPTA* ]]; then
+		if [[ $ARDUINOVARIANT == *PORTENTA* || $ARDUINOVARIANT == *GIGA* || $ARDUINOVARIANT == *NICLA_VISION* || $ARDUINOVARIANT == *OPTA* || $ARDUINOVARIANT == *GENERIC*M4 ]]; then
 			echo "Patching '-fno-exceptions' flag for $ARDUINOVARIANT/${fl}flags.txt"
 			sed -i '/-fno-exceptions/d' "$ARDUINOVARIANT"/${fl}flags.txt
 			set +e

nicla.variables

@@ -1,5 +1,5 @@
 export FLAVOUR="nicla"
-export VARIANTS=("NICLA NICLA_VISION PORTENTA_H7_M4")
+export VARIANTS=("NICLA NICLA_VISION GENERIC_STM32H747_M4")
 export FQBNS=("nicla_sense nicla_voice nicla_vision")
 export LIBRARIES=("SPI Wire Scheduler Nicla_System WiFi ea_malloc openamp_arduino STM32H747_System ThreadDebug GC2145 Himax_HM01B0 PDM KernelDebug RPC USBHID Camera rpclib USBHOST mbed-memory-status USBMSD SocketWrapper MRI SE05X MLC NDP syntiant_ilib")
 export BOOTLOADERS=("NICLA NICLA_VISION NICLA_VOICE")

opta.variables

@@ -1,5 +1,5 @@
 export FLAVOUR="opta"
-export VARIANTS=("OPTA PORTENTA_H7_M4")
+export VARIANTS=("OPTA GENERIC_STM32H747_M4")
 export FQBNS=("opta")
 export LIBRARIES=("Ethernet SPI WiFi openamp_arduino ThreadDebug KernelDebug RPC USBHID Wire rpclib USBHOST mbed-memory-status Scheduler USBMSD SocketWrapper STM32H747_System MRI")
 export BOOTLOADERS=("OPTA")

portenta.variables

@@ -1,5 +1,5 @@
 export FLAVOUR="portenta"
-export VARIANTS=("PORTENTA_H7_M7 PORTENTA_H7_M4 PORTENTA_X8")
+export VARIANTS=("PORTENTA_H7_M7 GENERIC_STM32H747_M4 PORTENTA_X8")
 export FQBNS=("envie_m7 portenta_x8")
 export LIBRARIES=("doom Ethernet MRI Portenta_SDRAM SPI WiFi ea_malloc openamp_arduino STM32H747_System ThreadDebug Himax_HM01B0 Himax_HM0360 PDM Arduino_H7_Video USBAudio KernelDebug Portenta_Audio RPC USBHID Wire Portenta_lvgl Camera rpclib USBHOST mbed-memory-status Portenta_SDCARD Scheduler USBMSD USBMIDI SocketWrapper GSM GPS MCUboot Arduino_CAN")
 export BOOTLOADERS=("PORTENTA_H7")