Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: eclipse-threadx/threadx
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dev
Choose a base ref
...
head repository: sysprog21/threadx
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dev
Choose a head ref
  • 16 commits
  • 118 files changed
  • 8 contributors

Commits on Nov 20, 2024

  1. Removed extra spaces

    Signed-off-by: Jim Huang <jserv@ccns.ncku.edu.tw>
    MrNetic authored and jserv committed Nov 20, 2024
    Copy the full SHA
    17944a0 View commit details
  2. Remove duplicate declaration "invalidateCaches_IS"

    Signed-off-by: Du Huanpeng <dhu@hodcarrier.org>
    Signed-off-by: Jim Huang <jserv@ccns.ncku.edu.tw>
    hodcarrier authored and jserv committed Nov 20, 2024
    Copy the full SHA
    2ea8807 View commit details
  3. Fix link flag to -mcpu=cortex-a9

    Signed-off-by: Du Huanpeng <dhu@hodcarrier.org>
    Signed-off-by: Jim Huang <jserv@ccns.ncku.edu.tw>
    hodcarrier authored and jserv committed Nov 20, 2024
    Copy the full SHA
    1deefaa View commit details
  4. Fix the typos

    Signed-off-by: Jim Huang <jserv@ccns.ncku.edu.tw>
    howjmay authored and jserv committed Nov 20, 2024
    Copy the full SHA
    a8feb78 View commit details
  5. Drop unintended binary blobs

    This drops a few archive files from the source tree as they belong
    to the toolchain.
    
    Signed-off-by: Yanfeng Liu <yfliu2008@qq.com>
    Signed-off-by: Jim Huang <jserv@ccns.ncku.edu.tw>
    yf13 authored and jserv committed Nov 20, 2024
    Copy the full SHA
    8456814 View commit details
  6. Fix first system tick delay on Cortex-M0

    The SysTick timer was initializing incorrectly, causing an unexpectedly
    long first system tick. When the 24-bit SysTick Current Value Register
    starts at 0xFFFFFF without being reset, it creates a substantial startup
    delay of approximately 350 milliseconds at 48 MHz.
    
    The initialization in the port file is corrected to reset the register,
    ensuring more predictable and efficient system tick timing. This change
    aligns with Arm's recommended initialization practices for the SysTick
    timer.
    
    Signed-off-by: Jim Huang <jserv@ccns.ncku.edu.tw>
    Alex Kiselev authored and jserv committed Nov 20, 2024
    Copy the full SHA
    1bc9c1b View commit details
  7. Use the '--toolchain' option for CMake

    Signed-off-by: Jim Huang <jserv@ccns.ncku.edu.tw>
    pdietl authored and jserv committed Nov 20, 2024
    Copy the full SHA
    8f954d3 View commit details
  8. Increase minimum required CMake version

    At least as of CMake 3.28.3, it warns that support for CMake
    versions less than 3.5 will be removed soon, quote:
    
    > CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required):
      Compatibility with CMake < 3.5 will be removed from a future version of
      CMake.
    
    Signed-off-by: Jim Huang <jserv@ccns.ncku.edu.tw>
    pdietl authored and jserv committed Nov 20, 2024
    Copy the full SHA
    82c647c View commit details

Commits on Nov 21, 2024

  1. Refine the comment

    jserv committed Nov 21, 2024
    Copy the full SHA
    c2fe7ec View commit details
  2. CI: Bump Arm GNU Toolchain

    jserv committed Nov 21, 2024
    Copy the full SHA
    f2a7030 View commit details
  3. Merge pull request #1 from sysprog21/ci-arm-none-eabi-gcc

    CI: Bump Arm GNU Toolchain
    jserv authored Nov 21, 2024
    Copy the full SHA
    ca456a4 View commit details
  4. CI: Bump dependency

    Initially, Arm Cortex-A port checks were conducted using 'pwsh' (Windows
    PowerShell) on a Windows host. To maintain consistency, the continuous
    integration pipeline shifted to a Linux host. Consequently, this change
    eliminated the use of Windows PowerShell, which effectively disabled the
    Arm Cortex-A port checks.
    jserv committed Nov 21, 2024
    Copy the full SHA
    473f3ae View commit details
  5. Merge pull request #2 from sysprog21/ci-refine

    CI: Bump dependency
    jserv authored Nov 21, 2024
    Copy the full SHA
    63d20af View commit details
  6. Copy the full SHA
    51e2a04 View commit details
  7. Fix RV64 context_restore bug when F/D extension is enabled

    Signed-off-by: Jim Huang <jserv@ccns.ncku.edu.tw>
    Jer6y authored and jserv committed Nov 21, 2024
    Copy the full SHA
    0670e81 View commit details

Commits on Nov 26, 2024

  1. Fix missing barrier in TX_DISABLE for Cortex-R5

    This commit fixes thread safety issue in tx_byte_allocate by correcting
    clobber list and adding missing compiler fence. This addresses potential
    race conditions when aggressive compiler optimization is enabled.
    
    See #334
    jserv committed Nov 26, 2024
    Copy the full SHA
    15459cc View commit details
Showing with 317 additions and 357 deletions.
  1. +1 −1 .devcontainer/devcontainer.json
  2. +1 −1 .gitattributes
  3. +1 −1 .github/PULL_REQUEST_TEMPLATE.md
  4. +8 −23 .github/workflows/ci_cortex_m.yml
  5. +6 −32 .github/workflows/ports_arch_check.yml
  6. +12 −11 .github/workflows/regression_template.yml
  7. +4 −4 .github/workflows/regression_test.yml
  8. +2 −2 CMakeLists.txt
  9. +1 −1 README.md
  10. +1 −1 cmake/arm-none-eabi.cmake
  11. +1 −1 cmake/cortex_m0.cmake
  12. +1 −1 cmake/cortex_m3.cmake
  13. +1 −1 cmake/cortex_m4.cmake
  14. +1 −1 cmake/cortex_m7.cmake
  15. +1 −1 cmake/utilities.cmake
  16. +1 −1 docs/revision_history.txt
  17. BIN ports/arm11/gnu/example_build/libnosys.a
  18. +1 −1 ports/c667x/ccs/example_build/sample_threadx_c6678evm/targetConfigs/readme.txt
  19. +1 −1 ports/c667x/ccs/example_build/sample_threadx_ta6678fmc/targetConfigs/readme.txt
  20. +1 −1 ports/cortex_a5x/ac6/example_build/sample_threadx/sample_threadx.txt
  21. +3 −0 ports/cortex_m0/ac5/example_build/tx_initialize_low_level.s
  22. +0 −1 ports/cortex_m0/gnu/example_build/cortexm0_crt0.S
  23. +3 −0 ports/cortex_m0/gnu/example_build/tx_initialize_low_level.S
  24. +3 −0 ports/cortex_m0/iar/example_build/tx_initialize_low_level.s
  25. +3 −0 ports/cortex_m0/keil/example_build/tx_initialize_low_level.s
  26. +1 −1 ports/cortex_m23/ac6/example_build/Debug.ini
  27. +1 −1 ports/cortex_m23/ac6/example_build/demo_secure_zone/Abstract.txt
  28. +0 −1 ports/cortex_m3/gnu/example_build/cortexm3_crt0.S
  29. +1 −1 ports/cortex_m33/ac6/example_build/Debug.ini
  30. +1 −1 ports/cortex_m33/ac6/example_build/demo_secure_zone/Abstract.txt
  31. +0 −1 ports/cortex_m4/gnu/example_build/cortexm4_crt0.S
  32. +1 −1 ports/cortex_m55/ac6/example_build/Debug.ini
  33. +0 −1 ports/cortex_m7/gnu/example_build/cortexm7_crt0.S
  34. +2 −2 ports/cortex_r5/gnu/inc/tx_port.h
  35. +1 −1 ports/linux/gnu/CMakeLists.txt
  36. +1 −1 ports/risc-v32/iar/example_build/config/debugger/timer.mac
  37. +1 −1 ports/risc-v32/iar/example_build/sample_threadx.c
  38. +0 −1 ports/risc-v32/iar/src/tx_initialize_low_level.s
  39. +0 −1 ports/risc-v32/iar/src/tx_thread_context_save.s
  40. +0 −1 ports/risc-v32/iar/src/tx_thread_interrupt_control.s
  41. +0 −1 ports/risc-v32/iar/src/tx_thread_system_return.s
  42. +0 −1 ports/risc-v32/iar/src/tx_timer_interrupt.s
  43. +8 −0 ports/risc-v64/gnu/src/tx_thread_context_restore.S
  44. +4 −0 ports/risc-v64/gnu/src/tx_thread_schedule.S
  45. +1 −1 ports/rxv1/ccrx/readme_threadx.txt
  46. +1 −1 ports/rxv1/iar/readme_threadx.txt
  47. +1 −1 ports/rxv2/ccrx/readme_threadx.txt
  48. +1 −1 ports/rxv2/iar/readme_threadx.txt
  49. +1 −1 ports/rxv3/iar/readme_threadx.txt
  50. +1 −1 ports/win32/vs_2019/src/tx_initialize_low_level.c
  51. +0 −1 ports_arch/ARMv7-M/threadx/gnu/example_build/cortexm4_crt0.S
  52. BIN ports_module/cortex_a7/ac5/example_build/module_code.c
  53. +0 −1 ports_module/cortex_a7/gnu/example_build/gcc_setup.S
  54. +1 −1 ports_module/cortex_a7/iar/module_manager/src/tx_thread_context_restore.s
  55. +0 −1 ports_module/cortex_m0+/gnu/example_build/sample_threadx/cortexm_crt0.s
  56. +0 −1 ports_module/cortex_m0+/gnu/example_build/sample_threadx_module_manager/cortexm_crt0.s
  57. BIN ports_module/cortex_m0+/gnu/example_build/sample_threadx_module_manager/libgcc.a
  58. +1 −1 ports_module/cortex_m23/ac6/example_build/Debug.ini
  59. +1 −1 ports_module/cortex_m23/ac6/module_manager/inc/txm_module_manager_dispatch_port.h
  60. +1 −1 ports_module/cortex_m23/gnu/module_manager/inc/txm_module_manager_dispatch_port.h
  61. +1 −1 ports_module/cortex_m23/iar/module_manager/inc/txm_module_manager_dispatch_port.h
  62. +0 −1 ports_module/cortex_m3/gnu/example_build/cortexm_crt0.s
  63. +0 −1 ports_module/cortex_m3/gnu/example_build/gcc_setup.s
  64. BIN ports_module/cortex_m3/iar/example_build/stm32f2xx_library.a
  65. +1 −1 ports_module/cortex_m33/ac6/example_build/Debug.ini
  66. +1 −1 ports_module/cortex_m33/ac6/module_manager/inc/txm_module_manager_dispatch_port.h
  67. +0 −1 ports_module/cortex_m33/gnu/example_build/gcc_setup.s
  68. +1 −1 ports_module/cortex_m33/gnu/module_manager/inc/txm_module_manager_dispatch_port.h
  69. +1 −1 ports_module/cortex_m33/iar/module_manager/inc/txm_module_manager_dispatch_port.h
  70. +0 −1 ports_module/cortex_m4/gnu/example_build/gcc_setup.s
  71. +0 −1 ports_module/cortex_m7/gnu/example_build/cortexm_crt0.s
  72. +0 −1 ports_module/cortex_m7/gnu/example_build/gcc_setup.s
  73. +1 −1 ports_smp/cortex_a5_smp/ac5/example_build/sample_threadx/sample_threadx.sct
  74. +0 −1 ports_smp/cortex_a5_smp/ac5/example_build/sample_threadx/v7.h
  75. +0 −1 ports_smp/cortex_a5_smp/gnu/example_build/v7.h
  76. +1 −1 ports_smp/cortex_a75_smp/gnu/inc/tx_port.h
  77. +1 −1 ports_smp/cortex_a7_smp/ac5/example_build/sample_threadx/sample_threadx.scat
  78. +0 −1 ports_smp/cortex_a7_smp/ac5/example_build/sample_threadx/v7.h
  79. +0 −1 ports_smp/cortex_a7_smp/gnu/example_build/v7.h
  80. +1 −1 ports_smp/cortex_a9_smp/ac5/example_build/sample_threadx/sample_threadx.scat
  81. +1 −1 ports_smp/cortex_a9_smp/gnu/example_build/build_threadx_sample.bat
  82. +0 −1 ports_smp/cortex_a9_smp/gnu/example_build/v7.h
  83. +1 −1 scripts/copy_armv7_m.sh
  84. +1 −1 scripts/copy_armv8_m.sh
  85. +1 −1 scripts/copy_module_armv7_m.sh
  86. +1 −1 scripts/sdl_check.sh
  87. +1 −1 test/.gitignore
  88. +1 −1 test/ports/.gitignore
  89. +2 −2 test/smp/cmake/regression/CMakeLists.txt
  90. +1 −1 test/smp/cmake/regression/generate_test_file.sh
  91. +1 −1 test/smp/cmake/samples/fake.c
  92. +1 −1 test/smp/cmake/threadx_smp/CMakeLists.txt
  93. +1 −1 test/smp/cmake/threadx_smp/ports_smp/linux/gnu/CMakeLists.txt
  94. +7 −7 test/smp/regression/testcontrol.c
  95. +1 −1 test/smp/regression/threadx_initialize_kernel_setup_test.c
  96. +17 −17 test/smp/regression/threadx_mutex_information_test.c
  97. +2 −2 test/smp/regression/threadx_mutex_nested_priority_inheritance_test.c
  98. +1 −1 test/smp/regression/threadx_semaphore_basic_test.c
  99. +33 −33 ...dx_smp_resume_suspend_accending_order_test.c → threadx_smp_resume_suspend_ascending_order_test.c}
  100. +67 −67 ...x_smp_resume_suspend_decending_order_test.c → threadx_smp_resume_suspend_descending_order_test.c}
  101. +2 −2 test/smp/regression/threadx_thread_basic_execution_test.c
  102. +9 −9 test/smp/regression/threadx_thread_delayed_suspension_test.c
  103. +1 −1 test/smp/regression/threadx_thread_simple_suspend_test.c
  104. +12 −12 test/smp/regression/threadx_thread_sleep_for_100ticks_test.c
  105. +1 −1 test/smp/regression/threadx_thread_terminate_delete_test.c
  106. +1 −1 test/tx/cmake/regression/generate_test_file.sh
  107. +1 −1 test/tx/cmake/samples/fake.c
  108. +3 −3 test/tx/regression/testcontrol.c
  109. +1 −1 test/tx/regression/threadx_initialize_kernel_setup_test.c
  110. +17 −17 test/tx/regression/threadx_mutex_information_test.c
  111. +2 −2 test/tx/regression/threadx_mutex_nested_priority_inheritance_test.c
  112. +1 −1 test/tx/regression/threadx_semaphore_basic_test.c
  113. +2 −2 test/tx/regression/threadx_thread_basic_execution_test.c
  114. +9 −9 test/tx/regression/threadx_thread_delayed_suspension_test.c
  115. +1 −1 test/tx/regression/threadx_thread_simple_suspend_test.c
  116. +12 −12 test/tx/regression/threadx_thread_sleep_for_100ticks_test.c
  117. +1 −1 test/tx/regression/threadx_thread_terminate_delete_test.c
  118. +1 −1 utility/rtos_compatibility_layers/posix/px_cond_signal.c
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -10,4 +10,4 @@
"remoteUser": "vscode",

"runArgs": [ "--cap-add=NET_ADMIN"]
}
}
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -37,4 +37,4 @@ configure eol=lf

*.cmake whitespace=tab-in-indent
*.rst whitespace=tab-in-indent conflict-marker-size=79
*.txt whitespace=tab-in-indent
*.txt whitespace=tab-in-indent
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@
<!--- Put an `x` in all the boxes that apply. -->
- [ ] Updated function header with a short description and version number
- [ ] Added test case for bug fix or new feature
- [ ] Validated on real hardware <!-- hardware - toolchain -->
- [ ] Validated on real hardware <!-- hardware - toolchain -->
31 changes: 8 additions & 23 deletions .github/workflows/ci_cortex_m.yml
Original file line number Diff line number Diff line change
@@ -3,12 +3,12 @@
name: cortex_m

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
# events but only for the dev branch
on:
push:
branches: [ master ]
branches: [ dev ]
pull_request:
branches: [ master ]
branches: [ dev ]
paths:
- ".github/workflows/ci_cortex_m.yml"
- 'common/**'
@@ -39,39 +39,24 @@ jobs:
with:
submodules: true

# Store the arm compilers in the cache to speed up builds
- name: Cache arm-none-eabi-gcc tools
id: cache-arm-gcc
uses: actions/cache@v1
with:
path: $HOME/arm-none-eabi-gcc-9-2019-q4
key: ${{ runner.os }}-arm-gcc-9-2019-q4

# Get the arm-non-eabi-gcc toolchain
- name: Install arm-none-eabi-gcc
uses: fiam/arm-none-eabi-gcc@v1
uses: carlosperate/arm-none-eabi-gcc-action@v1
if: steps.cache-arm-gcc.outputs.cache-hit != 'true'
with:
release: '9-2019-q4' # The arm-none-eabi-gcc release to use.
directory: $HOME/arm-none-eabi-gcc-9-2019-q4
release: '13.3.Rel1' # The arm-none-eabi-gcc release to use.

# Get CMake into the environment
- name: Install cmake 3.19.1
uses: lukka/get-cmake@v3.19.1
- name: Install cmake
uses: lukka/get-cmake@v3.31.0

# Get Ninja into the environment
- name: Install ninja-build
uses: seanmiddleditch/gha-setup-ninja@v3
uses: seanmiddleditch/gha-setup-ninja@v5

# Prepare the build system
- name: Prepare build system
run: cmake -Bbuild -DCMAKE_TOOLCHAIN_FILE=./cmake/cortex_m${{ matrix.port }}.cmake -GNinja .
env:
PATH: "$HOME/arm-none-eabi-gcc-9-2019-q4/bin:$PATH"

- name: Compile and link
run: cmake --build ./build
env:
PATH: "$HOME/arm-none-eabi-gcc-9-2019-q4/bin:$PATH"


38 changes: 6 additions & 32 deletions .github/workflows/ports_arch_check.yml
Original file line number Diff line number Diff line change
@@ -3,10 +3,10 @@
name: ports_arch_check

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
# events but only for the dev branch
on:
pull_request:
branches: [ master ]
branches: [ dev ]
paths:
- ".github/workflows/ports_arch_check.yml"
- 'common/**'
@@ -28,7 +28,7 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout sources recursively
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
token: ${{ secrets.REPO_SCOPED_TOKEN }}
submodules: true
@@ -38,36 +38,10 @@ jobs:
run: |
scripts/copy_armv7_m.sh && scripts/copy_armv8_m.sh && scripts/copy_module_armv7_m.sh
if [[ -n $(git status --porcelain -uno) ]]; then
echo "Ports for ARM architecture is not updated"
echo "Ports for Arm architecture is not updated"
git status
exit 1
fi
cortex-a:
# Check ports for cortex-a
runs-on: windows-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout sources recursively
uses: actions/checkout@v2
with:
token: ${{ secrets.REPO_SCOPED_TOKEN }}
submodules: true

# Copy ports arch
- name: Copy ports arch
run: |
cd ports_arch/ARMv7-A
pwsh -Command ./update.ps1 -PortSets tx -CopyCommonFiles -CopyPortFiles -CopyExample -PatchFiles
cd ../../ports_arch/ARMv8-A
pwsh -Command ./update.ps1 -PortSets tx,tx_smp -CopyCommonFiles -CopyPortFiles -CopyExample -PatchFiles
if ((git status --porcelain -uno) -ne $null) {
Write-Host "Ports for ARM architecture is not updated"
git status
Exit 1
}
# FIXME: Re-enable the checks for Arm Cortex-A
# cortex-a:
23 changes: 12 additions & 11 deletions .github/workflows/regression_template.yml
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ jobs:
run: ${{ inputs.test_script }}

- name: Publish Test Results
uses: EnricoMi/publish-unit-test-result-action@v2.11.0
uses: EnricoMi/publish-unit-test-result-action@v2.18.0
if: always()
with:
check_name: Test Results ${{ inputs.result_affix }}
@@ -86,7 +86,7 @@ jobs:
- name: Upload Test Results
if: success() || failure()
uses: actions/upload-artifact@v3.1.3
uses: actions/upload-artifact@v4
with:
name: test_reports ${{ inputs.result_affix }}
path: |
@@ -95,7 +95,7 @@ jobs:
${{ inputs.cmake_path }}/build/**/regression/output_files/*.bin
- name: Configure GitHub Pages
uses: actions/configure-pages@v3.0.6
uses: actions/configure-pages@v5

- name: Generate Code Coverage Results Summary
if: (!inputs.skip_coverage)
@@ -115,7 +115,7 @@ jobs:
- name: Create CheckRun for Code Coverage
if: ((github.event_name == 'push') || (github.event_name == 'workflow_dispatch') || (github.event.pull_request.head.repo.full_name == github.repository)) && (!inputs.skip_coverage)
uses: LouisBrunner/checks-action@v1.6.2
uses: LouisBrunner/checks-action@v2.0.0
with:
token: ${{ secrets.GITHUB_TOKEN }}
name: Code Coverage ${{ inputs.result_affix }}
@@ -141,15 +141,15 @@ jobs:
fi
- name: Upload Code Coverage Artifacts
uses: actions/upload-artifact@v3.1.3
uses: actions/upload-artifact@v4
if: (inputs.skip_deploy && !inputs.skip_coverage)
with:
name: coverage_report
name: coverage_report-${{inputs.context}}-${{inputs.job-index}}
path: ${{ inputs.cmake_path }}/coverage_report
retention-days: 1

- name: Upload Code Coverage Pages
uses: actions/upload-pages-artifact@v2.0.0
uses: actions/upload-pages-artifact@v3
if: (!inputs.skip_deploy && !inputs.skip_coverage)
with:
path: ${{ inputs.cmake_path }}/coverage_report/${{ inputs.coverage_name }}
@@ -166,13 +166,14 @@ jobs:
id-token: write

steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
if: ${{ inputs.skip_test }}
with:
name: coverage_report
pattern: coverage_report-${{inputs.context}}*
merge-multiple: true

- name: Upload Code Coverage Pages
uses: actions/upload-pages-artifact@v2.0.0
uses: actions/upload-pages-artifact@v3
if: ${{ inputs.skip_test }}
with:
path: .
@@ -184,7 +185,7 @@ jobs:

- name: Deploy GitHub Pages site
id: deployment
uses: actions/deploy-pages@v1.2.9
uses: actions/deploy-pages@v4

- name: Write Code Coverage Report URL
run: >-
8 changes: 4 additions & 4 deletions .github/workflows/regression_test.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: regression_test

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
# events but only for the dev branch
on:
workflow_dispatch:
push:
branches: [ master ]
branches: [ dev ]
pull_request:
branches: [ master ]
branches: [ dev ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
@@ -32,4 +32,4 @@ jobs:
uses: ./.github/workflows/regression_template.yml
with:
skip_test: true
deploy_list: "ThreadX SMP"
deploy_list: "ThreadX SMP"
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)

# Set up the project
project(threadx
@@ -69,4 +69,4 @@ set(CPACK_SOURCE_IGNORE_FILES
".*~$"
)
set(CPACK_VERBATIM_VARIABLES YES)
include(CPack)
include(CPack)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -197,7 +197,7 @@ Instruction for building the ThreadX as static library using Arm GNU Toolchain a
An example of building the library for Cortex-M4:
```bash
$ cmake -Bbuild -GNinja -DCMAKE_TOOLCHAIN_FILE=cmake/cortex_m4.cmake .
$ cmake -Bbuild -GNinja --toolchain cmake/cortex_m4.cmake .

$ cmake --build ./build
```
2 changes: 1 addition & 1 deletion cmake/arm-none-eabi.cmake
Original file line number Diff line number Diff line change
@@ -26,4 +26,4 @@ SET(CMAKE_ASM_FLAGS_DEBUG "-g -ggdb3" CACHE INTERNAL "asm debug compiler flags")

SET(CMAKE_C_FLAGS_RELEASE "-O3" CACHE INTERNAL "c release compiler flags")
SET(CMAKE_CXX_FLAGS_RELEASE "-O3" CACHE INTERNAL "cxx release compiler flags")
SET(CMAKE_ASM_FLAGS_RELEASE "" CACHE INTERNAL "asm release compiler flags")
SET(CMAKE_ASM_FLAGS_RELEASE "" CACHE INTERNAL "asm release compiler flags")
2 changes: 1 addition & 1 deletion cmake/cortex_m0.cmake
Original file line number Diff line number Diff line change
@@ -10,4 +10,4 @@ set(VFP_FLAGS "")
set(SPEC_FLAGS "--specs=nosys.specs")
# set(LD_FLAGS "-nostartfiles")

include(${CMAKE_CURRENT_LIST_DIR}/arm-none-eabi.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/arm-none-eabi.cmake)
2 changes: 1 addition & 1 deletion cmake/cortex_m3.cmake
Original file line number Diff line number Diff line change
@@ -10,4 +10,4 @@ set(VFP_FLAGS "")
set(SPEC_FLAGS "--specs=nosys.specs")
# set(LD_FLAGS "-nostartfiles")

include(${CMAKE_CURRENT_LIST_DIR}/arm-none-eabi.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/arm-none-eabi.cmake)
2 changes: 1 addition & 1 deletion cmake/cortex_m4.cmake
Original file line number Diff line number Diff line change
@@ -10,4 +10,4 @@ set(VFP_FLAGS "")
set(SPEC_FLAGS "--specs=nosys.specs")
# set(LD_FLAGS "-nostartfiles")

include(${CMAKE_CURRENT_LIST_DIR}/arm-none-eabi.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/arm-none-eabi.cmake)
2 changes: 1 addition & 1 deletion cmake/cortex_m7.cmake
Original file line number Diff line number Diff line change
@@ -10,4 +10,4 @@ set(VFP_FLAGS "")
set(SPEC_FLAGS "--specs=nosys.specs")
# set(LD_FLAGS "-nostartfiles")

include(${CMAKE_CURRENT_LIST_DIR}/arm-none-eabi.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/arm-none-eabi.cmake)
2 changes: 1 addition & 1 deletion cmake/utilities.cmake
Original file line number Diff line number Diff line change
@@ -12,4 +12,4 @@ function(add_azrtos_component_dir dirname)
list(APPEND tmp "azrtos::${dirname}")
# Copy the temp back up to the parent list
set(azrtos_targets ${tmp} PARENT_SCOPE)
endfunction()
endfunction()
2 changes: 1 addition & 1 deletion docs/revision_history.txt
Original file line number Diff line number Diff line change
@@ -1550,4 +1550,4 @@ Below is the revision history for 5.x.
tx*.h Changed comments and copyright header.


12-12-2012 Initial ThreadX SMP generic code version 5.6.1.
12-12-2012 Initial ThreadX SMP generic code version 5.6.1.
Binary file removed ports/arm11/gnu/example_build/libnosys.a
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -6,4 +6,4 @@ connection settings will either modify an existing or generate a new target-conf
if you manually edit these auto-generated files, you may need to re-apply your changes. Alternatively,
you may create your own target-configuration file for this project and manage it manually. You can
always switch back to automatic target-configuration management by checking the "Manage the project's
target-configuration automatically" checkbox on the project's Properties > General page.
target-configuration automatically" checkbox on the project's Properties > General page.
Original file line number Diff line number Diff line change
@@ -6,4 +6,4 @@ connection settings will either modify an existing or generate a new target-conf
if you manually edit these auto-generated files, you may need to re-apply your changes. Alternatively,
you may create your own target-configuration file for this project and manage it manually. You can
always switch back to automatic target-configuration management by checking the "Manage the project's
target-configuration automatically" checkbox on the project's Properties > General page.
target-configuration automatically" checkbox on the project's Properties > General page.
Original file line number Diff line number Diff line change
@@ -12,4 +12,4 @@ LOAD 0x80000000

ARM_LIB_STACKHEAP 0x80090000 EMPTY -0x00040000
{}
}
}
3 changes: 3 additions & 0 deletions ports/cortex_m0/ac5/example_build/tx_initialize_low_level.s
Original file line number Diff line number Diff line change
@@ -175,6 +175,9 @@ _tx_initialize_low_level
; /* Configure SysTick. */
;
LDR r0, =0xE000E000 ; Build address of NVIC registers
LDR r1, =0
STR r1, [r0, #0x10] ; Reset SysTick Control
STR r1, [r0, #0x18] ; Reset SysTick Counter Value
LDR r1, =SYSTICK_CYCLES
STR r1, [r0, #0x14] ; Setup SysTick Reload Value
MOVS r1, #0x7 ; Build SysTick Control Enable Value
1 change: 0 additions & 1 deletion ports/cortex_m0/gnu/example_build/cortexm0_crt0.S
Original file line number Diff line number Diff line change
@@ -116,4 +116,3 @@ memory_set_done:
.section .stack, "wa", %nobits
.section .stack_process, "wa", %nobits
.section .heap, "wa", %nobits
3 changes: 3 additions & 0 deletions ports/cortex_m0/gnu/example_build/tx_initialize_low_level.S
Original file line number Diff line number Diff line change
@@ -133,6 +133,9 @@ _tx_initialize_low_level:
@ /* Configure SysTick for 100Hz clock, or 16384 cycles if no reference. */
@
LDR r0, =0xE000E000 @ Build address of NVIC registers
LDR r1, =0
STR r1, [r0, #0x10] // Reset SysTick Control
STR r1, [r0, #0x18] // Reset SysTick Counter Value
LDR r1, =SYSTICK_CYCLES
STR r1, [r0, #0x14] // Setup SysTick Reload Value
LDR r1, =0x7 // Build SysTick Control Enable Value
3 changes: 3 additions & 0 deletions ports/cortex_m0/iar/example_build/tx_initialize_low_level.s
Original file line number Diff line number Diff line change
@@ -124,6 +124,9 @@ _tx_initialize_low_level:
; /* Configure SysTick. */
;
LDR r0, =0xE000E000 ; Build address of NVIC registers
LDR r1, =0
STR r1, [r0, #0x10] ; Reset SysTick Control
STR r1, [r0, #0x18] ; Reset SysTick Counter Value
LDR r1, =SYSTICK_CYCLES
STR r1, [r0, #0x14] ; Setup SysTick Reload Value
MOVS r1, #0x7 ; Build SysTick Control Enable Value
3 changes: 3 additions & 0 deletions ports/cortex_m0/keil/example_build/tx_initialize_low_level.s
Original file line number Diff line number Diff line change
@@ -175,6 +175,9 @@ _tx_initialize_low_level
; /* Configure SysTick. */
;
LDR r0, =0xE000E000 ; Build address of NVIC registers
LDR r1, =0
STR r1, [r0, #0x10] ; Reset SysTick Control
STR r1, [r0, #0x18] ; Reset SysTick Counter Value
LDR r1, =SYSTICK_CYCLES
STR r1, [r0, #0x14] ; Setup SysTick Reload Value
MOVS r1, #0x7 ; Build SysTick Control Enable Value
2 changes: 1 addition & 1 deletion ports/cortex_m23/ac6/example_build/Debug.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LOAD "..\\demo_threadx_non-secure_zone\\Objects\\demo_threadx_non-secure_zone.axf" incremental
LOAD "..\\demo_secure_zone\\Objects\\demo_secure_zone.axf" incremental
RESET
g, \\demo_secure_zone\main_s\main
g, \\demo_secure_zone\main_s\main
Loading