summaryrefslogtreecommitdiffstats
path: root/firmware/Makefile
diff options
context:
space:
mode:
authorJenna Fox <a@creativepony.com>2012-09-23 22:37:45 +1000
committerJenna Fox <a@creativepony.com>2012-09-23 22:37:45 +1000
commit409e6097d172f4027b8e541128ef3e89cbaed027 (patch)
treea5602811db452b7f3da009b5f39ef13d8cefdb93 /firmware/Makefile
parent28b65b95cc1f47a6353e6ede5a4dbee6a36a76e3 (diff)
downloadmicronucleus-409e6097d172f4027b8e541128ef3e89cbaed027.tar.gz
micronucleus-409e6097d172f4027b8e541128ef3e89cbaed027.tar.bz2
micronucleus-409e6097d172f4027b8e541128ef3e89cbaed027.zip
very close to it working - it uploads some, but the words uploaded are spaced out with 0xFF's between each word :S
Diffstat (limited to 'firmware/Makefile')
-rw-r--r--firmware/Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/firmware/Makefile b/firmware/Makefile
index bc6ab7f..4f4c077 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -148,8 +148,8 @@ DEFINES = -DBOOTLOADER_ADDRESS=0x$(BOOTLOADER_ADDRESS) #-DDEBUG_LEVEL=2
CFLAGS = -Wall -Os -fno-move-loop-invariants -fno-tree-scev-cprop -fno-inline-small-functions -I. -Ilibs-device -mmcu=$(DEVICE) -DF_CPU=$(F_CPU) $(DEFINES)
LDFLAGS = -Wl,--relax,--gc-sections -Wl,--section-start=.text=$(BOOTLOADER_ADDRESS),-Map=main.map
-OBJECTS = usbdrv/usbdrvasm.o main.o
-#### OBJECTS += libs-device/osccal.o
+OBJECTS = usbdrv/usbdrvasm.o usbdrv/oddebug.o main.o
+OBJECTS += libs-device/osccal.o
# symbolic targets:
all: main.hex
@@ -220,6 +220,5 @@ $(ALLHEXFILES):
addr=`echo $$device | sed -e 's/\([0-9]\)8/\1/g' | awk '{printf("%x", ($$1 - 2) * 1024)}'`; \
echo "### Make with F_CPU=$${clock}000000 DEVICE=atmega$$device BOOTLOADER_ADDRESS=$$addr"; \
$(MAKE) clean; \
-# $(MAKE) main.hex F_CPU=$${clock}000000 DEVICE=atmega$$device BOOTLOADER_ADDRESS=$$addr DEFINES=-DUSE_AUTOCONFIG=1
- $(MAKE) main.hex F_CPU=$${clock}000000 DEVICE=atmega$$device BOOTLOADER_ADDRESS=$$addr
+ $(MAKE) main.hex F_CPU=$${clock}000000 DEVICE=atmega$$device BOOTLOADER_ADDRESS=$$addr DEFINES=-DUSE_AUTOCONFIG=1
mv main.hex $@