Skip to content

Commit

Permalink
Merge branch 'apache:master' into sim_offload_lame
Browse files Browse the repository at this point in the history
  • Loading branch information
shizhenghui authored Aug 22, 2024
2 parents 851d0ad + fe642f1 commit ba8c263
Show file tree
Hide file tree
Showing 205 changed files with 8,455 additions and 8,315 deletions.
12 changes: 7 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -528,11 +528,13 @@ endif()
# failure logs more deterministic and most importantly makes builds more
# deterministic. Debuggers usually have a path mapping feature to ensure the
# files are still found.
if(CONFIG_OUTPUT_STRIP_PATHS)
add_compile_options(-fmacro-prefix-map=${NUTTX_DIR}=)
add_compile_options(-fmacro-prefix-map=${NUTTX_APPS_DIR}=)
add_compile_options(-fmacro-prefix-map=${NUTTX_BOARD_ABS_DIR}=)
add_compile_options(-fmacro-prefix-map=${NUTTX_CHIP_ABS_DIR}=)
if(NOT MSVC)
if(CONFIG_OUTPUT_STRIP_PATHS)
add_compile_options(-fmacro-prefix-map=${NUTTX_DIR}=)
add_compile_options(-fmacro-prefix-map=${NUTTX_APPS_DIR}=)
add_compile_options(-fmacro-prefix-map=${NUTTX_BOARD_ABS_DIR}=)
add_compile_options(-fmacro-prefix-map=${NUTTX_CHIP_ABS_DIR}=)
endif()
endif()

add_definitions(-D__NuttX__)
Expand Down
24 changes: 24 additions & 0 deletions Documentation/components/drivers/special/power/pm/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,33 @@ All PM interfaces are declared in the file ``include/nuttx/power/pm.h``.
completes the entire state change unless interrupts are disabled
throughout the state change.
.. c:function:: void pm_idle(pm_idle_handler_t handler)
This function provide standard pm idle work flow for up_idle.
Called from the chip bsp and should only focus on handle the system
state changed.
:param handler: The execution after PM_IDLE_DOMAIN state changed
:return:
None
Callbacks
=========
.. c:typedef::pm_idle_handler_t
This type declare is provide for pm_idle interface.
Handle the pm low power action and execution for not SMP case.
Possible execution for long time because of WFI inside.
.. code-block:: c
typedef void (*pm_idle_handler_t)(enum pm_state_e);
:param pm_state_e:
Indicate the new system power state.
.. c:struct:: pm_callback_s
This struct includes the pointers to the driver
Expand Down
3 changes: 0 additions & 3 deletions arch/arm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,6 @@ config ARCH_CHIP_RP2040
select ARCH_HAVE_TESTSET
select ARCH_HAVE_I2CRESET
select ARM_HAVE_WFE_SEV
select LIBC_ARCH_ATOMIC
select ARCH_HAVE_PWM_MULTICHAN
select ARCH_BOARD_COMMON
---help---
Expand Down Expand Up @@ -638,15 +637,13 @@ config ARCH_CHIP_CXD56XX
config ARCH_CHIP_PHY62XX
bool "Phyplus PHY62XX BLE"
select ARCH_CORTEXM0
select LIBC_ARCH_ATOMIC
---help---
Phyplus PHY62XX architectures (ARM Cortex-M0).

config ARCH_CHIP_TLSR82
bool "Telink TLSR82XX"
select ARCH_ARMV6M
select ARCH_HAVE_RESET
select LIBC_ARCH_ATOMIC
---help---
Telink tlsr82xx architectures (Customed armv6m)

Expand Down
Loading

0 comments on commit ba8c263

Please sign in to comment.