From 3ef0064200e5cef029a3c30f80b5a48078b5a6dd Mon Sep 17 00:00:00 2001 From: Heesub Shin Date: Wed, 26 Apr 2017 16:29:46 +0900 Subject: [PATCH] s5j/Kconfig: remove unnecessary Kconfig entries We have so many legacy Kconfig entries that are not currently in use. This makes us very confused. Let's remove them all. Change-Id: Ic3ab07bd7d729b2ea8f9908bd7d29bf32bda943e Signed-off-by: Heesub Shin --- build/configs/artik053/nettest/defconfig | 15 ---- build/configs/artik053/tash/defconfig | 15 ---- build/configs/sidk_s5jt200/hello/defconfig | 15 ---- .../configs/sidk_s5jt200/hello_with_tash/defconfig | 15 ---- build/configs/sidk_s5jt200/kernel_sample/defconfig | 15 ---- .../configs/sidk_s5jt200/sidk_tash_wlan/defconfig | 15 ---- build/configs/sidk_s5jt200/tc/defconfig | 15 ---- os/arch/arm/src/s5j/Kconfig | 79 +--------------------- os/arch/arm/src/s5j/Make.defs | 52 +------------- 9 files changed, 4 insertions(+), 232 deletions(-) diff --git a/build/configs/artik053/nettest/defconfig b/build/configs/artik053/nettest/defconfig index 1cec71f..22ec818 100644 --- a/build/configs/artik053/nettest/defconfig +++ b/build/configs/artik053/nettest/defconfig @@ -148,7 +148,6 @@ CONFIG_S5J_S5JT200=y # # S5J DEBUG UART Configuration # -# CONFIG_S5J_UART_CLOCK_FROM_WPLL is not set CONFIG_SERIAL_TERMIOS=y CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y CONFIG_S5J_HAVE_UARTDBG=y @@ -167,7 +166,6 @@ CONFIG_S5J_UART0=y CONFIG_S5J_UART1=y CONFIG_S5J_UART2=y CONFIG_S5J_UART3=y -CONFIG_UARTDBG_SERIAL_CONSOLE=y CONFIG_S5J_PWM=y CONFIG_S5J_SSS=y @@ -186,23 +184,10 @@ CONFIG_S5J_SSS=y # S5J I2C # # CONFIG_S5J_I2C is not set -# CONFIG_S5J_MAILBOX is not set CONFIG_S5J_GPIO=y -# CONFIG_S5J_CHIPID is not set -# CONFIG_S5J_EFUSE is not set -# CONFIG_S5J_SDIO_SLAVE is not set -# CONFIG_S5J_LEDCTRLBLK is not set CONFIG_S5J_SFLASH=y -# -# S5J binary version -# -CONFIG_S5J_BL2_VERSION_ADDR=0x04003FF4 -CONFIG_S5J_LEDFW_VERSION_ADDR=0x042FBFF4 -CONFIG_S5J_SSSFW_VERSION_ADDR=0x04303FF4 -CONFIG_S5J_WLANFW_VERSION_ADDR=0x043BDFF4 # CONFIG_S5J_DEBUG_BREAK is not set -CONFIG_S5J_PM=y # # S5J PMU Config diff --git a/build/configs/artik053/tash/defconfig b/build/configs/artik053/tash/defconfig index 60d1338..5c35f20 100644 --- a/build/configs/artik053/tash/defconfig +++ b/build/configs/artik053/tash/defconfig @@ -137,7 +137,6 @@ CONFIG_S5J_S5JT200=y # # S5J DEBUG UART Configuration # -# CONFIG_S5J_UART_CLOCK_FROM_WPLL is not set CONFIG_SERIAL_TERMIOS=y CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y CONFIG_S5J_HAVE_UARTDBG=y @@ -156,7 +155,6 @@ CONFIG_S5J_UART0=y CONFIG_S5J_UART1=y CONFIG_S5J_UART2=y CONFIG_S5J_UART3=y -CONFIG_UARTDBG_SERIAL_CONSOLE=y # CONFIG_S5J_PWM is not set # CONFIG_S5J_SSS is not set @@ -184,12 +182,7 @@ CONFIG_UARTDBG_SERIAL_CONSOLE=y # S5J I2C # # CONFIG_S5J_I2C is not set -# CONFIG_S5J_MAILBOX is not set CONFIG_S5J_GPIO=y -# CONFIG_S5J_CHIPID is not set -# CONFIG_S5J_EFUSE is not set -# CONFIG_S5J_SDIO_SLAVE is not set -# CONFIG_S5J_LEDCTRLBLK is not set CONFIG_S5J_SFLASH=y # @@ -201,15 +194,7 @@ CONFIG_S5J_FLASH_SIZE=0x800000 CONFIG_S5J_FLASH_SECTOR_SIZE=4096 CONFIG_S5J_BOOTLOADER_REGION_SIZE=0x320000 -# -# S5J binary version -# -CONFIG_S5J_BL2_VERSION_ADDR=0x04003FF4 -CONFIG_S5J_LEDFW_VERSION_ADDR=0x042FBFF4 -CONFIG_S5J_SSSFW_VERSION_ADDR=0x04303FF4 -CONFIG_S5J_WLANFW_VERSION_ADDR=0x043BDFF4 # CONFIG_S5J_DEBUG_BREAK is not set -CONFIG_S5J_PM=y # # S5J PMU Config diff --git a/build/configs/sidk_s5jt200/hello/defconfig b/build/configs/sidk_s5jt200/hello/defconfig index b18877e..16cb490 100644 --- a/build/configs/sidk_s5jt200/hello/defconfig +++ b/build/configs/sidk_s5jt200/hello/defconfig @@ -111,7 +111,6 @@ CONFIG_S5J_S5JT200=y # # S5J DEBUG UART Configuration # -# CONFIG_S5J_UART_CLOCK_FROM_WPLL is not set CONFIG_SERIAL_TERMIOS=y CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y CONFIG_S5J_HAVE_UARTDBG=y @@ -130,7 +129,6 @@ CONFIG_S5J_UART0=y CONFIG_S5J_UART1=y CONFIG_S5J_UART2=y CONFIG_S5J_UART3=y -CONFIG_UARTDBG_SERIAL_CONSOLE=y # CONFIG_S5J_PWM is not set # CONFIG_S5J_SSS is not set @@ -149,22 +147,9 @@ CONFIG_UARTDBG_SERIAL_CONSOLE=y # S5J I2C # # CONFIG_S5J_I2C is not set -# CONFIG_S5J_MAILBOX is not set -# CONFIG_S5J_CHIPID is not set -# CONFIG_S5J_EFUSE is not set -# CONFIG_S5J_SDIO_SLAVE is not set -# CONFIG_S5J_LEDCTRLBLK is not set # CONFIG_S5J_SFLASH is not set -# -# S5J binary version -# -CONFIG_S5J_BL2_VERSION_ADDR=0x04003FF4 -CONFIG_S5J_LEDFW_VERSION_ADDR=0x042FBFF4 -CONFIG_S5J_SSSFW_VERSION_ADDR=0x04303FF4 -CONFIG_S5J_WLANFW_VERSION_ADDR=0x043BDFF4 # CONFIG_S5J_DEBUG_BREAK is not set -# CONFIG_S5J_PM is not set # # S5J PMU Config diff --git a/build/configs/sidk_s5jt200/hello_with_tash/defconfig b/build/configs/sidk_s5jt200/hello_with_tash/defconfig index f5e3aa9..7c2ef02 100644 --- a/build/configs/sidk_s5jt200/hello_with_tash/defconfig +++ b/build/configs/sidk_s5jt200/hello_with_tash/defconfig @@ -137,7 +137,6 @@ CONFIG_S5J_S5JT200=y # # S5J DEBUG UART Configuration # -# CONFIG_S5J_UART_CLOCK_FROM_WPLL is not set CONFIG_SERIAL_TERMIOS=y CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y CONFIG_S5J_HAVE_UARTDBG=y @@ -156,7 +155,6 @@ CONFIG_S5J_UART0=y CONFIG_S5J_UART1=y CONFIG_S5J_UART2=y CONFIG_S5J_UART3=y -CONFIG_UARTDBG_SERIAL_CONSOLE=y # CONFIG_S5J_PWM is not set # CONFIG_S5J_SSS is not set @@ -184,12 +182,7 @@ CONFIG_UARTDBG_SERIAL_CONSOLE=y # S5J I2C # CONFIG_S5J_I2C=y -# CONFIG_S5J_MAILBOX is not set CONFIG_S5J_GPIO=y -# CONFIG_S5J_CHIPID is not set -# CONFIG_S5J_EFUSE is not set -# CONFIG_S5J_SDIO_SLAVE is not set -# CONFIG_S5J_LEDCTRLBLK is not set CONFIG_S5J_SFLASH=y # @@ -201,15 +194,7 @@ CONFIG_S5J_FLASH_SIZE=0x800000 CONFIG_S5J_FLASH_SECTOR_SIZE=4096 CONFIG_S5J_BOOTLOADER_REGION_SIZE=0x400000 -# -# S5J binary version -# -CONFIG_S5J_BL2_VERSION_ADDR=0x04003FF4 -CONFIG_S5J_LEDFW_VERSION_ADDR=0x042FBFF4 -CONFIG_S5J_SSSFW_VERSION_ADDR=0x04303FF4 -CONFIG_S5J_WLANFW_VERSION_ADDR=0x043BDFF4 # CONFIG_S5J_DEBUG_BREAK is not set -CONFIG_S5J_PM=y # # S5J PMU Config diff --git a/build/configs/sidk_s5jt200/kernel_sample/defconfig b/build/configs/sidk_s5jt200/kernel_sample/defconfig index d6484b0..8ff4341 100644 --- a/build/configs/sidk_s5jt200/kernel_sample/defconfig +++ b/build/configs/sidk_s5jt200/kernel_sample/defconfig @@ -137,7 +137,6 @@ CONFIG_S5J_S5JT200=y # # S5J DEBUG UART Configuration # -# CONFIG_S5J_UART_CLOCK_FROM_WPLL is not set CONFIG_SERIAL_TERMIOS=y CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y CONFIG_S5J_HAVE_UARTDBG=y @@ -156,7 +155,6 @@ CONFIG_S5J_UART0=y CONFIG_S5J_UART1=y CONFIG_S5J_UART2=y CONFIG_S5J_UART3=y -CONFIG_UARTDBG_SERIAL_CONSOLE=y # CONFIG_S5J_PWM is not set # CONFIG_S5J_SSS is not set @@ -184,12 +182,7 @@ CONFIG_UARTDBG_SERIAL_CONSOLE=y # S5J I2C # CONFIG_S5J_I2C=y -# CONFIG_S5J_MAILBOX is not set CONFIG_S5J_GPIO=y -# CONFIG_S5J_CHIPID is not set -# CONFIG_S5J_EFUSE is not set -# CONFIG_S5J_SDIO_SLAVE is not set -# CONFIG_S5J_LEDCTRLBLK is not set CONFIG_S5J_SFLASH=y # @@ -201,15 +194,7 @@ CONFIG_S5J_FLASH_SIZE=0x800000 CONFIG_S5J_FLASH_SECTOR_SIZE=4096 CONFIG_S5J_BOOTLOADER_REGION_SIZE=0x400000 -# -# S5J binary version -# -CONFIG_S5J_BL2_VERSION_ADDR=0x04003FF4 -CONFIG_S5J_LEDFW_VERSION_ADDR=0x042FBFF4 -CONFIG_S5J_SSSFW_VERSION_ADDR=0x04303FF4 -CONFIG_S5J_WLANFW_VERSION_ADDR=0x043BDFF4 # CONFIG_S5J_DEBUG_BREAK is not set -CONFIG_S5J_PM=y # # S5J PMU Config diff --git a/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig b/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig index 30c29aa..8218029 100644 --- a/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig +++ b/build/configs/sidk_s5jt200/sidk_tash_wlan/defconfig @@ -148,7 +148,6 @@ CONFIG_S5J_S5JT200=y # # S5J DEBUG UART Configuration # -# CONFIG_S5J_UART_CLOCK_FROM_WPLL is not set CONFIG_SERIAL_TERMIOS=y CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y CONFIG_S5J_HAVE_UARTDBG=y @@ -167,7 +166,6 @@ CONFIG_S5J_UART0=y CONFIG_S5J_UART1=y CONFIG_S5J_UART2=y CONFIG_S5J_UART3=y -CONFIG_UARTDBG_SERIAL_CONSOLE=y CONFIG_S5J_PWM=y CONFIG_S5J_SSS=y @@ -186,23 +184,10 @@ CONFIG_S5J_SSS=y # S5J I2C # CONFIG_S5J_I2C=y -# CONFIG_S5J_MAILBOX is not set CONFIG_S5J_GPIO=y -# CONFIG_S5J_CHIPID is not set -# CONFIG_S5J_EFUSE is not set -# CONFIG_S5J_SDIO_SLAVE is not set -# CONFIG_S5J_LEDCTRLBLK is not set CONFIG_S5J_SFLASH=y -# -# S5J binary version -# -CONFIG_S5J_BL2_VERSION_ADDR=0x04003FF4 -CONFIG_S5J_LEDFW_VERSION_ADDR=0x042FBFF4 -CONFIG_S5J_SSSFW_VERSION_ADDR=0x04303FF4 -CONFIG_S5J_WLANFW_VERSION_ADDR=0x043BDFF4 # CONFIG_S5J_DEBUG_BREAK is not set -CONFIG_S5J_PM=y # # S5J PMU Config diff --git a/build/configs/sidk_s5jt200/tc/defconfig b/build/configs/sidk_s5jt200/tc/defconfig index 8fd072b..131a34a 100644 --- a/build/configs/sidk_s5jt200/tc/defconfig +++ b/build/configs/sidk_s5jt200/tc/defconfig @@ -137,7 +137,6 @@ CONFIG_S5J_S5JT200=y # # S5J DEBUG UART Configuration # -# CONFIG_S5J_UART_CLOCK_FROM_WPLL is not set CONFIG_SERIAL_TERMIOS=y CONFIG_ARCH_HAVE_SERIAL_TERMIOS=y CONFIG_S5J_HAVE_UARTDBG=y @@ -156,7 +155,6 @@ CONFIG_S5J_UART0=y CONFIG_S5J_UART1=y CONFIG_S5J_UART2=y CONFIG_S5J_UART3=y -CONFIG_UARTDBG_SERIAL_CONSOLE=y CONFIG_S5J_PWM=y # CONFIG_S5J_SSS is not set @@ -184,12 +182,7 @@ CONFIG_S5J_SPI=y # S5J I2C # CONFIG_S5J_I2C=y -# CONFIG_S5J_MAILBOX is not set CONFIG_S5J_GPIO=y -# CONFIG_S5J_CHIPID is not set -# CONFIG_S5J_EFUSE is not set -# CONFIG_S5J_SDIO_SLAVE is not set -# CONFIG_S5J_LEDCTRLBLK is not set CONFIG_S5J_SFLASH=y # @@ -201,15 +194,7 @@ CONFIG_S5J_FLASH_SIZE=0x800000 CONFIG_S5J_FLASH_SECTOR_SIZE=4096 CONFIG_S5J_BOOTLOADER_REGION_SIZE=0x400000 -# -# S5J binary version -# -CONFIG_S5J_BL2_VERSION_ADDR=0x04003FF4 -CONFIG_S5J_LEDFW_VERSION_ADDR=0x042FBFF4 -CONFIG_S5J_SSSFW_VERSION_ADDR=0x04303FF4 -CONFIG_S5J_WLANFW_VERSION_ADDR=0x043BDFF4 # CONFIG_S5J_DEBUG_BREAK is not set -# CONFIG_S5J_PM is not set # # S5J PMU Config diff --git a/os/arch/arm/src/s5j/Kconfig b/os/arch/arm/src/s5j/Kconfig index b7ff8b3..3a55ab1 100644 --- a/os/arch/arm/src/s5j/Kconfig +++ b/os/arch/arm/src/s5j/Kconfig @@ -10,7 +10,7 @@ choice default ARCH_CHIP_S5JT200 config ARCH_CHIP_S5JT200 - bool "S5JT200 " + bool "S5JT200" depends on ARCH_CHIP_S5J select S5J_S5JT200 select ARCH_CORTEXR4 @@ -30,18 +30,6 @@ config S5J_S5JT200 select S5J_UART3 menu "S5J DEBUG UART Configuration" -config S5J_UART_CLOCK_FROM_WPLL - bool "Set Uart Clock using WPLL" - default n - -config SERIAL_TERMIOS - bool - default y - -config ARCH_HAVE_SERIAL_TERMIOS - bool - default y - config S5J_HAVE_UARTDBG bool default y @@ -88,15 +76,11 @@ config UARTDBG_2STOP default 0 endif - config S5J_UARTDBG bool default n - select ARCH_HAVE_UARTDBG select S5J_HAVE_UARTDBG select UART0_SERIAL_CONSOLE - select UARTDBG_SERIAL_CONSOLE - config S5J_UART0 bool @@ -125,11 +109,6 @@ config S5J_UART3 select S5J_HAVE_UART3 select UART2_SERIAL_CONSOLE -config UARTDBG_SERIAL_CONSOLE - bool - default n - - endmenu #"S5J UART Configuration" config S5J_PWM @@ -146,7 +125,6 @@ config S5J_SPI default y endmenu - menu "S5J WDT(Watch Dog Timer)" config S5J_WATCHDOG bool "S5J WDT support" @@ -171,7 +149,6 @@ config S5J_WDT_DEFTIMEOUT int "S5J Watchdog Timeout(in msec)" default 7000 depends on S5J_WATCHDOG - endmenu config S5J_ADC @@ -191,65 +168,15 @@ config S5J_I2C default n endmenu -config S5J_MAILBOX - bool "S5J MAILBOX support" - default n - select MAILBOX - -config S5J_CHIPID - bool "S5J CHIPID support" - default n - -config S5J_EFUSE - bool "S5J EFUSE support" - default n - -config S5J_SDIO_SLAVE - bool "S5J SDIO support" - default n - -config S5J_LEDCTRLBLK - bool "S5J LED BLK controller support" - default y - config S5J_SFLASH - bool "S5J Serial Flash support" + bool "S5J Serial Flash support" default y -menu "S5J binary version" - -config S5J_BL2_VERSION_ADDR - hex "bl2 base address" - default 0x04003FF4 - help - -config S5J_LEDFW_VERSION_ADDR - hex "LEDFW base address" - default 0x042FBFF4 - help - -config S5J_SSSFW_VERSION_ADDR - hex "SSSFW base address" - default 0x04303FF4 - help - -config S5J_WLANFW_VERSION_ADDR - hex "WLANFW base address" - default 0x043BDFF4 - help - -endmenu - - config S5J_DEBUG_BREAK bool "S5J debug break on boot process" help this enable break during booting, on s5j_boot.c before os_start() -config S5J_PM - bool "S5J Power Management" - default n - menu "S5J PMU Config" config S5J_PWR bool "S5J PMU feature" @@ -262,10 +189,8 @@ config S5J_PWR_DSTOP config S5J_PWR_SLEEP bool "S5J SLEEP Power Mode" default n - endmenu - config S5J_DMA bool "S5J DMA enable" default n diff --git a/os/arch/arm/src/s5j/Make.defs b/os/arch/arm/src/s5j/Make.defs index 690dec4..6396be9 100644 --- a/os/arch/arm/src/s5j/Make.defs +++ b/os/arch/arm/src/s5j/Make.defs @@ -95,17 +95,13 @@ CMN_CSRCS += arm_schedulesigaction.c arm_sigdeliver.c arm_syscall.c CMN_CSRCS += arm_unblocktask.c arm_undefinedinsn.c CMN_CSRCS += arm_copyarmstate.c CMN_CSRCS += up_checkstack.c +CMN_CSRCS += up_idle.c # Configuration dependent C files ifeq ($(CONFIG_ARMV7M_MPU),y) CMN_CSRCS += arm_mpu.c endif -ifeq ($(CONFIG_PAGING),y) -CMN_CSRCS += arm_allocpage.c arm_checkmapping.c arm_pginitialize.c -CMN_CSRCS += arm_va2pte.c -endif - ifeq ($(CONFIG_BUILD_KERNEL),y) CMN_CSRCS += up_task_start.c up_pthread_start.c arm_signal_dispatch.c endif @@ -114,13 +110,10 @@ ifneq ($(CONFIG_SCHED_TICKLESS),y) CHIP_CSRCS += s5j_timerisr.c endif -ifeq ($(CONFIG_SCHED_TICKLESS),y) -CHIP_CSRCS += s5j_tickless.c -endif - CHIP_CSRCS += s5j_boot.c s5j_irq.c CHIP_CSRCS += s5j_serial.c CHIP_CSRCS += s5j_mac.c +CHIP_CSRCS += s5j_watchdog.c CHIP_CSRCS += s5j_gpio.c ifeq ($(CONFIG_GPIO),y) @@ -131,36 +124,18 @@ ifeq ($(CONFIG_S5J_SPI),y) CHIP_CSRCS += s5j_spi.c endif -ifeq ($(CONFIG_S5J_CHIPID),y) -CHIP_CSRCS += s5j_chipid.c -endif - ifeq ($(CONFIG_S5J_ADC),y) CHIP_CSRCS += s5j_adc.c endif -ifeq ($(CONFIG_S5J_WATCHDOG),y) -CHIP_CSRCS += s5j_watchdog.c -endif - ifeq ($(CONFIG_S5J_I2C),y) CHIP_CSRCS += s5j_i2c.c endif -ifeq ($(CONFIG_S5J_LEDCTRLBLK),y) -CHIP_CSRCS += s5j_ledctrlblk.c -endif - ifeq ($(CONFIG_S5J_SFLASH),y) CHIP_CSRCS += s5j_sflash.c endif -ifeq ($(CONFIG_ARCH_IDLE_CUSTOM),y) -CHIP_CSRCS += s5j_idle.c -else -CMN_CSRCS += up_idle.c -endif - ifeq ($(CONFIG_ARCH_CUSTOM_PMINIT),y) CHIP_CSRCS += s5j_pminitialize.c CHIP_CSRCS += s5j_pmstandby.c s5j_pmstop.c @@ -171,14 +146,6 @@ CHIP_CSRCS += s5j_pwr.c CHIP_CSRCS += s5j_pwrcal.c endif -ifeq ($(CONFIG_S5J_SDIO_SLAVE),y) -CHIP_CSRCS += s5j_sdio_slave.c -endif - -ifeq ($(CONFIG_S5E_LEDCTRLBLK),y) -CHIP_CSRCS += s5j_ledctrlblk.c -endif - ifeq ($(CONFIG_S5J_PWM),y) CHIP_CSRCS += s5j_pwm.c endif @@ -190,24 +157,10 @@ CHIP_CSRCS += s5j_rtc_lowerhalf.c endif endif -ifeq ($(CONFIG_S5J_MAILBOX),y) -CHIP_CSRCS += s5j_mailbox.c -endif - -ifeq ($(CONFIG_S5J_WLBTBLK),y) -CHIP_CSRCS += s5j_wlbt.c -endif - -ifeq ($(CONFIG_EXAMPLES_LDO_TEST),y) -CHIP_CSRCS += s5j_ldo.c -endif - ifeq ($(CONFIG_S5J_DMA),y) CHIP_CSRCS += s5j_dma.c endif -CHIP_CSRCS += s5j_watchdog.c - ifeq ($(CONFIG_S5J_SSS),y) VPATH += chip/sss CHIP_CSRCS += sss_driver_io.c @@ -215,4 +168,3 @@ CHIP_CSRCS += sss_driver_io.c # built-in static library EXTRA_LIBS += chip/sss/libispdriver.a endif - -- 2.7.4