both stm32 and esp32s2 enumerated

hathach · hathach · commit c3b190842fc3 · 2020-10-15T00:40:44.000+07:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/ports/*/_build/
 /ports/*/build/
 /sdkconfig
 .settings/
diff --git a/ports/esp32s2/CMakeLists.txt b/ports/esp32s2/CMakeLists.txt
@@ -20,7 +20,11 @@ if(NOT (DEFINED BOARD AND EXISTS "${CMAKE_SOURCE_DIR}/components/boards/${BOARD}
   message(FATAL_ERROR "Invalid BOARD specified")
 endif()
 
-set(EXTRA_COMPONENT_DIRS "../../src")
+# TOP is absolute path to root directory
+set(TOP "../..")
+get_filename_component(TOP "${TOP}" REALPATH)
+
+set(EXTRA_COMPONENT_DIRS "${TOP}/src")
 
 set(SDKCONFIG_DEFAULTS sdkconfig.defaults components/boards/${BOARD}/sdkconfig)
 set(SDKCONFIG build/sdkconfig)
diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
@@ -0,0 +1,16 @@
+# Espressif IDF use CMake build system, this add wrapper target to call idf.py
+
+.PHONY: all clean flash
+.DEFAULT_GOAL := all
+
+# Build directory
+BUILD = _build/build-$(BOARD)
+
+all:
+	idf.py -B$(BUILD) -DBOARD=$(BOARD) build
+
+clean:
+	idf.py -B$(BUILD) -DBOARD=$(BOARD) clean
+
+flash:
+	idf.py -B$(BUILD) -DBOARD=$(BOARD) flash
diff --git a/ports/esp32s2/components/tinyusb/CMakeLists.txt b/ports/esp32s2/components/tinyusb/CMakeLists.txt
diff --git a/ports/esp32s2/tusb_config.h b/ports/esp32s2/tusb_config.h
diff --git a/ports/rules.mk b/ports/rules.mk
@@ -1,25 +1,7 @@
 # ---------------------------------------
-# Common make rules for all examples
+# Common make rules for all
 # ---------------------------------------
 
-ifeq ($(CROSS_COMPILE),xtensa-esp32s2-elf-)
-# Espressif IDF use CMake build system, this add wrapper target to call idf.py
-
-.PHONY: all clean flash
-.DEFAULT_GOAL := all
-
-all:
-	idf.py -B$(BUILD) -DBOARD=$(BOARD) build
-
-clean:
-	idf.py -B$(BUILD) -DBOARD=$(BOARD) clean
-
-flash:
-	idf.py -B$(BUILD) -DBOARD=$(BOARD) flash
-
-else
-# GNU Make build system
-
 # libc
 LIBS += -lgcc -lm -lnosys -lc
 
@@ -31,6 +13,7 @@ ifeq ($(BOARD), msp_exp430f5529lp)
 else
   LDFLAGS += $(CFLAGS) -fshort-enums -Wl,-T,$(TOP)/$(LD_FILE) -Wl,-Map=$@.map -Wl,-cref -Wl,-gc-sections -specs=nosys.specs -specs=nano.specs
 endif
+
 ASFLAGS += $(CFLAGS)
 
 # Assembly files can be name with upper case .S, convert it to .s
@@ -144,5 +127,3 @@ flash-stlink: $(BUILD)/$(BOARD)-firmware.elf
 flash-pyocd: $(BUILD)/$(BOARD)-firmware.hex
 	pyocd flash -t $(PYOCD_TARGET) $<
 	pyocd reset -t $(PYOCD_TARGET)
-
-endif # Make target
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,3 +1,27 @@
 idf_component_register(SRCS ghostfat.c images.c main.c msc.c screen.c usb_descriptors.c
                     INCLUDE_DIRS "."
-                    REQUIRES app_update boards led_strip spi_flash tinyusb lcd)
+                    REQUIRES app_update boards led_strip spi_flash lcd)
+
+idf_component_get_property( FREERTOS_ORIG_INCLUDE_PATH freertos ORIG_INCLUDE_PATH)
+
+target_include_directories(${COMPONENT_TARGET} PUBLIC
+  "${FREERTOS_ORIG_INCLUDE_PATH}"
+  "${TOP}/lib/tinyusb/src"
+  "${TOP}/ports/esp32s2"
+)
+
+target_sources(${COMPONENT_TARGET} PUBLIC
+  "${TOP}/lib/tinyusb/src/tusb.c"
+  "${TOP}/lib/tinyusb/src/common/tusb_fifo.c"
+  "${TOP}/lib/tinyusb/src/device/usbd.c"
+  "${TOP}/lib/tinyusb/src/device/usbd_control.c"
+  "${TOP}/lib/tinyusb/src/class/cdc/cdc_device.c"
+  "${TOP}/lib/tinyusb/src/class/dfu/dfu_rt_device.c"
+  "${TOP}/lib/tinyusb/src/class/hid/hid_device.c"
+  "${TOP}/lib/tinyusb/src/class/midi/midi_device.c"
+  "${TOP}/lib/tinyusb/src/class/msc/msc_device.c"
+  "${TOP}/lib/tinyusb/src/class/net/net_device.c"
+  "${TOP}/lib/tinyusb/src/class/usbtmc/usbtmc_device.c"
+  "${TOP}/lib/tinyusb/src/class/vendor/vendor_device.c"
+  "${TOP}/lib/tinyusb/src/portable/espressif/esp32s2/dcd_esp32s2.c"
+)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+/ports/*/_build/`
`1`	`2`	`/ports/*/build/`
`2`	`3`	`/sdkconfig`
`3`	`4`	`.settings/`