Mercurial > pihelp
changeset 32:bd9ce7e581ec
Fix bad merge
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Thu, 27 Jun 2013 11:40:35 +0800 |
parents | 5d6a841eef82 |
children | a3de303afabf |
files | Makefile |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Jun 27 00:12:32 2013 +0800 +++ b/Makefile Thu Jun 27 11:40:35 2013 +0800 @@ -24,6 +24,7 @@ PROGRAMMER = -c stk500 -P ~/dev/stk500 -p $(PROGDEVICE) -B 2 SOURCE_1WIRE = onewire.c simple_ds18b20.c crc8.c SOURCE_CRYPTO = hmac-sha1.c sha1-asm.S aes.c +SOURCE_SD = byteordering.c fat.c partition.c sd_raw.c SOURCE = main.c SOURCE += $(SOURCE_CRYPTO) $(SOURCE_SD) LIBS = @@ -78,8 +79,7 @@ export PATH := $(PATH):/usr/local/CrossPack-AVR/bin/ AVRDUDE = avrdude $(PROGRAMMER) -#COMPILE = avr-gcc -Wall -Os -DF_CPU=$(CLOCK) -mmcu=$(DEVICE) -g -std=c99 -mcall-prologues -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,--relax -fwhole-program -Wl,-u,vfprintf -lprintf_flt -lm -COMPILE = avr-gcc -Wall -Os -DF_CPU=$(CLOCK) -mmcu=$(DEVICE) -g -std=c99 -Wl,-u,vfprintf -lprintf_flt -lm +COMPILE = avr-gcc -Wall -Os -DF_CPU=$(CLOCK) -mmcu=$(DEVICE) -g -std=c99 -mcall-prologues -fdata-sections -ffunction-sections -Wl,--gc-sections -Wl,--relax -fwhole-program -flto # symbolic targets: all: main.hex