summaryrefslogtreecommitdiff
path: root/examples/device
diff options
context:
space:
mode:
authorhathach <[email protected]>2019-03-05 05:47:40 -0800
committerGitHub <[email protected]>2019-03-05 05:47:40 -0800
commitc0737f928f8c741ef70bd7f330b24f548ec1d0ce (patch)
treec9c0e1718779d889aaa47979f3c5b3c4d423297b /examples/device
parenta19455d1ff2581b07b1ace00f5a2820165bd8e98 (diff)
parent8418cb816bbc0b760c102921875016a8ba31167d (diff)
Merge pull request #38 from cr1901/stm32f4
STM32F4 Family Support
Diffstat (limited to 'examples/device')
-rw-r--r--examples/device/cdc_msc_hid/Makefile16
1 files changed, 11 insertions, 5 deletions
diff --git a/examples/device/cdc_msc_hid/Makefile b/examples/device/cdc_msc_hid/Makefile
index 983365fc4..cf7e83483 100644
--- a/examples/device/cdc_msc_hid/Makefile
+++ b/examples/device/cdc_msc_hid/Makefile
@@ -25,6 +25,7 @@ MKDIR = mkdir
SED = sed
CP = cp
RM = rm
+AS = $(CROSS_COMPILE)as
INC += -Isrc \
-I$(TOP)/hw \
@@ -58,7 +59,7 @@ else
CFLAGS += -flto -Os
endif
-CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -DBOARD_$(shell echo $(BOARD) | tr a-z A-Z)
+CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib -DBOARD_$(shell echo $(BOARD) | tr a-z\- A-Z_)
LDFLAGS += $(CFLAGS) -nostartfiles -fshort-enums -Wl,-T,$(TOP)/$(LD_FILE) -Wl,[email protected] -Wl,-cref -Wl,-gc-sections -specs=nosys.specs -specs=nano.specs
LIBS := -lgcc -lc -lm -lnosys
@@ -119,10 +120,15 @@ $(BUILD)/obj/%.o: %.c
$(RM) $(@:.o=.d)
# ASM sources
-vpath %.S . $(TOP)
-$(BUILD)/obj/%.o: %.S
- @echo AS $(notdir $@)
- @$(CC) -x assembler-with-cpp $(ASFLAGS) -c -o $@ $<
+vpath %.s . $(TOP)
+$(BUILD)/obj/%.o: %.s
+ @echo "AS $<"
+ @$(AS) -o $@ $<
+
+#vpath %.S . $(TOP)
+#$(BUILD)/obj/%.o: %.S
+# @echo AS $(notdir $@)
+# @$(CC) -x assembler-with-cpp $(ASFLAGS) -c -o $@ $<
size: $(BUILD)/$(BOARD)-firmware.elf
-@echo ''