<div dir="ltr"><div dir="ltr"><div dir="ltr">Hi Alex,<div><br></div><div class="gmail_quote"><div dir="ltr">Le jeu. 30 août 2018 à 07:58, Alex Kiernan <<a href="mailto:alex.kiernan@gmail.com" target="_blank">alex.kiernan@gmail.com</a>> a écrit :<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Wed, Aug 29, 2018 at 11:59 PM Pierre-Jean Texier<br>
<<a href="mailto:texier.pj2@gmail.com" target="_blank">texier.pj2@gmail.com</a>> wrote:<br>
><br>
> The DT specifications demands a unit-address of a node name to match the "reg"<br>
> property in that node. Newer dtc versions will throw warnings if this is<br>
> not the case.<br>
><br>
> Fixes the following warnings:<br>
><br>
> | <stdout>: Warning (unit_address_vs_reg): Node /images/kernel@1 has a unit name, but no reg property<br>
> | <stdout>: Warning (unit_address_vs_reg): Node /images/kernel@1/hash@1 has a unit name, but no reg property<br>
> | <stdout>: Warning (unit_address_vs_reg): Node /images/fdt@at91-sama5d27_som1_ek.dtb has a unit name, but no reg property<br>
> | <stdout>: Warning (unit_address_vs_reg): Node /images/fdt@at91-sama5d27_som1_ek.dtb/hash@1 has a unit name, but no reg property<br>
> | <stdout>: Warning (unit_address_vs_reg): Node /images/fdt@at91-sama5d27_som1_ek_pda4.dtb has a unit name, but no reg property<br>
> | <stdout>: Warning (unit_address_vs_reg): Node /images/fdt@at91-sama5d27_som1_ek_pda4.dtb/hash@1 has a unit name, but no reg property<br>
> | <stdout>: Warning (unit_address_vs_reg): Node /images/fdt@at91-sama5d27_som1_ek_pda7.dtb has a unit name, but no reg property<br>
> | <stdout>: Warning (unit_address_vs_reg): Node /images/fdt@at91-sama5d27_som1_ek_pda7.dtb/hash@1 has a unit name, but no reg property<br>
> | <stdout>: Warning (unit_address_vs_reg): Node /images/fdt@at91-sama5d27_som1_ek_pda7b.dtb has a unit name, but no reg property<br>
> | <stdout>: Warning (unit_address_vs_reg): Node /images/fdt@at91-sama5d27_som1_ek_pda7b.dtb/hash@1 has a unit name, but no reg property<br>
><br>
> Signed-off-by: Pierre-Jean Texier <<a href="mailto:texier.pj2@gmail.com" target="_blank">texier.pj2@gmail.com</a>><br>
<br>
This strikes me as a bad idea... it breaks existing boot<br>
configurations as it changes the name that has to be selected by<br>
U-Boot.<br>
<br></blockquote><div><br></div><div><div>Thanks for your comment,</div><div>In fact, this patch is based on <a href="https://patchwork.ozlabs.org/patch/844054/" target="_blank">https://patchwork.ozlabs.org/patch/844054/</a></div></div><div><br></div><div>/Pierre-Jean</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
> ---<br>
> Changes in V2:<br>
> - rebase on master<br>
><br>
> meta/classes/kernel-fitimage.bbclass | 32 ++++++++++++++++----------------<br>
> 1 file changed, 16 insertions(+), 16 deletions(-)<br>
><br>
> diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass<br>
> index a4d7aca..3d7800a 100644<br>
> --- a/meta/classes/kernel-fitimage.bbclass<br>
> +++ b/meta/classes/kernel-fitimage.bbclass<br>
> @@ -109,7 +109,7 @@ fitimage_emit_section_kernel() {<br>
> fi<br>
><br>
> cat << EOF >> ${1}<br>
> - kernel@${2} {<br>
> + kernel-${2} {<br>
> description = "Linux kernel";<br>
> data = /incbin/("${3}");<br>
> type = "kernel";<br>
> @@ -118,7 +118,7 @@ fitimage_emit_section_kernel() {<br>
> compression = "${4}";<br>
> load = <${UBOOT_LOADADDRESS}>;<br>
> entry = <${ENTRYPOINT}>;<br>
> - hash@1 {<br>
> + hash-1 {<br>
> algo = "${kernel_csum}";<br>
> };<br>
> };<br>
> @@ -145,14 +145,14 @@ fitimage_emit_section_dtb() {<br>
> dtb_loadline="load = <${UBOOT_DTB_LOADADDRESS}>;"<br>
> fi<br>
> cat << EOF >> ${1}<br>
> - fdt@${2} {<br>
> + fdt-${2} {<br>
> description = "Flattened Device Tree blob";<br>
> data = /incbin/("${3}");<br>
> type = "flat_dt";<br>
> arch = "${UBOOT_ARCH}";<br>
> compression = "none";<br>
> ${dtb_loadline}<br>
> - hash@1 {<br>
> + hash-1 {<br>
> algo = "${dtb_csum}";<br>
> };<br>
> };<br>
> @@ -170,7 +170,7 @@ fitimage_emit_section_setup() {<br>
> setup_csum="sha1"<br>
><br>
> cat << EOF >> ${1}<br>
> - setup@${2} {<br>
> + setup-${2} {<br>
> description = "Linux setup.bin";<br>
> data = /incbin/("${3}");<br>
> type = "x86_setup";<br>
> @@ -179,7 +179,7 @@ fitimage_emit_section_setup() {<br>
> compression = "none";<br>
> load = <0x00090000>;<br>
> entry = <0x00090000>;<br>
> - hash@1 {<br>
> + hash-1 {<br>
> algo = "${setup_csum}";<br>
> };<br>
> };<br>
> @@ -225,7 +225,7 @@ fitimage_emit_section_ramdisk() {<br>
> esac<br>
><br>
> cat << EOF >> ${1}<br>
> - ramdisk@${2} {<br>
> + ramdisk-${2} {<br>
> description = "${INITRAMFS_IMAGE}";<br>
> data = /incbin/("${3}");<br>
> type = "ramdisk";<br>
> @@ -234,7 +234,7 @@ fitimage_emit_section_ramdisk() {<br>
> compression = "${ramdisk_ctype}";<br>
> ${ramdisk_loadline}<br>
> ${ramdisk_entryline}<br>
> - hash@1 {<br>
> + hash-1 {<br>
> algo = "${ramdisk_csum}";<br>
> };<br>
> };<br>
> @@ -269,39 +269,39 @@ fitimage_emit_section_config() {<br>
> if [ -n "${2}" ]; then<br>
> conf_desc="Linux kernel"<br>
> sep=", "<br>
> - kernel_line="kernel = \"kernel@${2}\";"<br>
> + kernel_line="kernel = \"kernel-${2}\";"<br>
> fi<br>
><br>
> if [ -n "${3}" ]; then<br>
> conf_desc="${conf_desc}${sep}FDT blob"<br>
> sep=", "<br>
> - fdt_line="fdt = \"fdt@${3}\";"<br>
> + fdt_line="fdt = \"fdt-${3}\";"<br>
> fi<br>
><br>
> if [ -n "${4}" ]; then<br>
> conf_desc="${conf_desc}${sep}ramdisk"<br>
> sep=", "<br>
> - ramdisk_line="ramdisk = \"ramdisk@${4}\";"<br>
> + ramdisk_line="ramdisk = \"ramdisk-${4}\";"<br>
> fi<br>
><br>
> if [ -n "${5}" ]; then<br>
> conf_desc="${conf_desc}${sep}setup"<br>
> - setup_line="setup = \"setup@${5}\";"<br>
> + setup_line="setup = \"setup-${5}\";"<br>
> fi<br>
><br>
> if [ "${6}" = "1" ]; then<br>
> - default_line="default = \"conf@${3}\";"<br>
> + default_line="default = \"conf-${3}\";"<br>
> fi<br>
><br>
> cat << EOF >> ${1}<br>
> ${default_line}<br>
> - conf@${3} {<br>
> + conf-${3} {<br>
> description = "${6} ${conf_desc}";<br>
> ${kernel_line}<br>
> ${fdt_line}<br>
> ${ramdisk_line}<br>
> ${setup_line}<br>
> - hash@1 {<br>
> + hash-1 {<br>
> algo = "${conf_csum}";<br>
> };<br>
> EOF<br>
> @@ -333,7 +333,7 @@ EOF<br>
> sign_line="${sign_line};"<br>
><br>
> cat << EOF >> ${1}<br>
> - signature@1 {<br>
> + signature-1 {<br>
> algo = "${conf_csum},rsa2048";<br>
> key-name-hint = "${conf_sign_keyname}";<br>
> ${sign_line}<br>
> --<br>
> 2.7.4<br>
><br>
> --<br>
> _______________________________________________<br>
> Openembedded-core mailing list<br>
> <a href="mailto:Openembedded-core@lists.openembedded.org" target="_blank">Openembedded-core@lists.openembedded.org</a><br>
> <a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
<br>
<br>
<br>
-- <br>
Alex Kiernan<br>
</blockquote></div></div></div></div>