Re: [PATCH 1/2] imx: Drop unneeded phandle in FIT template

2023-08-29 Thread Tom Rini 
On Wed, Aug 23, 2023 at 07:18:01PM -0600, Simon Glass wrote:

> Adding a phandle to a template node is not allowed, since when the node is
> instantiated multiple times, we end up with duplicate phandles.
> 
> Drop this invalid constructs.
> 
> Signed-off-by: Simon Glass 
> Acked-by: Tim Harvey 

Applied to u-boot/master, thanks!

-- 
Tom


signature.asc
Description: PGP signature

Re: [PATCH 1/2] imx: Drop unneeded phandle in FIT template

2023-08-28 Thread Simon Glass 
Hi Tim,

On Mon, 28 Aug 2023 at 11:33, Tim Harvey  wrote:
>
> On Wed, Aug 23, 2023 at 6:18 PM Simon Glass  wrote:
> >
> > Adding a phandle to a template node is not allowed, since when the node is
> > instantiated multiple times, we end up with duplicate phandles.
> >
> > Drop this invalid constructs.
> >
> > Signed-off-by: Simon Glass 
> > ---
> >
> >  arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi | 2 ++
> >  arch/arm/dts/imx8mm-u-boot.dtsi   | 2 +-
> >  arch/arm/dts/imx8mn-u-boot.dtsi   | 2 +-
> >  arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi| 2 ++
> >  arch/arm/dts/imx8mp-u-boot.dtsi   | 4 ++--
> >  arch/arm/dts/imx8qm-u-boot.dtsi   | 2 +-
> >  arch/arm/dts/k3-am65-iot2050-boot-image.dtsi  | 8 
> >  7 files changed, 13 insertions(+), 9 deletions(-)
> >
> > diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi 
> > b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
> > index 484e31824b85..d93e1cbd8a71 100644
> > --- a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
> > +++ b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
> > @@ -41,9 +41,11 @@
> > };
> >  };
> >
> > +/* This cannot work since it refers to a template node
> >  _configuration {
> > loadables = "atf", "fip";
> >  };
> > +*/
> >
> >   {
> > phy-reset-gpios = < 22 GPIO_ACTIVE_LOW>;
> > diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi 
> > b/arch/arm/dts/imx8mm-u-boot.dtsi
> > index 035282bf0b00..6085128e24ec 100644
> > --- a/arch/arm/dts/imx8mm-u-boot.dtsi
> > +++ b/arch/arm/dts/imx8mm-u-boot.dtsi
> > @@ -140,7 +140,7 @@
> > configurations {
> > default = "@config-DEFAULT-SEQ";
> >
> > -   binman_configuration: @config-SEQ {
> > +   @config-SEQ {
> > description = "NAME";
> > fdt = "fdt-SEQ";
> > firmware = "uboot";
> > diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi 
> > b/arch/arm/dts/imx8mn-u-boot.dtsi
> > index 5046b38e4e29..bc57566a108f 100644
> > --- a/arch/arm/dts/imx8mn-u-boot.dtsi
> > +++ b/arch/arm/dts/imx8mn-u-boot.dtsi
> > @@ -204,7 +204,7 @@
> > configurations {
> > default = "@config-DEFAULT-SEQ";
> >
> > -   binman_configuration: @config-SEQ {
> > +   @config-SEQ {
> > description = "NAME";
> > fdt = "fdt-SEQ";
> > firmware = "uboot";
> > diff --git a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi 
> > b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
> > index f3fb44046d5c..c4ea536b29bb 100644
> > --- a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
> > +++ b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
> > @@ -162,6 +162,8 @@
> > };
> >  };
> >
> > +/* This cannot work since it refers to a template node
> >  _configuration {
> > loadables = "atf", "fip";
> >  };
> > +*/
> > diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi 
> > b/arch/arm/dts/imx8mp-u-boot.dtsi
> > index 36e7444a627b..200938a98072 100644
> > --- a/arch/arm/dts/imx8mp-u-boot.dtsi
> > +++ b/arch/arm/dts/imx8mp-u-boot.dtsi
> > @@ -146,7 +146,7 @@
> > type = "flat_dt";
> > compression = "none";
> >
> > -   uboot_fdt_blob: blob-ext {
> > +   blob-ext {
> > filename = "u-boot.dtb";
> > };
> > };
> > @@ -155,7 +155,7 @@
> > configurations {
> > default = "@config-DEFAULT-SEQ";
> >
> > -   binman_configuration: @config-SEQ {
> > +   @config-SEQ {
> > description = "NAME";
> > fdt = "fdt-SEQ";
> > firmware = "uboot";
> > diff --git a/arch/arm/dts/imx8qm-u-boot.dtsi 
> > b/arch/arm/dts/imx8qm-u-boot.dtsi
> > index a3e0af48109b..d316e869516f 100644
> > --- a/arch/arm/dts/imx8qm-u-boot.dtsi
> > +++ b/arch/arm/dts/imx8qm-u-boot.dtsi
> > @@ -112,7 +112,7 @@
> > configurations {
> > default = "@config-DEFAULT-SEQ";
> >
> > -   binman_configuration: @config-SEQ {
> > +   @config-SEQ {
> > description = "NAME";
> > fdt = "fdt-SEQ";
> > firmware = "uboot";
> > diff --git

Re: [PATCH 1/2] imx: Drop unneeded phandle in FIT template

2023-08-28 Thread Tim Harvey 
On Wed, Aug 23, 2023 at 6:18 PM Simon Glass  wrote:
>
> Adding a phandle to a template node is not allowed, since when the node is
> instantiated multiple times, we end up with duplicate phandles.
>
> Drop this invalid constructs.
>
> Signed-off-by: Simon Glass 
> ---
>
>  arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi | 2 ++
>  arch/arm/dts/imx8mm-u-boot.dtsi   | 2 +-
>  arch/arm/dts/imx8mn-u-boot.dtsi   | 2 +-
>  arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi| 2 ++
>  arch/arm/dts/imx8mp-u-boot.dtsi   | 4 ++--
>  arch/arm/dts/imx8qm-u-boot.dtsi   | 2 +-
>  arch/arm/dts/k3-am65-iot2050-boot-image.dtsi  | 8 
>  7 files changed, 13 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi 
> b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
> index 484e31824b85..d93e1cbd8a71 100644
> --- a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
> @@ -41,9 +41,11 @@
> };
>  };
>
> +/* This cannot work since it refers to a template node
>  _configuration {
> loadables = "atf", "fip";
>  };
> +*/
>
>   {
> phy-reset-gpios = < 22 GPIO_ACTIVE_LOW>;
> diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
> index 035282bf0b00..6085128e24ec 100644
> --- a/arch/arm/dts/imx8mm-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mm-u-boot.dtsi
> @@ -140,7 +140,7 @@
> configurations {
> default = "@config-DEFAULT-SEQ";
>
> -   binman_configuration: @config-SEQ {
> +   @config-SEQ {
> description = "NAME";
> fdt = "fdt-SEQ";
> firmware = "uboot";
> diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi
> index 5046b38e4e29..bc57566a108f 100644
> --- a/arch/arm/dts/imx8mn-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mn-u-boot.dtsi
> @@ -204,7 +204,7 @@
> configurations {
> default = "@config-DEFAULT-SEQ";
>
> -   binman_configuration: @config-SEQ {
> +   @config-SEQ {
> description = "NAME";
> fdt = "fdt-SEQ";
> firmware = "uboot";
> diff --git a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi 
> b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
> index f3fb44046d5c..c4ea536b29bb 100644
> --- a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
> @@ -162,6 +162,8 @@
> };
>  };
>
> +/* This cannot work since it refers to a template node
>  _configuration {
> loadables = "atf", "fip";
>  };
> +*/
> diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi
> index 36e7444a627b..200938a98072 100644
> --- a/arch/arm/dts/imx8mp-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mp-u-boot.dtsi
> @@ -146,7 +146,7 @@
> type = "flat_dt";
> compression = "none";
>
> -   uboot_fdt_blob: blob-ext {
> +   blob-ext {
> filename = "u-boot.dtb";
> };
> };
> @@ -155,7 +155,7 @@
> configurations {
> default = "@config-DEFAULT-SEQ";
>
> -   binman_configuration: @config-SEQ {
> +   @config-SEQ {
> description = "NAME";
> fdt = "fdt-SEQ";
> firmware = "uboot";
> diff --git a/arch/arm/dts/imx8qm-u-boot.dtsi b/arch/arm/dts/imx8qm-u-boot.dtsi
> index a3e0af48109b..d316e869516f 100644
> --- a/arch/arm/dts/imx8qm-u-boot.dtsi
> +++ b/arch/arm/dts/imx8qm-u-boot.dtsi
> @@ -112,7 +112,7 @@
> configurations {
> default = "@config-DEFAULT-SEQ";
>
> -   binman_configuration: @config-SEQ {
> +   @config-SEQ {
> description = "NAME";
> fdt = "fdt-SEQ";
> firmware = "uboot";
> diff --git a/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi 
> b/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi
> index 3ecb461b0110..64318d09cf0a 100644
> --- a/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi
> +++ b/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi
> @@ -41,7 +41,7 @@
> os =

[PATCH 1/2] imx: Drop unneeded phandle in FIT template

2023-08-23 Thread Simon Glass 
Adding a phandle to a template node is not allowed, since when the node is
instantiated multiple times, we end up with duplicate phandles.

Drop this invalid constructs.

Signed-off-by: Simon Glass 
---

 arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi | 2 ++
 arch/arm/dts/imx8mm-u-boot.dtsi   | 2 +-
 arch/arm/dts/imx8mn-u-boot.dtsi   | 2 +-
 arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi| 2 ++
 arch/arm/dts/imx8mp-u-boot.dtsi   | 4 ++--
 arch/arm/dts/imx8qm-u-boot.dtsi   | 2 +-
 arch/arm/dts/k3-am65-iot2050-boot-image.dtsi  | 8 
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi 
b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
index 484e31824b85..d93e1cbd8a71 100644
--- a/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
@@ -41,9 +41,11 @@
};
 };
 
+/* This cannot work since it refers to a template node
 _configuration {
loadables = "atf", "fip";
 };
+*/
 
  {
phy-reset-gpios = < 22 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 035282bf0b00..6085128e24ec 100644
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -140,7 +140,7 @@
configurations {
default = "@config-DEFAULT-SEQ";
 
-   binman_configuration: @config-SEQ {
+   @config-SEQ {
description = "NAME";
fdt = "fdt-SEQ";
firmware = "uboot";
diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi
index 5046b38e4e29..bc57566a108f 100644
--- a/arch/arm/dts/imx8mn-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-u-boot.dtsi
@@ -204,7 +204,7 @@
configurations {
default = "@config-DEFAULT-SEQ";
 
-   binman_configuration: @config-SEQ {
+   @config-SEQ {
description = "NAME";
fdt = "fdt-SEQ";
firmware = "uboot";
diff --git a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi 
b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
index f3fb44046d5c..c4ea536b29bb 100644
--- a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
@@ -162,6 +162,8 @@
};
 };
 
+/* This cannot work since it refers to a template node
 _configuration {
loadables = "atf", "fip";
 };
+*/
diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi
index 36e7444a627b..200938a98072 100644
--- a/arch/arm/dts/imx8mp-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-u-boot.dtsi
@@ -146,7 +146,7 @@
type = "flat_dt";
compression = "none";
 
-   uboot_fdt_blob: blob-ext {
+   blob-ext {
filename = "u-boot.dtb";
};
};
@@ -155,7 +155,7 @@
configurations {
default = "@config-DEFAULT-SEQ";
 
-   binman_configuration: @config-SEQ {
+   @config-SEQ {
description = "NAME";
fdt = "fdt-SEQ";
firmware = "uboot";
diff --git a/arch/arm/dts/imx8qm-u-boot.dtsi b/arch/arm/dts/imx8qm-u-boot.dtsi
index a3e0af48109b..d316e869516f 100644
--- a/arch/arm/dts/imx8qm-u-boot.dtsi
+++ b/arch/arm/dts/imx8qm-u-boot.dtsi
@@ -112,7 +112,7 @@
configurations {
default = "@config-DEFAULT-SEQ";
 
-   binman_configuration: @config-SEQ {
+   @config-SEQ {
description = "NAME";
fdt = "fdt-SEQ";
firmware = "uboot";
diff --git a/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi 
b/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi
index 3ecb461b0110..64318d09cf0a 100644
--- a/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi
+++ b/arch/arm/dts/k3-am65-iot2050-boot-image.dtsi
@@ -41,7 +41,7 @@
os = "arm-trusted-firmware";
load = ;
entry = ;
-   atf: atf-bl31 {
+   atf-bl31 {
};