Fix UC3 support in the BUILD build system module. Fix bug in the EVK1101 board buttons driver.

pull/1469/head
Dean Camera 13 years ago
parent 5ce60f25e6
commit 4913678695

@ -114,8 +114,10 @@ endif
C_FLAGS += -Wstrict-prototypes C_FLAGS += -Wstrict-prototypes
# Create a list of flags to pass to the linker # Create a list of flags to pass to the linker
LD_FLAGS += -Wl,-Map=$(TARGET).map,--cref -Wl,--gc-sections -lm LD_FLAGS += -lm -Wl,-Map=$(TARGET).map,--cref -Wl,--gc-sections
ifneq ($(F_CPU), UC3) ifeq ($(ARCH), UC3)
LD_FLAGS += --rodata-writable -Wl,--direct-data
else
LD_FLAGS += -Wl,--relax LD_FLAGS += -Wl,--relax
endif endif
@ -126,8 +128,8 @@ ifneq ($(UNKNOWN_SOURCE),)
endif endif
# Determine flags to pass to the size utility based on its reported features # Determine flags to pass to the size utility based on its reported features
SIZE_MCU_FLAG = $(shell avr-size --help | grep -- --mcu > /dev/null && echo --mcu=$(MCU) ) SIZE_MCU_FLAG = $(shell $(CROSS)size --help | grep -- --mcu > /dev/null && echo --mcu=$(MCU) )
SIZE_FORMAT_FLAG = $(shell avr-size --help | grep -- --format=.*avr > /dev/null && echo --format=avr ) SIZE_FORMAT_FLAG = $(shell $(CROSS)size --help | grep -- --format=.*avr > /dev/null && echo --format=avr )
begin: begin:
@ -150,7 +152,7 @@ checksource:
size: size:
@echo $(MSG_SIZE_CMD) Determining size of \"$(TARGET).elf\" @echo $(MSG_SIZE_CMD) Determining size of \"$(TARGET).elf\"
@if test -f $(TARGET).elf; then \ @if test -f $(TARGET).elf; then \
avr-size $(SIZE_MCU_FLAG) $(SIZE_FORMAT_FLAG) $(TARGET).elf ; 2>/dev/null; \ $(CROSS)size $(SIZE_MCU_FLAG) $(SIZE_FORMAT_FLAG) $(TARGET).elf ; 2>/dev/null; \
fi fi
.PHONY: begin elf hex lss size end .PHONY: begin elf hex lss size end

@ -98,7 +98,7 @@
static inline uint32_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT; static inline uint32_t Buttons_GetStatus(void) ATTR_WARN_UNUSED_RESULT;
static inline uint32_t Buttons_GetStatus(void) static inline uint32_t Buttons_GetStatus(void)
{ {
return (~(AVR32_GPIO.port[JOY_MOVE_PORT].pvr & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2))); return (~(AVR32_GPIO.port[BUTTONS_PORT].pvr & (BUTTONS_BUTTON1 | BUTTONS_BUTTON2)));
} }
#endif #endif

Loading…
Cancel
Save