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

Jump to bottom

Refactor f103,f072,f042 based keyboards to use new MCU selection defaults #7705

Merged
merged 3 commits into from
Jan 10, 2020
Merged

Refactor f103,f072,f042 based keyboards to use new MCU selection defaults #7705

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b993fc3
refactor keyboards using ST_STM32F072B_DISCOVERY to use 'MCU = STM32F…
zvecr Dec 23, 2019
24dd0ff
refactor keyboards using GENERIC_STM32_F042X6 to use 'MCU = STM32F042'
zvecr Dec 23, 2019
1d5bb9d
refactor keyboards using GENERIC_STM32_F103 to use 'MCU = STM32F103'
zvecr Dec 23, 2019
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
Prev Previous commit
Next Next commit
refactor keyboards using GENERIC_STM32_F042X6 to use 'MCU = STM32F042'
  • Loading branch information
@zvecr
zvecr committed Jan 4, 2020
commit 24dd0fff019f16ef69de658a6b04440c6f3c0001
37 changes: 2 additions & 35 deletions keyboards/peiorisboards/ixora/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,5 @@
# project specific files

## chip/board settings
# - the next two should match the directories in
# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32F0xx

# Linker script to use
# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
# or <this_dir>/ld/
MCU_LDSCRIPT = STM32F042x6

# Startup code to use
# - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/
MCU_STARTUP = stm32f0xx

# Board: it should exist either in <chibios>/os/hal/boards/
# or <this_dir>/boards
BOARD = GENERIC_STM32_F042X6

# Cortex version
MCU = cortex-m0

# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 6

# Vector table for application
# 0x00000000-0x00001000 area is occupied by bootlaoder.*/
# The CORTEX_VTOR... is needed only for MCHCK/Infinity KB
#OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000
OPT_DEFS =

# Options to pass to dfu-util when flashing
DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
# MCU name
MCU = STM32F042

# Build Options
# comment out to disable the options.
Expand Down
38 changes: 2 additions & 36 deletions keyboards/vinta/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,5 @@
# project specific files

## chip/board settings
# - the next two should match the directories in
# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
MCU_FAMILY = STM32
MCU_SERIES = STM32F0xx

# Linker script to use
# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
# or <this_dir>/ld/
MCU_LDSCRIPT = STM32F042x6

# Startup code to use
# - it should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/
MCU_STARTUP = stm32f0xx

# Board: it should exist either in <chibios>/os/hal/boards/
# or <this_dir>/boards
BOARD = GENERIC_STM32_F042X6

# Cortex version
MCU = cortex-m0

# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
ARMV = 6

# Vector table for application
# 0x00000000-0x00001000 area is occupied by bootlaoder.*/
# The CORTEX_VTOR... is needed only for MCHCK/Infinity KB
#OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000
OPT_DEFS =

# Options to pass to dfu-util when flashing
DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
DFU_SUFFIX_ARGS = -p DF11 -v 0483
# MCU name
MCU = STM32F042

# Build Options
# comment out to disable the options.
Expand Down