From bfc0391e04fee7a5e39b36ac66c72357dfe3aa96 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 12 Jan 2025 01:42:34 +0800 Subject: [PATCH 1/2] libc: Rename LIBC_STRING_OPTIMIZE to LIBC_NEWLIB_OPTSPEED and correct the dependence Signed-off-by: Xiang Xiao --- libs/libc/string/CMakeLists.txt | 4 ++-- libs/libc/string/Kconfig | 18 +++++++++--------- libs/libc/string/Make.defs | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/libc/string/CMakeLists.txt b/libs/libc/string/CMakeLists.txt index 2fe47cc738..94588e6236 100644 --- a/libs/libc/string/CMakeLists.txt +++ b/libs/libc/string/CMakeLists.txt @@ -66,7 +66,7 @@ set(SRCS if(CONFIG_MEMCPY_VIK) list(APPEND SRCS lib_vikmemcpy.c) -elseif(CONFIG_LIBC_STRING_OPTIMIZE) +elseif(CONFIG_LIBC_NEWLIB_OPTSPEED) list(APPEND SRCS lib_bsdmemcpy.c) else() list(APPEND SRCS lib_memcpy.c) @@ -76,7 +76,7 @@ if(CONFIG_LIBC_LOCALE) list(APPEND SRCS lib_strcoll.c lib_strxfrm.c) endif() -if(CONFIG_LIBC_STRING_OPTIMIZE) +if(CONFIG_LIBC_NEWLIB_OPTSPEED) list( APPEND SRCS diff --git a/libs/libc/string/Kconfig b/libs/libc/string/Kconfig index d42cfe5410..0e5feb7ad4 100644 --- a/libs/libc/string/Kconfig +++ b/libs/libc/string/Kconfig @@ -36,13 +36,6 @@ config LIBC_STRERROR_ERRNUM for unknown errors like "Unknown error 101". Default enabled when LIBC_STRERROR is not selected. -config LIBC_STRING_OPTIMIZE - bool "optimized string function" - depends on ALLOW_BSD_COMPONENTS - default y - ---help--- - Use optimized string function implementation based on newlib. - config LIBC_PERROR_STDOUT bool "perror() to stdout" default n @@ -55,10 +48,17 @@ endmenu # errno Decode Support menu "memcpy/memset Options" +config LIBC_NEWLIB_OPTSPEED + bool "newlib optimized function" + depends on ALLOW_BSD_COMPONENTS + default !DEFAULT_SMALL + ---help--- + Use optimized string function implementation based on newlib. + config MEMCPY_VIK bool "Vik memcpy()" default n - depends on !LIBC_ARCH_MEMCPY + depends on !LIBC_NEWLIB_OPTSPEED && !LIBC_ARCH_MEMCPY ---help--- Select this option to use the optimized memcpy() function by Daniel Vik. Select this option for improved performance at the expense of increased @@ -91,7 +91,7 @@ endif # MEMCPY_VIK config MEMSET_OPTSPEED bool "Optimize memset() for speed" default n - depends on !LIBC_ARCH_MEMSET + depends on !LIBC_NEWLIB_OPTSPEED && !LIBC_ARCH_MEMSET ---help--- Select this option to use a version of memcpy() optimized for speed. Default: memcpy() is optimized for size. diff --git a/libs/libc/string/Make.defs b/libs/libc/string/Make.defs index 0ac85f3b4b..a4a859b2a7 100644 --- a/libs/libc/string/Make.defs +++ b/libs/libc/string/Make.defs @@ -40,7 +40,7 @@ CSRCS += lib_strlcpy.c lib_strnlen.c ifeq ($(CONFIG_MEMCPY_VIK),y) CSRCS += lib_vikmemcpy.c -else ifeq ($(CONFIG_LIBC_STRING_OPTIMIZE),y) +else ifeq ($(CONFIG_LIBC_NEWLIB_OPTSPEED),y) CSRCS += lib_bsdmemcpy.c else CSRCS += lib_memcpy.c @@ -50,7 +50,7 @@ ifeq ($(CONFIG_LIBC_LOCALE),y) CSRCS += lib_strcoll.c lib_strxfrm.c endif -ifeq ($(CONFIG_LIBC_STRING_OPTIMIZE),y) +ifeq ($(CONFIG_LIBC_NEWLIB_OPTSPEED),y) CSRCS += lib_bsdmemccpy.c lib_bsdmemcmp.c lib_bsdmemrchr.c lib_bsdstpncpy.c CSRCS += lib_bsdstrchr.c lib_bsdstrcmp.c lib_bsdstrlen.c lib_bsdstrncpy.c CSRCS += lib_bsdmemchr.c lib_bsdstpcpy.c lib_bsdstrcat.c lib_bsdstrchrnul.c From 432fa6513d7d541f1b1188cb5028f198bfcfd9fd Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 12 Jan 2025 01:51:59 +0800 Subject: [PATCH 2/2] libc: Add LIBC_ prefix to MEMCPY_VIK and MEMSET_OPTSPEED align with other option naming convention Signed-off-by: Xiang Xiao --- .../cxd56xx/spresense/configs/rndis/defconfig | 3 -- .../configs/rndis_composite/defconfig | 3 -- .../spresense/configs/rndis_smp/defconfig | 3 -- .../cxd56xx/spresense/configs/wifi/defconfig | 3 -- .../spresense/configs/wifi_smp/defconfig | 3 -- .../lc823450-xgevk/configs/audio/defconfig | 2 +- .../lc823450-xgevk/configs/bt/defconfig | 4 +-- .../lc823450-xgevk/configs/elf/defconfig | 2 +- .../lc823450-xgevk/configs/ipl2/defconfig | 2 +- .../lc823450-xgevk/configs/knsh/defconfig | 2 +- .../lc823450-xgevk/configs/krndis/defconfig | 2 +- .../lc823450-xgevk/configs/nsh/defconfig | 2 +- .../configs/posix_spawn/defconfig | 2 +- .../lc823450-xgevk/configs/rndis/defconfig | 1 - .../lc823450-xgevk/configs/usb/defconfig | 2 +- .../bl602/bl602evb/configs/wifi/defconfig | 4 +-- .../risc-v/bl808/ox64/configs/adc/defconfig | 4 +-- .../risc-v/bl808/ox64/configs/nsh/defconfig | 4 +-- .../risc-v/bl808/ox64/configs/spi/defconfig | 4 +-- .../risc-v/bl808/ox64/configs/timer/defconfig | 4 +-- .../jh7110/star64/configs/nsh/defconfig | 4 +-- .../k230/canmv230/configs/knsh/defconfig | 4 +-- .../k230/canmv230/configs/master/defconfig | 4 +-- .../k230/canmv230/configs/nsbi/defconfig | 4 +-- .../k230/canmv230/configs/remote/defconfig | 4 +-- .../mpfs/icicle/configs/hwtest/defconfig | 4 +-- .../risc-v/mpfs/icicle/configs/knsh/defconfig | 4 +-- .../mpfs/icicle/configs/network/defconfig | 4 +-- .../risc-v/mpfs/icicle/configs/nsh/defconfig | 4 +-- .../mpfs/icicle/configs/opensbi/defconfig | 2 -- .../risc-v/mpfs/icicle/configs/pnsh/defconfig | 4 +-- .../mpfs/icicle/configs/rpmsg-ch1/defconfig | 4 +-- .../mpfs/icicle/configs/rpmsg-ch2/defconfig | 4 +-- .../mpfs/icicle/configs/rpmsg-sbi/defconfig | 2 -- .../risc-v/mpfs/icicle/configs/usb/defconfig | 4 +-- .../mpfs/m100pfsevp/configs/nsh/defconfig | 4 +-- .../qemu-rv/rv-virt/configs/kfb64/defconfig | 4 +-- .../rv-virt/configs/knetnsh64/defconfig | 4 +-- .../rv-virt/configs/knetnsh64_smp/defconfig | 8 ++--- .../qemu-rv/rv-virt/configs/knsh64/defconfig | 4 +-- .../qemu-rv/rv-virt/configs/ksmp64/defconfig | 4 +-- .../rv-virt/configs/netnsh64_smp/defconfig | 6 ++-- .../rv-virt/configs/netnsh_smp/defconfig | 6 ++-- .../sg2000/milkv_duos/configs/nsh/defconfig | 4 +-- boards/sim/sim/sim/configs/loadable/defconfig | 2 +- .../sparc/bm3803/xx3803/configs/nsh/defconfig | 4 +-- .../s698pm/s698pm-dkit/configs/nsh/defconfig | 4 +-- .../s698pm/s698pm-dkit/configs/smp/defconfig | 4 +-- libs/libc/string/CMakeLists.txt | 2 +- libs/libc/string/Kconfig | 20 ++++++------ libs/libc/string/Make.defs | 2 +- libs/libc/string/lib_memset.c | 14 ++++---- libs/libc/string/lib_vikmemcpy.c | 32 +++++++++---------- 53 files changed, 110 insertions(+), 130 deletions(-) diff --git a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig index 092d3d7dea..1e2c036a1c 100644 --- a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig @@ -66,9 +66,6 @@ CONFIG_IOB_NBUFFERS=128 CONFIG_IOB_THROTTLE=24 CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_MEMCPY_VIK=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_MTD_BYTE_WRITE=y CONFIG_MTD_PARTITION=y diff --git a/boards/arm/cxd56xx/spresense/configs/rndis_composite/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis_composite/defconfig index e13594b1f4..9ff5dfc21b 100644 --- a/boards/arm/cxd56xx/spresense/configs/rndis_composite/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/rndis_composite/defconfig @@ -68,9 +68,6 @@ CONFIG_IOB_NBUFFERS=128 CONFIG_IOB_THROTTLE=24 CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_MEMCPY_VIK=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_MTD_BYTE_WRITE=y CONFIG_MTD_PARTITION=y diff --git a/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig index f4f2df5907..51c604b585 100644 --- a/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig @@ -66,9 +66,6 @@ CONFIG_IOB_NBUFFERS=128 CONFIG_IOB_THROTTLE=24 CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_MEMCPY_VIK=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_MTD_BYTE_WRITE=y CONFIG_MTD_PARTITION=y diff --git a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig index 787871023f..811b9d5536 100644 --- a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig @@ -80,9 +80,6 @@ CONFIG_LCD_ILI9340=y CONFIG_LCD_ILI9340_IFACE0=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_MEMCPY_VIK=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_IOB=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_MTD_BYTE_WRITE=y diff --git a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig index 2d737275c0..1f99fb17ee 100644 --- a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig @@ -83,9 +83,6 @@ CONFIG_LCD_ILI9340=y CONFIG_LCD_ILI9340_IFACE0=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y -CONFIG_MEMCPY_VIK=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_IOB=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_MTD_BYTE_WRITE=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig index 83352e287f..19856026d2 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig @@ -64,8 +64,8 @@ CONFIG_LCD=y CONFIG_LCD_ST7565=y CONFIG_LIBC_KBDCODEC=y CONFIG_LIBC_MAX_EXITFUNS=32 +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBM=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_MTD=y CONFIG_NAME_MAX=255 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig index bfc4f54feb..a6518073b4 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig @@ -67,9 +67,9 @@ CONFIG_LCD=y CONFIG_LCD_ST7565=y CONFIG_LIBC_KBDCODEC=y CONFIG_LIBC_MAX_EXITFUNS=32 +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBM=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_MTD=y CONFIG_NAME_MAX=255 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig index 436695676e..7330aeacb4 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig @@ -35,8 +35,8 @@ CONFIG_LC823450_UART0=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_KBDCODEC=y CONFIG_LIBC_MAX_EXITFUNS=32 +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBM=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_NAME_MAX=255 CONFIG_NETUTILS_CODECS=y CONFIG_PATH_INITIAL="/mnt/romfs" diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig index cb70836f8e..cf0e7ad7a2 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig @@ -34,8 +34,8 @@ CONFIG_LC823450_SDIF_SDC=y CONFIG_LC823450_UART0=y CONFIG_LC823450_UART1=y CONFIG_LIBC_MAX_EXITFUNS=32 +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBM=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MTD=y CONFIG_NAME_MAX=255 CONFIG_NETUTILS_CODECS=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig index 1404d886f9..fa068b00e7 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig @@ -47,8 +47,8 @@ CONFIG_LCD=y CONFIG_LCD_ST7565=y CONFIG_LIBC_KBDCODEC=y CONFIG_LIBC_MAX_EXITFUNS=32 +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBM=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NAME_MAX=255 CONFIG_NETUTILS_CODECS=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig index f8b8e64dc0..03cb58e1c5 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig @@ -77,8 +77,8 @@ CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_KBDCODEC=y CONFIG_LIBC_MAX_EXITFUNS=32 +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBM=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_MTD=y CONFIG_NAME_MAX=255 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig index 08bbaf6029..1c9e5f49b0 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig @@ -52,8 +52,8 @@ CONFIG_LCD=y CONFIG_LCD_ST7565=y CONFIG_LIBC_KBDCODEC=y CONFIG_LIBC_MAX_EXITFUNS=32 +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBM=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_NAME_MAX=255 CONFIG_NETUTILS_CODECS=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig index 71128f9342..6e47075ae1 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig @@ -34,8 +34,8 @@ CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_KBDCODEC=y CONFIG_LIBC_MAX_EXITFUNS=32 +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBM=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_NAME_MAX=255 CONFIG_NETUTILS_CODECS=y CONFIG_PATH_INITIAL="/mnt/romfs" diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig index f09613587b..bc5d864bc6 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig @@ -75,7 +75,6 @@ CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_KBDCODEC=y CONFIG_LIBC_MAX_EXITFUNS=32 CONFIG_LIBM=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_MTD=y CONFIG_NAME_MAX=255 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig index c498ecbdff..8700b61662 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig @@ -59,8 +59,8 @@ CONFIG_LCD=y CONFIG_LCD_ST7565=y CONFIG_LIBC_KBDCODEC=y CONFIG_LIBC_MAX_EXITFUNS=32 +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBM=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MODLIB_BUFFERSIZE=512 CONFIG_MQ_MAXMSGSIZE=64 CONFIG_MTD=y diff --git a/boards/risc-v/bl602/bl602evb/configs/wifi/defconfig b/boards/risc-v/bl602/bl602evb/configs/wifi/defconfig index f4c05a360f..a5e769f69b 100644 --- a/boards/risc-v/bl602/bl602evb/configs/wifi/defconfig +++ b/boards/risc-v/bl602/bl602evb/configs/wifi/defconfig @@ -70,11 +70,11 @@ CONFIG_IOB_NCHAINS=32 CONFIG_IOB_THROTTLE=10 CONFIG_LIBC_LOCALTIME=y CONFIG_LIBC_MAX_EXITFUNS=1 +CONFIG_LIBC_MEMCPY_VIK=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y CONFIG_LIBM=y -CONFIG_MEMCPY_VIK=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_REGIONS=2 CONFIG_MQ_MAXMSGSIZE=224 CONFIG_MTD=y diff --git a/boards/risc-v/bl808/ox64/configs/adc/defconfig b/boards/risc-v/bl808/ox64/configs/adc/defconfig index 2b72035f13..8db57aaddc 100644 --- a/boards/risc-v/bl808/ox64/configs/adc/defconfig +++ b/boards/risc-v/bl808/ox64/configs/adc/defconfig @@ -71,10 +71,10 @@ CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_PGALLOC=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y diff --git a/boards/risc-v/bl808/ox64/configs/nsh/defconfig b/boards/risc-v/bl808/ox64/configs/nsh/defconfig index 716402355e..c9d4179369 100644 --- a/boards/risc-v/bl808/ox64/configs/nsh/defconfig +++ b/boards/risc-v/bl808/ox64/configs/nsh/defconfig @@ -57,10 +57,10 @@ CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_PGALLOC=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y diff --git a/boards/risc-v/bl808/ox64/configs/spi/defconfig b/boards/risc-v/bl808/ox64/configs/spi/defconfig index 3fbc035df1..beb7bf48e0 100644 --- a/boards/risc-v/bl808/ox64/configs/spi/defconfig +++ b/boards/risc-v/bl808/ox64/configs/spi/defconfig @@ -58,10 +58,10 @@ CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_PGALLOC=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y diff --git a/boards/risc-v/bl808/ox64/configs/timer/defconfig b/boards/risc-v/bl808/ox64/configs/timer/defconfig index 4919d06d47..b3059f7f5b 100644 --- a/boards/risc-v/bl808/ox64/configs/timer/defconfig +++ b/boards/risc-v/bl808/ox64/configs/timer/defconfig @@ -61,10 +61,10 @@ CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_PGALLOC=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y diff --git a/boards/risc-v/jh7110/star64/configs/nsh/defconfig b/boards/risc-v/jh7110/star64/configs/nsh/defconfig index f0ae5e529c..abf5a1a228 100644 --- a/boards/risc-v/jh7110/star64/configs/nsh/defconfig +++ b/boards/risc-v/jh7110/star64/configs/nsh/defconfig @@ -61,10 +61,10 @@ CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_PGALLOC=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y diff --git a/boards/risc-v/k230/canmv230/configs/knsh/defconfig b/boards/risc-v/k230/canmv230/configs/knsh/defconfig index e5e48913bd..dead0ff5ae 100644 --- a/boards/risc-v/k230/canmv230/configs/knsh/defconfig +++ b/boards/risc-v/k230/canmv230/configs/knsh/defconfig @@ -58,11 +58,11 @@ CONFIG_INIT_MOUNT_TARGET="/system/bin" CONFIG_INIT_STACKSIZE=3072 CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y CONFIG_LIBM=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_PGALLOC=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y diff --git a/boards/risc-v/k230/canmv230/configs/master/defconfig b/boards/risc-v/k230/canmv230/configs/master/defconfig index d493125edc..569f41c223 100644 --- a/boards/risc-v/k230/canmv230/configs/master/defconfig +++ b/boards/risc-v/k230/canmv230/configs/master/defconfig @@ -65,11 +65,11 @@ CONFIG_K230_RPTUN_MASTER=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_HOSTNAME="master" +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y CONFIG_LIBM=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_PGALLOC=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y diff --git a/boards/risc-v/k230/canmv230/configs/nsbi/defconfig b/boards/risc-v/k230/canmv230/configs/nsbi/defconfig index 18c0e77474..263f628af1 100644 --- a/boards/risc-v/k230/canmv230/configs/nsbi/defconfig +++ b/boards/risc-v/k230/canmv230/configs/nsbi/defconfig @@ -59,11 +59,11 @@ CONFIG_INIT_MOUNT_TARGET="/system/bin" CONFIG_INIT_STACKSIZE=3072 CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y CONFIG_LIBM=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_PGALLOC=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y diff --git a/boards/risc-v/k230/canmv230/configs/remote/defconfig b/boards/risc-v/k230/canmv230/configs/remote/defconfig index 31f77ad2ef..68aef4e535 100644 --- a/boards/risc-v/k230/canmv230/configs/remote/defconfig +++ b/boards/risc-v/k230/canmv230/configs/remote/defconfig @@ -53,11 +53,11 @@ CONFIG_INIT_STACKSIZE=3072 CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_HOSTNAME="remote" +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y CONFIG_LIBM=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_PGALLOC=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y diff --git a/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig b/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig index 1d5e2fdfbe..fab44ab2c8 100644 --- a/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig @@ -35,10 +35,10 @@ CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MMCSD=y CONFIG_MMCSD_SDIO=y CONFIG_MPFS_COREPWM0=y diff --git a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig index 6c095a0316..9352b992ec 100644 --- a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig @@ -63,11 +63,11 @@ CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_HOSTNAME="icicle" CONFIG_LIBC_LOCALE=y CONFIG_LIBC_MAX_EXITFUNS=16 +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y CONFIG_LIBM=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_KMAP=y CONFIG_MM_PGALLOC=y CONFIG_MM_SHM=y diff --git a/boards/risc-v/mpfs/icicle/configs/network/defconfig b/boards/risc-v/mpfs/icicle/configs/network/defconfig index 8f0c9f8354..47aa79dbad 100644 --- a/boards/risc-v/mpfs/icicle/configs/network/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/network/defconfig @@ -36,10 +36,10 @@ CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_HOSTNAME="icicle" +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MPFS_ENABLE_DPFPU=y CONFIG_MPFS_ETHMAC_1=y CONFIG_MPFS_PHYADDR=9 diff --git a/boards/risc-v/mpfs/icicle/configs/nsh/defconfig b/boards/risc-v/mpfs/icicle/configs/nsh/defconfig index 0e643f4edb..fdc983d279 100644 --- a/boards/risc-v/mpfs/icicle/configs/nsh/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/nsh/defconfig @@ -32,10 +32,10 @@ CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_HOSTNAME="icicle" +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MPFS_ENABLE_DPFPU=y CONFIG_MPFS_UART1=y CONFIG_NSH_ARCHINIT=y diff --git a/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig b/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig index 63b5935a28..e12060887a 100644 --- a/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig @@ -35,8 +35,6 @@ CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_HOSTNAME="icicle" CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MMCSD=y CONFIG_MMCSD_SDIO=y CONFIG_MPFS_BOOTLOADER=y diff --git a/boards/risc-v/mpfs/icicle/configs/pnsh/defconfig b/boards/risc-v/mpfs/icicle/configs/pnsh/defconfig index 31598672ef..f50ce60916 100644 --- a/boards/risc-v/mpfs/icicle/configs/pnsh/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/pnsh/defconfig @@ -36,10 +36,10 @@ CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_HOSTNAME="icicle" +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MPFS_ENABLE_DPFPU=y CONFIG_MPFS_UART1=y CONFIG_NSH_ARCHINIT=y diff --git a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig index 8e31836554..1a537a3469 100644 --- a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig @@ -41,10 +41,10 @@ CONFIG_INTELHEX_BINARY=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_NCHAINS=24 CONFIG_LIBC_HOSTNAME="icicle" +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_IOB=y CONFIG_MPFS_IHC_CLIENT=y CONFIG_MPFS_IHC_LINUX_ON_HART4=0 diff --git a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig index c2e1c86554..8a7e79ec52 100644 --- a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig @@ -41,10 +41,10 @@ CONFIG_INTELHEX_BINARY=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_NCHAINS=24 CONFIG_LIBC_HOSTNAME="icicle" +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_IOB=y CONFIG_MPFS_IHC_CLIENT=y CONFIG_MPFS_IHC_LINUX_ON_HART3=0 diff --git a/boards/risc-v/mpfs/icicle/configs/rpmsg-sbi/defconfig b/boards/risc-v/mpfs/icicle/configs/rpmsg-sbi/defconfig index b87edf872f..ca36d95a97 100644 --- a/boards/risc-v/mpfs/icicle/configs/rpmsg-sbi/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/rpmsg-sbi/defconfig @@ -39,8 +39,6 @@ CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_HOSTNAME="icicle" CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MMCSD=y CONFIG_MMCSD_SDIO=y CONFIG_MPFS_BOOTLOADER=y diff --git a/boards/risc-v/mpfs/icicle/configs/usb/defconfig b/boards/risc-v/mpfs/icicle/configs/usb/defconfig index b286867e1c..c7b62c64b1 100644 --- a/boards/risc-v/mpfs/icicle/configs/usb/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/usb/defconfig @@ -52,10 +52,10 @@ CONFIG_INTELHEX_BINARY=y CONFIG_IOB_NBUFFERS=24 CONFIG_IOB_NCHAINS=24 CONFIG_LIBC_HOSTNAME="icicle" +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MMCSD=y CONFIG_MMCSD_SDIO=y CONFIG_MM_IOB=y diff --git a/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig b/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig index 56a811989a..101bea1f7f 100644 --- a/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig +++ b/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig @@ -31,10 +31,10 @@ CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_HOSTNAME="icicle" +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MPFS_ENABLE_DPFPU=y CONFIG_MPFS_UART1=y CONFIG_NSH_ARCHINIT=y diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/kfb64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/kfb64/defconfig index a5e93c0303..6946c41fc2 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/kfb64/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/kfb64/defconfig @@ -75,11 +75,11 @@ CONFIG_INIT_MOUNT_TARGET="/system" CONFIG_INIT_STACKSIZE=3072 CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y CONFIG_LIBM=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_PGALLOC=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig index 7f3252a09a..ede903ab5f 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64/defconfig @@ -79,11 +79,11 @@ CONFIG_IOB_BUFSIZE=1534 CONFIG_IOB_THROTTLE=2 CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y CONFIG_LIBM=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_PGALLOC=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig index feaa05701d..bb6d493819 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/knetnsh64_smp/defconfig @@ -80,13 +80,13 @@ CONFIG_IOB_NBUFFERS=64 CONFIG_IOB_THROTTLE=8 CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y +CONFIG_LIBC_MEMCPY_64BIT=y +CONFIG_LIBC_MEMCPY_VIK=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y CONFIG_LIBM=y -CONFIG_MEMCPY_64BIT=y -CONFIG_MEMCPY_VIK=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_PGALLOC=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/knsh64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/knsh64/defconfig index cdb3d12e0f..e3691d8deb 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/knsh64/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/knsh64/defconfig @@ -64,11 +64,11 @@ CONFIG_INIT_MOUNT_TARGET="/system" CONFIG_INIT_STACKSIZE=3072 CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y CONFIG_LIBM=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_PGALLOC=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/ksmp64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/ksmp64/defconfig index 878e637cd8..4b6c4ecd35 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/ksmp64/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/ksmp64/defconfig @@ -64,11 +64,11 @@ CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y CONFIG_LIBM=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_PGALLOC=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64_smp/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64_smp/defconfig index 372fd85fde..1949c13602 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64_smp/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh64_smp/defconfig @@ -59,11 +59,11 @@ CONFIG_IOB_NBUFFERS=64 CONFIG_IOB_THROTTLE=8 CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y +CONFIG_LIBC_MEMCPY_VIK=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMCPY_VIK=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSCLIENT_ENTRIES=4 diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig index f7a82e2720..191a0e5280 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/netnsh_smp/defconfig @@ -59,11 +59,11 @@ CONFIG_IOB_NBUFFERS=64 CONFIG_IOB_THROTTLE=8 CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y +CONFIG_LIBC_MEMCPY_VIK=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMCPY_VIK=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_NET=y CONFIG_NETDB_DNSCLIENT=y CONFIG_NETDB_DNSCLIENT_ENTRIES=4 diff --git a/boards/risc-v/sg2000/milkv_duos/configs/nsh/defconfig b/boards/risc-v/sg2000/milkv_duos/configs/nsh/defconfig index 790726fc55..d5f2f1dfb0 100644 --- a/boards/risc-v/sg2000/milkv_duos/configs/nsh/defconfig +++ b/boards/risc-v/sg2000/milkv_duos/configs/nsh/defconfig @@ -61,10 +61,10 @@ CONFIG_INIT_STACKSIZE=3072 CONFIG_INTELHEX_BINARY=y CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBC_PERROR_STDOUT=y CONFIG_LIBC_STRERROR=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MM_PGALLOC=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 CONFIG_NSH_ARCHINIT=y diff --git a/boards/sim/sim/sim/configs/loadable/defconfig b/boards/sim/sim/sim/configs/loadable/defconfig index 467e06ae91..c08cda16dd 100644 --- a/boards/sim/sim/sim/configs/loadable/defconfig +++ b/boards/sim/sim/sim/configs/loadable/defconfig @@ -36,7 +36,7 @@ CONFIG_INIT_MOUNT_TARGET="/system" CONFIG_LIBC_ENVPATH=y CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_MAX_EXITFUNS=1 -CONFIG_MEMSET_OPTSPEED=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_FILE_APPS=y diff --git a/boards/sparc/bm3803/xx3803/configs/nsh/defconfig b/boards/sparc/bm3803/xx3803/configs/nsh/defconfig index 2460046b94..c396f31f8a 100644 --- a/boards/sparc/bm3803/xx3803/configs/nsh/defconfig +++ b/boards/sparc/bm3803/xx3803/configs/nsh/defconfig @@ -49,9 +49,9 @@ CONFIG_IDLETHREAD_STACKSIZE=2048 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=8192 CONFIG_INTELHEX_BINARY=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBM=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MODLIB_ALIGN_LOG2=3 CONFIG_MODLIB_BUFFERSIZE=64 CONFIG_NSH_ARCHINIT=y diff --git a/boards/sparc/s698pm/s698pm-dkit/configs/nsh/defconfig b/boards/sparc/s698pm/s698pm-dkit/configs/nsh/defconfig index 4ea6d657ad..e0fd9ec02f 100644 --- a/boards/sparc/s698pm/s698pm-dkit/configs/nsh/defconfig +++ b/boards/sparc/s698pm/s698pm-dkit/configs/nsh/defconfig @@ -39,9 +39,9 @@ CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=16384 CONFIG_INTELHEX_BINARY=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBM=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MODLIB_ALIGN_LOG2=3 CONFIG_MODLIB_BUFFERSIZE=64 CONFIG_NSH_ARCHINIT=y diff --git a/boards/sparc/s698pm/s698pm-dkit/configs/smp/defconfig b/boards/sparc/s698pm/s698pm-dkit/configs/smp/defconfig index 7f2efae0bf..3acfcf09ca 100644 --- a/boards/sparc/s698pm/s698pm-dkit/configs/smp/defconfig +++ b/boards/sparc/s698pm/s698pm-dkit/configs/smp/defconfig @@ -40,9 +40,9 @@ CONFIG_IDLETHREAD_STACKSIZE=4096 CONFIG_INIT_ENTRYPOINT="nsh_main" CONFIG_INIT_STACKSIZE=16384 CONFIG_INTELHEX_BINARY=y +CONFIG_LIBC_MEMSET_64BIT=y +CONFIG_LIBC_MEMSET_OPTSPEED=y CONFIG_LIBM=y -CONFIG_MEMSET_64BIT=y -CONFIG_MEMSET_OPTSPEED=y CONFIG_MODLIB_ALIGN_LOG2=3 CONFIG_MODLIB_BUFFERSIZE=64 CONFIG_NSH_ARCHINIT=y diff --git a/libs/libc/string/CMakeLists.txt b/libs/libc/string/CMakeLists.txt index 94588e6236..a862919faa 100644 --- a/libs/libc/string/CMakeLists.txt +++ b/libs/libc/string/CMakeLists.txt @@ -64,7 +64,7 @@ set(SRCS lib_strlcpy.c lib_strnlen.c) -if(CONFIG_MEMCPY_VIK) +if(CONFIG_LIBC_MEMCPY_VIK) list(APPEND SRCS lib_vikmemcpy.c) elseif(CONFIG_LIBC_NEWLIB_OPTSPEED) list(APPEND SRCS lib_bsdmemcpy.c) diff --git a/libs/libc/string/Kconfig b/libs/libc/string/Kconfig index 0e5feb7ad4..2f7cb09049 100644 --- a/libs/libc/string/Kconfig +++ b/libs/libc/string/Kconfig @@ -55,7 +55,7 @@ config LIBC_NEWLIB_OPTSPEED ---help--- Use optimized string function implementation based on newlib. -config MEMCPY_VIK +config LIBC_MEMCPY_VIK bool "Vik memcpy()" default n depends on !LIBC_NEWLIB_OPTSPEED && !LIBC_ARCH_MEMCPY @@ -64,31 +64,31 @@ config MEMCPY_VIK Select this option for improved performance at the expense of increased size. See licensing information in the top-level LICENSE file. -if MEMCPY_VIK +if LIBC_MEMCPY_VIK -config MEMCPY_PRE_INC_PTRS +config LIBC_MEMCPY_PRE_INC_PTRS bool "Pre-increment pointers" default n ---help--- Use pre-increment of pointers. Default is post increment of pointers. -config MEMCPY_INDEXED_COPY +config LIBC_MEMCPY_INDEXED_COPY bool "Array indexing" default y ---help--- Copying data using array indexing. Using this option, disables the - MEMCPY_PRE_INC_PTRS option. + LIBC_MEMCPY_PRE_INC_PTRS option. -config MEMCPY_64BIT +config LIBC_MEMCPY_64BIT bool "64-bit memcpy()" default n ---help--- Compiles memcpy() for architectures that support 64-bit operations efficiently. -endif # MEMCPY_VIK +endif # LIBC_MEMCPY_VIK -config MEMSET_OPTSPEED +config LIBC_MEMSET_OPTSPEED bool "Optimize memset() for speed" default n depends on !LIBC_NEWLIB_OPTSPEED && !LIBC_ARCH_MEMSET @@ -96,10 +96,10 @@ config MEMSET_OPTSPEED Select this option to use a version of memcpy() optimized for speed. Default: memcpy() is optimized for size. -config MEMSET_64BIT +config LIBC_MEMSET_64BIT bool "64-bit memset()" default n - depends on MEMSET_OPTSPEED + depends on LIBC_MEMSET_OPTSPEED ---help--- Compiles memset() for architectures that support 64-bit operations efficiently. diff --git a/libs/libc/string/Make.defs b/libs/libc/string/Make.defs index a4a859b2a7..4d909c51bb 100644 --- a/libs/libc/string/Make.defs +++ b/libs/libc/string/Make.defs @@ -38,7 +38,7 @@ CSRCS += lib_memmove.c lib_memset.c CSRCS += lib_strlcat.c CSRCS += lib_strlcpy.c lib_strnlen.c -ifeq ($(CONFIG_MEMCPY_VIK),y) +ifeq ($(CONFIG_LIBC_MEMCPY_VIK),y) CSRCS += lib_vikmemcpy.c else ifeq ($(CONFIG_LIBC_NEWLIB_OPTSPEED),y) CSRCS += lib_bsdmemcpy.c diff --git a/libs/libc/string/lib_memset.c b/libs/libc/string/lib_memset.c index 1a00a41ee4..58132b0db3 100644 --- a/libs/libc/string/lib_memset.c +++ b/libs/libc/string/lib_memset.c @@ -38,12 +38,12 @@ * Pre-processor Definitions ****************************************************************************/ -/* Can't support CONFIG_MEMSET_64BIT if the platform does not have 64-bit - * integer types. +/* Can't support CONFIG_LIBC_MEMSET_64BIT if the platform does not + * have 64-bit integer types. */ #ifndef CONFIG_HAVE_LONG_LONG -# undef CONFIG_MEMSET_64BIT +# undef CONFIG_LIBC_MEMSET_64BIT #endif /**************************************************************************** @@ -55,7 +55,7 @@ no_builtin("memset") FAR void *memset(FAR void *s, int c, size_t n) { -#ifdef CONFIG_MEMSET_OPTSPEED +#ifdef CONFIG_LIBC_MEMSET_OPTSPEED /* This version is optimized for speed (you could do better * still by exploiting processor caching or memory burst * knowledge.) @@ -64,7 +64,7 @@ FAR void *memset(FAR void *s, int c, size_t n) uintptr_t addr = (uintptr_t)s; uint16_t val16 = ((uint16_t)c << 8) | (uint16_t)c; uint32_t val32 = ((uint32_t)val16 << 16) | (uint32_t)val16; -#ifdef CONFIG_MEMSET_64BIT +#ifdef CONFIG_LIBC_MEMSET_64BIT uint64_t val64 = ((uint64_t)val32 << 32) | (uint64_t)val32; #endif @@ -96,7 +96,7 @@ FAR void *memset(FAR void *s, int c, size_t n) n -= 2; } -#ifndef CONFIG_MEMSET_64BIT +#ifndef CONFIG_LIBC_MEMSET_64BIT /* Loop while there are at least 16-bytes left to be written */ while (n >= 16) @@ -161,7 +161,7 @@ FAR void *memset(FAR void *s, int c, size_t n) #endif } -#ifdef CONFIG_MEMSET_64BIT +#ifdef CONFIG_LIBC_MEMSET_64BIT /* We may get here with n in the range 0..7. If n >= 4, then we should * have 64-bit alignment. */ diff --git a/libs/libc/string/lib_vikmemcpy.c b/libs/libc/string/lib_vikmemcpy.c index 8e7dd19ec5..d2e1a1b22e 100644 --- a/libs/libc/string/lib_vikmemcpy.c +++ b/libs/libc/string/lib_vikmemcpy.c @@ -45,25 +45,25 @@ * Pre-processor Definitions ****************************************************************************/ -/* Can't support CONFIG_MEMCPY_64BIT if the platform does not have 64-bit - * integer types. +/* Can't support CONFIG_LIBC_MEMCPY_64BIT if the platform does not have + * 64-bit integer types. */ #ifndef CONFIG_HAVE_LONG_LONG -# undef CONFIG_MEMCPY_64BIT +# undef CONFIG_LIBC_MEMCPY_64BIT #endif -/* Remove definitions when CONFIG_MEMCPY_INDEXED_COPY is defined */ +/* Remove definitions when CONFIG_LIBC_MEMCPY_INDEXED_COPY is defined */ -#if defined (CONFIG_MEMCPY_INDEXED_COPY) -# if defined (CONFIG_MEMCPY_PRE_INC_PTRS) -# undef CONFIG_MEMCPY_PRE_INC_PTRS -# endif /* CONFIG_MEMCPY_PRE_INC_PTRS */ -#endif /* CONFIG_MEMCPY_INDEXED_COPY */ +#ifdef CONFIG_LIBC_MEMCPY_INDEXED_COPY +# ifdef CONFIG_LIBC_MEMCPY_PRE_INC_PTRS +# undef CONFIG_LIBC_MEMCPY_PRE_INC_PTRS +# endif /* CONFIG_LIBC_MEMCPY_PRE_INC_PTRS */ +#endif /* CONFIG_LIBC_MEMCPY_INDEXED_COPY */ /* Definitions for pre and post increment of pointers */ -#if defined (CONFIG_MEMCPY_PRE_INC_PTRS) +#ifdef CONFIG_LIBC_MEMCPY_PRE_INC_PTRS # define START_VAL(x) (x)-- # define INC_VAL(x) *++(x) @@ -72,7 +72,7 @@ # define PRE_LOOP_ADJUST - (TYPE_WIDTH - 1) # define PRE_SWITCH_ADJUST + 1 -#else /* CONFIG_MEMCPY_PRE_INC_PTRS */ +#else /* CONFIG_LIBC_MEMCPY_PRE_INC_PTRS */ # define START_VAL(x) # define INC_VAL(x) *(x)++ @@ -81,7 +81,7 @@ # define PRE_LOOP_ADJUST # define PRE_SWITCH_ADJUST -#endif /* CONFIG_MEMCPY_PRE_INC_PTRS */ +#endif /* CONFIG_LIBC_MEMCPY_PRE_INC_PTRS */ /* Definitions for endian-ness */ @@ -139,21 +139,21 @@ * configuration. ****************************************************************************/ -#if defined (CONFIG_MEMCPY_INDEXED_COPY) +#ifdef CONFIG_LIBC_MEMCPY_INDEXED_COPY # define CP(idx) CP_INDEX(idx) # define CP_SH(idx, shl, shr) CP_INDEX_SH(idx, shl, shr) # define INC_INDEX(p, o) ((p) += (o)) -#else /* CONFIG_MEMCPY_INDEXED_COPY */ +#else /* CONFIG_LIBC_MEMCPY_INDEXED_COPY */ # define CP(idx) CP_INCR() # define CP_SH(idx, shl, shr) CP_INCR_SH(shl, shr) # define INC_INDEX(p, o) -#endif /* CONFIG_MEMCPY_INDEXED_COPY */ +#endif /* CONFIG_LIBC_MEMCPY_INDEXED_COPY */ #define COPY_REMAINING(count) \ { \ @@ -256,7 +256,7 @@ * Type Definitions ****************************************************************************/ -#ifdef CONFIG_MEMCPY_64BIT +#ifdef CONFIG_LIBC_MEMCPY_64BIT typedef uint64_t uintn; # define TYPE_WIDTH 8L #else