Hi Alex, Le jeu. 30 août 2018 à 07:58, Alex Kiernan <alex.kier...@gmail.com> a écrit :
> On Wed, Aug 29, 2018 at 11:59 PM Pierre-Jean Texier > <texier....@gmail.com> wrote: > > > > 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@1 has a > unit name, but no reg property > > | <stdout>: Warning (unit_address_vs_reg): Node /images/kernel@1/hash@1 > has a unit name, but no reg property > > | <stdout>: Warning (unit_address_vs_reg): Node > /images/fdt@at91-sama5d27_som1_ek.dtb has a unit name, but no reg property > > | <stdout>: Warning (unit_address_vs_reg): Node > /images/fdt@at91-sama5d27_som1_ek.dtb/hash@1 has a unit name, but no reg > property > > | <stdout>: Warning (unit_address_vs_reg): Node > /images/fdt@at91-sama5d27_som1_ek_pda4.dtb has a unit name, but no reg > property > > | <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 > > | <stdout>: Warning (unit_address_vs_reg): Node > /images/fdt@at91-sama5d27_som1_ek_pda7.dtb has a unit name, but no reg > property > > | <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 > > | <stdout>: Warning (unit_address_vs_reg): Node > /images/fdt@at91-sama5d27_som1_ek_pda7b.dtb has a unit name, but no reg > property > > | <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 > > > > Signed-off-by: Pierre-Jean Texier <texier....@gmail.com> > > This strikes me as a bad idea... it breaks existing boot > configurations as it changes the name that has to be selected by > U-Boot. > > Thanks for your comment, In fact, this patch is based on https://patchwork.ozlabs.org/patch/844054/ /Pierre-Jean > > --- > > Changes in V2: > > - rebase on master > > > > 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 a4d7aca..3d7800a 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@1 { > > + hash-1 { > > algo = "${kernel_csum}"; > > }; > > }; > > @@ -145,14 +145,14 @@ fitimage_emit_section_dtb() { > > dtb_loadline="load = <${UBOOT_DTB_LOADADDRESS}>;" > > fi > > cat << EOF >> ${1} > > - fdt@${2} { > > + fdt-${2} { > > description = "Flattened Device Tree blob"; > > data = /incbin/("${3}"); > > type = "flat_dt"; > > arch = "${UBOOT_ARCH}"; > > compression = "none"; > > ${dtb_loadline} > > - hash@1 { > > + hash-1 { > > algo = "${dtb_csum}"; > > }; > > }; > > @@ -170,7 +170,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"; > > @@ -179,7 +179,7 @@ fitimage_emit_section_setup() { > > compression = "none"; > > load = <0x00090000>; > > entry = <0x00090000>; > > - hash@1 { > > + hash-1 { > > algo = "${setup_csum}"; > > }; > > }; > > @@ -225,7 +225,7 @@ fitimage_emit_section_ramdisk() { > > esac > > > > cat << EOF >> ${1} > > - ramdisk@${2} { > > + ramdisk-${2} { > > description = "${INITRAMFS_IMAGE}"; > > data = /incbin/("${3}"); > > type = "ramdisk"; > > @@ -234,7 +234,7 @@ fitimage_emit_section_ramdisk() { > > compression = "${ramdisk_ctype}"; > > ${ramdisk_loadline} > > ${ramdisk_entryline} > > - hash@1 { > > + hash-1 { > > algo = "${ramdisk_csum}"; > > }; > > }; > > @@ -269,39 +269,39 @@ fitimage_emit_section_config() { > > if [ -n "${2}" ]; then > > conf_desc="Linux kernel" > > sep=", " > > - kernel_line="kernel = \"kernel@${2}\";" > > + kernel_line="kernel = \"kernel-${2}\";" > > fi > > > > if [ -n "${3}" ]; then > > conf_desc="${conf_desc}${sep}FDT blob" > > sep=", " > > - fdt_line="fdt = \"fdt@${3}\";" > > + fdt_line="fdt = \"fdt-${3}\";" > > fi > > > > if [ -n "${4}" ]; then > > conf_desc="${conf_desc}${sep}ramdisk" > > sep=", " > > - ramdisk_line="ramdisk = \"ramdisk@${4}\";" > > + ramdisk_line="ramdisk = \"ramdisk-${4}\";" > > fi > > > > if [ -n "${5}" ]; then > > conf_desc="${conf_desc}${sep}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@1 { > > + hash-1 { > > algo = "${conf_csum}"; > > }; > > EOF > > @@ -333,7 +333,7 @@ EOF > > sign_line="${sign_line};" > > > > cat << EOF >> ${1} > > - signature@1 { > > + signature-1 { > > algo = "${conf_csum},rsa2048"; > > key-name-hint = "${conf_sign_keyname}"; > > ${sign_line} > > -- > > 2.7.4 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > -- > Alex Kiernan >
-- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
