[U-Boot] [PATCH] imx: mkimage_fit_atf: Fix DTC warnings

[U-Boot] [PATCH] imx: mkimage_fit_atf: Fix DTC warnings

[Fabio Estevam]

When generating the flash.bin binary the following DTC warnings
are seen:

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/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


Fix them by removing the meaningless @1 entries.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
 arch/arm/mach-imx/mkimage_fit_atf.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh b/arch/arm/mach-imx/mkimage_fit_atf.sh
index 38c9858e84..fc9342543a 100755
--- a/arch/arm/mach-imx/mkimage_fit_atf.sh
+++ b/arch/arm/mach-imx/mkimage_fit_atf.sh
@@ -53,7 +53,7 @@ cat << __HEADER_EOF
 	description = "Configuration to load ATF before U-Boot";
 
 	images {
-		uboot@1 {
+		uboot {
 			description = "U-Boot (64-bit)";
 			data = /incbin/("$BL33");
 			type = "standalone";
@@ -61,7 +61,7 @@ cat << __HEADER_EOF
 			compression = "none";
 			load = <$BL33_LOAD_ADDR>;
 		};
-		atf at 1 {
+		atf {
 			description = "ARM Trusted Firmware";
 			data = /incbin/("$BL31");
 			type = "firmware";
@@ -74,7 +74,7 @@ __HEADER_EOF
 
 if [ -f $BL32 ]; then
 cat << __HEADER_EOF
-		tee at 1 {
+		tee {
 			description = "TEE firmware";
 			data = /incbin/("$BL32");
 			type = "firmware";
@@ -90,7 +90,7 @@ cnt=1
 for dtname in $*
 do
 	cat << __FDT_IMAGE_EOF
-		fdt@$cnt {
+		fdt {
 			description = "$(basename $dtname .dtb)";
 			data = /incbin/("$dtname");
 			type = "flat_dt";
@@ -103,7 +103,7 @@ done
 cat << __CONF_HEADER_EOF
 	};
 	configurations {
-		default = "config at 1";
+		default = "config";
 
 __CONF_HEADER_EOF
 
@@ -112,20 +112,20 @@ for dtname in $*
 do
 if [ -f $BL32 ]; then
 cat << __CONF_SECTION_EOF
-		config@$cnt {
+		config {
 			description = "$(basename $dtname .dtb)";
-			firmware = "uboot at 1";
-			loadables = "atf at 1", "tee at 1";
-			fdt = "fdt@$cnt";
+			firmware = "uboot";
+			loadables = "atf", "tee";
+			fdt = "fdt";
 		};
 __CONF_SECTION_EOF
 else
 cat << __CONF_SECTION1_EOF
-		config@$cnt {
+		config {
 			description = "$(basename $dtname .dtb)";
-			firmware = "uboot at 1";
-			loadables = "atf@1";
-			fdt = "fdt@$cnt";
+			firmware = "uboot";
+			loadables = "atf";
+			fdt = "fdt";
 		};
 __CONF_SECTION1_EOF
 fi
-- 
2.17.1

[U-Boot] [PATCH] imx: mkimage_fit_atf: Fix DTC warnings

[Peng Fan]

Hi Fabio,

> Subject: [PATCH] imx: mkimage_fit_atf: Fix DTC warnings
> 
> When generating the flash.bin binary the following DTC warnings are seen:
> 
> 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/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
> 
> 
> Fix them by removing the meaningless @1 entries.
> 
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> ---
>  arch/arm/mach-imx/mkimage_fit_atf.sh | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh
> b/arch/arm/mach-imx/mkimage_fit_atf.sh
> index 38c9858e84..fc9342543a 100755
> --- a/arch/arm/mach-imx/mkimage_fit_atf.sh
> +++ b/arch/arm/mach-imx/mkimage_fit_atf.sh
> @@ -53,7 +53,7 @@ cat << __HEADER_EOF
>  	description = "Configuration to load ATF before U-Boot";
> 
>  	images {
> -		uboot at 1 {
> +		uboot {
>  			description = "U-Boot (64-bit)";
>  			data = /incbin/("$BL33");
>  			type = "standalone";
> @@ -61,7 +61,7 @@ cat << __HEADER_EOF
>  			compression = "none";
>  			load = <$BL33_LOAD_ADDR>;
>  		};
> -		atf at 1 {
> +		atf {
>  			description = "ARM Trusted Firmware";
>  			data = /incbin/("$BL31");
>  			type = "firmware";
> @@ -74,7 +74,7 @@ __HEADER_EOF
> 
>  if [ -f $BL32 ]; then
>  cat << __HEADER_EOF
> -		tee at 1 {
> +		tee {
>  			description = "TEE firmware";
>  			data = /incbin/("$BL32");
>  			type = "firmware";
> @@ -90,7 +90,7 @@ cnt=1
>  for dtname in $*
>  do
>  	cat << __FDT_IMAGE_EOF
> -		fdt@$cnt {
> +		fdt {

This is not correct. The file is expected to add more than one fdt files.

Regards,
Peng.

>  			description = "$(basename $dtname .dtb)";
>  			data = /incbin/("$dtname");
>  			type = "flat_dt";
> @@ -103,7 +103,7 @@ done
>  cat << __CONF_HEADER_EOF
>  	};
>  	configurations {
> -		default = "config at 1";
> +		default = "config";
> 
>  __CONF_HEADER_EOF
> 
> @@ -112,20 +112,20 @@ for dtname in $*
>  do
>  if [ -f $BL32 ]; then
>  cat << __CONF_SECTION_EOF
> -		config@$cnt {
> +		config {
>  			description = "$(basename $dtname .dtb)";
> -			firmware = "uboot at 1";
> -			loadables = "atf at 1", "tee at 1";
> -			fdt = "fdt@$cnt";
> +			firmware = "uboot";
> +			loadables = "atf", "tee";
> +			fdt = "fdt";
>  		};
>  __CONF_SECTION_EOF
>  else
>  cat << __CONF_SECTION1_EOF
> -		config@$cnt {
> +		config {
>  			description = "$(basename $dtname .dtb)";
> -			firmware = "uboot at 1";
> -			loadables = "atf at 1";
> -			fdt = "fdt@$cnt";
> +			firmware = "uboot";
> +			loadables = "atf";
> +			fdt = "fdt";
>  		};
>  __CONF_SECTION1_EOF
>  fi
> --
> 2.17.1