[Skiboot] [PATCH 1/2] FSP: Move all FSP code under platforms/ibm-fsp/

Stewart Smith stewart at linux.ibm.com
Mon Jul 15 12:07:13 AEST 2019 

Signed-off-by: Stewart Smith <stewart at linux.ibm.com>
---
 hw/Makefile.inc                                     | 3 +--
 platforms/ibm-fsp/Makefile.inc                      | 4 +++-
 {hw/fsp => platforms/ibm-fsp/hw}/Makefile.inc       | 6 +++---
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-attn.c         | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-chiptod.c      | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-codeupdate.c   | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-codeupdate.h   | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-console.c      | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-diag.c         | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-dpo.c          | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-dump.c         | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-elog-read.c    | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-elog-write.c   | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-epow.c         | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-epow.h         | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-ipmi.c         | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-leds.c         | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-mdst-table.c   | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-mem-err.c      | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-nvram.c        | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-occ.c          | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-op-panel.c     | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-psi.c          | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-rtc.c          | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-sensor.c       | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-surveillance.c | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp-sysparam.c     | 0
 {hw/fsp => platforms/ibm-fsp/hw}/fsp.c              | 0
 28 files changed, 7 insertions(+), 6 deletions(-)
 rename {hw/fsp => platforms/ibm-fsp/hw}/Makefile.inc (74%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-attn.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-chiptod.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-codeupdate.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-codeupdate.h (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-console.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-diag.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-dpo.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-dump.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-elog-read.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-elog-write.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-epow.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-epow.h (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-ipmi.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-leds.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-mdst-table.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-mem-err.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-nvram.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-occ.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-op-panel.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-psi.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-rtc.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-sensor.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-surveillance.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp-sysparam.c (100%)
 rename {hw/fsp => platforms/ibm-fsp/hw}/fsp.c (100%)

diff --git a/hw/Makefile.inc b/hw/Makefile.inc
index 0e8c257fb80a..6a59651dc5ed 100644
--- a/hw/Makefile.inc
+++ b/hw/Makefile.inc
@@ -12,9 +12,8 @@ HW_OBJS += vas.o sbe-p8.o dio-p9.o
 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
 
-$(HW): $(HW_OBJS:%=hw/%) $(FSP) $(EC) $(AST_BMC) $(IPMI)
+$(HW): $(HW_OBJS:%=hw/%) $(EC) $(AST_BMC) $(IPMI)
diff --git a/platforms/ibm-fsp/Makefile.inc b/platforms/ibm-fsp/Makefile.inc
index 8883f09c1815..c67950d56348 100644
--- a/platforms/ibm-fsp/Makefile.inc
+++ b/platforms/ibm-fsp/Makefile.inc
@@ -4,6 +4,8 @@ IBM_FSP_OBJS = common.o lxvpd.o hostservices.o fsp-vpd.o \
 	       firenze.o firenze-pci.o zz.o
 IBM_FSP = $(PLATDIR)/ibm-fsp/built-in.a
 
+include $(SRC)/$(PLATDIR)/ibm-fsp/hw/Makefile.inc
+
 ifeq ($(CONFIG_FSP),1)
-$(IBM_FSP): $(IBM_FSP_OBJS:%=$(PLATDIR)/ibm-fsp/%)
+$(IBM_FSP): $(IBM_FSP_OBJS:%=$(PLATDIR)/ibm-fsp/%) $(FSP_HW_OBJS)
 endif
diff --git a/hw/fsp/Makefile.inc b/platforms/ibm-fsp/hw/Makefile.inc
similarity index 74%
rename from hw/fsp/Makefile.inc
rename to platforms/ibm-fsp/hw/Makefile.inc
index b078a4d765bd..deeb40ea5e46 100644
--- a/hw/fsp/Makefile.inc
+++ b/platforms/ibm-fsp/hw/Makefile.inc
@@ -1,4 +1,4 @@
-SUBDIRS += hw/fsp
+SUBDIRS += $(PLATDIR)/ibm-fsp/hw
 
 FSP_OBJS  = fsp.o fsp-console.o fsp-rtc.o fsp-nvram.o fsp-sysparam.o
 FSP_OBJS += fsp-surveillance.o fsp-codeupdate.o fsp-sensor.o
@@ -6,8 +6,8 @@ FSP_OBJS += fsp-diag.o fsp-leds.o fsp-mem-err.o fsp-op-panel.o
 FSP_OBJS += fsp-elog-read.o fsp-elog-write.o fsp-epow.o fsp-dpo.o
 FSP_OBJS += fsp-dump.o fsp-mdst-table.o fsp-chiptod.o fsp-ipmi.o
 FSP_OBJS += fsp-attn.o fsp-occ.o fsp-psi.o
-FSP = hw/fsp/built-in.a
+FSP_HW_OBJS = $(PLATDIR)/ibm-fsp/hw/built-in.a
 
 ifeq ($(CONFIG_FSP),1)
-$(FSP): $(FSP_OBJS:%=hw/fsp/%)
+$(FSP_HW_OBJS): $(FSP_OBJS:%=$(PLATDIR)/ibm-fsp/hw/%)
 endif
diff --git a/hw/fsp/fsp-attn.c b/platforms/ibm-fsp/hw/fsp-attn.c
similarity index 100%
rename from hw/fsp/fsp-attn.c
rename to platforms/ibm-fsp/hw/fsp-attn.c
diff --git a/hw/fsp/fsp-chiptod.c b/platforms/ibm-fsp/hw/fsp-chiptod.c
similarity index 100%
rename from hw/fsp/fsp-chiptod.c
rename to platforms/ibm-fsp/hw/fsp-chiptod.c
diff --git a/hw/fsp/fsp-codeupdate.c b/platforms/ibm-fsp/hw/fsp-codeupdate.c
similarity index 100%
rename from hw/fsp/fsp-codeupdate.c
rename to platforms/ibm-fsp/hw/fsp-codeupdate.c
diff --git a/hw/fsp/fsp-codeupdate.h b/platforms/ibm-fsp/hw/fsp-codeupdate.h
similarity index 100%
rename from hw/fsp/fsp-codeupdate.h
rename to platforms/ibm-fsp/hw/fsp-codeupdate.h
diff --git a/hw/fsp/fsp-console.c b/platforms/ibm-fsp/hw/fsp-console.c
similarity index 100%
rename from hw/fsp/fsp-console.c
rename to platforms/ibm-fsp/hw/fsp-console.c
diff --git a/hw/fsp/fsp-diag.c b/platforms/ibm-fsp/hw/fsp-diag.c
similarity index 100%
rename from hw/fsp/fsp-diag.c
rename to platforms/ibm-fsp/hw/fsp-diag.c
diff --git a/hw/fsp/fsp-dpo.c b/platforms/ibm-fsp/hw/fsp-dpo.c
similarity index 100%
rename from hw/fsp/fsp-dpo.c
rename to platforms/ibm-fsp/hw/fsp-dpo.c
diff --git a/hw/fsp/fsp-dump.c b/platforms/ibm-fsp/hw/fsp-dump.c
similarity index 100%
rename from hw/fsp/fsp-dump.c
rename to platforms/ibm-fsp/hw/fsp-dump.c
diff --git a/hw/fsp/fsp-elog-read.c b/platforms/ibm-fsp/hw/fsp-elog-read.c
similarity index 100%
rename from hw/fsp/fsp-elog-read.c
rename to platforms/ibm-fsp/hw/fsp-elog-read.c
diff --git a/hw/fsp/fsp-elog-write.c b/platforms/ibm-fsp/hw/fsp-elog-write.c
similarity index 100%
rename from hw/fsp/fsp-elog-write.c
rename to platforms/ibm-fsp/hw/fsp-elog-write.c
diff --git a/hw/fsp/fsp-epow.c b/platforms/ibm-fsp/hw/fsp-epow.c
similarity index 100%
rename from hw/fsp/fsp-epow.c
rename to platforms/ibm-fsp/hw/fsp-epow.c
diff --git a/hw/fsp/fsp-epow.h b/platforms/ibm-fsp/hw/fsp-epow.h
similarity index 100%
rename from hw/fsp/fsp-epow.h
rename to platforms/ibm-fsp/hw/fsp-epow.h
diff --git a/hw/fsp/fsp-ipmi.c b/platforms/ibm-fsp/hw/fsp-ipmi.c
similarity index 100%
rename from hw/fsp/fsp-ipmi.c
rename to platforms/ibm-fsp/hw/fsp-ipmi.c
diff --git a/hw/fsp/fsp-leds.c b/platforms/ibm-fsp/hw/fsp-leds.c
similarity index 100%
rename from hw/fsp/fsp-leds.c
rename to platforms/ibm-fsp/hw/fsp-leds.c
diff --git a/hw/fsp/fsp-mdst-table.c b/platforms/ibm-fsp/hw/fsp-mdst-table.c
similarity index 100%
rename from hw/fsp/fsp-mdst-table.c
rename to platforms/ibm-fsp/hw/fsp-mdst-table.c
diff --git a/hw/fsp/fsp-mem-err.c b/platforms/ibm-fsp/hw/fsp-mem-err.c
similarity index 100%
rename from hw/fsp/fsp-mem-err.c
rename to platforms/ibm-fsp/hw/fsp-mem-err.c
diff --git a/hw/fsp/fsp-nvram.c b/platforms/ibm-fsp/hw/fsp-nvram.c
similarity index 100%
rename from hw/fsp/fsp-nvram.c
rename to platforms/ibm-fsp/hw/fsp-nvram.c
diff --git a/hw/fsp/fsp-occ.c b/platforms/ibm-fsp/hw/fsp-occ.c
similarity index 100%
rename from hw/fsp/fsp-occ.c
rename to platforms/ibm-fsp/hw/fsp-occ.c
diff --git a/hw/fsp/fsp-op-panel.c b/platforms/ibm-fsp/hw/fsp-op-panel.c
similarity index 100%
rename from hw/fsp/fsp-op-panel.c
rename to platforms/ibm-fsp/hw/fsp-op-panel.c
diff --git a/hw/fsp/fsp-psi.c b/platforms/ibm-fsp/hw/fsp-psi.c
similarity index 100%
rename from hw/fsp/fsp-psi.c
rename to platforms/ibm-fsp/hw/fsp-psi.c
diff --git a/hw/fsp/fsp-rtc.c b/platforms/ibm-fsp/hw/fsp-rtc.c
similarity index 100%
rename from hw/fsp/fsp-rtc.c
rename to platforms/ibm-fsp/hw/fsp-rtc.c
diff --git a/hw/fsp/fsp-sensor.c b/platforms/ibm-fsp/hw/fsp-sensor.c
similarity index 100%
rename from hw/fsp/fsp-sensor.c
rename to platforms/ibm-fsp/hw/fsp-sensor.c
diff --git a/hw/fsp/fsp-surveillance.c b/platforms/ibm-fsp/hw/fsp-surveillance.c
similarity index 100%
rename from hw/fsp/fsp-surveillance.c
rename to platforms/ibm-fsp/hw/fsp-surveillance.c
diff --git a/hw/fsp/fsp-sysparam.c b/platforms/ibm-fsp/hw/fsp-sysparam.c
similarity index 100%
rename from hw/fsp/fsp-sysparam.c
rename to platforms/ibm-fsp/hw/fsp-sysparam.c
diff --git a/hw/fsp/fsp.c b/platforms/ibm-fsp/hw/fsp.c
similarity index 100%
rename from hw/fsp/fsp.c
rename to platforms/ibm-fsp/hw/fsp.c
-- 
2.21.0

More information about the Skiboot mailing list