MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

kernel-fitimage: Allow user to select dtb when multiple dtb exists

Browse Source 
Allow user to select the default DTB for FIT image when multiple
dtb's exists.

From machine.conf or local.conf user can specify the default dtb
for FIT image as shown below.

FIT_CONF_DEFAULT_DTB = "board-default.dtb"

Also fallback to avaialable dtb when FIT_CONF_DEFAULT_DTB doesn't
exits or empty.

(From OE-Core rev: 160f2c58d68a049a87ddc7aedb2055152ac6ff4e)

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Sandeep Gundlupet Raju 2023-01-04 15:09:02 -07:00 committed by Richard Purdie
parent e6cb132072
commit 8b77cb3a82
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meta/classes-recipe/kernel-fitimage.bbclass
View File

@ -89,6 +89,9 @@ FIT_CONF_PREFIX[doc] = "Prefix to use for FIT configuration node name"
FIT_SUPPORTED_INITRAMFS_FSTYPES ?= "cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.zst cpio.gz ext2.gz cpio" FIT_SUPPORTED_INITRAMFS_FSTYPES ?= "cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.zst cpio.gz ext2.gz cpio"
# Allow user to select the default DTB for FIT image when multiple dtb's exists.
FIT_CONF_DEFAULT_DTB ?= ""
# Keys used to sign individually image nodes. # Keys used to sign individually image nodes.
# The keys to sign image nodes must be different from those used to sign # The keys to sign image nodes must be different from those used to sign
# configuration nodes, otherwise the "required" property, from # configuration nodes, otherwise the "required" property, from
@ -412,6 +415,7 @@ fitimage_emit_section_config() {
bootscr_line="" bootscr_line=""
setup_line="" setup_line=""
default_line="" default_line=""
default_dtb_image="${FIT_CONF_DEFAULT_DTB}"
dtb_image_sect=$(symlink_points_below $dtb_image "${EXTERNAL_KERNEL_DEVICETREE}") dtb_image_sect=$(symlink_points_below $dtb_image "${EXTERNAL_KERNEL_DEVICETREE}")
if [ -z "$dtb_image_sect" ]; then if [ -z "$dtb_image_sect" ]; then
@ -462,7 +466,17 @@ fitimage_emit_section_config() {
# default node is selected based on dtb ID if it is present, # default node is selected based on dtb ID if it is present,
# otherwise its selected based on kernel ID # otherwise its selected based on kernel ID
if [ -n "$dtb_image" ]; then if [ -n "$dtb_image" ]; then
default_line="default = \"${FIT_CONF_PREFIX}$dtb_image\";" # Select default node as user specified dtb when
# multiple dtb exists.
if [ -n "$default_dtb_image" ]; then
if [ -s "${EXTERNAL_KERNEL_DEVICETREE}/$default_dtb_image" ]; then
default_line="default = \"${FIT_CONF_PREFIX}$default_dtb_image\";"
else
bbwarn "Couldn't find a valid user specified dtb in ${EXTERNAL_KERNEL_DEVICETREE}/$default_dtb_image"
fi
else
default_line="default = \"${FIT_CONF_PREFIX}$dtb_image\";"
fi
else else
default_line="default = \"${FIT_CONF_PREFIX}$kernel_id\";" default_line="default = \"${FIT_CONF_PREFIX}$kernel_id\";"
fi fi