Merge 432fa6513d into 63c8de5f03

libc: Add LIBC_ prefix to MEMCPY_VIK and MEMSET_OPTSPEED
align with other option naming convention Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
2025-01-13 01:38:36 +08:00 · 2025-01-12 16:17:54 +08:00 · 2025-01-12 16:17:21 +08:00 · 2025-01-12 02:15:11 +08:00
53 changed files with 123 additions and 143 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/libs/libc/string/CMakeLists.txt
+++ b/libs/libc/string/CMakeLists.txt
@ -64,9 +64,9 @@ 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_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
--- 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,51 +48,58 @@ endmenu # errno Decode Support

 menu "memcpy/memset Options"

-config MEMCPY_VIK
+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 LIBC_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
 		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_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.

-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.
--- a/libs/libc/string/Make.defs
+++ b/libs/libc/string/Make.defs
@ -38,9 +38,9 @@ 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_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
--- 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.
       */
--- 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
Author	SHA1	Message	Date
Xiang Xiao	9c122829f4	Merge `432fa6513d` into `63c8de5f03`	2025-01-12 16:17:54 +08:00
Xiang Xiao	432fa6513d	libc: Add LIBC_ prefix to MEMCPY_VIK and MEMSET_OPTSPEED align with other option naming convention Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>	2025-01-12 16:17:21 +08:00
Xiang Xiao	bfc0391e04	libc: Rename LIBC_STRING_OPTIMIZE to LIBC_NEWLIB_OPTSPEED and correct the dependence Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>	2025-01-12 02:15:11 +08:00