Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add eeprom defaults for tinyuf2 bootloader #18042

Merged
merged 4 commits into from
Aug 25, 2022
Merged

Add eeprom defaults for tinyuf2 bootloader #18042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7601d06
Remove stale tinyuf2 config
zvecr Aug 14, 2022
bf655d6
Add eeprom defaults for tinyuf2 bootloader
zvecr Aug 14, 2022
5cdb959
Remove vendor config
zvecr Aug 14, 2022
e8c15a6
Revert back to mcu_selection so it actually works....
zvecr Aug 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions builddefs/bootloader.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ endif
ifeq ($(strip $(BOOTLOADER)), tinyuf2)
OPT_DEFS += -DBOOTLOADER_TINYUF2
BOOTLOADER_TYPE = tinyuf2
FIRMWARE_FORMAT = uf2
endif
ifeq ($(strip $(BOOTLOADER)), rp2040)
OPT_DEFS += -DBOOTLOADER_RP2040
Expand Down
6 changes: 4 additions & 2 deletions builddefs/mcu_selection.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,8 @@ ifneq ($(findstring STM32F401, $(MCU)),)
# or <keyboard_dir>/ld/
ifeq ($(strip $(BOOTLOADER)), tinyuf2)
MCU_LDSCRIPT ?= STM32F401xC_tinyuf2
FIRMWARE_FORMAT ?= uf2
EEPROM_DRIVER ?= wear_leveling
WEAR_LEVELING_DRIVER ?= legacy
else
MCU_LDSCRIPT ?= STM32F401xC
endif
Expand Down Expand Up @@ -464,7 +465,8 @@ ifneq ($(findstring STM32F411, $(MCU)),)
# or <keyboard_dir>/ld/
ifeq ($(strip $(BOOTLOADER)), tinyuf2)
MCU_LDSCRIPT ?= STM32F411xE_tinyuf2
FIRMWARE_FORMAT ?= uf2
EEPROM_DRIVER ?= wear_leveling
WEAR_LEVELING_DRIVER ?= legacy
else
MCU_LDSCRIPT ?= STM32F411xE
endif
Expand Down
8 changes: 0 additions & 8 deletions keyboards/mechwild/puckbuddy/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,6 @@
#define MATRIX_ROWS 4
#define MATRIX_COLS 4

#ifdef UF2_BUILD
#define EXTERNAL_EEPROM_BYTE_COUNT 2048
#define EXTERNAL_EEPROM_PAGE_SIZE 128
#define EXTERNAL_EEPROM_ADDRESS_SIZE 1
#define EXTERNAL_EEPROM_WRITE_TIME 0
#define FEE_PAGE_BASE_ADDRESS 0x08008000
#endif

/* Define custom font */
#define OLED_FONT_H "keyboards/mechwild/puckbuddy/glcdfont.c"

Expand Down
88 changes: 0 additions & 88 deletions keyboards/mechwild/puckbuddy/ld/STM32F401xE.ld
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions keyboards/mechwild/puckbuddy/post_rules.mk
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions keyboards/mlego/m48/rev1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,3 @@
#define RGBLIGHT_EFFECT_TWINKLE

#endif

// you want to comment this if using stm32-dfu as bootloader
#define FEE_PAGE_BASE_ADDRESS 0x08008000
88 changes: 0 additions & 88 deletions keyboards/mlego/m48/rev1/ld/STM32F401xE.ld
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions keyboards/mlego/m48/rev1/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ MCU = STM32F401

# Bootloader selection
BOOTLOADER = tinyuf2
MCU_LDSCRIPT = STM32F401xE
EEPROM_DRIVER = vendor
#BOOTLOADER = stm32-dfu

# Build Options
Expand Down
3 changes: 0 additions & 3 deletions keyboards/mlego/m60/rev1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,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
88 changes: 0 additions & 88 deletions keyboards/mlego/m60/rev1/ld/STM32F401xE.ld
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions keyboards/mlego/m60/rev1/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ MCU = STM32F401
# Bootloader selection
BOOTLOADER = tinyuf2
#BOOTLOADER = stm32-dfu
MCU_LDSCRIPT = STM32F401xE
EEPROM_DRIVER = vendor

# Build Options
# change yes to no to disable
Expand Down
3 changes: 0 additions & 3 deletions keyboards/mlego/m60_split/rev1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,3 @@
#define BOOTMAGIC_LITE_ROW_RIGHT 5
#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
#endif

// you want to comment this if using stm32-dfu as bootloader
#define FEE_PAGE_BASE_ADDRESS 0x08008000
Loading