Skip to content

Commit 08380ca

Browse files
TiejunZhou-CNTiejunZhou-CN
authored
Unify ThreadX and SMP for ARMv8-A. (#275)
* Unify ThreadX and SMP for ARMv8-A. * Fix path in pipeline to check ports arch. * Add ignore folders for ARM DS * Generate ThreadX and SMP ports for ARMv8-A. * Ignore untracked files for ports_arch check. * Use arch instead of CPU to simplify the project management.
1 parent 1b2995c commit 08380ca

736 files changed

Lines changed: 4649 additions & 1989 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ports_arch_check.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Copy ports arch
3838
run: |
3939
scripts/copy_armv7_m.sh && scripts/copy_armv8_m.sh && scripts/copy_module_armv7_m.sh
40-
if [[ -n $(git status --porcelain) ]]; then
40+
if [[ -n $(git status --porcelain -uno) ]]; then
4141
echo "Ports for ARM architecture is not updated"
4242
git status
4343
exit 1
@@ -61,7 +61,9 @@ jobs:
6161
run: |
6262
cd ports_arch/ARMv7-A
6363
pwsh -Command ./update.ps1 -PortSets tx -CopyCommonFiles -CopyPortFiles -CopyExample -PatchFiles
64-
if ((git status --porcelain) -ne $null) {
64+
cd ../../ports_arch/ARMv8-A
65+
pwsh -Command ./update.ps1 -PortSets tx,tx_smp -CopyCommonFiles -CopyPortFiles -CopyExample -PatchFiles
66+
if ((git status --porcelain -uno) -ne $null) {
6567
Write-Host "Ports for ARM architecture is not updated"
6668
git status
6769
Exit 1

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.vscode/
2+
.settings/
3+
.metadata/
24
_deps/
35
build/
46
Debug/

‎ports/cortex_a35/ac6/src/tx_initialize_low_level.S‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22-
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2325

2426
.text
2527
.align 3
@@ -28,7 +30,7 @@
2830
/* FUNCTION RELEASE */
2931
/* */
3032
/* _tx_initialize_low_level ARMv8-A */
31-
/* 6.1.10 */
33+
/* 6.x */
3234
/* AUTHOR */
3335
/* */
3436
/* William E. Lamie, Microsoft Corporation */
@@ -64,6 +66,9 @@
6466
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
6567
/* 01-31-2022 Andres Mlinar Updated comments, */
6668
/* resulting in version 6.1.10 */
69+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
70+
/* #include tx_user.h, */
71+
/* resulting in version 6.x */
6772
/* */
6873
/**************************************************************************/
6974
// VOID _tx_initialize_low_level(VOID)

‎ports/cortex_a35/ac6/src/tx_thread_context_restore.S‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,17 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22-
23-
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2425
.text
2526
.align 3
2627
/**************************************************************************/
2728
/* */
2829
/* FUNCTION RELEASE */
2930
/* */
3031
/* _tx_thread_context_restore ARMv8-A */
31-
/* 6.1.10 */
32+
/* 6.x */
3233
/* AUTHOR */
3334
/* */
3435
/* William E. Lamie, Microsoft Corporation */
@@ -61,6 +62,9 @@
6162
/* DATE NAME DESCRIPTION */
6263
/* */
6364
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
65+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
66+
/* #include tx_user.h, */
67+
/* resulting in version 6.x */
6468
/* */
6569
/**************************************************************************/
6670
// VOID _tx_thread_context_restore(VOID)

‎ports/cortex_a35/ac6/src/tx_thread_context_save.S‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22-
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2325

2426
.text
2527
.align 3
@@ -28,7 +30,7 @@
2830
/* FUNCTION RELEASE */
2931
/* */
3032
/* _tx_thread_context_save ARMv8-A */
31-
/* 6.1.10 */
33+
/* 6.x */
3234
/* AUTHOR */
3335
/* */
3436
/* William E. Lamie, Microsoft Corporation */
@@ -60,6 +62,9 @@
6062
/* DATE NAME DESCRIPTION */
6163
/* */
6264
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
65+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
66+
/* #include tx_user.h, */
67+
/* resulting in version 6.x */
6368
/* */
6469
/**************************************************************************/
6570
// VOID _tx_thread_context_save(VOID)

‎ports/cortex_a35/ac6/src/tx_thread_interrupt_control.S‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22-
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2325

2426
.text
2527
.align 3
@@ -28,7 +30,7 @@
2830
/* FUNCTION RELEASE */
2931
/* */
3032
/* _tx_thread_interrupt_control ARMv8-A */
31-
/* 6.1.10 */
33+
/* 6.x */
3234
/* AUTHOR */
3335
/* */
3436
/* William E. Lamie, Microsoft Corporation */
@@ -61,6 +63,9 @@
6163
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
6264
/* 01-31-2022 Andres Mlinar Updated comments, */
6365
/* resulting in version 6.1.10 */
66+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
67+
/* #include tx_user.h, */
68+
/* resulting in version 6.x */
6469
/* */
6570
/**************************************************************************/
6671
// UINT _tx_thread_interrupt_control(UINT new_posture)

‎ports/cortex_a35/ac6/src/tx_thread_interrupt_disable.S‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22-
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2325

2426
.text
2527
.align 3
@@ -28,7 +30,7 @@
2830
/* FUNCTION RELEASE */
2931
/* */
3032
/* _tx_thread_interrupt_disable ARMv8-A */
31-
/* 6.1.10 */
33+
/* 6.x */
3234
/* AUTHOR */
3335
/* */
3436
/* William E. Lamie, Microsoft Corporation */
@@ -60,6 +62,9 @@
6062
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
6163
/* 01-31-2022 Andres Mlinar Updated comments, */
6264
/* resulting in version 6.1.10 */
65+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
66+
/* #include tx_user.h, */
67+
/* resulting in version 6.x */
6368
/* */
6469
/**************************************************************************/
6570
// UINT _tx_thread_interrupt_disable(void)

‎ports/cortex_a35/ac6/src/tx_thread_interrupt_restore.S‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22-
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2325

2426
.text
2527
.align 3
@@ -28,7 +30,7 @@
2830
/* FUNCTION RELEASE */
2931
/* */
3032
/* _tx_thread_interrupt_restore ARMv8-A */
31-
/* 6.1.10 */
33+
/* 6.x */
3234
/* AUTHOR */
3335
/* */
3436
/* William E. Lamie, Microsoft Corporation */
@@ -61,6 +63,9 @@
6163
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
6264
/* 01-31-2022 Andres Mlinar Updated comments, */
6365
/* resulting in version 6.1.10 */
66+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
67+
/* #include tx_user.h, */
68+
/* resulting in version 6.x */
6469
/* */
6570
/**************************************************************************/
6671
// UINT _tx_thread_interrupt_restore(UINT old_posture)

‎ports/cortex_a35/ac6/src/tx_thread_schedule.S‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22-
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2325

2426
.text
2527
.align 3
@@ -28,7 +30,7 @@
2830
/* FUNCTION RELEASE */
2931
/* */
3032
/* _tx_thread_schedule ARMv8-A */
31-
/* 6.1.10 */
33+
/* 6.x */
3234
/* AUTHOR */
3335
/* */
3436
/* William E. Lamie, Microsoft Corporation */
@@ -65,6 +67,9 @@
6567
/* 01-31-2022 Andres Mlinar Updated comments, */
6668
/* added ARMv8.2-A support, */
6769
/* resulting in version 6.1.10 */
70+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
71+
/* #include tx_user.h, */
72+
/* resulting in version 6.x */
6873
/* */
6974
/**************************************************************************/
7075
// VOID _tx_thread_schedule(VOID)

‎ports/cortex_a35/ac6/src/tx_thread_stack_build.S‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
/** */
2020
/**************************************************************************/
2121
/**************************************************************************/
22-
22+
#ifdef TX_INCLUDE_USER_DEFINE_FILE
23+
#include "tx_user.h"
24+
#endif
2325

2426
.text
2527
.align 3
@@ -28,7 +30,7 @@
2830
/* FUNCTION RELEASE */
2931
/* */
3032
/* _tx_thread_stack_build ARMv8-A */
31-
/* 6.1.10 */
33+
/* 6.x */
3234
/* AUTHOR */
3335
/* */
3436
/* William E. Lamie, Microsoft Corporation */
@@ -63,6 +65,9 @@
6365
/* 09-30-2020 William E. Lamie Initial Version 6.1 */
6466
/* 01-31-2022 Andres Mlinar Updated comments, */
6567
/* resulting in version 6.1.10 */
68+
/* xx-xx-xxxx Tiejun Zhou Modified comment(s), added */
69+
/* #include tx_user.h, */
70+
/* resulting in version 6.x */
6671
/* */
6772
/**************************************************************************/
6873
// VOID _tx_thread_stack_build(TX_THREAD *thread_ptr, VOID (*function_ptr)(VOID))

0 commit comments

Comments
 (0)