X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=examples%2Ftriface%2Ftriface.mk;h=e9861a064c324e0fcfcd16af88d59ef0eb65b671;hb=05ebf945e64b34150a526a0b07ed72203059e422;hp=430c421fac60f215d95d9cf5f6c03d08225b7b8e;hpb=066e5c4216d6003d84242f7de768edc581c24348;p=bertos.git diff --git a/examples/triface/triface.mk b/examples/triface/triface.mk index 430c421f..e9861a06 100644 --- a/examples/triface/triface.mk +++ b/examples/triface/triface.mk @@ -17,7 +17,7 @@ TRG += triface CPU = atmega1281 BOOT_ADDR_START = 0x1E000 -triface_CROSS = avr- +triface_PREFIX = avr- ifeq ($(CPU), atmega1281) triface_hfuse = 0x98 @@ -37,17 +37,18 @@ triface_CSRC = \ examples/triface/triface.c \ examples/triface/protocol.c \ examples/triface/hw/hw_adc.c \ + bertos/cpu/avr/drv/ser_avr.c \ + bertos/cpu/avr/drv/timer_avr.c \ bertos/drv/timer.c \ bertos/drv/ser.c \ bertos/drv/buzzer.c \ - bertos/cpu/avr/drv/ser_avr.c \ - bertos/cpu/avr/drv/sipo.c \ + bertos/drv/sipo.c \ bertos/mware/formatwr.c \ bertos/mware/hex.c \ - bertos/struct/hashtable.c \ bertos/mware/readline.c \ bertos/mware/parser.c \ bertos/mware/event.c \ + bertos/struct/hashtable.c \ bertos/kern/kfile.c \ bertos/net/keytag.c \ # @@ -55,7 +56,7 @@ triface_CSRC = \ triface_PCSRC += bertos/mware/formatwr.c -triface_CFLAGS = -O2 -D'ARCH=(ARCH_TRIFACE)' -fno-strict-aliasing -Iexamples/triface -Ibertos/cpu/avr +triface_CFLAGS = -O2 -D'ARCH=(ARCH_TRIFACE)' -D'CPU_FREQ=(14745600UL)' -D'WIZ_AUTOGEN' -fno-strict-aliasing -Iexamples/triface -Ibertos/cpu/avr triface_LDFLAGS = -Wl @@ -68,17 +69,20 @@ TRG += boot boot_MCU = $(CPU) boot_CSRC = \ examples/triface/boot/main.c \ - bertos/net/xmodem.c \ - bertos/drv/ser.c \ bertos/cpu/avr/drv/ser_avr.c \ bertos/cpu/avr/drv/flash_avr.c \ bertos/drv/timer.c \ + bertos/cpu/avr/drv/timer_avr.c \ + bertos/drv/ser.c \ + bertos/net/xmodem.c \ bertos/algo/crc.c \ bertos/mware/hex.c \ bertos/kern/kfile.c \ # -boot_CROSS = avr- -boot_CPPFLAGS = -D'ARCH=(ARCH_TRIFACE|ARCH_BOOT)' -Iexamples/triface/boot -Ibertos/cpu/avr + +boot_PREFIX = avr- + +boot_CPPFLAGS = -D'ARCH=(ARCH_TRIFACE|ARCH_BOOT)' -D'CPU_FREQ=(14745600UL)' -D'WIZ_AUTOGEN' -Iexamples/triface/boot -Ibertos/cpu/avr boot_CFLAGS = -Os -mcall-prologues boot_LDFLAGS = -Wl,--relax -Wl,--section-start=.text=$(BOOT_ADDR_START)