Kconfig: Resync src/Kconfig with upstream Klipper code

This adds a few symbols used by the latest Klipper code.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2022-12-14 21:08:00 -05:00 committed by Eric Callahan
parent f9cd240fb4
commit e3e72b8642

View File

@ -10,21 +10,23 @@ config LOW_LEVEL_OPTIONS
choice choice
prompt "Micro-controller Architecture" prompt "Micro-controller Architecture"
config MACH_STM32
bool "STMicroelectronics STM32"
config MACH_LPC176X config MACH_LPC176X
bool "LPC176x (Smoothieboard)" bool "LPC176x (Smoothieboard)"
config MACH_STM32
bool "STMicroelectronics STM32"
config MACH_RP2040 config MACH_RP2040
bool "Raspberry Pi RP2040" bool "Raspberry Pi RP2040"
endchoice endchoice
source "src/stm32/Kconfig"
source "src/lpc176x/Kconfig" source "src/lpc176x/Kconfig"
source "src/stm32/Kconfig"
source "src/rp2040/Kconfig" source "src/rp2040/Kconfig"
# Generic configuration options for serial ports # Generic configuration options for serial ports
config SERIAL config SERIAL
bool bool
config SERIAL_BOOTLOADER_SIDECHANNEL
bool
config SERIAL_BAUD config SERIAL_BAUD
depends on SERIAL depends on SERIAL
int "Baud rate for serial port" if LOW_LEVEL_OPTIONS int "Baud rate for serial port" if LOW_LEVEL_OPTIONS
@ -36,18 +38,23 @@ config SERIAL_BAUD
# Generic configuration options for USB # Generic configuration options for USB
config USBSERIAL config USBSERIAL
bool bool
config USBCANBUS
bool
config USB
bool
default y if USBSERIAL || USBCANBUS
config USB_VENDOR_ID config USB_VENDOR_ID
default 0x1d50 default 0x1d50
config USB_DEVICE_ID config USB_DEVICE_ID
default 0x6177 default 0x6177
config USB_SERIAL_NUMBER_CHIPID config USB_SERIAL_NUMBER_CHIPID
depends on HAVE_CHIPID && USBSERIAL depends on USB && HAVE_CHIPID
default y default y
config USB_SERIAL_NUMBER config USB_SERIAL_NUMBER
default "12345" default "12345"
menu "USB ids" menu "USB ids"
depends on USBSERIAL && LOW_LEVEL_OPTIONS depends on USB && LOW_LEVEL_OPTIONS
config USB_VENDOR_ID config USB_VENDOR_ID
hex "USB vendor ID" if USBSERIAL hex "USB vendor ID" if USBSERIAL
config USB_DEVICE_ID config USB_DEVICE_ID
@ -63,9 +70,9 @@ config CANSERIAL
bool bool
config CANBUS config CANBUS
bool bool
default y if CANSERIAL default y if CANSERIAL || USBCANBUS
config CANBUS_FREQUENCY config CANBUS_FREQUENCY
int "CAN bus speed" if CANBUS int "CAN bus speed" if LOW_LEVEL_OPTIONS && CANBUS
default 500000 default 500000
config CANBUS_FILTER config CANBUS_FILTER
bool bool