Rename ec to soc

Use the more generic descriptor as the directory name for
microcontroller support, as is used in other firmware-related projects.

SoC vendor name, which is used to add the correct subdirectory, is now
determined in the general SoC Makefile instead of per-board.

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

Author: crawfxrd

Makefile

@@ -43,15 +43,10 @@ include $(BOARD_DIR)/Makefile.mk
 SRC += $(foreach src, $(board-y), $(BOARD_DIR)/$(src))
 SRC += $(foreach src, $(keyboard-y), $(KEYBOARD_DIR)/$(src))
 
-# The board will define the embedded controller
-# Include the embedded controller's source
-EC_DIR=src/ec/$(EC)
-INCLUDE += $(EC_DIR)/Makefile.mk
-CFLAGS+=-I$(EC_DIR)/include
-include $(EC_DIR)/Makefile.mk
-SRC += $(foreach src, $(ec-y), $(EC_DIR)/$(src))
-
-# The EC will define the architecture
+# The board will define the SoC
+include src/soc/Makefile.mk
+
+# The SoC will define the architecture
 # Include the architecture's source
 ARCH_DIR=src/arch/$(ARCH)
 INCLUDE += $(ARCH_DIR)/Makefile.mk

src/app/main/battery.c

@@ -15,7 +15,7 @@ uint16_t battery_charger_input_current = CHARGER_INPUT_CURRENT;
 #define BATTERY_END_DEFAULT 100
 
 // Flash address to save charging thresholds to
-static const uint32_t BAT_CFG_ADDR = CONFIG_EC_FLASH_SIZE - (2 * 1024);
+static const uint32_t BAT_CFG_ADDR = CONFIG_SOC_FLASH_SIZE - (2 * 1024);
 static const uint16_t BAT_CFG_MAGIC = 0x4254;
 
 struct battery_config {

src/app/main/dgpu.c

@@ -5,7 +5,7 @@
 #include <board/gpio.h>
 #include <common/debug.h>
 #include <common/macro.h>
-#include <ec/i2c.h>
+#include <soc/i2c.h>
 
 int16_t dgpu_temp = 0;
 

src/app/main/espi.c

@@ -6,9 +6,9 @@
 #include <arch/delay.h>
 #include <common/debug.h>
 #include <common/macro.h>
-#include <ec/ecpm.h>
-#include <ec/gctrl.h>
-#include <ec/gpio.h>
+#include <soc/ecpm.h>
+#include <soc/gctrl.h>
+#include <soc/gpio.h>
 
 #include <8051.h>
 #include <stdint.h>

src/app/main/fan.c

@@ -5,7 +5,7 @@
 #include <app/power.h>
 #include <common/debug.h>
 #include <common/macro.h>
-#include <ec/pwm.h>
+#include <soc/pwm.h>
 
 #if CONFIG_PLATFORM_INTEL
 #include <app/peci.h>

src/app/main/flash/main.c

@@ -46,7 +46,7 @@ void flash_write_enable(void);
 void flash_entry(uint32_t addr, uint8_t *data, uint32_t length,
                  uint8_t command) __reentrant __critical {
     // Only allow access from 64 KiB to the end of flash.
-    if ((addr < 0x10000) || (length > 0x10000) || ((addr + length) > CONFIG_EC_FLASH_SIZE))
+    if ((addr < 0x10000) || (length > 0x10000) || ((addr + length) > CONFIG_SOC_FLASH_SIZE))
         return;
 
     if (command == FLASH_COMMAND_READ) {

src/app/main/flash/wrapper.c

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (C) 2020 Evan Lojewski
 
 #include <app/flash.h>
-#include <ec/scratch.h>
+#include <soc/scratch.h>
 #include "include/flash/entry.h"
 #include <stdint.h>
 #include <stddef.h>

src/app/main/include/app/ecpm.h

@@ -3,7 +3,7 @@
 #ifndef _APP_ECPM_H
 #define _APP_ECPM_H
 
-#include <ec/ecpm.h>
+#include <soc/ecpm.h>
 
 void ecpm_init(void);
 

src/app/main/include/app/espi.h

@@ -5,7 +5,7 @@
 
 #include <stdbool.h>
 
-#include <ec/espi.h>
+#include <soc/espi.h>
 
 extern bool espi_host_reset;
 

src/app/main/include/app/gctrl.h

@@ -3,7 +3,7 @@
 #ifndef _APP_GCTRL_H
 #define _APP_GCTRL_H
 
-#include <ec/gctrl.h>
+#include <soc/gctrl.h>
 
 void gctrl_init(void);