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.

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

Move BitThunder to Meson build system #53

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Prev Previous commit
Next Next commit
[MESON] Updated latest meson.build files.
jameswalmsley committed Dec 6, 2018
commit f51d8fbb30c068bd411b3c603dc6c6a8c78c7769
6 changes: 5 additions & 1 deletion arch/arm/mach/meson.build
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
subdir('zynq')
#
# Include the correct machine build file.
#

subdir(SUBARCH)
7 changes: 7 additions & 0 deletions arch/arm/meson.build
Original file line number Diff line number Diff line change
@@ -2,6 +2,9 @@ vm_includes += 'arch/arm/include'
vm_includes += 'arch/arm/include/arch/common'


#
# Common ARM build files.
#
vm_sources += 'arch/arm/boot/head.S'
vm_sources += 'arch/arm/common/arm11cpu.c'
vm_sources += 'arch/arm/common/arm-cache.c'
@@ -11,5 +14,9 @@ vm_sources += 'arch/arm/common/gic.c'
vm_sources += 'arch/arm/common/freertos-ca9.c'
vm_sources += 'arch/arm/common/freertos-ca9-asm.S'

if config.has('BT_CONFIG_HAS_MMU')
vm_sources += 'arch/arm/mm/v7-mmu.c'
vm_sources += 'arch/arm/mm/v7-mmu-asm.S'
endif

subdir('mach')
1 change: 1 addition & 0 deletions drivers/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
vm_includes += 'drivers'
3 changes: 2 additions & 1 deletion lib/meson.build
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
vm_includes += 'lib/include'

vm_sources += 'lib/src/handles/bt_handles.c'
vm_sources += 'lib/src/collections/bt_fifo.c'
vm_sources += 'lib/src/handles/bt_handles.c'
1 change: 1 addition & 0 deletions os/meson.build
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@ vm_includes += 'os/include'
vm_sources += 'os/src/bt_main.c'

subdir('src/devman')
subdir('src/gpio')
subdir('src/fs')
subdir('src/helpers')
subdir('src/interfaces')
4 changes: 3 additions & 1 deletion os/src/devman/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
pwd = meson.current_source_dir() + '/'

vm_sources += pwd + 'bt_devman.c'
vm_sources += pwd + 'bt_resources.c'
vm_sources += pwd + 'bt_device.c'
vm_sources += pwd + 'bt_resources.c'
vm_sources += pwd + 'bt_i2c.c'
3 changes: 3 additions & 0 deletions os/src/gpio/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
pwd = meson.current_source_dir() + '/'

vm_sources += pwd + 'bt_gpio.c'
11 changes: 10 additions & 1 deletion os/src/interrupts/meson.build
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
pwd = meson.current_source_dir() + '/'

vm_sources += pwd + 'bt_interrupts.c'
vm_sources += pwd + 'bt_interrupts.c'

if config.has('BT_CONFIG_INTERRUPTS_SOFTIRQ')
vm_sources += pwd + 'bt_softirq.c'
endif

if config.has('BT_CONFIG_TASKLETS')
vm_sources += pwd + 'bt_tasklets.c'
endif

18 changes: 17 additions & 1 deletion os/src/mm/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,20 @@
if config.has('BT_CONFIG_OS')
vm_sources += 'os/src/mm/bt_mm.c'
endif

if config.has('BT_CONFIG_MEM_PAGE_ALLOCATOR')
vm_sources += 'os/src/mm/bt_page.c'
endif

if config.has('BT_CONFIG_MEM_KHEAP')
vm_sources += 'os/src/mm/bt_heap.c'
endif

if config.has('BT_CONFIG_USE_VIRTUAL_ADDRESSING')
vm_sources += 'os/src/mm/bt_vm.c'
vm_sources += 'os/src/mm/bt_map.c'
endif

#vm_sources += 'os/src/mm/bt_vm.c'
if config.has('BT_CONFIG_MEM_SLAB_ALLOCATOR')
vm_sources += 'os/src/mm/slab.c'
endif
2 changes: 2 additions & 0 deletions os/src/process/meson.build
Original file line number Diff line number Diff line change
@@ -3,3 +3,5 @@ pwd = meson.current_source_dir() + '/'

vm_sources += pwd + 'bt_threads.c'
vm_sources += pwd + 'bt_process.c'
vm_sources += pwd + 'bt_queue.c'