summaryrefslogtreecommitdiff
path: root/examples/device
diff options
context:
space:
mode:
authorScott Shawcroft <[email protected]>2018-11-27 18:11:03 -0800
committerScott Shawcroft <[email protected]>2018-11-27 18:11:03 -0800
commitb4103eef06c2851edc0c5661d06115171e479d91 (patch)
tree4e40a8966e992f200b0b7db6e8a0402e7e7b59e1 /examples/device
parent4ec7dba453d414d0c0c67c6f5bab5a9ca9eba388 (diff)
needs to be filled out. blinks though
Diffstat (limited to 'examples/device')
-rw-r--r--examples/device/cdc_msc_hid/Makefile8
-rw-r--r--examples/device/cdc_msc_hid/src/tusb_config.h2
2 files changed, 8 insertions, 2 deletions
diff --git a/examples/device/cdc_msc_hid/Makefile b/examples/device/cdc_msc_hid/Makefile
index 4fddc1a14..742cf8350 100644
--- a/examples/device/cdc_msc_hid/Makefile
+++ b/examples/device/cdc_msc_hid/Makefile
@@ -24,6 +24,7 @@ MKDIR = mkdir
SED = sed
CP = cp
RM = rm
+AS = $(CROSS_COMPILE)as
INC += -Isrc \
-I$(TOP)/hw \
@@ -57,7 +58,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
@@ -118,5 +119,10 @@ $(BUILD)/obj/%.o: %.c
-e '/^$$/ d' -e 's/$$/ :/' < $(@:.o=.d) >> $(@:.o=.P); \
$(RM) $(@:.o=.d)
+vpath %.s . $(TOP)
+$(BUILD)/obj/%.o: %.s
+ @echo "AS $<"
+ @$(AS) -o $@ $<
+
clean:
rm -rf build-$(BOARD)
diff --git a/examples/device/cdc_msc_hid/src/tusb_config.h b/examples/device/cdc_msc_hid/src/tusb_config.h
index 0aa023352..70a08567f 100644
--- a/examples/device/cdc_msc_hid/src/tusb_config.h
+++ b/examples/device/cdc_msc_hid/src/tusb_config.h
@@ -96,7 +96,7 @@
//------------- CLASS -------------//
#define CFG_TUD_CDC 1
-#define CFG_TUD_MSC 1
+#define CFG_TUD_MSC 0
#define CFG_TUD_CUSTOM_CLASS 0
#define CFG_TUD_HID 0