Skip to content

Commit 24047f9

Browse files
committed
Merge branch 'docs/sync_psram_noinit_and_bss_description' into 'master'
docs(psram): sync psram noinit description See merge request espressif/esp-idf!33360
2 parents 160bd65 + 057b6b7 commit 24047f9

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

docs/en/api-guides/external-ram.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ ESP-IDF fully supports the use of external RAM in applications. Once the externa
5454
* :ref:`external_ram_config_capability_allocator`
5555
* :ref:`external_ram_config_malloc` (default)
5656
* :ref:`external_ram_config_bss`
57-
:esp32: * :ref:`external_ram_config_noinit`
57+
* :ref:`external_ram_config_noinit`
5858
:SOC_SPIRAM_XIP_SUPPORTED: * :ref:`external_ram_config_xip`
5959

6060
.. _external_ram_config_memory_map:

docs/en/api-guides/memory-types.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Constant data may also be placed into DRAM, for example if it is used in an non-
4242

4343
The macro ``__NOINIT_ATTR`` can be used as attribute to place data into ``.noinit`` section. The values placed into this section will not be initialized at startup and should keep its value after software restart.
4444

45-
.. only:: esp32
45+
.. only:: SOC_SPIRAM_SUPPORTED
4646

4747
By applying the ``EXT_RAM_NOINIT_ATTR`` macro, non-initialized value could also be placed in external RAM. To do this, the :ref:`CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY` needs to be enabled. See :ref:`external_ram_config_noinit`. If the :ref:`CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY` is not enabled, ``EXT_RAM_NOINIT_ATTR`` will behave just as ``__NOINIT_ATTR``, it will make data to be placed into ``.noinit`` segment in internal RAM.
4848

docs/zh_CN/api-guides/external-ram.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ ESP-IDF 完全支持将片外 RAM 集成到你的应用程序中。在启动并
5454
* :ref:`external_ram_config_capability_allocator`
5555
* :ref:`external_ram_config_malloc` (default)
5656
* :ref:`external_ram_config_bss`
57-
:esp32: * :ref:`external_ram_config_noinit`
57+
* :ref:`external_ram_config_noinit`
5858
:SOC_SPIRAM_XIP_SUPPORTED: * :ref:`external_ram_config_xip`
5959

6060
.. _external_ram_config_memory_map:
@@ -184,7 +184,6 @@ ESP-IDF 启动过程中,片外 RAM 被映射到数据虚拟地址空间,该
184184

185185
启用此选项后,SPI1 flash 操作期间 cache 保持启用状态,因此需要执行的代码在此期间不必放置在内部 RAM 中。由于 ESP32-P4 flash 和 PSRAM 使用两个独立的 SPI 总线,将 flash 内容移动到 PSRAM 实际上增加了 PSRAM MSPI 总线的负载,因此访问速度相对较慢。应用程序在运行过程中对 PSRAM 的使用会直接影响整体性能。因此,建议先进行性能分析以确定启用此选项是否会显著影响应用程序性能。
186186

187-
188187
片外 RAM 使用限制
189188
===================
190189

docs/zh_CN/api-guides/memory-types.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ DRAM(数据 RAM)
4242

4343
可以将 ``__NOINIT_ATTR`` 宏用作属性,从而将数据放入 ``.noinit`` 部分。放入该部分的值在启动时不会被初始化,在软件重启后也会保持值不变。
4444

45-
.. only:: esp32
45+
.. only:: SOC_SPIRAM_SUPPORTED
4646

4747
通过使用 ``EXT_RAM_NOINIT_ATTR`` 宏,noinit 数据也可以放入外部 RAM 中。为此,需要启用 :ref:`CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY`,可参考 :ref:`external_ram_config_noinit`。如果没有启用 :ref:`CONFIG_SPIRAM_ALLOW_NOINIT_SEG_EXTERNAL_MEMORY`, ``EXT_RAM_NOINIT_ATTR`` 会和 ``__NOINIT_ATTR`` 一样,将数据放入内部 RAM 的 ``.noinit`` 部分。
4848

0 commit comments

Comments
 (0)