public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] doc: fitImage: Fix conf number incrementation
@ 2019-07-15 14:29 Mickaël Tansorier
  0 siblings, 0 replies; 3+ messages in thread
From: Mickaël Tansorier @ 2019-07-15 14:29 UTC (permalink / raw)
  To: u-boot

Increment conf id to avoid to have two same conf name
into one configuration description.

Signed-off-by: Mickaël Tansorier <mickael.tansorier@smile.fr>
---
 doc/uImage.FIT/signature.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/uImage.FIT/signature.txt b/doc/uImage.FIT/signature.txt
index 78b59e7203..27bcbef5d6 100644
--- a/doc/uImage.FIT/signature.txt
+++ b/doc/uImage.FIT/signature.txt
@@ -216,7 +216,7 @@ As an example, consider this FIT:
 			kernel = "kernel-1";
 			fdt = "fdt-1";
 		};
-		conf-1 {
+		conf-2 {
 			kernel = "kernel-2";
 			fdt = "fdt-2";
 		};
@@ -232,7 +232,7 @@ configuration 3 with kernel 1 and fdt 2:
 			kernel = "kernel-1";
 			fdt = "fdt-1";
 		};
-		conf-1 {
+		conf-2 {
 			kernel = "kernel-2";
 			fdt = "fdt-2";
 		};
-- 
2.22.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [U-Boot] [PATCH] doc: fitImage: Fix conf number incrementation
@ 2019-07-17 15:57 Mickaël Tansorier
  2019-07-24 20:07 ` Tom Rini
  0 siblings, 1 reply; 3+ messages in thread
From: Mickaël Tansorier @ 2019-07-17 15:57 UTC (permalink / raw)
  To: u-boot

Increment conf id to avoid to have two same conf name
into one configuration description.

Signed-off-by: Mickaël Tansorier <mickael.tansorier@smile.fr>
---
 doc/uImage.FIT/signature.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/uImage.FIT/signature.txt b/doc/uImage.FIT/signature.txt
index 78b59e7203..27bcbef5d6 100644
--- a/doc/uImage.FIT/signature.txt
+++ b/doc/uImage.FIT/signature.txt
@@ -216,7 +216,7 @@ As an example, consider this FIT:
 			kernel = "kernel-1";
 			fdt = "fdt-1";
 		};
-		conf-1 {
+		conf-2 {
 			kernel = "kernel-2";
 			fdt = "fdt-2";
 		};
@@ -232,7 +232,7 @@ configuration 3 with kernel 1 and fdt 2:
 			kernel = "kernel-1";
 			fdt = "fdt-1";
 		};
-		conf-1 {
+		conf-2 {
 			kernel = "kernel-2";
 			fdt = "fdt-2";
 		};
-- 
2.22.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [U-Boot] [PATCH] doc: fitImage: Fix conf number incrementation
  2019-07-17 15:57 [U-Boot] [PATCH] doc: fitImage: Fix conf number incrementation Mickaël Tansorier
@ 2019-07-24 20:07 ` Tom Rini
  0 siblings, 0 replies; 3+ messages in thread
From: Tom Rini @ 2019-07-24 20:07 UTC (permalink / raw)
  To: u-boot

On Wed, Jul 17, 2019 at 05:57:16PM +0200, Mickaël Tansorier wrote:

> Increment conf id to avoid to have two same conf name
> into one configuration description.
> 
> Signed-off-by: Mickaël Tansorier <mickael.tansorier@smile.fr>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190724/77b9e550/attachment.sig>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-07-24 20:07 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-17 15:57 [U-Boot] [PATCH] doc: fitImage: Fix conf number incrementation Mickaël Tansorier
2019-07-24 20:07 ` Tom Rini
  -- strict thread matches above, loose matches on Subject: below --
2019-07-15 14:29 Mickaël Tansorier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox