Skip to content
Snippets Groups Projects
Commit f49b61a1 authored by schneider's avatar schneider
Browse files

Merge branch 'rahix/boot' into 'master'

Integrate bootloader into meson

See merge request card10/firmware!5
parents 54c13a79 cbb0f31e
No related branches found
No related tags found
1 merge request!5Integrate bootloader into meson
Pipeline #423 passed
includes = include_directories(
'./Source/',
)
sources = files(
'./Source/diskio.c',
'./Source/ff.c',
'./Source/ffsystem.c',
'./Source/ffunicode.c',
)
lib = static_library(
'ff13',
sources,
include_directories: includes,
dependencies: [periphdriver, mx25lba],
)
libff13 = declare_dependency(
include_directories: includes,
link_with: lib,
dependencies: [periphdriver, mx25lba],
)
......@@ -7,3 +7,4 @@ subdir('./vendor/Maxim/MAX77650/')
subdir('./gfx/')
subdir('./card10/')
subdir('./ff13/')
......@@ -66,3 +66,17 @@ max32665_startup_core1 = declare_dependency(
'--entry', 'Reset_Handler',
],
)
#############################################################
# For the bootloader
#############################################################
# We can just reuse the same lib here
max32665_startup_boot_lib = max32665_startup_lib
max32665_startup_boot = declare_dependency(
link_args: [
'-T', meson.current_source_dir() + 'Source/GCC/max32665_boot.ld',
'--entry', 'Reset_Handler',
],
)
includes = include_directories(
'include/core/musbhsfc',
'include/core',
'include/devclass',
'include/enumerate',
'include/util',
'include/dbg_log',
)
sources = files(
'src/core/musbhsfc/usb.c',
'src/core/usb_event.c',
'src/dbg_log/dbg_log.c',
'src/devclass/cdc_acm.c',
'src/devclass/hid_kbd.c',
'src/devclass/hid_raw.c',
'src/devclass/msc.c',
'src/enumerate/enumerate.c',
'src/util/fifo.c',
)
lib = static_library(
'maxusb',
sources,
include_directories: includes,
dependencies: periphdriver,
)
maxusb = declare_dependency(
include_directories: includes,
link_with: lib,
dependencies: periphdriver,
)
......@@ -4,3 +4,5 @@ subdir('./Libraries/CMSIS/Device/Maxim/MAX32665/')
subdir('./Libraries/Boards/card10/')
subdir('./Libraries/FreeRTOS/')
subdir('./Libraries/MAXUSB/')
......@@ -27,7 +27,9 @@ add_global_link_arguments(
language: 'c',
)
python3 = import('python').find_installation('python3')
# python3 = import('python').find_installation('python3')
python3 = 'python3'
subdir('lib/')
subdir('bootloader/')
subdir('hw-tests/')
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment