Enable M4 on all STM32H747 boards as menu

giga.variables

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

nicla.variables

@@ -1,5 +1,5 @@
 export FLAVOUR="nicla"
-export VARIANTS=("NICLA NICLA_VISION")
+export VARIANTS=("NICLA NICLA_VISION PORTENTA_H7_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")
+export VARIANTS=("OPTA PORTENTA_H7_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 FQBNS=("envie_m7 envie_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 Portenta_Video USBAudio KernelDebug Portenta_Audio RPC USBHID Wire Portenta_lvgl Camera rpclib USBHOST mbed-memory-status Portenta_SDCARD Scheduler USBMSD SocketWrapper GSM GPS MCUboot")
 export BOOTLOADERS=("PORTENTA_H7")

variants/GIGA/pins_arduino.h

@@ -12,7 +12,7 @@ extern "C" bool isBetaBoard();
 
 // Booting
 // ----
-#define bootM4() LL_RCC_ForceCM4Boot() // Provide a memorable alias
+void bootM4();
 
 extern PinName digitalPinToPinName(pin_size_t P);
 

variants/GIGA/variant.cpp

@@ -206,4 +206,12 @@ void _ontouch1200bps_() {
   NVIC_SystemReset();
 }
 
+#include "stm32h7xx_ll_system.h"
+
+void bootM4() {
+  // Classic boot, just set the address and we are ready to go
+  LL_SYSCFG_SetCM4BootAddress0(CM4_BINARY_START >> 16);
+  LL_RCC_ForceCM4Boot();
+}
+
 #endif

variants/NICLA_VISION/pins_arduino.h

@@ -12,7 +12,7 @@ extern "C" bool isBetaBoard();
 
 // Booting
 // ----
-#define bootM4() LL_RCC_ForceCM4Boot() // Provide a memorable alias
+void bootM4();
 
 extern PinName digitalPinToPinName(pin_size_t P);
 

variants/NICLA_VISION/variant.cpp

@@ -264,4 +264,12 @@ void _ontouch1200bps_() {
   NVIC_SystemReset();
 }
 
+#include "stm32h7xx_ll_system.h"
+
+void bootM4() {
+  // Classic boot, just set the address and we are ready to go
+  LL_SYSCFG_SetCM4BootAddress0(CM4_BINARY_START >> 16);
+  LL_RCC_ForceCM4Boot();
+}
+
 #endif

variants/OPTA/variant.cpp

@@ -375,4 +375,12 @@ void _ontouch1200bps_() {
   NVIC_SystemReset();
 }
 
+#include "stm32h7xx_ll_system.h"
+
+void bootM4() {
+  // Classic boot, just set the address and we are ready to go
+  LL_SYSCFG_SetCM4BootAddress0(CM4_BINARY_START >> 16);
+  LL_RCC_ForceCM4Boot();
+}
+
 #endif

variants/PORTENTA_H7_M4/pins_arduino.h

@@ -3,7 +3,7 @@
 #elif defined(OPTA_PINS)
 #include "../OPTA/pins_arduino.h"
 #elif defined(NVISION_PINS)
-#include "../NICLA_VSION/pins_arduino.h"
+#include "../NICLA_VISION/pins_arduino.h"
 #elif defined(GIGA_PINS)
 #include "../GIGA/pins_arduino.h"
 #endif

variants/PORTENTA_H7_M4/variant.cpp

@@ -5,7 +5,7 @@
 #elif defined(OPTA_PINS)
 #include "../OPTA/variant.cpp"
 #elif defined(NVISION_PINS)
-#include "../NICLA_VSION/variant.cpp"
+#include "../NICLA_VISION/variant.cpp"
 #elif defined(GIGA_PINS)
 #include "../GIGA/variant.cpp"
 #endif

variants/PORTENTA_X8/pins_arduino.h

@@ -12,7 +12,7 @@ extern "C" bool isBetaBoard();
 
 // Booting
 // ----
-void bootM4();
+// void bootM4();
 
 extern PinName digitalPinToPinName(pin_size_t P);