mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Robert Karszniewicz <r.karszniewicz@phytec.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] blspec: Allow the "options" key to be given multiple times
Date: Wed, 20 May 2020 13:06:09 +0200	[thread overview]
Message-ID: <20200520110608.GY11869@pengutronix.de> (raw)
In-Reply-To: <1589798255-359359-1-git-send-email-r.karszniewicz@phytec.de>

On Mon, May 18, 2020 at 12:37:35PM +0200, Robert Karszniewicz wrote:
> The Boot Loader Spec says:
> "This key is optional and may appear more than once in which case all
> specified parameters are used in the order they are listed."
> 
> Signed-off-by: Robert Karszniewicz <r.karszniewicz@phytec.de>
> ---
>  common/blspec.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)

Applied, thanks

Sascha

> 
> diff --git a/common/blspec.c b/common/blspec.c
> index 1a6d581..3be26d0 100644
> --- a/common/blspec.c
> +++ b/common/blspec.c
> @@ -298,6 +298,18 @@ static struct blspec_entry *blspec_entry_open(struct bootentries *bootentries,
>  
>  		val = end;
>  
> +		if (!strcmp(name, "options")) {
> +			/* If there was a previous "options" key given, prepend its value
> +			 * (as per spec). */
> +			char *prev_val = blspec_entry_var_get(entry, name);
> +			if (prev_val) {
> +				char *opts = xasprintf("%s %s", prev_val, val);
> +				blspec_entry_var_set(entry, name, opts);
> +				free(opts);
> +				continue;
> +			}
> +		}
> +
>  		blspec_entry_var_set(entry, name, val);
>  	}
>  
> -- 
> 2.7.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
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

      reply	other threads:[~2020-05-20 11:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-18 10:37 Robert Karszniewicz
2020-05-20 11:06 ` 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=20200520110608.GY11869@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=r.karszniewicz@phytec.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