summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVegard Storheil Eriksen <zyp@jvnv.net>2014-11-09 23:11:32 +0100
committerVegard Storheil Eriksen <zyp@jvnv.net>2014-11-09 23:11:32 +0100
commitbe79b45f8c84bf6e685b408b2693f21d75d869c4 (patch)
treea97fcf1cd5472897c53d8e4ff8b0363b182aa479
parent57e93ec2ed70c6b433d33d4951d8a20f4154c640 (diff)
Moved files for each firmware build to its own directory.
-rw-r--r--SConstruct6
-rw-r--r--arcin/arcin.ld (renamed from arcin.ld)0
-rw-r--r--arcin/main.cpp (renamed from main.cpp)0
-rw-r--r--bootloader/bootloader.ld (renamed from bootloader.ld)0
-rw-r--r--bootloader/main.cpp (renamed from bootloader.cpp)0
-rw-r--r--test/main.cpp (renamed from test.cpp)0
6 files changed, 3 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct
index 0c60496..0858f10 100644
--- a/SConstruct
+++ b/SConstruct
@@ -8,8 +8,8 @@ SConscript('laks/build_rules')
env.SelectMCU('stm32f303rc')
-env.Firmware('arcin.elf', ['main.cpp'], LINK_SCRIPT = 'arcin.ld')
+env.Firmware('arcin.elf', Glob('arcin/*.cpp'), LINK_SCRIPT = 'arcin/arcin.ld')
-env.Firmware('bootloader.elf', ['bootloader.cpp'], LINK_SCRIPT = 'bootloader.ld')
+env.Firmware('bootloader.elf', Glob('bootloader/*.cpp'), LINK_SCRIPT = 'bootloader/bootloader.ld')
-env.Firmware('test.elf', ['test.cpp'])
+env.Firmware('test.elf', Glob('test/*.cpp'))
diff --git a/arcin.ld b/arcin/arcin.ld
index 43f0e44..43f0e44 100644
--- a/arcin.ld
+++ b/arcin/arcin.ld
diff --git a/main.cpp b/arcin/main.cpp
index 5294b29..5294b29 100644
--- a/main.cpp
+++ b/arcin/main.cpp
diff --git a/bootloader.ld b/bootloader/bootloader.ld
index 9776f7f..9776f7f 100644
--- a/bootloader.ld
+++ b/bootloader/bootloader.ld
diff --git a/bootloader.cpp b/bootloader/main.cpp
index 620e143..620e143 100644
--- a/bootloader.cpp
+++ b/bootloader/main.cpp
diff --git a/test.cpp b/test/main.cpp
index 9475507..9475507 100644
--- a/test.cpp
+++ b/test/main.cpp