* [PATCH linux dev-4.10 v2 1/2] ARM: dts: aspeed: Rename aspeed-bmc-opp-flash-layout.dtsi
@ 2017-11-28 19:28 James Feist
2017-11-28 19:28 ` [PATCH linux dev-4.10 v2 2/2] ARM: dts: Add Wfp BMC Machine James Feist
2017-11-29 9:16 ` [PATCH linux dev-4.10 v2 1/2] ARM: dts: aspeed: Rename aspeed-bmc-opp-flash-layout.dtsi Joel Stanley
0 siblings, 2 replies; 6+ messages in thread
From: James Feist @ 2017-11-28 19:28 UTC (permalink / raw)
To: openbmc, joel; +Cc: James Feist
Rename aspeed-bmc-opp-flash-layout.dtsi to openbmc-flash-layout.dtsi
as this file is not open power specific.
Signed-off-by: James Feist <james.feist@linux.intel.com>
---
Changes since v1:
- Added patch 2 that depends on this patch.
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";
+ };
+ };
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH linux dev-4.10 v2 2/2] ARM: dts: Add Wfp BMC Machine
2017-11-28 19:28 [PATCH linux dev-4.10 v2 1/2] ARM: dts: aspeed: Rename aspeed-bmc-opp-flash-layout.dtsi James Feist
@ 2017-11-28 19:28 ` James Feist
2017-11-29 9:20 ` Joel Stanley
2017-11-29 9:16 ` [PATCH linux dev-4.10 v2 1/2] ARM: dts: aspeed: Rename aspeed-bmc-opp-flash-layout.dtsi Joel Stanley
1 sibling, 1 reply; 6+ messages in thread
From: James Feist @ 2017-11-28 19:28 UTC (permalink / raw)
To: openbmc, joel; +Cc: James Feist
Wfp is a Intel system with an Aspeed ast2500 BMC.
Signed-off-by: James Feist <james.feist@linux.intel.com>
---
Changes since V1:
- Fix mac 0 pinctrl and use existing flash layout.
- Add dependency.
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts | 117 +++++++++++++++++++++++++++++
2 files changed, 118 insertions(+)
create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 6d6c9eb..987e23e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -992,6 +992,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb \
aspeed-bmc-opp-lanyang.dtb \
aspeed-bmc-mellanox-msn.dtb \
aspeed-bmc-quanta-q71l.dtb \
+ aspeed-bmc-intel-wfp.dtb \
aspeed-ast2500-evb.dtb
endif
diff --git a/arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts b/arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
new file mode 100644
index 0000000..f15a5e7
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed-bmc-intel-wfp.dts
@@ -0,0 +1,117 @@
+/dts-v1/;
+
+#include "aspeed-g5.dtsi"
+
+/ {
+ model = "WFP BMC";
+ compatible = "intel,wfp-bmc", "aspeed,ast2500";
+
+ aliases {
+ serial4 = &uart5;
+ };
+
+ chosen {
+ stdout-path = &uart5;
+ bootargs = "115200 earlyprintk";
+ };
+
+ memory {
+ reg = <0x80000000 0x20000000>;
+ };
+
+ iio-hwmon {
+ compatible = "iio-hwmon";
+ io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>,
+ <&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>,
+ <&adc 8>, <&adc 9>, <&adc 10>, <&adc 11>,
+ <&adc 12>, <&adc 13>, <&adc 14>, <&adc 15>;
+ };
+
+};
+
+&fmc {
+ status = "okay";
+ flash@0 {
+ status = "okay";
+#include "openbmc-flash-layout.dtsi"
+ };
+};
+
+&spi1 {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_spi1_default>;
+
+ flash@0 {
+ status = "okay";
+ label = "pnor";
+ };
+};
+
+&uart5 {
+ status = "okay";
+};
+
+&mac0 {
+ status = "okay";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_rmii1_default>;
+ use-ncsi;
+};
+
+&mac1 {
+ status = "okay";
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
+};
+
+&i2c1 {
+ status = "okay";
+};
+
+&i2c2 {
+ status = "okay";
+};
+
+&i2c3 {
+ status = "okay";
+};
+
+&i2c4 {
+ status = "okay";
+};
+
+&i2c5 {
+ status = "okay";
+};
+
+&i2c6 {
+ status = "okay";
+};
+
+&i2c7 {
+ status = "okay";
+};
+
+&i2c13 {
+ status = "okay";
+};
+
+&gfx {
+ status = "okay";
+};
+
+&pinctrl {
+ aspeed,external-nodes = <&gfx &lhc>;
+};
+
+&pwm_tacho {
+ status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default
+ &pinctrl_pwm2_default &pinctrl_pwm3_default
+ &pinctrl_pwm4_default &pinctrl_pwm5_default
+ &pinctrl_pwm6_default &pinctrl_pwm7_default>;
+};
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH linux dev-4.10 v2 1/2] ARM: dts: aspeed: Rename aspeed-bmc-opp-flash-layout.dtsi
2017-11-28 19:28 [PATCH linux dev-4.10 v2 1/2] ARM: dts: aspeed: Rename aspeed-bmc-opp-flash-layout.dtsi James Feist
2017-11-28 19:28 ` [PATCH linux dev-4.10 v2 2/2] ARM: dts: Add Wfp BMC Machine James Feist
@ 2017-11-29 9:16 ` Joel Stanley
1 sibling, 0 replies; 6+ messages in thread
From: Joel Stanley @ 2017-11-29 9:16 UTC (permalink / raw)
To: James Feist; +Cc: OpenBMC Maillist
On Wed, Nov 29, 2017 at 5:58 AM, James Feist
<james.feist@linux.intel.com> wrote:
> Rename aspeed-bmc-opp-flash-layout.dtsi to openbmc-flash-layout.dtsi
> as this file is not open power specific.
>
> Signed-off-by: James Feist <james.feist@linux.intel.com>
This one looks okay. I've been flat out working on upstream and our
v4.13 tree, but I will find some time to merge these for you in the
coming days.
> ---
> Changes since v1:
> - Added patch 2 that depends on this patch.
>
> 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";
> + };
> + };
> --
> 2.7.4
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH linux dev-4.10 v2 2/2] ARM: dts: Add Wfp BMC Machine
2017-11-28 19:28 ` [PATCH linux dev-4.10 v2 2/2] ARM: dts: Add Wfp BMC Machine James Feist
@ 2017-11-29 9:20 ` Joel Stanley
2017-11-29 16:59 ` James Feist
0 siblings, 1 reply; 6+ messages in thread
From: Joel Stanley @ 2017-11-29 9:20 UTC (permalink / raw)
To: James Feist, Andrew Jeffery; +Cc: OpenBMC Maillist
On Wed, Nov 29, 2017 at 5:58 AM, James Feist
<james.feist@linux.intel.com> wrote:
> Wfp is a Intel system with an Aspeed ast2500 BMC.
Is WFP an acronym? It would be good to spell it out in the commit message.
Andrew, can you please review the bits of the device tree that you're
familiar with (mostly pinmux)?
> +
> + chosen {
> + stdout-path = &uart5;
> + bootargs = "115200 earlyprintk";
I don't think 115200 will do anything. Can you explain your intent here?
> + };
> +
> + memory {
> + reg = <0x80000000 0x20000000>;
> + };
There's no reserved region for the VGA framebuffer, but you enable the
GFX node below.
With the openbmc u-boot tree the size of the memory is adjusted to
account for the framebuffer at the top of memory, but I was lead to
believe Intel machines use their own u-boot fork.
Cheers,
Joel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH linux dev-4.10 v2 2/2] ARM: dts: Add Wfp BMC Machine
2017-11-29 9:20 ` Joel Stanley
@ 2017-11-29 16:59 ` James Feist
2017-12-08 3:27 ` Joel Stanley
0 siblings, 1 reply; 6+ messages in thread
From: James Feist @ 2017-11-29 16:59 UTC (permalink / raw)
To: Joel Stanley, Andrew Jeffery; +Cc: OpenBMC Maillist
On 11/29/2017 01:20 AM, Joel Stanley wrote:
> On Wed, Nov 29, 2017 at 5:58 AM, James Feist
> <james.feist@linux.intel.com> wrote:
>> Wfp is a Intel system with an Aspeed ast2500 BMC.
>
> Is WFP an acronym? It would be good to spell it out in the commit message.
>
It is not an acronym, it is a short name to describe current generation
Intel boards.
> Andrew, can you please review the bits of the device tree that you're
> familiar with (mostly pinmux)?
>
>
>> +
>> + chosen {
>> + stdout-path = &uart5;
>> + bootargs = "115200 earlyprintk";
>
> I don't think 115200 will do anything. Can you explain your intent here?
Will delete.
>
>> + };
>> +
>> + memory {
>> + reg = <0x80000000 0x20000000>;
>> + };
>
> There's no reserved region for the VGA framebuffer, but you enable the
> GFX node below.
>
> With the openbmc u-boot tree the size of the memory is adjusted to
> account for the framebuffer at the top of memory, but I was lead to
> believe Intel machines use their own u-boot fork.
>
We don't use u-boot, but I will fix this.
> Cheers,
>
> Joel
>
Thanks,
James
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH linux dev-4.10 v2 2/2] ARM: dts: Add Wfp BMC Machine
2017-11-29 16:59 ` James Feist
@ 2017-12-08 3:27 ` Joel Stanley
0 siblings, 0 replies; 6+ messages in thread
From: Joel Stanley @ 2017-12-08 3:27 UTC (permalink / raw)
To: James Feist; +Cc: Andrew Jeffery, OpenBMC Maillist
On Thu, Nov 30, 2017 at 3:29 AM, James Feist
<james.feist@linux.intel.com> wrote:
> On 11/29/2017 01:20 AM, Joel Stanley wrote:
>>
>> On Wed, Nov 29, 2017 at 5:58 AM, James Feist
>> <james.feist@linux.intel.com> wrote:
>>>
>>> Wfp is a Intel system with an Aspeed ast2500 BMC.
>>
>>
>> Is WFP an acronym? It would be good to spell it out in the commit message.
>>
> It is not an acronym, it is a short name to describe current generation
> Intel boards.
Okay. Can you please update the commit message with this information,
and the long name?
Cheers,
Joel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-12-08 3:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-28 19:28 [PATCH linux dev-4.10 v2 1/2] ARM: dts: aspeed: Rename aspeed-bmc-opp-flash-layout.dtsi James Feist
2017-11-28 19:28 ` [PATCH linux dev-4.10 v2 2/2] ARM: dts: Add Wfp BMC Machine James Feist
2017-11-29 9:20 ` Joel Stanley
2017-11-29 16:59 ` James Feist
2017-12-08 3:27 ` Joel Stanley
2017-11-29 9:16 ` [PATCH linux dev-4.10 v2 1/2] ARM: dts: aspeed: Rename aspeed-bmc-opp-flash-layout.dtsi Joel Stanley
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.