mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Cc: Barebox List <barebox@lists.infradead.org>,
	Enrico Jorns <ejo@pengutronix.de>
Subject: Re: [PATCH 1/6] dts: achilles: add state for bootchooser
Date: Tue, 2 Oct 2018 09:23:16 +0200	[thread overview]
Message-ID: <20181002072316.rmwwor5i2tdfrzyv@pengutronix.de> (raw)
In-Reply-To: <20180928104206.17764-1-s.trumtrar@pengutronix.de>

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

      parent reply	other threads:[~2018-10-02  7:23 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-28 10:42 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 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181002072316.rmwwor5i2tdfrzyv@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=ejo@pengutronix.de \
    --cc=s.trumtrar@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox