From ef80a01ba0294d9f9c045c252ecef7883198b0cb Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Mon, 23 Oct 2023 22:38:16 +0000 Subject: conf: machine: move RDEPENDS and RRECOMMENDS from kernel-rdepends.inc Instead of making kernel RDEPENDS on devicetree and different FW images with lots of machine-override appends that are hard to modify downstream, use proper MACHINE_ESSENTIAL_EXTRA_RDEPENDS and MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS vars that are specifically designed for this purpose. This also makes such dependencies generic and not tied to a particular kernel recipe including kernel-rdepends.inc with the entire machine-specific list. Signed-off-by: Denys Dmytriyenko Acked-by: Andrew Davis Acked-by: Ryan Eatmon Signed-off-by: Ryan Eatmon --- .../recipes-kernel/linux/kernel-rdepends.inc | 38 ---------------------- .../recipes-kernel/linux/linux-ti-mainline_git.bb | 1 - .../recipes-kernel/linux/linux-ti-staging_5.10.bb | 1 - .../recipes-kernel/linux/linux-ti-staging_6.1.bb | 1 - 4 files changed, 41 deletions(-) delete mode 100644 meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc (limited to 'meta-ti-bsp/recipes-kernel') diff --git a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc b/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc deleted file mode 100644 index 266a7ef5..00000000 --- a/meta-ti-bsp/recipes-kernel/linux/kernel-rdepends.inc +++ /dev/null @@ -1,38 +0,0 @@ -# Pull in the devicetree files into the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree" - -# Add run-time dependency for PM firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " amx3-cm3" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " amx3-cm3" - -# Add run-time dependency for VPE VPDMA firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " vpdma-fw" - -# Add run-time dependency for Goodix firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " goodix-fw" - -# Add run-time dependency for PRU Ethernet firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx = " prueth-fw prusw-fw pruhsr-fw pruprp-fw" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " prueth-fw pruhsr-fw pruprp-fw" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " prueth-fw pruhsr-fw pruprp-fw" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx = " prueth-fw-am65x" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx-evm = " prueth-fw-am65x-sr2 pruhsr-fw-am65x-sr2 prusw-fw-am65x-sr2" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am64xx = " prueth-fw-am65x-sr2 pruhsr-fw-am65x-sr2 prusw-fw-am65x-sr2" - -# Add run-time dependency for Cadence MHDP firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721e = " cadence-mhdp-fw" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cadence-mhdp-fw" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " cadence-mhdp-fw" - -# Add run-time dependency for Video Decoding firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721e = " vxd-dec-fw" - -# Add run-time dependency for Chips&Media Wave521 firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cnm-wave-fw" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " cnm-wave-fw" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62axx = " cnm-wave-fw" - -# Add run-time dependency for TI ETH firmware to the rootfs -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721e = " ti-eth-fw" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7200 = " ti-eth-fw" -RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " ti-eth-fw" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb index dfa46f48..a7b5ca74 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" inherit kernel -require recipes-kernel/linux/kernel-rdepends.inc require recipes-kernel/linux/ti-kernel.inc DEPENDS += "gmp-native libmpc-native" diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb index 58a2fd69..c53ae1e1 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_5.10.bb @@ -9,7 +9,6 @@ inherit kernel DEFCONFIG_BUILDER = "${S}/ti_config_fragments/defconfig_builder.sh" require recipes-kernel/linux/setup-defconfig.inc -require recipes-kernel/linux/kernel-rdepends.inc require recipes-kernel/linux/ti-kernel.inc include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb index 66be6944..ee106a7f 100644 --- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb +++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb @@ -7,7 +7,6 @@ inherit ti-secdev inherit kernel require recipes-kernel/linux/setup-defconfig.inc -require recipes-kernel/linux/kernel-rdepends.inc require recipes-kernel/linux/ti-kernel.inc include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} -- cgit v1.2.3-54-g00ecf