summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorhathach <[email protected]>2019-09-05 16:18:34 +0700
committerGitHub <[email protected]>2019-09-05 16:18:34 +0700
commit143a138028a03f1665ab32dd53435c2d7d0b8237 (patch)
treea0f4acd5d8fc8dddf47fa7efbc63c804e078c140 /examples
parent7350e9c25c468fbcbc4c8e492f9cd6dc0402b611 (diff)
parenta90e2aa2ce076009961c42a78de218f899c6ee07 (diff)
Merge pull request #116 from hathach/develop
Board update
Diffstat (limited to 'examples')
-rw-r--r--examples/device/cdc_msc_hid/src/tusb_config.h4
-rw-r--r--examples/make.mk10
2 files changed, 10 insertions, 4 deletions
diff --git a/examples/device/cdc_msc_hid/src/tusb_config.h b/examples/device/cdc_msc_hid/src/tusb_config.h
index 92cc2bbd4..544216da9 100644
--- a/examples/device/cdc_msc_hid/src/tusb_config.h
+++ b/examples/device/cdc_msc_hid/src/tusb_config.h
@@ -74,10 +74,10 @@
//------------- CLASS -------------//
#define CFG_TUD_CDC 1
#define CFG_TUD_MSC 1
+
#if CFG_TUSB_MCU == OPT_MCU_STM32F4
// STM32F4 does not have enough endpoints (4, including hardcoded control
-// endpoint) to enable CDC, MSC, and HID simultaneously, so disable HID as a
-// compromise.
+// endpoint) to enable CDC, MSC, and HID simultaneously, so disable HID as a compromise.
#define CFG_TUD_HID 0
#else
#define CFG_TUD_HID 1
diff --git a/examples/make.mk b/examples/make.mk
index 6706294ad..b0aa5659e 100644
--- a/examples/make.mk
+++ b/examples/make.mk
@@ -21,11 +21,17 @@ __check_defined = \
$(if $(value $1),, \
$(error Undefined make flag: $1$(if $2, ($2))))
+
+define newline
+
+
+endef
+
# Select the board to build for.
ifeq ($(BOARD),)
$(info You must provide a BOARD parameter with 'BOARD=')
- $(info Possible values are:)
- $(info $(sort $(subst /.,,$(subst $(TOP)/hw/bsp/,,$(wildcard $(TOP)/hw/bsp/*/.)))))
+ $(info Supported boards are:)
+ $(info $(sort $(subst /.,,$(subst $(TOP)/hw/bsp/, $(newline)-,$(wildcard $(TOP)/hw/bsp/*/.)))))
$(error BOARD not defined)
else
ifeq ($(wildcard $(TOP)/hw/bsp/$(BOARD)/.),)