From patchwork Mon Jul 15 02:00:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stewart Smith X-Patchwork-Id: 1131824 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45n6G63k8Gz9sPM for ; Mon, 15 Jul 2019 12:01:34 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 45n6G62wN1zDqVF for ; Mon, 15 Jul 2019 12:01:34 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=stewart@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 45n6FN0KnmzDqTX for ; Mon, 15 Jul 2019 12:00:55 +1000 (AEST) Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x6F1vCRC024885 for ; Sun, 14 Jul 2019 22:00:52 -0400 Received: from e35.co.us.ibm.com (e35.co.us.ibm.com [32.97.110.153]) by mx0b-001b2d01.pphosted.com with ESMTP id 2trasugq81-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sun, 14 Jul 2019 22:00:52 -0400 Received: from localhost by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 15 Jul 2019 03:00:51 +0100 Received: from b03cxnp08028.gho.boulder.ibm.com (9.17.130.20) by e35.co.us.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 15 Jul 2019 03:00:50 +0100 Received: from b03ledav004.gho.boulder.ibm.com (b03ledav004.gho.boulder.ibm.com [9.17.130.235]) by b03cxnp08028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x6F20nso64749906 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 15 Jul 2019 02:00:49 GMT Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9682478064 for ; Mon, 15 Jul 2019 02:00:49 +0000 (GMT) Received: from b03ledav004.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5EFF17805E for ; Mon, 15 Jul 2019 02:00:49 +0000 (GMT) Received: from birb.localdomain (unknown [9.185.142.88]) by b03ledav004.gho.boulder.ibm.com (Postfix) with ESMTP for ; Mon, 15 Jul 2019 02:00:49 +0000 (GMT) Received: by birb.localdomain (Postfix, from userid 1000) id B4C3A563ACC; Mon, 15 Jul 2019 12:00:45 +1000 (AEST) From: Stewart Smith To: skiboot@lists.ozlabs.org Date: Mon, 15 Jul 2019 12:00:44 +1000 X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 19071502-0012-0000-0000-0000174FA00C X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00011430; HX=3.00000242; KW=3.00000007; PH=3.00000004; SC=3.00000286; SDB=6.01232304; UDB=6.00649233; IPR=6.01013606; MB=3.00027718; MTD=3.00000008; XFM=3.00000015; UTC=2019-07-15 02:00:51 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19071502-0013-0000-0000-000058112F8B Message-Id: <20190715020044.8752-1-stewart@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-07-14_08:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=652 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1907150023 Subject: [Skiboot] [PATCH] Move ec/ code to Rhesus platform X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" The embedded controller that Rhesus uses is exclusive to that platform, make it purely part of tha platform Signed-off-by: Stewart Smith --- 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%) 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 #include #include -#include -#include +#include "ec/config.h" +#include "ec/gpio.h" /* * EC GPIO mapping