Add NUCLEO-L496ZG and NUCLEO-L496ZG-P support

boards.txt

@@ -49,6 +49,30 @@ Nucleo_144.menu.pnum.NUCLEO_F429ZI.build.product_line=STM32F429xx
 Nucleo_144.menu.pnum.NUCLEO_F429ZI.build.variant=NUCLEO_F429ZI
 Nucleo_144.menu.pnum.NUCLEO_F429ZI.build.cmsis_lib_gcc=arm_cortexM4l_math
 
+# NUCLEO_L496ZG board
+Nucleo_144.menu.pnum.NUCLEO_L496ZG=Nucleo L496ZG
+Nucleo_144.menu.pnum.NUCLEO_L496ZG.node=NODE_L496ZG
+Nucleo_144.menu.pnum.NUCLEO_L496ZG.upload.maximum_size=1048576
+Nucleo_144.menu.pnum.NUCLEO_L496ZG.upload.maximum_data_size=327680
+Nucleo_144.menu.pnum.NUCLEO_L496ZG.build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
+Nucleo_144.menu.pnum.NUCLEO_L496ZG.build.board=NUCLEO_L496ZG
+Nucleo_144.menu.pnum.NUCLEO_L496ZG.build.series=STM32L4xx
+Nucleo_144.menu.pnum.NUCLEO_L496ZG.build.product_line=STM32L496xx
+Nucleo_144.menu.pnum.NUCLEO_L496ZG.build.variant=NUCLEO_L496ZG
+Nucleo_144.menu.pnum.NUCLEO_L496ZG.build.cmsis_lib_gcc=arm_cortexM4l_math
+
+# NUCLEO_L496ZG-P board
+Nucleo_144.menu.pnum.NUCLEO_L496ZG-P=Nucleo L496ZG-P
+Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.node=NODE_L496ZG
+Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.upload.maximum_size=1048576
+Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.upload.maximum_data_size=327680
+Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
+Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.build.board=NUCLEO_L496ZG_P
+Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.build.series=STM32L4xx
+Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.build.product_line=STM32L496xx
+Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.build.variant=NUCLEO_L496ZG
+Nucleo_144.menu.pnum.NUCLEO_L496ZG-P.build.cmsis_lib_gcc=arm_cortexM4l_math
+
 # Upload menu
 Nucleo_144.menu.upload_method.MassStorage=Mass Storage
 Nucleo_144.menu.upload_method.MassStorage.upload.protocol=

cores/arduino/pins_arduino.h

@@ -49,7 +49,7 @@ enum {
 
 // Arduino analog pins
 // Analog pins must be contiguous to be able to loop on each value
-#define MAX_ANALOG_INPUTS 20
+#define MAX_ANALOG_INPUTS 24
 _Static_assert(NUM_ANALOG_INPUTS <= MAX_ANALOG_INPUTS,
                "Core NUM_ANALOG_INPUTS limited to MAX_ANALOG_INPUTS" );
 _Static_assert(NUM_ANALOG_FIRST >= NUM_ANALOG_INPUTS,
@@ -138,6 +138,22 @@ static const uint8_t A18 = PIN_A18;
 #define PIN_A19      (PIN_A18 + 1)
 static const uint8_t A19 = PIN_A19;
 #endif
+#if NUM_ANALOG_INPUTS > 20
+#define PIN_A20      (PIN_A19 + 1)
+static const uint8_t A20 = PIN_A20;
+#endif
+#if NUM_ANALOG_INPUTS > 21
+#define PIN_A21      (PIN_A20 + 1)
+static const uint8_t A21 = PIN_A21;
+#endif
+#if NUM_ANALOG_INPUTS > 22
+#define PIN_A22      (PIN_A21 + 1)
+static const uint8_t A22 = PIN_A22;
+#endif
+#if NUM_ANALOG_INPUTS > 23
+#define PIN_A23      (PIN_A22 + 1)
+static const uint8_t A23 = PIN_A23;
+#endif
 
 // Default for Arduino connector compatibility
 // SPI Definitions

cores/arduino/stm32/PortNames.c

@@ -132,6 +132,11 @@ GPIO_TypeDef *set_GPIO_Port_Clock(uint32_t port_idx) {
 #endif
 #if defined GPIOG_BASE
         case PortG:
+#if defined(STM32L4xx) && defined(PWR_CR2_IOSV)
+            // Enable VDDIO2 supply for 14 I/Os (Port G[15:2])
+            __HAL_RCC_PWR_CLK_ENABLE();
+            HAL_PWREx_EnableVddIO2();
+#endif
             gpioPort = (GPIO_TypeDef *)GPIOG_BASE;
             __HAL_RCC_GPIOG_CLK_ENABLE();
             break;

variants/NUCLEO_L496ZG/PinNamesVar.h

@@ -0,0 +1,25 @@
+    /* SYS_WKUP */
+#ifdef PWR_WAKEUP_PIN1
+    SYS_WKUP1 = PA_0,
+#endif
+#ifdef PWR_WAKEUP_PIN2
+    SYS_WKUP2 = PC_13,
+#endif
+#ifdef PWR_WAKEUP_PIN3
+    SYS_WKUP3 = PE_6,
+#endif
+#ifdef PWR_WAKEUP_PIN4
+    SYS_WKUP4 = PA_2,
+#endif
+#ifdef PWR_WAKEUP_PIN5
+    SYS_WKUP5 = PC_5,
+#endif
+#ifdef PWR_WAKEUP_PIN6
+    SYS_WKUP6 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN7
+    SYS_WKUP7 = NC,
+#endif
+#ifdef PWR_WAKEUP_PIN8
+    SYS_WKUP8 = NC,
+#endif

variants/NUCLEO_L496ZG/ldscript.ld

@@ -0,0 +1,183 @@
+/*
+*****************************************************************************
+**
+
+**  File        : LinkerScript.ld
+**
+**  Abstract    : Linker script for STM32L496ZGTx(P) Device with
+**                1024KByte FLASH, 320KByte RAM
+**
+**                Set heap size, stack size and stack location according
+**                to application requirements.
+**
+**                Set memory bank area and size if external memory is used.
+**
+**  Target      : STMicroelectronics STM32
+**
+**
+**  Distribution: The file is distributed as is, without any warranty
+**                of any kind.
+**
+**  (c)Copyright Ac6.
+**  You may use this file as-is or modify it according to the needs of your
+**  project. Distribution of this file (unmodified or modified) is not
+**  permitted. Ac6 permit registered System Workbench for MCU users the
+**  rights to distribute the assembled, compiled & linked contents of this
+**  file as part of an application binary file, provided that it is built
+**  using the System Workbench for MCU toolchain.
+**
+*****************************************************************************
+*/
+
+/* Entry Point */
+ENTRY(Reset_Handler)
+
+/* Highest address of the user mode stack */
+_estack = 0x20050000;    /* end of RAM */
+/* Generate a link error if heap and stack don't fit into RAM */
+_Min_Heap_Size = 0x200;      /* required amount of heap  */
+_Min_Stack_Size = 0x400; /* required amount of stack */
+
+/* Specify the memory areas */
+MEMORY
+{
+RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 320K
+FLASH (rx)      : ORIGIN = 0x8000000, LENGTH = 1024K
+}
+
+/* Define output sections */
+SECTIONS
+{
+  /* The startup code goes first into FLASH */
+  .isr_vector :
+  {
+    . = ALIGN(8);
+    KEEP(*(.isr_vector)) /* Startup code */
+    . = ALIGN(8);
+  } >FLASH
+
+  /* The program code and other data goes into FLASH */
+  .text :
+  {
+    . = ALIGN(8);
+    *(.text)           /* .text sections (code) */
+    *(.text*)          /* .text* sections (code) */
+    *(.glue_7)         /* glue arm to thumb code */
+    *(.glue_7t)        /* glue thumb to arm code */
+    *(.eh_frame)
+
+    KEEP (*(.init))
+    KEEP (*(.fini))
+
+    . = ALIGN(8);
+    _etext = .;        /* define a global symbols at end of code */
+  } >FLASH
+
+  /* Constant data goes into FLASH */
+  .rodata :
+  {
+    . = ALIGN(8);
+    *(.rodata)         /* .rodata sections (constants, strings, etc.) */
+    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */
+    . = ALIGN(8);
+  } >FLASH
+
+  .ARM.extab   :
+  {
+  . = ALIGN(8);
+  *(.ARM.extab* .gnu.linkonce.armextab.*)
+  . = ALIGN(8);
+  } >FLASH
+  .ARM : {
+	. = ALIGN(8);
+    __exidx_start = .;
+    *(.ARM.exidx*)
+    __exidx_end = .;
+	. = ALIGN(8);
+  } >FLASH
+
+  .preinit_array     :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__preinit_array_start = .);
+    KEEP (*(.preinit_array*))
+    PROVIDE_HIDDEN (__preinit_array_end = .);
+	. = ALIGN(8);
+  } >FLASH
+
+  .init_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__init_array_start = .);
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array*))
+    PROVIDE_HIDDEN (__init_array_end = .);
+	. = ALIGN(8);
+  } >FLASH
+  .fini_array :
+  {
+	. = ALIGN(8);
+    PROVIDE_HIDDEN (__fini_array_start = .);
+    KEEP (*(SORT(.fini_array.*)))
+    KEEP (*(.fini_array*))
+    PROVIDE_HIDDEN (__fini_array_end = .);
+	. = ALIGN(8);
+  } >FLASH
+
+  /* used by the startup to initialize data */
+  _sidata = LOADADDR(.data);
+
+  /* Initialized data sections goes into RAM, load LMA copy after code */
+  .data :
+  {
+    . = ALIGN(8);
+    _sdata = .;        /* create a global symbol at data start */
+    *(.data)           /* .data sections */
+    *(.data*)          /* .data* sections */
+
+    . = ALIGN(8);
+    _edata = .;        /* define a global symbol at data end */
+  } >RAM AT> FLASH
+
+
+  /* Uninitialized data section */
+  . = ALIGN(4);
+  .bss :
+  {
+    /* This is used by the startup in order to initialize the .bss secion */
+    _sbss = .;         /* define a global symbol at bss start */
+    __bss_start__ = _sbss;
+    *(.bss)
+    *(.bss*)
+    *(COMMON)
+
+    . = ALIGN(4);
+    _ebss = .;         /* define a global symbol at bss end */
+    __bss_end__ = _ebss;
+  } >RAM
+
+  /* User_heap_stack section, used to check that there is enough RAM left */
+  ._user_heap_stack :
+  {
+    . = ALIGN(8);
+    PROVIDE ( end = . );
+    PROVIDE ( _end = . );
+    . = . + _Min_Heap_Size;
+    . = . + _Min_Stack_Size;
+    . = ALIGN(8);
+  } >RAM
+
+
+
+  /* Remove information from the standard libraries */
+  /DISCARD/ :
+  {
+    libc.a ( * )
+    libm.a ( * )
+    libgcc.a ( * )
+  }
+
+  .ARM.attributes 0 : { *(.ARM.attributes) }
+}
+
+