Skip to content

Commit b67cb26

Browse files
hathachhathach
committed
change hil board s3 devkitm (devkitc seems to have usb issue with cp2104)
1 parent eaec0fb commit b67cb26

File tree

14 files changed

+56
-51
lines changed

14 files changed

+56
-51
lines changed

‎.github/workflows/build_aarch64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
run: echo >> $GITHUB_ENV TOOLCHAIN_URL=https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
4848

4949
- name: Cache Toolchain
50-
uses: actions/cache@v3
50+
uses: actions/cache@v4
5151
id: cache-toolchain
5252
with:
5353
path: ~/cache/

‎.github/workflows/build_cmake.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168
run: echo >> $GITHUB_ENV TOOLCHAIN_URL=https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-17.0.1/LLVMEmbeddedToolchainForArm-17.0.1-Linux-x86_64.tar.xz
169169

170170
- name: Cache Toolchain
171-
uses: actions/cache@v3
171+
uses: actions/cache@v4
172172
id: cache-toolchain
173173
with:
174174
path: ~/cache/
@@ -216,7 +216,7 @@ jobs:
216216
run: echo >> $GITHUB_ENV TOOLCHAIN_URL=http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/9_2_0_0/export/msp430-gcc-9.2.0.50_linux64.tar.bz2
217217

218218
- name: Cache Toolchain
219-
uses: actions/cache@v3
219+
uses: actions/cache@v4
220220
id: cache-toolchain
221221
with:
222222
path: ~/cache/

‎.github/workflows/build_esp.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# ESP32-S2
3535
- 'espressif_kaluga_1'
3636
# ESP32-S3
37-
- 'espressif_s3_devkitc'
37+
- 'espressif_s3_devkitm'
3838
steps:
3939
- name: Setup Python
4040
uses: actions/setup-python@v5
@@ -51,7 +51,7 @@ jobs:
5151
run: docker run --rm -v $PWD:/project -w /project espressif/idf:v5.1.1 python3 tools/build_esp32.py ${{ matrix.board }}
5252

5353
- name: Upload Artifacts for Hardware Testing
54-
if: matrix.board == 'espressif_s3_devkitc' && github.repository_owner == 'hathach'
54+
if: matrix.board == 'espressif_s3_devkitm' && github.repository_owner == 'hathach'
5555
uses: actions/upload-artifact@v4
5656
with:
5757
name: ${{ matrix.board }}
@@ -75,7 +75,7 @@ jobs:
7575
fail-fast: false
7676
matrix:
7777
board:
78-
- 'espressif_s3_devkitc'
78+
- 'espressif_s3_devkitm'
7979
steps:
8080
- name: Clean workspace
8181
run: |

‎.github/workflows/build_renesas.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
run: echo >> $GITHUB_ENV TOOLCHAIN_URL=http://gcc-renesas.com/downloads/get.php?f=rx/8.3.0.202004-gnurx/gcc-8.3.0.202004-GNURX-ELF.run
4747

4848
- name: Cache Toolchain
49-
uses: actions/cache@v3
49+
uses: actions/cache@v4
5050
id: cache-toolchain
5151
with:
5252
path: ~/cache/

‎.github/workflows/build_riscv.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
run: echo >> $GITHUB_ENV TOOLCHAIN_URL=https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/download/v10.1.0-1.1/xpack-riscv-none-embed-gcc-10.1.0-1.1-linux-x64.tar.gz
4949

5050
- name: Cache Toolchain
51-
uses: actions/cache@v3
51+
uses: actions/cache@v4
5252
id: cache-toolchain
5353
with:
5454
path: ~/cache/

‎examples/build_system/make/make.mk

Lines changed: 28 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ TOP = $(abspath $(subst make.mk,../../..,$(THIS_MAKEFILE)))
1515
# Set CURRENT_PATH to the relative path from TOP to the current directory, ie examples/device/cdc_msc_freertos
1616
CURRENT_PATH = $(subst $(TOP)/,,$(abspath .))
1717

18+
#-------------- Linux/Windows ------------
19+
1820
# Detect whether shell style is windows or not
1921
# https://stackoverflow.com/questions/714100/os-detecting-makefile/52062069#52062069
2022
ifeq '$(findstring ;,$(PATH))' ';'
@@ -26,13 +28,18 @@ CMDEXE := 1
2628
SHELL := cmd.exe
2729
endif
2830

29-
# Handy check parameter function
30-
check_defined = \
31-
$(strip $(foreach 1,$1, \
32-
$(call __check_defined,$1,$(strip $(value 2)))))
33-
__check_defined = \
34-
$(if $(value $1),, \
35-
$(error Undefined make flag: $1$(if $2, ($2))))
31+
ifeq ($(CMDEXE),1)
32+
CP = copy
33+
RM = del
34+
MKDIR = mkdir
35+
PYTHON = python
36+
else
37+
CP = cp
38+
RM = rm
39+
MKDIR = mkdir
40+
PYTHON = python3
41+
endif
42+
3643

3744
# Build directory
3845
BUILD := _build/$(BOARD)
@@ -44,8 +51,8 @@ BIN := $(TOP)/_bin/$(BOARD)/$(notdir $(CURDIR))
4451

4552
# Board without family
4653
ifneq ($(wildcard $(TOP)/hw/bsp/$(BOARD)/board.mk),)
47-
BOARD_PATH := hw/bsp/$(BOARD)
48-
FAMILY :=
54+
BOARD_PATH := hw/bsp/$(BOARD)
55+
FAMILY :=
4956
endif
5057

5158
# Board within family
@@ -68,31 +75,12 @@ else
6875
SRC_C += $(subst $(TOP)/,,$(wildcard $(TOP)/$(FAMILY_PATH)/*.c))
6976
endif
7077

71-
#-------------- Toolchain ------------
72-
73-
# Supported toolchain: gcc, iar
78+
#-------------------------------------------------------------
79+
# Toolchain
80+
# Can be changed via TOOLCHAIN=gcc|iar or CC=arm-none-eabi-gcc|iccarm|clang
81+
#-------------------------------------------------------------
7482
TOOLCHAIN ?= gcc
7583

76-
# Can be set by board, default to ARM GCC
77-
CROSS_COMPILE ?= arm-none-eabi-
78-
79-
ifeq ($(TOOLCHAIN),iar)
80-
CC := iccarm
81-
USE_IAR = 1
82-
endif
83-
84-
ifeq ($(CMDEXE),1)
85-
CP = copy
86-
RM = del
87-
MKDIR = mkdir
88-
PYTHON = python
89-
else
90-
CP = cp
91-
RM = rm
92-
MKDIR = mkdir
93-
PYTHON = python3
94-
endif
95-
9684
#-------------- Source files and compiler flags --------------
9785
# tinyusb makefile
9886
include $(TOP)/src/tinyusb.mk
@@ -143,3 +131,11 @@ endif
143131

144132
# toolchain specific
145133
include ${TOP}/examples/build_system/make/toolchain/arm_$(TOOLCHAIN).mk
134+
135+
# Handy check parameter function
136+
check_defined = \
137+
$(strip $(foreach 1,$1, \
138+
$(call __check_defined,$1,$(strip $(value 2)))))
139+
__check_defined = \
140+
$(if $(value $1),, \
141+
$(error Undefined make flag: $1$(if $2, ($2))))

‎examples/build_system/make/toolchain/arm_gcc.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# makefile for arm gcc toolchain
22

3+
# Can be set by family, default to ARM GCC
4+
CROSS_COMPILE ?= arm-none-eabi-
5+
36
CC = $(CROSS_COMPILE)gcc
47
CXX = $(CROSS_COMPILE)g++
58
AS = $(CC) -x assembler-with-cpp

‎examples/build_system/make/toolchain/arm_iar.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# makefile for arm iar toolchain
2+
3+
CC = iccarm
24
AS = iasmarm
35
LD = ilinkarm
46
OBJCOPY = ielftool --silent

‎examples/device/cdc_msc_freertos/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include ../../build_system/make/make.mk
22

33
FREERTOS_SRC = lib/FreeRTOS-Kernel
4-
FREERTOS_PORTABLE_PATH= $(FREERTOS_SRC)/portable/$(if $(USE_IAR),IAR,GCC)
4+
FREERTOS_PORTABLE_PATH = $(FREERTOS_SRC)/portable/$(if $(findstring iar,$(TOOLCHAIN)),IAR,GCC)
55

66
INC += \
77
src \

‎examples/device/hid_composite_freertos/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ DEPS_SUBMODULES += lib/FreeRTOS-Kernel
33
include ../../build_system/make/make.mk
44

55
FREERTOS_SRC = lib/FreeRTOS-Kernel
6-
FREERTOS_PORTABLE_PATH= $(FREERTOS_SRC)/portable/$(if $(USE_IAR),IAR,GCC)
6+
FREERTOS_PORTABLE_PATH= $(FREERTOS_SRC)/portable/$(if $(findstring iar,$(TOOLCHAIN)),IAR,GCC)
77

88
INC += \
99
src \

‎examples/host/cdc_msc_hid_freertos/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
include ../../build_system/make/make.mk
22

33
FREERTOS_SRC = lib/FreeRTOS-Kernel
4-
FREERTOS_PORTABLE_PATH= $(FREERTOS_SRC)/portable/$(if $(USE_IAR),IAR,GCC)
4+
FREERTOS_PORTABLE_PATH= $(FREERTOS_SRC)/portable/$(if $(findstring iar,$(TOOLCHAIN)),IAR,GCC)
55

66
INC += \
77
src \

‎hw/bsp/board.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@
2525

2626
#include "board_api.h"
2727

28+
//--------------------------------------------------------------------+
29+
// Board API
30+
//--------------------------------------------------------------------+
31+
int board_getchar(void) {
32+
char c;
33+
return (sys_read(0, &c, 1) > 0) ? (int) c : (-1);
34+
}
35+
2836
//--------------------------------------------------------------------+
2937
// newlib read()/write() retarget
3038
//--------------------------------------------------------------------+
@@ -126,8 +134,3 @@ FILE *const stdin = &__stdio;
126134
__strong_reference(stdin, stdout);
127135
__strong_reference(stdin, stderr);
128136
#endif
129-
130-
int board_getchar(void) {
131-
char c;
132-
return (sys_read(0, &c, 1) > 0) ? (int) c : (-1);
133-
}

‎hw/bsp/board_api.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ static inline size_t board_usb_get_serial(uint16_t desc_str1[], size_t max_chars
142142
uint8_t uid[16] TU_ATTR_ALIGNED(4);
143143
size_t uid_len;
144144

145+
// TODO work with make, but not working with esp32s3 cmake
145146
if ( board_get_unique_id ) {
146147
uid_len = board_get_unique_id(uid, sizeof(uid));
147148
}else {

‎test/hil/hil_pi4.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
"flasher_args": "-f interface/cmsis-dap.cfg -f target/rp2040.cfg -c \"adapter speed 5000\""
99
},
1010
{
11-
"name": "espressif_s3_devkitc",
12-
"uid": "7CDFA1E073CC",
11+
"name": "espressif_s3_devkitm",
12+
"uid": "84F703C084E4",
1313
"tests": [
1414
"cdc_msc_freertos", "hid_composite_freertos"
1515
],
1616
"flasher": "esptool",
17-
"flasher_sn": "461cb8d7decdeb119be9b506e93fd3f1",
17+
"flasher_sn": "3ea619acd1cdeb11a0a0b806e93fd3f1",
1818
"flasher_args": "-b 1500000"
1919
},
2020
{

0 commit comments

Comments
 (0)