| Message ID | 20190715020044.8752-1-stewart@linux.ibm.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Move ec/ code to Rhesus platform | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch master (4db38a36b31045f0a116d388ddeac850b38c8680) |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot | success | Test snowpatch/job/snowpatch-skiboot on branch master |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot-dco | success | Signed-off-by present |
On Mon, Jul 15, 2019 at 12:01 PM Stewart Smith <stewart@linux.ibm.com> wrote: > > 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> > --- > hw/Makefile.inc | 1 - > hw/ec/Makefile.inc | 8 -------- > hw/ec/makefile | 8 -------- > platforms/rhesus/Makefile.inc | 2 +- > {include => platforms/rhesus}/ec/config.h | 0 > {include => platforms/rhesus}/ec/gpio.h | 0 > {hw/ec => platforms/rhesus}/gpio.c | 0 > platforms/rhesus/rhesus.c | 4 ++-- > 8 files changed, 3 insertions(+), 20 deletions(-) > delete mode 100644 hw/ec/Makefile.inc > delete mode 100644 hw/ec/makefile > rename {include => platforms/rhesus}/ec/config.h (100%) > rename {include => platforms/rhesus}/ec/gpio.h (100%) > rename {hw/ec => platforms/rhesus}/gpio.c (100%) I always wondered what that stuff was. merged as 067de39aa3334248232ea09d3215ae7055a811f3
diff --git a/hw/Makefile.inc b/hw/Makefile.inc index 0e8c257fb80a..e265bd0deb31 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 f944d4df0831..000000000000 --- 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 e6ceafaf13b0..000000000000 --- 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 3a3fd87e00e0..aa66f6aea72d 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 similarity index 100% rename from include/ec/config.h rename to platforms/rhesus/ec/config.h diff --git a/include/ec/gpio.h b/platforms/rhesus/ec/gpio.h similarity index 100% rename from include/ec/gpio.h rename to platforms/rhesus/ec/gpio.h diff --git a/hw/ec/gpio.c b/platforms/rhesus/gpio.c similarity index 100% rename from hw/ec/gpio.c rename to platforms/rhesus/gpio.c diff --git a/platforms/rhesus/rhesus.c b/platforms/rhesus/rhesus.c index 0571e22d2f18..7a629f7add40 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
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> --- hw/Makefile.inc | 1 - hw/ec/Makefile.inc | 8 -------- hw/ec/makefile | 8 -------- platforms/rhesus/Makefile.inc | 2 +- {include => platforms/rhesus}/ec/config.h | 0 {include => platforms/rhesus}/ec/gpio.h | 0 {hw/ec => platforms/rhesus}/gpio.c | 0 platforms/rhesus/rhesus.c | 4 ++-- 8 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 hw/ec/Makefile.inc delete mode 100644 hw/ec/makefile rename {include => platforms/rhesus}/ec/config.h (100%) rename {include => platforms/rhesus}/ec/gpio.h (100%) rename {hw/ec => platforms/rhesus}/gpio.c (100%)