3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avr: Rename AVR_SERIAL and AVR_USBSERIAL to SERIAL and USBSERIAL 

Rename the config options to be more consistent with other
architectures.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2019-01-25 17:48:01 -05:00
parent 15afcf69fe
commit 4fec225115
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/avr/Kconfig
View File

@ -101,16 +101,16 @@ config AVR_STACK_SIZE
config AVR_WATCHDOG config AVR_WATCHDOG
bool bool
default y default y
config AVR_USBSERIAL config USBSERIAL
bool "Use USB for communication (instead of serial)" bool "Use USB for communication (instead of serial)"
depends on MACH_at90usb1286 || MACH_at90usb646 || MACH_atmega32u4 depends on MACH_at90usb1286 || MACH_at90usb646 || MACH_atmega32u4
default y default y
config AVR_SERIAL config SERIAL
depends on !AVR_USBSERIAL depends on !USBSERIAL
bool bool
default y default y
choice choice
depends on AVR_SERIAL depends on SERIAL
prompt "Serial Port" if MACH_atmega2560 || MACH_atmega1280 || MACH_atmega1284p prompt "Serial Port" if MACH_atmega2560 || MACH_atmega1280 || MACH_atmega1284p
help help
Select the serial device to use on the AVR chip. This is Select the serial device to use on the AVR chip. This is
@ -125,11 +125,11 @@ choice
bool "UART3" if MACH_atmega2560 || MACH_atmega1280 bool "UART3" if MACH_atmega2560 || MACH_atmega1280
endchoice endchoice
config SERIAL_BAUD config SERIAL_BAUD
depends on AVR_SERIAL depends on SERIAL
int "Baud rate for serial port" int "Baud rate for serial port"
default 250000 default 250000
config SERIAL_BAUD_U2X config SERIAL_BAUD_U2X
depends on AVR_SERIAL && !SIMULAVR depends on SERIAL && !SIMULAVR
bool bool
default y default y

4
src/avr/Makefile
View File

@ -15,8 +15,8 @@ src-$(CONFIG_HAVE_GPIO_SPI) += avr/spi.c
src-$(CONFIG_HAVE_GPIO_I2C) += avr/i2c.c src-$(CONFIG_HAVE_GPIO_I2C) += avr/i2c.c
src-$(CONFIG_HAVE_GPIO_HARD_PWM) += avr/hard_pwm.c src-$(CONFIG_HAVE_GPIO_HARD_PWM) += avr/hard_pwm.c
src-$(CONFIG_AVR_WATCHDOG) += avr/watchdog.c src-$(CONFIG_AVR_WATCHDOG) += avr/watchdog.c
src-$(CONFIG_AVR_USBSERIAL) += avr/usbserial.c generic/usb_cdc.c src-$(CONFIG_USBSERIAL) += avr/usbserial.c generic/usb_cdc.c
src-$(CONFIG_AVR_SERIAL) += avr/serial.c generic/serial_irq.c src-$(CONFIG_SERIAL) += avr/serial.c generic/serial_irq.c
# Suppress broken "misspelled signal handler" warnings on gcc 4.8.1 # Suppress broken "misspelled signal handler" warnings on gcc 4.8.1
CFLAGS_klipper.elf := $(CFLAGS_klipper.elf) $(if $(filter 4.8.1, $(shell $(CC) -dumpversion)), -w) CFLAGS_klipper.elf := $(CFLAGS_klipper.elf) $(if $(filter 4.8.1, $(shell $(CC) -dumpversion)), -w)