Merge common EC directories

Split the EC define into base and variant. Merge the 3 ATmega chips as
atmega, and the 2 ITE chips as ite.

Tested that the generated files are identical.

Signed-off-by: Tim Crawford <tcrawford@system76.com>

Makefile

@@ -42,7 +42,7 @@ include $(BOARD_DIR)/board.mk
 EC_DIR=src/ec/$(EC)
 SRC+=$(wildcard $(EC_DIR)/*.c)
 INCLUDE+=$(wildcard $(EC_DIR)/include/ec/*.h) $(EC_DIR)/ec.mk
-CFLAGS+=-I$(EC_DIR)/include -D__EC__=$(EC) -D$(EC)
+CFLAGS+=-I$(EC_DIR)/include -D__EC__=$(EC_VARIANT) -D$(EC_VARIANT)
 include $(EC_DIR)/ec.mk
 
 # The EC will define the architecture

src/arch/avr/arch.mk

@@ -1,12 +1,12 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-CC=avr-gcc -mmcu=$(EC)
+CC=avr-gcc -mmcu=$(EC_VARIANT)
 CFLAGS+=-Os -fstack-usage -Wall -Werror -Wl,--gc-sections -Wl,-u,vfprintf -lprintf_flt
 OBJ=$(sort $(patsubst src/%.c,$(BUILD)/%.o,$(SRC)))
 
 # Run EC rom in simulator
 sim: $(BUILD)/ec.elf
-	simavr $< --mcu $(EC)
+	simavr $< --mcu $(EC_VARIANT)
 
 # Convert from Intel Hex file to binary file
 $(BUILD)/ec.rom: $(BUILD)/ec.ihx

src/board/arduino/mega2560/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=atmega2560
+EC=atmega
+EC_VARIANT=atmega2560
 
 PORT=$(wildcard /dev/ttyACM*)
 CONSOLE_BAUD=1000000
@@ -10,4 +11,4 @@ console:
 	sudo tio -b $(CONSOLE_BAUD) $(PORT)
 
 flash: $(BUILD)/ec.ihx
-	sudo avrdude -v -v -p $(EC) -c wiring -P $(PORT) -b 115200 -D -U flash:w:$<:i
+	sudo avrdude -v -v -p $(EC_VARIANT) -c wiring -P $(PORT) -b 115200 -D -U flash:w:$<:i

src/board/arduino/micro/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=atmega32u4
+EC=atmega
+EC_VARIANT=atmega32u4
 
 PORT=$(wildcard /dev/ttyACM*)
 CONSOLE_BAUD=1000000
@@ -10,4 +11,4 @@ console:
 	sudo tio -b $(CONSOLE_BAUD) $(PORT)
 
 flash: $(BUILD)/ec.ihx
-	sudo avrdude -v -v -p $(EC) -c avr109 -P $(PORT) -b 115200 -D -U flash:w:$<:i
+	sudo avrdude -v -v -p $(EC_VARIANT) -c avr109 -P $(PORT) -b 115200 -D -U flash:w:$<:i

src/board/arduino/uno/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=atmega328p
+EC=atmega
+EC_VARIANT=atmega328p
 
 PORT=$(wildcard /dev/ttyACM*)
 CONSOLE_BAUD=1000000
@@ -10,4 +11,4 @@ console:
 	sudo tio -b $(CONSOLE_BAUD) $(PORT)
 
 flash: $(BUILD)/ec.ihx
-	sudo avrdude -v -v -p $(EC) -c arduino -P $(PORT) -b 115200 -D -U flash:w:$<:i
+	sudo avrdude -v -v -p $(EC_VARIANT) -c arduino -P $(PORT) -b 115200 -D -U flash:w:$<:i

src/board/system76/addw1/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it8587e
+EC=ite
+EC_VARIANT=it8587e
 
 # Include keyboard
 KEYBOARD=15in_102

src/board/system76/addw2/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Include keyboard
 KEYBOARD=15in_102

src/board/system76/bonw14/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Include keyboard
 KEYBOARD=15in_102_nkey

src/board/system76/darp5/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it8587e
+EC=ite
+EC_VARIANT=it8587e
 
 # Include keyboard
 KEYBOARD=15in_102

src/board/system76/darp7/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Enable eSPI
 CFLAGS+=-DEC_ESPI=1

src/board/system76/darp8/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Enable eSPI
 CFLAGS+=-DEC_ESPI=1

src/board/system76/galp3-c/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it8587e
+EC=ite
+EC_VARIANT=it8587e
 
 # Include keyboard
 KEYBOARD=14in_86

src/board/system76/galp5/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Enable eSPI
 CFLAGS+=-DEC_ESPI=1

src/board/system76/galp6/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Enable eSPI
 CFLAGS+=-DEC_ESPI=1

src/board/system76/gaze15/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Include keyboard
 KEYBOARD=15in_102

src/board/system76/gaze16-3050/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Enable eSPI
 CFLAGS+=-DEC_ESPI=1

src/board/system76/gaze16-3060/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Enable eSPI
 CFLAGS+=-DEC_ESPI=1

src/board/system76/gaze17-3050/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Enable eSPI
 CFLAGS+=-DEC_ESPI=1

src/board/system76/gaze17-3060/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Enable eSPI
 CFLAGS+=-DEC_ESPI=1

src/board/system76/lemp10/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Enable eSPI
 CFLAGS+=-DEC_ESPI=1

src/board/system76/lemp11/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Enable eSPI
 CFLAGS+=-DEC_ESPI=1

src/board/system76/lemp9/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Include keyboard
 KEYBOARD=14in_83

src/board/system76/oryp5/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it8587e
+EC=ite
+EC_VARIANT=it8587e
 
 # Include keyboard
 KEYBOARD=15in_102

src/board/system76/oryp6/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Include keyboard
 KEYBOARD=15in_102

src/board/system76/oryp7/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Include keyboard
 KEYBOARD=15in_102

src/board/system76/oryp8/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Enable eSPI
 CFLAGS+=-DEC_ESPI=1

src/board/system76/oryp9/board.mk

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
-EC=it5570e
+EC=ite
+EC_VARIANT=it5570e
 
 # Enable eSPI
 CFLAGS+=-DEC_ESPI=1

src/ec/atmega328p/ec.mk

@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-only
-
-ARCH=avr

src/ec/atmega32u4/ec.mk

@@ -1,3 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-only
-
-ARCH=avr

src/ec/it5570e/ec.mk

@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-only
-
-# SRAM is 6144 bytes, only 4096 bytes are mapped at address 0. Region at
-# 0x0E00-0x1000 is used for AP communication. So this is brought down to 2048,
-# which matches it8587e limits
-SRAM_SIZE=2048
-
-include src/ec/ite/ec.mk

src/ec/it8587e/ec.mk

@@ -1,6 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-only
-
-# SRAM is 4096 bytes, but SRAM at address 2048 is used for scratch ROM
-SRAM_SIZE=2048
-
-include src/ec/ite/ec.mk

src/ec/ite/ec.mk

@@ -1,12 +1,18 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
+ifeq ($(EC_VARIANT), it8587e)
+# SRAM is 4096 bytes, but SRAM at address 2048 is used for scratch ROM
+SRAM_SIZE=2048
+else ifeq ($(EC_VARIANT), it5570e)
+# SRAM is 6144 bytes, only 4096 bytes are mapped at address 0. Region at
+# 0x0E00-0x1000 is used for AP communication. So this is brought down to 2048,
+# which matches it8587e limits
+SRAM_SIZE=2048
+else
+$(error Unsupported EC: $(EC_VARIANT))
+endif
+
 ARCH=8051
 
 # 64 KB is the max without banking
 CODE_SIZE=65536
-
-# Include ITE common source
-EC_ITE_COMMON_DIR=src/ec/ite
-SRC+=$(wildcard $(EC_ITE_COMMON_DIR)/*.c)
-INCLUDE+=$(wildcard $(EC_ITE_COMMON_DIR)/include/ec/*.h) $(EC_ITE_COMMON_DIR)/ec.mk
-CFLAGS+=-I$(EC_ITE_COMMON_DIR)/include