| Message ID | 20241216181230.20523-1-reatmon@ti.com |
|---|---|
| State | Under Review |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master,v2] linux-ti-mainline: Update to version: v6.12 | expand |
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc index 803e369c..99a3b12f 100644 --- a/meta-ti-bsp/conf/machine/include/am65xx.inc +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc @@ -17,6 +17,8 @@ KERNEL_DEVICETREE = " \ ti/k3-am654-idk.dtbo \ ti/k3-am654-pcie-usb2.dtbo \ ti/k3-am654-pcie-usb3.dtbo \ + ti/k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtbo \ + ti/k3-am6548-iot2050-advanced-m2-bkey-usb3.dtbo \ ti/k3-am6548-iot2050-advanced-m2.dtb \ ti/k3-am6548-iot2050-advanced-pg2.dtb \ ti/k3-am6548-iot2050-advanced-sm.dtb \ diff --git a/meta-ti-bsp/conf/machine/j722s-evm.conf b/meta-ti-bsp/conf/machine/j722s-evm.conf index 74bcdfce..2af0981e 100644 --- a/meta-ti-bsp/conf/machine/j722s-evm.conf +++ b/meta-ti-bsp/conf/machine/j722s-evm.conf @@ -10,6 +10,8 @@ KERNEL_DEVICETREE_PREFIX = " \ ti/k3-v3link \ " -KERNEL_DEVICETREE = "" +KERNEL_DEVICETREE = " \ + ti/k3-j722s-evm.dtb \ +" UBOOT_MACHINE = "j722s_evm_a53_defconfig" 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 765375b0..803db1fd 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 @@ -13,9 +13,9 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" S = "${WORKDIR}/git" -# 6.11 Mainline version -SRCREV = "fa7818b3a6dd56c7956f515d287ed9f80c7bf59a" -PV = "6.11" +# 6.12 Mainline version +SRCREV = "adc218676eef25575469234709c2d87185ca223a" +PV = "6.12" KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" BRANCH = "master"
Updated the value(s) for: am65xx-evm: KERNEL_DEVICETREE j722s-evm: KERNEL_DEVICETREE linux-ti-mainline: PV,SRCREV Signed-off-by: LCPD Automation Script <lcpdbld@list.ti.com> --- v2: Fixed logic in script that was listing too many configs in the above table even though there were no changes. meta-ti-bsp/conf/machine/include/am65xx.inc | 2 ++ meta-ti-bsp/conf/machine/j722s-evm.conf | 4 +++- meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-)