Newer versions of the device tree compiler (rightfully) complain about
mismatches between attributed node names (name@<addr>) and a missing
reg property in that node.
Adjust the FIT build script for 64-bit Allwinner boards to remove the
bogus addresses from the node names and avoid the warnings.

Signed-off-by: Andre Przywara <andre.przyw...@arm.com>
---
 board/sunxi/mksunxi_fit_atf.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/board/sunxi/mksunxi_fit_atf.sh b/board/sunxi/mksunxi_fit_atf.sh
index b1d6e0e16a..36abe9efed 100755
--- a/board/sunxi/mksunxi_fit_atf.sh
+++ b/board/sunxi/mksunxi_fit_atf.sh
@@ -21,7 +21,7 @@ cat << __HEADER_EOF
        #address-cells = <1>;
 
        images {
-               uboot@1 {
+               uboot {
                        description = "U-Boot (64-bit)";
                        data = /incbin/("u-boot-nodtb.bin");
                        type = "standalone";
@@ -29,7 +29,7 @@ cat << __HEADER_EOF
                        compression = "none";
                        load = <0x4a000000>;
                };
-               atf@1 {
+               atf {
                        description = "ARM Trusted Firmware";
                        data = /incbin/("$BL31");
                        type = "firmware";
@@ -44,7 +44,7 @@ cnt=1
 for dtname in $*
 do
        cat << __FDT_IMAGE_EOF
-               fdt@$cnt {
+               fdt_$cnt {
                        description = "$(basename $dtname .dtb)";
                        data = /incbin/("$dtname");
                        type = "flat_dt";
@@ -57,7 +57,7 @@ done
 cat << __CONF_HEADER_EOF
        };
        configurations {
-               default = "config@1";
+               default = "config_1";
 
 __CONF_HEADER_EOF
 
@@ -65,11 +65,11 @@ cnt=1
 for dtname in $*
 do
        cat << __CONF_SECTION_EOF
-               config@$cnt {
+               config_$cnt {
                        description = "$(basename $dtname .dtb)";
-                       firmware = "uboot@1";
-                       loadables = "atf@1";
-                       fdt = "fdt@$cnt";
+                       firmware = "uboot";
+                       loadables = "atf";
+                       fdt = "fdt_$cnt";
                };
 __CONF_SECTION_EOF
        cnt=$((cnt+1))
-- 
2.14.1

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Reply via email to