[PATCH 30/38] Nokia RX-51: Migrate legacy USB device options to Kconfig

Tom Rini
2022-11-19T23:52:11Z

Move a number of legacy USB UDC options to Kconfig, over from the config
header.

Cc: Pali Rohár <pali@kernel.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
README | 7 -------
board/nokia/rx51/Kconfig | 30 ++++++++++++++++++++++++++++++
include/configs/nokia_rx51.h | 9 ---------
3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/README b/README
index 0acc0b410917..103562bbbe8d 100644
--- a/README
+++ b/README
@@ -629,13 +629,6 @@ The following options need to be configured:
variable usbtty to be cdc_acm should suffice. The following
might be defined in YourBoardName.h

- CONFIG_USB_DEVICE
- Define this to build a UDC device
-
- CONFIG_USB_TTY
- Define this to have a tty type of device available to
- talk to the UDC device
-
CONFIG_USBD_HS
Define this to enable the high speed support for usb
device and usbtty. If this feature is enabled, a routine
diff --git a/board/nokia/rx51/Kconfig b/board/nokia/rx51/Kconfig
index 7cf05077dad1..c884543a3d84 100644
--- a/board/nokia/rx51/Kconfig
+++ b/board/nokia/rx51/Kconfig
@@ -1,5 +1,35 @@
if TARGET_NOKIA_RX51

+config USB_DEVICE
+ def_bool y
+ help
+ Legacy UDC device support
+
+config USB_TTY
+ def_bool y
+ help
+ Legacy tty type of device available to talk to the UDC device
+
+config USBD_VENDORID
+ hex
+ default 0x0421
+
+config USBD_PRODUCTID_CDCACM
+ hex
+ default 0x01c8
+
+config USBD_PRODUCTID_GSERIAL
+ hex
+ default 0x01c8
+
+config USBD_MANUFACTURER
+ string
+ default "Nokia"
+
+config USBD_PRODUCT_NAME
+ string
+ default "N900 (U-Boot)"
+
config NR_DRAM_BANKS
default 2

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 5701732b9aeb..04bff3ca4f67 100644
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -49,15 +49,6 @@

#define CFG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 }

-/* USB device configuration */
-#define CONFIG_USB_DEVICE
-#define CONFIG_USB_TTY
-#define CONFIG_USBD_VENDORID 0x0421
-#define CONFIG_USBD_PRODUCTID_CDCACM 0x01c8
-#define CONFIG_USBD_PRODUCTID_GSERIAL 0x01c8
-#define CONFIG_USBD_MANUFACTURER "Nokia"
-#define CONFIG_USBD_PRODUCT_NAME "N900 (U-Boot)"
-
#define GPIO_SLIDE 71

/*
--
2.25.1