mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-04-20 19:53:43 +00:00
Code Issues Projects Releases Wiki Activity

bsp: fitimage-legacyhs: add default dtb support

Browse Source 
FIT_CONF_DEFAULT_DTB config specifies the default dtb file for the
FITimage when multiple ones are provided[1].

Legacyhs fitimage does not currently support this feature set which is
required for repurposing the same class for falcon boot.

This patch adds support for FIT_CONF_DEFAULT_DTB without affecting
existing platforms that rely on legacyhs fitImage.

[1]:
https://docs.yoctoproject.org/ref-manual/variables.html#term-FIT_CONF_DEFAULT_DTB

Signed-off-by: Anshul Dalal <anshuld@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Anshul Dalal
2025-04-15 09:05:09 +05:30
committed by Ryan Eatmon
parent a15a36cf34
commit fba44e113b
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
meta-ti-bsp/classes/kernel-fitimage-legacyhs.bbclass
View File

@@ -316,6 +316,7 @@ EOF
# $4 ... ramdisk ID
# $5 ... config ID
# $6 ... tee ID/name
# $7 ... default DTB ID
fitimage_emit_section_config() {
conf_csum=${FITIMAGE_HASH_ALGO}
@@ -370,6 +371,16 @@ fitimage_emit_section_config() {
final_conf_desc="${conf_desc}"
fi
default_dtb_count=${7}
if [ "x${FITIMAGE_CONF_BY_NAME}" = "x1" ] ; then
default_conf_name="${FIT_CONF_DEFAULT_DTB}"
else
default_conf_name="conf-${default_dtb_count}"
fi
cat << EOF >> ${1}
default = "${default_conf_name}";
EOF
dtbcount=1
for DTB in ${KERNEL_DEVICETREE}; do
DTB=$(basename "${DTB}")
@@ -386,12 +397,6 @@ fitimage_emit_section_config() {
fdt_line="fdt = \"fdt-${dtbcount}\";"
fi
if [ "x${dtbcount}" = "x1" ]; then
cat << EOF >> ${1}
default = "${conf_name}";
EOF
fi
# Generate a single configuration section
cat << EOF >> ${1}
${conf_name} {
@@ -524,6 +529,7 @@ fitimage_assemble() {
ramdiskcount=${3}
setupcount=""
teecount=1
default_dtb_count=1
rm -f ${1} arch/${ARCH}/boot/${2}
fitimage_emit_fit_header ${1}
@@ -544,6 +550,9 @@ fitimage_assemble() {
dtbcount=1
dtboaddress="${UBOOT_DTBO_LOADADDRESS}"
for DTB in ${KERNEL_DEVICETREE}; do
if [ "${DTB}" = "${FIT_CONF_DEFAULT_DTB}" ]; then
default_dtb_count=${dtbcount}
fi
if echo ${DTB} | grep -q '/dts/'; then
bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used."
DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
@@ -660,7 +669,7 @@ fitimage_assemble() {
else
teeref="${teecount}"
fi
fitimage_emit_section_config ${1} "${kernelcount}" "${dtbref}" "${ramdiskcount}" "${setupcount}" "${teeref}"
fitimage_emit_section_config ${1} "${kernelcount}" "${dtbref}" "${ramdiskcount}" "${setupcount}" "${teeref}" "${default_dtb_count}"
fitimage_emit_section_maint ${1} sectend