You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2021/11/13 14:55:44 UTC

[incubator-nuttx] branch master updated (c6c534f -> 6cbcbd5)

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

acassis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.


    from c6c534f  xtensa:mpu:use WRITEBACK attribute for intsram & extsram
     new a01cb86  esp32c3_rom.ld:  Add some of the string.h functions to the linker script.
     new 6cbcbd5  arch/risc-v&xtensa/Kconfig: Don't select LIBC_ARCH_MEMCCMP.  The Kconfig option doens't exist and we are not providing any external implementation.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 arch/risc-v/Kconfig                                       | 15 +++++++++++----
 arch/xtensa/Kconfig                                       |  2 --
 .../risc-v/esp32c3/esp32c3-devkit/scripts/esp32c3_rom.ld  |  5 ++++-
 3 files changed, 15 insertions(+), 7 deletions(-)

[incubator-nuttx] 02/02: arch/risc-v&xtensa/Kconfig: Don't select LIBC_ARCH_MEMCCMP. The Kconfig option doens't exist and we are not providing any external implementation.

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 6cbcbd5481311a64591c630794de9166f30344f4
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Sat Nov 13 14:08:26 2021 +0100

    arch/risc-v&xtensa/Kconfig: Don't select LIBC_ARCH_MEMCCMP.  The Kconfig
    option doens't exist and we are not providing any external
    implementation.
    
    Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
 arch/risc-v/Kconfig | 1 -
 arch/xtensa/Kconfig | 2 --
 2 files changed, 3 deletions(-)

diff --git a/arch/risc-v/Kconfig b/arch/risc-v/Kconfig
index fda26ab..e8e812a 100644
--- a/arch/risc-v/Kconfig
+++ b/arch/risc-v/Kconfig
@@ -51,7 +51,6 @@ config ARCH_CHIP_ESP32C3
 	select LIBC_ARCH_MEMMOVE
 	select LIBC_ARCH_MEMCMP
 	select LIBC_ARCH_MEMCHR
-	select LIBC_ARCH_MEMCCMP
 	select LIBC_ARCH_STRCPY
 	select LIBC_ARCH_STRCHR
 	select LIBC_ARCH_STRCMP
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 03d1ec0..402f92f 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -22,7 +22,6 @@ config ARCH_CHIP_ESP32
 	select LIBC_ARCH_MEMCPY
 	select LIBC_ARCH_MEMCHR
 	select LIBC_ARCH_MEMCMP
-	select LIBC_ARCH_MEMCCMP
 	select LIBC_ARCH_MEMMOVE
 	select LIBC_ARCH_MEMSET
 	---help---
@@ -49,7 +48,6 @@ config ARCH_CHIP_ESP32S2
 	select LIBC_ARCH_MEMCPY
 	select LIBC_ARCH_MEMCHR
 	select LIBC_ARCH_MEMCMP
-	select LIBC_ARCH_MEMCCMP
 	select LIBC_ARCH_MEMMOVE
 	select LIBC_ARCH_MEMSET
 	select LIBC_ARCH_STRCHR

[incubator-nuttx] 01/02: esp32c3_rom.ld: Add some of the string.h functions to the linker script.

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit a01cb867ce2cdff0c0ed658703c7be9fa2bf544f
Author: Abdelatif Guettouche <ab...@espressif.com>
AuthorDate: Sat Nov 13 14:06:26 2021 +0100

    esp32c3_rom.ld:  Add some of the string.h functions to the linker
    script.
    
    These functions are strongly declared and thus will be used instead of
    any other implementation.  Furthermore, necessary Kconfig options are
    selected to avoid building those function from NuttX's C library.
    
    Signed-off-by: Abdelatif Guettouche <ab...@espressif.com>
---
 arch/risc-v/Kconfig                                        | 14 +++++++++++---
 .../risc-v/esp32c3/esp32c3-devkit/scripts/esp32c3_rom.ld   |  5 ++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/arch/risc-v/Kconfig b/arch/risc-v/Kconfig
index 1c6123b..fda26ab 100644
--- a/arch/risc-v/Kconfig
+++ b/arch/risc-v/Kconfig
@@ -46,11 +46,19 @@ config ARCH_CHIP_ESP32C3
 	select ARCH_VECNOTIRQ
 	select ARCH_HAVE_RESET
 	select LIBC_ARCH_ATOMIC
-	select LIBC_ARCH_MEMCHR
+	select LIBC_ARCH_MEMSET
+	select LIBC_ARCH_MEMCPY
+	select LIBC_ARCH_MEMMOVE
 	select LIBC_ARCH_MEMCMP
+	select LIBC_ARCH_MEMCHR
 	select LIBC_ARCH_MEMCCMP
-	select LIBC_ARCH_MEMMOVE
-	select LIBC_ARCH_MEMSET
+	select LIBC_ARCH_STRCPY
+	select LIBC_ARCH_STRCHR
+	select LIBC_ARCH_STRCMP
+	select LIBC_ARCH_STRLCPY
+	select LIBC_ARCH_STRNCPY
+	select LIBC_ARCH_STRLEN
+	select LIBC_ARCH_STRNLEN
 	select ARCH_HAVE_TEXT_HEAP
 	select ARCH_HAVE_BOOTLOADER
 	---help---
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/scripts/esp32c3_rom.ld b/boards/risc-v/esp32c3/esp32c3-devkit/scripts/esp32c3_rom.ld
index a011038..2950632 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/scripts/esp32c3_rom.ld
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/scripts/esp32c3_rom.ld
@@ -1936,17 +1936,20 @@ rom_pll_vol_cal = 0x40001b28;
 
 memset = 0x40000354;
 memcpy = 0x40000358;
+memccpy = 0x400003c4;
 memmove = 0x4000035c;
 memcmp = 0x40000360;
-memccpy = 0x400003c4;
 memchr = 0x400003c8;
 memrchr = 0x400003cc;
 strcpy = 0x40000364;
 strncpy = 0x40000368;
+strlcpy = 0x400003f0;
 strcmp = 0x4000036c;
 strncmp = 0x40000370;
 strlen = 0x40000374;
+strnlen = 0x40000404;
 strstr = 0x40000378;
+strchr = 0x400003e0;
 bzero = 0x4000037c;
 
 /***************************************