mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-04 07:12:33 +01:00 
			
		
		
		
	adding uf2 flash support for blackpill 401 (#13968)
* adding uf2 flash support for blackpill 401 * forgot to add blackpill to keyboard header file * making changes requested by drashna * fixing tzarc s comments * removing the keyboard * undo the change to dactyl_manuform.h
This commit is contained in:
		
							parent
							
								
									718f0a2482
								
							
						
					
					
						commit
						f314705921
					
				@ -298,7 +298,7 @@ Flashing sequence:
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
## tinyuf2
 | 
					## tinyuf2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Keyboards may opt into supporting the tinyuf2 bootloader. This is currently only supported on the F411 blackpill.
 | 
					Keyboards may opt into supporting the tinyuf2 bootloader. This is currently only supported on the F401/F411 blackpill.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
The `rules.mk` setting for this bootloader is `tinyuf2`, and can be specified at the keymap or user level.
 | 
					The `rules.mk` setting for this bootloader is `tinyuf2`, and can be specified at the keymap or user level.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -0,0 +1,88 @@
 | 
				
			|||||||
 | 
					/*
 | 
				
			||||||
 | 
					    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Licensed under the Apache License, Version 2.0 (the "License");
 | 
				
			||||||
 | 
					    you may not use this file except in compliance with the License.
 | 
				
			||||||
 | 
					    You may obtain a copy of the License at
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        http://www.apache.org/licenses/LICENSE-2.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Unless required by applicable law or agreed to in writing, software
 | 
				
			||||||
 | 
					    distributed under the License is distributed on an "AS IS" BASIS,
 | 
				
			||||||
 | 
					    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
				
			||||||
 | 
					    See the License for the specific language governing permissions and
 | 
				
			||||||
 | 
					    limitations under the License.
 | 
				
			||||||
 | 
					*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					 * STM32F401xC memory setup.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					MEMORY
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    flash0 (rx) : org = 0x08000000 + 64k, len = 256k - 64k /* tinyuf2 bootloader requires app to be located at 64k offset for this MCU */
 | 
				
			||||||
 | 
					    flash1 (rx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    flash2 (rx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    flash3 (rx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    flash4 (rx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    flash5 (rx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    flash6 (rx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    flash7 (rx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    ram0   (wx) : org = 0x20000000, len = 64k
 | 
				
			||||||
 | 
					    ram1   (wx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    ram2   (wx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    ram3   (wx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    ram4   (wx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    ram5   (wx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    ram6   (wx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    ram7   (wx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* For each data/text section two region are defined, a virtual region
 | 
				
			||||||
 | 
					   and a load region (_LMA suffix).*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Flash region to be used for exception vectors.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("VECTORS_FLASH", flash0);
 | 
				
			||||||
 | 
					REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Flash region to be used for constructors and destructors.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("XTORS_FLASH", flash0);
 | 
				
			||||||
 | 
					REGION_ALIAS("XTORS_FLASH_LMA", flash0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Flash region to be used for code text.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("TEXT_FLASH", flash0);
 | 
				
			||||||
 | 
					REGION_ALIAS("TEXT_FLASH_LMA", flash0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Flash region to be used for read only data.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("RODATA_FLASH", flash0);
 | 
				
			||||||
 | 
					REGION_ALIAS("RODATA_FLASH_LMA", flash0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Flash region to be used for various.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("VARIOUS_FLASH", flash0);
 | 
				
			||||||
 | 
					REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Flash region to be used for RAM(n) initialization data.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* RAM region to be used for Main stack. This stack accommodates the processing
 | 
				
			||||||
 | 
					   of all exceptions and interrupts.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("MAIN_STACK_RAM", ram0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* RAM region to be used for the process stack. This is the stack used by
 | 
				
			||||||
 | 
					   the main() function.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("PROCESS_STACK_RAM", ram0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* RAM region to be used for data segment.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("DATA_RAM", ram0);
 | 
				
			||||||
 | 
					REGION_ALIAS("DATA_RAM_LMA", flash0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* RAM region to be used for BSS segment.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("BSS_RAM", ram0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* RAM region to be used for the default heap.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("HEAP_RAM", ram0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Generic rules inclusion.*/
 | 
				
			||||||
 | 
					INCLUDE rules.ld
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* TinyUF2 bootloader reset support */
 | 
				
			||||||
 | 
					_board_dfu_dbl_tap = ORIGIN(ram0) + 64k - 4; /* this is based off the linker file for tinyuf2 */
 | 
				
			||||||
@ -0,0 +1,88 @@
 | 
				
			|||||||
 | 
					/*
 | 
				
			||||||
 | 
					    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Licensed under the Apache License, Version 2.0 (the "License");
 | 
				
			||||||
 | 
					    you may not use this file except in compliance with the License.
 | 
				
			||||||
 | 
					    You may obtain a copy of the License at
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        http://www.apache.org/licenses/LICENSE-2.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    Unless required by applicable law or agreed to in writing, software
 | 
				
			||||||
 | 
					    distributed under the License is distributed on an "AS IS" BASIS,
 | 
				
			||||||
 | 
					    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
				
			||||||
 | 
					    See the License for the specific language governing permissions and
 | 
				
			||||||
 | 
					    limitations under the License.
 | 
				
			||||||
 | 
					*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					 * STM32F401xE memory setup.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					MEMORY
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    flash0 (rx) : org = 0x08000000 + 64k, len = 512k - 64k /* tinyuf2 bootloader requires app to be located at 64k offset for this MCU */
 | 
				
			||||||
 | 
					    flash1 (rx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    flash2 (rx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    flash3 (rx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    flash4 (rx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    flash5 (rx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    flash6 (rx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    flash7 (rx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    ram0   (wx) : org = 0x20000000, len = 96k
 | 
				
			||||||
 | 
					    ram1   (wx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    ram2   (wx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    ram3   (wx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    ram4   (wx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    ram5   (wx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    ram6   (wx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					    ram7   (wx) : org = 0x00000000, len = 0
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* For each data/text section two region are defined, a virtual region
 | 
				
			||||||
 | 
					   and a load region (_LMA suffix).*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Flash region to be used for exception vectors.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("VECTORS_FLASH", flash0);
 | 
				
			||||||
 | 
					REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Flash region to be used for constructors and destructors.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("XTORS_FLASH", flash0);
 | 
				
			||||||
 | 
					REGION_ALIAS("XTORS_FLASH_LMA", flash0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Flash region to be used for code text.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("TEXT_FLASH", flash0);
 | 
				
			||||||
 | 
					REGION_ALIAS("TEXT_FLASH_LMA", flash0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Flash region to be used for read only data.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("RODATA_FLASH", flash0);
 | 
				
			||||||
 | 
					REGION_ALIAS("RODATA_FLASH_LMA", flash0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Flash region to be used for various.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("VARIOUS_FLASH", flash0);
 | 
				
			||||||
 | 
					REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Flash region to be used for RAM(n) initialization data.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* RAM region to be used for Main stack. This stack accommodates the processing
 | 
				
			||||||
 | 
					   of all exceptions and interrupts.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("MAIN_STACK_RAM", ram0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* RAM region to be used for the process stack. This is the stack used by
 | 
				
			||||||
 | 
					   the main() function.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("PROCESS_STACK_RAM", ram0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* RAM region to be used for data segment.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("DATA_RAM", ram0);
 | 
				
			||||||
 | 
					REGION_ALIAS("DATA_RAM_LMA", flash0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* RAM region to be used for BSS segment.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("BSS_RAM", ram0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* RAM region to be used for the default heap.*/
 | 
				
			||||||
 | 
					REGION_ALIAS("HEAP_RAM", ram0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Generic rules inclusion.*/
 | 
				
			||||||
 | 
					INCLUDE rules.ld
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* TinyUF2 bootloader reset support */
 | 
				
			||||||
 | 
					_board_dfu_dbl_tap = ORIGIN(ram0) + 64k - 4; /* this is based off the linker file for tinyuf2 */
 | 
				
			||||||
@ -252,7 +252,12 @@ ifneq ($(findstring STM32F401, $(MCU)),)
 | 
				
			|||||||
  # Linker script to use
 | 
					  # 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/ports/ARMCMx/compilers/GCC/ld/
 | 
				
			||||||
  #   or <keyboard_dir>/ld/
 | 
					  #   or <keyboard_dir>/ld/
 | 
				
			||||||
 | 
					  ifeq ($(strip $(BOOTLOADER)), tinyuf2)
 | 
				
			||||||
 | 
					    MCU_LDSCRIPT ?= STM32F401xC_tinyuf2
 | 
				
			||||||
 | 
					    FIRMWARE_FORMAT ?= uf2
 | 
				
			||||||
 | 
					  else
 | 
				
			||||||
    MCU_LDSCRIPT ?= STM32F401xC
 | 
					    MCU_LDSCRIPT ?= STM32F401xC
 | 
				
			||||||
 | 
					  endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  # Startup code to use
 | 
					  # Startup code to use
 | 
				
			||||||
  #  - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
 | 
					  #  - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user