* [PATCH 1/6] dts: achilles: add state for bootchooser
@ 2018-09-28 10:42 Steffen Trumtrar
2018-09-28 10:42 ` [PATCH 2/6] barebox: move mmc partitions to partitions subnode Steffen Trumtrar
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Steffen Trumtrar @ 2018-09-28 10:42 UTC (permalink / raw)
To: Barebox List; +Cc: Enrico Jorns
From: Enrico Jorns <ejo@pengutronix.de>
Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
arch/arm/dts/socfpga_arria10_achilles.dts | 90 +++++++++++++++++++++++
1 file changed, 90 insertions(+)
diff --git a/arch/arm/dts/socfpga_arria10_achilles.dts b/arch/arm/dts/socfpga_arria10_achilles.dts
index c03982ef5672..fc75afc79516 100644
--- a/arch/arm/dts/socfpga_arria10_achilles.dts
+++ b/arch/arm/dts/socfpga_arria10_achilles.dts
@@ -23,6 +23,7 @@
aliases {
serial0 = &uart0;
+ state = &state;
};
chosen {
@@ -40,6 +41,90 @@
reg = <0x0 0xc0000000>;
};
+ state: state {
+ magic = <0x4d433230>;
+ compatible = "barebox,state";
+ backend-type = "raw";
+ backend = <&state_mmc>;
+ backend-stridesize = <1024>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ bootstate {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ system0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ remaining_attempts {
+ reg = <0x0 0x4>;
+ type = "uint32";
+ default = <3>;
+ };
+ priority {
+ reg = <0x4 0x4>;
+ type = "uint32";
+ default = <20>;
+ };
+ };
+
+ system1 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ remaining_attempts {
+ reg = <0x10 0x4>;
+ type = "uint32";
+ default = <3>;
+ };
+ priority {
+ reg = <0x14 0x4>;
+ type = "uint32";
+ default = <20>;
+ };
+ };
+ factory {
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ remaining_attempts {
+ reg = <0x20 0x4>;
+ type = "uint32";
+ default = <3>;
+ };
+ priority {
+ reg = <0x24 0x4>;
+ type = "uint32";
+ default = <10>;
+ };
+ };
+ last_chosen {
+ reg = <0x2C 0x4>;
+ type = "uint32";
+ };
+ };
+ };
+
+ bootstate: bootstate {
+ compatible = "barebox,bootstate";
+ backend-type = "state"; // or "nv", or "efivar"
+ backend = <&state>;
+
+ system0 {
+ default_attempts = <3>;
+ };
+
+ system1 {
+ default_attempts = <3>;
+ };
+
+ factory {
+ default_attempts = <3>;
+ };
+ };
+
soc {
clkmgr@ffd04000 {
clocks {
@@ -120,6 +205,11 @@
label = "environment";
reg = <0x178000 0x8000>;
};
+
+ state_mmc: partition@180000 {
+ label = "state";
+ reg = <0x180000 0xC00>;
+ };
};
&uart0 {
--
2.19.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/6] barebox: move mmc partitions to partitions subnode
2018-09-28 10:42 [PATCH 1/6] dts: achilles: add state for bootchooser Steffen Trumtrar
@ 2018-09-28 10:42 ` Steffen Trumtrar
2018-09-28 10:42 ` [PATCH 3/6] ARM: socfpga: achilles: move partitions to free disk space Steffen Trumtrar
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Steffen Trumtrar @ 2018-09-28 10:42 UTC (permalink / raw)
To: Barebox List; +Cc: Enrico Jorns
From: Enrico Jorns <ejo@pengutronix.de>
Linux kernel implicitly adds this, thus we have to add them explicitly
to stay compatible
Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
arch/arm/dts/socfpga_arria10_achilles.dts | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/arch/arm/dts/socfpga_arria10_achilles.dts b/arch/arm/dts/socfpga_arria10_achilles.dts
index fc75afc79516..5c08be82d67f 100644
--- a/arch/arm/dts/socfpga_arria10_achilles.dts
+++ b/arch/arm/dts/socfpga_arria10_achilles.dts
@@ -201,14 +201,19 @@
bus-width = <1>;
status = "okay";
- environment_mmc: partition@178000 {
- label = "environment";
- reg = <0x178000 0x8000>;
- };
+ partitions {
+ compatible = "fixed-partitions";
+ #size-cells = <1>;
+ #address-cells = <1>;
+ environment_mmc: partition@178000 {
+ label = "environment";
+ reg = <0x178000 0x8000>;
+ };
- state_mmc: partition@180000 {
- label = "state";
- reg = <0x180000 0xC00>;
+ state_mmc: partition@180000 {
+ label = "state";
+ reg = <0x180000 0xC00>;
+ };
};
};
--
2.19.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/6] ARM: socfpga: achilles: move partitions to free disk space
2018-09-28 10:42 [PATCH 1/6] dts: achilles: add state for bootchooser Steffen Trumtrar
2018-09-28 10:42 ` [PATCH 2/6] barebox: move mmc partitions to partitions subnode Steffen Trumtrar
@ 2018-09-28 10:42 ` Steffen Trumtrar
2018-09-28 10:42 ` [PATCH 4/6] ARM: socfpga: achilles: bitstream will not exceed 32M Steffen Trumtrar
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Steffen Trumtrar @ 2018-09-28 10:42 UTC (permalink / raw)
To: Barebox List; +Cc: Enrico Jorns
From: Enrico Jorns <ejo@pengutronix.de>
Prior to this, environment and state was placed inside the redundant
barbeox copies.
Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
arch/arm/dts/socfpga_arria10_achilles.dts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/socfpga_arria10_achilles.dts b/arch/arm/dts/socfpga_arria10_achilles.dts
index 5c08be82d67f..abf2a7d9f15b 100644
--- a/arch/arm/dts/socfpga_arria10_achilles.dts
+++ b/arch/arm/dts/socfpga_arria10_achilles.dts
@@ -207,12 +207,12 @@
#address-cells = <1>;
environment_mmc: partition@178000 {
label = "environment";
- reg = <0x178000 0x8000>;
+ reg = <0x300000 0x8000>;
};
state_mmc: partition@180000 {
label = "state";
- reg = <0x180000 0xC00>;
+ reg = <0x400000 0x8000>;
};
};
};
--
2.19.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 4/6] ARM: socfpga: achilles: bitstream will not exceed 32M
2018-09-28 10:42 [PATCH 1/6] dts: achilles: add state for bootchooser Steffen Trumtrar
2018-09-28 10:42 ` [PATCH 2/6] barebox: move mmc partitions to partitions subnode Steffen Trumtrar
2018-09-28 10:42 ` [PATCH 3/6] ARM: socfpga: achilles: move partitions to free disk space Steffen Trumtrar
@ 2018-09-28 10:42 ` Steffen Trumtrar
2018-09-28 10:42 ` [PATCH 5/6] ARM: socfpga: achilles: let bootchooser boot from system0 initially Steffen Trumtrar
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Steffen Trumtrar @ 2018-09-28 10:42 UTC (permalink / raw)
To: Barebox List; +Cc: Enrico Jorns
From: Enrico Jorns <ejo@pengutronix.de>
Thus we decrease offsets to save space
Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
arch/arm/boards/reflex-achilles/lowlevel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boards/reflex-achilles/lowlevel.c b/arch/arm/boards/reflex-achilles/lowlevel.c
index 2265aa882b1f..9cedc74e079f 100644
--- a/arch/arm/boards/reflex-achilles/lowlevel.c
+++ b/arch/arm/boards/reflex-achilles/lowlevel.c
@@ -25,7 +25,7 @@
#define BAREBOX3_OFFSET BAREBOX2_OFFSET + SZ_512K
#define BAREBOX4_OFFSET BAREBOX3_OFFSET + SZ_512K
#define BITSTREAM1_OFFSET 0x0
-#define BITSTREAM2_OFFSET BITSTREAM1_OFFSET + SZ_64M
+#define BITSTREAM2_OFFSET BITSTREAM1_OFFSET + SZ_32M
extern char __dtb_socfpga_arria10_achilles_start[];
--
2.19.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 5/6] ARM: socfpga: achilles: let bootchooser boot from system0 initially
2018-09-28 10:42 [PATCH 1/6] dts: achilles: add state for bootchooser Steffen Trumtrar
` (2 preceding siblings ...)
2018-09-28 10:42 ` [PATCH 4/6] ARM: socfpga: achilles: bitstream will not exceed 32M Steffen Trumtrar
@ 2018-09-28 10:42 ` Steffen Trumtrar
2018-09-28 10:42 ` [PATCH 6/6] ARM: dts: socfpga: achilles: enable second ethernet port Steffen Trumtrar
2018-10-02 7:23 ` [PATCH 1/6] dts: achilles: add state for bootchooser Sascha Hauer
5 siblings, 0 replies; 7+ messages in thread
From: Steffen Trumtrar @ 2018-09-28 10:42 UTC (permalink / raw)
To: Barebox List; +Cc: Enrico Jorns
From: Enrico Jorns <ejo@pengutronix.de>
Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
---
arch/arm/dts/socfpga_arria10_achilles.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/dts/socfpga_arria10_achilles.dts b/arch/arm/dts/socfpga_arria10_achilles.dts
index abf2a7d9f15b..908e929d9edf 100644
--- a/arch/arm/dts/socfpga_arria10_achilles.dts
+++ b/arch/arm/dts/socfpga_arria10_achilles.dts
@@ -66,7 +66,7 @@
priority {
reg = <0x4 0x4>;
type = "uint32";
- default = <20>;
+ default = <21>;
};
};
--
2.19.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 6/6] ARM: dts: socfpga: achilles: enable second ethernet port
2018-09-28 10:42 [PATCH 1/6] dts: achilles: add state for bootchooser Steffen Trumtrar
` (3 preceding siblings ...)
2018-09-28 10:42 ` [PATCH 5/6] ARM: socfpga: achilles: let bootchooser boot from system0 initially Steffen Trumtrar
@ 2018-09-28 10:42 ` Steffen Trumtrar
2018-10-02 7:23 ` [PATCH 1/6] dts: achilles: add state for bootchooser Sascha Hauer
5 siblings, 0 replies; 7+ messages in thread
From: Steffen Trumtrar @ 2018-09-28 10:42 UTC (permalink / raw)
To: Barebox List
The Reflex Achilles has 2 ethernet ports. Enable the second one, too.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
---
arch/arm/dts/socfpga_arria10_achilles.dts | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/arch/arm/dts/socfpga_arria10_achilles.dts b/arch/arm/dts/socfpga_arria10_achilles.dts
index 908e929d9edf..176e06df12a5 100644
--- a/arch/arm/dts/socfpga_arria10_achilles.dts
+++ b/arch/arm/dts/socfpga_arria10_achilles.dts
@@ -174,6 +174,27 @@
status = "okay";
};
+&gmac2 {
+ phy-mode = "rgmii";
+ phy-addr = <0x3>;
+
+ status = "okay";
+
+ txd0-skew-ps = <0>; /* -420ps */
+ txd1-skew-ps = <0>; /* -420ps */
+ txd2-skew-ps = <0>; /* -420ps */
+ txd3-skew-ps = <0>; /* -420ps */
+ rxd0-skew-ps = <420>; /* 0ps */
+ rxd1-skew-ps = <420>; /* 0ps */
+ rxd2-skew-ps = <420>; /* 0ps */
+ rxd3-skew-ps = <420>; /* 0ps */
+ txen-skew-ps = <0>; /* -420ps */
+ txc-skew-ps = <1860>; /* 960ps */
+ rxdv-skew-ps = <420>; /* 0ps */
+ rxc-skew-ps = <1680>; /* 780ps */
+ max-frame-size = <3800>;
+};
+
&i2c0 {
status = "okay";
--
2.19.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/6] dts: achilles: add state for bootchooser
2018-09-28 10:42 [PATCH 1/6] dts: achilles: add state for bootchooser Steffen Trumtrar
` (4 preceding siblings ...)
2018-09-28 10:42 ` [PATCH 6/6] ARM: dts: socfpga: achilles: enable second ethernet port Steffen Trumtrar
@ 2018-10-02 7:23 ` Sascha Hauer
5 siblings, 0 replies; 7+ messages in thread
From: Sascha Hauer @ 2018-10-02 7:23 UTC (permalink / raw)
To: Steffen Trumtrar; +Cc: Barebox List, Enrico Jorns
On Fri, Sep 28, 2018 at 12:42:01PM +0200, Steffen Trumtrar wrote:
> From: Enrico Jorns <ejo@pengutronix.de>
>
> Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
> ---
Applied, thanks
Sascha
> arch/arm/dts/socfpga_arria10_achilles.dts | 90 +++++++++++++++++++++++
> 1 file changed, 90 insertions(+)
>
> diff --git a/arch/arm/dts/socfpga_arria10_achilles.dts b/arch/arm/dts/socfpga_arria10_achilles.dts
> index c03982ef5672..fc75afc79516 100644
> --- a/arch/arm/dts/socfpga_arria10_achilles.dts
> +++ b/arch/arm/dts/socfpga_arria10_achilles.dts
> @@ -23,6 +23,7 @@
>
> aliases {
> serial0 = &uart0;
> + state = &state;
> };
>
> chosen {
> @@ -40,6 +41,90 @@
> reg = <0x0 0xc0000000>;
> };
>
> + state: state {
> + magic = <0x4d433230>;
> + compatible = "barebox,state";
> + backend-type = "raw";
> + backend = <&state_mmc>;
> + backend-stridesize = <1024>;
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + bootstate {
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + system0 {
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + remaining_attempts {
> + reg = <0x0 0x4>;
> + type = "uint32";
> + default = <3>;
> + };
> + priority {
> + reg = <0x4 0x4>;
> + type = "uint32";
> + default = <20>;
> + };
> + };
> +
> + system1 {
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + remaining_attempts {
> + reg = <0x10 0x4>;
> + type = "uint32";
> + default = <3>;
> + };
> + priority {
> + reg = <0x14 0x4>;
> + type = "uint32";
> + default = <20>;
> + };
> + };
> + factory {
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + remaining_attempts {
> + reg = <0x20 0x4>;
> + type = "uint32";
> + default = <3>;
> + };
> + priority {
> + reg = <0x24 0x4>;
> + type = "uint32";
> + default = <10>;
> + };
> + };
> + last_chosen {
> + reg = <0x2C 0x4>;
> + type = "uint32";
> + };
> + };
> + };
> +
> + bootstate: bootstate {
> + compatible = "barebox,bootstate";
> + backend-type = "state"; // or "nv", or "efivar"
> + backend = <&state>;
> +
> + system0 {
> + default_attempts = <3>;
> + };
> +
> + system1 {
> + default_attempts = <3>;
> + };
> +
> + factory {
> + default_attempts = <3>;
> + };
> + };
> +
> soc {
> clkmgr@ffd04000 {
> clocks {
> @@ -120,6 +205,11 @@
> label = "environment";
> reg = <0x178000 0x8000>;
> };
> +
> + state_mmc: partition@180000 {
> + label = "state";
> + reg = <0x180000 0xC00>;
> + };
> };
>
> &uart0 {
> --
> 2.19.0
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-10-02 7:23 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-28 10:42 [PATCH 1/6] dts: achilles: add state for bootchooser Steffen Trumtrar
2018-09-28 10:42 ` [PATCH 2/6] barebox: move mmc partitions to partitions subnode Steffen Trumtrar
2018-09-28 10:42 ` [PATCH 3/6] ARM: socfpga: achilles: move partitions to free disk space Steffen Trumtrar
2018-09-28 10:42 ` [PATCH 4/6] ARM: socfpga: achilles: bitstream will not exceed 32M Steffen Trumtrar
2018-09-28 10:42 ` [PATCH 5/6] ARM: socfpga: achilles: let bootchooser boot from system0 initially Steffen Trumtrar
2018-09-28 10:42 ` [PATCH 6/6] ARM: dts: socfpga: achilles: enable second ethernet port Steffen Trumtrar
2018-10-02 7:23 ` [PATCH 1/6] dts: achilles: add state for bootchooser Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox