[U-Boot] [RESENT PATCH] rockchip: make_fit_atf: fix warning unit_address_vs_reg

[Peter Robinson]

Philipp,

Can we get this one applied to Rockchips too please?

Peter

On Thu, Aug 23, 2018 at 4:01 AM Kever Yang <kever.yang at rock-chips.com> wrote:
>
> Patch fix warning:
> /builddir/BUILD/u-boot-2018.05-rc2/"arch/arm/mach-rockchip/make_fit_atf.py" \
> arch/arm/dts/rk3399-firefly.dtb > u-boot.its
>   ./tools/mkimage  -f u-boot.its -E u-boot.itb >/dev/null  && cat
> /dev/null
> u-boot.itb.tmp: Warning (unit_address_vs_reg): Node /images/uboot at 1
> has a unit name, but no reg property
> u-boot.itb.tmp: Warning (unit_address_vs_reg): Node /images/atf at 1 has
> a unit name, but no reg property
> u-boot.itb.tmp: Warning (unit_address_vs_reg): Node /images/atf at 2 has
> a unit name, but no reg property
> u-boot.itb.tmp: Warning (unit_address_vs_reg): Node /images/atf at 3 has
> a unit name, but no reg property
> u-boot.itb.tmp: Warning (unit_address_vs_reg): Node /images/fdt at 1 has
> a unit name, but no reg property
> u-boot.itb.tmp: Warning (unit_address_vs_reg): Node
> /configurations/config at 1 has a unit name, but no reg property
> make[1]: Leaving directory
> '/builddir/BUILD/u-boot-2018.05-rc2/builds/firefly-rk3399'
>
> Reported-by: Peter Robinson <pbrobinson at gmail.com>
> Signed-off-by: Kever Yang <kever.yang at rock-chips.com>
> ---
>
>  arch/arm/mach-rockchip/make_fit_atf.py | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/mach-rockchip/make_fit_atf.py b/arch/arm/mach-rockchip/make_fit_atf.py
> index 6b3d9201c9..62b9caee34 100755
> --- a/arch/arm/mach-rockchip/make_fit_atf.py
> +++ b/arch/arm/mach-rockchip/make_fit_atf.py
> @@ -34,7 +34,7 @@ DT_HEADER="""// SPDX-License-Identifier: GPL-2.0+ OR X11
>         #address-cells = <1>;
>
>         images {
> -               uboot at 1 {
> +               uboot {
>                         description = "U-Boot (64-bit)";
>                         data = /incbin/("u-boot-nodtb.bin");
>                         type = "standalone";
> @@ -58,7 +58,7 @@ def append_atf_node(file, atf_index, phy_addr):
>      Append ATF DT node to input FIT dts file.
>      """
>      data = 'bl31_0x%08x.bin' % phy_addr
> -    print >> file, '\t\tatf@%d {' % atf_index
> +    print >> file, '\t\tatf_%d {' % atf_index
>      print >> file, '\t\t\tdescription = \"ARM Trusted Firmware\";'
>      print >> file, '\t\t\tdata = /incbin/("%s");' % data
>      print >> file, '\t\t\ttype = "firmware";'
> @@ -78,7 +78,7 @@ def append_fdt_node(file, dtbs):
>      cnt = 1
>      for dtb in dtbs:
>          dtname = os.path.basename(dtb)
> -        print >> file, '\t\tfdt@%d {' % cnt
> +        print >> file, '\t\tfdt_%d {' % cnt
>          print >> file, '\t\t\tdescription = "%s";' % dtname
>          print >> file, '\t\t\tdata = /incbin/("%s");' % dtb
>          print >> file, '\t\t\ttype = "flat_dt";'
> @@ -88,17 +88,17 @@ def append_fdt_node(file, dtbs):
>          cnt = cnt + 1
>
>  def append_conf_section(file, cnt, dtname, atf_cnt):
> -    print >> file, '\t\tconfig@%d {' % cnt
> +    print >> file, '\t\tconfig_%d {' % cnt
>      print >> file, '\t\t\tdescription = "%s";' % dtname
> -    print >> file, '\t\t\tfirmware = "atf at 1";'
> -    print >> file, '\t\t\tloadables = "uboot at 1",',
> +    print >> file, '\t\t\tfirmware = "atf_1";'
> +    print >> file, '\t\t\tloadables = "uboot",',
>      for i in range(1, atf_cnt):
> -        print >> file, '"atf@%d"' % (i+1),
> +        print >> file, '"atf_%d"' % (i+1),
>          if i != (atf_cnt - 1):
>              print >> file, ',',
>          else:
>              print >> file, ';'
> -    print >> file, '\t\t\tfdt = "fdt at 1";'
> +    print >> file, '\t\t\tfdt = "fdt_1";'
>      print >> file, '\t\t};'
>      print >> file, ''
>
> @@ -108,7 +108,7 @@ def append_conf_node(file, dtbs, atf_cnt):
>      """
>      cnt = 1
>      print >> file, '\tconfigurations {'
> -    print >> file, '\t\tdefault = "config at 1";'
> +    print >> file, '\t\tdefault = "config_1";'
>      for dtb in dtbs:
>          dtname = os.path.basename(dtb)
>          append_conf_section(file, cnt, dtname, atf_cnt)
> --
> 2.18.0
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot