From 43fd6471305d3ebd9e6cb537d4d39c71e480922e Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 25 Aug 2022 12:17:41 +0100 Subject: Add eeprom defaults for tinyuf2 bootloader (#18042) --- keyboards/mlego/m60/rev1/config.h | 3 - keyboards/mlego/m60/rev1/ld/STM32F401xE.ld | 88 ------------------------------ keyboards/mlego/m60/rev1/rules.mk | 2 - 3 files changed, 93 deletions(-) delete mode 100644 keyboards/mlego/m60/rev1/ld/STM32F401xE.ld (limited to 'keyboards/mlego/m60/rev1') diff --git a/keyboards/mlego/m60/rev1/config.h b/keyboards/mlego/m60/rev1/config.h index 49c9492aa2..7507dcd427 100644 --- a/keyboards/mlego/m60/rev1/config.h +++ b/keyboards/mlego/m60/rev1/config.h @@ -51,6 +51,3 @@ #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE #endif - -// you want to comment this if using stm32-dfu as bootloader -#define FEE_PAGE_BASE_ADDRESS 0x08008000 diff --git a/keyboards/mlego/m60/rev1/ld/STM32F401xE.ld b/keyboards/mlego/m60/rev1/ld/STM32F401xE.ld deleted file mode 100644 index daec7d8583..0000000000 --- a/keyboards/mlego/m60/rev1/ld/STM32F401xE.ld +++ /dev/null @@ -1,88 +0,0 @@ -/* - 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, len = 16k /* tinyuf2 bootloader requires app to be located at 64k offset for this MCU */ - flash1 (rx) : org = 0x08004000, len = 16k - flash2 (rx) : org = 0x08008000, len = 16k /* emulated eeprom */ - flash3 (rx) : org = 0x0800C000, len = 16k - flash4 (rx) : org = 0x08010000, len = 512k - 64k - 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", flash4); -REGION_ALIAS("VECTORS_FLASH_LMA", flash4); - -/* Flash region to be used for constructors and destructors.*/ -REGION_ALIAS("XTORS_FLASH", flash4); -REGION_ALIAS("XTORS_FLASH_LMA", flash4); - -/* Flash region to be used for code text.*/ -REGION_ALIAS("TEXT_FLASH", flash4); -REGION_ALIAS("TEXT_FLASH_LMA", flash4); - -/* Flash region to be used for read only data.*/ -REGION_ALIAS("RODATA_FLASH", flash4); -REGION_ALIAS("RODATA_FLASH_LMA", flash4); - -/* Flash region to be used for various.*/ -REGION_ALIAS("VARIOUS_FLASH", flash4); -REGION_ALIAS("VARIOUS_FLASH_LMA", flash4); - -/* Flash region to be used for RAM(n) initialization data.*/ -REGION_ALIAS("RAM_INIT_FLASH_LMA", flash4); - -/* 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", flash4); - -/* 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 */ diff --git a/keyboards/mlego/m60/rev1/rules.mk b/keyboards/mlego/m60/rev1/rules.mk index 4e071f302f..6c3ff56a08 100644 --- a/keyboards/mlego/m60/rev1/rules.mk +++ b/keyboards/mlego/m60/rev1/rules.mk @@ -5,8 +5,6 @@ BOARD = BLACKPILL_STM32_F401 # Bootloader selection BOOTLOADER = tinyuf2 #BOOTLOADER = stm32-dfu -MCU_LDSCRIPT = STM32F401xE -EEPROM_DRIVER = vendor # Build Options # change yes to no to disable -- cgit v1.2.3