diff options
| author | Stewart Smith <stewart@linux.ibm.com> | 2019-07-15 12:00:44 +1000 |
|---|---|---|
| committer | Oliver O'Halloran <oohall@gmail.com> | 2019-07-19 17:46:22 +1000 |
| commit | 067de39aa3334248232ea09d3215ae7055a811f3 (patch) | |
| tree | db26b27f4d4a0e43a90cd325319c7c801bfbf43f | |
| parent | 1a02a18937c0d331ebc6c599d95e7df54d556aa0 (diff) | |
| download | skiboot-067de39aa3334248232ea09d3215ae7055a811f3.zip skiboot-067de39aa3334248232ea09d3215ae7055a811f3.tar.gz skiboot-067de39aa3334248232ea09d3215ae7055a811f3.tar.bz2 | |
Move ec/ code to Rhesus platform
The embedded controller that Rhesus uses is exclusive to that platform,
make it purely part of tha platform
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
| -rw-r--r-- | hw/Makefile.inc | 1 | ||||
| -rw-r--r-- | hw/ec/Makefile.inc | 8 | ||||
| -rw-r--r-- | hw/ec/makefile | 8 | ||||
| -rw-r--r-- | platforms/rhesus/Makefile.inc | 2 | ||||
| -rw-r--r-- | platforms/rhesus/ec/config.h (renamed from include/ec/config.h) | 0 | ||||
| -rw-r--r-- | platforms/rhesus/ec/gpio.h (renamed from include/ec/gpio.h) | 0 | ||||
| -rw-r--r-- | platforms/rhesus/gpio.c (renamed from hw/ec/gpio.c) | 0 | ||||
| -rw-r--r-- | platforms/rhesus/rhesus.c | 4 |
8 files changed, 3 insertions, 20 deletions
diff --git a/hw/Makefile.inc b/hw/Makefile.inc index 0e8c257..e265bd0 100644 --- a/hw/Makefile.inc +++ b/hw/Makefile.inc @@ -13,7 +13,6 @@ HW_OBJS += lpc-port80h.o HW=hw/built-in.a include $(SRC)/hw/fsp/Makefile.inc -include $(SRC)/hw/ec/Makefile.inc include $(SRC)/hw/ast-bmc/Makefile.inc include $(SRC)/hw/ipmi/Makefile.inc diff --git a/hw/ec/Makefile.inc b/hw/ec/Makefile.inc deleted file mode 100644 index f944d4d..0000000 --- a/hw/ec/Makefile.inc +++ /dev/null @@ -1,8 +0,0 @@ -# -*-Makefile-*- -# Sapphire EC makefile - -SUBDIRS += hw/ec -EC_OBJS = gpio.o -EC=hw/ec/built-in.a - -$(EC): $(EC_OBJS:%=hw/ec/%) diff --git a/hw/ec/makefile b/hw/ec/makefile deleted file mode 100644 index e6ceafa..0000000 --- a/hw/ec/makefile +++ /dev/null @@ -1,8 +0,0 @@ -ROOTPATH = ../../.. -MODULE = ec - -OBJS = cmosdd.o gpio.o rhesus.o hostboot.o - -SUBDIRS = test.d - -include ${ROOTPATH}/config.mk diff --git a/platforms/rhesus/Makefile.inc b/platforms/rhesus/Makefile.inc index 3a3fd87..aa66f6a 100644 --- a/platforms/rhesus/Makefile.inc +++ b/platforms/rhesus/Makefile.inc @@ -1,6 +1,6 @@ SUBDIRS += $(PLATDIR)/rhesus -RHESUS_OBJS = rhesus.o +RHESUS_OBJS = rhesus.o gpio.o RHESUS = $(PLATDIR)/rhesus/built-in.a $(RHESUS): $(RHESUS_OBJS:%=$(PLATDIR)/rhesus/%) diff --git a/include/ec/config.h b/platforms/rhesus/ec/config.h index 201ccac..201ccac 100644 --- a/include/ec/config.h +++ b/platforms/rhesus/ec/config.h diff --git a/include/ec/gpio.h b/platforms/rhesus/ec/gpio.h index 82a9343..82a9343 100644 --- a/include/ec/gpio.h +++ b/platforms/rhesus/ec/gpio.h diff --git a/hw/ec/gpio.c b/platforms/rhesus/gpio.c index 0a2223d..0a2223d 100644 --- a/hw/ec/gpio.c +++ b/platforms/rhesus/gpio.c diff --git a/platforms/rhesus/rhesus.c b/platforms/rhesus/rhesus.c index 0571e22..7a629f7 100644 --- a/platforms/rhesus/rhesus.c +++ b/platforms/rhesus/rhesus.c @@ -25,8 +25,8 @@ #include <libflash/libffs.h> #include <libflash/blocklevel.h> #include <sfc-ctrl.h> -#include <ec/config.h> -#include <ec/gpio.h> +#include "ec/config.h" +#include "ec/gpio.h" /* * EC GPIO mapping |