diff options
author | Ryan Eatmon <reatmon@ti.com> | 2023-03-17 10:20:53 -0500 |
---|---|---|
committer | Ryan Eatmon <reatmon@ti.com> | 2023-03-31 09:16:08 -0500 |
commit | aacaba30db61d9199a23513ef6838922d73dcad0 (patch) | |
tree | bfd29c6b75cf1f9ef867340bee5a27464105ce12 /meta-ti-bsp/conf/machine/include | |
parent | 183e6abac6611fea0f52d7ac7303131536516a80 (diff) | |
download | meta-ti-aacaba30db61d9199a23513ef6838922d73dcad0.tar.gz |
linux-ti-*: Add filtering for which dtb/dtbo to include
We often carry more dtbs/dtbos in our kernel than we have upstreamed.
The inclusion of all of the dtb/dtbo in the KERNEL_DEVICETREE has become
problematic as we start testing the linux-next and 6.1 as part of our
LTS migration. To address this issue we are adding in two step method
for managing the KERNEL_DEVICETREE.
Going forward we will only accept dtb/dtbo in KERNEL_DEVICETREE if it is
available in upstream. This way we ensure that the variable is more
accurate for whichever kernel you might be looking at. We have also
added a new variable KERNEL_DEVICETREE_PREFIX which our kernel recipes
will use to auto set KERNEL_DEVICETREE based on what files are in the
kernel and not a fixed list in the conf files.
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Signed-off-by: Andrew Davis <afd@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
Diffstat (limited to 'meta-ti-bsp/conf/machine/include')
-rw-r--r-- | meta-ti-bsp/conf/machine/include/am64xx.inc | 5 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/am65xx.inc | 12 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/ti33x.inc | 15 | ||||
-rw-r--r-- | meta-ti-bsp/conf/machine/include/ti43x.inc | 10 |
4 files changed, 22 insertions, 20 deletions
diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc index a2e5d673..157bf5d5 100644 --- a/meta-ti-bsp/conf/machine/include/am64xx.inc +++ b/meta-ti-bsp/conf/machine/include/am64xx.inc | |||
@@ -4,12 +4,11 @@ SOC_FAMILY:append = ":am64xx" | |||
4 | SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" | 4 | SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS1" |
5 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | 5 | SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" |
6 | 6 | ||
7 | KERNEL_DEVICETREE_PREFIX = "ti/k3-am642" | ||
8 | |||
7 | KERNEL_DEVICETREE = " \ | 9 | KERNEL_DEVICETREE = " \ |
8 | ti/k3-am642-evm.dtb \ | 10 | ti/k3-am642-evm.dtb \ |
9 | ti/k3-am642-sk.dtb \ | 11 | ti/k3-am642-sk.dtb \ |
10 | ti/k3-am642-evm-icssg1-dualemac.dtbo \ | ||
11 | ti/k3-am642-evm-icssg1-dualemac-mii.dtbo \ | ||
12 | ti/k3-am642-evm-nand.dtbo \ | ||
13 | " | 12 | " |
14 | 13 | ||
15 | # Default tiboot3.bin on AM64x is for SR2.0 HS-FS | 14 | # Default tiboot3.bin on AM64x is for SR2.0 HS-FS |
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 0ae00761..564d61b0 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc | |||
@@ -8,18 +8,10 @@ SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}" | |||
8 | 8 | ||
9 | PREFERRED_PROVIDER_virtual/gpudriver ?= "" | 9 | PREFERRED_PROVIDER_virtual/gpudriver ?= "" |
10 | 10 | ||
11 | KERNEL_DEVICETREE_PREFIX = "ti/k3-am654" | ||
12 | |||
11 | KERNEL_DEVICETREE = " \ | 13 | KERNEL_DEVICETREE = " \ |
12 | ti/k3-am654-base-board.dtb \ | 14 | ti/k3-am654-base-board.dtb \ |
13 | ti/k3-am654-base-board-sr1.dtbo \ | ||
14 | ti/k3-am654-gp.dtbo \ | ||
15 | ti/k3-am654-idk.dtbo \ | ||
16 | ti/k3-am654-idk-sr1.dtbo \ | ||
17 | ti/k3-am654-sr1.dtbo \ | ||
18 | ti/k3-am654-pcie-usb2.dtbo \ | ||
19 | ti/k3-am654-pcie-usb3.dtbo \ | ||
20 | ti/k3-am654-evm-tc358876.dtbo \ | ||
21 | ti/k3-am654-evm-oldi-lcd1evm.dtbo \ | ||
22 | ti/k3-am654-evm-ov5640.dtbo \ | ||
23 | " | 15 | " |
24 | 16 | ||
25 | # On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw | 17 | # On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw |
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc index 95499552..4f6d90bf 100644 --- a/meta-ti-bsp/conf/machine/include/ti33x.inc +++ b/meta-ti-bsp/conf/machine/include/ti33x.inc | |||
@@ -18,12 +18,19 @@ PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc" | |||
18 | 18 | ||
19 | KERNEL_IMAGETYPE = "zImage" | 19 | KERNEL_IMAGETYPE = "zImage" |
20 | 20 | ||
21 | KERNEL_DEVICETREE_PREFIX = "am335x" | ||
22 | |||
21 | KERNEL_DEVICETREE = " \ | 23 | KERNEL_DEVICETREE = " \ |
22 | am335x-evm.dtb am335x-evmsk.dtb \ | 24 | am335x-evm.dtb \ |
25 | am335x-evmsk.dtb \ | ||
23 | am335x-icev2.dtb \ | 26 | am335x-icev2.dtb \ |
24 | am335x-pocketbeagle.dtb am335x-bone.dtb am335x-boneblue.dtb \ | 27 | am335x-pocketbeagle.dtb \ |
25 | am335x-bonegreen.dtb am335x-bonegreen-wireless.dtb \ | 28 | am335x-bone.dtb \ |
26 | am335x-boneblack.dtb am335x-boneblack-wireless.dtb \ | 29 | am335x-boneblue.dtb \ |
30 | am335x-bonegreen.dtb \ | ||
31 | am335x-bonegreen-wireless.dtb \ | ||
32 | am335x-boneblack.dtb \ | ||
33 | am335x-boneblack-wireless.dtb \ | ||
27 | am335x-sancloud-bbe.dtb \ | 34 | am335x-sancloud-bbe.dtb \ |
28 | " | 35 | " |
29 | 36 | ||
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc index ec6d9c07..5b40925e 100644 --- a/meta-ti-bsp/conf/machine/include/ti43x.inc +++ b/meta-ti-bsp/conf/machine/include/ti43x.inc | |||
@@ -18,12 +18,16 @@ PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" | |||
18 | 18 | ||
19 | KERNEL_IMAGETYPE = "zImage" | 19 | KERNEL_IMAGETYPE = "zImage" |
20 | 20 | ||
21 | KERNEL_DEVICETREE_PREFIX = " \ | ||
22 | am437x \ | ||
23 | am43x \ | ||
24 | " | ||
25 | |||
21 | KERNEL_DEVICETREE = " \ | 26 | KERNEL_DEVICETREE = " \ |
22 | am437x-gp-evm.dtb \ | 27 | am437x-gp-evm.dtb \ |
23 | ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'am437x-gp-evm-hdmi.dtb', d)} \ | 28 | am437x-sk-evm.dtb \ |
24 | am437x-sk-evm.dtb am437x-idk-evm.dtb \ | 29 | am437x-idk-evm.dtb \ |
25 | am43x-epos-evm.dtb \ | 30 | am43x-epos-evm.dtb \ |
26 | ${@oe.utils.conditional('PREFERRED_PROVIDER_virtual/kernel', 'linux-ti-mainline', '', 'am43x-epos-evm-hdmi.dtb', d)} \ | ||
27 | " | 31 | " |
28 | 32 | ||
29 | KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}" | 33 | KERNEL_DEVICETREE += "${@oe.utils.conditional('ENABLE_TI_UIO_DEVICES', '1', 'am437x-idk-pru-excl-uio.dtb', '', d)}" |