Skip to contentSkip to conversation

imx: mkimage_fit_atf: Fix DTC warnings

PATCH New Fabio Estevam 2 participants 2 messages May 7, 2019 – May 8, 2019

Subsystems (3)
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH 1/1 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.

---
 arch/arm/mach-imx/mkimage_fit_atf.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
arch/arm/mach-imx/mkimage_fit_atf.sh +13 -13
index 38c9858e84..fc9342543a 100755
@@ -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
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 imx: mkimage_fit_atf: Fix DTC warnings

Hi Fabio,

Quoted 54 lines

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.

---
 arch/arm/mach-imx/mkimage_fit_atf.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
arch/arm/mach-imx/mkimage_fit_atf.sh +3 -3
index 38c9858e84..fc9342543a 100755
@@ -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";

arch/arm/mach-imx/mkimage_fit_atf.sh cnt=1 · line 93

Quoted 5 lines
arch/arm/mach-imx/mkimage_fit_atf.sh +1 -1
@@ -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.

Quoted 43 lines
arch/arm/mach-imx/mkimage_fit_atf.sh +9 -10
 			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