Skip to content

Commit bda86d8

Browse files
committed
Moved to using the dragonTI version of the Tiva-C headers
1 parent 60aac17 commit bda86d8

File tree

10 files changed

+28
-1777
lines changed

10 files changed

+28
-1777
lines changed

deps/dragonTI.wrap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[wrap-git]
2+
url = https://github.com/DX-MON/dragonTI.git
3+
revision = head
4+
clone-recursive = false

firmware/led.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: BSD-3-Clause
2-
#include "tm4c123gh6pm/platform.hxx"
3-
#include "tm4c123gh6pm/constants.hxx"
2+
#include <tm4c123gh6pm/platform.hxx>
3+
#include <tm4c123gh6pm/constants.hxx>
44
#include "led.hxx"
55

66
/*!

firmware/meson.build

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@
22

33
substrate = include_directories('../deps/substrate')
44

5+
dragonTI = dependency(
6+
'dragonTI',
7+
required: true,
8+
version: '>=0.0.1',
9+
fallback: ['dragonTI', 'dragonTI_dep'],
10+
default_options: [
11+
'chip=tm4c123gh6pm',
12+
]
13+
)
14+
515
firmwareSrc = [
616
'startup.cxx', 'spiFlashProgrammer.cxx', 'led.cxx', 'spi.cxx',
717
'osc.cxx', 'usb.cxx', 'usb/descriptors.cxx', 'usb/device.cxx',
@@ -19,8 +29,9 @@ firmware = executable(
1929
'SPIFlashProgrammer',
2030
firmwareSrc,
2131
include_directories: [commonInclude, substrate],
32+
dependencies: [dragonTI],
2233
cpp_args: firmwareArgs,
23-
link_args: ['-T', '@0@/tm4c123gh6pm/memoryLayout.ld'.format(meson.current_source_dir())],
34+
#link_args: ['-T', '@0@/tm4c123gh6pm/memoryLayout.ld'.format(meson.current_source_dir())],
2435
gnu_symbol_visibility: 'inlineshidden',
2536
name_suffix: 'elf',
2637
build_by_default: true,

firmware/osc.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: BSD-3-Clause
2-
#include "tm4c123gh6pm/platform.hxx"
3-
#include "tm4c123gh6pm/constants.hxx"
2+
#include <tm4c123gh6pm/platform.hxx>
3+
#include <tm4c123gh6pm/constants.hxx>
44
#include "osc.hxx"
55

66
extern void oscInit() noexcept

firmware/spi.cxx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: BSD-3-Clause
2-
#include "tm4c123gh6pm/platform.hxx"
3-
#include "tm4c123gh6pm/constants.hxx"
2+
#include <tm4c123gh6pm/platform.hxx>
3+
#include <tm4c123gh6pm/constants.hxx>
44
#include "spi.hxx"
55
#include "led.hxx"
66

firmware/tm4c123gh6pm/constants.hxx

Lines changed: 0 additions & 567 deletions
This file was deleted.

0 commit comments

Comments
 (0)