From 8c35d31808d762c0c49cafda0d94db23c5b5ce4a Mon Sep 17 00:00:00 2001 From: "chao.an" Date: Fri, 7 Jan 2022 10:56:12 +0800 Subject: [PATCH] Kconfig: Remove CONFIG_ prefix from config definition Signed-off-by: chao.an --- arch/arm/src/stm32f7/stm32_sdmmc.c | 4 ++-- arch/arm/src/stm32l4/stm32l4_sdmmc.c | 4 ++-- arch/risc-v/src/mpfs/Kconfig | 6 +++--- arch/z80/src/ez80/Kconfig | 2 +- boards/Kconfig | 2 +- boards/arm/am335x/beaglebone-black/Kconfig | 2 +- boards/arm/sama5/giant-board/Kconfig | 2 +- boards/arm/sama5/sama5d2-xult/Kconfig | 2 +- libs/libc/machine/arm/armv8-m/Kconfig | 24 +++++++++++----------- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c index 0350c174a4..d83eb2dc2f 100644 --- a/arch/arm/src/stm32f7/stm32_sdmmc.c +++ b/arch/arm/src/stm32f7/stm32_sdmmc.c @@ -81,7 +81,7 @@ * 4 SD data lines). * CONFIG_SDMMC_DMAPRIO - SDMMC DMA priority. This can be selected if * CONFIG_STM32F7_SDMMC_DMA is enabled. - * CONFIG_CONFIG_STM32F7_SDMMC_XFRDEBUG - Enables some very low-level debug + * CONFIG_STM32F7_SDMMC_XFRDEBUG - Enables some very low-level debug * output. This also requires CONFIG_DEBUG_FS and CONFIG_DEBUG_INFO * * CONFIG_SDMMC1/2_SDIO_MODE @@ -162,7 +162,7 @@ #endif #if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_FEATURES) -# undef CONFIG_CONFIG_STM32F7_SDMMC_XFRDEBUG +# undef CONFIG_STM32F7_SDMMC_XFRDEBUG #endif #ifdef CONFIG_SDMMC1_SDIO_PULLUP diff --git a/arch/arm/src/stm32l4/stm32l4_sdmmc.c b/arch/arm/src/stm32l4/stm32l4_sdmmc.c index be92f71614..008da817da 100644 --- a/arch/arm/src/stm32l4/stm32l4_sdmmc.c +++ b/arch/arm/src/stm32l4/stm32l4_sdmmc.c @@ -78,7 +78,7 @@ * 4 SD data lines). * CONFIG_SDMMC_DMAPRIO - SDMMC DMA priority. This can be selected if * CONFIG_STM32L4_SDMMC_DMA is enabled. - * CONFIG_CONFIG_STM32L4_SDMMC_XFRDEBUG - Enables some very low-level + * CONFIG_STM32L4_SDMMC_XFRDEBUG - Enables some very low-level * debug output. This also requires CONFIG_DEBUG_FS and * CONFIG_DEBUG_INFO */ @@ -125,7 +125,7 @@ #endif #if !defined(CONFIG_DEBUG_FS) || !defined(CONFIG_DEBUG_FEATURES) -# undef CONFIG_CONFIG_STM32L4_SDMMC_XFRDEBUG +# undef CONFIG_STM32L4_SDMMC_XFRDEBUG #endif /* Friendly CLKCR bit re-definitions ****************************************/ diff --git a/arch/risc-v/src/mpfs/Kconfig b/arch/risc-v/src/mpfs/Kconfig index f50a9782df..878bebaa3b 100755 --- a/arch/risc-v/src/mpfs/Kconfig +++ b/arch/risc-v/src/mpfs/Kconfig @@ -15,17 +15,17 @@ config ARCH_CHIP_MPFS250T_FCVG484 ---help--- MPFS250T 484, 19x19x0.8 mm package -config CONFIG_ARCH_CHIP_MPFS250T_FCG484 +config ARCH_CHIP_MPFS250T_FCG484 bool "MPFS250T_FCG484" ---help--- MPFS250T 484, 23x23x1 mm package -config CONFIG_ARCH_CHIP_MPFS250T_FCSG325 +config ARCH_CHIP_MPFS250T_FCSG325 bool "MPFS250T_FCSG325" ---help--- MPFS250T 325, 11x11 / 11x14.5, 0.5 mm package -config CONFIG_ARCH_CHIP_MPFS250T_FCSG536 +config ARCH_CHIP_MPFS250T_FCSG536 bool "MPFS250T_FCSG536" ---help--- MPFS250T 536, 16x16x0.5 mm package diff --git a/arch/z80/src/ez80/Kconfig b/arch/z80/src/ez80/Kconfig index bc393d90b7..d962dab1d4 100644 --- a/arch/z80/src/ez80/Kconfig +++ b/arch/z80/src/ez80/Kconfig @@ -96,7 +96,7 @@ config EZ80_BOOTLOADER config EZ80_PROGRAM bool default n - select CONFIG_BOOT_RUNFROMEXTSRAM + select BOOT_RUNFROMEXTSRAM ---help--- Binary image is a RAM-resident program loaded by a bootloader and may require special properties such as re-direction of interrupts diff --git a/boards/Kconfig b/boards/Kconfig index 909a512eaf..5db3570d49 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -684,7 +684,7 @@ config ARCH_BOARD_ICICLE_MPFS config ARCH_BOARD_M100PFSEVP_MPFS bool "Aries M100PFSEVP evaluation platform for MPFS" depends on ARCH_CHIP_MPFS - select CONFIG_MPFS_EMMCSD_MUX_GPIO if !MPFS_WITH_QEMU + select MPFS_EMMCSD_MUX_GPIO if !MPFS_WITH_QEMU ---help--- This is the board configuration for the port of NuttX to the MicroChip m100pfsevp-mpfs board. This board features the RISC-V MPFS. diff --git a/boards/arm/am335x/beaglebone-black/Kconfig b/boards/arm/am335x/beaglebone-black/Kconfig index c4e4b4eafb..755c9bc09d 100644 --- a/boards/arm/am335x/beaglebone-black/Kconfig +++ b/boards/arm/am335x/beaglebone-black/Kconfig @@ -8,7 +8,7 @@ if ARCH_BOARD_BEAGLEBONE_BLACK config BEAGLEBONE_VIDEOMODE string "LCD Video Mode" default "640x480x60" - depends on !CONFIG_LCD_TDA19988 || !CONFIG_AM335X_I2C2 + depends on !LCD_TDA19988 || !AM335X_I2C2 ---help--- If we are not using HDMI (via the TDA19988) then we must select a fixed LCD resolution. The default, "640x480x60" is standard VGA diff --git a/boards/arm/sama5/giant-board/Kconfig b/boards/arm/sama5/giant-board/Kconfig index 8106dddfbf..d708048476 100644 --- a/boards/arm/sama5/giant-board/Kconfig +++ b/boards/arm/sama5/giant-board/Kconfig @@ -72,7 +72,7 @@ config SAMA5D27_SDMMC0_MOUNT_FSTYPE default "vfat" depends on SAMA5_SDMMC0 -config CONFIG_SAMA5_SDMMC1_WIDTH_D1_D8 +config SAMA5_SDMMC1_WIDTH_D1_D8 bool "SDMMC0 data bus width 8 bits" default y depends on SAMA5_SDMMC0 diff --git a/boards/arm/sama5/sama5d2-xult/Kconfig b/boards/arm/sama5/sama5d2-xult/Kconfig index aff9244ddf..d6adcd44e0 100644 --- a/boards/arm/sama5/sama5d2-xult/Kconfig +++ b/boards/arm/sama5/sama5d2-xult/Kconfig @@ -80,7 +80,7 @@ config SAMA5D27_SDMMC0_MOUNT_FSTYPE default "vfat" depends on SAMA5_SDMMC0 -config CONFIG_SAMA5_SDMMC1_WIDTH_D1_D8 +config SAMA5_SDMMC1_WIDTH_D1_D8 bool "SDMMC0 data bus width 8 bits" default y depends on SAMA5_SDMMC0 diff --git a/libs/libc/machine/arm/armv8-m/Kconfig b/libs/libc/machine/arm/armv8-m/Kconfig index 825ee73d90..c6db2651ba 100644 --- a/libs/libc/machine/arm/armv8-m/Kconfig +++ b/libs/libc/machine/arm/armv8-m/Kconfig @@ -8,18 +8,18 @@ if ARCH_ARMV8M config ARMV8M_LIBM bool "Architecture specific optimizations" default n - select LIBM_ARCH_CEIL if CONFIG_ARCH_DPFPU - select LIBM_ARCH_FLOOR if CONFIG_ARCH_DPFPU - select LIBM_ARCH_NEARBYINT if CONFIG_ARCH_DPFPU - select LIBM_ARCH_RINT if CONFIG_ARCH_DPFPU - select LIBM_ARCH_ROUND if CONFIG_ARCH_DPFPU - select LIBM_ARCH_TRUNC if CONFIG_ARCH_DPFPU - select LIBM_ARCH_CEILF if CONFIG_ARCH_FPU - select LIBM_ARCH_FLOORF if CONFIG_ARCH_FPU - select LIBM_ARCH_NEARBYINTF if CONFIG_ARCH_FPU - select LIBM_ARCH_RINTF if CONFIG_ARCH_FPU - select LIBM_ARCH_ROUNDF if CONFIG_ARCH_FPU - select LIBM_ARCH_TRUNCF if CONFIG_ARCH_FPU + select LIBM_ARCH_CEIL if ARCH_DPFPU + select LIBM_ARCH_FLOOR if ARCH_DPFPU + select LIBM_ARCH_NEARBYINT if ARCH_DPFPU + select LIBM_ARCH_RINT if ARCH_DPFPU + select LIBM_ARCH_ROUND if ARCH_DPFPU + select LIBM_ARCH_TRUNC if ARCH_DPFPU + select LIBM_ARCH_CEILF if ARCH_FPU + select LIBM_ARCH_FLOORF if ARCH_FPU + select LIBM_ARCH_NEARBYINTF if ARCH_FPU + select LIBM_ARCH_RINTF if ARCH_FPU + select LIBM_ARCH_ROUNDF if ARCH_FPU + select LIBM_ARCH_TRUNCF if ARCH_FPU depends on LIBM ---help--- Enable ARMv8 specific floating point optimizations.