Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						462323418e
					
				
					 1 changed files with 12 additions and 13 deletions
				
			
		| 
						 | 
				
			
			@ -122,7 +122,7 @@ ifneq ($(findstring STM32F042, $(MCU)),)
 | 
			
		|||
  MCU_SERIES = STM32F0xx
 | 
			
		||||
 | 
			
		||||
  # Linker script to use
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  #   or <keyboard_dir>/ld/
 | 
			
		||||
  MCU_LDSCRIPT ?= STM32F042x6
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -159,7 +159,7 @@ ifneq ($(findstring STM32F072, $(MCU)),)
 | 
			
		|||
  MCU_SERIES = STM32F0xx
 | 
			
		||||
 | 
			
		||||
  # Linker script to use
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  #   or <keyboard_dir>/ld/
 | 
			
		||||
  MCU_LDSCRIPT ?= STM32F072xB
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -191,7 +191,7 @@ ifneq ($(findstring STM32F103, $(MCU)),)
 | 
			
		|||
  MCU_SERIES = STM32F1xx
 | 
			
		||||
 | 
			
		||||
  # Linker script to use
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  #   or <keyboard_dir>/ld/
 | 
			
		||||
  MCU_LDSCRIPT ?= STM32F103x8
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -223,7 +223,7 @@ ifneq ($(findstring STM32F303, $(MCU)),)
 | 
			
		|||
  MCU_SERIES = STM32F3xx
 | 
			
		||||
 | 
			
		||||
  # Linker script to use
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  #   or <keyboard_dir>/ld/
 | 
			
		||||
  MCU_LDSCRIPT ?= STM32F303xC
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -255,7 +255,7 @@ ifneq ($(findstring STM32F401, $(MCU)),)
 | 
			
		|||
  MCU_SERIES = STM32F4xx
 | 
			
		||||
 | 
			
		||||
  # Linker script to use
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  #   or <keyboard_dir>/ld/
 | 
			
		||||
  ifeq ($(strip $(BOOTLOADER)), tinyuf2)
 | 
			
		||||
    MCU_LDSCRIPT ?= STM32F401xC_tinyuf2
 | 
			
		||||
| 
						 | 
				
			
			@ -324,7 +324,7 @@ ifneq ($(findstring STM32F407, $(MCU)),)
 | 
			
		|||
  MCU_SERIES = STM32F4xx
 | 
			
		||||
 | 
			
		||||
  # Linker script to use
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  #   or <keyboard_dir>/ld/
 | 
			
		||||
  MCU_LDSCRIPT ?= STM32F407xE
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -356,7 +356,7 @@ ifneq ($(findstring STM32F411, $(MCU)),)
 | 
			
		|||
  MCU_SERIES = STM32F4xx
 | 
			
		||||
 | 
			
		||||
  # Linker script to use
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  #   or <keyboard_dir>/ld/
 | 
			
		||||
  ifeq ($(strip $(BOOTLOADER)), tinyuf2)
 | 
			
		||||
    MCU_LDSCRIPT ?= STM32F411xE_tinyuf2
 | 
			
		||||
| 
						 | 
				
			
			@ -393,8 +393,7 @@ ifneq ($(findstring STM32F446, $(MCU)),)
 | 
			
		|||
  MCU_SERIES = STM32F4xx
 | 
			
		||||
 | 
			
		||||
  # Linker script to use
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  #   or <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  #   or <keyboard_dir>/ld/
 | 
			
		||||
  MCU_LDSCRIPT ?= STM32F446xE
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -423,7 +422,7 @@ ifneq ($(findstring STM32G431, $(MCU)),)
 | 
			
		|||
  MCU_SERIES = STM32G4xx
 | 
			
		||||
 | 
			
		||||
  # Linker script to use
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  #   or <keyboard_dir>/ld/
 | 
			
		||||
  MCU_LDSCRIPT ?= STM32G431xB
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -455,7 +454,7 @@ ifneq ($(findstring STM32G474, $(MCU)),)
 | 
			
		|||
  MCU_SERIES = STM32G4xx
 | 
			
		||||
 | 
			
		||||
  # Linker script to use
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  #   or <keyboard_dir>/ld/
 | 
			
		||||
  MCU_LDSCRIPT ?= STM32G474xE
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -487,7 +486,7 @@ ifneq (,$(filter $(MCU),STM32L433 STM32L443))
 | 
			
		|||
  MCU_SERIES = STM32L4xx
 | 
			
		||||
 | 
			
		||||
  # Linker script to use
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  #   or <keyboard_dir>/ld/
 | 
			
		||||
  MCU_LDSCRIPT ?= STM32L432xC
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -521,7 +520,7 @@ ifneq (,$(filter $(MCU),STM32L412 STM32L422))
 | 
			
		|||
  MCU_SERIES = STM32L4xx
 | 
			
		||||
 | 
			
		||||
  # Linker script to use
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
 | 
			
		||||
  #   or <keyboard_dir>/ld/
 | 
			
		||||
  MCU_LDSCRIPT ?= STM32L412xB
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue