From c43e4567f4a6e365e3af4b0b9efdb86dc2da85b1 Mon Sep 17 00:00:00 2001 From: turo Date: Sat, 3 Oct 2026 09:07:44 -0700 Subject: [PATCH] threadx: pin the fork merge of upstream v6.5.2.202603_rel Moves third_party/threadx from c7c33342 to e24aa9c9, the tinic/threadx merge of upstream 93387b0a (PR tinic/threadx#1), and raises AMINETXDUO_THREADX_VERSION_PIN 6.5.1 -> 6.5.2 in the same commit: tx_api.h now reports 6.5.2 and configure refuses a mismatch. Co-Authored-By: Claude Opus 5.5 --- cmake/AmiNetXDuoVersion.cmake | 2 +- third_party/threadx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/AmiNetXDuoVersion.cmake b/cmake/AmiNetXDuoVersion.cmake index 749024756..94343e837 100644 --- a/cmake/AmiNetXDuoVersion.cmake +++ b/cmake/AmiNetXDuoVersion.cmake @@ -29,7 +29,7 @@ # upstream version numbers in the tree. Bumping a submodule means editing the # matching line here, in the same commit, on purpose. set(AMINETXDUO_NETXDUO_VERSION_PIN "6.5.1") -set(AMINETXDUO_THREADX_VERSION_PIN "6.5.1") +set(AMINETXDUO_THREADX_VERSION_PIN "6.5.2") # --------------------------------------------------------------- reading ---- diff --git a/third_party/threadx b/third_party/threadx index c7c333422..e24aa9c92 160000 --- a/third_party/threadx +++ b/third_party/threadx @@ -1 +1 @@ -Subproject commit c7c33342214ed5fe47996930965d64563019b815 +Subproject commit e24aa9c92d247dcea3502b9a77b6dd1af21d0a2f