diff options
author | Christian Pointner <equinox@spreadspace.org> | 2012-05-31 21:53:35 +0000 |
---|---|---|
committer | Christian Pointner <equinox@spreadspace.org> | 2012-05-31 21:53:35 +0000 |
commit | a2c37177e8d1639c620750ce263f15a370bf961c (patch) | |
tree | 023bb9e972cf22378567b24718a142b874b4fca2 | |
parent | cleanup (diff) |
fixed lib for chips without bootloader function... (more workaround than fix)
git-svn-id: https://svn.spreadspace.org/avr/trunk@54 aa12f405-d877-488e-9caf-2d797e2a1cc7
-rw-r--r-- | defines.mk | 1 | ||||
-rw-r--r-- | include.mk | 2 | ||||
-rw-r--r-- | lib/util.c | 2 | ||||
-rw-r--r-- | lufa.mk | 2 |
4 files changed, 5 insertions, 2 deletions
@@ -149,6 +149,7 @@ CFLAGS += -Wstrict-prototypes CFLAGS += -I$(LIB_DIR) CFLAGS += -DF_CPU=$(F_CPU)UL CFLAGS += -D__BOARD_$(BOARD_TYPE)__ +CFLAGS += -DARCH=ARCH_$(ARCH) CFLAGS += -std=c99 @@ -43,7 +43,7 @@ LDFLAGS += -L./ ifdef LUFA_PATH CFLAGS += -I$(LUFA_PATH) CFLAGS += -DF_USB=$(F_USB)UL -CFLAGS += -DBOARD=BOARD_$(LUFA_BOARD) -DARCH=ARCH_$(ARCH) +CFLAGS += -DBOARD=BOARD_$(LUFA_BOARD) CFLAGS += $(LUFA_OPTS) endif @@ -47,6 +47,8 @@ void cpu_init(void) #define BOOTLOADER_VEC 0x1FC00 #elif defined(__BOARD_hhd70dongle__) #define BOOTLOADER_VEC 0x3800 +#else + #define BOOTLOADER_VEC 0x0000 #endif typedef void (*f_ptr_type)(void); @@ -27,7 +27,7 @@ include $(LUFA_PATH)/LUFA/makefile SRC = $(LUFA_SRC_USB) $(LUFA_SRC_USBCLASS)
CFLAGS += -DF_USB=$(F_USB)UL
-CFLAGS += -DBOARD=BOARD_$(LUFA_BOARD) -DARCH=ARCH_$(ARCH)
+CFLAGS += -DBOARD=BOARD_$(LUFA_BOARD)
CFLAGS += $(LUFA_OPTS)
OBJ = $(SRC:%.c=%.o)
|