From patchwork Tue Nov 14 19:34:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Feist X-Patchwork-Id: 838004 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ybyQP420Kz9rxm for ; Wed, 15 Nov 2017 06:35:09 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3ybyQP32rrzDqlN for ; Wed, 15 Nov 2017 06:35:09 +1100 (AEDT) X-Original-To: openbmc@lists.ozlabs.org Delivered-To: openbmc@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=linux.intel.com (client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=james.feist@linux.intel.com; receiver=) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 3ybyQG2rbmzDqkr for ; Wed, 15 Nov 2017 06:35:01 +1100 (AEDT) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Nov 2017 11:34:58 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,396,1505804400"; d="scan'208";a="173522249" Received: from skyhawk.jf.intel.com (HELO [10.54.51.84]) ([10.54.51.84]) by orsmga005.jf.intel.com with ESMTP; 14 Nov 2017 11:34:58 -0800 From: James Feist Subject: [PATCH linux dev-4.10 1/1] Rename aspeed-bmc-opp-flash-layout.dtsi To: openbmc@lists.ozlabs.org, joel@jms.id.au Message-ID: <595016cc-32ac-c0fb-43fb-ecfc5cd45989@linux.intel.com> Date: Tue, 14 Nov 2017 11:34:58 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Language: en-US X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "openbmc" Rename aspeed-bmc-opp-flash-layout.dtsi to openbmc-flash-layout.dtsi as this file is not open power specific. Signed-off-by: Feist, James --- arch/arm/boot/dts/aspeed-ast2500-evb.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi | 26 ---------------------- arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 2 +- arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 2 +- arch/arm/boot/dts/openbmc-flash-layout.dtsi | 26 ++++++++++++++++++++++ 13 files changed, 37 insertions(+), 37 deletions(-) delete mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi create mode 100644 arch/arm/boot/dts/openbmc-flash-layout.dtsi diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts index 3543989..d75b2e8 100644 --- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts +++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts @@ -21,7 +21,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts b/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts index d1dc2ef..2d0bc10 100644 --- a/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts +++ b/arch/arm/boot/dts/aspeed-bmc-mellanox-msn.dts @@ -24,7 +24,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts index 6e70ca5..0b7a238 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts @@ -61,7 +61,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts index 93ad3ea..e8e61f7 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts @@ -50,7 +50,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi b/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi deleted file mode 100644 index 4bcfd1b..0000000 --- a/arch/arm/boot/dts/aspeed-bmc-opp-flash-layout.dtsi +++ /dev/null @@ -1,26 +0,0 @@ - label = "bmc"; - partitions { - #address-cells = < 1 >; - #size-cells = < 1 >; - compatible = "fixed-partitions"; - u-boot@0 { - reg = < 0 0x60000 >; - label = "u-boot"; - }; - u-boot-env@60000 { - reg = < 0x60000 0x20000 >; - label = "u-boot-env"; - }; - kernel@80000 { - reg = < 0x80000 0x440000 >; - label = "kernel"; - }; - rofs@0c0000 { - reg = < 0x4c0000 0x1740000 >; - label = "rofs"; - }; - rwfs@1c00000 { - reg = < 0x1c00000 0x400000 >; - label = "rwfs"; - }; - }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts index 95552c8..5e30912 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts @@ -34,7 +34,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts index 833ef17..58f7884 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts @@ -96,7 +96,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts index ab3fee6..b41c29a 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts @@ -65,7 +65,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts index 060eb0c..329532a 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts @@ -114,7 +114,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts index 68058ec..7017984 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts @@ -176,7 +176,7 @@ status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; flash@1 { status = "okay"; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts index 5410f58..5f6a11a 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts @@ -140,7 +140,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts index 7ed3a77..eafd6f9 100644 --- a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts +++ b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts @@ -107,7 +107,7 @@ flash@0 { status = "okay"; m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" +#include "openbmc-flash-layout.dtsi" }; }; diff --git a/arch/arm/boot/dts/openbmc-flash-layout.dtsi b/arch/arm/boot/dts/openbmc-flash-layout.dtsi new file mode 100644 index 0000000..4bcfd1b --- /dev/null +++ b/arch/arm/boot/dts/openbmc-flash-layout.dtsi @@ -0,0 +1,26 @@ + label = "bmc"; + partitions { + #address-cells = < 1 >; + #size-cells = < 1 >; + compatible = "fixed-partitions"; + u-boot@0 { + reg = < 0 0x60000 >; + label = "u-boot"; + }; + u-boot-env@60000 { + reg = < 0x60000 0x20000 >; + label = "u-boot-env"; + }; + kernel@80000 { + reg = < 0x80000 0x440000 >; + label = "kernel"; + }; + rofs@0c0000 { + reg = < 0x4c0000 0x1740000 >; + label = "rofs"; + }; + rwfs@1c00000 { + reg = < 0x1c00000 0x400000 >; + label = "rwfs"; + }; + };