Skip to contentSkip to conversation

Revert "kernel_devicetree_vendor_dtb: Backport kernel-devicetree.bbclass"

PATCH New Ryan Eatmon 1 participant 2 messages Jun 2, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Revert "kernel_devicetree_vendor_dtb: Backport kernel-devicetree.bbclass"

This reverts commit bdc8e7c9b58be79cd94906d1a2b6571e61d35561.

The file was updated in upstream oe-core for kirkstone. This commit is no longer needed.

---
 .../kernel_devicetree_vendor_dtb.bbclass      | 134 ---
 meta-ti-bsp/classes/kernel_vendor_dtb.bbclass | 837 ------------------
 2 files changed, 971 deletions(-)
 delete mode 100644 meta-ti-bsp/classes/kernel_devicetree_vendor_dtb.bbclass
 delete mode 100644 meta-ti-bsp/classes/kernel_vendor_dtb.bbclass
meta-ti-bsp/classes/kernel_devicetree_vendor_dtb.bbclass deleted +0 -134
deleted file mode 100644
index eaa73c4d..00000000
@@ -1,134 +0,0 @@
-# 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")
-}
-
-# recursivly search for devicetree files
-def find_device_trees(d):
-    import glob
-    import os
-
-    file_paths = []
-    dest_dir = d.getVar('D')
-    full_dtb_dir = dest_dir + '/' + d.getVar('KERNEL_DTBDEST')
-
-    for file in glob.glob(full_dtb_dir + '/**/*.dtb*', recursive=True):
-        file_paths.append('/' + os.path.relpath(file, dest_dir))
-
-    return ' '.join(file_paths)
-
-FILES:${KERNEL_PACKAGE_NAME}-devicetree = "${@find_device_trees(d)}"
-FILES:${KERNEL_PACKAGE_NAME}-image-zimage-bundle = "/${KERNEL_IMAGEDEST}/zImage-*.dtb.bin"
-
-# Generate kernel+devicetree bundle
-KERNEL_DEVICETREE_BUNDLE ?= "0"
-
-# dtc flags passed via DTC_FLAGS env variable
-KERNEL_DTC_FLAGS ?= ""
-
-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() {
-	if [ -n "${KERNEL_DTC_FLAGS}" ]; then
-		export DTC_FLAGS="${KERNEL_DTC_FLAGS}"
-	fi
-
-	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() {
-	install -d ${D}/${KERNEL_DTBDEST}
-	for dtbf in ${KERNEL_DEVICETREE}; do
-		dtb=`normalize_dtb "$dtbf"`
-		dtb_path=`get_real_dtb_path_in_kernel "$dtb"`
-		if "${@'false' if oe.types.boolean(d.getVar('KERNEL_DTBVENDORED')) else 'true'}"; then
-			dtb_ext=${dtb##*.}
-			dtb_base_name=`basename $dtb .$dtb_ext`
-			dtb=$dtb_base_name.$dtb_ext
-		fi
-		install -Dm 0644 $dtb_path ${D}/${KERNEL_DTBDEST}/$dtb
-	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
-		if "${@'false' if oe.types.boolean(d.getVar('KERNEL_DTBVENDORED')) else 'true'}"; then
-			dtb=$dtb_base_name.$dtb_ext
-		fi
-		install -m 0644 ${D}/${KERNEL_DTBDEST}/$dtb $deployDir/$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext
-		if [ "${KERNEL_IMAGETYPE_SYMLINK}" = "1" ] ; then
-			ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext $deployDir/$dtb_base_name.$dtb_ext
-		fi
-		if [ -n "${KERNEL_DTB_LINK_NAME}" ] ; then
-			ln -sf $dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext $deployDir/$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext
-		fi
-		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${KERNEL_DTB_BIN_EXT}
-				if [ -n "${KERNEL_DTB_LINK_NAME}" ]; then
-					ln -sf $type-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT} \
-						$deployDir/$type-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT}
-				fi
-				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${KERNEL_DTB_BIN_EXT}
-					if [ -n "${KERNEL_DTB_LINK_NAME}" ]; then
-						ln -sf ${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT} \
-							$deployDir/${type}-${INITRAMFS_NAME}-$dtb_base_name-${KERNEL_DTB_LINK_NAME}.$dtb_ext${KERNEL_DTB_BIN_EXT}
-					fi
-				fi
-			fi
-		done
-	done
-}
meta-ti-bsp/classes/kernel_vendor_dtb.bbclass deleted +0 -837

837 lines not on this page · raw message

Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 Revert "linux-ti-*: Use vendored kernel-devicetree.bbclass"

This reverts commit a4f0f492f14059171ba515944bd9be3caf97c1d2.

The file was updated in upstream oe-core for kirkstone. This commit is no longer needed.

---
 meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 2 +-
 meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb     | 2 +-
 meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +1 -1
index 74a4a860..dfa46f48 100644
@@ -3,7 +3,7 @@ SUMMARY = "Mainline Linux kernel for TI devices"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
-inherit kernel_vendor_dtb
+inherit kernel
 
 require recipes-kernel/linux/kernel-rdepends.inc
 require recipes-kernel/linux/ti-kernel.inc
meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb +1 -1
index e1e1eb5e..9138c7c5 100644
@@ -3,7 +3,7 @@ SUMMARY = "Linux-next kernel for TI devices"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
-inherit kernel_vendor_dtb
+inherit kernel
 
 require recipes-kernel/linux/ti-kernel.inc
 
meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb +1 -1
index 3d0ec289..8a12984a 100644
@@ -3,7 +3,7 @@ SUMMARY = "Linux kernel for TI devices"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
-inherit kernel_vendor_dtb
+inherit kernel
 
 require recipes-kernel/linux/setup-defconfig.inc
 require recipes-kernel/linux/kernel-rdepends.inc
Signature · 1 line
2.17.1