Skip to content

Commit 43fd647

Browse files
authored
Add eeprom defaults for tinyuf2 bootloader (#18042)
1 parent 1c47bd0 commit 43fd647

File tree

21 files changed

+5
-574
lines changed

21 files changed

+5
-574
lines changed

builddefs/bootloader.mk

+1
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ endif
199199
ifeq ($(strip $(BOOTLOADER)), tinyuf2)
200200
OPT_DEFS += -DBOOTLOADER_TINYUF2
201201
BOOTLOADER_TYPE = tinyuf2
202+
FIRMWARE_FORMAT = uf2
202203
endif
203204
ifeq ($(strip $(BOOTLOADER)), rp2040)
204205
OPT_DEFS += -DBOOTLOADER_RP2040

builddefs/mcu_selection.mk

+4-2
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,8 @@ ifneq ($(findstring STM32F401, $(MCU)),)
348348
# or <keyboard_dir>/ld/
349349
ifeq ($(strip $(BOOTLOADER)), tinyuf2)
350350
MCU_LDSCRIPT ?= STM32F401xC_tinyuf2
351-
FIRMWARE_FORMAT ?= uf2
351+
EEPROM_DRIVER ?= wear_leveling
352+
WEAR_LEVELING_DRIVER ?= legacy
352353
else
353354
MCU_LDSCRIPT ?= STM32F401xC
354355
endif
@@ -464,7 +465,8 @@ ifneq ($(findstring STM32F411, $(MCU)),)
464465
# or <keyboard_dir>/ld/
465466
ifeq ($(strip $(BOOTLOADER)), tinyuf2)
466467
MCU_LDSCRIPT ?= STM32F411xE_tinyuf2
467-
FIRMWARE_FORMAT ?= uf2
468+
EEPROM_DRIVER ?= wear_leveling
469+
WEAR_LEVELING_DRIVER ?= legacy
468470
else
469471
MCU_LDSCRIPT ?= STM32F411xE
470472
endif

keyboards/mechwild/puckbuddy/config.h

-8
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,6 @@
99
#define MATRIX_ROWS 4
1010
#define MATRIX_COLS 4
1111

12-
#ifdef UF2_BUILD
13-
#define EXTERNAL_EEPROM_BYTE_COUNT 2048
14-
#define EXTERNAL_EEPROM_PAGE_SIZE 128
15-
#define EXTERNAL_EEPROM_ADDRESS_SIZE 1
16-
#define EXTERNAL_EEPROM_WRITE_TIME 0
17-
#define FEE_PAGE_BASE_ADDRESS 0x08008000
18-
#endif
19-
2012
/* Define custom font */
2113
#define OLED_FONT_H "keyboards/mechwild/puckbuddy/glcdfont.c"
2214

keyboards/mechwild/puckbuddy/ld/STM32F401xE.ld

-88
This file was deleted.

keyboards/mechwild/puckbuddy/post_rules.mk

-7
This file was deleted.

keyboards/mlego/m48/rev1/config.h

-3
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,3 @@
5151
#define RGBLIGHT_EFFECT_TWINKLE
5252

5353
#endif
54-
55-
// you want to comment this if using stm32-dfu as bootloader
56-
#define FEE_PAGE_BASE_ADDRESS 0x08008000

keyboards/mlego/m48/rev1/ld/STM32F401xE.ld

-88
This file was deleted.

keyboards/mlego/m48/rev1/rules.mk

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ BOARD = BLACKPILL_STM32_F401
44

55
# Bootloader selection
66
BOOTLOADER = tinyuf2
7-
MCU_LDSCRIPT = STM32F401xE
8-
EEPROM_DRIVER = vendor
97
#BOOTLOADER = stm32-dfu
108

119
# Build Options

keyboards/mlego/m60/rev1/config.h

-3
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,3 @@
5151
#define RGBLIGHT_EFFECT_ALTERNATING
5252
#define RGBLIGHT_EFFECT_TWINKLE
5353
#endif
54-
55-
// you want to comment this if using stm32-dfu as bootloader
56-
#define FEE_PAGE_BASE_ADDRESS 0x08008000

keyboards/mlego/m60/rev1/ld/STM32F401xE.ld

-88
This file was deleted.

keyboards/mlego/m60/rev1/rules.mk

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ BOARD = BLACKPILL_STM32_F401
55
# Bootloader selection
66
BOOTLOADER = tinyuf2
77
#BOOTLOADER = stm32-dfu
8-
MCU_LDSCRIPT = STM32F401xE
9-
EEPROM_DRIVER = vendor
108

119
# Build Options
1210
# change yes to no to disable

keyboards/mlego/m60_split/rev1/config.h

-3
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,3 @@
7878
#define BOOTMAGIC_LITE_ROW_RIGHT 5
7979
#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
8080
#endif
81-
82-
// you want to comment this if using stm32-dfu as bootloader
83-
#define FEE_PAGE_BASE_ADDRESS 0x08008000

0 commit comments

Comments
 (0)