summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@mur.at>2015-02-25 00:11:44 (GMT)
committerChristian Pointner <equinox@mur.at>2015-02-25 00:11:44 (GMT)
commit706f441b7bcb163e6cead21d5b5708adf5e0a415 (patch)
tree2e304e2d6dbcc48a97e476b8129898f48c985b54
parent53ec16b2a54e7eeef741e4da1b52ebef69d617f3 (diff)
fixed pic bootloader include paths
-rw-r--r--software/pic.bootloader/Makefile-BAT3
-rw-r--r--software/pic.bootloader/Makefile-CTR3
-rw-r--r--software/pic.bootloader/Makefile-IDM3
-rw-r--r--software/pic.bootloader/Makefile-IHU3
-rwxr-xr-xsoftware/pic.bootloader/downloader.py2
5 files changed, 9 insertions, 5 deletions
diff --git a/software/pic.bootloader/Makefile-BAT b/software/pic.bootloader/Makefile-BAT
index 6137abb..5afb338 100644
--- a/software/pic.bootloader/Makefile-BAT
+++ b/software/pic.bootloader/Makefile-BAT
@@ -22,5 +22,6 @@
PROJECT := bootloader-BAT
PROC_TYPE := 16F887
+SPREADPIC_PATH := ../../contrib/pic-utils
-include ../pic.include.mk
+include $(SPREADPIC_PATH)/include.mk
diff --git a/software/pic.bootloader/Makefile-CTR b/software/pic.bootloader/Makefile-CTR
index 2e2dbfa..eb4a765 100644
--- a/software/pic.bootloader/Makefile-CTR
+++ b/software/pic.bootloader/Makefile-CTR
@@ -22,5 +22,6 @@
PROJECT := bootloader-CTR
PROC_TYPE := 16F887
+SPREADPIC_PATH := ../../contrib/pic-utils
-include ../pic.include.mk
+include $(SPREADPIC_PATH)/include.mk
diff --git a/software/pic.bootloader/Makefile-IDM b/software/pic.bootloader/Makefile-IDM
index c1f54f9..0bdd8bb 100644
--- a/software/pic.bootloader/Makefile-IDM
+++ b/software/pic.bootloader/Makefile-IDM
@@ -22,5 +22,6 @@
PROJECT := bootloader-IDM
PROC_TYPE := 16F1847
+SPREADPIC_PATH := ../../contrib/pic-utils
-include ../pic.include.mk
+include $(SPREADPIC_PATH)/include.mk
diff --git a/software/pic.bootloader/Makefile-IHU b/software/pic.bootloader/Makefile-IHU
index f576f64..b9a9a31 100644
--- a/software/pic.bootloader/Makefile-IHU
+++ b/software/pic.bootloader/Makefile-IHU
@@ -22,5 +22,6 @@
PROJECT := bootloader-IHU
PROC_TYPE := 16F887
+SPREADPIC_PATH := ../../contrib/pic-utils
-include ../pic.include.mk
+include $(SPREADPIC_PATH)/include.mk
diff --git a/software/pic.bootloader/downloader.py b/software/pic.bootloader/downloader.py
index a371438..1e1dc87 100755
--- a/software/pic.bootloader/downloader.py
+++ b/software/pic.bootloader/downloader.py
@@ -408,4 +408,4 @@ Commands:
for cmd in cmds:
commands[cmd['name']](dev, id, cmd['args'])
except KeyError:
- print >> sys.stderr, "ERROR: unkown command '%s'" % cmd['name']
+ print >> sys.stderr, "ERROR: unknown command '%s'" % cmd['name']