[OE-core] [PATCH] kernel-fitimage: Fix no reg property warning

[Pierre-Jean Texier]

The DT specifications demands a unit-address of a node name to match the "reg"
property in that node. Newer dtc versions will throw warnings if this is
not the case.

Fixes the following warnings:

| <stdout>: Warning (unit_address_vs_reg): Node /images/kernel at 1 has a unit name, but no reg property
| <stdout>: Warning (unit_address_vs_reg): Node /images/kernel at 1/hash at 1 has a unit name, but no reg property
| <stdout>: Warning (unit_address_vs_reg): Node /images/fdt at at91-sama5d27_som1_ek.dtb has a unit name, but no reg property
| <stdout>: Warning (unit_address_vs_reg): Node /images/fdt at at91-sama5d27_som1_ek.dtb/hash at 1 has a unit name, but no reg property
| <stdout>: Warning (unit_address_vs_reg): Node /images/fdt at at91-sama5d27_som1_ek_pda4.dtb has a unit name, but no reg property
| <stdout>: Warning (unit_address_vs_reg): Node /images/fdt at at91-sama5d27_som1_ek_pda4.dtb/hash at 1 has a unit name, but no reg property
| <stdout>: Warning (unit_address_vs_reg): Node /images/fdt at at91-sama5d27_som1_ek_pda7.dtb has a unit name, but no reg property
| <stdout>: Warning (unit_address_vs_reg): Node /images/fdt at at91-sama5d27_som1_ek_pda7.dtb/hash at 1 has a unit name, but no reg property
| <stdout>: Warning (unit_address_vs_reg): Node /images/fdt at at91-sama5d27_som1_ek_pda7b.dtb has a unit name, but no reg property
| <stdout>: Warning (unit_address_vs_reg): Node /images/fdt at at91-sama5d27_som1_ek_pda7b.dtb/hash at 1 has a unit name, but no reg property

Signed-off-by: Pierre-Jean Texier <texier.pj2 at gmail.com>
---
 meta/classes/kernel-fitimage.bbclass | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass
index 50a91e1..491784c 100644
--- a/meta/classes/kernel-fitimage.bbclass
+++ b/meta/classes/kernel-fitimage.bbclass
@@ -109,7 +109,7 @@ fitimage_emit_section_kernel() {
 	fi
 
 	cat << EOF >> ${1}
-                kernel@${2} {
+                kernel-${2} {
                         description = "Linux kernel";
                         data = /incbin/("${3}");
                         type = "kernel";
@@ -118,7 +118,7 @@ fitimage_emit_section_kernel() {
                         compression = "${4}";
                         load = <${UBOOT_LOADADDRESS}>;
                         entry = <${ENTRYPOINT}>;
-                        hash at 1 {
+                        hash-1 {
                                 algo = "${kernel_csum}";
                         };
                 };
@@ -136,13 +136,13 @@ fitimage_emit_section_dtb() {
 	dtb_csum="sha1"
 
 	cat << EOF >> ${1}
-                fdt@${2} {
+                fdt-${2} {
                         description = "Flattened Device Tree blob";
                         data = /incbin/("${3}");
                         type = "flat_dt";
                         arch = "${UBOOT_ARCH}";
                         compression = "none";
-                        hash at 1 {
+                        hash-1 {
                                 algo = "${dtb_csum}";
                         };
                 };
@@ -160,7 +160,7 @@ fitimage_emit_section_setup() {
 	setup_csum="sha1"
 
 	cat << EOF >> ${1}
-                setup@${2} {
+                setup-${2} {
                         description = "Linux setup.bin";
                         data = /incbin/("${3}");
                         type = "x86_setup";
@@ -169,7 +169,7 @@ fitimage_emit_section_setup() {
                         compression = "none";
                         load = <0x00090000>;
                         entry = <0x00090000>;
-                        hash at 1 {
+                        hash-1 {
                                 algo = "${setup_csum}";
                         };
                 };
@@ -215,7 +215,7 @@ fitimage_emit_section_ramdisk() {
 	esac
 
 	cat << EOF >> ${1}
-                ramdisk@${2} {
+                ramdisk-${2} {
                         description = "${INITRAMFS_IMAGE}";
                         data = /incbin/("${3}");
                         type = "ramdisk";
@@ -224,7 +224,7 @@ fitimage_emit_section_ramdisk() {
                         compression = "${ramdisk_ctype}";
                         ${ramdisk_loadline}
                         ${ramdisk_entryline}
-                        hash at 1 {
+                        hash-1 {
                                 algo = "${ramdisk_csum}";
                         };
                 };
@@ -249,7 +249,7 @@ fitimage_emit_section_config() {
 
 	# Test if we have any DTBs at all
 	conf_desc="Linux kernel"
-	kernel_line="kernel = \"kernel@${2}\";"
+	kernel_line="kernel = \"kernel-${2}\";"
 	fdt_line=""
 	ramdisk_line=""
 	setup_line=""
@@ -257,32 +257,32 @@ fitimage_emit_section_config() {
 
 	if [ -n "${3}" ]; then
 		conf_desc="${conf_desc}, FDT blob"
-		fdt_line="fdt = \"fdt@${3}\";"
+		fdt_line="fdt = \"fdt-${3}\";"
 	fi
 
 	if [ -n "${4}" ]; then
 		conf_desc="${conf_desc}, ramdisk"
-		ramdisk_line="ramdisk = \"ramdisk@${4}\";"
+		ramdisk_line="ramdisk = \"ramdisk-${4}\";"
 	fi
 
 	if [ -n "${5}" ]; then
 		conf_desc="${conf_desc}, setup"
-		setup_line="setup = \"setup@${5}\";"
+		setup_line="setup = \"setup-${5}\";"
 	fi
 
 	if [ "${6}" = "1" ]; then
-		default_line="default = \"conf@${3}\";"
+		default_line="default = \"conf-${3}\";"
 	fi
 
 	cat << EOF >> ${1}
                 ${default_line}
-                conf@${3} {
+                conf-${3} {
 			description = "${6} ${conf_desc}";
 			${kernel_line}
 			${fdt_line}
 			${ramdisk_line}
 			${setup_line}
-                        hash at 1 {
+                        hash-1 {
                                 algo = "${conf_csum}";
                         };
 EOF
@@ -306,7 +306,7 @@ EOF
 		sign_line="${sign_line};"
 
 		cat << EOF >> ${1}
-                        signature at 1 {
+                        signature-1 {
                                 algo = "${conf_csum},rsa2048";
                                 key-name-hint = "${conf_sign_keyname}";
 				${sign_line}
-- 
2.7.4