Merge branch 'master' of github.com:apache/nuttx into hpwork_static

Author: pangzhen1xiaomi

.github/CODEOWNERS

@@ -22450,7 +22450,6 @@ sched/sched/sched_removeblocked.c [email protected] masayuki.ishikawa@gmail
 sched/sched/sched_removereadytorun.c [email protected] [email protected] [email protected] [email protected]
 sched/sched/sched_reprioritize.c [email protected] [email protected]
 sched/sched/sched_reprioritizertr.c [email protected] [email protected] [email protected] [email protected]
-sched/sched/sched_resumescheduler.c [email protected] [email protected] [email protected] [email protected]
 sched/sched/sched_roundrobin.c [email protected] [email protected] [email protected] [email protected]
 sched/sched/sched_rrgetinterval.c [email protected] [email protected]
 sched/sched/sched_self.c [email protected]

.github/workflows/build.yml

@@ -15,19 +15,19 @@ name: Build
 on:
   pull_request:
     paths-ignore:
-      - 'AUTHORS'
-      - 'CONTRIBUTING.md'
-      - '**/CODEOWNERS'
-      - 'Documentation/**'
-      - 'tools/ci/docker/linux/**'
-      - 'tools/codeowners/*'
+      - "AUTHORS"
+      - "CONTRIBUTING.md"
+      - "**/CODEOWNERS"
+      - "Documentation/**"
+      - "tools/ci/docker/linux/**"
+      - "tools/codeowners/*"
   push:
     paths-ignore:
-      - 'AUTHORS'
-      - 'CONTRIBUTING.md'
-      - 'Documentation/**'
+      - "AUTHORS"
+      - "CONTRIBUTING.md"
+      - "Documentation/**"
     branches:
-      - 'releases/*'
+      - "releases/*"
     tags:
 
 permissions:
@@ -38,7 +38,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-
   # Fetch the source from nuttx and nuttx-apps repos
   Fetch-Source:
     runs-on: ubuntu-latest
@@ -153,7 +152,6 @@ jobs:
         boards: ${{ fromJSON(needs.Linux-Arch.outputs.selected_builds) }}
 
     steps:
-
       - name: Show Disk Space
         run: df -h
 
@@ -229,6 +227,13 @@ jobs:
                 ./cibuild.sh -c -A -N -R -S testlist/${{matrix.boards}}.dat
             fi
 
+      - name: Run host_info sanity check
+        uses: ./sources/nuttx/.github/actions/ci-container
+        with:
+          run: |
+            cd sources/nuttx
+            make host_info
+
       - name: Post-build Disk Space
         if: always()
         run: df -h
@@ -331,7 +336,7 @@ jobs:
       # https://github.com/cython/cython/issues/4500
       - uses: actions/setup-python@v6
         with:
-          python-version: '3.10'
+          python-version: "3.10"
       - name: Run Builds
         run: |
           echo "::add-matcher::sources/nuttx/.github/gcc.json"
@@ -448,7 +453,7 @@ jobs:
       - name: Set up Python and install kconfiglib
         uses: actions/setup-python@v6
         with:
-          python-version: '3.10'
+          python-version: "3.10"
       - name: Install kconfiglib
         run: |
           pip install kconfiglib

CMakeLists.txt

@@ -65,6 +65,8 @@ endif()
 set(CMAKE_CXX_EXTENSIONS OFF)
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+set(CMAKE_USER_MAKE_RULES_OVERRIDE
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/nuttx_overrides.cmake)
 
 # Setup build type (Debug Release RelWithDebInfo MinSizeRel Coverage). Default
 # to minimum size release
@@ -626,18 +628,22 @@ process_all_directory_romfs()
 # Get linker script to use
 get_property(ldscript GLOBAL PROPERTY LD_SCRIPT)
 
-# Pre-compile linker script
+# Pre-compile linker script(s)
 if(NOT CONFIG_ARCH_SIM)
-  get_filename_component(LD_SCRIPT_NAME ${ldscript} NAME)
-  set(LD_SCRIPT_TMP "${CMAKE_BINARY_DIR}/${LD_SCRIPT_NAME}.tmp")
+  set(ldscript_tmp_list)
+  foreach(ld ${ldscript})
+    get_filename_component(LD_SCRIPT_NAME ${ld} NAME)
+    set(LD_SCRIPT_TMP "${CMAKE_BINARY_DIR}/${LD_SCRIPT_NAME}.tmp")
 
-  nuttx_generate_preprocess_target(SOURCE_FILE ${ldscript} TARGET_FILE
-                                   ${LD_SCRIPT_TMP})
+    nuttx_generate_preprocess_target(SOURCE_FILE ${ld} TARGET_FILE
+                                     ${LD_SCRIPT_TMP})
 
-  add_custom_target(ldscript_tmp DEPENDS ${LD_SCRIPT_TMP})
-  add_dependencies(nuttx ldscript_tmp)
+    add_custom_target(ldscript_tmp_${LD_SCRIPT_NAME} DEPENDS ${LD_SCRIPT_TMP})
+    add_dependencies(nuttx ldscript_tmp_${LD_SCRIPT_NAME})
 
-  set(ldscript ${LD_SCRIPT_TMP})
+    list(APPEND ldscript_tmp_list -T ${LD_SCRIPT_TMP})
+  endforeach()
+  set(ldscript ${ldscript_tmp_list})
 endif()
 
 # Perform link
@@ -677,7 +683,6 @@ if(NOT CONFIG_ARCH_SIM)
     target_link_libraries(
       nuttx
       PRIVATE ${NUTTX_EXTRA_FLAGS}
-              -T
               ${ldscript}
               $<$<NOT:$<BOOL:${DISABLE_LINK_GROUP}>>:-Wl,--start-group>
               ${nuttx_libs}
@@ -809,14 +814,19 @@ if(CONFIG_BUILD_PROTECTED)
 
   get_property(user_ldscript GLOBAL PROPERTY LD_SCRIPT_USER)
 
-  # Pre-compile linker script
-  get_filename_component(LD_SCRIPT_USER_NAME ${user_ldscript} NAME)
-  set(LD_SCRIPT_USER_TMP "${CMAKE_BINARY_DIR}/${LD_SCRIPT_USER_NAME}.tmp")
-  nuttx_generate_preprocess_target(SOURCE_FILE ${user_ldscript} TARGET_FILE
-                                   ${LD_SCRIPT_USER_TMP})
-  add_custom_target(user_ldscript_tmp DEPENDS ${LD_SCRIPT_USER_TMP})
-  add_dependencies(nuttx_user user_ldscript_tmp)
-  set(user_ldscript ${LD_SCRIPT_USER_TMP})
+  # Pre-compile linker script(s)
+  set(user_ldscript_tmp_list)
+  foreach(ldscript ${user_ldscript})
+    get_filename_component(LD_SCRIPT_USER_NAME ${ldscript} NAME)
+    set(LD_SCRIPT_USER_TMP "${CMAKE_BINARY_DIR}/${LD_SCRIPT_USER_NAME}.tmp")
+    nuttx_generate_preprocess_target(SOURCE_FILE ${ldscript} TARGET_FILE
+                                     ${LD_SCRIPT_USER_TMP})
+    add_custom_target(user_ldscript_tmp_${LD_SCRIPT_USER_NAME}
+                      DEPENDS ${LD_SCRIPT_USER_TMP})
+    add_dependencies(nuttx_user user_ldscript_tmp_${LD_SCRIPT_USER_NAME})
+    list(APPEND user_ldscript_tmp_list -T ${LD_SCRIPT_USER_TMP})
+  endforeach()
+  set(user_ldscript ${user_ldscript_tmp_list})
 
   # reset link options that don't fit userspace
   get_target_property(nuttx_user_LINK_OPTIONS nuttx_user LINK_OPTIONS)
@@ -846,8 +856,7 @@ if(CONFIG_BUILD_PROTECTED)
 
   target_link_libraries(
     nuttx_user
-    PRIVATE -T
-            ${user_ldscript}
+    PRIVATE ${user_ldscript}
             $<$<NOT:$<BOOL:${DISABLE_LINK_GROUP}>>:-Wl,--start-group>
             ${nuttx_system_libs}
             ${nuttx_apps_libs}

Documentation/Makefile

@@ -24,15 +24,19 @@
 # You can set these variables from the command line, and also
 # from the environment for the first two.
 # Ignore the _tags directory as per sphinx-tags docs to avoid infinite loop
-SPHINXOPTS      ?= -j 1 -W -A nuttx_versions="latest,${NUTTX_VERSIONS}"
-SPHINXAUTOOPTS  ?= -j 8 -W --ignore "_tags/*"
+SPHINXOPTS      ?= -j auto -W -A nuttx_versions="latest,${NUTTX_VERSIONS}"
+SPHINXAUTOOPTS  ?= -j auto -W --ignore "_tags/*"
 SPHINXBUILD     ?= sphinx-build
 SPHINXAUTOBUILD ?= sphinx-autobuild
 SOURCEDIR       = .
 BUILDDIR        = _build
 
 # Put it first so that "make" without argument is like "make help".
 help:
+	$(info =>)
+	$(info => Use `make autobuild` to build live preview of the documentation.)
+	$(info => You can then watch live edit changes at http://localhost:8000.)
+	$(info =>)
 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
 .PHONY: help Makefile

Documentation/applications/examples/boardioc_spinlock/index.rst

@@ -0,0 +1,116 @@
+==================================
+BOARDIOC_SPINLOCK Spinlock Example
+==================================
+
+Overview
+========
+
+This example demonstrates the usage of the BOARDIOC_SPINLOCK board control
+interface for managing hardware spinlock operations in NuttX. The BOARDIOC_SPINLOCK
+interface provides a low-level mechanism to synchronize access to shared resources
+across multiple threads or CPUs using spinlock primitives.
+
+What is BOARDIOC_SPINLOCK?
+==========================
+
+BOARDIOC_SPINLOCK is a board control request that allows applications to perform
+atomic spinlock operations through the boardctl() interface.
+
+The BOARDIOC_SPINLOCK interface supports three primary operations:
+
+* **BOARDIOC_SPINLOCK_LOCK** - Acquire a spinlock (blocks until available)
+* **BOARDIOC_SPINLOCK_TRYLOCK** - Try to acquire a spinlock (non-blocking)
+* **BOARDIOC_SPINLOCK_UNLOCK** - Release a spinlock
+
+Prerequisites
+=============
+
+The following configuration options must be enabled:
+
+.. code-block:: bash
+
+    # Enable board spinlock support
+    CONFIG_BOARDCTL_SPINLOCK=y
+
+
+Basic Usage
+===========
+
+Header Files
+------------
+
+Include the following headers in your application:
+
+.. code-block:: c
+
+    #include <sys/boardctl.h>        /* For boardctl() interface */
+    #include <nuttx/spinlock.h>      /* For spinlock types */
+
+Data Structures
+---------------
+
+The BOARDIOC_SPINLOCK interface uses the following structure:
+
+.. code-block:: c
+
+    struct boardioc_spinlock_s
+    {
+        int action;                   /* Operation: LOCK, TRYLOCK, or UNLOCK */
+        spinlock_t *lock;             /* Pointer to the spinlock variable */
+        void *flags;                  /* Optional flags (reserved, set to NULL) */
+    };
+
+Actions
+-------
+
+The following action values are supported:
+
+.. code-block:: c
+
+    BOARDIOC_SPINLOCK_LOCK        /* Acquire lock (blocks if unavailable) */
+    BOARDIOC_SPINLOCK_TRYLOCK     /* Try to acquire (non-blocking) */
+    BOARDIOC_SPINLOCK_UNLOCK      /* Release lock */
+
+Return Values
+^^^^^^^^^^^^^
+
+* **0** - Success
+* **Negative value** - Error code (converted to errno)
+
+Simple Lock Example
+-------------------
+
+Here's a basic example of acquiring and releasing a spinlock:
+
+.. code-block:: c
+
+    spinlock_t my_lock;
+    struct boardioc_spinlock_s spinlock_op;
+    int ret;
+
+    /* Initialize the spinlock */
+    spin_lock_init(&my_lock);
+
+    /* Acquire the spinlock */
+    spinlock_op.action = BOARDIOC_SPINLOCK_LOCK;
+    spinlock_op.lock = &my_lock;
+    spinlock_op.flags = NULL;
+    
+    ret = boardctl(BOARDIOC_SPINLOCK, (uintptr_t)&spinlock_op);
+    if (ret == 0) {
+        printf("Spinlock acquired successfully\n");
+    } else {
+        printf("Failed to acquire spinlock: %d\n", ret);
+    }
+
+    printf("Inside spinlock\n");
+
+    /* Release the spinlock */
+    spinlock_op.action = BOARDIOC_SPINLOCK_UNLOCK;
+    ret = boardctl(BOARDIOC_SPINLOCK, (uintptr_t)&spinlock_op);
+    if (ret == 0) {
+        printf("Spinlock released successfully\n");
+    }
+
+
+

Documentation/applications/netutils/bare/index.rst

@@ -0,0 +1,39 @@
+===========================================
+``bare`` Binary Application Record Encoding
+===========================================
+
+BARE is a simple binary representation for structured application data, see
+https://baremessages.org/.
+
+BARE implementation ported to NuttX is ``cbare``, see
+https://git.sr.ht/~fsx/cbare.
+
+BARE_ is similar to other binary formats like CBOR_, BSON_, or `Protocol
+Buffers`_.
+
+.. _BARE: https://baremessages.org/
+.. _CBOR: https://cbor.io/
+.. _BSON: https://bsonspec.org/
+.. _Protocol Buffers: https://protobuf.dev/
+
+BARE at glance, from its web page:
+
+- Messages are encoded in binary and compact in size. Messages do not contain
+  schema information — they are not self-describing.
+
+- BARE is optimized for small messages. It is not optimized for encoding large
+  amounts of data in a single message, or efficiently reading a message with
+  fields of a fixed size. However, all types are aligned to 8 bits, which does
+  exchange some space for simplicity.
+
+- BARE's approach to extensibility is conservative: messages encoded today will
+  be decodable tomorrow, and vice-versa. But extensibility is still possible;
+  implementations can choose to decode user-defined types at a higher level and
+  map them onto arbitrary data types.
+
+- The specification is likewise conservative. Simple implementations of message
+  decoders and encoders can be written inside of an afternoon.
+
+- An optional DSL is provided to document message schemas and provide a source
+  for code generation. However, if you prefer, you may also define your schema
+  using the type system already available in your programming language.

Documentation/applications/nsh/nsh.rst

@@ -89,23 +89,26 @@ Command Overview
 (NSH) is a simple shell application. NSH supports the following
 commands forms:
 
-===============================   ======================================
+===============================   ==========================================
 Simple command                    ``<cmd>``
-Command with re-directed output   ``<cmd> > <file> <cmd> >> <file>``
+Command with re-directed input    ``<cmd> < <file>``
+Command with re-directed output   ``<cmd> > <file>`` ``<cmd> >> <file>``
+Command with re-directed error    ``<cmd> 2> <file>`` ``<cmd> 2>> <file>``
+Redirect stderr to stdout         ``<cmd> > <file> 2>&1``
 Background command                ``<cmd> &``
-Re-directed background command    ``<cmd> > <file> & <cmd> >> <file> &``
-===============================   ======================================
+Re-directed background command    ``<cmd> > <file> &`` ``<cmd> >> <file> &``
+===============================   ==========================================
 
 Where:
 
   * ``<cmd>`` is any one of the simple commands listed later.
-  * ``<file>`` is the full or relative path to any writable object in the file system name space (file or character driver). Such objects will be referred to simply as files throughout this document.
+  * ``<file>`` is the full or relative path to any readable or writable object in the file system name space (file or character driver). Such objects will be referred to simply as files throughout this document.
 
 ``nice`` **'d Background Commands**. NSH executes at the
 mid-priority (128). Backgrounded commands can be made to execute
 at higher or lower priorities using ``nice``::
 
-  [nice [-d <niceness>>]] <cmd> [> <file>|>> <file>] [&]
+  [nice [-d <niceness>>]] <cmd> [< <file>] [> <file>|>> <file>] [2> <file>|2>> <file>|2>&1] [&]
 
 Where ``<niceness>`` is any value between -20 and 19 where lower
 (more negative values) correspond to higher priorities. The