mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-01 13:58:04 +00:00
cfe478f8d3
When packaging is disabled using the nopackages class, ensure we don't add to PACKAGES. This fixes builds where we have an unpackaged kernel alongside a packaged kernel. (From OE-Core rev: 9cce475ffc4bd71977d8e0a31c1a4df7a2f30ef7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit d6b114cf5a9b22688c0b59a3afc46a07450d87b5) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
99 lines
3.6 KiB
Plaintext
99 lines
3.6 KiB
Plaintext
# Support for device tree generation
|
|
python () {
|
|
if not bb.data.inherits_class('nopackages', d):
|
|
d.appendVar("PACKAGES", " ${KERNEL_PACKAGE_NAME}-devicetree")
|
|
if d.getVar('KERNEL_DEVICETREE_BUNDLE') == '1':
|
|
d.appendVar("PACKAGES", " ${KERNEL_PACKAGE_NAME}-image-zimage-bundle")
|
|
}
|
|
|
|
FILES_${KERNEL_PACKAGE_NAME}-devicetree = "/${KERNEL_IMAGEDEST}/*.dtb /${KERNEL_IMAGEDEST}/*.dtbo"
|
|
FILES_${KERNEL_PACKAGE_NAME}-image-zimage-bundle = "/${KERNEL_IMAGEDEST}/zImage-*.dtb.bin"
|
|
|
|
# Generate kernel+devicetree bundle
|
|
KERNEL_DEVICETREE_BUNDLE ?= "0"
|
|
|
|
normalize_dtb () {
|
|
dtb="$1"
|
|
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'`
|
|
fi
|
|
echo "$dtb"
|
|
}
|
|
|
|
get_real_dtb_path_in_kernel () {
|
|
dtb="$1"
|
|
dtb_path="${B}/arch/${ARCH}/boot/dts/$dtb"
|
|
if [ ! -e "$dtb_path" ]; then
|
|
dtb_path="${B}/arch/${ARCH}/boot/$dtb"
|
|
fi
|
|
echo "$dtb_path"
|
|
}
|
|
|
|
do_configure_append() {
|
|
if [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then
|
|
if echo ${KERNEL_IMAGETYPE_FOR_MAKE} | grep -q 'zImage'; then
|
|
case "${ARCH}" in
|
|
"arm")
|
|
config="${B}/.config"
|
|
if ! grep -q 'CONFIG_ARM_APPENDED_DTB=y' $config; then
|
|
bbwarn 'CONFIG_ARM_APPENDED_DTB is NOT enabled in the kernel. Enabling it to allow the kernel to boot with the Device Tree appended!'
|
|
sed -i "/CONFIG_ARM_APPENDED_DTB[ =]/d" $config
|
|
echo "CONFIG_ARM_APPENDED_DTB=y" >> $config
|
|
echo "# CONFIG_ARM_ATAG_DTB_COMPAT is not set" >> $config
|
|
fi
|
|
;;
|
|
*)
|
|
bberror "KERNEL_DEVICETREE_BUNDLE is not supported for ${ARCH}. Currently it is only supported for 'ARM'."
|
|
esac
|
|
else
|
|
bberror 'The KERNEL_DEVICETREE_BUNDLE requires the KERNEL_IMAGETYPE to contain zImage.'
|
|
fi
|
|
fi
|
|
}
|
|
|
|
do_compile_append() {
|
|
for dtbf in ${KERNEL_DEVICETREE}; do
|
|
dtb=`normalize_dtb "$dtbf"`
|
|
oe_runmake $dtb CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
|
|
done
|
|
}
|
|
|
|
do_install_append() {
|
|
for dtbf in ${KERNEL_DEVICETREE}; do
|
|
dtb=`normalize_dtb "$dtbf"`
|
|
dtb_ext=${dtb##*.}
|
|
dtb_base_name=`basename $dtb .$dtb_ext`
|
|
dtb_path=`get_real_dtb_path_in_kernel "$dtb"`
|
|
install -m 0644 $dtb_path ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext
|
|
done
|
|
}
|
|
|
|
do_deploy_append() {
|
|
for dtbf in ${KERNEL_DEVICETREE}; do
|
|
dtb=`normalize_dtb "$dtbf"`
|
|
dtb_ext=${dtb##*.}
|
|
dtb_base_name=`basename $dtb .$dtb_ext`
|
|
install -d $deployDir
|
|
install -m 0644 ${D}/${KERNEL_IMAGEDEST}/$dtb_base_name.$dtb_ext $deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext
|
|
ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext $deployDir/$dtb_base_name.$dtb_ext
|
|
ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext $deployDir/$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext
|
|
for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do
|
|
if [ "$type" = "zImage" ] && [ "${KERNEL_DEVICETREE_BUNDLE}" = "1" ]; then
|
|
cat ${D}/${KERNEL_IMAGEDEST}/$type \
|
|
$deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \
|
|
> $deployDir/$type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin
|
|
ln -sf $type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \
|
|
$deployDir/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin
|
|
if [ -e "${KERNEL_OUTPUT_DIR}/${type}.initramfs" ]; then
|
|
cat ${KERNEL_OUTPUT_DIR}/${type}.initramfs \
|
|
$deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext \
|
|
> $deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin
|
|
ln -sf ${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext.bin \
|
|
$deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext.bin
|
|
fi
|
|
fi
|
|
done
|
|
done
|
|
}
|