You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/09/09 11:11:30 UTC

[incubator-nuttx] branch releases/11.0 updated: esp32s3: Fix Data allocation offset within shared Internal SRAM1

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch releases/11.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/releases/11.0 by this push:
     new 00296c1ef3 esp32s3: Fix Data allocation offset within shared Internal SRAM1
00296c1ef3 is described below

commit 00296c1ef32a7275845b1a3374d920c009b2f90d
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Wed Aug 24 16:11:34 2022 -0300

    esp32s3: Fix Data allocation offset within shared Internal SRAM1
    
    Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
 boards/xtensa/esp32s3/esp32s3-devkit/scripts/esp32s3.ld | 2 +-
 boards/xtensa/esp32s3/esp32s3-eye/scripts/esp32s3.ld    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/scripts/esp32s3.ld b/boards/xtensa/esp32s3/esp32s3-devkit/scripts/esp32s3.ld
index 5abcfa5def..941893364c 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/scripts/esp32s3.ld
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/scripts/esp32s3.ld
@@ -71,7 +71,7 @@ SECTIONS
      * and dram0_0_seg reflect the same address space on different buses.
      */
 
-    . = ORIGIN(dram0_0_seg) + _iram_end - _iram_start;
+    . = ORIGIN(dram0_0_seg) + MAX(_iram_end, _diram_i_start) - _diram_i_start;
   } > dram0_0_seg
 
   /* Shared RAM */
diff --git a/boards/xtensa/esp32s3/esp32s3-eye/scripts/esp32s3.ld b/boards/xtensa/esp32s3/esp32s3-eye/scripts/esp32s3.ld
index 4e8a3044c9..d2a9389aa7 100644
--- a/boards/xtensa/esp32s3/esp32s3-eye/scripts/esp32s3.ld
+++ b/boards/xtensa/esp32s3/esp32s3-eye/scripts/esp32s3.ld
@@ -71,7 +71,7 @@ SECTIONS
      * and dram0_0_seg reflect the same address space on different buses.
      */
 
-    . = ORIGIN(dram0_0_seg) + _iram_end - _iram_start;
+    . = ORIGIN(dram0_0_seg) + MAX(_iram_end, _diram_i_start) - _diram_i_start;
   } > dram0_0_seg
 
   /* Shared RAM */