Skip to content

Commit e8f5b2e

Browse files
tony-josi-awstony-josi-aws
authored
Merge branch 'main' into dev-ip-build-sep
2 parents cecf06e + 9af3768 commit e8f5b2e

33 files changed

+25352
-21
lines changed

‎.github/.cSpellWords.txt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,7 @@ DEFR
229229
Deglitchers
230230
DEMCR
231231
DEREN
232+
Descs
232233
DEVAD
233234
DFREERTOS
234235
DFSR
@@ -394,6 +395,8 @@ ETHERC
394395
ethernetif
395396
ETHMACRX
396397
ETHMACTX
398+
ETHTX
399+
ETHRX
397400
ETIE
398401
EVCNT
399402
EVCNTR
@@ -441,6 +444,7 @@ FFSR
441444
FIFOSZ
442445
FLMSK
443446
FMAC
447+
FNUM
444448
FOLDEVTENA
445449
FORCEWT
446450
FORWARDALLEXCEPTPA
@@ -477,6 +481,14 @@ Gpbs
477481
GPCNTRL
478482
gpio
479483
GPIO
484+
GPIOA
485+
GPIOB
486+
GPIOC
487+
GPIOD
488+
GPIOE
489+
GPIOF
490+
GPIOG
491+
GPIOH
480492
GPSL
481493
GPSLCE
482494
gptimer
@@ -593,6 +605,7 @@ IVLTV
593605
IVTIR
594606
JABBR
595607
JFRAME
608+
Jndex
596609
jscott
597610
jscotts
598611
karkhaz
@@ -677,6 +690,7 @@ MACECR
677690
MACFCR
678691
MACHT
679692
MACHTLR
693+
MACHWF
680694
MACIMR
681695
MACISR
682696
MACMDIOAR
@@ -922,6 +936,7 @@ Picovolts
922936
PIDEVAD
923937
pidr
924938
PIDR
939+
PINSEL
925940
PIOA
926941
PKHBT
927942
pkhtb
@@ -1323,6 +1338,7 @@ TBFT
13231338
TBQB
13241339
TBQBAPQ
13251340
TBUE
1341+
TBUS
13261342
TCKER
13271343
TCMSSV
13281344
TCOMP

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ jobs:
126126
uses: FreeRTOS/CI-CD-Github-Actions/spellings@main
127127
with:
128128
path: ./
129+
exclude-dirs: source/portable/NetworkInterface/STM32
129130

130131
formatting:
131132
runs-on: ubuntu-20.04
@@ -135,6 +136,7 @@ jobs:
135136
uses: FreeRTOS/CI-CD-Github-Actions/formatting@main
136137
with:
137138
path: ./
139+
exclude-dirs: source/portable/NetworkInterface/STM32
138140

139141
doxygen:
140142
runs-on: ubuntu-latest

‎.github/workflows/release.yml‎

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,31 +20,43 @@ jobs:
2020
with:
2121
ref: ${{ github.event.inputs.commit_id }}
2222
- name: Configure git identity
23+
env:
24+
ACTOR: ${{ github.actor }}
2325
run: |
24-
git config --global user.name ${{ github.actor }}
25-
git config --global user.email ${{ github.actor }}@users.noreply.github.com
26+
git config --global user.name "$ACTOR"
27+
git config --global user.email "$ACTOR"@users.noreply.github.com
2628
- name: create a new branch that references commit id
27-
run: git checkout -b ${{ github.event.inputs.version_number }} ${{ github.event.inputs.commit_id }}
29+
env:
30+
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
31+
COMMIT_ID: ${{ github.event.inputs.commit_id }}
32+
run: git checkout -b "$VERSION_NUMBER" "$COMMIT_ID"
2833
- name: Generate SBOM
2934
uses: FreeRTOS/CI-CD-Github-Actions/sbom-generator@main
3035
with:
3136
repo_path: ./
3237
source_path: ./source
3338
- name: commit SBOM file
39+
env:
40+
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
3441
run: |
3542
git add .
3643
git commit -m 'Update SBOM'
37-
git push -u origin ${{ github.event.inputs.version_number }}
44+
git push -u origin "$VERSION_NUMBER"
3845
- name: Tag Commit and Push to remote
46+
env:
47+
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
3948
run: |
40-
git tag ${{ github.event.inputs.version_number }} -a -m "FreeRTOS-Plus-TCP Library ${{ github.event.inputs.version_number }}"
49+
git tag "$VERSION_NUMBER" -a -m "FreeRTOS-Plus-TCP Library $VERSION_NUMBER"
4150
git push origin --tags
4251
- name: Verify tag on remote
52+
env:
53+
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
54+
COMMIT_ID: ${{ github.event.inputs.commit_id }}
4355
run: |
44-
git tag -d ${{ github.event.inputs.version_number }}
56+
git tag -d "$VERSION_NUMBER"
4557
git remote update
46-
git checkout tags/${{ github.event.inputs.version_number }}
47-
git diff ${{ github.event.inputs.commit_id }} tags/${{ github.event.inputs.version_number }}
58+
git checkout tags/"$VERSION_NUMBER"
59+
git diff "$COMMIT_ID" tags/"$VERSION_NUMBER"
4860
create-zip:
4961
needs: tag-commit
5062
name: Create ZIP and verify package for release asset.
@@ -63,28 +75,36 @@ jobs:
6375
cd FreeRTOS-Plus-TCP
6476
git submodule update --init --checkout --recursive
6577
- name: Create ZIP
78+
env:
79+
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
6680
run: |
67-
zip -r FreeRTOS-Plus-TCP-${{ github.event.inputs.version_number }}.zip FreeRTOS-Plus-TCP -x "*.git*"
81+
zip -r FreeRTOS-Plus-TCP-"$VERSION_NUMBER".zip FreeRTOS-Plus-TCP -x "*.git*"
6882
ls ./
6983
- name: Validate created ZIP
84+
env:
85+
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
7086
run: |
7187
mkdir zip-check
72-
mv FreeRTOS-Plus-TCP-${{ github.event.inputs.version_number }}.zip zip-check
88+
mv FreeRTOS-Plus-TCP-"$VERSION_NUMBER".zip zip-check
7389
cd zip-check
74-
unzip FreeRTOS-Plus-TCP-${{ github.event.inputs.version_number }}.zip -d FreeRTOS-Plus-TCP-${{ github.event.inputs.version_number }}
75-
ls FreeRTOS-Plus-TCP-${{ github.event.inputs.version_number }}
76-
diff -r -x "*.git*" FreeRTOS-Plus-TCP-${{ github.event.inputs.version_number }}/FreeRTOS-Plus-TCP/ ../FreeRTOS-Plus-TCP/
90+
unzip FreeRTOS-Plus-TCP-"$VERSION_NUMBER".zip -d FreeRTOS-Plus-TCP-"$VERSION_NUMBER"
91+
ls FreeRTOS-Plus-TCP-"$VERSION_NUMBER"
92+
diff -r -x "*.git*" FreeRTOS-Plus-TCP-"$VERSION_NUMBER"/FreeRTOS-Plus-TCP/ ../FreeRTOS-Plus-TCP/
7793
cd ../
7894
- name: Build
95+
env:
96+
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
7997
run: |
80-
cd zip-check/FreeRTOS-Plus-TCP-${{ github.event.inputs.version_number }}/FreeRTOS-Plus-TCP
98+
cd zip-check/FreeRTOS-Plus-TCP-"$VERSION_NUMBER"/FreeRTOS-Plus-TCP
8199
sudo apt-get install -y lcov
82100
sudo apt-get install unifdef
83101
cmake -S test/unit-test -B test/unit-test/build/
84102
make -C test/unit-test/build/ all
85103
- name: Test
104+
env:
105+
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
86106
run: |
87-
cd zip-check/FreeRTOS-Plus-TCP-${{ github.event.inputs.version_number }}/FreeRTOS-Plus-TCP
107+
cd zip-check/FreeRTOS-Plus-TCP-"$VERSION_NUMBER"/FreeRTOS-Plus-TCP
88108
pushd test/unit-test/build/
89109
ctest -E system --output-on-failure
90110
popd
@@ -147,6 +167,8 @@ jobs:
147167
- name: Checkout code
148168
uses: actions/checkout@v4
149169
- name: Delete branch created for Tag by SBOM generator
170+
env:
171+
VERSION_NUMBER: ${{ github.event.inputs.version_number }}
150172
run: |
151173
# Delete the branch created for Tag by SBOM generator
152-
git push -u origin --delete refs/heads/${{ github.event.inputs.version_number }}
174+
git push -u origin --delete refs/heads/"$VERSION_NUMBER"

‎CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ set(FREERTOS_PLUS_TCP_NETWORK_IF_LIST
7171
POSIX WIN_PCAP # Native Linux & Windows respectively
7272
RX
7373
SH2A
74-
STM32FXX STM32HXX # ST Micro
74+
STM32 # ST Micro
7575
MSP432
7676
TM4C
7777
XILINX_ULTRASCALE ZYNQ # AMD/Xilinx
@@ -117,8 +117,7 @@ if(NOT FREERTOS_PLUS_TCP_NETWORK_IF IN_LIST FREERTOS_PLUS_TCP_NETWORK_IF_LIST )
117117
" PIC32MZEF_WIFI Target: pic32mzef Wifi Tested: TODO\n"
118118
" RX Target: RX Tested: TODO\n"
119119
" SH2A Target: SH2A Tested: TODO\n"
120-
" STM32FXX Target: STM32Fxx Tested: TODO\n"
121-
" STM32HXX Target: STM32Hxx Tested: TODO\n"
120+
" STM32 Target: STM32 Tested: TODO\n"
122121
" MSP432 Target: MSP432 Tested: TODO\n"
123122
" TM4C Target: TM4C Tested: TODO\n"
124123
" WIN_PCAP Target: Windows Tested: TODO\n"

‎source/portable/NetworkInterface/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ add_subdirectory(mw300_rd)
4949
add_subdirectory(pic32mzef)
5050
add_subdirectory(RX)
5151
add_subdirectory(SH2A)
52-
add_subdirectory(STM32Fxx)
53-
add_subdirectory(STM32Hxx)
52+
add_subdirectory(STM32)
5453
add_subdirectory(ThirdParty/MSP432)
5554
add_subdirectory(TM4C)
5655
add_subdirectory(WinPCap)

‎source/portable/NetworkInterface/STM32/CMakeLists.txt‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
if (NOT ( (FREERTOS_PLUS_TCP_NETWORK_IF STREQUAL "STM32") ) )
2+
return()
3+
endif()
4+
5+
#------------------------------------------------------------------------------
6+
add_library( freertos_plus_tcp_network_if STATIC )
7+
8+
set( FREERTOS_PLUS_TCP_STM32_IF_DRIVER "None" CACHE STRING "The driver sources to use with STM32 Network interface" )
9+
10+
target_sources( freertos_plus_tcp_network_if
11+
PRIVATE
12+
NetworkInterface.c
13+
$<$<STREQUAL:${FREERTOS_PLUS_TCP_STM32_IF_DRIVER},F4>:
14+
Drivers/F4/stm32f4xx_hal_eth.c>
15+
$<$<STREQUAL:${FREERTOS_PLUS_TCP_STM32_IF_DRIVER},F7>:
16+
Drivers/F7/stm32f7xx_hal_eth.c>
17+
$<$<STREQUAL:${FREERTOS_PLUS_TCP_STM32_IF_DRIVER},H5>:
18+
Drivers/H5/stm32h5xx_hal_eth_ex.c>
19+
$<$<STREQUAL:${FREERTOS_PLUS_TCP_STM32_IF_DRIVER},H5>:
20+
Drivers/H5/stm32h5xx_hal_eth.c>
21+
$<$<STREQUAL:${FREERTOS_PLUS_TCP_STM32_IF_DRIVER},H7>:
22+
Drivers/H7/stm32h7xx_hal_eth_ex.c>
23+
$<$<STREQUAL:${FREERTOS_PLUS_TCP_STM32_IF_DRIVER},H7>:
24+
Drivers/H7/stm32h7xx_hal_eth.c>
25+
)
26+
27+
target_include_directories( freertos_plus_tcp_network_if
28+
PUBLIC
29+
$<$<STREQUAL:${FREERTOS_PLUS_TCP_STM32_IF_DRIVER},F4>:
30+
Drivers/F4>
31+
$<$<STREQUAL:${FREERTOS_PLUS_TCP_STM32_IF_DRIVER},F7>:
32+
Drivers/F7>
33+
$<$<STREQUAL:${FREERTOS_PLUS_TCP_STM32_IF_DRIVER},H5>:
34+
Drivers/H5>
35+
$<$<STREQUAL:${FREERTOS_PLUS_TCP_STM32_IF_DRIVER},H7>:
36+
Drivers/H7>
37+
)
38+
39+
target_link_libraries( freertos_plus_tcp_network_if
40+
PUBLIC
41+
freertos_plus_tcp_port
42+
freertos_plus_tcp_network_if_common
43+
PRIVATE
44+
freertos_kernel
45+
freertos_plus_tcp
46+
)

0 commit comments

Comments
 (0)