diff options
author | Denys Dmytriyenko <denys@konsulko.com> | 2023-10-23 22:38:16 +0000 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-10-24 09:56:09 -0500 |
commit | ef80a01ba0294d9f9c045c252ecef7883198b0cb (patch) | |
tree | 4a58ab244750ce026fa65cbb1660a827e37ae0bc /meta-ti-bsp/recipes-kernel | |
parent | 2749107fb3951a49a9afdfb1fecbdb74177f5ecb (diff) | |
download | meta-ti-ef80a01ba0294d9f9c045c252ecef7883198b0cb.tar.gz |
conf: machine: move RDEPENDS and RRECOMMENDS from kernel-rdepends.inccicd.master.202310260100cicd.master.202310250100
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 <denys@konsulko.com>
Acked-by: Andrew Davis <afd@ti.com>
Acked-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat (limited to 'meta-ti-bsp/recipes-kernel')
4 files changed, 0 insertions, 41 deletions
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 @@ | |||
1 | # Pull in the devicetree files into the rootfs | ||
2 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base += "kernel-devicetree" | ||
3 | |||
4 | # Add run-time dependency for PM firmware to the rootfs | ||
5 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " amx3-cm3" | ||
6 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " amx3-cm3" | ||
7 | |||
8 | # Add run-time dependency for VPE VPDMA firmware to the rootfs | ||
9 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " vpdma-fw" | ||
10 | |||
11 | # Add run-time dependency for Goodix firmware to the rootfs | ||
12 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:dra7xx = " goodix-fw" | ||
13 | |||
14 | # Add run-time dependency for PRU Ethernet firmware to the rootfs | ||
15 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am57xx = " prueth-fw prusw-fw pruhsr-fw pruprp-fw" | ||
16 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti43x = " prueth-fw pruhsr-fw pruprp-fw" | ||
17 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:ti33x = " prueth-fw pruhsr-fw pruprp-fw" | ||
18 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx = " prueth-fw-am65x" | ||
19 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am65xx-evm = " prueth-fw-am65x-sr2 pruhsr-fw-am65x-sr2 prusw-fw-am65x-sr2" | ||
20 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am64xx = " prueth-fw-am65x-sr2 pruhsr-fw-am65x-sr2 prusw-fw-am65x-sr2" | ||
21 | |||
22 | # Add run-time dependency for Cadence MHDP firmware to the rootfs | ||
23 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721e = " cadence-mhdp-fw" | ||
24 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cadence-mhdp-fw" | ||
25 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " cadence-mhdp-fw" | ||
26 | |||
27 | # Add run-time dependency for Video Decoding firmware to the rootfs | ||
28 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721e = " vxd-dec-fw" | ||
29 | |||
30 | # Add run-time dependency for Chips&Media Wave521 firmware to the rootfs | ||
31 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721s2 = " cnm-wave-fw" | ||
32 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j784s4 = " cnm-wave-fw" | ||
33 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:am62axx = " cnm-wave-fw" | ||
34 | |||
35 | # Add run-time dependency for TI ETH firmware to the rootfs | ||
36 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j721e = " ti-eth-fw" | ||
37 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base:append:j7200 = " ti-eth-fw" | ||
38 | 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" | |||
5 | 5 | ||
6 | inherit kernel | 6 | inherit kernel |
7 | 7 | ||
8 | require recipes-kernel/linux/kernel-rdepends.inc | ||
9 | require recipes-kernel/linux/ti-kernel.inc | 8 | require recipes-kernel/linux/ti-kernel.inc |
10 | 9 | ||
11 | DEPENDS += "gmp-native libmpc-native" | 10 | 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 | |||
9 | 9 | ||
10 | DEFCONFIG_BUILDER = "${S}/ti_config_fragments/defconfig_builder.sh" | 10 | DEFCONFIG_BUILDER = "${S}/ti_config_fragments/defconfig_builder.sh" |
11 | require recipes-kernel/linux/setup-defconfig.inc | 11 | require recipes-kernel/linux/setup-defconfig.inc |
12 | require recipes-kernel/linux/kernel-rdepends.inc | ||
13 | require recipes-kernel/linux/ti-kernel.inc | 12 | require recipes-kernel/linux/ti-kernel.inc |
14 | include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} | 13 | include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} |
15 | 14 | ||
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 | |||
7 | inherit kernel | 7 | inherit kernel |
8 | 8 | ||
9 | require recipes-kernel/linux/setup-defconfig.inc | 9 | require recipes-kernel/linux/setup-defconfig.inc |
10 | require recipes-kernel/linux/kernel-rdepends.inc | ||
11 | require recipes-kernel/linux/ti-kernel.inc | 10 | require recipes-kernel/linux/ti-kernel.inc |
12 | include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} | 11 | include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} |
13 | include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} | 12 | include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} |