diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2019-01-25 17:48:01 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2019-01-25 17:52:09 -0500 |
| commit | 4fec225115777a028a00a4797663e00e8bd96ce1 (patch) | |
| tree | 9699ff553b238bd8f6c58c2ba397653ebf614db5 | |
| parent | 15afcf69fe859534ae83f55e16991d3b022b3b81 (diff) | |
| download | kutter-4fec225115777a028a00a4797663e00e8bd96ce1.tar.gz kutter-4fec225115777a028a00a4797663e00e8bd96ce1.tar.xz kutter-4fec225115777a028a00a4797663e00e8bd96ce1.zip | |
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>
| -rw-r--r-- | src/avr/Kconfig | 12 | ||||
| -rw-r--r-- | src/avr/Makefile | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/avr/Kconfig b/src/avr/Kconfig index 2a1ca0b8..b6877ac6 100644 --- a/src/avr/Kconfig +++ b/src/avr/Kconfig @@ -101,16 +101,16 @@ config AVR_STACK_SIZE config AVR_WATCHDOG bool default y -config AVR_USBSERIAL +config USBSERIAL bool "Use USB for communication (instead of serial)" depends on MACH_at90usb1286 || MACH_at90usb646 || MACH_atmega32u4 default y -config AVR_SERIAL - depends on !AVR_USBSERIAL +config SERIAL + depends on !USBSERIAL bool default y choice - depends on AVR_SERIAL + depends on SERIAL prompt "Serial Port" if MACH_atmega2560 || MACH_atmega1280 || MACH_atmega1284p help Select the serial device to use on the AVR chip. This is @@ -125,11 +125,11 @@ choice bool "UART3" if MACH_atmega2560 || MACH_atmega1280 endchoice config SERIAL_BAUD - depends on AVR_SERIAL + depends on SERIAL int "Baud rate for serial port" default 250000 config SERIAL_BAUD_U2X - depends on AVR_SERIAL && !SIMULAVR + depends on SERIAL && !SIMULAVR bool default y diff --git a/src/avr/Makefile b/src/avr/Makefile index 775bafc3..42f6855f 100644 --- a/src/avr/Makefile +++ b/src/avr/Makefile @@ -15,8 +15,8 @@ src-$(CONFIG_HAVE_GPIO_SPI) += avr/spi.c src-$(CONFIG_HAVE_GPIO_I2C) += avr/i2c.c src-$(CONFIG_HAVE_GPIO_HARD_PWM) += avr/hard_pwm.c src-$(CONFIG_AVR_WATCHDOG) += avr/watchdog.c -src-$(CONFIG_AVR_USBSERIAL) += avr/usbserial.c generic/usb_cdc.c -src-$(CONFIG_AVR_SERIAL) += avr/serial.c generic/serial_irq.c +src-$(CONFIG_USBSERIAL) += avr/usbserial.c generic/usb_cdc.c +src-$(CONFIG_SERIAL) += avr/serial.c generic/serial_irq.c # 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) |