From 679c37aa8de55ae28fc4ff13b2dd45d3905e0c0b Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Tue, 13 Jul 2021 14:38:33 -0600 Subject: [PATCH] src/device: Remove DEVICE_PATH_ESPI & DEVICE_PATH_LPC The ESPI & LPC keywords were added for the zork program, but it was found that they weren't needed, so they were never used. The previous patch removes them from sconfig, so now they aren't needed in coreboot. BUG=None TEST=Build Signed-off-by: Martin Roth Change-Id: I9ae7817bb63d69ee272103b2d1186f125e188950 Reviewed-on: https://review.coreboot.org/c/coreboot/+/56278 Reviewed-by: Raul Rangel Reviewed-by: Felix Held Tested-by: build bot (Jenkins) --- src/device/device_const.c | 6 ------ src/device/device_util.c | 8 -------- src/include/device/path.h | 14 -------------- 3 files changed, 28 deletions(-) diff --git a/src/device/device_const.c b/src/device/device_const.c index 7e7f2f1980..92bae37930 100644 --- a/src/device/device_const.c +++ b/src/device/device_const.c @@ -157,12 +157,6 @@ static int path_eq(const struct device_path *path1, case DEVICE_PATH_MMIO: equal = (path1->mmio.addr == path2->mmio.addr); break; - case DEVICE_PATH_ESPI: - equal = (path1->espi.addr == path2->espi.addr); - break; - case DEVICE_PATH_LPC: - equal = (path1->lpc.addr == path2->lpc.addr); - break; case DEVICE_PATH_GPIO: equal = (path1->gpio.id == path2->gpio.id); break; diff --git a/src/device/device_util.c b/src/device/device_util.c index 8ee8afce27..9e71287342 100644 --- a/src/device/device_util.c +++ b/src/device/device_util.c @@ -218,14 +218,6 @@ const char *dev_path(const struct device *dev) snprintf(buffer, sizeof(buffer), "MMIO: %08lx", dev->path.mmio.addr); break; - case DEVICE_PATH_ESPI: - snprintf(buffer, sizeof(buffer), "ESPI: %08lx", - dev->path.espi.addr); - break; - case DEVICE_PATH_LPC: - snprintf(buffer, sizeof(buffer), "LPC: %08lx", - dev->path.lpc.addr); - break; case DEVICE_PATH_GPIO: snprintf(buffer, sizeof(buffer), "GPIO: %d", dev->path.gpio.id); break; diff --git a/src/include/device/path.h b/src/include/device/path.h index 0cdb997726..934d3b354d 100644 --- a/src/include/device/path.h +++ b/src/include/device/path.h @@ -19,8 +19,6 @@ enum device_path_type { DEVICE_PATH_SPI, DEVICE_PATH_USB, DEVICE_PATH_MMIO, - DEVICE_PATH_ESPI, - DEVICE_PATH_LPC, DEVICE_PATH_GPIO, /* @@ -45,8 +43,6 @@ enum device_path_type { "DEVICE_PATH_SPI", \ "DEVICE_PATH_USB", \ "DEVICE_PATH_MMIO", \ - "DEVICE_PATH_ESPI", \ - "DEVICE_PATH_LPC", \ "DEVICE_PATH_GPIO", \ } @@ -110,14 +106,6 @@ struct mmio_path { uintptr_t addr; }; -struct espi_path { - uintptr_t addr; -}; - -struct lpc_path { - uintptr_t addr; -}; - struct gpio_path { unsigned int id; }; @@ -138,8 +126,6 @@ struct device_path { struct spi_path spi; struct usb_path usb; struct mmio_path mmio; - struct espi_path espi; - struct lpc_path lpc; struct gpio_path gpio; }; };