From 892c86df3ccb38dd76424ee780d563f48226f79b Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 6 Mar 2014 09:17:11 -0600 Subject: [PATCH] configs/us7032evb1/ostest: Configuration converted to use the kconfig-frontends tools --- arch/hc/src/m9s12/Kconfig | 108 +------------------------------------- arch/sh/Kconfig | 9 ++-- arch/sh/src/sh1/Kconfig | 61 +++++++++++++++++++++ 3 files changed, 69 insertions(+), 109 deletions(-) diff --git a/arch/hc/src/m9s12/Kconfig b/arch/hc/src/m9s12/Kconfig index a2968c85ff..c0fce2f9b2 100644 --- a/arch/hc/src/m9s12/Kconfig +++ b/arch/hc/src/m9s12/Kconfig @@ -11,119 +11,15 @@ menu "M9S12 Peripheral Selection" config HCS12_SCI0 bool "SCI0" default n + select ARCH_HAVE_SCI0 config HCS12_SCI1 bool "SCI1" default n + select ARCH_HAVE_SCI1 endmenu # M9S12 Peripheral Selection -menu "SCI Configuration" - depends on HCS12_SCI0 || HCS12_SCI1 - -if HCS12_SCI0 - -config SCI0_RXBUFSIZE - int "SCI0 receive buffer size" - default 256 - ---help--- - Characters are buffered as they are received. This specifies - the size of the receive buffer. - -config SCI0_TXBUFSIZE - int "SCI0 transmit buffer size" - default 256 - ---help--- - Characters are buffered before being sent. This specifies - the size of the transmit buffer. - -config SCI0_BAUD - int "SCI0 BAUD rate" - default 115200 - ---help--- - The configured BAUD of the SCI. - -config SCI0_BITS - int "SCI0 character size" - default 8 - ---help--- - The number of bits. Must be either 7 or 8. - -config SCI0_PARITY - int "Parity setting" - default 0 - ---help--- - 0=no parity, 1=odd parity, 2=even parity - -config SCI0_2STOP - int "SCI0 use 2 stop bits" - default 0 - ---help--- - 1=Two stop bits - -endif # HCS12_SCI0 - -if HCS12_SCI1 - -config SCI1_RXBUFSIZE - int "SCI1 receive buffer size" - default 256 - ---help--- - Characters are buffered as they are received. This specifies - the size of the receive buffer. - -config SCI1_TXBUFSIZE - int "SCI1 transmit buffer size" - default 256 - ---help--- - Characters are buffered before being sent. This specifies - the size of the transmit buffer. - -config SCI1_BAUD - int "SCI1 BAUD rate" - default 115200 - ---help--- - The configured BAUD of the SCI. - -config SCI1_BITS - int "SCI1 character size" - default 8 - ---help--- - The number of bits. Must be either 7 or 8. - -config SCI1_PARITY - int "Parity setting" - default 0 - ---help--- - 0=no parity, 1=odd parity, 2=even parity - -config SCI1_2STOP - int "SCI1 use 2 stop bits" - default 0 - ---help--- - 1=Two stop bits - -endif # HCS12_SCI1 - -choice - prompt "SCI Serial Console" - default SCI0_SERIAL_CONSOLE if HCS12_SCI0 - default SCI1_SERIAL_CONSOLE if !HCS12_SCI0 - -config NOSCI_SERIAL_CONSOLE - bool "No SCI serial console" - -config SCI0_SERIAL_CONSOLE - bool "SCI0 serial console" - depends on HCS12_SCI0 - -config SCI1_SERIAL_CONSOLE - bool "SCI1 serial console" - depends on HCS12_SCI1 - -endchoice -endmenu # SCI Configuration - menu "HSC12 Build Options" config HCS12_SERIALMON diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index bfb1f5973a..15575a9e4f 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -4,17 +4,20 @@ # if ARCH_SH + choice prompt "SH chip selection" default ARCH_CHIP_SH7032 config ARCH_CHIP_SH7032 bool "SH7032" + select ARCH_SH1 ---help--- Hitachi/Renesas SH7032 (SH1) config ARCH_CHIP_M30262F8 bool "M30262F8" + select ARCH_M16C ---help--- Renesas M30262F8 (M16C) @@ -22,11 +25,11 @@ endchoice config ARCH_SH1 bool - default y if ARCH_CHIP_SH7032 + default n config ARCH_M16C bool - default y if ARCH_CHIP_M30262F8 + default n config ARCH_CHIP string @@ -37,4 +40,4 @@ source arch/sh/src/common/Kconfig source arch/sh/src/m16c/Kconfig source arch/sh/src/sh1/Kconfig -endif +endif # ARCH_SH diff --git a/arch/sh/src/sh1/Kconfig b/arch/sh/src/sh1/Kconfig index 3fe3ebb7d9..560c3d91c7 100644 --- a/arch/sh/src/sh1/Kconfig +++ b/arch/sh/src/sh1/Kconfig @@ -6,4 +6,65 @@ if ARCH_SH1 comment "SH-1 Configuration Options" +menu "SH-1 Peripheral Selections" + +config SH1_DMAC0 + bool "DMAC0" + default n + +config SH1_DMAC1 + bool "DMAC1" + default n + +config SH1_DMAC2 + bool "DMAC2" + default n + +config SH1_DMAC3 + bool "DMAC3" + default n + +config SH1_ITU1 + bool "ITU2" + default n + +config SH1_ITU2 + bool "ITU2" + default n + +config SH1_ITU3 + bool "ITU3" + default n + +config SH1_ITU4 + bool "ITU4" + default n + +config SH1_SCI0 + bool "SCI0" + default n + select ARCH_HAVE_SCI0 + +config SH1_SCI1 + bool "SCI1" + default n + select ARCH_HAVE_SCI1 + +config SH1_PCU + bool "PCU" + default n + +config SH1_AD + bool "AD" + default n + +config SH1_WDT + bool "WDT" + default n + +config SH1_CMI + bool "CMI" + default n + +endmenu # SH-1 Peripheral Selections endif