From 27f6adf44aaa19c5e198531723374e4bda88f677 Mon Sep 17 00:00:00 2001 From: WestfW Date: Fri, 29 May 2020 02:17:56 -0700 Subject: [PATCH] Fix "make help", at least on unixy systems. Remove the UARTTX option, which is only relevant for mega0 targets. Remove mega0 targets from the Makefile.extras, where they slipped in accidentallly. They never worked, and caused confusing since a "make atmega4809" would generate compile errors instead of "unknown target" errors. --- optiboot/bootloaders/optiboot/Makefile | 4 +- optiboot/bootloaders/optiboot/Makefile.extras | 37 ------------------- 2 files changed, 2 insertions(+), 39 deletions(-) diff --git a/optiboot/bootloaders/optiboot/Makefile b/optiboot/bootloaders/optiboot/Makefile index d18cfec..1d194de 100644 --- a/optiboot/bootloaders/optiboot/Makefile +++ b/optiboot/bootloaders/optiboot/Makefile @@ -257,7 +257,6 @@ COMMON_OPTIONS += $(OSCCAL_VALUE_CMD) $(VERSION_CMD) $(TIMEOUT_CMD) #UART is handled separately and only passed for devices with more than one. HELPTEXT += "Option UART=n - use UARTn for communications\n" -HELPTEXT += "Option UARTTX=pin - describe UART for Mega0, Xtiny ifdef UART UART_CMD = -DUART=$(UART) endif @@ -265,6 +264,7 @@ ifdef UARTTX UART_CMD = -DUARTTX=$(UARTTX) endif +HELPTEXT += "Option TIMEOUT=n - set WDT to 1, 2, 4, or 8 seconds\n" ifdef TIMEOUT TIMEOUT_CMD = -DWDTTIME=$(TIMEOUT) dummy = FORCE @@ -444,7 +444,7 @@ atmega328_isp: EFUSE ?= FD atmega328_isp: isp #Atmega1280 -HELPTEXT += "target atmega1280 - ATmega1280 (100pin, 128k)\n" +#HELPTEXT += "target atmega1280 - ATmega1280 (100pin, 128k)\n" atmega1280: MCU_TARGET = atmega1280 atmega1280: CFLAGS += $(COMMON_OPTIONS) -DBIGBOOT $(UART_CMD) atmega1280: AVR_FREQ ?= 16000000L diff --git a/optiboot/bootloaders/optiboot/Makefile.extras b/optiboot/bootloaders/optiboot/Makefile.extras index 2dfc582..9706821 100644 --- a/optiboot/bootloaders/optiboot/Makefile.extras +++ b/optiboot/bootloaders/optiboot/Makefile.extras @@ -134,40 +134,3 @@ luminet_isp: LFUSE ?= 62 luminet_isp: EFUSE ?= FE luminet_isp: isp - -HELPTEXT += "target atmega4809 - ATmega4809\n" -atmega4809: TARGET = atmega4809 -atmega4809: PROGRAM = optiboot_x -atmega4809: MCU_TARGET = atmega4809 -atmega4809: CFLAGS += $(COMMON_OPTIONS) -DLED=A7 $(UART_CMD) -DRSTPIN=1 -DTIMEOUT=1 -atmega4809: AVR_FREQ ?= 20000000L -atmega4809: LDSECTIONS = -Wl,--section-start=.text=0 -Wl,--section-start=.version=0x1fe -Wl,--section-start=.postapp=0x200 -atmega4809: $(PROGRAM)_atmega4809.hex -ifndef PRODUCTION -atmega4809: $(PROGRAM)_atmega4809.lst -endif - -HELPTEXT += "target Xplained416 - ATtiny416 Xplained Nano\n" -xplained416: TARGET = attiny416 -xplained416: PROGRAM = optiboot_x -xplained416: MCU_TARGET = attiny416 -xplained416: CFLAGS += $(COMMON_OPTIONS) $(UART_CMD) -DLED_INVERT=1 -DTIMEOUT=8 -xplained416: AVR_FREQ ?= 20000000L -xplained416: LDSECTIONS = -Wl,--section-start=.text=0 -Wl,--section-start=.version=0x1fe -Wl,--section-start=.postapp=0x200 -xplained416: $(PROGRAM)_attiny416.hex -ifndef PRODUCTION -xplained416: $(PROGRAM)_attiny416.lst -endif - -HELPTEXT += "target attiny412 - ATtiny4x2 boards by DrAzzy\n" -attiny412: TARGET = attiny412 -attiny412: PROGRAM = optiboot_x -attiny412: MCU_TARGET = attiny412 -attiny412: CFLAGS += $(COMMON_OPTIONS) $(UART_CMD) -DTIMEOUT=8 -attiny412: AVR_FREQ ?= 20000000L -attiny412: LDSECTIONS = -Wl,--section-start=.text=0 -Wl,--section-start=.version=0x1fe -Wl,--section-start=.postapp=0x200 -attiny412: $(PROGRAM)_attiny412.hex -ifndef PRODUCTION -attiny412: $(PROGRAM)_attiny412.lst -endif -