summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore6
-rw-r--r--TODO7
-rw-r--r--check_yocto_rules.json31
-rw-r--r--meta-beagle/COPYING.MIT17
-rw-r--r--meta-beagle/README31
-rw-r--r--meta-beagle/SECURITY20
-rw-r--r--meta-beagle/conf/layer.conf17
-rw-r--r--meta-beagle/conf/machine/beagle-x15.conf29
-rw-r--r--meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf (renamed from meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf)11
-rw-r--r--meta-beagle/conf/machine/beaglebone-ai64.conf54
-rw-r--r--meta-beagle/conf/machine/beaglebone.conf34
-rw-r--r--meta-beagle/conf/machine/beagleplay-k3r5.conf11
-rw-r--r--meta-beagle/conf/machine/beagleplay.conf75
-rw-r--r--meta-beagle/conf/machine/beagley-ai-k3r5.conf15
-rw-r--r--meta-beagle/conf/machine/beagley-ai.conf29
-rw-r--r--meta-beagle/conf/machine/include/beagle-bsp.inc71
-rw-r--r--meta-beagle/conf/machine/pocketbeagle2-k3r5.conf12
-rw-r--r--meta-beagle/conf/machine/pocketbeagle2.conf28
-rw-r--r--meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg1
-rw-r--r--meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2023.04.bb (renamed from meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb)9
-rw-r--r--meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb14
-rw-r--r--meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb26
-rw-r--r--meta-beagle/recipes-kernel/linux/linux-bb.org-6.1/defconfig (renamed from meta-ti-bsp/recipes-kernel/linux/linux-bb.org/defconfig)0
-rw-r--r--meta-beagle/recipes-kernel/linux/linux-bb.org-6.12/defconfig1
-rw-r--r--meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/defconfig1
-rw-r--r--meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/no-fortify.cfg1
-rw-r--r--meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb70
-rw-r--r--meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb70
-rw-r--r--meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb73
-rw-r--r--meta-ti-bsp/SECURITY20
-rw-r--r--meta-ti-bsp/classes/kernel-fitimage-deprecated.bbclass839
-rw-r--r--meta-ti-bsp/classes/kernel-fitimage-legacyhs.bbclass25
-rw-r--r--meta-ti-bsp/classes/kernel-uboot-deprecated.bbclass51
-rw-r--r--meta-ti-bsp/classes/kernel_deprecated.bbclass869
-rw-r--r--meta-ti-bsp/conf/layer.conf6
-rw-r--r--meta-ti-bsp/conf/machine/am335x-evm.conf2
-rw-r--r--meta-ti-bsp/conf/machine/am437x-evm.conf2
-rw-r--r--meta-ti-bsp/conf/machine/am57xx-evm.conf17
-rw-r--r--meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf2
-rw-r--r--meta-ti-bsp/conf/machine/am62axx-evm.conf7
-rw-r--r--meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf11
-rw-r--r--meta-ti-bsp/conf/machine/am62dxx-evm.conf18
-rw-r--r--meta-ti-bsp/conf/machine/am62lxx-evm.conf20
-rw-r--r--meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf2
-rw-r--r--meta-ti-bsp/conf/machine/am62pxx-evm.conf13
-rw-r--r--meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf2
-rw-r--r--meta-ti-bsp/conf/machine/am62xx-evm.conf19
-rw-r--r--meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf2
-rw-r--r--meta-ti-bsp/conf/machine/am62xx-lp-evm.conf8
-rw-r--r--meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf9
-rw-r--r--meta-ti-bsp/conf/machine/am62xxsip-evm.conf6
-rw-r--r--meta-ti-bsp/conf/machine/am68-sk-k3r5.conf11
-rw-r--r--meta-ti-bsp/conf/machine/am68-sk.conf23
-rw-r--r--meta-ti-bsp/conf/machine/am69-sk.conf6
-rw-r--r--meta-ti-bsp/conf/machine/beagle-x15.conf22
-rw-r--r--meta-ti-bsp/conf/machine/beaglebone-ai64.conf37
-rw-r--r--meta-ti-bsp/conf/machine/beaglebone.conf67
-rw-r--r--meta-ti-bsp/conf/machine/beagleplay-k3r5.conf19
-rw-r--r--meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf14
-rw-r--r--meta-ti-bsp/conf/machine/beagleplay-ti.conf46
-rw-r--r--meta-ti-bsp/conf/machine/beagleplay.conf60
-rw-r--r--meta-ti-bsp/conf/machine/include/am62axx.inc5
-rw-r--r--meta-ti-bsp/conf/machine/include/am62dxx.inc15
-rw-r--r--meta-ti-bsp/conf/machine/include/am62lxx.inc9
-rw-r--r--meta-ti-bsp/conf/machine/include/am62pxx.inc7
-rw-r--r--meta-ti-bsp/conf/machine/include/am62xx.inc4
-rw-r--r--meta-ti-bsp/conf/machine/include/am64xx.inc12
-rw-r--r--meta-ti-bsp/conf/machine/include/am65xx.inc15
-rw-r--r--meta-ti-bsp/conf/machine/include/am68.inc21
-rw-r--r--meta-ti-bsp/conf/machine/include/am69.inc21
-rw-r--r--meta-ti-bsp/conf/machine/include/beagle.inc3
-rw-r--r--meta-ti-bsp/conf/machine/include/j7200.inc12
-rw-r--r--meta-ti-bsp/conf/machine/include/j721e.inc28
-rw-r--r--meta-ti-bsp/conf/machine/include/j721s2.inc4
-rw-r--r--meta-ti-bsp/conf/machine/include/j722s.inc9
-rw-r--r--meta-ti-bsp/conf/machine/include/j742s2.inc21
-rw-r--r--meta-ti-bsp/conf/machine/include/j784s4.inc6
-rw-r--r--meta-ti-bsp/conf/machine/include/k3.inc26
-rw-r--r--meta-ti-bsp/conf/machine/include/k3r5.inc4
-rw-r--r--meta-ti-bsp/conf/machine/include/mc_k3r5.inc3
-rw-r--r--meta-ti-bsp/conf/machine/include/omap-a15.inc12
-rw-r--r--meta-ti-bsp/conf/machine/include/omapl138.inc4
-rw-r--r--meta-ti-bsp/conf/machine/include/ti-bsp.inc135
-rw-r--r--meta-ti-bsp/conf/machine/include/ti-falcon.inc6
-rw-r--r--meta-ti-bsp/conf/machine/include/ti-soc.inc3
-rw-r--r--meta-ti-bsp/conf/machine/include/ti33x.inc48
-rw-r--r--meta-ti-bsp/conf/machine/include/ti43x.inc14
-rw-r--r--meta-ti-bsp/conf/machine/j7200-evm.conf1
-rw-r--r--meta-ti-bsp/conf/machine/j721e-evm.conf6
-rw-r--r--meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf11
-rw-r--r--meta-ti-bsp/conf/machine/j721e-sk.conf17
-rw-r--r--meta-ti-bsp/conf/machine/j721s2-evm.conf3
-rw-r--r--meta-ti-bsp/conf/machine/j722s-evm.conf5
-rw-r--r--meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf11
-rw-r--r--meta-ti-bsp/conf/machine/j742s2-evm.conf22
-rw-r--r--meta-ti-bsp/conf/machine/j784s4-evm.conf8
-rw-r--r--meta-ti-bsp/conf/machine/omapl138-lcdk.conf4
-rw-r--r--meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend14
-rw-r--r--meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb2
-rw-r--r--meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb6
-rw-r--r--meta-ti-bsp/recipes-bsp/cmem/cmem.inc16
-rw-r--r--meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb11
-rw-r--r--meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb4
-rwxr-xr-xmeta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb2
-rw-r--r--meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb11
-rw-r--r--meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb2
-rw-r--r--meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb11
-rw-r--r--meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.2.6643903.bb38
-rw-r--r--meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb17
-rw-r--r--meta-ti-bsp/recipes-bsp/ti-dac-fw/ti-dac-fw.bb17
-rw-r--r--meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb14
-rw-r--r--meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb94
-rw-r--r--meta-ti-bsp/recipes-bsp/ti-hsm-fw/ti-hsm-demo-fw_git.bb24
-rw-r--r--meta-ti-bsp/recipes-bsp/ti-img-encode-decode/ti-vxe-vxd-driver_6.12.bb21
-rw-r--r--meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb2
-rw-r--r--meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb2
-rw-r--r--meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc21
-rw-r--r--meta-ti-bsp/recipes-bsp/ti-rtos-fw/ti-rtos-echo-test-fw.bb (renamed from meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb)118
-rw-r--r--meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb6
-rw-r--r--meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc32
-rw-r--r--meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc10
-rw-r--r--meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb15
-rw-r--r--meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-next_git.bb5
-rw-r--r--meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb4
-rw-r--r--meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb6
-rw-r--r--meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb9
-rw-r--r--meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc471
-rw-r--r--meta-ti-bsp/recipes-bsp/u-boot/u-boot/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch59
-rw-r--r--meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb4
-rw-r--r--meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb3
-rw-r--r--meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb4
-rw-r--r--meta-ti-bsp/recipes-bsp/zephyr-fw/zephyr-openamp-rsc-table-fw.bb6
-rw-r--r--meta-ti-bsp/recipes-core/udev/eudev_%.bbappend4
-rw-r--r--meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb4
-rw-r--r--meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb12
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch65
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch (renamed from meta-ti-bsp/recipes-graphics/mesa/files/0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch)0
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch (renamed from meta-ti-bsp/recipes-graphics/mesa/files/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch)0
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-17.patch (renamed from meta-ti-bsp/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch)0
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-18-and-19.patch53
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gbm-backend-fix-gbm-compile-without-dri.patch (renamed from meta-ti-bsp/recipes-graphics/mesa/files/0001-gbm-backend-fix-gbm-compile-without-dri.patch)0
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch (renamed from meta-ti-bsp/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch)0
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-meson.build-check-for-all-linux-host_os-combinations.patch (renamed from meta-ti-bsp/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch)0
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-util-format-Check-for-NEON-before-using-it.patch (renamed from meta-ti-bsp/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch)0
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-Update-lp_bld_misc.cpp-to-support-llvm-19.patch38
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-drisw-fix-build-without-dri3.patch57
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallium-Fix-build-with-llvm-17.patch40
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallivm-Call-StringMapIterator-from-llvm-scope.patch31
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch25
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson.build-check-for-all-linux-host_os-combinations.patch43
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch41
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr.inc370
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb11
-rw-r--r--meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb52
-rw-r--r--meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb24
-rw-r--r--meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb154
-rw-r--r--meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb25
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/files/0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch55
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/files/0001-gcc-plugins-Fix-build-for-upcoming-GCC-release.patch46
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/files/0001-perf-python-Fix-compile-for-32bit-platforms.patch32
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility-for-v6.10.patch60
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility.patch56
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/files/init_disassemble_info-signature-changes-causes-compile-failures.patch111
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch56
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch54
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb35
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-mainline_git.bb35
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb21
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/defconfig (renamed from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/defconfig)0
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/k3/defconfig (renamed from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/k3/defconfig)0
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/omapl138/defconfig (renamed from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/omapl138/defconfig)0
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti33x/defconfig (renamed from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/defconfig)0
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti43x/defconfig2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/k3/defconfig2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/omapl138/defconfig (renamed from meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/omapl138/defconfig)1
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti33x/defconfig2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti43x/defconfig2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb4
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb9
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb6
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/k3/defconfig2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.1.bb5
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.6.bb7
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.1.bb17
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb37
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb21
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc2
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc10
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/ti-extras.inc10
-rw-r--r--meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc14
-rw-r--r--meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc8
-rw-r--r--meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc2
-rw-r--r--meta-ti-bsp/recipes-security/optee/optee-os-4.0.0/0002ti-core-Define-section-attributes-for-clang.patch249
-rw-r--r--meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc15
-rw-r--r--meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc14
-rw-r--r--meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc9
-rw-r--r--meta-ti-bsp/recipes-security/optee/optee-test/0001-Suppress-new-gcc-15-Wunterminated-string-initializat.patch68
-rw-r--r--meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc2
-rw-r--r--meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc5
-rw-r--r--meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb15
-rw-r--r--meta-ti-bsp/recipes-ti/ipc/ti-librpmsg-dma_1.0.bb12
-rw-r--r--meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc11
-rw-r--r--meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb4
-rw-r--r--meta-ti-bsp/recipes-ti/ti-rtos-bin/files/empty1
-rw-r--r--meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb47
-rw-r--r--meta-ti-extras/SECURITY20
-rw-r--r--meta-ti-extras/conf/layer.conf2
-rw-r--r--meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb4
-rw-r--r--meta-ti-extras/recipes-bsp/cc33xx-fw/cc33xx-fw_git.bb20
-rw-r--r--meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb65
-rw-r--r--meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb12
-rw-r--r--meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb4
-rw-r--r--meta-ti-extras/recipes-bsp/dsptop/files/0001-debugss_kmodule-Add-include-for-mod_devicetable.h.patch32
-rw-r--r--meta-ti-extras/recipes-bsp/dsptop/files/0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch57
-rw-r--r--meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb16
-rw-r--r--meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb31
-rw-r--r--meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb4
-rw-r--r--meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw/0001-Add-Makefile-to-install-firmware-files.patch31
-rw-r--r--meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb16
-rw-r--r--meta-ti-extras/recipes-connectivity/cc33calibrator/cc33calibrator_git.bb24
-rw-r--r--meta-ti-extras/recipes-connectivity/cc33conf/cc33conf_git.bb29
-rw-r--r--meta-ti-extras/recipes-connectivity/cc33xx-target-scripts/cc33xx-target-scripts_git.bb18
-rw-r--r--meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb4
-rw-r--r--meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb4
-rw-r--r--meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.8.1.bb4
-rw-r--r--meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb4
-rw-r--r--meta-ti-extras/recipes-devtools/cuia/cuia_1.0.0.13.bb4
-rw-r--r--meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb12
-rw-r--r--meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb14
-rw-r--r--meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb7
-rw-r--r--meta-ti-extras/recipes-devtools/python-yamllint/python3-yamllint_1.33.0.bb15
-rw-r--r--meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb6
-rw-r--r--meta-ti-extras/recipes-ti/beagleboard/beaglebone-capes.bb6
-rw-r--r--meta-ti-extras/recipes-ti/beagleboard/beaglebone-getting-started.bb2
-rw-r--r--meta-ti-extras/recipes-ti/beagleboard/gadget-init.bb60
-rw-r--r--meta-ti-extras/recipes-ti/beagleboard/gadget-init/bone-gmass-eject.rules1
-rwxr-xr-xmeta-ti-extras/recipes-ti/beagleboard/gadget-init/g-ether-load.sh46
-rwxr-xr-xmeta-ti-extras/recipes-ti/beagleboard/gadget-init/g-ether-start-service.sh10
-rwxr-xr-xmeta-ti-extras/recipes-ti/beagleboard/gadget-init/g-storage-reinsert.sh4
-rw-r--r--meta-ti-extras/recipes-ti/beagleboard/gadget-init/network-gadget-init.service11
-rw-r--r--meta-ti-extras/recipes-ti/beagleboard/gadget-init/storage-gadget-init.service11
-rw-r--r--meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.conf5
-rw-r--r--meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.rules2
-rw-r--r--meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.service12
-rwxr-xr-xmeta-ti-extras/recipes-ti/beagleboard/gadget-init/update-image-info-on-mmcblk0p1.sh37
-rw-r--r--meta-ti-extras/recipes-ti/bios/ti-sysbios.inc10
-rw-r--r--meta-ti-extras/recipes-ti/bios/ti-sysbios_6.76.03.01.bb2
-rw-r--r--meta-ti-extras/recipes-ti/codec-engine/ti-codec-engine_3.24.00.08.bb4
-rw-r--r--meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb4
-rw-r--r--meta-ti-extras/recipes-ti/devtools/gcc-arm-baremetal_7-2018-q2-update.bb6
-rw-r--r--meta-ti-extras/recipes-ti/devtools/ti-cg-xml_2.61.00.bb10
-rw-r--r--meta-ti-extras/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb2
-rw-r--r--meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb11
-rw-r--r--meta-ti-extras/recipes-ti/devtools/ti-cgt470.inc10
-rw-r--r--meta-ti-extras/recipes-ti/devtools/ti-cgt6x-7_7.4.16.bb8
-rw-r--r--meta-ti-extras/recipes-ti/devtools/ti-cgt6x_8.3.2.bb4
-rw-r--r--meta-ti-extras/recipes-ti/devtools/ti-cgt7x_1.2.0.bb4
-rw-r--r--meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb3
-rw-r--r--meta-ti-extras/recipes-ti/dsplib/dsplib.inc34
-rw-r--r--meta-ti-extras/recipes-ti/framework-components/ti-framework-components.inc4
-rw-r--r--meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc3
-rw-r--r--meta-ti-extras/recipes-ti/includes/ti-paths.inc2
-rw-r--r--meta-ti-extras/recipes-ti/includes/ti-unpack.inc4
-rw-r--r--meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux/0001-examples-ClusterMgr-sys_errlist-has-been-deprecated-.patch40
-rw-r--r--meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux_git.bb49
-rw-r--r--meta-ti-extras/recipes-ti/ipc/ti-ipc-examples.inc31
-rw-r--r--meta-ti-extras/recipes-ti/ipc/ti-ipc-examples_git.bb44
-rw-r--r--meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc8
-rw-r--r--meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb56
-rw-r--r--meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb24
-rw-r--r--meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc6
-rw-r--r--meta-ti-extras/recipes-ti/mathlib/mathlib.inc32
-rw-r--r--meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb62
-rw-r--r--meta-ti-extras/recipes-ti/osal/ti-osal.inc24
-rw-r--r--meta-ti-extras/recipes-ti/osal/ti-osal_1.24.00.09.bb9
-rw-r--r--meta-ti-extras/recipes-ti/swtools/swtools_git.bb1
-rw-r--r--meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc8
-rw-r--r--meta-ti-extras/recipes-ti/xdais/ti-xdais.inc4
279 files changed, 5755 insertions, 2296 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..ae174429
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
1*.pyc
2*.pyo
3*.swp
4*.orig
5*.rej
6*~
diff --git a/TODO b/TODO
index e1aeba53..40d82c10 100644
--- a/TODO
+++ b/TODO
@@ -1,9 +1,2 @@
1
2This TODO list allows us to track certain actions and lists of patches that 1This TODO list allows us to track certain actions and lists of patches that
3need to be removed at a future date. 2need to be removed at a future date.
4
5
6May 2024 - nanbield EOL
7-----------------------
8 - Remove python3-yamllint: Temporarily carry this new recipe
9
diff --git a/check_yocto_rules.json b/check_yocto_rules.json
new file mode 100644
index 00000000..7e8eb211
--- /dev/null
+++ b/check_yocto_rules.json
@@ -0,0 +1,31 @@
1{
2 "APPEND-1" : {
3 "skip_vars" : [ "ALTERNATIVE", "FILES", "INSANE_SKIP", "RDEPENDS", "RRECOMMENDS" ]
4 },
5 "APPEND-2" : {
6 "skip_vars" : [ "KERNEL_LOCALVERSION", "PR", "PV" ],
7 "file_regex" : {
8 "meta-ti-bsp\\/recipes-graphics\\/mesa\\/mesa-pvr_\\S+\\.bb" : {
9 "skip_vars": [ "GALLIUMDRIVERS", "VULKAN_DRIVERS" ]
10 },
11 "meta-ti-bsp\\/recipes-graphics\\/mesa\\/mesa-pvr\\.inc" : {
12 "skip_vars": [ "TOOLS", "TOOLS_DEPS", "GALLIUMDRIVERS", "VULKAN_DRIVERS" ]
13 }
14 }
15 },
16 "GUARD-1" : {
17 "skip_files" : [
18 "meta-ti-bsp/recipes-core/udev/eudev_%.bbappend",
19 "meta-ti-bsp/recipes-devtools/binutils/binutils-cross-canadian_%.bbappend",
20 "meta-ti-bsp/recipes-security/optee/optee-%.bbappend"
21 ]
22 },
23 "GUARD-2" : {
24 "skip_vars" : [ "k3" , "ti-soc" ]
25 },
26 "SUMMARY-1" : {
27 "skip_files" : [
28 "meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb"
29 ]
30 }
31}
diff --git a/meta-beagle/COPYING.MIT b/meta-beagle/COPYING.MIT
new file mode 100644
index 00000000..89de3547
--- /dev/null
+++ b/meta-beagle/COPYING.MIT
@@ -0,0 +1,17 @@
1Permission is hereby granted, free of charge, to any person obtaining a copy
2of this software and associated documentation files (the "Software"), to deal
3in the Software without restriction, including without limitation the rights
4to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
5copies of the Software, and to permit persons to whom the Software is
6furnished to do so, subject to the following conditions:
7
8The above copyright notice and this permission notice shall be included in
9all copies or substantial portions of the Software.
10
11THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
12IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
13FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
14AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
15LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
16OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
17THE SOFTWARE.
diff --git a/meta-beagle/README b/meta-beagle/README
new file mode 100644
index 00000000..a17e6433
--- /dev/null
+++ b/meta-beagle/README
@@ -0,0 +1,31 @@
1OpenEmbedded/Yocto layer that extends meta-ti-bsp with BeagleBoard.org platforms.
2
3It is hosted on http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/ with the
4source repository at git://git.yoctoproject.org/meta-ti
5
6
7This layer depends on:
8
9URI: git://git.openembedded.org/openembedded-core
10layers: meta
11branch: master
12
13URI: git://git.yoctoproject.org/meta-arm
14layers: meta-arm
15branch: master
16
17URI: git://git.yoctoproject.org/meta-ti
18branch: master
19revision: HEAD
20layers: meta-ti-bsp
21
22
23Send pull requests, patches, comments or questions to:
24meta-ti@lists.yoctoproject.org
25
26Please note - meta-ti mailing list requires subscription for posting:
27https://lists.yoctoproject.org/g/meta-ti
28
29Maintainers:
30Denys Dmytriyenko <denys@konsulko.com>
31Ryan Eatmon <reatmon@ti.com>
diff --git a/meta-beagle/SECURITY b/meta-beagle/SECURITY
new file mode 100644
index 00000000..367adc34
--- /dev/null
+++ b/meta-beagle/SECURITY
@@ -0,0 +1,20 @@
1How to Report a Potential Vulnerability?
2========================================
3
4If you would like to report a public issue (for example, one with a released
5CVE number), please report it to the mailing list:
6
7 https://lists.yoctoproject.org/g/meta-ti
8
9If you are dealing with a not-yet released or urgent issue, please send a
10message to one of the maintainers listed in the README. Include as many
11details as possible:
12 - the layer or software module affected
13 - the recipe and its version
14 - any example code, if available
15
16Branches maintained with security fixes
17---------------------------------------
18
19See https://wiki.yoctoproject.org/wiki/Releases for the list of current
20releases. We only accept patches for the LTS releases and the master branch.
diff --git a/meta-beagle/conf/layer.conf b/meta-beagle/conf/layer.conf
new file mode 100644
index 00000000..d036bb08
--- /dev/null
+++ b/meta-beagle/conf/layer.conf
@@ -0,0 +1,17 @@
1# We have a conf and classes directory, append to BBPATH
2BBPATH .= ":${LAYERDIR}"
3
4# We have a recipes directory, add to BBFILES
5BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
6
7BBFILE_COLLECTIONS += "meta-beagle"
8BBFILE_PATTERN_meta-beagle := "^${LAYERDIR}/"
9BBFILE_PRIORITY_meta-beagle = "6"
10
11LAYERSERIES_COMPAT_meta-beagle = "walnascar whinlatter"
12
13LAYERDEPENDS_meta-beagle = " \
14 meta-ti-bsp \
15"
16
17HOSTTOOLS_NONFATAL += "lz4c"
diff --git a/meta-beagle/conf/machine/beagle-x15.conf b/meta-beagle/conf/machine/beagle-x15.conf
new file mode 100644
index 00000000..8ad028f4
--- /dev/null
+++ b/meta-beagle/conf/machine/beagle-x15.conf
@@ -0,0 +1,29 @@
1#@TYPE: Machine
2#@NAME: BeagleBoard X15
3#@DESCRIPTION: Machine configuration for the BeagleBoard X15
4
5require conf/machine/include/am57xx.inc
6require conf/machine/include/beagle-bsp.inc
7
8DT_VENDOR_PREFIX = "ti/omap/"
9DT_VENDOR_PREFIX:bsp-ti-6_1 = ""
10DT_VENDOR_PREFIX:bsp-bb_org-6_1 = ""
11
12KERNEL_DEVICETREE_PREFIX = " \
13${DT_VENDOR_PREFIX}am57xx-beagle-x15 \
14${DT_VENDOR_PREFIX}am57xx-idk-lcd \
15"
16
17KERNEL_DEVICETREE = " \
18${DT_VENDOR_PREFIX}am57xx-beagle-x15.dtb \
19${DT_VENDOR_PREFIX}am57xx-beagle-x15-revb1.dtb \
20${DT_VENDOR_PREFIX}am57xx-beagle-x15-revc.dtb \
21${DT_VENDOR_PREFIX}am57xx-idk-lcd-osd101t2045.dtbo \
22${DT_VENDOR_PREFIX}am57xx-idk-lcd-osd101t2587.dtbo \
23"
24
25MACHINE_GUI_CLASS = "bigscreen"
26
27SERIAL_CONSOLES = "115200;ttyS2"
28
29UBOOT_MACHINE = "am57xx_evm_config"
diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
index f57ae065..4574f82b 100644
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf
+++ b/meta-beagle/conf/machine/beaglebone-ai64-k3r5.conf
@@ -3,6 +3,7 @@
3#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core) 3#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 (R5F core)
4 4
5require conf/machine/include/k3r5.inc 5require conf/machine/include/k3r5.inc
6require conf/machine/include/beagle-bsp.inc
6 7
7SYSFW_SOC = "j721e" 8SYSFW_SOC = "j721e"
8SYSFW_CONFIG = "evm" 9SYSFW_CONFIG = "evm"
@@ -14,10 +15,10 @@ UBOOT_BINARY = "tiboot3.${UBOOT_SUFFIX}"
14UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" 15UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
15UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" 16UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}"
16 17
17UBOOT_MACHINE = "j721e_evm_r5_defconfig" 18UBOOT_MACHINE = "j721e_beagleboneai64_r5_defconfig"
18 19
20UBOOT_MACHINE:bsp-ti-6_1 = "j721e_evm_r5_defconfig"
21UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_r5.config"
19 22
20# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build 23UBOOT_MACHINE:bsp-bb_org-6_1 = "j721e_evm_r5_defconfig"
21# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc 24UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "j721e_beagleboneai64_r5.config"
22# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
23UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_r5.config"
diff --git a/meta-beagle/conf/machine/beaglebone-ai64.conf b/meta-beagle/conf/machine/beaglebone-ai64.conf
new file mode 100644
index 00000000..c7d72590
--- /dev/null
+++ b/meta-beagle/conf/machine/beaglebone-ai64.conf
@@ -0,0 +1,54 @@
1#@TYPE: Machine
2#@NAME: BeagleBone AI-64 (A72)
3#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core)
4
5require conf/machine/include/j721e.inc
6require conf/machine/include/beagle-bsp.inc
7
8IMAGE_SR1_1_HS_FS_FILES = ""
9IMAGE_SR1_1_HS_SE_FILES = ""
10IMAGE_SR2_HS_FS_FILES = ""
11IMAGE_SR2_HS_SE_FILES = ""
12
13UBOOT_MACHINE = "j721e_beagleboneai64_a72_defconfig"
14
15UBOOT_MACHINE:bsp-ti-6_1 = "j721e_evm_a72_config"
16UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "j721e_beagleboneai64_a72.config"
17
18UBOOT_MACHINE:bsp-bb_org-6_1 = "j721e_evm_a72_config"
19UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "j721e_beagleboneai64_a72.config"
20
21SPL_BINARY = "tispl.bin_unsigned"
22
23KERNEL_DEVICETREE_PREFIX = " \
24 ti/k3-j721e \
25"
26
27KERNEL_DEVICETREE = " \
28ti/k3-j721e-beagleboneai64.dtb \
29ti/k3-j721e-common-proc-board.dtb \
30ti/k3-j721e-evm-gesi-exp-board.dtbo \
31ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
32ti/k3-j721e-sk.dtb \
33"
34
35KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \
36ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \
37ti/k3-j721e-common-proc-board-infotainment.dtbo \
38ti/k3-j721e-evm-csi2-ov5640.dtbo \
39ti/k3-j721e-evm-fusion.dtbo \
40ti/k3-j721e-evm-pcie0-ep.dtbo \
41ti/k3-j721e-evm-virt-mac-client.dtbo \
42ti/k3-j721e-sk-csi2-ov5640.dtbo \
43ti/k3-j721e-sk-csi2-rpi-imx219.dtbo \
44ti/k3-j721e-sk-fusion.dtbo \
45ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \
46"
47
48MACHINE_GUI_CLASS = "bigscreen"
49
50# TI has moved a driver out of its kernel tree and into an out of tree module.
51# We need to not include that for older kernels since the module is still in
52# the kernel.
53TI_VXE_VXD_DRIVER:bsp-bb_org-6_6 = ""
54TI_VXE_VXD_DRIVER:bsp-bb_org-6_1 = ""
diff --git a/meta-beagle/conf/machine/beaglebone.conf b/meta-beagle/conf/machine/beaglebone.conf
new file mode 100644
index 00000000..456da618
--- /dev/null
+++ b/meta-beagle/conf/machine/beaglebone.conf
@@ -0,0 +1,34 @@
1#@TYPE: Machine
2#@NAME: BeagleBone machine
3#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
4
5require conf/machine/include/ti33x.inc
6require conf/machine/include/beagle-bsp.inc
7
8DT_VENDOR_PREFIX = "ti/omap/"
9DT_VENDOR_PREFIX:bsp-ti-6_1 = ""
10DT_VENDOR_PREFIX:bsp-bb_org-6_1 = ""
11
12KERNEL_DEVICETREE_PREFIX = " \
13${DT_VENDOR_PREFIX}am335x-bone \
14${DT_VENDOR_PREFIX}am335x-pocketbeagle \
15${DT_VENDOR_PREFIX}am335x-sancloud-bbe \
16"
17
18KERNEL_DEVICETREE = " \
19${DT_VENDOR_PREFIX}am335x-bone.dtb \
20${DT_VENDOR_PREFIX}am335x-boneblack.dtb \
21${DT_VENDOR_PREFIX}am335x-boneblack-wireless.dtb \
22${DT_VENDOR_PREFIX}am335x-boneblue.dtb \
23${DT_VENDOR_PREFIX}am335x-bonegreen.dtb \
24${DT_VENDOR_PREFIX}am335x-bonegreen-wireless.dtb \
25${DT_VENDOR_PREFIX}am335x-pocketbeagle.dtb \
26${DT_VENDOR_PREFIX}am335x-sancloud-bbe.dtb \
27${DT_VENDOR_PREFIX}am335x-sancloud-bbe-extended-wifi.dtb \
28${DT_VENDOR_PREFIX}am335x-sancloud-bbe-lite.dtb \
29"
30
31MACHINE_GUI_CLASS = "bigscreen"
32MACHINE_FEATURES += "screen"
33
34SERIAL_CONSOLES = "115200;ttyS0"
diff --git a/meta-beagle/conf/machine/beagleplay-k3r5.conf b/meta-beagle/conf/machine/beagleplay-k3r5.conf
new file mode 100644
index 00000000..f053c11e
--- /dev/null
+++ b/meta-beagle/conf/machine/beagleplay-k3r5.conf
@@ -0,0 +1,11 @@
1#@TYPE: Machine
2#@NAME: BeaglePlay (R5F)
3#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core)
4
5require conf/machine/beagleplay-ti-k3r5.conf
6
7require conf/machine/include/beagle-bsp.inc
8
9UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_r5_defconfig"
10
11UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_r5.config"
diff --git a/meta-beagle/conf/machine/beagleplay.conf b/meta-beagle/conf/machine/beagleplay.conf
new file mode 100644
index 00000000..bc0de3f0
--- /dev/null
+++ b/meta-beagle/conf/machine/beagleplay.conf
@@ -0,0 +1,75 @@
1#@TYPE: Machine
2#@NAME: BeaglePlay (A53)
3#@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)
4
5require conf/machine/beagleplay-ti.conf
6
7require conf/machine/include/beagle-bsp.inc
8
9UBOOT_MACHINE:bsp-bb_org-6_1 = "am62x_evm_a53_defconfig"
10
11UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am625_beagleplay_a53.config"
12
13KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \
14ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
15ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
16ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
17ti/k3-am625-beaglemod.dtb \
18ti/k3-am625-beaglemod-audio.dtbo \
19ti/k3-am625-beaglemod-can0.dtbo \
20ti/k3-am625-beaglemod-can1.dtbo \
21ti/k3-am625-beaglemod-csi0-ov5640.dtbo \
22ti/k3-am625-beaglemod-eeprom.dtbo \
23ti/k3-am625-beaglemod-eth.dtbo \
24ti/k3-am625-beaglemod-hdmi.dtbo \
25ti/k3-am625-beaglemod-io-expand.dtbo \
26ti/k3-am625-beaglemod-lt-lcd185.dtbo \
27ti/k3-am625-beaglemod-ospi-flash.dtbo \
28ti/k3-am625-beaglemod-rs485-1.dtbo \
29ti/k3-am625-beaglemod-rs485-2.dtbo \
30ti/k3-am625-beaglemod-rtc.dtbo \
31ti/k3-am625-beaglemod-wl1835.dtbo \
32ti/k3-am625-sk-dmtimer-pwm.dtbo \
33ti/k3-am625-sk-ecap-capture.dtbo \
34ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
35ti/k3-am625-sk-mcspi-loopback.dtbo \
36ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
37ti/k3-am625-sk-microtips-mf103hie-lcd2.dtbo \
38ti/k3-am625-sk-pwm.dtbo \
39ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \
40ti/k3-am62x-sk-csi2-imx219.dtbo \
41ti/k3-am62x-sk-csi2-ov5640.dtbo \
42ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
43ti/k3-am62x-sk-csi2-v3link-fusion.dtbo \
44ti/k3-am62x-sk-eqep.dtbo \
45ti/k3-am62x-sk-hdmi-disable-fastboot.dtbo \
46ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
47ti/k3-am62x-sk-mcan.dtbo \
48"
49
50KERNEL_DEVICETREE:append:bsp-bb_org-6_6 = " \
51ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
52ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
53ti/k3-am625-beagleplay.dtb \
54ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
55ti/k3-am625-minimal.dtb \
56ti/k3-am625-sk.dtb \
57ti/k3-am625-sk-ecap-capture.dtbo \
58ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
59ti/k3-am625-sk-m2-cc3301.dtbo \
60ti/k3-am625-sk-mcspi-loopback.dtbo \
61ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
62ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \
63ti/k3-am62x-sk-csi2-imx219.dtbo \
64ti/k3-am62x-sk-csi2-ov5640.dtbo \
65ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
66ti/k3-am62x-sk-csi2-v3link-fusion.dtbo \
67ti/k3-am62x-sk-dmtimer-pwm.dtbo \
68ti/k3-am62x-sk-eqep.dtbo \
69ti/k3-am62x-sk-fastboot-disable-hdmi.dtbo \
70ti/k3-am62x-sk-hdmi-audio.dtbo \
71ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
72ti/k3-am62x-sk-mcan.dtbo \
73ti/k3-am62x-sk-microtips-mf103hie-lcd2.dtbo \
74ti/k3-am62x-sk-pwm.dtbo \
75"
diff --git a/meta-beagle/conf/machine/beagley-ai-k3r5.conf b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
new file mode 100644
index 00000000..8d5111f0
--- /dev/null
+++ b/meta-beagle/conf/machine/beagley-ai-k3r5.conf
@@ -0,0 +1,15 @@
1#@TYPE: Machine
2#@NAME: BeagleY AI (R5F)
3#@DESCRIPTION: Machine configuration for the BeagleY AI (R5F core)
4
5require conf/machine/include/k3r5.inc
6require conf/machine/include/beagle-bsp.inc
7
8SYSFW_SOC = "j722s"
9SYSFW_CONFIG = "evm"
10SYSFW_SUFFIX = "hs-fs"
11
12UBOOT_MACHINE = "j722s_evm_r5_defconfig"
13UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_r5_defconfig"
14
15UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_r5.config"
diff --git a/meta-beagle/conf/machine/beagley-ai.conf b/meta-beagle/conf/machine/beagley-ai.conf
new file mode 100644
index 00000000..497001ee
--- /dev/null
+++ b/meta-beagle/conf/machine/beagley-ai.conf
@@ -0,0 +1,29 @@
1#@TYPE: Machine
2#@NAME: BeagleY AI (A53)
3#@DESCRIPTION: Machine configuration for the BeagleY AI board (A53 core)
4
5require conf/machine/include/j722s.inc
6require conf/machine/include/beagle-bsp.inc
7
8UBOOT_MACHINE = "j722s_evm_a53_config"
9UBOOT_MACHINE:bsp-bb_org-6_12 = "am67a_beagley_ai_a53_defconfig"
10
11UBOOT_CONFIG_FRAGMENTS:bsp-bb_org-6_1 = "am67a_beagley_ai_a53.config"
12
13KERNEL_DEVICETREE_PREFIX = " \
14 ti/k3-j722s \
15"
16
17KERNEL_DEVICETREE = ""
18
19KERNEL_DEVICETREE:append:bsp-bb_org-6_1 = " \
20ti/k3-j722s-evm.dtb \
21ti/k3-am67a-beagley-ai.dtb \
22"
23
24KERNEL_DEVICETREE:append:bsp-bb_org-6_12 = " \
25ti/k3-j722s-evm.dtb \
26ti/k3-am67a-beagley-ai.dtb \
27"
28
29MACHINE_GUI_CLASS = "bigscreen"
diff --git a/meta-beagle/conf/machine/include/beagle-bsp.inc b/meta-beagle/conf/machine/include/beagle-bsp.inc
new file mode 100644
index 00000000..7dff583e
--- /dev/null
+++ b/meta-beagle/conf/machine/include/beagle-bsp.inc
@@ -0,0 +1,71 @@
1# Use meta-ti-bsp "multi-BSP" facility to create a custom "bb_org" BSP profile
2# with default preferences for Beagle platforms
3
4# Default is bb_org-6_12, but can override with any of the existing options
5TI_PREFERRED_BSP ?= "bb_org-6_12"
6
7# ==========
8# bb_org-6_12
9# BeagleBoard.org kernel 6.12, Upstream u-boot 2025.04
10# based on TI staging trees with extra Beagle-specific features
11# but may not be up-to-date with TI version
12# ==========
13BSP_KERNEL_PROVIDER:bsp-bb_org-6_12 = "linux-bb.org"
14BSP_KERNEL_VERSION:bsp-bb_org-6_12 = "6.12.%"
15BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_12 = "u-boot-bb.org"
16BSP_BOOTLOADER_VERSION:bsp-bb_org-6_12 = "2025.%"
17
18BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-sgx-ddk-km"
19BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_12 = "1.17%"
20BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_12 = "1.17%"
21BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_12 = "ti-img-rogue-driver"
22BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_12 = "24%"
23BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_12 = "24%"
24BSP_MESA_PVR_VERSION:bsp-bb_org-6_12 = "24%"
25
26# GC320 support requires out-of-tree drivers not yet available in bb.org 6.6
27MACHINE_FEATURES:remove:bsp-bb_org-6_12 = "gc320"
28
29# ==========
30# bb_org-6_6
31# BeagleBoard.org kernel 6.6, Upstream u-boot 2024.07
32# based on TI staging trees with extra Beagle-specific features
33# but may not be up-to-date with TI version
34# ==========
35BSP_KERNEL_PROVIDER:bsp-bb_org-6_6 = "linux-bb.org"
36BSP_KERNEL_VERSION:bsp-bb_org-6_6 = "6.6.%"
37BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_6 = "u-boot-bb.org"
38BSP_BOOTLOADER_VERSION:bsp-bb_org-6_6 = "2024.%"
39
40BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km"
41BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%"
42BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_6 = "1.17%"
43BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-img-rogue-driver"
44BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "24%"
45BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_6 = "24%"
46BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "24%"
47
48# GC320 support requires out-of-tree drivers not yet available in bb.org 6.6
49MACHINE_FEATURES:remove:bsp-bb_org-6_6 = "gc320"
50
51# ==========
52# bb_org-6_1
53# BeagleBoard.org kernel 6.1, u-boot 2023.04
54# based on TI staging trees with extra Beagle-specific features
55# but may not be up-to-date with TI version
56# ==========
57BSP_KERNEL_PROVIDER:bsp-bb_org-6_1 = "linux-bb.org"
58BSP_KERNEL_VERSION:bsp-bb_org-6_1 = "6.1.%"
59BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_1 = "u-boot-bb.org"
60BSP_BOOTLOADER_VERSION:bsp-bb_org-6_1 = "2023.%"
61
62BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_1 = "ti-sgx-ddk-km"
63BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_1 = "1.17%"
64BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_1 = "1.17%"
65BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_1 = "ti-img-rogue-driver"
66BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_1 = "23%"
67BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_1 = "23%"
68BSP_MESA_PVR_VERSION:bsp-bb_org-6_1 = "22%"
69
70# GC320 support requires out-of-tree drivers not yet available in bb.org 6.1
71MACHINE_FEATURES:remove:bsp-bb_org-6_1 = "gc320"
diff --git a/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf b/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf
new file mode 100644
index 00000000..32e40312
--- /dev/null
+++ b/meta-beagle/conf/machine/pocketbeagle2-k3r5.conf
@@ -0,0 +1,12 @@
1#@TYPE: Machine
2#@NAME: PocketBeagle2 (R5F)
3#@DESCRIPTION: Machine configuration for the PocketBeagle2 (R5F core)
4
5require conf/machine/include/k3r5.inc
6require conf/machine/include/beagle-bsp.inc
7
8SYSFW_SOC = "am62x"
9SYSFW_CONFIG = "evm"
10SYSFW_SUFFIX = "hs-fs"
11
12UBOOT_MACHINE = "am6232_pocketbeagle2_r5_defconfig"
diff --git a/meta-beagle/conf/machine/pocketbeagle2.conf b/meta-beagle/conf/machine/pocketbeagle2.conf
new file mode 100644
index 00000000..3d9651bd
--- /dev/null
+++ b/meta-beagle/conf/machine/pocketbeagle2.conf
@@ -0,0 +1,28 @@
1#@TYPE: Machine
2#@NAME: PocketBeagle2 (A53)
3#@DESCRIPTION: Machine configuration for the PocketBeagle2 board (A53 core)
4
5require conf/machine/include/k3.inc
6require conf/machine/include/mc_k3r5.inc
7
8require conf/machine/include/beagle-bsp.inc
9
10SOC_FAMILY:append = ":am62xx"
11
12SERIAL_CONSOLES = "115200;ttyS2"
13
14TFA_BOARD = "lite"
15TFA_K3_SYSTEM_SUSPEND = "1"
16
17OPTEEMACHINE = "k3-am62x"
18
19UBOOT_MACHINE = "am6232_pocketbeagle2_a53_defconfig"
20
21KERNEL_DEVICETREE_PREFIX = " \
22 ti/k3-am6232 \
23"
24
25KERNEL_DEVICETREE = " \
26 ti/k3-am6232-pocketbeagle2.dtb \
27 ti/k3-am6232-pocketbeagle2-techlab-cape.dtbo \
28"
diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg
new file mode 100644
index 00000000..362696b9
--- /dev/null
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org-2025.04+git/bootcmd-ti-mmc.cfg
@@ -0,0 +1 @@
CONFIG_BOOTCOMMAND="run bootcmd_ti_mmc"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2023.04.bb
index 13286564..fb7b0c18 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-bb.org_git.bb
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2023.04.bb
@@ -1,4 +1,4 @@
1require u-boot-ti.inc 1require recipes-bsp/u-boot/u-boot-ti.inc
2 2
3SUMMARY = "BeagleBoard.org U-Boot" 3SUMMARY = "BeagleBoard.org U-Boot"
4 4
@@ -6,6 +6,8 @@ COMPATIBLE_MACHINE = "beagle.*"
6 6
7PV = "2023.04" 7PV = "2023.04"
8 8
9SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch"
10
9UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git" 11UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
10UBOOT_GIT_PROTOCOL = "https" 12UBOOT_GIT_PROTOCOL = "https"
11BRANCH = "v2023.04-ti-09.01.00.008" 13BRANCH = "v2023.04-ti-09.01.00.008"
@@ -15,3 +17,8 @@ BRANCH:beagleplay = "v2023.04-ti-09.01.00.008-BeaglePlay"
15BRANCH:beagleplay-k3r5 = "v2023.04-ti-09.01.00.008-BeaglePlay" 17BRANCH:beagleplay-k3r5 = "v2023.04-ti-09.01.00.008-BeaglePlay"
16SRCREV:beagleplay = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e" 18SRCREV:beagleplay = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e"
17SRCREV:beagleplay-k3r5 = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e" 19SRCREV:beagleplay-k3r5 = "43791d945f4e5c25bcc19b9c778e8f9d194dc16e"
20
21BRANCH:beagley-ai = "v2023.04-ti-09.02.00.009-BeagleY-AI-Production"
22BRANCH:beagley-ai-k3r5 = "v2023.04-ti-09.02.00.009-BeagleY-AI-Production"
23SRCREV:beagley-ai = "93735daa6fe024304934d5a5e93ab05a06abf1a8"
24SRCREV:beagley-ai-k3r5 = "93735daa6fe024304934d5a5e93ab05a06abf1a8"
diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb
new file mode 100644
index 00000000..389893b0
--- /dev/null
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.10.bb
@@ -0,0 +1,14 @@
1require recipes-bsp/u-boot/u-boot-ti.inc
2
3SUMMARY = "BeagleBoard.org U-Boot"
4
5COMPATIBLE_MACHINE = "beagle.*"
6
7PV = "2024.10"
8
9SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch"
10
11UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
12UBOOT_GIT_PROTOCOL = "https"
13BRANCH = "v2024.10-Beagle"
14SRCREV = "bf0e9d0b7274d2b561bd24c858affec2038250f9"
diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb
new file mode 100644
index 00000000..aa825d99
--- /dev/null
+++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2025.04.bb
@@ -0,0 +1,26 @@
1require recipes-bsp/u-boot/u-boot-ti.inc
2
3SUMMARY = "BeagleBoard.org U-Boot"
4
5COMPATIBLE_MACHINE = "pocketbeagle2|beagle.*"
6
7PV = "2025.04"
8
9UBOOT_GIT_URI = "git://github.com/beagleboard/u-boot.git"
10UBOOT_GIT_PROTOCOL = "https"
11BRANCH = "v2025.04-Beagle"
12SRCREV = "ea2aeefcb2de36f8ca1b51d0580826d13c01f143"
13
14BRANCH:beagley-ai = "v2025.04-rc3-BeagleY-AI"
15BRANCH:beagley-ai-k3r5 = "v2025.04-rc3-BeagleY-AI"
16SRCREV:beagley-ai = "cc376f9faef201670c7bb1734f42f5475c73f85d"
17SRCREV:beagley-ai-k3r5 = "cc376f9faef201670c7bb1734f42f5475c73f85d"
18
19SRC_URI:append:beagley-ai = " file://bootcmd-ti-mmc.cfg"
20
21BRANCH:pocketbeagle2 = "v2025.04-pocketbeagle2"
22BRANCH:pocketbeagle2-k3r5 = "v2025.04-pocketbeagle2"
23SRCREV:pocketbeagle2 = "f7439516453b7728bda496ff6496ef6f1411aae3"
24SRCREV:pocketbeagle2-k3r5 = "f7439516453b7728bda496ff6496ef6f1411aae3"
25
26SRC_URI:append:pocketbeagle2 = " file://bootcmd-ti-mmc.cfg"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/defconfig b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.1/defconfig
index a5de2e24..a5de2e24 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/defconfig
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.1/defconfig
diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org-6.12/defconfig b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.12/defconfig
new file mode 100644
index 00000000..a5de2e24
--- /dev/null
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.12/defconfig
@@ -0,0 +1 @@
use-kernel-config=bb.org_defconfig
diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/defconfig b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/defconfig
new file mode 100644
index 00000000..a5de2e24
--- /dev/null
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/defconfig
@@ -0,0 +1 @@
use-kernel-config=bb.org_defconfig
diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/no-fortify.cfg b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/no-fortify.cfg
new file mode 100644
index 00000000..808f9519
--- /dev/null
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/no-fortify.cfg
@@ -0,0 +1 @@
CONFIG_FORTIFY_SOURCE=n
diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb
new file mode 100644
index 00000000..067c9ddf
--- /dev/null
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.1.bb
@@ -0,0 +1,70 @@
1# Look in the generic major.minor directory for files
2FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:"
3
4SECTION = "kernel"
5SUMMARY = "BeagleBoard.org Linux kernel"
6LICENSE = "GPL-2.0-only"
7LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
8
9COMPATIBLE_MACHINE = "beagle.*"
10
11inherit kernel_deprecated
12
13require recipes-kernel/linux/setup-defconfig.inc
14require recipes-kernel/linux/ti-kernel.inc
15
16DEPENDS += "gmp-native libmpc-native"
17
18KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
19
20# Extra DT overlays/capes
21KERNEL_DEVICETREE:append:armv7a = " \
22AM335X-PRU-UIO-00A0.dtbo \
23BB-ADC-00A0.dtbo \
24BB-BBBW-WL1835-00A0.dtbo \
25BB-BBGG-WL1835-00A0.dtbo \
26BB-BBGW-WL1835-00A0.dtbo \
27BB-BONE-4D5R-01-00A1.dtbo \
28BB-BONE-eMMC1-01-00A0.dtbo \
29BB-BONE-LCD4-01-00A1.dtbo \
30BB-BONE-NH7C-01-A0.dtbo \
31BB-CAPE-DISP-CT4-00A0.dtbo \
32BB-HDMI-TDA998x-00A0.dtbo \
33BB-I2C1-MCP7940X-00A0.dtbo \
34BB-I2C1-RTC-DS3231.dtbo \
35BB-I2C1-RTC-PCF8563.dtbo \
36BB-I2C2-BME680.dtbo \
37BB-I2C2-MPU6050.dtbo \
38BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \
39BB-NHDMI-TDA998x-00A0.dtbo \
40BBORG_COMMS-00A2.dtbo \
41BBORG_FAN-A000.dtbo \
42BBORG_RELAY-00A2.dtbo \
43BB-SPIDEV0-00A0.dtbo \
44BB-SPIDEV1-00A0.dtbo \
45BB-UART1-00A0.dtbo \
46BB-UART2-00A0.dtbo \
47BB-UART4-00A0.dtbo \
48BB-W1-P9.12-00A0.dtbo \
49BONE-ADC.dtbo \
50M-BB-BBG-00A0.dtbo \
51M-BB-BBGG-00A0.dtbo \
52PB-MIKROBUS-0.dtbo \
53PB-MIKROBUS-1.dtbo \
54"
55
56S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
57
58# 6.1.83 version for 32-bit
59SRCREV:armv7a = "be9b910b08dfd674e47a2643f35080b005ac3792"
60PV:armv7a = "6.1.83+git"
61BRANCH:armv7a = "v6.1.83-ti-r35"
62
63# 6.1.83 version for 64-bit
64SRCREV:aarch64 = "135558243d5a98ed39812b797d2ba6295ef3b86a"
65PV:aarch64 = "6.1.83+git"
66BRANCH:aarch64 = "v6.1.83-ti-arm64-r64"
67
68KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git"
69
70INSANE_SKIP:kernel-modules += "debug-deps"
diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb
new file mode 100644
index 00000000..6e221d1b
--- /dev/null
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.12.bb
@@ -0,0 +1,70 @@
1# Look in the generic major.minor directory for files
2FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:"
3
4SECTION = "kernel"
5SUMMARY = "BeagleBoard.org Linux kernel"
6LICENSE = "GPL-2.0-only"
7LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
8
9COMPATIBLE_MACHINE = "pocketbeagle2|beagle.*"
10
11inherit kernel_deprecated
12
13require recipes-kernel/linux/setup-defconfig.inc
14require recipes-kernel/linux/ti-kernel.inc
15
16DEPENDS += "gmp-native libmpc-native"
17
18KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
19
20# Extra DT overlays/capes
21KERNEL_DEVICETREE:append:armv7a = " \
22${DT_VENDOR_PREFIX}AM335X-PRU-UIO-00A0.dtbo \
23${DT_VENDOR_PREFIX}BB-ADC-00A0.dtbo \
24${DT_VENDOR_PREFIX}BB-BBBW-WL1835-00A0.dtbo \
25${DT_VENDOR_PREFIX}BB-BBGG-WL1835-00A0.dtbo \
26${DT_VENDOR_PREFIX}BB-BBGW-WL1835-00A0.dtbo \
27${DT_VENDOR_PREFIX}BB-BONE-4D5R-01-00A1.dtbo \
28${DT_VENDOR_PREFIX}BB-BONE-eMMC1-01-00A0.dtbo \
29${DT_VENDOR_PREFIX}BB-BONE-LCD4-01-00A1.dtbo \
30${DT_VENDOR_PREFIX}BB-BONE-NH7C-01-A0.dtbo \
31${DT_VENDOR_PREFIX}BB-CAPE-DISP-CT4-00A0.dtbo \
32${DT_VENDOR_PREFIX}BB-HDMI-TDA998x-00A0.dtbo \
33${DT_VENDOR_PREFIX}BB-I2C1-MCP7940X-00A0.dtbo \
34${DT_VENDOR_PREFIX}BB-I2C1-RTC-DS3231.dtbo \
35${DT_VENDOR_PREFIX}BB-I2C1-RTC-PCF8563.dtbo \
36${DT_VENDOR_PREFIX}BB-I2C2-BME680.dtbo \
37${DT_VENDOR_PREFIX}BB-I2C2-MPU6050.dtbo \
38${DT_VENDOR_PREFIX}BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \
39${DT_VENDOR_PREFIX}BB-NHDMI-TDA998x-00A0.dtbo \
40${DT_VENDOR_PREFIX}BBORG_COMMS-00A2.dtbo \
41${DT_VENDOR_PREFIX}BBORG_FAN-A000.dtbo \
42${DT_VENDOR_PREFIX}BBORG_RELAY-00A2.dtbo \
43${DT_VENDOR_PREFIX}BB-SPIDEV0-00A0.dtbo \
44${DT_VENDOR_PREFIX}BB-SPIDEV1-00A0.dtbo \
45${DT_VENDOR_PREFIX}BB-UART1-00A0.dtbo \
46${DT_VENDOR_PREFIX}BB-UART2-00A0.dtbo \
47${DT_VENDOR_PREFIX}BB-UART4-00A0.dtbo \
48${DT_VENDOR_PREFIX}BB-W1-P9.12-00A0.dtbo \
49${DT_VENDOR_PREFIX}BONE-ADC.dtbo \
50${DT_VENDOR_PREFIX}M-BB-BBG-00A0.dtbo \
51${DT_VENDOR_PREFIX}M-BB-BBGG-00A0.dtbo \
52${DT_VENDOR_PREFIX}PB-MIKROBUS-0.dtbo \
53${DT_VENDOR_PREFIX}PB-MIKROBUS-1.dtbo \
54"
55
56S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
57
58# 6.12.22 version for 32-bit
59SRCREV:armv7a = "d7f560ef48a867b94959f040b4c3c57053f4e32d"
60PV:armv7a = "6.12.22+git"
61BRANCH:armv7a = "v6.12.22-ti-arm32-r10"
62
63# 6.12.22 version for 64-bit
64SRCREV:aarch64 = "9e43fd19ece3affb9406e87ec3df733b91b77a4f"
65PV:aarch64 = "6.12.22+git"
66BRANCH:aarch64 = "v6.12.22-ti-arm64-r35"
67
68KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git"
69
70INSANE_SKIP:kernel-modules += "debug-deps"
diff --git a/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb
new file mode 100644
index 00000000..cc7a56ac
--- /dev/null
+++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb
@@ -0,0 +1,73 @@
1# Look in the generic major.minor directory for files
2FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
3
4SECTION = "kernel"
5SUMMARY = "BeagleBoard.org Linux kernel"
6LICENSE = "GPL-2.0-only"
7LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
8
9COMPATIBLE_MACHINE = "beagle.*"
10
11inherit kernel_deprecated
12
13require recipes-kernel/linux/setup-defconfig.inc
14require recipes-kernel/linux/ti-kernel.inc
15
16DEPENDS += "gmp-native libmpc-native"
17
18KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
19
20# Extra DT overlays/capes
21KERNEL_DEVICETREE:append:armv7a = " \
22${DT_VENDOR_PREFIX}AM335X-PRU-UIO-00A0.dtbo \
23${DT_VENDOR_PREFIX}BB-ADC-00A0.dtbo \
24${DT_VENDOR_PREFIX}BB-BBBW-WL1835-00A0.dtbo \
25${DT_VENDOR_PREFIX}BB-BBGG-WL1835-00A0.dtbo \
26${DT_VENDOR_PREFIX}BB-BBGW-WL1835-00A0.dtbo \
27${DT_VENDOR_PREFIX}BB-BONE-4D5R-01-00A1.dtbo \
28${DT_VENDOR_PREFIX}BB-BONE-eMMC1-01-00A0.dtbo \
29${DT_VENDOR_PREFIX}BB-BONE-LCD4-01-00A1.dtbo \
30${DT_VENDOR_PREFIX}BB-BONE-NH7C-01-A0.dtbo \
31${DT_VENDOR_PREFIX}BB-CAPE-DISP-CT4-00A0.dtbo \
32${DT_VENDOR_PREFIX}BB-HDMI-TDA998x-00A0.dtbo \
33${DT_VENDOR_PREFIX}BB-I2C1-MCP7940X-00A0.dtbo \
34${DT_VENDOR_PREFIX}BB-I2C1-RTC-DS3231.dtbo \
35${DT_VENDOR_PREFIX}BB-I2C1-RTC-PCF8563.dtbo \
36${DT_VENDOR_PREFIX}BB-I2C2-BME680.dtbo \
37${DT_VENDOR_PREFIX}BB-I2C2-MPU6050.dtbo \
38${DT_VENDOR_PREFIX}BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \
39${DT_VENDOR_PREFIX}BB-NHDMI-TDA998x-00A0.dtbo \
40${DT_VENDOR_PREFIX}BBORG_COMMS-00A2.dtbo \
41${DT_VENDOR_PREFIX}BBORG_FAN-A000.dtbo \
42${DT_VENDOR_PREFIX}BBORG_RELAY-00A2.dtbo \
43${DT_VENDOR_PREFIX}BB-SPIDEV0-00A0.dtbo \
44${DT_VENDOR_PREFIX}BB-SPIDEV1-00A0.dtbo \
45${DT_VENDOR_PREFIX}BB-UART1-00A0.dtbo \
46${DT_VENDOR_PREFIX}BB-UART2-00A0.dtbo \
47${DT_VENDOR_PREFIX}BB-UART4-00A0.dtbo \
48${DT_VENDOR_PREFIX}BB-W1-P9.12-00A0.dtbo \
49${DT_VENDOR_PREFIX}BONE-ADC.dtbo \
50${DT_VENDOR_PREFIX}M-BB-BBG-00A0.dtbo \
51${DT_VENDOR_PREFIX}M-BB-BBGG-00A0.dtbo \
52${DT_VENDOR_PREFIX}PB-MIKROBUS-0.dtbo \
53${DT_VENDOR_PREFIX}PB-MIKROBUS-1.dtbo \
54"
55
56S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
57
58# 6.6.58 version for 32-bit
59SRCREV:armv7a = "0d043a88f69f48789e43526d7a807ab744708071"
60PV:armv7a = "6.6.58+git"
61BRANCH:armv7a = "v6.6.58-ti-arm32-r10"
62
63# 6.6.58 version for 64-bit
64SRCREV:aarch64 = "0987ef737c9812374607475972f0868b8fecbbf7"
65PV:aarch64 = "6.6.58+git"
66BRANCH:aarch64 = "v6.6.58-ti-arm64-r23"
67
68KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git"
69
70SRC_URI += "file://no-fortify.cfg"
71KERNEL_CONFIG_FRAGMENTS += "${UNPACKDIR}/no-fortify.cfg"
72
73INSANE_SKIP:kernel-modules += "debug-deps"
diff --git a/meta-ti-bsp/SECURITY b/meta-ti-bsp/SECURITY
new file mode 100644
index 00000000..367adc34
--- /dev/null
+++ b/meta-ti-bsp/SECURITY
@@ -0,0 +1,20 @@
1How to Report a Potential Vulnerability?
2========================================
3
4If you would like to report a public issue (for example, one with a released
5CVE number), please report it to the mailing list:
6
7 https://lists.yoctoproject.org/g/meta-ti
8
9If you are dealing with a not-yet released or urgent issue, please send a
10message to one of the maintainers listed in the README. Include as many
11details as possible:
12 - the layer or software module affected
13 - the recipe and its version
14 - any example code, if available
15
16Branches maintained with security fixes
17---------------------------------------
18
19See https://wiki.yoctoproject.org/wiki/Releases for the list of current
20releases. We only accept patches for the LTS releases and the master branch.
diff --git a/meta-ti-bsp/classes/kernel-fitimage-deprecated.bbclass b/meta-ti-bsp/classes/kernel-fitimage-deprecated.bbclass
new file mode 100644
index 00000000..b1705818
--- /dev/null
+++ b/meta-ti-bsp/classes/kernel-fitimage-deprecated.bbclass
@@ -0,0 +1,839 @@
1#
2# Copyright OpenEmbedded Contributors
3#
4# SPDX-License-Identifier: MIT
5#
6
7inherit kernel-uboot-deprecated kernel-artifact-names uboot-config
8require conf/image-fitimage.conf
9
10def get_fit_replacement_type(d):
11 kerneltypes = d.getVar('KERNEL_IMAGETYPES') or ""
12 replacementtype = ""
13 if 'fitImage' in kerneltypes.split():
14 uarch = d.getVar("UBOOT_ARCH")
15 if uarch == "arm64":
16 replacementtype = "Image"
17 elif uarch == "riscv":
18 replacementtype = "Image"
19 elif uarch == "mips":
20 replacementtype = "vmlinuz.bin"
21 elif uarch == "x86":
22 replacementtype = "bzImage"
23 elif uarch == "microblaze":
24 replacementtype = "linux.bin"
25 else:
26 replacementtype = "zImage"
27 return replacementtype
28
29KERNEL_IMAGETYPE_REPLACEMENT ?= "${@get_fit_replacement_type(d)}"
30DEPENDS:append = " ${@'u-boot-tools-native dtc-native' if 'fitImage' in (d.getVar('KERNEL_IMAGETYPES') or '').split() else ''}"
31
32python __anonymous () {
33 # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal
34 # to kernel.bbclass . We have to override it, since we pack zImage
35 # (at least for now) into the fitImage .
36 typeformake = d.getVar("KERNEL_IMAGETYPE_FOR_MAKE") or ""
37 if 'fitImage' in typeformake.split():
38 d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake.replace('fitImage', d.getVar('KERNEL_IMAGETYPE_REPLACEMENT')))
39
40 image = d.getVar('INITRAMFS_IMAGE')
41 if image and not bb.utils.to_boolean(d.getVar('INITRAMFS_IMAGE_BUNDLE')):
42 if d.getVar('INITRAMFS_MULTICONFIG'):
43 mc = d.getVar('BB_CURRENT_MC')
44 d.appendVarFlag('do_assemble_fitimage_initramfs', 'mcdepends', ' mc:' + mc + ':${INITRAMFS_MULTICONFIG}:${INITRAMFS_IMAGE}:do_image_complete')
45 else:
46 d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
47
48 #check if there are any dtb providers
49 providerdtb = d.getVar("PREFERRED_PROVIDER_virtual/dtb")
50 if providerdtb:
51 d.appendVarFlag('do_assemble_fitimage', 'depends', ' virtual/dtb:do_populate_sysroot')
52 d.appendVarFlag('do_assemble_fitimage_initramfs', 'depends', ' virtual/dtb:do_populate_sysroot')
53 d.setVar('EXTERNAL_KERNEL_DEVICETREE', "${RECIPE_SYSROOT}/boot/devicetree")
54}
55
56#
57# Emit the fitImage ITS header
58#
59# $1 ... .its filename
60fitimage_emit_fit_header() {
61 cat << EOF >> $1
62/dts-v1/;
63
64/ {
65 description = "${FIT_DESC}";
66 #address-cells = <${FIT_ADDRESS_CELLS}>;
67EOF
68}
69
70#
71# Emit the fitImage section bits
72#
73# $1 ... .its filename
74# $2 ... Section bit type: imagestart - image section start
75# confstart - configuration section start
76# sectend - section end
77# fitend - fitimage end
78#
79fitimage_emit_section_maint() {
80 case $2 in
81 imagestart)
82 cat << EOF >> $1
83
84 images {
85EOF
86 ;;
87 confstart)
88 cat << EOF >> $1
89
90 configurations {
91EOF
92 ;;
93 sectend)
94 cat << EOF >> $1
95 };
96EOF
97 ;;
98 fitend)
99 cat << EOF >> $1
100};
101EOF
102 ;;
103 esac
104}
105
106#
107# Emit the fitImage ITS kernel section
108#
109# $1 ... .its filename
110# $2 ... Image counter
111# $3 ... Path to kernel image
112# $4 ... Compression type
113fitimage_emit_section_kernel() {
114
115 kernel_csum="${FIT_HASH_ALG}"
116 kernel_sign_algo="${FIT_SIGN_ALG}"
117 kernel_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
118
119 ENTRYPOINT="${UBOOT_ENTRYPOINT}"
120 if [ -n "${UBOOT_ENTRYSYMBOL}" ]; then
121 ENTRYPOINT=`${HOST_PREFIX}nm vmlinux | \
122 awk '$3=="${UBOOT_ENTRYSYMBOL}" {print "0x"$1;exit}'`
123 fi
124
125 cat << EOF >> $1
126 kernel-$2 {
127 description = "Linux kernel";
128 data = /incbin/("$3");
129 type = "${UBOOT_MKIMAGE_KERNEL_TYPE}";
130 arch = "${UBOOT_ARCH}";
131 os = "linux";
132 compression = "$4";
133 load = <${UBOOT_LOADADDRESS}>;
134 entry = <$ENTRYPOINT>;
135 hash-1 {
136 algo = "$kernel_csum";
137 };
138 };
139EOF
140
141 if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "$kernel_sign_keyname" ] ; then
142 sed -i '$ d' $1
143 cat << EOF >> $1
144 signature-1 {
145 algo = "$kernel_csum,$kernel_sign_algo";
146 key-name-hint = "$kernel_sign_keyname";
147 };
148 };
149EOF
150 fi
151}
152
153#
154# Emit the fitImage ITS DTB section
155#
156# $1 ... .its filename
157# $2 ... Image counter
158# $3 ... Path to DTB image
159fitimage_emit_section_dtb() {
160
161 dtb_csum="${FIT_HASH_ALG}"
162 dtb_sign_algo="${FIT_SIGN_ALG}"
163 dtb_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
164
165 dtb_loadline=""
166 dtb_ext=${DTB##*.}
167 if [ "${dtb_ext}" = "dtbo" ]; then
168 if [ -n "${UBOOT_DTBO_LOADADDRESS}" ]; then
169 dtb_loadline="load = <${UBOOT_DTBO_LOADADDRESS}>;"
170 fi
171 elif [ -n "${UBOOT_DTB_LOADADDRESS}" ]; then
172 dtb_loadline="load = <${UBOOT_DTB_LOADADDRESS}>;"
173 fi
174 cat << EOF >> $1
175 fdt-$2 {
176 description = "Flattened Device Tree blob";
177 data = /incbin/("$3");
178 type = "flat_dt";
179 arch = "${UBOOT_ARCH}";
180 compression = "none";
181 $dtb_loadline
182 hash-1 {
183 algo = "$dtb_csum";
184 };
185 };
186EOF
187
188 if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "$dtb_sign_keyname" ] ; then
189 sed -i '$ d' $1
190 cat << EOF >> $1
191 signature-1 {
192 algo = "$dtb_csum,$dtb_sign_algo";
193 key-name-hint = "$dtb_sign_keyname";
194 };
195 };
196EOF
197 fi
198}
199
200#
201# Emit the fitImage ITS u-boot script section
202#
203# $1 ... .its filename
204# $2 ... Image counter
205# $3 ... Path to boot script image
206fitimage_emit_section_boot_script() {
207
208 bootscr_csum="${FIT_HASH_ALG}"
209 bootscr_sign_algo="${FIT_SIGN_ALG}"
210 bootscr_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
211
212 cat << EOF >> $1
213 bootscr-$2 {
214 description = "U-boot script";
215 data = /incbin/("$3");
216 type = "script";
217 arch = "${UBOOT_ARCH}";
218 compression = "none";
219 hash-1 {
220 algo = "$bootscr_csum";
221 };
222 };
223EOF
224
225 if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "$bootscr_sign_keyname" ] ; then
226 sed -i '$ d' $1
227 cat << EOF >> $1
228 signature-1 {
229 algo = "$bootscr_csum,$bootscr_sign_algo";
230 key-name-hint = "$bootscr_sign_keyname";
231 };
232 };
233EOF
234 fi
235}
236
237#
238# Emit the fitImage ITS setup section
239#
240# $1 ... .its filename
241# $2 ... Image counter
242# $3 ... Path to setup image
243fitimage_emit_section_setup() {
244
245 setup_csum="${FIT_HASH_ALG}"
246 setup_sign_algo="${FIT_SIGN_ALG}"
247 setup_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
248
249 cat << EOF >> $1
250 setup-$2 {
251 description = "Linux setup.bin";
252 data = /incbin/("$3");
253 type = "x86_setup";
254 arch = "${UBOOT_ARCH}";
255 os = "linux";
256 compression = "none";
257 load = <0x00090000>;
258 entry = <0x00090000>;
259 hash-1 {
260 algo = "$setup_csum";
261 };
262 };
263EOF
264
265 if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "$setup_sign_keyname" ] ; then
266 sed -i '$ d' $1
267 cat << EOF >> $1
268 signature-1 {
269 algo = "$setup_csum,$setup_sign_algo";
270 key-name-hint = "$setup_sign_keyname";
271 };
272 };
273EOF
274 fi
275}
276
277#
278# Emit the fitImage ITS ramdisk section
279#
280# $1 ... .its filename
281# $2 ... Image counter
282# $3 ... Path to ramdisk image
283fitimage_emit_section_ramdisk() {
284
285 ramdisk_csum="${FIT_HASH_ALG}"
286 ramdisk_sign_algo="${FIT_SIGN_ALG}"
287 ramdisk_sign_keyname="${UBOOT_SIGN_IMG_KEYNAME}"
288 ramdisk_loadline=""
289 ramdisk_entryline=""
290
291 if [ -n "${UBOOT_RD_LOADADDRESS}" ]; then
292 ramdisk_loadline="load = <${UBOOT_RD_LOADADDRESS}>;"
293 fi
294 if [ -n "${UBOOT_RD_ENTRYPOINT}" ]; then
295 ramdisk_entryline="entry = <${UBOOT_RD_ENTRYPOINT}>;"
296 fi
297
298 cat << EOF >> $1
299 ramdisk-$2 {
300 description = "${INITRAMFS_IMAGE}";
301 data = /incbin/("$3");
302 type = "ramdisk";
303 arch = "${UBOOT_ARCH}";
304 os = "linux";
305 compression = "none";
306 $ramdisk_loadline
307 $ramdisk_entryline
308 hash-1 {
309 algo = "$ramdisk_csum";
310 };
311 };
312EOF
313
314 if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "$ramdisk_sign_keyname" ] ; then
315 sed -i '$ d' $1
316 cat << EOF >> $1
317 signature-1 {
318 algo = "$ramdisk_csum,$ramdisk_sign_algo";
319 key-name-hint = "$ramdisk_sign_keyname";
320 };
321 };
322EOF
323 fi
324}
325
326#
327# echoes symlink destination if it points below directory
328#
329# $1 ... file that's a potential symlink
330# $2 ... expected parent directory
331symlink_points_below() {
332 file="$2/$1"
333 dir=$2
334
335 if ! [ -L "$file" ]; then
336 return
337 fi
338
339 realpath="$(realpath --relative-to=$dir $file)"
340 if [ -z "${realpath%%../*}" ]; then
341 return
342 fi
343
344 echo "$realpath"
345}
346
347#
348# Emit the fitImage ITS configuration section
349#
350# $1 ... .its filename
351# $2 ... Linux kernel ID
352# $3 ... DTB image name
353# $4 ... ramdisk ID
354# $5 ... u-boot script ID
355# $6 ... config ID
356# $7 ... default flag
357# $8 ... default DTB image name
358fitimage_emit_section_config() {
359
360 conf_csum="${FIT_HASH_ALG}"
361 conf_sign_algo="${FIT_SIGN_ALG}"
362 conf_padding_algo="${FIT_PAD_ALG}"
363 if [ "${UBOOT_SIGN_ENABLE}" = "1" ] ; then
364 conf_sign_keyname="${UBOOT_SIGN_KEYNAME}"
365 fi
366
367 its_file="$1"
368 kernel_id="$2"
369 dtb_image="$3"
370 ramdisk_id="$4"
371 bootscr_id="$5"
372 config_id="$6"
373 default_flag="$7"
374 default_dtb_image="$8"
375
376 # Test if we have any DTBs at all
377 sep=""
378 conf_desc=""
379 conf_node="${FIT_CONF_PREFIX}"
380 kernel_line=""
381 fdt_line=""
382 ramdisk_line=""
383 bootscr_line=""
384 setup_line=""
385 default_line=""
386 compatible_line=""
387
388 dtb_image_sect=$(symlink_points_below $dtb_image "${EXTERNAL_KERNEL_DEVICETREE}")
389 if [ -z "$dtb_image_sect" ]; then
390 dtb_image_sect=$dtb_image
391 fi
392
393 dtb_path="${EXTERNAL_KERNEL_DEVICETREE}/${dtb_image_sect}"
394 if [ -f "$dtb_path" ] || [ -L "$dtb_path" ]; then
395 compat=$(fdtget -t s "$dtb_path" / compatible | sed 's/ /", "/g')
396 if [ -n "$compat" ]; then
397 compatible_line="compatible = \"$compat\";"
398 fi
399 fi
400
401 dtb_image=$(echo $dtb_image | tr '/' '_')
402 dtb_image_sect=$(echo "${dtb_image_sect}" | tr '/' '_')
403
404 # conf node name is selected based on dtb ID if it is present,
405 # otherwise its selected based on kernel ID
406 if [ -n "$dtb_image" ]; then
407 conf_node=$conf_node$dtb_image
408 else
409 conf_node=$conf_node$kernel_id
410 fi
411
412 if [ -n "$kernel_id" ]; then
413 conf_desc="Linux kernel"
414 sep=", "
415 kernel_line="kernel = \"kernel-$kernel_id\";"
416 fi
417
418 if [ -n "$dtb_image" ]; then
419 conf_desc="$conf_desc${sep}FDT blob"
420 sep=", "
421 fdt_line="fdt = \"fdt-$dtb_image_sect\";"
422 fi
423
424 if [ -n "$ramdisk_id" ]; then
425 conf_desc="$conf_desc${sep}ramdisk"
426 sep=", "
427 ramdisk_line="ramdisk = \"ramdisk-$ramdisk_id\";"
428 fi
429
430 if [ -n "$bootscr_id" ]; then
431 conf_desc="$conf_desc${sep}u-boot script"
432 sep=", "
433 bootscr_line="bootscr = \"bootscr-$bootscr_id\";"
434 fi
435
436 if [ -n "$config_id" ]; then
437 conf_desc="$conf_desc${sep}setup"
438 setup_line="setup = \"setup-$config_id\";"
439 fi
440
441 if [ "$default_flag" = "1" ]; then
442 # default node is selected based on dtb ID if it is present,
443 # otherwise its selected based on kernel ID
444 if [ -n "$dtb_image" ]; then
445 # Select default node as user specified dtb when
446 # multiple dtb exists.
447 if [ -n "$default_dtb_image" ]; then
448 default_line="default = \"${FIT_CONF_PREFIX}$default_dtb_image\";"
449 else
450 default_line="default = \"${FIT_CONF_PREFIX}$dtb_image\";"
451 fi
452 else
453 default_line="default = \"${FIT_CONF_PREFIX}$kernel_id\";"
454 fi
455 fi
456
457 cat << EOF >> $its_file
458 $default_line
459 $conf_node {
460 description = "$default_flag $conf_desc";
461 $compatible_line
462 $kernel_line
463 $fdt_line
464 $ramdisk_line
465 $bootscr_line
466 $setup_line
467 hash-1 {
468 algo = "$conf_csum";
469 };
470EOF
471
472 if [ -n "$conf_sign_keyname" ] ; then
473
474 sign_line="sign-images = "
475 sep=""
476
477 if [ -n "$kernel_id" ]; then
478 sign_line="$sign_line${sep}\"kernel\""
479 sep=", "
480 fi
481
482 if [ -n "$dtb_image" ]; then
483 sign_line="$sign_line${sep}\"fdt\""
484 sep=", "
485 fi
486
487 if [ -n "$ramdisk_id" ]; then
488 sign_line="$sign_line${sep}\"ramdisk\""
489 sep=", "
490 fi
491
492 if [ -n "$bootscr_id" ]; then
493 sign_line="$sign_line${sep}\"bootscr\""
494 sep=", "
495 fi
496
497 if [ -n "$config_id" ]; then
498 sign_line="$sign_line${sep}\"setup\""
499 fi
500
501 sign_line="$sign_line;"
502
503 cat << EOF >> $its_file
504 signature-1 {
505 algo = "$conf_csum,$conf_sign_algo";
506 key-name-hint = "$conf_sign_keyname";
507 padding = "$conf_padding_algo";
508 $sign_line
509 };
510EOF
511 fi
512
513 cat << EOF >> $its_file
514 };
515EOF
516}
517
518#
519# Assemble fitImage
520#
521# $1 ... .its filename
522# $2 ... fitImage name
523# $3 ... include ramdisk
524fitimage_assemble() {
525 kernelcount=1
526 dtbcount=""
527 DTBS=""
528 ramdiskcount=$3
529 setupcount=""
530 bootscr_id=""
531 default_dtb_image=""
532 rm -f $1 arch/${ARCH}/boot/$2
533
534 if [ -n "${UBOOT_SIGN_IMG_KEYNAME}" -a "${UBOOT_SIGN_KEYNAME}" = "${UBOOT_SIGN_IMG_KEYNAME}" ]; then
535 bbfatal "Keys used to sign images and configuration nodes must be different."
536 fi
537
538 fitimage_emit_fit_header $1
539
540 #
541 # Step 1: Prepare a kernel image section.
542 #
543 fitimage_emit_section_maint $1 imagestart
544
545 uboot_prep_kimage
546 fitimage_emit_section_kernel $1 $kernelcount linux.bin "$linux_comp"
547
548 #
549 # Step 2: Prepare a DTB image section
550 #
551
552 if [ -n "${KERNEL_DEVICETREE}" ]; then
553 dtbcount=1
554 for DTB in ${KERNEL_DEVICETREE}; do
555 if echo $DTB | grep -q '/dts/'; then
556 bbwarn "$DTB contains the full path to the the dts file, but only the dtb name should be used."
557 DTB=`basename $DTB | sed 's,\.dts$,.dtb,g'`
558 fi
559
560 # Skip ${DTB} if it's also provided in ${EXTERNAL_KERNEL_DEVICETREE}
561 if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ] && [ -s ${EXTERNAL_KERNEL_DEVICETREE}/${DTB} ]; then
562 continue
563 fi
564
565 DTB_PATH="${KERNEL_OUTPUT_DIR}/dts/$DTB"
566 if [ ! -e "$DTB_PATH" ]; then
567 DTB_PATH="${KERNEL_OUTPUT_DIR}/$DTB"
568 fi
569
570 # Strip off the path component from the filename
571 if "${@'false' if oe.types.boolean(d.getVar('KERNEL_DTBVENDORED')) else 'true'}"; then
572 DTB=`basename $DTB`
573 fi
574
575 # Set the default dtb image if it exists in the devicetree.
576 if [ "${FIT_CONF_DEFAULT_DTB}" = "$DTB" ];then
577 default_dtb_image=$(echo "$DTB" | tr '/' '_')
578 fi
579
580 DTB=$(echo "$DTB" | tr '/' '_')
581
582 # Skip DTB if we've picked it up previously
583 echo "$DTBS" | tr ' ' '\n' | grep -xq "$DTB" && continue
584
585 DTBS="$DTBS $DTB"
586 DTB=$(echo $DTB | tr '/' '_')
587 fitimage_emit_section_dtb $1 $DTB $DTB_PATH
588 done
589 fi
590
591 if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then
592 dtbcount=1
593 for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtb' -printf '%P\n' | sort) \
594 $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtbo' -printf '%P\n' | sort); do
595 # Set the default dtb image if it exists in the devicetree.
596 if [ ${FIT_CONF_DEFAULT_DTB} = $DTB ];then
597 default_dtb_image=$(echo "$DTB" | tr '/' '_')
598 fi
599
600 DTB=$(echo "$DTB" | tr '/' '_')
601
602 # Skip DTB/DTBO if we've picked it up previously
603 echo "$DTBS" | tr ' ' '\n' | grep -xq "$DTB" && continue
604
605 DTBS="$DTBS $DTB"
606
607 # Also skip if a symlink. We'll later have each config section point at it
608 [ $(symlink_points_below $DTB "${EXTERNAL_KERNEL_DEVICETREE}") ] && continue
609
610 DTB=$(echo $DTB | tr '/' '_')
611 fitimage_emit_section_dtb $1 $DTB "${EXTERNAL_KERNEL_DEVICETREE}/$DTB"
612 done
613 fi
614
615 if [ -n "${FIT_CONF_DEFAULT_DTB}" ] && [ -z $default_dtb_image ]; then
616 bbwarn "${FIT_CONF_DEFAULT_DTB} is not available in the list of device trees."
617 fi
618
619 #
620 # Step 3: Prepare a u-boot script section
621 #
622
623 if [ -n "${FIT_UBOOT_ENV}" ]; then
624 cp ${UNPACKDIR}/${FIT_UBOOT_ENV} ${B}
625 bootscr_id="${FIT_UBOOT_ENV}"
626 fitimage_emit_section_boot_script $1 "$bootscr_id" ${FIT_UBOOT_ENV}
627 fi
628
629 #
630 # Step 4: Prepare a setup section. (For x86)
631 #
632 if [ -e ${KERNEL_OUTPUT_DIR}/setup.bin ]; then
633 setupcount=1
634 fitimage_emit_section_setup $1 $setupcount ${KERNEL_OUTPUT_DIR}/setup.bin
635 fi
636
637 #
638 # Step 5: Prepare a ramdisk section.
639 #
640 if [ "x${ramdiskcount}" = "x1" ] && [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
641 # Find and use the first initramfs image archive type we find
642 found=
643 for img in ${FIT_SUPPORTED_INITRAMFS_FSTYPES}; do
644 initramfs_path="${INITRAMFS_DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img"
645 if [ -e "$initramfs_path" ]; then
646 bbnote "Found initramfs image: $initramfs_path"
647 found=true
648 fitimage_emit_section_ramdisk $1 "$ramdiskcount" "$initramfs_path"
649 break
650 else
651 bbnote "Did not find initramfs image: $initramfs_path"
652 fi
653 done
654
655 if [ -z "$found" ]; then
656 bbfatal "Could not find a valid initramfs type for ${INITRAMFS_IMAGE_NAME}, the supported types are: ${FIT_SUPPORTED_INITRAMFS_FSTYPES}"
657 fi
658 fi
659
660 fitimage_emit_section_maint $1 sectend
661
662 # Force the first Kernel and DTB in the default config
663 kernelcount=1
664 if [ -n "$dtbcount" ]; then
665 dtbcount=1
666 fi
667
668 #
669 # Step 6: Prepare a configurations section
670 #
671 fitimage_emit_section_maint $1 confstart
672
673 # kernel-fitimage.bbclass currently only supports a single kernel (no less or
674 # more) to be added to the FIT image along with 0 or more device trees and
675 # 0 or 1 ramdisk.
676 # It is also possible to include an initramfs bundle (kernel and rootfs in one binary)
677 # When the initramfs bundle is used ramdisk is disabled.
678 # If a device tree is to be part of the FIT image, then select
679 # the default configuration to be used is based on the dtbcount. If there is
680 # no dtb present than select the default configuation to be based on
681 # the kernelcount.
682 if [ -n "$DTBS" ]; then
683 i=1
684 for DTB in ${DTBS}; do
685 dtb_ext=${DTB##*.}
686 if [ "$dtb_ext" = "dtbo" ]; then
687 fitimage_emit_section_config $1 "" "$DTB" "" "$bootscr_id" "" "`expr $i = $dtbcount`" "$default_dtb_image"
688 else
689 fitimage_emit_section_config $1 $kernelcount "$DTB" "$ramdiskcount" "$bootscr_id" "$setupcount" "`expr $i = $dtbcount`" "$default_dtb_image"
690 fi
691 i=`expr $i + 1`
692 done
693 else
694 defaultconfigcount=1
695 fitimage_emit_section_config $1 $kernelcount "" "$ramdiskcount" "$bootscr_id" "$setupcount" $defaultconfigcount "$default_dtb_image"
696 fi
697
698 fitimage_emit_section_maint $1 sectend
699
700 fitimage_emit_section_maint $1 fitend
701
702 #
703 # Step 7: Assemble the image
704 #
705 ${UBOOT_MKIMAGE} \
706 ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
707 -f $1 \
708 ${KERNEL_OUTPUT_DIR}/$2
709
710 #
711 # Step 8: Sign the image
712 #
713 if [ "x${UBOOT_SIGN_ENABLE}" = "x1" ] ; then
714 ${UBOOT_MKIMAGE_SIGN} \
715 ${@'-D "${UBOOT_MKIMAGE_DTCOPTS}"' if len('${UBOOT_MKIMAGE_DTCOPTS}') else ''} \
716 -F -k "${UBOOT_SIGN_KEYDIR}" \
717 -r ${KERNEL_OUTPUT_DIR}/$2 \
718 ${UBOOT_MKIMAGE_SIGN_ARGS}
719 fi
720}
721
722do_assemble_fitimage() {
723 if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then
724 cd ${B}
725 fitimage_assemble fit-image.its fitImage-none ""
726 if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
727 ln -sf fitImage-none ${B}/${KERNEL_OUTPUT_DIR}/fitImage
728 fi
729 fi
730}
731
732addtask assemble_fitimage before do_install after do_compile
733
734SYSROOT_DIRS:append = " /sysroot-only"
735do_install:append() {
736 if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage" && \
737 [ "${UBOOT_SIGN_ENABLE}" = "1" ]; then
738 install -D ${B}/${KERNEL_OUTPUT_DIR}/fitImage-none ${D}/sysroot-only/fitImage
739 fi
740}
741
742do_assemble_fitimage_initramfs() {
743 if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage" && \
744 test -n "${INITRAMFS_IMAGE}" ; then
745 cd ${B}
746 if [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ]; then
747 fitimage_assemble fit-image-${INITRAMFS_IMAGE}.its fitImage-bundle ""
748 ln -sf fitImage-bundle ${B}/${KERNEL_OUTPUT_DIR}/fitImage
749 else
750 fitimage_assemble fit-image-${INITRAMFS_IMAGE}.its fitImage-${INITRAMFS_IMAGE} 1
751 fi
752 fi
753}
754
755addtask assemble_fitimage_initramfs before do_deploy after do_bundle_initramfs
756
757do_kernel_generate_rsa_keys() {
758 if [ "${UBOOT_SIGN_ENABLE}" = "0" ] && [ "${FIT_GENERATE_KEYS}" = "1" ]; then
759 bbwarn "FIT_GENERATE_KEYS is set to 1 even though UBOOT_SIGN_ENABLE is set to 0. The keys will not be generated as they won't be used."
760 fi
761
762 if [ "${UBOOT_SIGN_ENABLE}" = "1" ] && [ "${FIT_GENERATE_KEYS}" = "1" ]; then
763
764 # Generate keys to sign configuration nodes, only if they don't already exist
765 if [ ! -f "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".key ] || \
766 [ ! -f "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".crt ]; then
767
768 # make directory if it does not already exist
769 mkdir -p "${UBOOT_SIGN_KEYDIR}"
770
771 bbnote "Generating RSA private key for signing fitImage"
772 openssl genrsa ${FIT_KEY_GENRSA_ARGS} -out \
773 "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".key \
774 "${FIT_SIGN_NUMBITS}"
775
776 bbnote "Generating certificate for signing fitImage"
777 openssl req ${FIT_KEY_REQ_ARGS} "${FIT_KEY_SIGN_PKCS}" \
778 -key "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".key \
779 -out "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_KEYNAME}".crt
780 fi
781
782 # Generate keys to sign image nodes, only if they don't already exist
783 if [ ! -f "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".key ] || \
784 [ ! -f "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".crt ]; then
785
786 # make directory if it does not already exist
787 mkdir -p "${UBOOT_SIGN_KEYDIR}"
788
789 bbnote "Generating RSA private key for signing fitImage"
790 openssl genrsa ${FIT_KEY_GENRSA_ARGS} -out \
791 "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".key \
792 "${FIT_SIGN_NUMBITS}"
793
794 bbnote "Generating certificate for signing fitImage"
795 openssl req ${FIT_KEY_REQ_ARGS} "${FIT_KEY_SIGN_PKCS}" \
796 -key "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".key \
797 -out "${UBOOT_SIGN_KEYDIR}/${UBOOT_SIGN_IMG_KEYNAME}".crt
798 fi
799 fi
800}
801
802addtask kernel_generate_rsa_keys before do_assemble_fitimage after do_compile
803
804kernel_deprecated_do_deploy[vardepsexclude] = "DATETIME"
805kernel_deprecated_do_deploy:append() {
806 # Update deploy directory
807 if echo ${KERNEL_IMAGETYPES} | grep -wq "fitImage"; then
808
809 if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
810 bbnote "Copying fit-image.its source file..."
811 install -m 0644 ${B}/fit-image.its "$deployDir/fitImage-its-${KERNEL_FIT_NAME}.its"
812 if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then
813 ln -snf fitImage-its-${KERNEL_FIT_NAME}.its "$deployDir/fitImage-its-${KERNEL_FIT_LINK_NAME}"
814 fi
815
816 bbnote "Copying linux.bin file..."
817 install -m 0644 ${B}/linux.bin $deployDir/fitImage-linux.bin-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}
818 if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then
819 ln -snf fitImage-linux.bin-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT} "$deployDir/fitImage-linux.bin-${KERNEL_FIT_LINK_NAME}"
820 fi
821 fi
822
823 if [ -n "${INITRAMFS_IMAGE}" ]; then
824 bbnote "Copying fit-image-${INITRAMFS_IMAGE}.its source file..."
825 install -m 0644 ${B}/fit-image-${INITRAMFS_IMAGE}.its "$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its"
826 if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then
827 ln -snf fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}.its "$deployDir/fitImage-its-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}"
828 fi
829
830 if [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ]; then
831 bbnote "Copying fitImage-${INITRAMFS_IMAGE} file..."
832 install -m 0644 ${B}/${KERNEL_OUTPUT_DIR}/fitImage-${INITRAMFS_IMAGE} "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT}"
833 if [ -n "${KERNEL_FIT_LINK_NAME}" ] ; then
834 ln -snf fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_NAME}${KERNEL_FIT_BIN_EXT} "$deployDir/fitImage-${INITRAMFS_IMAGE_NAME}-${KERNEL_FIT_LINK_NAME}"
835 fi
836 fi
837 fi
838 fi
839}
diff --git a/meta-ti-bsp/classes/kernel-fitimage-legacyhs.bbclass b/meta-ti-bsp/classes/kernel-fitimage-legacyhs.bbclass
index 5e1fa56a..ca133457 100644
--- a/meta-ti-bsp/classes/kernel-fitimage-legacyhs.bbclass
+++ b/meta-ti-bsp/classes/kernel-fitimage-legacyhs.bbclass
@@ -1,4 +1,4 @@
1inherit ti-secdev kernel-uboot uboot-sign-legacyhs 1inherit ti-secdev kernel-uboot-deprecated uboot-sign-legacyhs
2 2
3FITIMAGE_HASH_ALGO ?= "sha1" 3FITIMAGE_HASH_ALGO ?= "sha1"
4FITIMAGE_PACK_TEE ?= "0" 4FITIMAGE_PACK_TEE ?= "0"
@@ -316,6 +316,7 @@ EOF
316# $4 ... ramdisk ID 316# $4 ... ramdisk ID
317# $5 ... config ID 317# $5 ... config ID
318# $6 ... tee ID/name 318# $6 ... tee ID/name
319# $7 ... default DTB ID
319fitimage_emit_section_config() { 320fitimage_emit_section_config() {
320 321
321 conf_csum=${FITIMAGE_HASH_ALGO} 322 conf_csum=${FITIMAGE_HASH_ALGO}
@@ -370,6 +371,16 @@ fitimage_emit_section_config() {
370 final_conf_desc="${conf_desc}" 371 final_conf_desc="${conf_desc}"
371 fi 372 fi
372 373
374 default_dtb_count=${7}
375 if [ "x${FITIMAGE_CONF_BY_NAME}" = "x1" ] ; then
376 default_conf_name="${FIT_CONF_DEFAULT_DTB}"
377 else
378 default_conf_name="conf-${default_dtb_count}"
379 fi
380 cat << EOF >> ${1}
381 default = "${default_conf_name}";
382EOF
383
373 dtbcount=1 384 dtbcount=1
374 for DTB in ${KERNEL_DEVICETREE}; do 385 for DTB in ${KERNEL_DEVICETREE}; do
375 DTB=$(basename "${DTB}") 386 DTB=$(basename "${DTB}")
@@ -386,12 +397,6 @@ fitimage_emit_section_config() {
386 fdt_line="fdt = \"fdt-${dtbcount}\";" 397 fdt_line="fdt = \"fdt-${dtbcount}\";"
387 fi 398 fi
388 399
389 if [ "x${dtbcount}" = "x1" ]; then
390 cat << EOF >> ${1}
391 default = "${conf_name}";
392EOF
393 fi
394
395# Generate a single configuration section 400# Generate a single configuration section
396 cat << EOF >> ${1} 401 cat << EOF >> ${1}
397 ${conf_name} { 402 ${conf_name} {
@@ -524,6 +529,7 @@ fitimage_assemble() {
524 ramdiskcount=${3} 529 ramdiskcount=${3}
525 setupcount="" 530 setupcount=""
526 teecount=1 531 teecount=1
532 default_dtb_count=1
527 rm -f ${1} arch/${ARCH}/boot/${2} 533 rm -f ${1} arch/${ARCH}/boot/${2}
528 534
529 fitimage_emit_fit_header ${1} 535 fitimage_emit_fit_header ${1}
@@ -544,6 +550,9 @@ fitimage_assemble() {
544 dtbcount=1 550 dtbcount=1
545 dtboaddress="${UBOOT_DTBO_LOADADDRESS}" 551 dtboaddress="${UBOOT_DTBO_LOADADDRESS}"
546 for DTB in ${KERNEL_DEVICETREE}; do 552 for DTB in ${KERNEL_DEVICETREE}; do
553 if [ "${DTB}" = "${FIT_CONF_DEFAULT_DTB}" ]; then
554 default_dtb_count=${dtbcount}
555 fi
547 if echo ${DTB} | grep -q '/dts/'; then 556 if echo ${DTB} | grep -q '/dts/'; then
548 bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used." 557 bbwarn "${DTB} contains the full path to the the dts file, but only the dtb name should be used."
549 DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` 558 DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
@@ -660,7 +669,7 @@ fitimage_assemble() {
660 else 669 else
661 teeref="${teecount}" 670 teeref="${teecount}"
662 fi 671 fi
663 fitimage_emit_section_config ${1} "${kernelcount}" "${dtbref}" "${ramdiskcount}" "${setupcount}" "${teeref}" 672 fitimage_emit_section_config ${1} "${kernelcount}" "${dtbref}" "${ramdiskcount}" "${setupcount}" "${teeref}" "${default_dtb_count}"
664 673
665 fitimage_emit_section_maint ${1} sectend 674 fitimage_emit_section_maint ${1} sectend
666 675
diff --git a/meta-ti-bsp/classes/kernel-uboot-deprecated.bbclass b/meta-ti-bsp/classes/kernel-uboot-deprecated.bbclass
new file mode 100644
index 00000000..6d4aff6b
--- /dev/null
+++ b/meta-ti-bsp/classes/kernel-uboot-deprecated.bbclass
@@ -0,0 +1,51 @@
1#
2# Copyright OpenEmbedded Contributors
3#
4# SPDX-License-Identifier: MIT
5#
6
7# fitImage kernel compression algorithm
8FIT_KERNEL_COMP_ALG ?= "gzip"
9FIT_KERNEL_COMP_ALG_EXTENSION ?= ".gz"
10
11# Kernel image type passed to mkimage (i.e. kernel kernel_noload...)
12UBOOT_MKIMAGE_KERNEL_TYPE ?= "kernel"
13
14uboot_prep_kimage() {
15 if [ -e arch/${ARCH}/boot/compressed/vmlinux ]; then
16 vmlinux_path="arch/${ARCH}/boot/compressed/vmlinux"
17 linux_suffix=""
18 linux_comp="none"
19 elif [ -e arch/${ARCH}/boot/vmlinuz.bin ]; then
20 rm -f linux.bin
21 cp -l arch/${ARCH}/boot/vmlinuz.bin linux.bin
22 vmlinux_path=""
23 linux_suffix=""
24 linux_comp="none"
25 else
26 vmlinux_path="vmlinux"
27 # Use vmlinux.initramfs for linux.bin when INITRAMFS_IMAGE_BUNDLE set
28 # As per the implementation in kernel.bbclass.
29 # See do_bundle_initramfs function
30 if [ "${INITRAMFS_IMAGE_BUNDLE}" = "1" ] && [ -e vmlinux.initramfs ]; then
31 vmlinux_path="vmlinux.initramfs"
32 fi
33 linux_suffix="${FIT_KERNEL_COMP_ALG_EXTENSION}"
34 linux_comp="${FIT_KERNEL_COMP_ALG}"
35 fi
36
37 [ -n "${vmlinux_path}" ] && ${KERNEL_OBJCOPY} -O binary -R .note -R .comment -S "${vmlinux_path}" linux.bin
38
39 if [ "${linux_comp}" != "none" ] ; then
40 if [ "${linux_comp}" = "gzip" ] ; then
41 gzip -9 linux.bin
42 elif [ "${linux_comp}" = "lzo" ] ; then
43 lzop -9 linux.bin
44 elif [ "${linux_comp}" = "lzma" ] ; then
45 xz --format=lzma -f -6 linux.bin
46 fi
47 mv -f "linux.bin${linux_suffix}" linux.bin
48 fi
49
50 echo "${linux_comp}"
51}
diff --git a/meta-ti-bsp/classes/kernel_deprecated.bbclass b/meta-ti-bsp/classes/kernel_deprecated.bbclass
new file mode 100644
index 00000000..328a08fd
--- /dev/null
+++ b/meta-ti-bsp/classes/kernel_deprecated.bbclass
@@ -0,0 +1,869 @@
1#
2# Copyright OpenEmbedded Contributors
3#
4# SPDX-License-Identifier: MIT
5#
6
7inherit linux-kernel-base kernel-module-split
8
9COMPATIBLE_HOST = ".*-linux"
10
11KERNEL_PACKAGE_NAME ??= "kernel"
12KERNEL_DEPLOYSUBDIR ??= "${@ "" if (d.getVar("KERNEL_PACKAGE_NAME") == "kernel") else d.getVar("KERNEL_PACKAGE_NAME") }"
13
14PROVIDES += "virtual/kernel"
15DEPENDS += "virtual/cross-binutils virtual/cross-cc kmod-native bc-native bison-native"
16DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lzo", "lzop-native", "", d)}"
17DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.lz4", "lz4-native", "", d)}"
18DEPENDS += "${@bb.utils.contains("INITRAMFS_FSTYPES", "cpio.zst", "zstd-native", "", d)}"
19PACKAGE_WRITE_DEPS += "depmodwrapper-cross"
20
21do_deploy[depends] += "depmodwrapper-cross:do_populate_sysroot gzip-native:do_populate_sysroot"
22do_clean[depends] += "make-mod-scripts:do_clean"
23
24# CPE entries from NVD use linux_kernel, but the raw CVE entries from the kernel CNA have
25# vendor: linux and product: linux. Note that multiple distributions use "linux" as a product
26# name, so we need to fill vendor to avoid false positives
27CVE_PRODUCT ?= "linux_kernel linux:linux"
28
29S = "${STAGING_KERNEL_DIR}"
30B = "${WORKDIR}/build"
31KBUILD_OUTPUT = "${B}"
32OE_TERMINAL_EXPORTS += "KBUILD_OUTPUT"
33
34# we include gcc above, we dont need virtual/libc
35INHIBIT_DEFAULT_DEPS = "1"
36
37KERNEL_IMAGETYPE ?= "zImage"
38INITRAMFS_IMAGE ?= ""
39INITRAMFS_TASK ?= ""
40INITRAMFS_IMAGE_BUNDLE ?= ""
41INITRAMFS_DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR_IMAGE}"
42INITRAMFS_MULTICONFIG ?= ""
43
44# KERNEL_VERSION is extracted from source code. It is evaluated as
45# None for the first parsing, since the code has not been fetched.
46# After the code is fetched, it will be evaluated as real version
47# number and cause kernel to be rebuilt. To avoid this, make
48# KERNEL_VERSION_NAME and KERNEL_VERSION_PKG_NAME depend on
49# LINUX_VERSION which is a constant.
50KERNEL_VERSION_NAME = "${@d.getVar('KERNEL_VERSION') or ""}"
51KERNEL_VERSION_NAME[vardepvalue] = "${LINUX_VERSION}"
52KERNEL_VERSION_PKG_NAME = "${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}"
53KERNEL_VERSION_PKG_NAME[vardepvalue] = "${LINUX_VERSION}"
54
55python __anonymous () {
56 pn = d.getVar("PN")
57 kpn = d.getVar("KERNEL_PACKAGE_NAME")
58
59 # XXX Remove this after bug 11905 is resolved
60 # FILES:${KERNEL_PACKAGE_NAME}-dev doesn't expand correctly
61 if kpn == pn:
62 bb.warn("Some packages (E.g. *-dev) might be missing due to "
63 "bug 11905 (variable KERNEL_PACKAGE_NAME == PN)")
64
65 # The default kernel recipe builds in a shared location defined by
66 # bitbake/distro confs: STAGING_KERNEL_DIR and STAGING_KERNEL_BUILDDIR.
67 # Set these variables to directories under ${WORKDIR} in alternate
68 # kernel recipes (I.e. where KERNEL_PACKAGE_NAME != kernel) so that they
69 # may build in parallel with the default kernel without clobbering.
70 if kpn != "kernel":
71 workdir = d.getVar("WORKDIR")
72 sourceDir = os.path.join(workdir, 'kernel-source')
73 artifactsDir = os.path.join(workdir, 'kernel-build-artifacts')
74 d.setVar("STAGING_KERNEL_DIR", sourceDir)
75 d.setVar("STAGING_KERNEL_BUILDDIR", artifactsDir)
76
77 # Merge KERNEL_IMAGETYPE and KERNEL_ALT_IMAGETYPE into KERNEL_IMAGETYPES
78 type = d.getVar('KERNEL_IMAGETYPE') or ""
79 alttype = d.getVar('KERNEL_ALT_IMAGETYPE') or ""
80 types = d.getVar('KERNEL_IMAGETYPES') or ""
81 if type not in types.split():
82 types = (type + ' ' + types).strip()
83 if alttype not in types.split():
84 types = (alttype + ' ' + types).strip()
85 d.setVar('KERNEL_IMAGETYPES', types)
86
87 # KERNEL_IMAGETYPES may contain a mixture of image types supported directly
88 # by the kernel build system and types which are created by post-processing
89 # the output of the kernel build system (e.g. compressing vmlinux ->
90 # vmlinux.gz in kernel_deprecated_do_transform_kernel()).
91 # KERNEL_IMAGETYPE_FOR_MAKE should contain only image types supported
92 # directly by the kernel build system.
93 if not d.getVar('KERNEL_IMAGETYPE_FOR_MAKE'):
94 typeformake = set()
95 for type in types.split():
96 if type == 'vmlinux.gz':
97 type = 'vmlinux'
98 typeformake.add(type)
99
100 d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', ' '.join(sorted(typeformake)))
101
102 kname = d.getVar('KERNEL_PACKAGE_NAME') or "kernel"
103 imagedest = d.getVar('KERNEL_IMAGEDEST')
104
105 for type in types.split():
106 if bb.data.inherits_class('nopackages', d):
107 continue
108 typelower = type.lower()
109 d.appendVar('PACKAGES', ' %s-image-%s' % (kname, typelower))
110 d.setVar('FILES:' + kname + '-image-' + typelower, '/' + imagedest + '/' + type + '-${KERNEL_VERSION_NAME}' + ' /' + imagedest + '/' + type)
111 d.appendVar('RDEPENDS:%s-image' % kname, ' %s-image-%s (= ${EXTENDPKGV})' % (kname, typelower))
112 splitmods = d.getVar("KERNEL_SPLIT_MODULES")
113 if splitmods != '1':
114 d.appendVar('RDEPENDS:%s-image' % kname, ' %s-modules (= ${EXTENDPKGV})' % kname)
115 d.appendVar('RDEPENDS:%s-image-%s' % (kname, typelower), ' %s-modules-${KERNEL_VERSION_PKG_NAME} (= ${EXTENDPKGV})' % kname)
116 d.setVar('PKG:%s-modules' % kname, '%s-modules-${KERNEL_VERSION_PKG_NAME}' % kname)
117 d.appendVar('RPROVIDES:%s-modules' % kname, ' %s-modules-${KERNEL_VERSION_PKG_NAME}' % kname)
118
119 d.setVar('PKG:%s-image-%s' % (kname,typelower), '%s-image-%s-${KERNEL_VERSION_PKG_NAME}' % (kname, typelower))
120 d.setVar('ALLOW_EMPTY:%s-image-%s' % (kname, typelower), '1')
121
122 if d.getVar('KERNEL_IMAGETYPE_SYMLINK') == '1':
123 d.prependVar('pkg_postinst:%s-image-%s' % (kname,typelower), """set +e
124if [ -n "$D" ]; then
125 ln -sf %s-${KERNEL_VERSION} $D/${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1
126else
127 ln -sf %s-${KERNEL_VERSION} ${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1
128 if [ $? -ne 0 ]; then
129 echo "Filesystem on ${KERNEL_IMAGEDEST}/ doesn't support symlinks, falling back to copied image (%s)."
130 install -m 0644 ${KERNEL_IMAGEDEST}/%s-${KERNEL_VERSION} ${KERNEL_IMAGEDEST}/%s
131 fi
132fi
133set -e
134""" % (type, type, type, type, type, type, type))
135 d.setVar('pkg_postrm:%s-image-%s' % (kname,typelower), """set +e
136if [ -f "${KERNEL_IMAGEDEST}/%s" -o -L "${KERNEL_IMAGEDEST}/%s" ]; then
137 rm -f ${KERNEL_IMAGEDEST}/%s > /dev/null 2>&1
138fi
139set -e
140""" % (type, type, type))
141
142
143 image = d.getVar('INITRAMFS_IMAGE')
144 # If the INTIRAMFS_IMAGE is set but the INITRAMFS_IMAGE_BUNDLE is set to 0,
145 # the do_bundle_initramfs does nothing, but the INITRAMFS_IMAGE is built
146 # standalone for use by wic and other tools.
147 if image:
148 if d.getVar('INITRAMFS_MULTICONFIG'):
149 d.appendVarFlag('do_bundle_initramfs', 'mcdepends', ' mc:${BB_CURRENT_MC}:${INITRAMFS_MULTICONFIG}:${INITRAMFS_IMAGE}:do_image_complete')
150 else:
151 d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete')
152 if image and bb.utils.to_boolean(d.getVar('INITRAMFS_IMAGE_BUNDLE')):
153 bb.build.addtask('do_transform_bundled_initramfs', 'do_deploy', 'do_bundle_initramfs', d)
154
155 # NOTE: setting INITRAMFS_TASK is for backward compatibility
156 # The preferred method is to set INITRAMFS_IMAGE, because
157 # this INITRAMFS_TASK has circular dependency problems
158 # if the initramfs requires kernel modules
159 image_task = d.getVar('INITRAMFS_TASK')
160 if image_task:
161 d.appendVarFlag('do_configure', 'depends', ' ${INITRAMFS_TASK}')
162}
163
164# Here we pull in all various kernel image types which we support.
165#
166# In case you're wondering why kernel.bbclass inherits the other image
167# types instead of the other way around, the reason for that is to
168# maintain compatibility with various currently existing meta-layers.
169# By pulling in the various kernel image types here, we retain the
170# original behavior of kernel.bbclass, so no meta-layers should get
171# broken.
172#
173# KERNEL_CLASSES by default pulls in kernel-uimage.bbclass, since this
174# used to be the default behavior when only uImage was supported. This
175# variable can be appended by users who implement support for new kernel
176# image types.
177
178KERNEL_CLASSES ?= " kernel-uimage "
179inherit_defer ${KERNEL_CLASSES}
180
181# Old style kernels may set ${S} = ${WORKDIR}/git for example
182# We need to move these over to STAGING_KERNEL_DIR. We can't just
183# create the symlink in advance as the git fetcher can't cope with
184# the symlink.
185do_unpack[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B} ${STAGING_KERNEL_BUILDDIR}"
186do_clean[cleandirs] += " ${S} ${STAGING_KERNEL_DIR} ${B} ${STAGING_KERNEL_BUILDDIR}"
187python do_symlink_kernsrc () {
188 s = d.getVar("S")
189 kernsrc = d.getVar("STAGING_KERNEL_DIR")
190 if s != kernsrc:
191 bb.utils.mkdirhier(kernsrc)
192 bb.utils.remove(kernsrc, recurse=True)
193 if s[-1] == '/':
194 # drop trailing slash, so that os.symlink(kernsrc, s) doesn't use s as
195 # directory name and fail
196 s = s[:-1]
197 if d.getVar("EXTERNALSRC"):
198 # With EXTERNALSRC S will not be wiped so we can symlink to it
199 os.symlink(s, kernsrc)
200 else:
201 import shutil
202 shutil.move(s, kernsrc)
203 os.symlink(kernsrc, s)
204}
205# do_patch is normally ordered before do_configure, but
206# externalsrc.bbclass deletes do_patch, breaking the dependency of
207# do_configure on do_symlink_kernsrc.
208addtask symlink_kernsrc before do_patch do_configure after do_unpack
209
210inherit kernel-arch deploy
211
212PACKAGES_DYNAMIC += "^${KERNEL_PACKAGE_NAME}-module-.*"
213PACKAGES_DYNAMIC += "^${KERNEL_PACKAGE_NAME}-image-.*"
214PACKAGES_DYNAMIC += "^${KERNEL_PACKAGE_NAME}-firmware-.*"
215
216export OS = "${TARGET_OS}"
217export CROSS_COMPILE = "${TARGET_PREFIX}"
218
219KERNEL_RELEASE ?= "${KERNEL_VERSION}"
220
221# The directory where built kernel lies in the kernel tree
222KERNEL_OUTPUT_DIR ?= "arch/${ARCH}/boot"
223KERNEL_IMAGEDEST ?= "boot"
224KERNEL_DTBDEST ?= "${KERNEL_IMAGEDEST}"
225KERNEL_DTBVENDORED ?= "0"
226
227#
228# configuration
229#
230KERNEL_VERSION = "${@get_kernelversion_headers('${B}')}"
231
232# kernels are generally machine specific
233PACKAGE_ARCH = "${MACHINE_ARCH}"
234
235# U-Boot support
236UBOOT_ENTRYPOINT ?= "0x20008000"
237UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}"
238
239# Some Linux kernel configurations need additional parameters on the command line
240KERNEL_EXTRA_ARGS ?= ""
241
242EXTRA_OEMAKE += ' CC="${KERNEL_CC}" LD="${KERNEL_LD}" OBJCOPY="${KERNEL_OBJCOPY}" STRIP="${KERNEL_STRIP}"'
243EXTRA_OEMAKE += ' HOSTCC="${BUILD_CC}" HOSTCFLAGS="${BUILD_CFLAGS}" HOSTLDFLAGS="${BUILD_LDFLAGS}" HOSTCPP="${BUILD_CPP}"'
244EXTRA_OEMAKE += ' HOSTCXX="${BUILD_CXX}" HOSTCXXFLAGS="${BUILD_CXXFLAGS}"'
245# Only for newer kernels (5.19+), native pkg-config variables are set for older kernels when building kernel and modules
246EXTRA_OEMAKE += ' HOSTPKG_CONFIG="pkg-config-native"'
247
248KERNEL_ALT_IMAGETYPE ??= ""
249
250copy_initramfs() {
251 echo "Copying initramfs into ./usr ..."
252 # In case the directory is not created yet from the first pass compile:
253 mkdir -p ${B}/usr
254 # Find and use the first initramfs image archive type we find
255 rm -f ${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio
256 for img in cpio cpio.gz cpio.lz4 cpio.lzo cpio.lzma cpio.xz cpio.zst; do
257 if [ -e "${INITRAMFS_DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img" ]; then
258 cp ${INITRAMFS_DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.$img ${B}/usr/.
259 case $img in
260 *gz)
261 echo "gzip decompressing image"
262 gunzip -f ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img
263 break
264 ;;
265 *lz4)
266 echo "lz4 decompressing image"
267 lz4 -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img ${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio
268 break
269 ;;
270 *lzo)
271 echo "lzo decompressing image"
272 lzop -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img
273 break
274 ;;
275 *lzma)
276 echo "lzma decompressing image"
277 lzma -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img
278 break
279 ;;
280 *xz)
281 echo "xz decompressing image"
282 xz -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img
283 break
284 ;;
285 *zst)
286 echo "zst decompressing image"
287 zstd -df ${B}/usr/${INITRAMFS_IMAGE_NAME}.$img
288 break
289 ;;
290 esac
291 break
292 fi
293 done
294 # Verify that the above loop found a initramfs, fail otherwise
295 [ -f ${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio ] && echo "Finished copy of initramfs into ./usr" || die "Could not find any ${INITRAMFS_DEPLOY_DIR_IMAGE}/${INITRAMFS_IMAGE_NAME}.cpio{.gz|.lz4|.lzo|.lzma|.xz|.zst) for bundling; INITRAMFS_IMAGE_NAME might be wrong."
296}
297
298do_bundle_initramfs () {
299 if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
300 echo "Creating a kernel image with a bundled initramfs..."
301 copy_initramfs
302 # Backing up kernel image relies on its type(regular file or symbolic link)
303 tmp_path=""
304 for imageType in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do
305 if [ -h ${KERNEL_OUTPUT_DIR}/$imageType ] ; then
306 linkpath=`readlink -n ${KERNEL_OUTPUT_DIR}/$imageType`
307 realpath=`readlink -fn ${KERNEL_OUTPUT_DIR}/$imageType`
308 mv -f $realpath $realpath.bak
309 tmp_path=$tmp_path" "$imageType"#"$linkpath"#"$realpath
310 elif [ -f ${KERNEL_OUTPUT_DIR}/$imageType ]; then
311 mv -f ${KERNEL_OUTPUT_DIR}/$imageType ${KERNEL_OUTPUT_DIR}/$imageType.bak
312 tmp_path=$tmp_path" "$imageType"##"
313 fi
314 done
315 use_alternate_initrd=CONFIG_INITRAMFS_SOURCE=${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio
316 kernel_deprecated_do_compile
317 # Restoring kernel image
318 for tp in $tmp_path ; do
319 imageType=`echo $tp|cut -d "#" -f 1`
320 linkpath=`echo $tp|cut -d "#" -f 2`
321 realpath=`echo $tp|cut -d "#" -f 3`
322 if [ -n "$realpath" ]; then
323 mv -f $realpath $realpath.initramfs
324 mv -f $realpath.bak $realpath
325 ln -sf $linkpath.initramfs ${B}/${KERNEL_OUTPUT_DIR}/$imageType.initramfs
326 else
327 mv -f ${KERNEL_OUTPUT_DIR}/$imageType ${KERNEL_OUTPUT_DIR}/$imageType.initramfs
328 mv -f ${KERNEL_OUTPUT_DIR}/$imageType.bak ${KERNEL_OUTPUT_DIR}/$imageType
329 fi
330 done
331 fi
332}
333do_bundle_initramfs[dirs] = "${B}"
334
335kernel_deprecated_do_transform_bundled_initramfs() {
336 # vmlinux.gz is not built by kernel
337 if (echo "${KERNEL_IMAGETYPES}" | grep -wq "vmlinux\.gz"); then
338 gzip -9cn < ${KERNEL_OUTPUT_DIR}/vmlinux.initramfs > ${KERNEL_OUTPUT_DIR}/vmlinux.gz.initramfs
339 fi
340}
341do_transform_bundled_initramfs[dirs] = "${B}"
342
343python do_package:prepend () {
344 d.setVar('STRIP', d.getVar('KERNEL_STRIP').strip())
345}
346
347python do_devshell:prepend () {
348 os.environ["LDFLAGS"] = ''
349}
350
351addtask bundle_initramfs after do_install before do_deploy
352
353KERNEL_DEBUG_TIMESTAMPS ??= "0"
354
355kernel_deprecated_do_compile() {
356 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
357
358 # setup native pkg-config variables (kconfig scripts call pkg-config directly, cannot generically be overriden to pkg-config-native)
359 export PKG_CONFIG_DIR="${STAGING_DIR_NATIVE}${libdir_native}/pkgconfig"
360 export PKG_CONFIG_PATH="$PKG_CONFIG_DIR:${STAGING_DATADIR_NATIVE}/pkgconfig"
361 export PKG_CONFIG_LIBDIR="$PKG_CONFIG_DIR"
362 export PKG_CONFIG_SYSROOT_DIR=""
363
364 if [ "${KERNEL_DEBUG_TIMESTAMPS}" != "1" ]; then
365 # kernel sources do not use do_unpack, so SOURCE_DATE_EPOCH may not
366 # be set....
367 if [ "${SOURCE_DATE_EPOCH}" = "" -o "${SOURCE_DATE_EPOCH}" = "0" ]; then
368 # The source directory is not necessarily a git repository, so we
369 # specify the git-dir to ensure that git does not query a
370 # repository in any parent directory.
371 SOURCE_DATE_EPOCH=`git --git-dir="${S}/.git" log -1 --pretty=%ct 2>/dev/null || echo "${REPRODUCIBLE_TIMESTAMP_ROOTFS}"`
372 fi
373
374 ts=`LC_ALL=C date -d @$SOURCE_DATE_EPOCH`
375 export KBUILD_BUILD_TIMESTAMP="$ts"
376 export KCONFIG_NOTIMESTAMP=1
377 bbnote "KBUILD_BUILD_TIMESTAMP: $ts"
378 else
379 ts=`LC_ALL=C date`
380 export KBUILD_BUILD_TIMESTAMP="$ts"
381 bbnote "KBUILD_BUILD_TIMESTAMP: $ts"
382 fi
383 # The $use_alternate_initrd is only set from
384 # do_bundle_initramfs() This variable is specifically for the
385 # case where we are making a second pass at the kernel
386 # compilation and we want to force the kernel build to use a
387 # different initramfs image. The way to do that in the kernel
388 # is to specify:
389 # make ...args... CONFIG_INITRAMFS_SOURCE=some_other_initramfs.cpio
390 if [ "$use_alternate_initrd" = "" ] && [ "${INITRAMFS_TASK}" != "" ] ; then
391 # The old style way of copying an prebuilt image and building it
392 # is turned on via INTIRAMFS_TASK != ""
393 copy_initramfs
394 use_alternate_initrd=CONFIG_INITRAMFS_SOURCE=${B}/usr/${INITRAMFS_IMAGE_NAME}.cpio
395 fi
396 for typeformake in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do
397 oe_runmake ${PARALLEL_MAKE} ${typeformake} ${KERNEL_EXTRA_ARGS} $use_alternate_initrd
398 done
399}
400
401kernel_deprecated_do_transform_kernel() {
402 # vmlinux.gz is not built by kernel
403 if (echo "${KERNEL_IMAGETYPES}" | grep -wq "vmlinux\.gz"); then
404 mkdir -p "${KERNEL_OUTPUT_DIR}"
405 gzip -9cn < ${B}/vmlinux > "${KERNEL_OUTPUT_DIR}/vmlinux.gz"
406 fi
407}
408do_transform_kernel[dirs] = "${B}"
409addtask transform_kernel after do_compile before do_install
410
411do_compile_kernelmodules() {
412 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
413
414 # setup native pkg-config variables (kconfig scripts call pkg-config directly, cannot generically be overriden to pkg-config-native)
415 export PKG_CONFIG_DIR="${STAGING_DIR_NATIVE}${libdir_native}/pkgconfig"
416 export PKG_CONFIG_PATH="$PKG_CONFIG_DIR:${STAGING_DATADIR_NATIVE}/pkgconfig"
417 export PKG_CONFIG_LIBDIR="$PKG_CONFIG_DIR"
418 export PKG_CONFIG_SYSROOT_DIR=""
419
420 if [ "${KERNEL_DEBUG_TIMESTAMPS}" != "1" ]; then
421 # kernel sources do not use do_unpack, so SOURCE_DATE_EPOCH may not
422 # be set....
423 if [ "${SOURCE_DATE_EPOCH}" = "" -o "${SOURCE_DATE_EPOCH}" = "0" ]; then
424 # The source directory is not necessarily a git repository, so we
425 # specify the git-dir to ensure that git does not query a
426 # repository in any parent directory.
427 SOURCE_DATE_EPOCH=`git --git-dir="${S}/.git" log -1 --pretty=%ct 2>/dev/null || echo "${REPRODUCIBLE_TIMESTAMP_ROOTFS}"`
428 fi
429
430 ts=`LC_ALL=C date -d @$SOURCE_DATE_EPOCH`
431 export KBUILD_BUILD_TIMESTAMP="$ts"
432 export KCONFIG_NOTIMESTAMP=1
433 bbnote "KBUILD_BUILD_TIMESTAMP: $ts"
434 else
435 ts=`LC_ALL=C date`
436 export KBUILD_BUILD_TIMESTAMP="$ts"
437 bbnote "KBUILD_BUILD_TIMESTAMP: $ts"
438 fi
439 if (grep -q -i -e '^CONFIG_MODULES=y$' ${B}/.config); then
440 oe_runmake -C ${B} ${PARALLEL_MAKE} modules ${KERNEL_EXTRA_ARGS}
441
442 # Module.symvers gets updated during the
443 # building of the kernel modules. We need to
444 # update this in the shared workdir since some
445 # external kernel modules has a dependency on
446 # other kernel modules and will look at this
447 # file to do symbol lookups
448 cp ${B}/Module.symvers ${STAGING_KERNEL_BUILDDIR}/
449 # 5.10+ kernels have module.lds that we need to copy for external module builds
450 if [ -e "${B}/scripts/module.lds" ]; then
451 install -Dm 0644 ${B}/scripts/module.lds ${STAGING_KERNEL_BUILDDIR}/scripts/module.lds
452 fi
453 else
454 bbnote "no modules to compile"
455 fi
456}
457addtask compile_kernelmodules after do_compile before do_strip
458
459kernel_deprecated_do_install() {
460 #
461 # First install the modules
462 #
463 unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
464 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
465 oe_runmake DEPMOD=echo MODLIB=${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION} INSTALL_FW_PATH=${D}${nonarch_base_libdir}/firmware modules_install
466 rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
467 rm -f "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/source"
468 # Remove empty module directories to prevent QA issues
469 [ -d "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" ] && find "${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/kernel" -type d -empty -delete
470 else
471 bbnote "no modules to install"
472 fi
473
474 #
475 # Install various kernel output (zImage, map file, config, module support files)
476 #
477 install -d ${D}/${KERNEL_IMAGEDEST}
478
479 #
480 # When including an initramfs bundle inside a FIT image, the fitImage is created after the install task
481 # by do_assemble_fitimage_initramfs.
482 # This happens after the generation of the initramfs bundle (done by do_bundle_initramfs).
483 # So, at the level of the install task we should not try to install the fitImage. fitImage is still not
484 # generated yet.
485 # After the generation of the fitImage, the deploy task copies the fitImage from the build directory to
486 # the deploy folder.
487 #
488
489 for imageType in ${KERNEL_IMAGETYPES} ; do
490 if [ $imageType != "fitImage" ] || [ "${INITRAMFS_IMAGE_BUNDLE}" != "1" ] ; then
491 install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType ${D}/${KERNEL_IMAGEDEST}/$imageType-${KERNEL_VERSION}
492 fi
493 done
494
495 install -m 0644 System.map ${D}/${KERNEL_IMAGEDEST}/System.map-${KERNEL_VERSION}
496 install -m 0644 .config ${D}/${KERNEL_IMAGEDEST}/config-${KERNEL_VERSION}
497 install -m 0644 vmlinux ${D}/${KERNEL_IMAGEDEST}/vmlinux-${KERNEL_VERSION}
498 ! [ -e Module.symvers ] || install -m 0644 Module.symvers ${D}/${KERNEL_IMAGEDEST}/Module.symvers-${KERNEL_VERSION}
499}
500
501# Must be ran no earlier than after do_kernel_checkout or else Makefile won't be in ${S}/Makefile
502do_kernel_version_sanity_check() {
503 if [ "x${KERNEL_VERSION_SANITY_SKIP}" = "x1" ]; then
504 exit 0
505 fi
506
507 # The Makefile determines the kernel version shown at runtime
508 # Don't use KERNEL_VERSION because the headers it grabs the version from aren't generated until do_compile
509 VERSION=$(grep "^VERSION =" ${S}/Makefile | sed s/.*=\ *//)
510 PATCHLEVEL=$(grep "^PATCHLEVEL =" ${S}/Makefile | sed s/.*=\ *//)
511 SUBLEVEL=$(grep "^SUBLEVEL =" ${S}/Makefile | sed s/.*=\ *//)
512 EXTRAVERSION=$(grep "^EXTRAVERSION =" ${S}/Makefile | sed s/.*=\ *//)
513
514 # Build a string for regex and a plain version string
515 reg="^${VERSION}\.${PATCHLEVEL}"
516 vers="${VERSION}.${PATCHLEVEL}"
517 if [ -n "${SUBLEVEL}" ]; then
518 # Ignoring a SUBLEVEL of zero is fine
519 if [ "${SUBLEVEL}" = "0" ]; then
520 reg="${reg}(\.${SUBLEVEL})?"
521 else
522 reg="${reg}\.${SUBLEVEL}"
523 vers="${vers}.${SUBLEVEL}"
524 fi
525 fi
526 vers="${vers}${EXTRAVERSION}"
527 reg="${reg}${EXTRAVERSION}"
528
529 if [ -z `echo ${PV} | grep -E "${reg}"` ]; then
530 bbfatal "Package Version (${PV}) does not match of kernel being built (${vers}). Please update the PV variable to match the kernel source or set KERNEL_VERSION_SANITY_SKIP=\"1\" in your recipe."
531 fi
532 exit 0
533}
534
535addtask shared_workdir after do_compile before do_compile_kernelmodules
536addtask shared_workdir_setscene
537
538do_shared_workdir_setscene () {
539 exit 1
540}
541
542emit_depmod_pkgdata() {
543 # Stash data for depmod
544 install -d ${PKGDESTWORK}/${KERNEL_PACKAGE_NAME}-depmod/
545 echo "${KERNEL_VERSION}" > ${PKGDESTWORK}/${KERNEL_PACKAGE_NAME}-depmod/${KERNEL_PACKAGE_NAME}-abiversion
546 cp ${B}/System.map ${PKGDESTWORK}/${KERNEL_PACKAGE_NAME}-depmod/System.map-${KERNEL_VERSION}
547}
548
549PACKAGEFUNCS += "emit_depmod_pkgdata"
550
551do_shared_workdir[cleandirs] += " ${STAGING_KERNEL_BUILDDIR}"
552do_shared_workdir () {
553 cd ${B}
554
555 kerneldir=${STAGING_KERNEL_BUILDDIR}
556 install -d $kerneldir
557
558 #
559 # Store the kernel version in sysroots for module-base.bbclass
560 #
561
562 echo "${KERNEL_VERSION}" > $kerneldir/${KERNEL_PACKAGE_NAME}-abiversion
563 echo "${KERNEL_LOCALVERSION}" > $kerneldir/${KERNEL_PACKAGE_NAME}-localversion
564
565 # Copy files required for module builds
566 cp System.map $kerneldir/System.map-${KERNEL_VERSION}
567 ! [ -e Module.symvers ] || cp Module.symvers $kerneldir/
568 cp .config $kerneldir/
569 mkdir -p $kerneldir/include/config
570 cp include/config/kernel.release $kerneldir/include/config/kernel.release
571 if [ -e certs/signing_key.x509 ]; then
572 # The signing_key.* files are stored in the certs/ dir in
573 # newer Linux kernels
574 mkdir -p $kerneldir/certs
575 cp certs/signing_key.* $kerneldir/certs/
576 elif [ -e signing_key.priv ]; then
577 cp signing_key.* $kerneldir/
578 fi
579
580 # We can also copy over all the generated files and avoid special cases
581 # like version.h, but we've opted to keep this small until file creep starts
582 # to happen
583 if [ -e include/linux/version.h ]; then
584 mkdir -p $kerneldir/include/linux
585 cp include/linux/version.h $kerneldir/include/linux/version.h
586 fi
587
588 # As of Linux kernel version 3.0.1, the clean target removes
589 # arch/powerpc/lib/crtsavres.o which is present in
590 # KBUILD_LDFLAGS_MODULE, making it required to build external modules.
591 if [ ${ARCH} = "powerpc" ]; then
592 if [ -e arch/powerpc/lib/crtsavres.o ]; then
593 mkdir -p $kerneldir/arch/powerpc/lib/
594 cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
595 fi
596 fi
597
598 if [ -d include/generated ]; then
599 mkdir -p $kerneldir/include/generated/
600 cp -fR include/generated/* $kerneldir/include/generated/
601 fi
602
603 if [ -d arch/${ARCH}/include/generated ]; then
604 mkdir -p $kerneldir/arch/${ARCH}/include/generated/
605 cp -fR arch/${ARCH}/include/generated/* $kerneldir/arch/${ARCH}/include/generated/
606 fi
607
608 if (grep -q -i -e '^CONFIG_UNWINDER_ORC=y$' $kerneldir/.config); then
609 # With CONFIG_UNWINDER_ORC (the default in 4.14), objtool is required for
610 # out-of-tree modules to be able to generate object files.
611 if [ -x tools/objtool/objtool ]; then
612 mkdir -p ${kerneldir}/tools/objtool
613 cp tools/objtool/objtool ${kerneldir}/tools/objtool/
614 fi
615 fi
616
617 # When building with CONFIG_MODVERSIONS=y and CONFIG_RANDSTRUCT=y we need
618 # to copy the build assets generated for the randstruct seed to
619 # STAGING_KERNEL_BUILDDIR, otherwise the out-of-tree modules build will
620 # generate those assets which will result in a different
621 # RANDSTRUCT_HASHED_SEED
622 if [ -d scripts/basic ]; then
623 mkdir -p ${kerneldir}/scripts
624 cp -r scripts/basic ${kerneldir}/scripts
625 fi
626
627 if [ -d scripts/gcc-plugins ]; then
628 mkdir -p ${kerneldir}/scripts
629 cp -r scripts/gcc-plugins ${kerneldir}/scripts
630 fi
631
632}
633
634# We don't need to stage anything, not the modules/firmware since those would clash with linux-firmware
635SYSROOT_DIRS = ""
636
637KERNEL_CONFIG_COMMAND ?= "oe_runmake_call -C ${S} O=${B} olddefconfig || oe_runmake -C ${S} O=${B} oldnoconfig"
638
639python check_oldest_kernel() {
640 oldest_kernel = d.getVar('OLDEST_KERNEL')
641 kernel_version = d.getVar('KERNEL_VERSION')
642 tclibc = d.getVar('TCLIBC')
643 if tclibc == 'glibc':
644 kernel_version = kernel_version.split('-', 1)[0]
645 if oldest_kernel and kernel_version:
646 if bb.utils.vercmp_string(kernel_version, oldest_kernel) < 0:
647 bb.warn('%s: OLDEST_KERNEL is "%s" but the version of the kernel you are building is "%s" - therefore %s as built may not be compatible with this kernel. Either set OLDEST_KERNEL to an older version, or build a newer kernel.' % (d.getVar('PN'), oldest_kernel, kernel_version, tclibc))
648}
649
650check_oldest_kernel[vardepsexclude] += "OLDEST_KERNEL KERNEL_VERSION"
651do_compile[postfuncs] += "check_oldest_kernel"
652
653KERNEL_LOCALVERSION ??= ""
654
655# 6.3+ requires the variable LOCALVERSION to be set to not get a "+" in
656# the local version. Having it empty means nothing will be added, and any
657# value will be appended to the local kernel version. This replaces the
658# use of .scmversion file for setting a localversion without using
659# the CONFIG_LOCALVERSION option.
660#
661# Note: This class saves the value of localversion to a file
662# so other recipes like make-mod-scripts can restore it via the
663# helper function get_kernellocalversion_file
664export LOCALVERSION = "${KERNEL_LOCALVERSION}"
665
666kernel_deprecated_do_configure() {
667 # fixes extra + in /lib/modules/2.6.37+
668 # $ scripts/setlocalversion . => +
669 # $ make kernelversion => 2.6.37
670 # $ make kernelrelease => 2.6.37+
671 # See kernel-arch.bbclass for post v6.3 removal of the extra
672 # + in localversion. .scmversion is no longer used, and the
673 # variable LOCALVERSION must be used
674 if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]; then
675 echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion
676 echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion
677 fi
678
679 if [ "${S}" != "${B}" ] && [ -f "${S}/.config" ] && [ ! -f "${B}/.config" ]; then
680 mv "${S}/.config" "${B}/.config"
681 fi
682
683 # Copy defconfig to .config if .config does not exist. This allows
684 # recipes to manage the .config themselves in do_configure:prepend().
685 if [ -f "${UNPACKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then
686 cp "${UNPACKDIR}/defconfig" "${B}/.config"
687 fi
688
689 ${KERNEL_CONFIG_COMMAND}
690}
691
692inherit cml1 pkgconfig
693
694EXPORT_FUNCTIONS do_compile do_transform_kernel do_transform_bundled_initramfs do_install do_configure
695
696# kernel-base becomes kernel-${KERNEL_VERSION}
697# kernel-image becomes kernel-image-${KERNEL_VERSION}
698PACKAGES = "${KERNEL_PACKAGE_NAME} ${KERNEL_PACKAGE_NAME}-base ${KERNEL_PACKAGE_NAME}-vmlinux ${KERNEL_PACKAGE_NAME}-image ${KERNEL_PACKAGE_NAME}-dev ${KERNEL_PACKAGE_NAME}-modules ${KERNEL_PACKAGE_NAME}-dbg"
699FILES:${PN} = ""
700FILES:${KERNEL_PACKAGE_NAME}-base = "${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.order ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/modules.builtin.modinfo"
701FILES:${KERNEL_PACKAGE_NAME}-image = ""
702FILES:${KERNEL_PACKAGE_NAME}-dev = "/${KERNEL_IMAGEDEST}/System.map* /${KERNEL_IMAGEDEST}/Module.symvers* /${KERNEL_IMAGEDEST}/config* ${KERNEL_SRC_PATH} ${nonarch_base_libdir}/modules/${KERNEL_VERSION}/build"
703FILES:${KERNEL_PACKAGE_NAME}-vmlinux = "/${KERNEL_IMAGEDEST}/vmlinux-${KERNEL_VERSION_NAME}"
704FILES:${KERNEL_PACKAGE_NAME}-modules = ""
705FILES:${KERNEL_PACKAGE_NAME}-dbg = "/usr/lib/debug /usr/src/debug"
706RDEPENDS:${KERNEL_PACKAGE_NAME} = "${KERNEL_PACKAGE_NAME}-base (= ${EXTENDPKGV})"
707# Allow machines to override this dependency if kernel image files are
708# not wanted in images as standard
709RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base ?= "${KERNEL_PACKAGE_NAME}-image (= ${EXTENDPKGV})"
710PKG:${KERNEL_PACKAGE_NAME}-image = "${KERNEL_PACKAGE_NAME}-image-${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}"
711RPROVIDES:${KERNEL_PACKAGE_NAME}-image += "${KERNEL_PACKAGE_NAME}-image"
712RDEPENDS:${KERNEL_PACKAGE_NAME}-image += "${@oe.utils.conditional('KERNEL_IMAGETYPE', 'vmlinux', '${KERNEL_PACKAGE_NAME}-vmlinux (= ${EXTENDPKGV})', '', d)}"
713PKG:${KERNEL_PACKAGE_NAME}-base = "${KERNEL_PACKAGE_NAME}-${@legitimize_package_name(d.getVar('KERNEL_VERSION'))}"
714RPROVIDES:${KERNEL_PACKAGE_NAME}-base += "${KERNEL_PACKAGE_NAME}-${KERNEL_VERSION} ${KERNEL_PACKAGE_NAME}-base"
715ALLOW_EMPTY:${KERNEL_PACKAGE_NAME} = "1"
716ALLOW_EMPTY:${KERNEL_PACKAGE_NAME}-base = "1"
717ALLOW_EMPTY:${KERNEL_PACKAGE_NAME}-image = "1"
718ALLOW_EMPTY:${KERNEL_PACKAGE_NAME}-modules = "1"
719DESCRIPTION:${KERNEL_PACKAGE_NAME}-modules = "Kernel modules meta package"
720
721pkg_postinst:${KERNEL_PACKAGE_NAME}-base () {
722 if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
723 mkdir -p $D/lib/modules/${KERNEL_VERSION}
724 fi
725 if [ -n "$D" ]; then
726 depmodwrapper -a -b $D ${KERNEL_VERSION} ${KERNEL_PACKAGE_NAME}
727 else
728 depmod -a ${KERNEL_VERSION}
729 fi
730}
731
732PACKAGESPLITFUNCS =+ "split_kernel_packages"
733
734python split_kernel_packages () {
735 do_split_packages(d, root='${nonarch_base_libdir}/firmware', file_regex=r'^(.*)\.(bin|fw|cis|csp|dsp)$', output_pattern='${KERNEL_PACKAGE_NAME}-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='')
736}
737
738# Many scripts want to look in arch/$arch/boot for the bootable
739# image. This poses a problem for vmlinux and vmlinuz based
740# booting. This task arranges to have vmlinux and vmlinuz appear
741# in the normalized directory location.
742do_kernel_link_images() {
743 if [ ! -d "${B}/arch/${ARCH}/boot" ]; then
744 mkdir ${B}/arch/${ARCH}/boot
745 fi
746 cd ${B}/arch/${ARCH}/boot
747 ln -sf ../../../vmlinux
748 if [ -f ../../../vmlinuz ]; then
749 ln -sf ../../../vmlinuz
750 fi
751 if [ -f ../../../vmlinuz.bin ]; then
752 ln -sf ../../../vmlinuz.bin
753 fi
754 if [ -f ../../../vmlinux.64 ]; then
755 ln -sf ../../../vmlinux.64
756 fi
757}
758addtask kernel_link_images after do_compile before do_strip
759
760python do_strip() {
761 import shutil
762
763 strip = d.getVar('KERNEL_STRIP')
764 extra_sections = d.getVar('KERNEL_IMAGE_STRIP_EXTRA_SECTIONS')
765 kernel_image = d.getVar('B') + "/" + d.getVar('KERNEL_OUTPUT_DIR') + "/vmlinux"
766
767 if (extra_sections and kernel_image.find(d.getVar('KERNEL_IMAGEDEST') + '/vmlinux') != -1):
768 kernel_image_stripped = kernel_image + ".stripped"
769 shutil.copy2(kernel_image, kernel_image_stripped)
770 oe.package.runstrip((kernel_image_stripped, 8, strip, extra_sections))
771 bb.debug(1, "KERNEL_IMAGE_STRIP_EXTRA_SECTIONS is set, stripping sections: " + \
772 extra_sections)
773}
774do_strip[dirs] = "${B}"
775
776addtask strip before do_sizecheck after do_kernel_link_images
777
778# Support checking the kernel size since some kernels need to reside in partitions
779# with a fixed length or there is a limit in transferring the kernel to memory.
780# If more than one image type is enabled, warn on any that don't fit but only fail
781# if none fit.
782do_sizecheck() {
783 if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
784 invalid=`echo ${KERNEL_IMAGE_MAXSIZE} | sed 's/[0-9]//g'`
785 if [ -n "$invalid" ]; then
786 die "Invalid KERNEL_IMAGE_MAXSIZE: ${KERNEL_IMAGE_MAXSIZE}, should be an integer (The unit is Kbytes)"
787 fi
788 at_least_one_fits=
789 for imageType in ${KERNEL_IMAGETYPES} ; do
790 size=`du -ks ${B}/${KERNEL_OUTPUT_DIR}/$imageType | awk '{print $1}'`
791 if [ $size -gt ${KERNEL_IMAGE_MAXSIZE} ]; then
792 bbwarn "This kernel $imageType (size=$size(K) > ${KERNEL_IMAGE_MAXSIZE}(K)) is too big for your device."
793 else
794 at_least_one_fits=y
795 fi
796 done
797 if [ -z "$at_least_one_fits" ]; then
798 die "All kernel images are too big for your device. Please reduce the size of the kernel by making more of it modular."
799 fi
800 fi
801}
802do_sizecheck[dirs] = "${B}"
803
804addtask sizecheck before do_install after do_strip
805
806inherit kernel-artifact-names
807
808kernel_deprecated_do_deploy() {
809 deployDir="${DEPLOYDIR}"
810 if [ -n "${KERNEL_DEPLOYSUBDIR}" ]; then
811 deployDir="${DEPLOYDIR}/${KERNEL_DEPLOYSUBDIR}"
812 mkdir "$deployDir"
813 fi
814
815 for imageType in ${KERNEL_IMAGETYPES} ; do
816 baseName=$imageType-${KERNEL_IMAGE_NAME}
817
818 if [ -s ${KERNEL_OUTPUT_DIR}/$imageType.stripped ] ; then
819 install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType.stripped $deployDir/$baseName${KERNEL_IMAGE_BIN_EXT}
820 else
821 install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType $deployDir/$baseName${KERNEL_IMAGE_BIN_EXT}
822 fi
823 if [ -n "${KERNEL_IMAGE_LINK_NAME}" ] ; then
824 ln -sf $baseName${KERNEL_IMAGE_BIN_EXT} $deployDir/$imageType-${KERNEL_IMAGE_LINK_NAME}${KERNEL_IMAGE_BIN_EXT}
825 fi
826 if [ "${KERNEL_IMAGETYPE_SYMLINK}" = "1" ] ; then
827 ln -sf $baseName${KERNEL_IMAGE_BIN_EXT} $deployDir/$imageType
828 fi
829 done
830
831 if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
832 mkdir -p ${D}${root_prefix}/lib
833 if [ -n "${SOURCE_DATE_EPOCH}" ]; then
834 TAR_ARGS="--sort=name --clamp-mtime --mtime=@${SOURCE_DATE_EPOCH}"
835 else
836 TAR_ARGS=""
837 fi
838 TAR_ARGS="$TAR_ARGS --owner=0 --group=0"
839 tar $TAR_ARGS -cv -C ${D}${root_prefix} lib | gzip -9n > $deployDir/modules-${MODULE_TARBALL_NAME}.tgz
840
841 if [ -n "${MODULE_TARBALL_LINK_NAME}" ] ; then
842 ln -sf modules-${MODULE_TARBALL_NAME}.tgz $deployDir/modules-${MODULE_TARBALL_LINK_NAME}.tgz
843 fi
844 fi
845
846 if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
847 for imageType in ${KERNEL_IMAGETYPES} ; do
848 if [ "$imageType" = "fitImage" ] ; then
849 continue
850 fi
851 initramfsBaseName=$imageType-${INITRAMFS_NAME}
852 install -m 0644 ${KERNEL_OUTPUT_DIR}/$imageType.initramfs $deployDir/$initramfsBaseName${KERNEL_IMAGE_BIN_EXT}
853 if [ -n "${INITRAMFS_LINK_NAME}" ] ; then
854 ln -sf $initramfsBaseName${KERNEL_IMAGE_BIN_EXT} $deployDir/$imageType-${INITRAMFS_LINK_NAME}${KERNEL_IMAGE_BIN_EXT}
855 fi
856 done
857 fi
858}
859
860# We deploy to filenames that include PKGV and PKGR, read the saved data to
861# ensure we get the right values for both
862do_deploy[prefuncs] += "read_subpackage_metadata"
863
864addtask deploy after do_populate_sysroot do_packagedata
865
866EXPORT_FUNCTIONS do_deploy
867
868# Add using Device Tree support
869inherit kernel-devicetree
diff --git a/meta-ti-bsp/conf/layer.conf b/meta-ti-bsp/conf/layer.conf
index 03cbd7ea..481daf2c 100644
--- a/meta-ti-bsp/conf/layer.conf
+++ b/meta-ti-bsp/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-ti-bsp"
9BBFILE_PATTERN_meta-ti-bsp := "^${LAYERDIR}/" 9BBFILE_PATTERN_meta-ti-bsp := "^${LAYERDIR}/"
10BBFILE_PRIORITY_meta-ti-bsp = "6" 10BBFILE_PRIORITY_meta-ti-bsp = "6"
11 11
12LAYERSERIES_COMPAT_meta-ti-bsp = "nanbield scarthgap styhead" 12LAYERSERIES_COMPAT_meta-ti-bsp = "walnascar whinlatter"
13 13
14LICENSE_PATH += "${LAYERDIR}/licenses" 14LICENSE_PATH += "${LAYERDIR}/licenses"
15 15
@@ -18,10 +18,6 @@ LAYERDEPENDS_meta-ti-bsp = " \
18 meta-arm \ 18 meta-arm \
19" 19"
20 20
21BBFILES_DYNAMIC += " \
22 clang-layer:${LAYERDIR}/dynamic-layers/clang-layer/recipes*/*/*.bbappend \
23"
24
25SIGGEN_EXCLUDERECIPES_ABISAFE += " \ 21SIGGEN_EXCLUDERECIPES_ABISAFE += " \
26 mesa-pvr \ 22 mesa-pvr \
27" 23"
diff --git a/meta-ti-bsp/conf/machine/am335x-evm.conf b/meta-ti-bsp/conf/machine/am335x-evm.conf
index 5b7739ce..029e761b 100644
--- a/meta-ti-bsp/conf/machine/am335x-evm.conf
+++ b/meta-ti-bsp/conf/machine/am335x-evm.conf
@@ -22,7 +22,7 @@ SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS3"
22# UBI: logical eraseblock size: 126976 bytes 22# UBI: logical eraseblock size: 126976 bytes
23# from ubiattach stdout: 23# from ubiattach stdout:
24# UBI device number 0, total 1988 LEBs 24# UBI device number 0, total 1988 LEBs
25MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 13000" 25MKUBIFS_ARGS ?= "-F -m 2048 -e 126976 -c 16000"
26 26
27# do ubiattach /dev/ubi_ctrl -m 7 -O 2048 27# do ubiattach /dev/ubi_ctrl -m 7 -O 2048
28# from dmesg: 28# from dmesg:
diff --git a/meta-ti-bsp/conf/machine/am437x-evm.conf b/meta-ti-bsp/conf/machine/am437x-evm.conf
index 58b7996f..248add70 100644
--- a/meta-ti-bsp/conf/machine/am437x-evm.conf
+++ b/meta-ti-bsp/conf/machine/am437x-evm.conf
@@ -21,7 +21,7 @@ SERIAL_CONSOLES = "115200;ttyS0"
21# UBI: logical eraseblock size: 253952 bytes 21# UBI: logical eraseblock size: 253952 bytes
22# from ubiattach stdout: 22# from ubiattach stdout:
23# UBI device number 0, total 994 LEBs 23# UBI device number 0, total 994 LEBs
24MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 6000" 24MKUBIFS_ARGS = "-F -m 4096 -e 253952 -c 8000"
25 25
26# do ubiattach /dev/ubi_ctrl -m 11 -O 4096 26# do ubiattach /dev/ubi_ctrl -m 11 -O 4096
27# from dmesg: 27# from dmesg:
diff --git a/meta-ti-bsp/conf/machine/am57xx-evm.conf b/meta-ti-bsp/conf/machine/am57xx-evm.conf
index 09eb4705..f9ff90c2 100644
--- a/meta-ti-bsp/conf/machine/am57xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am57xx-evm.conf
@@ -25,13 +25,22 @@ KERNEL_DEVICETREE_DTBMERGE = " \
25" 25"
26 26
27KERNEL_DEVICETREE = " \ 27KERNEL_DEVICETREE = " \
28 ti/omap/am57xx-beagle-x15.dtb \ 28 ti/omap/am571x-idk-touchscreen.dtbo \
29 ti/omap/am57xx-beagle-x15-revb1.dtb \
30 ti/omap/am57xx-beagle-x15-revc.dtb \
31 ti/omap/am5729-beagleboneai.dtb \
32 ti/omap/am571x-idk.dtb \ 29 ti/omap/am571x-idk.dtb \
30 ti/omap/am5729-beagleboneai.dtb \
31 ti/omap/am572x-idk-touchscreen.dtbo \
33 ti/omap/am572x-idk.dtb \ 32 ti/omap/am572x-idk.dtb \
34 ti/omap/am574x-idk.dtb \ 33 ti/omap/am574x-idk.dtb \
34 ti/omap/am57xx-beagle-x15-revb1.dtb \
35 ti/omap/am57xx-beagle-x15-revc.dtb \
36 ti/omap/am57xx-beagle-x15.dtb \
37 ti/omap/am57xx-cl-som-am57x.dtb \
38 ti/omap/am57xx-evm-reva3.dtb \
39 ti/omap/am57xx-evm.dtb \
40 ti/omap/am57xx-evm.dtbo \
41 ti/omap/am57xx-idk-lcd-osd101t2045.dtbo \
42 ti/omap/am57xx-idk-lcd-osd101t2587.dtbo \
43 ti/omap/am57xx-sbc-am57x.dtb \
35" 44"
36 45
37UBOOT_MACHINE = "am57xx_evm_config" 46UBOOT_MACHINE = "am57xx_evm_config"
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
index 2af3317e..ab14feef 100644
--- a/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm-k3r5.conf
@@ -9,3 +9,5 @@ SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "hs-fs" 9SYSFW_SUFFIX = "hs-fs"
10 10
11UBOOT_MACHINE = "am62ax_evm_r5_defconfig" 11UBOOT_MACHINE = "am62ax_evm_r5_defconfig"
12
13UBOOT_CONFIG_FRAGMENTS:ti-falcon = "am62x_r5_falcon.config"
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf
index 238718d0..faeb34a9 100644
--- a/meta-ti-bsp/conf/machine/am62axx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf
@@ -12,7 +12,14 @@ KERNEL_DEVICETREE_PREFIX = " \
12" 12"
13 13
14KERNEL_DEVICETREE = " \ 14KERNEL_DEVICETREE = " \
15 ti/k3-am62a7-phyboard-lyra-rdk.dtb \
15 ti/k3-am62a7-sk.dtb \ 16 ti/k3-am62a7-sk.dtb \
17 ti/k3-am62x-sk-csi2-imx219.dtbo \
18 ti/k3-am62x-sk-csi2-ov5640.dtbo \
19 ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
20 ti/k3-am62x-sk-hdmi-audio.dtbo \
16" 21"
17 22
23FIT_CONF_DEFAULT_DTB = "ti/k3-am62a7-sk.dtb"
24
18UBOOT_MACHINE = "am62ax_evm_a53_defconfig" 25UBOOT_MACHINE = "am62ax_evm_a53_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf
new file mode 100644
index 00000000..00906420
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am62dxx-evm-k3r5.conf
@@ -0,0 +1,11 @@
1#@TYPE: Machine
2#@NAME: AM62D HS-FS EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI AM62D EVM (R5F core)
4
5require conf/machine/include/k3r5.inc
6
7SYSFW_SOC = "am62dx"
8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "hs-fs"
10
11UBOOT_MACHINE = "am62dx_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62dxx-evm.conf b/meta-ti-bsp/conf/machine/am62dxx-evm.conf
new file mode 100644
index 00000000..1e41c53c
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am62dxx-evm.conf
@@ -0,0 +1,18 @@
1#@TYPE: Machine
2#@NAME: AM62DXX EVM
3#@DESCRIPTION: Machine configuration for the TI AM62DXX EVM
4
5require conf/machine/include/am62dxx.inc
6
7KERNEL_DEVICETREE_PREFIX = " \
8 ti/k3-am62d2 \
9 ti/k3-am62a7-sk-edgeai \
10"
11
12KERNEL_DEVICETREE = ""
13
14FIT_CONF_DEFAULT_DTB = "ti/k3-am62d2-evm.dtb"
15
16UBOOT_MACHINE = "am62dx_evm_a53_defconfig"
17
18MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-dac-fw"
diff --git a/meta-ti-bsp/conf/machine/am62lxx-evm.conf b/meta-ti-bsp/conf/machine/am62lxx-evm.conf
new file mode 100644
index 00000000..607092a7
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am62lxx-evm.conf
@@ -0,0 +1,20 @@
1#@TYPE: Machine
2#@NAME: AM62L EVM
3#@DESCRIPTION: Machine configuration for the TI AM62L EVM
4
5require conf/machine/include/am62lxx.inc
6require conf/machine/include/ti-extras.inc
7
8IMAGE_FSTYPES += "ubifs ubi"
9
10MKUBIFS_ARGS ?= "-F -m 4096 -e 258048 -c 8500"
11
12UBINIZE_ARGS ?= "-m 4096 -p 256KiB -s 1024 -O 1024"
13
14KERNEL_DEVICETREE_PREFIX = " \
15 ti/k3-am62l \
16"
17
18KERNEL_DEVICETREE = ""
19
20UBOOT_MACHINE = "am62lx_evm_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
index 36915381..849d6625 100644
--- a/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm-k3r5.conf
@@ -10,3 +10,5 @@ SYSFW_CONFIG = "evm"
10SYSFW_SUFFIX = "hs-fs" 10SYSFW_SUFFIX = "hs-fs"
11 11
12UBOOT_MACHINE = "am62px_evm_r5_defconfig" 12UBOOT_MACHINE = "am62px_evm_r5_defconfig"
13
14UBOOT_CONFIG_FRAGMENTS:ti-falcon = "am62x_r5_falcon.config"
diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm.conf b/meta-ti-bsp/conf/machine/am62pxx-evm.conf
index fab96bd8..09f0d1fb 100644
--- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf
@@ -10,17 +10,26 @@ KERNEL_DEVICETREE_PREFIX = " \
10 ti/k3-am62x-sk-csi2 \ 10 ti/k3-am62x-sk-csi2 \
11 ti/k3-am62x-sk-hdmi \ 11 ti/k3-am62x-sk-hdmi \
12 ti/k3-am62x-sk-lpm \ 12 ti/k3-am62x-sk-lpm \
13 ti/k3-v3link \
13" 14"
14 15
15KERNEL_DEVICETREE = " \ 16KERNEL_DEVICETREE = " \
16 ti/k3-am62p5-sk.dtb \ 17 ti/k3-am62p5-sk.dtb \
18 ti/k3-am62x-sk-csi2-imx219.dtbo \
19 ti/k3-am62x-sk-csi2-ov5640.dtbo \
20 ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
21 ti/k3-am62x-sk-hdmi-audio.dtbo \
17" 22"
18 23
24FIT_CONF_DEFAULT_DTB = "ti/k3-am62p5-sk.dtb"
25
19UBOOT_MACHINE = "am62px_evm_a53_defconfig" 26UBOOT_MACHINE = "am62px_evm_a53_defconfig"
20 27
21# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build 28# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
22# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc 29# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
23# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. 30# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
24# For AM62P tisdk-display-cluster image, splash screen is handled by SBL. 31# For AM62P tisdk-display-cluster image, splash screen is handled by SBL.
25# Hence, disable the A53 based splash screen using the am62px_evm_prune_splashscreen.config fragment present in ti-u-boot tree 32# Hence, disable the A53 based splash screen using the am62x_evm_prune_splashscreen.config fragment present in ti-u-boot tree
26UBOOT_CONFIG_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62px_evm_prune_splashscreen.config', '', d)}" 33UBOOT_CONFIG_FRAGMENTS = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62x_evm_prune_splashscreen.config', '', d)}"
34
35UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'am62px_evm_prune_splashscreen.config', '', d)}"
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
index 548369ca..a624a35d 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm-k3r5.conf
@@ -10,3 +10,5 @@ SYSFW_CONFIG = "evm"
10SYSFW_SUFFIX = "hs-fs" 10SYSFW_SUFFIX = "hs-fs"
11 11
12UBOOT_MACHINE = "am62x_evm_r5_defconfig" 12UBOOT_MACHINE = "am62x_evm_r5_defconfig"
13
14UBOOT_CONFIG_FRAGMENTS:ti-falcon = "am62x_r5_falcon.config"
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
index fadbc6f4..c826439b 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
@@ -11,7 +11,26 @@ KERNEL_DEVICETREE_PREFIX = " \
11" 11"
12 12
13KERNEL_DEVICETREE = " \ 13KERNEL_DEVICETREE = " \
14 ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
15 ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
16 ti/k3-am625-beagleplay.dtb \
17 ti/k3-am625-phyboard-lyra-1-4-ghz-opp.dtbo \
18 ti/k3-am625-phyboard-lyra-rdk.dtb \
14 ti/k3-am625-sk.dtb \ 19 ti/k3-am625-sk.dtb \
20 ti/k3-am625-verdin-nonwifi-dahlia.dtb \
21 ti/k3-am625-verdin-nonwifi-dev.dtb \
22 ti/k3-am625-verdin-nonwifi-mallow.dtb \
23 ti/k3-am625-verdin-nonwifi-yavia.dtb \
24 ti/k3-am625-verdin-wifi-dahlia.dtb \
25 ti/k3-am625-verdin-wifi-dev.dtb \
26 ti/k3-am625-verdin-wifi-mallow.dtb \
27 ti/k3-am625-verdin-wifi-yavia.dtb \
28 ti/k3-am62x-sk-csi2-imx219.dtbo \
29 ti/k3-am62x-sk-csi2-ov5640.dtbo \
30 ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
31 ti/k3-am62x-sk-hdmi-audio.dtbo \
15" 32"
16 33
34FIT_CONF_DEFAULT_DTB = "ti/k3-am625-sk.dtb"
35
17UBOOT_MACHINE = "am62x_evm_a53_defconfig" 36UBOOT_MACHINE = "am62x_evm_a53_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
index 52b69a72..851935db 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm-k3r5.conf
@@ -10,3 +10,5 @@ SYSFW_CONFIG = "evm"
10SYSFW_SUFFIX = "hs-fs" 10SYSFW_SUFFIX = "hs-fs"
11 11
12UBOOT_MACHINE = "am62x_lpsk_r5_defconfig" 12UBOOT_MACHINE = "am62x_lpsk_r5_defconfig"
13
14UBOOT_CONFIG_FRAGMENTS:ti-falcon = "am62x_r5_falcon.config"
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
index 51e99728..37f4a644 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -8,13 +8,21 @@ require conf/machine/include/ti-extras.inc
8KERNEL_DEVICETREE_PREFIX = " \ 8KERNEL_DEVICETREE_PREFIX = " \
9 ti/k3-am62-lp \ 9 ti/k3-am62-lp \
10 ti/k3-am625-sk \ 10 ti/k3-am625-sk \
11 ti/k3-am62x-sk-dmtimer-pwm \
12 ti/k3-am62x-sk-eqep \
11 ti/k3-am62x-sk-hdmi \ 13 ti/k3-am62x-sk-hdmi \
12 ti/k3-am62x-sk-lpm \ 14 ti/k3-am62x-sk-lpm \
13 ti/k3-am62x-sk-mcan \ 15 ti/k3-am62x-sk-mcan \
16 ti/k3-am62x-sk-pwm \
14" 17"
15 18
16KERNEL_DEVICETREE = " \ 19KERNEL_DEVICETREE = " \
20 ti/k3-am62-lp-sk-nand.dtbo \
17 ti/k3-am62-lp-sk.dtb \ 21 ti/k3-am62-lp-sk.dtb \
22 ti/k3-am625-sk.dtb \
23 ti/k3-am62x-sk-hdmi-audio.dtbo \
18" 24"
19 25
26FIT_CONF_DEFAULT_DTB = "ti/k3-am62-lp-sk.dtb"
27
20UBOOT_MACHINE = "am62x_lpsk_a53_defconfig" 28UBOOT_MACHINE = "am62x_lpsk_a53_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
index 0daff2b9..55bc530b 100644
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm-k3r5.conf
@@ -8,9 +8,8 @@ SYSFW_SOC = "am62x"
8SYSFW_CONFIG = "evm" 8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "hs-fs" 9SYSFW_SUFFIX = "hs-fs"
10 10
11UBOOT_MACHINE = "am62x_evm_r5_defconfig" 11UBOOT_MACHINE = "am62xsip_evm_r5_defconfig"
12 12
13# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build 13UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"
14# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc 14
15# under meta-ti-bsp/recipes-bsp/u-boot/ for more details. 15UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am62xsip_sk_r5.config"
16UBOOT_CONFIG_FRAGMENTS = "am62xsip_sk_r5.config"
diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
index b5dd18f1..2ca2cbdb 100644
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
@@ -13,4 +13,8 @@ KERNEL_DEVICETREE = " \
13 ti/k3-am625-sk.dtb \ 13 ti/k3-am625-sk.dtb \
14" 14"
15 15
16UBOOT_MACHINE = "am62x_evm_a53_defconfig" 16FIT_CONF_DEFAULT_DTB = "ti/k3-am625-sk.dtb"
17
18UBOOT_MACHINE = "am62xsip_evm_a53_defconfig"
19
20UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf b/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf
new file mode 100644
index 00000000..f8ce3688
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am68-sk-k3r5.conf
@@ -0,0 +1,11 @@
1#@TYPE: Machine
2#@NAME: AM68 SK (R5F)
3#@DESCRIPTION: Machine configuration for the TI AM68 SK (R5F core)
4
5require conf/machine/include/k3r5.inc
6
7SYSFW_SOC = "j721s2"
8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "hs-fs"
10
11UBOOT_MACHINE = "am68_sk_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am68-sk.conf b/meta-ti-bsp/conf/machine/am68-sk.conf
new file mode 100644
index 00000000..feabbfd1
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/am68-sk.conf
@@ -0,0 +1,23 @@
1#@TYPE: Machine
2#@NAME: AM68 SK
3#@DESCRIPTION: Machine configuration for the TI AM68 SK
4
5require conf/machine/include/am68.inc
6
7TFA_K3_USART = "0x8"
8OPTEE_K3_USART = "0x8"
9
10KERNEL_DEVICETREE_PREFIX = " \
11 ti/k3-am68-sk \
12 ti/k3-fpdlink \
13 ti/k3-v3link \
14 ti/k3-j721e-sk-csi2-dual-imx219 \
15 ti/k3-j721e-sk-fpdlink-fusion \
16"
17
18KERNEL_DEVICETREE = " \
19 ti/k3-am68-sk-base-board.dtb \
20 ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
21"
22
23UBOOT_MACHINE = "am68_sk_a72_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am69-sk.conf b/meta-ti-bsp/conf/machine/am69-sk.conf
index 233a4618..9531cc27 100644
--- a/meta-ti-bsp/conf/machine/am69-sk.conf
+++ b/meta-ti-bsp/conf/machine/am69-sk.conf
@@ -2,7 +2,7 @@
2#@NAME: AM69 SK 2#@NAME: AM69 SK
3#@DESCRIPTION: Machine configuration for the TI AM69 SK 3#@DESCRIPTION: Machine configuration for the TI AM69 SK
4 4
5require conf/machine/include/j784s4.inc 5require conf/machine/include/am69.inc
6 6
7TFA_K3_USART = "0x8" 7TFA_K3_USART = "0x8"
8OPTEE_K3_USART = "0x8" 8OPTEE_K3_USART = "0x8"
@@ -11,10 +11,14 @@ KERNEL_DEVICETREE_PREFIX = " \
11 ti/k3-am69-sk \ 11 ti/k3-am69-sk \
12 ti/k3-fpdlink \ 12 ti/k3-fpdlink \
13 ti/k3-v3link \ 13 ti/k3-v3link \
14 ti/k3-am68-sk-v3link-fusion \
15 ti/k3-j721e-sk-csi2-dual-imx219 \
16 ti/k3-j721e-sk-fpdlink-fusion \
14" 17"
15 18
16KERNEL_DEVICETREE = " \ 19KERNEL_DEVICETREE = " \
17 ti/k3-am69-sk.dtb \ 20 ti/k3-am69-sk.dtb \
21 ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
18" 22"
19 23
20UBOOT_MACHINE = "am69_sk_a72_defconfig" 24UBOOT_MACHINE = "am69_sk_a72_defconfig"
diff --git a/meta-ti-bsp/conf/machine/beagle-x15.conf b/meta-ti-bsp/conf/machine/beagle-x15.conf
deleted file mode 100644
index 6fc7957c..00000000
--- a/meta-ti-bsp/conf/machine/beagle-x15.conf
+++ /dev/null
@@ -1,22 +0,0 @@
1#@TYPE: Machine
2#@NAME: BeagleBoard X15
3#@DESCRIPTION: Machine configuration for the BeagleBoard X15
4
5require conf/machine/include/beagle.inc
6require conf/machine/include/am57xx.inc
7
8KERNEL_DEVICETREE_PREFIX = "am57xx-beagle-x15"
9
10KERNEL_DEVICETREE = " \
11am57xx-beagle-x15.dtb \
12am57xx-beagle-x15-revb1.dtb \
13am57xx-beagle-x15-revc.dtb \
14am57xx-idk-lcd-osd101t2045.dtbo \
15am57xx-idk-lcd-osd101t2587.dtbo \
16"
17
18MACHINE_GUI_CLASS = "bigscreen"
19
20SERIAL_CONSOLES = "115200;ttyS2"
21
22UBOOT_MACHINE = "am57xx_evm_config"
diff --git a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf b/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
deleted file mode 100644
index a9be4d13..00000000
--- a/meta-ti-bsp/conf/machine/beaglebone-ai64.conf
+++ /dev/null
@@ -1,37 +0,0 @@
1#@TYPE: Machine
2#@NAME: BeagleBone AI-64 (A72)
3#@DESCRIPTION: Machine configuration for the BeagleBone AI-64 board (A72 core)
4
5require conf/machine/include/beagle.inc
6require conf/machine/include/j721e.inc
7
8UBOOT_MACHINE = "j721e_evm_a72_config"
9
10
11# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
12# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
13# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
14UBOOT_CONFIG_FRAGMENTS = "j721e_beagleboneai64_a72.config"
15
16KERNEL_DEVICETREE_PREFIX = " \
17 ti/k3-j721e \
18"
19
20KERNEL_DEVICETREE = " \
21ti/k3-j721e-beagleboneai64.dtb \
22ti/k3-j721e-common-proc-board.dtb \
23ti/k3-j721e-beagleboneai64-dsi-rpi-7inch-panel.dtbo \
24ti/k3-j721e-evm-csi2-ov5640.dtbo \
25ti/k3-j721e-evm-fusion.dtbo \
26ti/k3-j721e-evm-gesi-exp-board.dtbo \
27ti/k3-j721e-evm-pcie0-ep.dtbo \
28ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
29ti/k3-j721e-evm-virt-mac-client.dtbo \
30ti/k3-j721e-sk.dtb \
31ti/k3-j721e-sk-csi2-ov5640.dtbo \
32ti/k3-j721e-sk-csi2-rpi-imx219.dtbo \
33ti/k3-j721e-sk-fusion.dtbo \
34ti/k3-j721e-sk-rpi-hdr-ehrpwm.dtbo \
35"
36
37MACHINE_GUI_CLASS = "bigscreen"
diff --git a/meta-ti-bsp/conf/machine/beaglebone.conf b/meta-ti-bsp/conf/machine/beaglebone.conf
deleted file mode 100644
index 8b8b9d29..00000000
--- a/meta-ti-bsp/conf/machine/beaglebone.conf
+++ /dev/null
@@ -1,67 +0,0 @@
1#@TYPE: Machine
2#@NAME: BeagleBone machine
3#@DESCRIPTION: Machine configuration for the http://beagleboard.org/bone board
4
5require conf/machine/include/beagle.inc
6require conf/machine/include/ti33x.inc
7
8KERNEL_DEVICETREE_PREFIX = "am335x-bone"
9
10KERNEL_DEVICETREE = " \
11am335x-bone.dtb \
12am335x-boneblack.dtb \
13am335x-boneblack-pps.dtb \
14am335x-boneblack-uboot.dtb \
15am335x-boneblack-uboot-univ.dtb \
16am335x-boneblack-wireless.dtb \
17am335x-boneblue.dtb \
18am335x-bonegreen.dtb \
19am335x-bonegreen-gateway.dtb \
20am335x-bonegreen-wireless.dtb \
21am335x-bonegreen-wireless-uboot-univ.dtb \
22am335x-pocketbeagle.dtb \
23am335x-sancloud-bbe.dtb \
24am335x-sancloud-bbe-extended-wifi.dtb \
25am335x-sancloud-bbe-lite.dtb \
26"
27
28# Extra DT overlays/capes
29KERNEL_DEVICETREE += " \
30AM335X-PRU-UIO-00A0.dtbo \
31BB-ADC-00A0.dtbo \
32BB-BBBW-WL1835-00A0.dtbo \
33BB-BBGG-WL1835-00A0.dtbo \
34BB-BBGW-WL1835-00A0.dtbo \
35BB-BONE-4D5R-01-00A1.dtbo \
36BB-BONE-eMMC1-01-00A0.dtbo \
37BB-BONE-LCD4-01-00A1.dtbo \
38BB-BONE-NH7C-01-A0.dtbo \
39BB-CAPE-DISP-CT4-00A0.dtbo \
40BB-HDMI-TDA998x-00A0.dtbo \
41BB-I2C1-MCP7940X-00A0.dtbo \
42BB-I2C1-RTC-DS3231.dtbo \
43BB-I2C1-RTC-PCF8563.dtbo \
44BB-I2C2-BME680.dtbo \
45BB-I2C2-MPU6050.dtbo \
46BB-LCD-ADAFRUIT-24-SPI1-00A0.dtbo \
47BB-NHDMI-TDA998x-00A0.dtbo \
48BBORG_COMMS-00A2.dtbo \
49BBORG_FAN-A000.dtbo \
50BBORG_RELAY-00A2.dtbo \
51BB-SPIDEV0-00A0.dtbo \
52BB-SPIDEV1-00A0.dtbo \
53BB-UART1-00A0.dtbo \
54BB-UART2-00A0.dtbo \
55BB-UART4-00A0.dtbo \
56BB-W1-P9.12-00A0.dtbo \
57BONE-ADC.dtbo \
58M-BB-BBG-00A0.dtbo \
59M-BB-BBGG-00A0.dtbo \
60PB-MIKROBUS-0.dtbo \
61PB-MIKROBUS-1.dtbo \
62"
63
64MACHINE_GUI_CLASS = "bigscreen"
65MACHINE_FEATURES += "screen"
66
67SERIAL_CONSOLES = "115200;ttyS0"
diff --git a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
deleted file mode 100644
index 601cbbf7..00000000
--- a/meta-ti-bsp/conf/machine/beagleplay-k3r5.conf
+++ /dev/null
@@ -1,19 +0,0 @@
1#@TYPE: Machine
2#@NAME: BeaglePlay (R5F)
3#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core)
4
5require conf/machine/include/k3r5.inc
6
7PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
8PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
9
10SYSFW_SOC = "am62x"
11SYSFW_CONFIG = "evm"
12SYSFW_SUFFIX = "gp"
13
14UBOOT_MACHINE = "am62x_evm_r5_defconfig"
15
16# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
17# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
18# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
19UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_r5.config"
diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
new file mode 100644
index 00000000..72dc145b
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/beagleplay-ti-k3r5.conf
@@ -0,0 +1,14 @@
1#@TYPE: Machine
2#@NAME: BeaglePlay (R5F)
3#@DESCRIPTION: Machine configuration for the BeaglePlay (R5F core)
4
5require conf/machine/include/k3r5.inc
6
7SYSFW_SOC = "am62x"
8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "gp"
10
11UBOOT_MACHINE = "am62x_beagleplay_r5_defconfig"
12UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_r5_defconfig"
13
14UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_r5.config"
diff --git a/meta-ti-bsp/conf/machine/beagleplay-ti.conf b/meta-ti-bsp/conf/machine/beagleplay-ti.conf
new file mode 100644
index 00000000..3824d867
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/beagleplay-ti.conf
@@ -0,0 +1,46 @@
1#@TYPE: Machine
2#@NAME: BeaglePlay (A53)
3#@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)
4
5require conf/machine/include/k3.inc
6require conf/machine/include/mc_k3r5.inc
7
8SOC_FAMILY:append = ":am62xx"
9
10MACHINE_FEATURES += "screen gpu"
11
12SERIAL_CONSOLES = "115200;ttyS2"
13
14require conf/machine/include/mesa-pvr.inc
15PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
16
17TFA_BOARD = "lite"
18TFA_K3_SYSTEM_SUSPEND = "1"
19
20OPTEEMACHINE = "k3-am62x"
21
22UBOOT_MACHINE = "am62x_beagleplay_a53_defconfig"
23UBOOT_MACHINE:bsp-ti-6_1 = "am62x_evm_a53_defconfig"
24
25UBOOT_CONFIG_FRAGMENTS:bsp-ti-6_1 = "am625_beagleplay_a53.config"
26
27SPL_BINARY = "tispl.bin_unsigned"
28
29KERNEL_DEVICETREE_PREFIX = " \
30 ti/k3-am625-beagle \
31 ti/k3-am625-sk \
32 ti/k3-am62x-sk \
33"
34
35KERNEL_DEVICETREE = " \
36 ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
37 ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
38 ti/k3-am625-beagleplay.dtb \
39 ti/k3-am625-sk.dtb \
40 ti/k3-am62x-sk-csi2-imx219.dtbo \
41 ti/k3-am62x-sk-csi2-ov5640.dtbo \
42 ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
43 ti/k3-am62x-sk-hdmi-audio.dtbo \
44"
45
46MACHINE_GUI_CLASS = "bigscreen"
diff --git a/meta-ti-bsp/conf/machine/beagleplay.conf b/meta-ti-bsp/conf/machine/beagleplay.conf
deleted file mode 100644
index 65c14333..00000000
--- a/meta-ti-bsp/conf/machine/beagleplay.conf
+++ /dev/null
@@ -1,60 +0,0 @@
1#@TYPE: Machine
2#@NAME: BeaglePlay (A53)
3#@DESCRIPTION: Machine configuration for the BeaglePlay board (A53 core)
4
5require conf/machine//include/beagle.inc
6require conf/machine/include/k3.inc
7SOC_FAMILY:append = ":am62xx"
8
9MACHINE_FEATURES += "screen gpu"
10
11SERIAL_CONSOLES = "115200;ttyS2"
12
13require conf/machine/include/mesa-pvr.inc
14PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver"
15
16TFA_BOARD = "lite"
17TFA_K3_SYSTEM_SUSPEND = "1"
18
19OPTEEMACHINE = "k3-am62x"
20
21UBOOT_MACHINE = "am62x_evm_a53_defconfig"
22
23# UBOOT_CONFIG_FRAGMENTS holds the list of u-boot config fragments which has to be build
24# along with the base defconfig mentioned in UBOOT_MACHINE. Refer u-boot-mergeconfig.inc
25# under meta-ti-bsp/recipes-bsp/u-boot/ for more details.
26UBOOT_CONFIG_FRAGMENTS = "am625_beagleplay_a53.config"
27
28PREFERRED_PROVIDER_virtual/bootloader = "u-boot-bb.org"
29PREFERRED_PROVIDER_u-boot = "u-boot-bb.org"
30
31KERNEL_DEVICETREE_PREFIX = " \
32 ti/k3-am625 \
33 ti/k3-am62x-sk \
34"
35
36KERNEL_DEVICETREE = " \
37ti/k3-am625-beagleplay.dtb \
38ti/k3-am625-beagleplay-csi2-ov5640.dtbo \
39ti/k3-am625-beagleplay-csi2-tevi-ov5640.dtbo \
40ti/k3-am625-beagleplay-lincolntech-lcd185-panel.dtbo \
41ti/k3-am625-sk.dtb \
42ti/k3-am625-sk-dmtimer-pwm.dtbo \
43ti/k3-am625-sk-ecap-capture.dtbo \
44ti/k3-am625-sk-lincolntech-lcd185-panel.dtbo \
45ti/k3-am625-sk-mcspi-loopback.dtbo \
46ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
47ti/k3-am625-sk-microtips-mf103hie-lcd2.dtbo \
48ti/k3-am625-sk-pwm.dtbo \
49ti/k3-am625-sk-rpi-hdr-ehrpwm.dtbo \
50ti/k3-am62x-sk-csi2-imx219.dtbo \
51ti/k3-am62x-sk-csi2-ov5640.dtbo \
52ti/k3-am62x-sk-csi2-tevi-ov5640.dtbo \
53ti/k3-am62x-sk-csi2-v3link-fusion.dtbo \
54ti/k3-am62x-sk-eqep.dtbo \
55ti/k3-am62x-sk-hdmi-audio.dtbo \
56ti/k3-am62x-sk-lpm-wkup-sources.dtbo \
57ti/k3-am62x-sk-mcan.dtbo \
58"
59
60MACHINE_GUI_CLASS = "bigscreen"
diff --git a/meta-ti-bsp/conf/machine/include/am62axx.inc b/meta-ti-bsp/conf/machine/include/am62axx.inc
index 93a41d8d..e5f827a9 100644
--- a/meta-ti-bsp/conf/machine/include/am62axx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62axx.inc
@@ -1,4 +1,6 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2require conf/machine/include/mc_k3r5.inc
3
2SOC_FAMILY:append = ":am62axx" 4SOC_FAMILY:append = ":am62axx"
3 5
4MACHINE_FEATURES += "screen touchscreen" 6MACHINE_FEATURES += "screen touchscreen"
@@ -8,9 +10,6 @@ TFA_K3_SYSTEM_SUSPEND = "1"
8# Default tiboot3.bin on AM62A is for HS-FS 10# Default tiboot3.bin on AM62A is for HS-FS
9IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin" 11IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin"
10 12
11# Since default tiboot3.bin on AM62A is for HS-FS, add a version for GP
12IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin"
13
14# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE 13# Since default tiboot3.bin on AM62A is for HS-FS, add a version for HS-SE
15IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin" 14IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin"
16 15
diff --git a/meta-ti-bsp/conf/machine/include/am62dxx.inc b/meta-ti-bsp/conf/machine/include/am62dxx.inc
new file mode 100644
index 00000000..ac4e8e17
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/am62dxx.inc
@@ -0,0 +1,15 @@
1require conf/machine/include/k3.inc
2require conf/machine/include/mc_k3r5.inc
3
4SOC_FAMILY:append = ":am62dxx"
5
6TFA_K3_SYSTEM_SUSPEND = "1"
7
8# Default tiboot3.bin on AM62D is for HS-FS
9IMAGE_BOOT_FILES += "tiboot3-am62dx-hs-fs-evm.bin"
10
11# Since default tiboot3.bin on AM62D is for HS-FS, add a version for HS-SE
12IMAGE_BOOT_FILES += "tiboot3-am62dx-hs-evm.bin"
13
14TFA_BOARD = "lite"
15OPTEEMACHINE = "k3-am62x"
diff --git a/meta-ti-bsp/conf/machine/include/am62lxx.inc b/meta-ti-bsp/conf/machine/include/am62lxx.inc
new file mode 100644
index 00000000..b4f0b8c9
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/am62lxx.inc
@@ -0,0 +1,9 @@
1require conf/machine/include/k3.inc
2SOC_FAMILY:append = ":am62lxx"
3
4MACHINE_FEATURES += "screen"
5
6TFA_BOARD = "am62l"
7TFA_K3_SYSTEM_SUSPEND = "1"
8
9OPTEEMACHINE = "k3-am62lx"
diff --git a/meta-ti-bsp/conf/machine/include/am62pxx.inc b/meta-ti-bsp/conf/machine/include/am62pxx.inc
index 38e35851..061d0e67 100644
--- a/meta-ti-bsp/conf/machine/include/am62pxx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62pxx.inc
@@ -1,14 +1,19 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2require conf/machine/include/mc_k3r5.inc
3
2SOC_FAMILY:append = ":am62pxx" 4SOC_FAMILY:append = ":am62pxx"
3 5
4MACHINE_FEATURES += "screen gpu" 6MACHINE_FEATURES += "screen gpu"
5 7
6require conf/machine/include/mesa-pvr.inc 8require conf/machine/include/mesa-pvr.inc
7PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 9PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
8 10
9# Default tiboot3.bin on AM62Px is for HS-FS 11# Default tiboot3.bin on AM62Px is for HS-FS
10IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin" 12IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin"
11 13
14# Since default tiboot3.bin on AM62Px is for HS-FS, add a version for HS-SE
15IMAGE_BOOT_FILES += "tiboot3-am62px-hs-evm.bin"
16
12TFA_BOARD = "lite" 17TFA_BOARD = "lite"
13TFA_K3_SYSTEM_SUSPEND = "1" 18TFA_K3_SYSTEM_SUSPEND = "1"
14 19
diff --git a/meta-ti-bsp/conf/machine/include/am62xx.inc b/meta-ti-bsp/conf/machine/include/am62xx.inc
index a0ec944f..1eb77b4e 100644
--- a/meta-ti-bsp/conf/machine/include/am62xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am62xx.inc
@@ -1,10 +1,12 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2require conf/machine/include/mc_k3r5.inc
3
2SOC_FAMILY:append = ":am62xx" 4SOC_FAMILY:append = ":am62xx"
3 5
4MACHINE_FEATURES += "screen gpu" 6MACHINE_FEATURES += "screen gpu"
5 7
6require conf/machine/include/mesa-pvr.inc 8require conf/machine/include/mesa-pvr.inc
7PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 9PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
8 10
9# Default tiboot3.bin on AM62x is for HS-FS 11# Default tiboot3.bin on AM62x is for HS-FS
10IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" 12IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin"
diff --git a/meta-ti-bsp/conf/machine/include/am64xx.inc b/meta-ti-bsp/conf/machine/include/am64xx.inc
index cfade2fa..49e996c8 100644
--- a/meta-ti-bsp/conf/machine/include/am64xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am64xx.inc
@@ -1,11 +1,23 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2require conf/machine/include/mc_k3r5.inc
3
2SOC_FAMILY:append = ":am64xx" 4SOC_FAMILY:append = ":am64xx"
3 5
4KERNEL_DEVICETREE_PREFIX = "ti/k3-am642" 6KERNEL_DEVICETREE_PREFIX = "ti/k3-am642"
5 7
6KERNEL_DEVICETREE = " \ 8KERNEL_DEVICETREE = " \
9 ti/k3-am642-evm-icssg1-dualemac-mii.dtbo \
10 ti/k3-am642-evm-icssg1-dualemac.dtbo \
11 ti/k3-am642-evm-nand.dtbo \
7 ti/k3-am642-evm.dtb \ 12 ti/k3-am642-evm.dtb \
13 ti/k3-am642-hummingboard-t-pcie.dtbo \
14 ti/k3-am642-hummingboard-t-usb3.dtbo \
15 ti/k3-am642-hummingboard-t.dtb \
16 ti/k3-am642-phyboard-electra-gpio-fan.dtbo \
17 ti/k3-am642-phyboard-electra-pcie-usb2.dtbo \
18 ti/k3-am642-phyboard-electra-rdk.dtb \
8 ti/k3-am642-sk.dtb \ 19 ti/k3-am642-sk.dtb \
20 ti/k3-am642-tqma64xxl-mbax4xxl.dtb \
9" 21"
10 22
11# Default tiboot3.bin on AM64x is for SR2.0 HS-FS 23# 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 80a7744a..99a3b12f 100644
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -1,15 +1,28 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2require conf/machine/include/mc_k3r5.inc
3
2SOC_FAMILY:append = ":am65xx" 4SOC_FAMILY:append = ":am65xx"
3 5
4MACHINE_FEATURES += "screen touchscreen gpu" 6MACHINE_FEATURES += "screen touchscreen gpu"
5 7
6require conf/machine/include/mesa-pvr.inc 8require conf/machine/include/mesa-pvr.inc
7PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" 9PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
8 10
9KERNEL_DEVICETREE_PREFIX = "ti/k3-am654" 11KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"
10 12
11KERNEL_DEVICETREE = " \ 13KERNEL_DEVICETREE = " \
14 ti/k3-am654-base-board-rocktech-rk101-panel.dtbo \
12 ti/k3-am654-base-board.dtb \ 15 ti/k3-am654-base-board.dtb \
16 ti/k3-am654-icssg2.dtbo \
17 ti/k3-am654-idk.dtbo \
18 ti/k3-am654-pcie-usb2.dtbo \
19 ti/k3-am654-pcie-usb3.dtbo \
20 ti/k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtbo \
21 ti/k3-am6548-iot2050-advanced-m2-bkey-usb3.dtbo \
22 ti/k3-am6548-iot2050-advanced-m2.dtb \
23 ti/k3-am6548-iot2050-advanced-pg2.dtb \
24 ti/k3-am6548-iot2050-advanced-sm.dtb \
25 ti/k3-am6548-iot2050-advanced.dtb \
13" 26"
14 27
15IMAGE_BOOT_FILES += "sysfw.itb" 28IMAGE_BOOT_FILES += "sysfw.itb"
diff --git a/meta-ti-bsp/conf/machine/include/am68.inc b/meta-ti-bsp/conf/machine/include/am68.inc
new file mode 100644
index 00000000..330a2973
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/am68.inc
@@ -0,0 +1,21 @@
1require conf/machine/include/k3.inc
2require conf/machine/include/mc_k3r5.inc
3
4SOC_FAMILY:append = ":j721s2"
5
6MACHINE_FEATURES += "screen gpu"
7
8require conf/machine/include/mesa-pvr.inc
9PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
10
11# Default tiboot3.bin on AM68 is for SR1.0 HS-FS
12IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin"
13
14# Since default tiboot3.bin on AM68 is for HS-FS, add a version for SR1.0 HS-SE
15IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-evm.bin"
16
17TFA_BOARD = "generic"
18
19OPTEEMACHINE = "k3-j784s4"
20
21MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw"
diff --git a/meta-ti-bsp/conf/machine/include/am69.inc b/meta-ti-bsp/conf/machine/include/am69.inc
new file mode 100644
index 00000000..1a19410a
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/am69.inc
@@ -0,0 +1,21 @@
1require conf/machine/include/k3.inc
2require conf/machine/include/mc_k3r5.inc
3
4SOC_FAMILY:append = ":j784s4"
5
6MACHINE_FEATURES += "screen gpu"
7
8require conf/machine/include/mesa-pvr.inc
9PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
10
11# Default tiboot3.bin on AM69 is for SR1.0 HS-FS
12IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin"
13
14# Since default tiboot3.bin on AM69 is for HS-FS, add a version for SR1.0 HS-SE
15IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-evm.bin"
16
17TFA_BOARD = "j784s4"
18
19OPTEEMACHINE = "k3-j784s4"
20
21MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw-j784s4"
diff --git a/meta-ti-bsp/conf/machine/include/beagle.inc b/meta-ti-bsp/conf/machine/include/beagle.inc
deleted file mode 100644
index 27e3298d..00000000
--- a/meta-ti-bsp/conf/machine/include/beagle.inc
+++ /dev/null
@@ -1,3 +0,0 @@
1
2PREFERRED_PROVIDER_virtual/kernel ?= "linux-bb.org"
3
diff --git a/meta-ti-bsp/conf/machine/include/j7200.inc b/meta-ti-bsp/conf/machine/include/j7200.inc
index caa79876..3cba71b6 100644
--- a/meta-ti-bsp/conf/machine/include/j7200.inc
+++ b/meta-ti-bsp/conf/machine/include/j7200.inc
@@ -1,14 +1,20 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2require conf/machine/include/mc_k3r5.inc
3
2SOC_FAMILY:append = ":j7200" 4SOC_FAMILY:append = ":j7200"
3 5
4# Default tiboot3.bin on J7200 is for GP 6# Default tiboot3.bin on J7200 is for GP
5IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" 7IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin"
6 8
7# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS 9# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-FS
8IMAGE_BOOT_FILES += "tiboot3-j7200-hs-fs-evm.bin" 10IMAGE_SR1_HS_FS_FILES = "tiboot3-j7200-hs-fs-evm.bin"
11IMAGE_SR1_HS_FS_FILES:bsp-mainline = ""
12IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_FS_FILES}"
9 13
10# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE 14# Since default tiboot3.bin on J7200 is for GP, add a version for SR1.0 HS-SE
11IMAGE_BOOT_FILES += "tiboot3-j7200-hs-evm.bin" 15IMAGE_SR1_HS_SE_FILES = "tiboot3-j7200-hs-evm.bin"
16IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
17IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
12 18
13# Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS 19# Since default tiboot3.bin on J7200 is for GP, add a version for SR2.0 HS-FS
14IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" 20IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin"
@@ -20,4 +26,4 @@ TFA_BOARD = "generic"
20 26
21OPTEEMACHINE = "k3-j721e" 27OPTEEMACHINE = "k3-j721e"
22 28
23MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-eth-fw" 29MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "ti-eth-fw-j7200"
diff --git a/meta-ti-bsp/conf/machine/include/j721e.inc b/meta-ti-bsp/conf/machine/include/j721e.inc
index 6040feb0..30aa2a69 100644
--- a/meta-ti-bsp/conf/machine/include/j721e.inc
+++ b/meta-ti-bsp/conf/machine/include/j721e.inc
@@ -1,10 +1,12 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2require conf/machine/include/mc_k3r5.inc
3
2SOC_FAMILY:append = ":j721e" 4SOC_FAMILY:append = ":j721e"
3 5
4MACHINE_FEATURES += "screen gpu" 6MACHINE_FEATURES += "screen gpu"
5 7
6require conf/machine/include/mesa-pvr.inc 8require conf/machine/include/mesa-pvr.inc
7PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 9PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
8 10
9IMAGE_BOOT_FILES += "sysfw.itb" 11IMAGE_BOOT_FILES += "sysfw.itb"
10 12
@@ -13,23 +15,29 @@ IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin"
13IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" 15IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb"
14 16
15# Since default on J721e is for GP, add a version for SR1.1 HS-FS 17# Since default on J721e is for GP, add a version for SR1.1 HS-FS
16IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-fs-evm.bin" 18IMAGE_SR1_1_HS_FS_FILES = "tiboot3-j721e_sr1_1-hs-fs-evm.bin sysfw-j721e_sr1_1-hs-fs-evm.itb"
17IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-fs-evm.itb" 19IMAGE_SR1_1_HS_FS_FILES:bsp-mainline = ""
20IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_FS_FILES}"
18 21
19# Since default on J721e is for GP, add a version for SR1.1 HS-SE 22# Since default on J721e is for GP, add a version for SR1.1 HS-SE
20IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" 23IMAGE_SR1_1_HS_SE_FILES = "tiboot3-j721e_sr1_1-hs-evm.bin sysfw-j721e_sr1_1-hs-evm.itb"
21IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" 24IMAGE_BOOT_FILES += "${IMAGE_SR1_1_HS_SE_FILES}"
22 25
23# Since default on J721e is for GP, add a version for SR2.0 HS-FS 26# Since default on J721e is for GP, add a version for SR2.0 HS-FS
24IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" 27IMAGE_SR2_HS_FS_FILES = "tiboot3-j721e_sr2-hs-fs-evm.bin sysfw-j721e_sr2-hs-fs-evm.itb"
25IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" 28IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_FS_FILES}"
26 29
27# Since default on J721e is for GP, add a version for SR2.0 HS-SE 30# Since default on J721e is for GP, add a version for SR2.0 HS-SE
28IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-evm.bin" 31IMAGE_SR2_HS_SE_FILES = "tiboot3-j721e_sr2-hs-evm.bin sysfw-j721e_sr2-hs-evm.itb"
29IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-evm.itb" 32IMAGE_SR2_HS_SE_FILES:bsp-mainline = ""
33IMAGE_BOOT_FILES += "${IMAGE_SR2_HS_SE_FILES}"
30 34
31TFA_BOARD = "generic" 35TFA_BOARD = "generic"
32 36
33OPTEEMACHINE = "k3-j721e" 37OPTEEMACHINE = "k3-j721e"
34 38
35MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw" 39TI_VXE_VXD_DRIVER = "ti-vxe-vxd-driver"
40TI_VXE_VXD_DRIVER:bsp-ti-6_6 = ""
41TI_VXE_VXD_DRIVER:bsp-ti-6_1 = ""
42
43MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw vxd-dec-fw ti-eth-fw-j721e ${TI_VXE_VXD_DRIVER}"
diff --git a/meta-ti-bsp/conf/machine/include/j721s2.inc b/meta-ti-bsp/conf/machine/include/j721s2.inc
index 5289ec5a..e6e4f162 100644
--- a/meta-ti-bsp/conf/machine/include/j721s2.inc
+++ b/meta-ti-bsp/conf/machine/include/j721s2.inc
@@ -1,10 +1,12 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2require conf/machine/include/mc_k3r5.inc
3
2SOC_FAMILY:append = ":j721s2" 4SOC_FAMILY:append = ":j721s2"
3 5
4MACHINE_FEATURES += "screen gpu" 6MACHINE_FEATURES += "screen gpu"
5 7
6require conf/machine/include/mesa-pvr.inc 8require conf/machine/include/mesa-pvr.inc
7PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 9PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
8 10
9# Default tiboot3.bin on J721S2 is for GP 11# Default tiboot3.bin on J721S2 is for GP
10IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" 12IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin"
diff --git a/meta-ti-bsp/conf/machine/include/j722s.inc b/meta-ti-bsp/conf/machine/include/j722s.inc
index 3b051f1b..e0b77d96 100644
--- a/meta-ti-bsp/conf/machine/include/j722s.inc
+++ b/meta-ti-bsp/conf/machine/include/j722s.inc
@@ -1,16 +1,21 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2require conf/machine/include/mc_k3r5.inc
3
2SOC_FAMILY:append = ":j722s" 4SOC_FAMILY:append = ":j722s"
3 5
4MACHINE_FEATURES += "screen gpu" 6MACHINE_FEATURES += "screen gpu"
5 7
6require conf/machine/include/mesa-pvr.inc 8require conf/machine/include/mesa-pvr.inc
7PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 9PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
8 10
9# Default tiboot3.bin on J722S is for HS-FS 11# Default tiboot3.bin on J722S is for HS-FS
10IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" 12IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin"
11 13
12# Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE 14# Since default tiboot3.bin on J722S is for HS-FS, add a version for HS-SE
13IMAGE_BOOT_FILES += "tiboot3-j722s-hs-evm.bin" 15IMAGE_SR1_HS_SE_FILES = "tiboot3-j722s-hs-evm.bin"
16IMAGE_SR1_HS_SE_FILES:bsp-mainline = ""
17IMAGE_SR1_HS_SE_FILES:bsp-next = ""
18IMAGE_BOOT_FILES += "${IMAGE_SR1_HS_SE_FILES}"
14 19
15TFA_BOARD = "lite" 20TFA_BOARD = "lite"
16TFA_K3_SYSTEM_SUSPEND = "1" 21TFA_K3_SYSTEM_SUSPEND = "1"
diff --git a/meta-ti-bsp/conf/machine/include/j742s2.inc b/meta-ti-bsp/conf/machine/include/j742s2.inc
new file mode 100644
index 00000000..9a54e11e
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/j742s2.inc
@@ -0,0 +1,21 @@
1require conf/machine/include/k3.inc
2require conf/machine/include/mc_k3r5.inc
3
4SOC_FAMILY:append = ":j742s2"
5
6MACHINE_FEATURES += "screen gpu"
7
8require conf/machine/include/mesa-pvr.inc
9PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
10
11# Default tiboot3.bin on J742S2 is for HS-FS
12IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-fs-evm.bin"
13
14# Since default tiboot3.bin on J742S2 is for HS-FS, add a version for SR1.0 HS-SE
15IMAGE_BOOT_FILES += "tiboot3-j742s2-hs-evm.bin"
16
17TFA_BOARD = "j784s4"
18
19OPTEEMACHINE = "k3-j784s4"
20
21MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw"
diff --git a/meta-ti-bsp/conf/machine/include/j784s4.inc b/meta-ti-bsp/conf/machine/include/j784s4.inc
index 92062cdf..33224ee3 100644
--- a/meta-ti-bsp/conf/machine/include/j784s4.inc
+++ b/meta-ti-bsp/conf/machine/include/j784s4.inc
@@ -1,10 +1,12 @@
1require conf/machine/include/k3.inc 1require conf/machine/include/k3.inc
2require conf/machine/include/mc_k3r5.inc
3
2SOC_FAMILY:append = ":j784s4" 4SOC_FAMILY:append = ":j784s4"
3 5
4MACHINE_FEATURES += "screen gpu" 6MACHINE_FEATURES += "screen gpu"
5 7
6require conf/machine/include/mesa-pvr.inc 8require conf/machine/include/mesa-pvr.inc
7PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-img-rogue-driver" 9PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_ROGUE_DRIVER_PROVIDER}"
8 10
9# Default tiboot3.bin on J784S4 is for GP 11# Default tiboot3.bin on J784S4 is for GP
10IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" 12IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin"
@@ -19,4 +21,4 @@ TFA_BOARD = "j784s4"
19 21
20OPTEEMACHINE = "k3-j784s4" 22OPTEEMACHINE = "k3-j784s4"
21 23
22MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw" 24MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += "cadence-mhdp-fw cnm-wave-fw ti-eth-fw-j784s4"
diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index e3da9e12..ec9a8944 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -3,20 +3,14 @@
3require conf/machine/include/ti-soc.inc 3require conf/machine/include/ti-soc.inc
4SOC_FAMILY:append = ":k3" 4SOC_FAMILY:append = ":k3"
5 5
6require conf/machine/include/arm/arch-arm64.inc 6DEFAULTTUNE ?= "aarch64"
7require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc
7 8
8BBMULTICONFIG += "k3r5" 9require conf/machine/include/ti-bsp.inc
9
10# Increase this everytime you change something in the kernel
11MACHINE_KERNEL_PR = "r0"
12
13PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
14PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
15PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
16 10
17KERNEL_IMAGETYPE = "Image" 11KERNEL_IMAGETYPE = "Image"
18KERNEL_IMAGETYPES = "Image fitImage" 12KERNEL_IMAGETYPES = "Image fitImage"
19KERNEL_CLASSES += "kernel-fitimage" 13KERNEL_CLASSES += "kernel-fitimage-deprecated"
20 14
21UBOOT_ARCH = "arm" 15UBOOT_ARCH = "arm"
22UBOOT_ENTRYPOINT = "0x81000000" 16UBOOT_ENTRYPOINT = "0x81000000"
@@ -31,10 +25,6 @@ SPL_BINARY = "tispl.bin"
31SPL_BINARYNAME = "tispl.bin" 25SPL_BINARYNAME = "tispl.bin"
32UBOOT_SUFFIX = "img" 26UBOOT_SUFFIX = "img"
33 27
34UBOOT_SIGN_ENABLE = "1"
35UBOOT_MKIMAGE_DTCOPTS = "-I dts -O dtb"
36UBOOT_SIGN_KEYNAME ?= "custMpk"
37UBOOT_SIGN_KEYDIR ?= "${TI_SECURE_DEV_PKG}/keys"
38FIT_HASH_ALG ?= "sha512" 28FIT_HASH_ALG ?= "sha512"
39FIT_SIGN_ALG ?= "rsa4096" 29FIT_SIGN_ALG ?= "rsa4096"
40 30
@@ -49,7 +39,7 @@ TFA_PLATFORM = "k3"
49UBI_VOLNAME = "rootfs" 39UBI_VOLNAME = "rootfs"
50 40
51# List common SoC features, may need to add touchscreen for specific machines 41# List common SoC features, may need to add touchscreen for specific machines
52MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci" 42MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 alsa pci optee-ftpm"
53 43
54IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" 44IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
55 45
@@ -62,6 +52,10 @@ MACHINE_FEATURES += "efi"
62WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}" 52WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}"
63 53
64do_image_wic[depends] += "virtual/bootloader:do_deploy" 54do_image_wic[depends] += "virtual/bootloader:do_deploy"
65do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
66 55
67SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2" 56SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
57
58FALCON_INCLUDE = ""
59FALCON_INCLUDE:ti-falcon = "conf/machine/include/ti-falcon.inc"
60
61require ${FALCON_INCLUDE}
diff --git a/meta-ti-bsp/conf/machine/include/k3r5.inc b/meta-ti-bsp/conf/machine/include/k3r5.inc
index 63267a5e..fcd54254 100644
--- a/meta-ti-bsp/conf/machine/include/k3r5.inc
+++ b/meta-ti-bsp/conf/machine/include/k3r5.inc
@@ -11,9 +11,9 @@ require conf/machine/include/arm/armv7a/tune-cortexa8.inc
11# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/j721e_evm.rst 11# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/j721e_evm.rst
12# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/am62x_sk.rst 12# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/am62x_sk.rst
13# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/k3.rst 13# https://git.ti.com/cgit/ti-u-boot/ti-u-boot/tree/doc/board/ti/k3.rst
14
15require conf/machine/include/ti-bsp.inc
14PREFERRED_PROVIDER_virtual/kernel = "linux-dummy" 16PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
15PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
16PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
17 17
18SPL_SUFFIX = "bin" 18SPL_SUFFIX = "bin"
19SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" 19SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}"
diff --git a/meta-ti-bsp/conf/machine/include/mc_k3r5.inc b/meta-ti-bsp/conf/machine/include/mc_k3r5.inc
new file mode 100644
index 00000000..d5a530b8
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/mc_k3r5.inc
@@ -0,0 +1,3 @@
1BBMULTICONFIG += "k3r5"
2
3do_image[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy"
diff --git a/meta-ti-bsp/conf/machine/include/omap-a15.inc b/meta-ti-bsp/conf/machine/include/omap-a15.inc
index a875713f..a258decd 100644
--- a/meta-ti-bsp/conf/machine/include/omap-a15.inc
+++ b/meta-ti-bsp/conf/machine/include/omap-a15.inc
@@ -4,16 +4,11 @@ SOC_FAMILY:append = ":omap-a15"
4DEFAULTTUNE ?= "armv7athf-neon" 4DEFAULTTUNE ?= "armv7athf-neon"
5require conf/machine/include/arm/armv7a/tune-cortexa15.inc 5require conf/machine/include/arm/armv7a/tune-cortexa15.inc
6 6
7# Increase this everytime you change something in the kernel 7require conf/machine/include/ti-bsp.inc
8MACHINE_KERNEL_PR = "r7"
9
10PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
11PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
12PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
13 8
14# Graphics providers and variables 9# Graphics providers and variables
15require conf/machine/include/mesa-pvr.inc 10require conf/machine/include/mesa-pvr.inc
16PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" 11PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
17PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" 12PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"
18 13
19KERNEL_IMAGETYPE = "zImage" 14KERNEL_IMAGETYPE = "zImage"
@@ -53,5 +48,6 @@ MACHINE_FEATURES = "apm usbgadget usbhost vfat ext2 screen alsa gpu mmip dsp gc3
53 48
54IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap" 49IMAGE_FSTYPES += "tar.xz wic.xz wic.bmap"
55WKS_FILE ?= "sdimage-2part.wks" 50WKS_FILE ?= "sdimage-2part.wks"
56IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES}" 51IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} ${UBOOT_EXTLINUX_BOOT_FILES} ipc/dra7-ipu1-fw.xem4;dra7-ipu1-fw.xem4"
57do_image_wic[depends] += "virtual/bootloader:do_deploy" 52do_image_wic[depends] += "virtual/bootloader:do_deploy"
53do_image_wic[depends] += "ti-ipc-rtos:do_deploy"
diff --git a/meta-ti-bsp/conf/machine/include/omapl138.inc b/meta-ti-bsp/conf/machine/include/omapl138.inc
index 7f8262a5..486de05d 100644
--- a/meta-ti-bsp/conf/machine/include/omapl138.inc
+++ b/meta-ti-bsp/conf/machine/include/omapl138.inc
@@ -5,9 +5,7 @@ require conf/machine/include/arm/armv5/tune-arm926ejs.inc
5 5
6KERNEL_IMAGETYPE = "zImage" 6KERNEL_IMAGETYPE = "zImage"
7 7
8PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging" 8require conf/machine/include/ti-bsp.inc
9PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ti-staging"
10PREFERRED_PROVIDER_u-boot = "u-boot-ti-staging"
11 9
12EXTRA_IMAGEDEPENDS += "virtual/bootloader" 10EXTRA_IMAGEDEPENDS += "virtual/bootloader"
13 11
diff --git a/meta-ti-bsp/conf/machine/include/ti-bsp.inc b/meta-ti-bsp/conf/machine/include/ti-bsp.inc
new file mode 100644
index 00000000..ce8efecd
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/ti-bsp.inc
@@ -0,0 +1,135 @@
1# Support multiple BSP providers
2# The main input is TI_PREFERRED_BSP, which translates into default
3# preferences for kernel, bootloader and graphics components, as
4# well as a dedicated machine override.
5
6# Supported options are: mainline, next, ti-6_12, ti-6_6, ti-6_1
7TI_PREFERRED_BSP ??= "ti-6_12"
8
9# Use bsp-* namespace for overrides
10MACHINEOVERRIDES =. "bsp-${TI_PREFERRED_BSP}:"
11
12# ==========
13# mainline
14# latest upstream/mainline kernel, u-boot
15# ==========
16BSP_KERNEL_PROVIDER:bsp-mainline = "linux-ti-mainline"
17BSP_KERNEL_VERSION:bsp-mainline = "%"
18BSP_BOOTLOADER_PROVIDER:bsp-mainline = "u-boot-ti-mainline"
19BSP_BOOTLOADER_VERSION:bsp-mainline = "%"
20
21# GPU support requires out-of-tree SGX and Rogue drivers not available
22# in mainline, usually present in TI staging or derivative like BB.org
23MACHINE_FEATURES:remove:bsp-mainline = "gpu"
24
25# GC320 support requires out-of-tree drivers not available in mainline
26MACHINE_FEATURES:remove:bsp-mainline = "gc320"
27
28# ==========
29# next
30# upcoming upstream/mainline kernel, u-boot
31# ==========
32BSP_KERNEL_PROVIDER:bsp-next = "linux-ti-next"
33BSP_KERNEL_VERSION:bsp-next = "%"
34BSP_BOOTLOADER_PROVIDER:bsp-next = "u-boot-ti-next"
35BSP_BOOTLOADER_VERSION:bsp-next = "%"
36
37# GPU support requires out-of-tree SGX and Rogue drivers not available
38# in next, usually present in TI staging or derivative like BB.org
39MACHINE_FEATURES:remove:bsp-next = "gpu"
40
41# GC320 support requires out-of-tree drivers not yet available in next
42MACHINE_FEATURES:remove:bsp-next = "gc320"
43
44# ==========
45# ti-6_12
46# TI staging kernel 6.12, u-boot 2025.01
47# ==========
48BSP_KERNEL_PROVIDER:bsp-ti-6_12 = "linux-ti-staging"
49BSP_KERNEL_VERSION:bsp-ti-6_12 = "6.12%"
50BSP_BOOTLOADER_PROVIDER:bsp-ti-6_12 = "u-boot-ti-staging"
51BSP_BOOTLOADER_VERSION:bsp-ti-6_12 = "2025.01%"
52
53BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-sgx-ddk-km"
54BSP_SGX_DRIVER_VERSION:bsp-ti-6_12 = "1.17%"
55BSP_SGX_UMLIBS_VERSION:bsp-ti-6_12 = "1.17%"
56BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_12 = "ti-img-rogue-driver"
57BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_12 = "24%"
58BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_12 = "24%"
59BSP_MESA_PVR_VERSION:bsp-ti-6_12 = "24%"
60
61# ==========
62# ti-6_6
63# TI staging kernel 6.6, u-boot 2024.04
64# ==========
65BSP_KERNEL_PROVIDER:bsp-ti-6_6 = "linux-ti-staging"
66BSP_KERNEL_VERSION:bsp-ti-6_6 = "6.6.%"
67BSP_BOOTLOADER_PROVIDER:bsp-ti-6_6 = "u-boot-ti-staging"
68BSP_BOOTLOADER_VERSION:bsp-ti-6_6 = "2024.04%"
69
70BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-sgx-ddk-km"
71BSP_SGX_DRIVER_VERSION:bsp-ti-6_6 = "1.17%"
72BSP_SGX_UMLIBS_VERSION:bsp-ti-6_6 = "1.17%"
73BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_6 = "ti-img-rogue-driver"
74BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_6 = "24%"
75BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_6 = "24%"
76BSP_MESA_PVR_VERSION:bsp-ti-6_6 = "24%"
77
78# GC320 support requires out-of-tree drivers not yet available in 6.6
79MACHINE_FEATURES:remove:bsp-ti-6_6 = "gc320"
80
81# ==========
82# ti-6_1
83# TI staging kernel 6.1, u-boot 2023.04
84# ==========
85BSP_KERNEL_PROVIDER:bsp-ti-6_1 = "linux-ti-staging"
86BSP_KERNEL_VERSION:bsp-ti-6_1 = "6.1.%"
87BSP_BOOTLOADER_PROVIDER:bsp-ti-6_1 = "u-boot-ti-staging"
88BSP_BOOTLOADER_VERSION:bsp-ti-6_1 = "2023.04%"
89
90BSP_SGX_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-sgx-ddk-km"
91BSP_SGX_DRIVER_VERSION:bsp-ti-6_1 = "1.17%"
92BSP_SGX_UMLIBS_VERSION:bsp-ti-6_1 = "1.17%"
93BSP_ROGUE_DRIVER_PROVIDER:bsp-ti-6_1 = "ti-img-rogue-driver"
94BSP_ROGUE_DRIVER_VERSION:bsp-ti-6_1 = "23%"
95BSP_ROGUE_UMLIBS_VERSION:bsp-ti-6_1 = "23%"
96BSP_MESA_PVR_VERSION:bsp-ti-6_1 = "22%"
97
98# GC320 support requires out-of-tree drivers not yet available in 6.1
99MACHINE_FEATURES:remove:bsp-ti-6_1 = "gc320"
100
101# ==========
102# sane fallback defaults
103# if specific values are not defined or bsp is set incorrectly
104# use default preference TI staging and SW-rendering graphics
105# ==========
106BSP_KERNEL_PROVIDER ?= "linux-ti-staging"
107BSP_KERNEL_VERSION ?= "%"
108BSP_BOOTLOADER_PROVIDER ?= "u-boot-ti-staging"
109BSP_BOOTLOADER_VERSION ?= "%"
110
111BSP_SGX_DRIVER_PROVIDER ?= ""
112BSP_SGX_DRIVER_VERSION ?= ""
113BSP_ROGUE_DRIVER_PROVIDER ?= ""
114BSP_ROGUE_DRIVER_VERSION ?= ""
115BSP_SGX_UMLIBS_VERSION ?= ""
116BSP_ROGUE_UMLIBS_VERSION ?= ""
117BSP_MESA_PVR_VERSION ?= ""
118
119# ==========
120# global preferences
121# ==========
122PREFERRED_PROVIDER_virtual/kernel ?= "${BSP_KERNEL_PROVIDER}"
123PREFERRED_VERSION_${BSP_KERNEL_PROVIDER} ?= "${BSP_KERNEL_VERSION}"
124PREFERRED_VERSION_${BSP_KERNEL_PROVIDER}-rt ?= "${BSP_KERNEL_VERSION}"
125PREFERRED_PROVIDER_virtual/bootloader ?= "${BSP_BOOTLOADER_PROVIDER}"
126PREFERRED_PROVIDER_u-boot ?= "${BSP_BOOTLOADER_PROVIDER}"
127PREFERRED_VERSION_${BSP_BOOTLOADER_PROVIDER} ?= "${BSP_BOOTLOADER_VERSION}"
128
129# GPU provider gets set in machine configs, as some machines are headless
130# Select default preferred versions here
131PREFERRED_VERSION_ti-sgx-ddk-km ?= "${BSP_SGX_DRIVER_VERSION}"
132PREFERRED_VERSION_ti-sgx-ddk-um ?= "${BSP_SGX_UMLIBS_VERSION}"
133PREFERRED_VERSION_ti-img-rogue-driver ?= "${BSP_ROGUE_DRIVER_VERSION}"
134PREFERRED_VERSION_ti-img-rogue-umlibs ?= "${BSP_ROGUE_UMLIBS_VERSION}"
135PREFERRED_VERSION_mesa-pvr ?= "${BSP_MESA_PVR_VERSION}"
diff --git a/meta-ti-bsp/conf/machine/include/ti-falcon.inc b/meta-ti-bsp/conf/machine/include/ti-falcon.inc
new file mode 100644
index 00000000..252fb28a
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/include/ti-falcon.inc
@@ -0,0 +1,6 @@
1IMAGE_INSTALL:append = " u-boot-ti-staging-falcon"
2KERNEL_CLASSES:remove = "kernel-fitimage-deprecated"
3KERNEL_CLASSES += "kernel-fitimage-legacyhs"
4UBOOT_DTB_LOADADDRESS = "0x88000000"
5UBOOT_LOADADDRESS = "0x82000000"
6FIT_KERNEL_COMP_ALG = "none"
diff --git a/meta-ti-bsp/conf/machine/include/ti-soc.inc b/meta-ti-bsp/conf/machine/include/ti-soc.inc
index a1fd3cbf..5d77e719 100644
--- a/meta-ti-bsp/conf/machine/include/ti-soc.inc
+++ b/meta-ti-bsp/conf/machine/include/ti-soc.inc
@@ -1,9 +1,8 @@
1# This is a generic TI SOC family. It is a superset of all other SOCs 1# This is a generic TI SOC family. It is a superset of all other SOCs
2# and platforms defined in meta-ti to allow BSP-level overrides. 2# and platforms defined in meta-ti to allow BSP-level overrides.
3SOC_FAMILY = "ti-soc" 3SOC_FAMILY = "ti-soc"
4require conf/machine/include/soc-family.inc
4 5
5# TI platforms all use devicetrees with overlays 6# TI platforms all use devicetrees with overlays
6MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree" 7MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-devicetree"
7KERNEL_DTB_OVERLAY_SUPPORT ?= "1" 8KERNEL_DTB_OVERLAY_SUPPORT ?= "1"
8
9require conf/machine/include/soc-family.inc
diff --git a/meta-ti-bsp/conf/machine/include/ti33x.inc b/meta-ti-bsp/conf/machine/include/ti33x.inc
index b0ed1c69..7e9eb48c 100644
--- a/meta-ti-bsp/conf/machine/include/ti33x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti33x.inc
@@ -4,17 +4,11 @@ SOC_FAMILY:append = ":ti33x"
4DEFAULTTUNE ?= "armv7athf-neon" 4DEFAULTTUNE ?= "armv7athf-neon"
5require conf/machine/include/arm/armv7a/tune-cortexa8.inc 5require conf/machine/include/arm/armv7a/tune-cortexa8.inc
6 6
7# Increase this everytime you change something in the kernel 7require conf/machine/include/ti-bsp.inc
8MACHINE_KERNEL_PR = "r22"
9
10# Default providers, may need to override for specific machines
11PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
12PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
13PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
14 8
15# Graphics providers and variables 9# Graphics providers and variables
16require conf/machine/include/mesa-pvr.inc 10require conf/machine/include/mesa-pvr.inc
17PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" 11PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
18PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc" 12PVR_DISPLAY_CONTROLLER_ALIAS ?= "tilcdc"
19 13
20KERNEL_IMAGETYPE = "zImage" 14KERNEL_IMAGETYPE = "zImage"
@@ -25,17 +19,43 @@ KERNEL_DEVICETREE_PREFIX = " \
25" 19"
26 20
27KERNEL_DEVICETREE = " \ 21KERNEL_DEVICETREE = " \
22 ti/omap/am335x-baltos-ir2110.dtb \
23 ti/omap/am335x-baltos-ir3220.dtb \
24 ti/omap/am335x-baltos-ir5221.dtb \
25 ti/omap/am335x-base0033.dtb \
26 ti/omap/am335x-bone.dtb \
27 ti/omap/am335x-boneblack-wireless.dtb \
28 ti/omap/am335x-boneblack.dtb \
29 ti/omap/am335x-boneblue.dtb \
30 ti/omap/am335x-bonegreen-wireless.dtb \
31 ti/omap/am335x-bonegreen.dtb \
32 ti/omap/am335x-chiliboard.dtb \
33 ti/omap/am335x-cm-t335.dtb \
28 ti/omap/am335x-evm.dtb \ 34 ti/omap/am335x-evm.dtb \
29 ti/omap/am335x-evmsk.dtb \ 35 ti/omap/am335x-evmsk.dtb \
36 ti/omap/am335x-guardian.dtb \
30 ti/omap/am335x-icev2.dtb \ 37 ti/omap/am335x-icev2.dtb \
38 ti/omap/am335x-lxm.dtb \
39 ti/omap/am335x-moxa-uc-2101.dtb \
40 ti/omap/am335x-moxa-uc-8100-me-t.dtb \
41 ti/omap/am335x-myirtech-myd.dtb \
42 ti/omap/am335x-nano.dtb \
43 ti/omap/am335x-netcan-plus-1xx.dtb \
44 ti/omap/am335x-netcom-plus-2xx.dtb \
45 ti/omap/am335x-netcom-plus-8xx.dtb \
46 ti/omap/am335x-osd3358-sm-red.dtb \
47 ti/omap/am335x-pdu001.dtb \
48 ti/omap/am335x-pepper.dtb \
49 ti/omap/am335x-phycore-rdk.dtb \
31 ti/omap/am335x-pocketbeagle.dtb \ 50 ti/omap/am335x-pocketbeagle.dtb \
32 ti/omap/am335x-bone.dtb \ 51 ti/omap/am335x-regor-rdk.dtb \
33 ti/omap/am335x-boneblue.dtb \ 52 ti/omap/am335x-sancloud-bbe-extended-wifi.dtb \
34 ti/omap/am335x-bonegreen.dtb \ 53 ti/omap/am335x-sancloud-bbe-lite.dtb \
35 ti/omap/am335x-bonegreen-wireless.dtb \
36 ti/omap/am335x-boneblack.dtb \
37 ti/omap/am335x-boneblack-wireless.dtb \
38 ti/omap/am335x-sancloud-bbe.dtb \ 54 ti/omap/am335x-sancloud-bbe.dtb \
55 ti/omap/am335x-sbc-t335.dtb \
56 ti/omap/am335x-shc.dtb \
57 ti/omap/am335x-sl50.dtb \
58 ti/omap/am335x-wega-rdk.dtb \
39" 59"
40 60
41UBOOT_ARCH = "arm" 61UBOOT_ARCH = "arm"
diff --git a/meta-ti-bsp/conf/machine/include/ti43x.inc b/meta-ti-bsp/conf/machine/include/ti43x.inc
index 17ca5240..2621d19a 100644
--- a/meta-ti-bsp/conf/machine/include/ti43x.inc
+++ b/meta-ti-bsp/conf/machine/include/ti43x.inc
@@ -4,17 +4,11 @@ SOC_FAMILY:append = ":ti43x"
4DEFAULTTUNE ?= "armv7athf-neon" 4DEFAULTTUNE ?= "armv7athf-neon"
5require conf/machine/include/arm/armv7a/tune-cortexa9.inc 5require conf/machine/include/arm/armv7a/tune-cortexa9.inc
6 6
7# Increase this everytime you change something in the kernel 7require conf/machine/include/ti-bsp.inc
8MACHINE_KERNEL_PR = "r3"
9
10# Default providers, may need to override for specific machines
11PREFERRED_PROVIDER_virtual/kernel ?= "linux-ti-staging"
12PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-ti-staging"
13PREFERRED_PROVIDER_u-boot ?= "u-boot-ti-staging"
14 8
15# Graphics providers and variables 9# Graphics providers and variables
16require conf/machine/include/mesa-pvr.inc 10require conf/machine/include/mesa-pvr.inc
17PREFERRED_PROVIDER_virtual/gpudriver ?= "ti-sgx-ddk-km" 11PREFERRED_PROVIDER_virtual/gpudriver ?= "${BSP_SGX_DRIVER_PROVIDER}"
18PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm" 12PVR_DISPLAY_CONTROLLER_ALIAS ?= "omapdrm"
19 13
20KERNEL_IMAGETYPE = "zImage" 14KERNEL_IMAGETYPE = "zImage"
@@ -27,9 +21,11 @@ KERNEL_DEVICETREE_PREFIX = " \
27" 21"
28 22
29KERNEL_DEVICETREE = " \ 23KERNEL_DEVICETREE = " \
24 ti/omap/am437x-cm-t43.dtb \
30 ti/omap/am437x-gp-evm.dtb \ 25 ti/omap/am437x-gp-evm.dtb \
31 ti/omap/am437x-sk-evm.dtb \
32 ti/omap/am437x-idk-evm.dtb \ 26 ti/omap/am437x-idk-evm.dtb \
27 ti/omap/am437x-sbc-t43.dtb \
28 ti/omap/am437x-sk-evm.dtb \
33 ti/omap/am43x-epos-evm.dtb \ 29 ti/omap/am43x-epos-evm.dtb \
34" 30"
35 31
diff --git a/meta-ti-bsp/conf/machine/j7200-evm.conf b/meta-ti-bsp/conf/machine/j7200-evm.conf
index dff1da69..adfc6376 100644
--- a/meta-ti-bsp/conf/machine/j7200-evm.conf
+++ b/meta-ti-bsp/conf/machine/j7200-evm.conf
@@ -8,6 +8,7 @@ KERNEL_DEVICETREE_PREFIX = "ti/k3-j7200"
8 8
9KERNEL_DEVICETREE = " \ 9KERNEL_DEVICETREE = " \
10 ti/k3-j7200-common-proc-board.dtb \ 10 ti/k3-j7200-common-proc-board.dtb \
11 ti/k3-j7200-evm-quad-port-eth-exp.dtbo \
11" 12"
12 13
13UBOOT_MACHINE = "j7200_evm_a72_config" 14UBOOT_MACHINE = "j7200_evm_a72_config"
diff --git a/meta-ti-bsp/conf/machine/j721e-evm.conf b/meta-ti-bsp/conf/machine/j721e-evm.conf
index 5e1f6dca..b0b2a5b6 100644
--- a/meta-ti-bsp/conf/machine/j721e-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721e-evm.conf
@@ -11,7 +11,13 @@ KERNEL_DEVICETREE_PREFIX = " \
11" 11"
12 12
13KERNEL_DEVICETREE = " \ 13KERNEL_DEVICETREE = " \
14 ti/k3-j721e-beagleboneai64.dtb \
15 ti/k3-j721e-common-proc-board-infotainment.dtbo \
14 ti/k3-j721e-common-proc-board.dtb \ 16 ti/k3-j721e-common-proc-board.dtb \
17 ti/k3-j721e-evm-gesi-exp-board.dtbo \
18 ti/k3-j721e-evm-pcie0-ep.dtbo \
19 ti/k3-j721e-evm-quad-port-eth-exp.dtbo \
20 ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
15 ti/k3-j721e-sk.dtb \ 21 ti/k3-j721e-sk.dtb \
16" 22"
17 23
diff --git a/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf b/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf
new file mode 100644
index 00000000..45eaabb6
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/j721e-sk-k3r5.conf
@@ -0,0 +1,11 @@
1#@TYPE: Machine
2#@NAME: J721e SK (R5F)
3#@DESCRIPTION: Machine configuration for the TI J721e SK (R5F core)
4
5require conf/machine/include/k3r5.inc
6
7SYSFW_SOC = "j721e"
8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "gp"
10
11UBOOT_MACHINE = "j721e_sk_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j721e-sk.conf b/meta-ti-bsp/conf/machine/j721e-sk.conf
new file mode 100644
index 00000000..604f8930
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/j721e-sk.conf
@@ -0,0 +1,17 @@
1#@TYPE: Machine
2#@NAME: J721e SK
3#@DESCRIPTION: Machine configuration for the TI J721e SK
4
5require conf/machine/include/j721e.inc
6
7KERNEL_DEVICETREE_PREFIX = " \
8 ti/k3-j721e-sk \
9 ti/k3-fpdlink \
10"
11
12KERNEL_DEVICETREE = " \
13 ti/k3-j721e-sk-csi2-dual-imx219.dtbo \
14 ti/k3-j721e-sk.dtb \
15"
16
17UBOOT_MACHINE = "j721e_sk_a72_config"
diff --git a/meta-ti-bsp/conf/machine/j721s2-evm.conf b/meta-ti-bsp/conf/machine/j721s2-evm.conf
index c4e8af90..5cb28309 100644
--- a/meta-ti-bsp/conf/machine/j721s2-evm.conf
+++ b/meta-ti-bsp/conf/machine/j721s2-evm.conf
@@ -16,7 +16,10 @@ KERNEL_DEVICETREE_PREFIX = " \
16" 16"
17 17
18KERNEL_DEVICETREE = " \ 18KERNEL_DEVICETREE = " \
19 ti/k3-am68-sk-base-board.dtb \
19 ti/k3-j721s2-common-proc-board.dtb \ 20 ti/k3-j721s2-common-proc-board.dtb \
21 ti/k3-j721s2-evm-gesi-exp-board.dtbo \
22 ti/k3-j721s2-evm-pcie1-ep.dtbo \
20" 23"
21 24
22UBOOT_MACHINE = "j721s2_evm_a72_defconfig" 25UBOOT_MACHINE = "j721s2_evm_a72_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j722s-evm.conf b/meta-ti-bsp/conf/machine/j722s-evm.conf
index 74bcdfce..52a6cfbd 100644
--- a/meta-ti-bsp/conf/machine/j722s-evm.conf
+++ b/meta-ti-bsp/conf/machine/j722s-evm.conf
@@ -7,9 +7,12 @@ require conf/machine/include/j722s.inc
7KERNEL_DEVICETREE_PREFIX = " \ 7KERNEL_DEVICETREE_PREFIX = " \
8 ti/k3-j722s \ 8 ti/k3-j722s \
9 ti/k3-fpdlink \ 9 ti/k3-fpdlink \
10 ti/k3-am625-sk-mcspi-loopback \
10 ti/k3-v3link \ 11 ti/k3-v3link \
11" 12"
12 13
13KERNEL_DEVICETREE = "" 14KERNEL_DEVICETREE = " \
15 ti/k3-j722s-evm.dtb \
16"
14 17
15UBOOT_MACHINE = "j722s_evm_a53_defconfig" 18UBOOT_MACHINE = "j722s_evm_a53_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf b/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf
new file mode 100644
index 00000000..41bf401e
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/j742s2-evm-k3r5.conf
@@ -0,0 +1,11 @@
1#@TYPE: Machine
2#@NAME: J742S2 EVM (R5F)
3#@DESCRIPTION: Machine configuration for the TI J742S2 EVM (R5F core)
4
5require conf/machine/include/k3r5.inc
6
7SYSFW_SOC = "j742s2"
8SYSFW_CONFIG = "evm"
9SYSFW_SUFFIX = "hs-fs"
10
11UBOOT_MACHINE = "j742s2_evm_r5_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j742s2-evm.conf b/meta-ti-bsp/conf/machine/j742s2-evm.conf
new file mode 100644
index 00000000..110931cc
--- /dev/null
+++ b/meta-ti-bsp/conf/machine/j742s2-evm.conf
@@ -0,0 +1,22 @@
1#@TYPE: Machine
2#@NAME: J742S2 EVM
3#@DESCRIPTION: Machine configuration for the TI J742S2 EVM
4
5require conf/machine/include/j742s2.inc
6
7TFA_K3_USART = "0x8"
8OPTEE_K3_USART = "0x8"
9
10KERNEL_DEVICETREE_PREFIX = " \
11 ti/k3-j742s2 \
12 ti/k3-j784s4 \
13 ti/k3-fpdlink \
14 ti/k3-j7200-evm-mcspi-loopback \
15 ti/k3-j721s2-evm-csi2-ov5640 \
16 ti/k3-j721s2-evm-fusion \
17 ti/k3-v3link \
18"
19
20KERNEL_DEVICETREE = ""
21
22UBOOT_MACHINE = "j742s2_evm_a72_defconfig"
diff --git a/meta-ti-bsp/conf/machine/j784s4-evm.conf b/meta-ti-bsp/conf/machine/j784s4-evm.conf
index 6573e5c5..bf53b07c 100644
--- a/meta-ti-bsp/conf/machine/j784s4-evm.conf
+++ b/meta-ti-bsp/conf/machine/j784s4-evm.conf
@@ -11,10 +11,18 @@ KERNEL_DEVICETREE_PREFIX = " \
11 ti/k3-j784s4 \ 11 ti/k3-j784s4 \
12 ti/k3-fpdlink \ 12 ti/k3-fpdlink \
13 ti/k3-j7200-evm-mcspi-loopback \ 13 ti/k3-j7200-evm-mcspi-loopback \
14 ti/k3-j721s2-evm-csi2-ov5640 \
15 ti/k3-j721s2-evm-fusion \
16 ti/k3-j721s2-evm-ub954 \
17 ti/k3-am69-sk \
14 ti/k3-v3link \ 18 ti/k3-v3link \
15" 19"
16 20
17KERNEL_DEVICETREE = " \ 21KERNEL_DEVICETREE = " \
22 ti/k3-am69-sk.dtb \
23 ti/k3-j784s4-evm-pcie0-pcie1-ep.dtbo \
24 ti/k3-j784s4-evm-quad-port-eth-exp1.dtbo \
25 ti/k3-j784s4-evm-usxgmii-exp1-exp2.dtbo \
18 ti/k3-j784s4-evm.dtb \ 26 ti/k3-j784s4-evm.dtb \
19" 27"
20 28
diff --git a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
index fdbaffae..458caaff 100644
--- a/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
+++ b/meta-ti-bsp/conf/machine/omapl138-lcdk.conf
@@ -21,6 +21,6 @@ KERNEL_DEVICETREE_PREFIX = " \
21" 21"
22 22
23KERNEL_DEVICETREE = " \ 23KERNEL_DEVICETREE = " \
24 da850-evm.dtb \ 24 ti/davinci/da850-evm.dtb \
25 da850-lcdk.dtb \ 25 ti/davinci/da850-lcdk.dtb \
26" 26"
diff --git a/meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend b/meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend
deleted file mode 100644
index 7e5c36fd..00000000
--- a/meta-ti-bsp/dynamic-layers/clang-layer/recipes-graphics/mesa/mesa-pvr_%.bbappend
+++ /dev/null
@@ -1,14 +0,0 @@
1# This is a copy of meta-clang/recipes-graphics/mesa/mesa_%.bbappend required
2# for llvmpipe when using pvr-mesa since we aren't caught by that glob.
3
4FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
5
6LDFLAGS:append:toolchain-clang = " -latomic -lm"
7DEPENDS:append:toolchain-clang = " libatomic-ops"
8
9EXTRA_OEMASON:append:toolchain-clang:x86 = " -Dasm=false"
10EXTRA_OEMASON:append:toolchain-clang:x86-64 = " -Dasm=false"
11
12export YOCTO_ALTERNATE_EXE_PATH = "${STAGING_LIBDIR}/llvm-config"
13
14PACKAGECONFIG[gallium-llvm] = "-Dllvm=true -Dshared-llvm=true -Ddraw-use-llvm=true,-Dllvm=false,clang clang-native elfutils"
diff --git a/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb b/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
index ed1c7817..97363b2e 100644
--- a/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cadence-mhdp-fw/cadence-mhdp-fw_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.cadence;md5=009f46816f6956cfb75ede13d3e1cee0"
8PV = "${CADENCE_MHDP_FW_VERSION}" 8PV = "${CADENCE_MHDP_FW_VERSION}"
9PR = "${INC_PR}.0" 9PR = "${INC_PR}.0"
10 10
11COMPATIBLE_MACHINE = "j721e|j721s2|j784s4" 11COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|j742s2"
12 12
13TARGET = "mhdp8546.bin" 13TARGET = "mhdp8546.bin"
14 14
diff --git a/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb b/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
index ecdae123..db080c62 100644
--- a/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cm3-pm-firmware/amx3-cm3_git.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Cortex-M3 binary blob for suspend-resume" 1SUMMARY = "Cortex-M3 binary blob for suspend-resume"
2 2
3LICENSE = "TI-TSPA" 3LICENSE = "TI-TSPA"
4LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8" 4LIC_FILES_CHKSUM = "file://License.txt;md5=7bdc54a749ab7a7dea999d25d99a41b8"
@@ -11,10 +11,8 @@ BRANCH ?= "ti-v4.1.y"
11 11
12SRC_URI = "git://git.ti.com/git/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=https;branch=${BRANCH}" 12SRC_URI = "git://git.ti.com/git/processor-firmware/ti-amx3-cm3-pm-firmware.git;protocol=https;branch=${BRANCH}"
13 13
14S = "${WORKDIR}/git"
15
16do_compile() { 14do_compile() {
17 make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS} ${DEBUG_PREFIX_MAP}" 15 make CROSS_COMPILE="${TARGET_PREFIX}" CC="${TARGET_PREFIX}gcc -std=gnu11 ${TOOLCHAIN_OPTIONS} ${SECURITY_NOPIE_CFLAGS} ${DEBUG_PREFIX_MAP}"
18} 16}
19 17
20do_install() { 18do_install() {
diff --git a/meta-ti-bsp/recipes-bsp/cmem/cmem.inc b/meta-ti-bsp/recipes-bsp/cmem/cmem.inc
deleted file mode 100644
index e8dbbe8f..00000000
--- a/meta-ti-bsp/recipes-bsp/cmem/cmem.inc
+++ /dev/null
@@ -1,16 +0,0 @@
1HOMEPAGE = "http://processors.wiki.ti.com/index.php/Category:CMEM"
2
3LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://include/ti/cmem.h;beginline=1;endline=30;md5=26be509e4bb413905bda8309e338e2b1"
5
6BRANCH = "master"
7# This corresponds to version 4.20.00.01
8SRCREV = "86269258a48e0a9008dd9d5ebfae9da7ce843393"
9
10PV = "4.20.00.01+git"
11
12SRC_URI = "git://git.ti.com/git/ipc/ludev.git;protocol=https;branch=${BRANCH}"
13
14S = "${WORKDIR}/git"
15COMPATIBLE_HOST ?= "null"
16COMPATIBLE_HOST:ti-soc = "(.*)"
diff --git a/meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb b/meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb
deleted file mode 100644
index 2042b08a..00000000
--- a/meta-ti-bsp/recipes-bsp/cmem/cmem_git.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1DESCRIPTION = "The cmem component supports contiguous memory allocation from userspace"
2
3include cmem.inc
4
5PR = "r0"
6
7PACKAGES =+ "${PN}-test"
8
9FILES:${PN}-test = "${bindir}/*"
10
11inherit autotools
diff --git a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
index b28bea92..6a65992f 100644
--- a/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cnm-wave-fw/cnm-wave-fw_git.bb
@@ -5,12 +5,12 @@ require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
5inherit update-alternatives 5inherit update-alternatives
6 6
7LICENSE = "BSD-3-Clause" 7LICENSE = "BSD-3-Clause"
8LIC_FILES_CHKSUM = "file://LICENCE.cnm;md5=93b67e6bac7f8fec22b96b8ad0a1a9d0" 8LIC_FILES_CHKSUM = "file://LICENCE.cnm;md5=df3992006621b797e36de43f36336e36"
9 9
10PV = "${CNM_WAVE521_FW_VERSION}" 10PV = "${CNM_WAVE521_FW_VERSION}"
11PR = "${INC_PR}.1" 11PR = "${INC_PR}.1"
12 12
13COMPATIBLE_MACHINE = "j721s2|j784s4|j722s|am62axx|am62pxx" 13COMPATIBLE_MACHINE = "j721s2|j784s4|j722s|j742s2|am62axx|am62pxx"
14 14
15TARGET_WAVE521C = "wave521c_k3_codec_fw.bin" 15TARGET_WAVE521C = "wave521c_k3_codec_fw.bin"
16 16
diff --git a/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb b/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
index 95ba1e2d..4e379c5d 100755
--- a/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/cpsw9g-eth-fw/cpsw9g-eth-fw_git.bb
@@ -13,8 +13,6 @@ SRCREV = "91f1628507bf7f8716f0bc7cafe88ad7f14c94f5"
13 13
14SRC_URI = "git://git.ti.com/git/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}" 14SRC_URI = "git://git.ti.com/git/glsdk/ti-eth-fw.git;protocol=${PROTOCOL};branch=${BRANCH}"
15 15
16S = "${WORKDIR}/git"
17
18CPSW9G_FW_DIR = "${S}/ethfw" 16CPSW9G_FW_DIR = "${S}/ethfw"
19CPSW9G_FW_FILENAME = "app_remoteswitchcfg_server_pdk_mem_map_strip.xer5f" 17CPSW9G_FW_FILENAME = "app_remoteswitchcfg_server_pdk_mem_map_strip.xer5f"
20 18
diff --git a/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb b/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
index a56810d4..3acdd130 100644
--- a/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
+++ b/meta-ti-bsp/recipes-bsp/gc320-drivers/ti-gc320-driver_5.0.11.p7.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Kernel drivers for the Vivante GC320 chipset found in TI SoCs" 1SUMMARY = "Kernel drivers for the Vivante GC320 chipset found in TI SoCs"
2HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-driver" 2HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-driver"
3LICENSE = "MIT | GPL-2.0-only" 3LICENSE = "MIT | GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://../LICENSE;md5=78d9818a51b9a8e9bb89dea418bac297" 4LIC_FILES_CHKSUM = "file://../LICENSE;md5=78d9818a51b9a8e9bb89dea418bac297"
@@ -7,17 +7,14 @@ inherit module features_check
7 7
8REQUIRED_MACHINE_FEATURES = "gc320" 8REQUIRED_MACHINE_FEATURES = "gc320"
9 9
10MACHINE_KERNEL_PR:append = "i"
11PR = "${MACHINE_KERNEL_PR}"
12
13# Need to branch out with ${PV} var 10# Need to branch out with ${PV} var
14BRANCH = "ti-${PV}-k5.10" 11BRANCH = "ti-${PV}-k6.12"
15 12
16SRCREV = "e2a10f31e255a65ec30a6e10b890e77d7e9cb107" 13SRCREV = "83afddf9dbf6a8458267b4dae21ee35bfb11f3d1"
17 14
18SRC_URI = "git://git.ti.com/git/graphics/ti-gc320-driver.git;protocol=https;branch=${BRANCH}" 15SRC_URI = "git://git.ti.com/git/graphics/ti-gc320-driver.git;protocol=https;branch=${BRANCH}"
19 16
20S = "${WORKDIR}/git/src" 17S:append = "/src"
21 18
22EXTRA_OEMAKE += "-f Kbuild AQROOT=${S} KERNEL_DIR=${STAGING_KERNEL_DIR} TOOLCHAIN_PATH=${TOOLCHAIN_PATH} CROSS_COMPILE=${TARGET_PREFIX} ARCH_TYPE=${TARGET_ARCH}" 19EXTRA_OEMAKE += "-f Kbuild AQROOT=${S} KERNEL_DIR=${STAGING_KERNEL_DIR} TOOLCHAIN_PATH=${TOOLCHAIN_PATH} CROSS_COMPILE=${TARGET_PREFIX} ARCH_TYPE=${TARGET_ARCH}"
23 20
diff --git a/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb b/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
index ee3a94dc..c43afb5b 100644
--- a/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/goodix-fw/goodix-fw_git.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Goodix GT9271 config firmware" 1SUMMARY = "Goodix GT9271 config firmware"
2 2
3require recipes-bsp/ti-linux-fw/ti-linux-fw.inc 3require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
4 4
diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb
index 02ec9fe9..0d39571b 100644
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_23.3.6512818.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs" 1SUMMARY = "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs"
2HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver" 2HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver"
3LICENSE = "MIT | GPL-2.0-only" 3LICENSE = "MIT | GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2" 4LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2"
@@ -7,22 +7,17 @@ inherit module
7 7
8PROVIDES = "virtual/gpudriver" 8PROVIDES = "virtual/gpudriver"
9 9
10MACHINE_KERNEL_PR:append = "b"
11PR = "${MACHINE_KERNEL_PR}"
12
13PACKAGE_ARCH = "${MACHINE_ARCH}" 10PACKAGE_ARCH = "${MACHINE_ARCH}"
14 11
15COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s" 12COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s"
16 13
17DEPENDS = "virtual/kernel" 14DEPENDS = "virtual/kernel"
18 15
19BRANCH = "linuxws/scarthgap/k6.6/${PV}" 16BRANCH = "linuxws/kirkstone/k6.1/${PV}"
20 17
21SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}" 18SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}"
22 19
23S = "${WORKDIR}/git" 20SRCREV = "c838bc06a163abad46dcc193c8fb9a4fb9e2e356"
24
25SRCREV = "2f409b4dd2540e896b54bff02219d4fc51129b81"
26 21
27TARGET_PRODUCT:j721e = "j721e_linux" 22TARGET_PRODUCT:j721e = "j721e_linux"
28TARGET_PRODUCT:j721s2 = "j721s2_linux" 23TARGET_PRODUCT:j721s2 = "j721s2_linux"
diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.2.6643903.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.2.6643903.bb
new file mode 100644
index 00000000..ddb401a5
--- /dev/null
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-img-rogue-driver_24.2.6643903.bb
@@ -0,0 +1,38 @@
1SUMMARY = "Kernel drivers for the PowerVR Rogue GPU found in the TI SoCs"
2HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-driver"
3LICENSE = "MIT | GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://README;beginline=14;endline=19;md5=0403c7dea01a2b8232261e805325fac2"
5
6inherit module
7
8PROVIDES = "virtual/gpudriver"
9
10PACKAGE_ARCH = "${MACHINE_ARCH}"
11
12COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|j742s2|am62xx|am62pxx|j722s"
13
14DEPENDS = "virtual/kernel"
15
16BRANCH = "linuxws/scarthgap/k6.12/${PV}"
17
18SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-driver.git;protocol=https;branch=${BRANCH}"
19
20SRCREV = "8eaff654a8871118c08cfafe53795f57e3b6b396"
21
22TARGET_PRODUCT:j721e = "j721e_linux"
23TARGET_PRODUCT:j721s2 = "j721s2_linux"
24TARGET_PRODUCT:j784s4 = "j784s4_linux"
25TARGET_PRODUCT:j742s2 = "j784s4_linux"
26TARGET_PRODUCT:am62xx = "am62_linux"
27TARGET_PRODUCT:am62pxx = "am62p_linux"
28TARGET_PRODUCT:j722s = "j722s_linux"
29PVR_BUILD = "release"
30PVR_WS = "lws-generic"
31
32EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} PVR_BUILD_DIR=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}'
33
34do_install() {
35 make -C ${STAGING_KERNEL_DIR} M=${B}/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_aarch64/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install
36}
37
38RRECOMMENDS:${PN} += "ti-img-rogue-umlibs"
diff --git a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
index ca28ae76..f5cea270 100644
--- a/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
+++ b/meta-ti-bsp/recipes-bsp/powervr-drivers/ti-sgx-ddk-km_1.17.4948957.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Kernel drivers for the PowerVR SGX chipset found in the TI SoCs" 1SUMMARY = "Kernel drivers for the PowerVR SGX chipset found in the TI SoCs"
2HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-linux" 2HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-linux"
3LICENSE = "MIT | GPL-2.0-only" 3LICENSE = "MIT | GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://GPL-COPYING;md5=60422928ba677faaa13d6ab5f5baaa1e" 4LIC_FILES_CHKSUM = "file://GPL-COPYING;md5=60422928ba677faaa13d6ab5f5baaa1e"
@@ -9,9 +9,6 @@ PROVIDES = "virtual/gpudriver"
9 9
10COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx" 10COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|am65xx"
11 11
12MACHINE_KERNEL_PR:append = "x"
13PR = "${MACHINE_KERNEL_PR}"
14
15PACKAGE_ARCH = "${MACHINE_ARCH}" 12PACKAGE_ARCH = "${MACHINE_ARCH}"
16 13
17DEPENDS = "virtual/kernel" 14DEPENDS = "virtual/kernel"
@@ -20,9 +17,7 @@ BRANCH = "${PV}/mesa/k6.1"
20 17
21SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https;branch=${BRANCH}" 18SRC_URI = "git://git.ti.com/git/graphics/omap5-sgx-ddk-linux.git;protocol=https;branch=${BRANCH}"
22 19
23S = "${WORKDIR}/git" 20SRCREV = "9ae0fa4998b1c624408945e062bf8fb0ea7efb9d"
24
25SRCREV = "2cb2c9609b7740cb2c348e669a96f26e1cc858da"
26 21
27TARGET_PRODUCT:omap-a15 = "ti572x_linux" 22TARGET_PRODUCT:omap-a15 = "ti572x_linux"
28TARGET_PRODUCT:ti33x = "ti335x_linux" 23TARGET_PRODUCT:ti33x = "ti335x_linux"
@@ -34,6 +29,14 @@ PVR_WS = "lws-generic"
34EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} \ 29EXTRA_OEMAKE += 'KERNELDIR="${STAGING_KERNEL_DIR}" BUILD=${PVR_BUILD} \
35WINDOW_SYSTEM=${PVR_WS} PVR_BUILD_DIR=${TARGET_PRODUCT}' 30WINDOW_SYSTEM=${PVR_WS} PVR_BUILD_DIR=${TARGET_PRODUCT}'
36 31
32# There are useful flags here that are interpreted by the final kbuild pass
33# These variables are not necessary when compiling outside of Yocto
34export KERNEL_CC
35export KERNEL_LD
36export KERNEL_AR
37export KERNEL_OBJCOPY
38export KERNEL_STRIP
39
37do_install() { 40do_install() {
38 make -C ${STAGING_KERNEL_DIR} M=${B}/eurasiacon/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_armhf/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install 41 make -C ${STAGING_KERNEL_DIR} M=${B}/eurasiacon/binary_${TARGET_PRODUCT}_${PVR_WS}_${PVR_BUILD}/target_armhf/kbuild INSTALL_MOD_PATH=${D}${root_prefix} PREFIX=${STAGING_DIR_HOST} modules_install
39} 42}
diff --git a/meta-ti-bsp/recipes-bsp/ti-dac-fw/ti-dac-fw.bb b/meta-ti-bsp/recipes-bsp/ti-dac-fw/ti-dac-fw.bb
new file mode 100644
index 00000000..8f68009d
--- /dev/null
+++ b/meta-ti-bsp/recipes-bsp/ti-dac-fw/ti-dac-fw.bb
@@ -0,0 +1,17 @@
1DESCRIPTION = "TI DAC TAD5212 config prebuild binary firmware"
2
3require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
4
5PV = "${TAD5212_FW_VERSION}"
6PR = "${INC_PR}.0"
7
8COMPATIBLE_MACHINE = "am62dxx"
9
10TAD5212_1DEV = "tad5212_01.bin"
11TAD5212_4DEV = "tad5212_04.bin"
12
13do_install() {
14 install -d ${D}${nonarch_base_libdir}/firmware
15 install -m 0644 ${S}/ti/tad5212/${TAD5212_1DEV} ${D}${nonarch_base_libdir}/firmware/
16 install -m 0644 ${S}/ti/tad5212/${TAD5212_4DEV} ${D}${nonarch_base_libdir}/firmware/
17}
diff --git a/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
index 1ad236ce..03016993 100644
--- a/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-dm-fw/ti-dm-fw.bb
@@ -7,8 +7,6 @@ COMPATIBLE_MACHINE = "k3"
7 7
8PACKAGE_ARCH = "${MACHINE_ARCH}" 8PACKAGE_ARCH = "${MACHINE_ARCH}"
9 9
10INHIBIT_DEFAULT_DEPS = "1"
11
12inherit deploy 10inherit deploy
13inherit update-alternatives 11inherit update-alternatives
14 12
@@ -26,10 +24,13 @@ PLAT_SFX:j7200 = "j7200"
26PLAT_SFX:j721s2 = "j721s2" 24PLAT_SFX:j721s2 = "j721s2"
27PLAT_SFX:j784s4 = "j784s4" 25PLAT_SFX:j784s4 = "j784s4"
28PLAT_SFX:j722s = "j722s" 26PLAT_SFX:j722s = "j722s"
27PLAT_SFX:j742s2 = "j742s2"
29PLAT_SFX:am65xx = "am65xx" 28PLAT_SFX:am65xx = "am65xx"
30PLAT_SFX:am64xx = "am64xx" 29PLAT_SFX:am64xx = "am64xx"
31PLAT_SFX:am62xx = "am62xx" 30PLAT_SFX:am62xx = "am62xx"
32PLAT_SFX:am62axx = "am62axx" 31PLAT_SFX:am62axx = "am62axx"
32PLAT_SFX:am62dxx = "am62axx"
33PLAT_SFX:am62lxx = "am62lxx"
33PLAT_SFX:am62pxx = "am62pxx" 34PLAT_SFX:am62pxx = "am62pxx"
34 35
35DM_FW_DIR = "ti-dm/${PLAT_SFX}" 36DM_FW_DIR = "ti-dm/${PLAT_SFX}"
@@ -37,6 +38,8 @@ DM_FW_DIR = "ti-dm/${PLAT_SFX}"
37INSTALL_DM_FW_DIR = "${nonarch_base_libdir}/firmware/${DM_FW_DIR}" 38INSTALL_DM_FW_DIR = "${nonarch_base_libdir}/firmware/${DM_FW_DIR}"
38 39
39DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" 40DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
41DM_FIRMWARE:am62axx = "dm_edgeai_mcu1_0_release_strip.out"
42DM_FIRMWARE:am62pxx = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'dss_display_share.wkup-r5f0_0.release.strip.out', 'ipc_echo_testb_mcu1_0_release_strip.xer5f', d)}"
40 43
41DM_FW_LIST = "" 44DM_FW_LIST = ""
42DM_FW_LIST:j721e = "${DM_FIRMWARE}" 45DM_FW_LIST:j721e = "${DM_FIRMWARE}"
@@ -44,10 +47,13 @@ DM_FW_LIST:j7200 = "${DM_FIRMWARE}"
44DM_FW_LIST:j721s2 = "${DM_FIRMWARE}" 47DM_FW_LIST:j721s2 = "${DM_FIRMWARE}"
45DM_FW_LIST:j784s4 = "${DM_FIRMWARE}" 48DM_FW_LIST:j784s4 = "${DM_FIRMWARE}"
46DM_FW_LIST:j722s = "${DM_FIRMWARE}" 49DM_FW_LIST:j722s = "${DM_FIRMWARE}"
50DM_FW_LIST:j742s2 = "${DM_FIRMWARE}"
47DM_FW_LIST:am65xx = "" 51DM_FW_LIST:am65xx = ""
48DM_FW_LIST:am64xx = "" 52DM_FW_LIST:am64xx = ""
49DM_FW_LIST:am62xx = "${DM_FIRMWARE}" 53DM_FW_LIST:am62xx = "${DM_FIRMWARE}"
50DM_FW_LIST:am62axx = "${DM_FIRMWARE}" 54DM_FW_LIST:am62axx = "${DM_FIRMWARE}"
55DM_FW_LIST:am62dxx = "${DM_FIRMWARE}"
56DM_FW_LIST:am62lxx = ""
51DM_FW_LIST:am62pxx = "${DM_FIRMWARE}" 57DM_FW_LIST:am62pxx = "${DM_FIRMWARE}"
52 58
53do_install() { 59do_install() {
@@ -81,11 +87,13 @@ do_deploy() {
81ALTERNATIVE:${PN}:am62xx = "am62-main-r5f0_0-fw" 87ALTERNATIVE:${PN}:am62xx = "am62-main-r5f0_0-fw"
82ALTERNATIVE:${PN}:am62pxx = "am62p-main-r5f0_0-fw" 88ALTERNATIVE:${PN}:am62pxx = "am62p-main-r5f0_0-fw"
83ALTERNATIVE:${PN}:am62axx = "am62a-main-r5f0_0-fw" 89ALTERNATIVE:${PN}:am62axx = "am62a-main-r5f0_0-fw"
90ALTERNATIVE:${PN}:am62dxx = "am62a-main-r5f0_0-fw"
84ALTERNATIVE:${PN}:j721e = "j7-mcu-r5f0_0-fw" 91ALTERNATIVE:${PN}:j721e = "j7-mcu-r5f0_0-fw"
85ALTERNATIVE:${PN}:j7200 = "j7200-mcu-r5f0_0-fw" 92ALTERNATIVE:${PN}:j7200 = "j7200-mcu-r5f0_0-fw"
86ALTERNATIVE:${PN}:j721s2 = "j721s2-mcu-r5f0_0-fw" 93ALTERNATIVE:${PN}:j721s2 = "j721s2-mcu-r5f0_0-fw"
87ALTERNATIVE:${PN}:j784s4 = "j784s4-mcu-r5f0_0-fw" 94ALTERNATIVE:${PN}:j784s4 = "j784s4-mcu-r5f0_0-fw"
88ALTERNATIVE:${PN}:j722s = "j722s-wkup-r5f0_0-fw" 95ALTERNATIVE:${PN}:j722s = "j722s-wkup-r5f0_0-fw"
96ALTERNATIVE:${PN}:j742s2 = "j742s2-mcu-r5f0_0-fw"
89 97
90# Set up link names for the firmwares 98# Set up link names for the firmwares
91ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62-main-r5f0_0-fw" 99ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62-main-r5f0_0-fw"
@@ -96,6 +104,7 @@ ALTERNATIVE_LINK_NAME[j7200-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j
96ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j721s2-mcu-r5f0_0-fw" 104ALTERNATIVE_LINK_NAME[j721s2-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j721s2-mcu-r5f0_0-fw"
97ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j784s4-mcu-r5f0_0-fw" 105ALTERNATIVE_LINK_NAME[j784s4-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j784s4-mcu-r5f0_0-fw"
98ALTERNATIVE_LINK_NAME[j722s-wkup-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j722s-wkup-r5f0_0-fw" 106ALTERNATIVE_LINK_NAME[j722s-wkup-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j722s-wkup-r5f0_0-fw"
107ALTERNATIVE_LINK_NAME[j742s2-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j742s2-mcu-r5f0_0-fw"
99 108
100# Create the firmware alternatives 109# Create the firmware alternatives
101ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" 110ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
@@ -106,6 +115,7 @@ ALTERNATIVE_TARGET[j7200-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
106ALTERNATIVE_TARGET[j721s2-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" 115ALTERNATIVE_TARGET[j721s2-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
107ALTERNATIVE_TARGET[j784s4-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" 116ALTERNATIVE_TARGET[j784s4-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
108ALTERNATIVE_TARGET[j722s-wkup-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}" 117ALTERNATIVE_TARGET[j722s-wkup-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
118ALTERNATIVE_TARGET[j742s2-mcu-r5f0_0-fw] = "${INSTALL_DM_FW_DIR}/${DM_FIRMWARE}"
109 119
110ALTERNATIVE_PRIORITY = "10" 120ALTERNATIVE_PRIORITY = "10"
111 121
diff --git a/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb b/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb
index 6bcc824b..04e43609 100644
--- a/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-eth-fw/ti-eth-fw.bb
@@ -3,11 +3,7 @@ SUMMARY = "TI Ethernet prebuilt binary firmware images"
3LICENSE = "TI-TFL" 3LICENSE = "TI-TFL"
4LIC_FILES_CHKSUM = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a" 4LIC_FILES_CHKSUM = "file://${THISDIR}/../../licenses/TI-TFL;md5=a1b59cb7ba626b9dbbcbf00f3fbc438a"
5 5
6COMPATIBLE_MACHINE = "k3" 6COMPATIBLE_MACHINE = "j721e|j7200|j784s4"
7
8PACKAGE_ARCH = "${MACHINE_ARCH}"
9
10INHIBIT_DEFAULT_DEPS = "1"
11 7
12inherit update-alternatives 8inherit update-alternatives
13 9
@@ -19,64 +15,60 @@ PR = "${INC_PR}.0"
19# Secure Build 15# Secure Build
20inherit ti-secdev 16inherit ti-secdev
21 17
22PLAT_SFX = "" 18PACKAGES += " \
23PLAT_SFX:j721e = "j721e" 19 ${PN}-j721e \
24PLAT_SFX:j7200 = "j7200" 20 ${PN}-j7200 \
25PLAT_SFX:j721s2 = "j721s2" 21 ${PN}-j784s4 \
26PLAT_SFX:j784s4 = "j784s4" 22"
27PLAT_SFX:j722s = "j722s" 23# Disable arch checking as firmware is likely to be a different arch from the Yocto build
28PLAT_SFX:am65xx = "am65xx" 24INSANE_SKIP:${PN}-j721e += "arch"
29PLAT_SFX:am64xx = "am64xx" 25INSANE_SKIP:${PN}-j7200 += "arch"
30PLAT_SFX:am62xx = "am62xx" 26INSANE_SKIP:${PN}-j784s4 += "arch"
31PLAT_SFX:am62pxx = "am62pxx" 27
32PLAT_SFX:am62axx = "am62axx" 28RDEPENDS:${PN} += " \
33 29 ${PN}-j721e \
34ETH_FW_DIR = "ti-eth/${PLAT_SFX}" 30 ${PN}-j7200 \
35 31 ${PN}-j784s4 \
36INSTALL_ETH_FW_DIR = "${nonarch_base_libdir}/firmware/${ETH_FW_DIR}" 32"
33
34PLATS = "\
35 j721e \
36 j7200 \
37 j784s4 \
38"
37 39
38ETH_FW = "app_remoteswitchcfg_server_strip.xer5f" 40ETH_FW = "app_remoteswitchcfg_server_strip.xer5f"
39 41
40ETH_FW_LIST = ""
41ETH_FW_LIST:j721e = "${ETH_FW}"
42ETH_FW_LIST:j7200 = "${ETH_FW}"
43ETH_FW_LIST:j721s2 = ""
44ETH_FW_LIST:j784s4 = "${ETH_FW}"
45ETH_FW_LIST:j722s = ""
46ETH_FW_LIST:am65xx = ""
47ETH_FW_LIST:am64xx = ""
48ETH_FW_LIST:am62xx = ""
49ETH_FW_LIST:am62pxx = ""
50ETH_FW_LIST:am62axx = ""
51
52do_install() { 42do_install() {
53 # ETH firmware 43 for PLAT in ${PLATS}
54 for FW_NAME in ${ETH_FW_LIST}
55 do 44 do
56 ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/${ETH_FW_DIR}/${FW_NAME} ${S}/${ETH_FW_DIR}/${FW_NAME}.signed 45 # Sign ETH firmware
57 done 46 ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh ${S}/ti-eth/${PLAT}/${ETH_FW} ${S}/ti-eth/${PLAT}/${ETH_FW}.signed
58 47
59 # ETH firmware 48 # Install ETH firmware
60 install -d ${D}${INSTALL_ETH_FW_DIR} 49 install -d ${D}${nonarch_base_libdir}/firmware/ti-eth/${PLAT}
61 for FW_NAME in ${ETH_FW_LIST} 50 install -m 0644 ${S}/ti-eth/${PLAT}/${ETH_FW} ${D}${nonarch_base_libdir}/firmware/ti-eth/${PLAT}
62 do 51 install -m 0644 ${S}/ti-eth/${PLAT}/${ETH_FW}.signed ${D}${nonarch_base_libdir}/firmware/ti-eth/${PLAT}
63 install -m 0644 ${S}/${ETH_FW_DIR}/${FW_NAME} ${D}${INSTALL_ETH_FW_DIR}
64 install -m 0644 ${S}/${ETH_FW_DIR}/${FW_NAME}.signed ${D}${INSTALL_ETH_FW_DIR}
65 done 52 done
66} 53}
67 54
55FILES:${PN} = ""
56FILES:${PN}-j721e = "${nonarch_base_libdir}/firmware/ti-eth/j721e"
57FILES:${PN}-j7200 = "${nonarch_base_libdir}/firmware/ti-eth/j7200"
58FILES:${PN}-j784s4 = "${nonarch_base_libdir}/firmware/ti-eth/j784s4"
59
68# Set up names for the firmwares 60# Set up names for the firmwares
69ALTERNATIVE:${PN}:j721e = "\ 61ALTERNATIVE:${PN}-j721e = "\
70 j7-main-r5f0_0-fw \ 62 j7-main-r5f0_0-fw \
71 j7-main-r5f0_0-fw-sec \ 63 j7-main-r5f0_0-fw-sec \
72 " 64 "
73 65
74ALTERNATIVE:${PN}:j7200 = "\ 66ALTERNATIVE:${PN}-j7200 = "\
75 j7200-main-r5f0_0-fw \ 67 j7200-main-r5f0_0-fw \
76 j7200-main-r5f0_0-fw-sec \ 68 j7200-main-r5f0_0-fw-sec \
77 " 69 "
78 70
79ALTERNATIVE:${PN}:j784s4 = "\ 71ALTERNATIVE:${PN}-j784s4 = "\
80 j784s4-main-r5f0_0-fw \ 72 j784s4-main-r5f0_0-fw \
81 j784s4-main-r5f0_0-fw-sec \ 73 j784s4-main-r5f0_0-fw-sec \
82 " 74 "
@@ -92,13 +84,13 @@ ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmw
92ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f0_0-fw-sec" 84ALTERNATIVE_LINK_NAME[j784s4-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j784s4-main-r5f0_0-fw-sec"
93 85
94# Create the firmware alternatives 86# Create the firmware alternatives
95ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}" 87ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/ti-eth/j721e/${ETH_FW}"
96ALTERNATIVE_TARGET[j7-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed" 88ALTERNATIVE_TARGET[j7-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/ti-eth/j721e/${ETH_FW}.signed"
97 89
98ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}" 90ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/ti-eth/j7200/${ETH_FW}"
99ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed" 91ALTERNATIVE_TARGET[j7200-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/ti-eth/j7200/${ETH_FW}.signed"
100 92
101ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}" 93ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/ti-eth/j784s4/${ETH_FW}"
102ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw-sec] = "${INSTALL_ETH_FW_DIR}/${ETH_FW}.signed" 94ALTERNATIVE_TARGET[j784s4-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/ti-eth/j784s4/${ETH_FW}.signed"
103 95
104ALTERNATIVE_PRIORITY = "5" 96ALTERNATIVE_PRIORITY = "5"
diff --git a/meta-ti-bsp/recipes-bsp/ti-hsm-fw/ti-hsm-demo-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-hsm-fw/ti-hsm-demo-fw_git.bb
new file mode 100644
index 00000000..f6a7b43f
--- /dev/null
+++ b/meta-ti-bsp/recipes-bsp/ti-hsm-fw/ti-hsm-demo-fw_git.bb
@@ -0,0 +1,24 @@
1SUMMARY = "TI HSM demo Firmware"
2
3inherit deploy
4
5require recipes-bsp/ti-linux-fw/ti-linux-fw.inc
6
7PACKAGE_ARCH = "${MACHINE_ARCH}"
8
9PV = "${TI_HSM_DEMO_FW_VERSION}"
10PR = "${INC_PR}.0"
11
12COMPATIBLE_MACHINE = "j721s2|j784s4"
13
14HSM_FW_SOC:j721s2 = "j721s2"
15HSM_FW_SOC:j784s4 = "j784s4"
16
17HSM_BINARY = "hsm-demo-firmware-${HSM_FW_SOC}*.bin"
18
19do_deploy() {
20 install -d ${DEPLOYDIR}/ti-hsm
21 install -m 644 ${S}/ti-hsm/${HSM_BINARY} ${DEPLOYDIR}/ti-hsm
22}
23
24addtask deploy before do_build after do_compile
diff --git a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/ti-vxe-vxd-driver_6.12.bb b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/ti-vxe-vxd-driver_6.12.bb
new file mode 100644
index 00000000..e5cd0d49
--- /dev/null
+++ b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/ti-vxe-vxd-driver_6.12.bb
@@ -0,0 +1,21 @@
1SUMMARY = "Kernel drivers for Video Accelerators found in the J721E TI SoC"
2LICENSE = "GPL-2.0-only"
3LIC_FILES_CHKSUM = "file://README;beginline=11;endline=12;md5=ad10b552e357ac443ec5dd2e02912b1b"
4
5inherit module
6
7PACKAGE_ARCH = "${MACHINE_ARCH}"
8
9COMPATIBLE_MACHINE = "j721e"
10
11DEPENDS += "virtual/kernel"
12
13BRANCH = "scarthgap/k${PV}"
14
15SRC_URI = "git://git.ti.com/git/multimedia/img-vxe-vxd.git;protocol=https;branch=${BRANCH}"
16
17SRCREV = "038d9263c67900ea4eff631820b088a3dc3a6ad5"
18
19TARGET_PRODUCT:j721e = "j721e_linux"
20
21EXTRA_OEMAKE += 'KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
diff --git a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
index 29af4863..133876df 100644
--- a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/viddec-test-app_1.0.0.bb
@@ -16,5 +16,3 @@ TARGET_CC_ARCH += "${LDFLAGS}"
16 16
17BRANCH = "master" 17BRANCH = "master"
18SRC_URI = "git://git.ti.com/git/jacinto7_multimedia/viddec-test-app.git;protocol=https;branch=${BRANCH}" 18SRC_URI = "git://git.ti.com/git/jacinto7_multimedia/viddec-test-app.git;protocol=https;branch=${BRANCH}"
19
20S = "${WORKDIR}/git"
diff --git a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
index b674c764..41b4d2e4 100644
--- a/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-img-encode-decode/videnc-test-app_1.0.0.bb
@@ -16,5 +16,3 @@ TARGET_CC_ARCH += "${LDFLAGS}"
16 16
17BRANCH = "master" 17BRANCH = "master"
18SRC_URI = "git://git.ti.com/git/jacinto7_multimedia/videnc-test-app.git;protocol=https;branch=${BRANCH}" 18SRC_URI = "git://git.ti.com/git/jacinto7_multimedia/videnc-test-app.git;protocol=https;branch=${BRANCH}"
19
20S = "${WORKDIR}/git"
diff --git a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
index 6f7e8813..58c4431e 100644
--- a/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
+++ b/meta-ti-bsp/recipes-bsp/ti-linux-fw/ti-linux-fw.inc
@@ -9,22 +9,26 @@ INC_PR = "r4"
9# Firmware versions 9# Firmware versions
10CORESDK_RTOS_VERSION = "08.02.00.04" 10CORESDK_RTOS_VERSION = "08.02.00.04"
11PRUETH_FW_AM65X_VERSION = "08.00.00.20" 11PRUETH_FW_AM65X_VERSION = "08.00.00.20"
12PRUETH_FW_AM65X_SR2_VERSION = "02.02.13.00" 12PRUETH_FW_AM65X_SR2_VERSION = "02.02.15.04"
13GOODIX_FW_VERSION = "1.0.0.0" 13GOODIX_FW_VERSION = "1.0.0.0"
14CADENCE_MHDP_FW_VERSION = "2.1.0" 14CADENCE_MHDP_FW_VERSION = "2.1.0"
15IMG_DEC_FW_VERSION = "1.0" 15IMG_DEC_FW_VERSION = "1.0"
16CNM_WAVE521_FW_VERSION = "1.0.3" 16CNM_WAVE521_FW_VERSION = "1.0.8"
17TI_DM_FW_VERSION = "09.02.04" 17TI_DM_FW_VERSION = "11.00.09"
18TI_SYSFW_VERSION = "09.02.07" 18TI_SYSFW_VERSION = "11.01.00"
19TI_HSM_DEMO_FW_VERSION = "11.00.09"
20TAD5212_FW_VERSION = "1.0.0.0"
19 21
20TI_LINUX_FW_SRCREV ?= "58e3c376102aa8f42a0b1208afc91d75200b2d7b" 22TI_LINUX_FW_SRCREV ?= "e594deb508a322d5681888d48fbb153953b06ca9"
21SRCREV = "${TI_LINUX_FW_SRCREV}" 23SRCREV = "${TI_LINUX_FW_SRCREV}"
22 24
23BRANCH ?= "ti-linux-firmware" 25BRANCH ?= "ti-linux-firmware"
24 26
25SRC_URI = "git://git.ti.com/git/processor-firmware/ti-linux-firmware.git;protocol=https;branch=${BRANCH}" 27TI_LINUX_FW_GIT_URI ?= "git://git.ti.com/git/processor-firmware/ti-linux-firmware.git"
28TI_LINUX_FW_GIT_PROTOCOL ?= "https"
29TI_LINUX_FW_GIT_BRANCH ?= "branch=${BRANCH}"
26 30
27S = "${WORKDIR}/git" 31SRC_URI = "${TI_LINUX_FW_GIT_URI};protocol=${TI_LINUX_FW_GIT_PROTOCOL};${TI_LINUX_FW_GIT_BRANCH}"
28 32
29CLEANBROKEN = "1" 33CLEANBROKEN = "1"
30 34
@@ -38,6 +42,9 @@ INHIBIT_SYSROOT_STRIP = "1"
38# This is used to prevent the build system from splitting out the firmware debug info into a separate file 42# This is used to prevent the build system from splitting out the firmware debug info into a separate file
39INHIBIT_PACKAGE_DEBUG_SPLIT = "1" 43INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
40 44
45# Firmware here are prebuilt with no external dependencies
46INHIBIT_DEFAULT_DEPS = "1"
47
41# Disable arch checking as firmware is likely to be a different arch from the Yocto build 48# Disable arch checking as firmware is likely to be a different arch from the Yocto build
42INSANE_SKIP:${PN} += "arch" 49INSANE_SKIP:${PN} += "arch"
43 50
diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb b/meta-ti-bsp/recipes-bsp/ti-rtos-fw/ti-rtos-echo-test-fw.bb
index 7bf5030a..7fffc9de 100644
--- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-firmware.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-rtos-fw/ti-rtos-echo-test-fw.bb
@@ -7,8 +7,6 @@ COMPATIBLE_MACHINE = "k3"
7 7
8PACKAGE_ARCH = "${MACHINE_ARCH}" 8PACKAGE_ARCH = "${MACHINE_ARCH}"
9 9
10INHIBIT_DEFAULT_DEPS = "1"
11
12inherit update-alternatives 10inherit update-alternatives
13 11
14PLAT_SFX = "" 12PLAT_SFX = ""
@@ -17,10 +15,12 @@ PLAT_SFX:j7200 = "j7200"
17PLAT_SFX:j721s2 = "j721s2" 15PLAT_SFX:j721s2 = "j721s2"
18PLAT_SFX:j784s4 = "j784s4" 16PLAT_SFX:j784s4 = "j784s4"
19PLAT_SFX:j722s = "j722s" 17PLAT_SFX:j722s = "j722s"
18PLAT_SFX:j742s2 = "j742s2"
20PLAT_SFX:am65xx = "am65xx" 19PLAT_SFX:am65xx = "am65xx"
21PLAT_SFX:am64xx = "am64xx" 20PLAT_SFX:am64xx = "am64xx"
22PLAT_SFX:am62xx = "am62xx" 21PLAT_SFX:am62xx = "am62xx"
23PLAT_SFX:am62axx = "am62axx" 22PLAT_SFX:am62axx = "am62axx"
23PLAT_SFX:am62dxx = "am62dxx"
24PLAT_SFX:am62pxx = "am62pxx" 24PLAT_SFX:am62pxx = "am62pxx"
25 25
26FILESEXTRAPATHS:prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:" 26FILESEXTRAPATHS:prepend := "${METATIBASE}/recipes-bsp/ti-sci-fw/files/:"
@@ -36,20 +36,21 @@ IPC_FW_DIR = "ti-ipc/${PLAT_SFX}"
36 36
37INSTALL_IPC_FW_DIR = "${nonarch_base_libdir}/firmware/${IPC_FW_DIR}" 37INSTALL_IPC_FW_DIR = "${nonarch_base_libdir}/firmware/${IPC_FW_DIR}"
38 38
39MCU_1_0_FW = "ipc_echo_test_mcu1_0_release_strip.xer5f" 39MCU_1_0_FW = "ipc_echo_test_mcu1_0_release_strip.xer5f"
40MCU_1_1_FW = "ipc_echo_test_mcu1_1_release_strip.xer5f" 40MCU_1_1_FW = "ipc_echo_test_mcu1_1_release_strip.xer5f"
41MCU_2_0_FW = "ipc_echo_test_mcu2_0_release_strip.xer5f" 41MCU_2_0_FW = "ipc_echo_test_mcu2_0_release_strip.xer5f"
42MCU_2_1_FW = "ipc_echo_test_mcu2_1_release_strip.xer5f" 42MCU_2_1_FW = "ipc_echo_test_mcu2_1_release_strip.xer5f"
43MCU_3_0_FW = "ipc_echo_test_mcu3_0_release_strip.xer5f" 43MCU_3_0_FW = "ipc_echo_test_mcu3_0_release_strip.xer5f"
44MCU_3_1_FW = "ipc_echo_test_mcu3_1_release_strip.xer5f" 44MCU_3_1_FW = "ipc_echo_test_mcu3_1_release_strip.xer5f"
45MCU_4_0_FW = "ipc_echo_test_mcu4_0_release_strip.xer5f" 45MCU_4_0_FW = "ipc_echo_test_mcu4_0_release_strip.xer5f"
46MCU_4_1_FW = "ipc_echo_test_mcu4_1_release_strip.xer5f" 46MCU_4_1_FW = "ipc_echo_test_mcu4_1_release_strip.xer5f"
47C66_1_FW = "ipc_echo_test_c66xdsp_1_release_strip.xe66" 47C66_1_FW = "ipc_echo_test_c66xdsp_1_release_strip.xe66"
48C66_2_FW = "ipc_echo_test_c66xdsp_2_release_strip.xe66" 48C66_2_FW = "ipc_echo_test_c66xdsp_2_release_strip.xe66"
49C7X_1_FW = "ipc_echo_test_c7x_1_release_strip.xe71" 49C7X_1_FW = "ipc_echo_test_c7x_1_release_strip.xe71"
50C7X_2_FW = "ipc_echo_test_c7x_2_release_strip.xe71" 50C7X_1_FW:am62axx = "dsp_edgeai_c7x_1_release_strip.out"
51C7X_3_FW = "ipc_echo_test_c7x_3_release_strip.xe71" 51C7X_2_FW = "ipc_echo_test_c7x_2_release_strip.xe71"
52C7X_4_FW = "ipc_echo_test_c7x_4_release_strip.xe71" 52C7X_3_FW = "ipc_echo_test_c7x_3_release_strip.xe71"
53C7X_4_FW = "ipc_echo_test_c7x_4_release_strip.xe71"
53 54
54IPC_FW_LIST = "" 55IPC_FW_LIST = ""
55IPC_FW_LIST:am65xx = "${MCU_1_0_FW} ${MCU_1_1_FW}" 56IPC_FW_LIST:am65xx = "${MCU_1_0_FW} ${MCU_1_1_FW}"
@@ -57,11 +58,13 @@ IPC_FW_LIST:am64xx = "${MCU_1_0_FW} ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} $
57IPC_FW_LIST:am62xx = " ${MCU_2_0_FW}" 58IPC_FW_LIST:am62xx = " ${MCU_2_0_FW}"
58IPC_FW_LIST:am62pxx = " ${MCU_2_0_FW}" 59IPC_FW_LIST:am62pxx = " ${MCU_2_0_FW}"
59IPC_FW_LIST:am62axx = " ${MCU_2_0_FW} ${C7X_1_FW}" 60IPC_FW_LIST:am62axx = " ${MCU_2_0_FW} ${C7X_1_FW}"
61IPC_FW_LIST:am62dxx = " ${MCU_2_0_FW} ${C7X_1_FW}"
60IPC_FW_LIST:j721e = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${C66_1_FW} ${C66_2_FW} ${C7X_1_FW}" 62IPC_FW_LIST:j721e = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${C66_1_FW} ${C66_2_FW} ${C7X_1_FW}"
61IPC_FW_LIST:j7200 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW}" 63IPC_FW_LIST:j7200 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW}"
62IPC_FW_LIST:j721s2 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${C7X_1_FW} ${C7X_2_FW}" 64IPC_FW_LIST:j721s2 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${C7X_1_FW} ${C7X_2_FW}"
63IPC_FW_LIST:j784s4 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${MCU_4_0_FW} ${MCU_4_1_FW} ${C7X_1_FW} ${C7X_2_FW} ${C7X_3_FW} ${C7X_4_FW}" 65IPC_FW_LIST:j784s4 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${MCU_4_0_FW} ${MCU_4_1_FW} ${C7X_1_FW} ${C7X_2_FW} ${C7X_3_FW} ${C7X_4_FW}"
64IPC_FW_LIST:j722s = " ${MCU_2_0_FW} ${MCU_3_0_FW} ${C7X_1_FW} ${C7X_2_FW}" 66IPC_FW_LIST:j722s = " ${MCU_2_0_FW} ${MCU_3_0_FW} ${C7X_1_FW} ${C7X_2_FW}"
67IPC_FW_LIST:j742s2 = " ${MCU_1_1_FW} ${MCU_2_0_FW} ${MCU_2_1_FW} ${MCU_3_0_FW} ${MCU_3_1_FW} ${MCU_4_0_FW} ${MCU_4_1_FW} ${C7X_1_FW} ${C7X_2_FW} ${C7X_3_FW}"
65 68
66# Update the am64xx ipc binaries to be consistent with other platforms 69# Update the am64xx ipc binaries to be consistent with other platforms
67do_install:prepend:am64xx() { 70do_install:prepend:am64xx() {
@@ -95,6 +98,14 @@ do_install:prepend:am62axx() {
95 ) 98 )
96} 99}
97 100
101# Update the am62dxx ipc binaries to be consistent with other platforms
102do_install:prepend:am62dxx() {
103 ( cd ${S}/${IPC_FW_DIR}; \
104 ln -sf ipc_rpmsg_echo.mcu-r5f0_0.release.strip.out ${MCU_2_0_FW}; \
105 ln -sf ipc_rpmsg_echo.c75ss0-0.release.strip.out ${C7X_1_FW}; \
106 )
107}
108
98do_install() { 109do_install() {
99 # IPC Firmware 110 # IPC Firmware
100 for FW_NAME in ${IPC_FW_LIST} 111 for FW_NAME in ${IPC_FW_LIST}
@@ -127,7 +138,6 @@ ALTERNATIVE:${PN}:am64xx = "\
127 138
128ALTERNATIVE:${PN}:am62xx = "\ 139ALTERNATIVE:${PN}:am62xx = "\
129 am62-mcu-m4f0_0-fw am62-mcu-m4f0_0-fw-sec \ 140 am62-mcu-m4f0_0-fw am62-mcu-m4f0_0-fw-sec \
130 am62-main-r5f0_0-fw am62-main-r5f0_0-fw-sec \
131 " 141 "
132 142
133ALTERNATIVE:${PN}:am62pxx = "\ 143ALTERNATIVE:${PN}:am62pxx = "\
@@ -139,6 +149,11 @@ ALTERNATIVE:${PN}:am62axx = "\
139 am62a-c71_0-fw am62a-c71_0-fw-sec \ 149 am62a-c71_0-fw am62a-c71_0-fw-sec \
140 " 150 "
141 151
152ALTERNATIVE:${PN}:am62dxx = "\
153 am62d-mcu-r5f0_0-fw am62d-mcu-r5f0_0-fw-sec \
154 am62d-c71_0-fw am62d-c71_0-fw-sec \
155 "
156
142ALTERNATIVE:${PN}:j721e = "\ 157ALTERNATIVE:${PN}:j721e = "\
143 j7-mcu-r5f0_1-fw j7-mcu-r5f0_1-fw-sec \ 158 j7-mcu-r5f0_1-fw j7-mcu-r5f0_1-fw-sec \
144 j7-main-r5f0_0-fw j7-main-r5f0_0-fw-sec \ 159 j7-main-r5f0_0-fw j7-main-r5f0_0-fw-sec \
@@ -187,6 +202,19 @@ ALTERNATIVE:${PN}:j722s = "\
187 j722s-c71_1-fw j722s-c71_1-fw-sec \ 202 j722s-c71_1-fw j722s-c71_1-fw-sec \
188 " 203 "
189 204
205ALTERNATIVE:${PN}:j742s2 = "\
206 j742s2-mcu-r5f0_1-fw j742s2-mcu-r5f0_1-fw-sec \
207 j742s2-main-r5f0_0-fw j742s2-main-r5f0_0-fw-sec \
208 j742s2-main-r5f0_1-fw j742s2-main-r5f0_1-fw-sec \
209 j742s2-main-r5f1_0-fw j742s2-main-r5f1_0-fw-sec \
210 j742s2-main-r5f1_1-fw j742s2-main-r5f1_1-fw-sec \
211 j742s2-main-r5f2_0-fw j742s2-main-r5f2_0-fw-sec \
212 j742s2-main-r5f2_1-fw j742s2-main-r5f2_1-fw-sec \
213 j742s2-c71_0-fw j742s2-c71_0-fw-sec \
214 j742s2-c71_1-fw j742s2-c71_1-fw-sec \
215 j742s2-c71_2-fw j742s2-c71_2-fw-sec \
216 "
217
190# Set up link names for the firmwares 218# Set up link names for the firmwares
191 219
192ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am65x-mcu-r5f0_0-fw" 220ALTERNATIVE_LINK_NAME[am65x-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am65x-mcu-r5f0_0-fw"
@@ -207,8 +235,6 @@ ALTERNATIVE_LINK_NAME[am64-mcu-m4f0_0-fw-sec] = "${nonarch_base_libdir}/firmware
207 235
208ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw] = "${nonarch_base_libdir}/firmware/am62-mcu-m4f0_0-fw" 236ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw] = "${nonarch_base_libdir}/firmware/am62-mcu-m4f0_0-fw"
209ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62-mcu-m4f0_0-fw-sec" 237ALTERNATIVE_LINK_NAME[am62-mcu-m4f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62-mcu-m4f0_0-fw-sec"
210ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62-main-r5f0_0-fw"
211ALTERNATIVE_LINK_NAME[am62-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62-main-r5f0_0-fw-sec"
212 238
213ALTERNATIVE_LINK_NAME[am62p-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62p-mcu-r5f0_0-fw" 239ALTERNATIVE_LINK_NAME[am62p-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62p-mcu-r5f0_0-fw"
214ALTERNATIVE_LINK_NAME[am62p-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62p-mcu-r5f0_0-fw-sec" 240ALTERNATIVE_LINK_NAME[am62p-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62p-mcu-r5f0_0-fw-sec"
@@ -218,6 +244,11 @@ ALTERNATIVE_LINK_NAME[am62a-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmwar
218ALTERNATIVE_LINK_NAME[am62a-c71_0-fw] = "${nonarch_base_libdir}/firmware/am62a-c71_0-fw" 244ALTERNATIVE_LINK_NAME[am62a-c71_0-fw] = "${nonarch_base_libdir}/firmware/am62a-c71_0-fw"
219ALTERNATIVE_LINK_NAME[am62a-c71_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62a-c71_0-fw-sec" 245ALTERNATIVE_LINK_NAME[am62a-c71_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62a-c71_0-fw-sec"
220 246
247ALTERNATIVE_LINK_NAME[am62d-mcu-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/am62d-mcu-r5f0_0-fw"
248ALTERNATIVE_LINK_NAME[am62d-mcu-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62d-mcu-r5f0_0-fw-sec"
249ALTERNATIVE_LINK_NAME[am62d-c71_0-fw] = "${nonarch_base_libdir}/firmware/am62d-c71_0-fw"
250ALTERNATIVE_LINK_NAME[am62d-c71_0-fw-sec] = "${nonarch_base_libdir}/firmware/am62d-c71_0-fw-sec"
251
221ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_1-fw" 252ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_1-fw"
222ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_1-fw-sec" 253ALTERNATIVE_LINK_NAME[j7-mcu-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j7-mcu-r5f0_1-fw-sec"
223ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7-main-r5f0_0-fw" 254ALTERNATIVE_LINK_NAME[j7-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j7-main-r5f0_0-fw"
@@ -289,6 +320,27 @@ ALTERNATIVE_LINK_NAME[j722s-c71_0-fw-sec] = "${nonarch_base_libdir}/firmware/j72
289ALTERNATIVE_LINK_NAME[j722s-c71_1-fw] = "${nonarch_base_libdir}/firmware/j722s-c71_1-fw" 320ALTERNATIVE_LINK_NAME[j722s-c71_1-fw] = "${nonarch_base_libdir}/firmware/j722s-c71_1-fw"
290ALTERNATIVE_LINK_NAME[j722s-c71_1-fw-sec] = "${nonarch_base_libdir}/firmware/j722s-c71_1-fw-sec" 321ALTERNATIVE_LINK_NAME[j722s-c71_1-fw-sec] = "${nonarch_base_libdir}/firmware/j722s-c71_1-fw-sec"
291 322
323ALTERNATIVE_LINK_NAME[j742s2-mcu-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j742s2-mcu-r5f0_1-fw"
324ALTERNATIVE_LINK_NAME[j742s2-mcu-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j742s2-mcu-r5f0_1-fw-sec"
325ALTERNATIVE_LINK_NAME[j742s2-main-r5f0_0-fw] = "${nonarch_base_libdir}/firmware/j742s2-main-r5f0_0-fw"
326ALTERNATIVE_LINK_NAME[j742s2-main-r5f0_0-fw-sec] = "${nonarch_base_libdir}/firmware/j742s2-main-r5f0_0-fw-sec"
327ALTERNATIVE_LINK_NAME[j742s2-main-r5f0_1-fw] = "${nonarch_base_libdir}/firmware/j742s2-main-r5f0_1-fw"
328ALTERNATIVE_LINK_NAME[j742s2-main-r5f0_1-fw-sec] = "${nonarch_base_libdir}/firmware/j742s2-main-r5f0_1-fw-sec"
329ALTERNATIVE_LINK_NAME[j742s2-main-r5f1_0-fw] = "${nonarch_base_libdir}/firmware/j742s2-main-r5f1_0-fw"
330ALTERNATIVE_LINK_NAME[j742s2-main-r5f1_0-fw-sec] = "${nonarch_base_libdir}/firmware/j742s2-main-r5f1_0-fw-sec"
331ALTERNATIVE_LINK_NAME[j742s2-main-r5f1_1-fw] = "${nonarch_base_libdir}/firmware/j742s2-main-r5f1_1-fw"
332ALTERNATIVE_LINK_NAME[j742s2-main-r5f1_1-fw-sec] = "${nonarch_base_libdir}/firmware/j742s2-main-r5f1_1-fw-sec"
333ALTERNATIVE_LINK_NAME[j742s2-main-r5f2_0-fw] = "${nonarch_base_libdir}/firmware/j742s2-main-r5f2_0-fw"
334ALTERNATIVE_LINK_NAME[j742s2-main-r5f2_0-fw-sec] = "${nonarch_base_libdir}/firmware/j742s2-main-r5f2_0-fw-sec"
335ALTERNATIVE_LINK_NAME[j742s2-main-r5f2_1-fw] = "${nonarch_base_libdir}/firmware/j742s2-main-r5f2_1-fw"
336ALTERNATIVE_LINK_NAME[j742s2-main-r5f2_1-fw-sec] = "${nonarch_base_libdir}/firmware/j742s2-main-r5f2_1-fw-sec"
337ALTERNATIVE_LINK_NAME[j742s2-c71_0-fw] = "${nonarch_base_libdir}/firmware/j742s2-c71_0-fw"
338ALTERNATIVE_LINK_NAME[j742s2-c71_0-fw-sec] = "${nonarch_base_libdir}/firmware/j742s2-c71_0-fw-sec"
339ALTERNATIVE_LINK_NAME[j742s2-c71_1-fw] = "${nonarch_base_libdir}/firmware/j742s2-c71_1-fw"
340ALTERNATIVE_LINK_NAME[j742s2-c71_1-fw-sec] = "${nonarch_base_libdir}/firmware/j742s2-c71_1-fw-sec"
341ALTERNATIVE_LINK_NAME[j742s2-c71_2-fw] = "${nonarch_base_libdir}/firmware/j742s2-c71_2-fw"
342ALTERNATIVE_LINK_NAME[j742s2-c71_2-fw-sec] = "${nonarch_base_libdir}/firmware/j742s2-c71_2-fw-sec"
343
292# Create the firmware alternatives 344# Create the firmware alternatives
293 345
294ALTERNATIVE_TARGET[am65x-mcu-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_0_FW}" 346ALTERNATIVE_TARGET[am65x-mcu-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_0_FW}"
@@ -309,8 +361,6 @@ ALTERNATIVE_TARGET[am64-mcu-m4f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW
309 361
310ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" 362ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}"
311ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed" 363ALTERNATIVE_TARGET[am62-mcu-m4f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed"
312ALTERNATIVE_TARGET[am62-main-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}"
313ALTERNATIVE_TARGET[am62-main-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed"
314 364
315ALTERNATIVE_TARGET[am62p-mcu-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" 365ALTERNATIVE_TARGET[am62p-mcu-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}"
316ALTERNATIVE_TARGET[am62p-mcu-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed" 366ALTERNATIVE_TARGET[am62p-mcu-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed"
@@ -320,6 +370,11 @@ ALTERNATIVE_TARGET[am62a-mcu-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_F
320ALTERNATIVE_TARGET[am62a-c71_0-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}" 370ALTERNATIVE_TARGET[am62a-c71_0-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}"
321ALTERNATIVE_TARGET[am62a-c71_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}.signed" 371ALTERNATIVE_TARGET[am62a-c71_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}.signed"
322 372
373ALTERNATIVE_TARGET[am62d-mcu-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}"
374ALTERNATIVE_TARGET[am62d-mcu-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed"
375ALTERNATIVE_TARGET[am62d-c71_0-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}"
376ALTERNATIVE_TARGET[am62d-c71_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}.signed"
377
323ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}" 378ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}"
324ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}.signed" 379ALTERNATIVE_TARGET[j7-mcu-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}.signed"
325ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}" 380ALTERNATIVE_TARGET[j7-main-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}"
@@ -391,4 +446,25 @@ ALTERNATIVE_TARGET[j722s-c71_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}.sign
391ALTERNATIVE_TARGET[j722s-c71_1-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_2_FW}" 446ALTERNATIVE_TARGET[j722s-c71_1-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_2_FW}"
392ALTERNATIVE_TARGET[j722s-c71_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_2_FW}.signed" 447ALTERNATIVE_TARGET[j722s-c71_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_2_FW}.signed"
393 448
449ALTERNATIVE_TARGET[j742s2-mcu-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}"
450ALTERNATIVE_TARGET[j742s2-mcu-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_1_1_FW}.signed"
451ALTERNATIVE_TARGET[j742s2-main-r5f0_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}"
452ALTERNATIVE_TARGET[j742s2-main-r5f0_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_0_FW}.signed"
453ALTERNATIVE_TARGET[j742s2-main-r5f0_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}"
454ALTERNATIVE_TARGET[j742s2-main-r5f0_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_2_1_FW}.signed"
455ALTERNATIVE_TARGET[j742s2-main-r5f1_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}"
456ALTERNATIVE_TARGET[j742s2-main-r5f1_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_3_0_FW}.signed"
457ALTERNATIVE_TARGET[j742s2-main-r5f1_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_3_1_FW}"
458ALTERNATIVE_TARGET[j742s2-main-r5f1_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_3_1_FW}.signed"
459ALTERNATIVE_TARGET[j742s2-main-r5f2_0-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_4_0_FW}"
460ALTERNATIVE_TARGET[j742s2-main-r5f2_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_4_0_FW}.signed"
461ALTERNATIVE_TARGET[j742s2-main-r5f2_1-fw] = "${INSTALL_IPC_FW_DIR}/${MCU_4_1_FW}"
462ALTERNATIVE_TARGET[j742s2-main-r5f2_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${MCU_4_1_FW}.signed"
463ALTERNATIVE_TARGET[j742s2-c71_0-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}"
464ALTERNATIVE_TARGET[j742s2-c71_0-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_1_FW}.signed"
465ALTERNATIVE_TARGET[j742s2-c71_1-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_2_FW}"
466ALTERNATIVE_TARGET[j742s2-c71_1-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_2_FW}.signed"
467ALTERNATIVE_TARGET[j742s2-c71_2-fw] = "${INSTALL_IPC_FW_DIR}/${C7X_3_FW}"
468ALTERNATIVE_TARGET[j742s2-c71_2-fw-sec] = "${INSTALL_IPC_FW_DIR}/${C7X_3_FW}.signed"
469
394ALTERNATIVE_PRIORITY = "10" 470ALTERNATIVE_PRIORITY = "10"
diff --git a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 12292c88..0d724862 100644
--- a/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/meta-ti-bsp/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -26,4 +26,10 @@ do_deploy:k3r5() {
26 install -m 644 ${S}/ti-sysfw/ti-fs-stub-firmware-* ${DEPLOYDIR}/ti-sysfw 26 install -m 644 ${S}/ti-sysfw/ti-fs-stub-firmware-* ${DEPLOYDIR}/ti-sysfw
27} 27}
28 28
29do_deploy:am62lxx(){
30 install -d ${DEPLOYDIR}/ti-sysfw
31 install -m 644 ${S}/ti-sysfw/ti-sci-firmware-* ${DEPLOYDIR}/ti-sysfw
32 install -m 644 ${S}/ti-sysfw/ti-fs-firmware-* ${DEPLOYDIR}/ti-sysfw
33}
34
29addtask deploy before do_build after do_compile 35addtask deploy before do_build after do_compile
diff --git a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
index 291259c0..cb956a00 100644
--- a/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc
@@ -1,10 +1,22 @@
1PV:k3 = "2.10+git" 1# NOTE: This .inc file with customizations only gets included for K3 platforms
2SRCREV_tfa:k3 = "00f1ec6b8740ccd403e641131e294aabacf2a48b" 2
3SRC_URI:k3 = "git://git.trustedfirmware.org/TF-A/trusted-firmware-a.git;protocol=https;name=tfa;branch=master" 3PV = "2.12+git"
4COMPATIBLE_MACHINE:k3 = "k3" 4SRCREV_tfa = "2ab59f45ad0a5d95b5cb339c0f64686954377050"
5TFA_BUILD_TARGET:k3 = "all" 5SRC_URI_TRUSTED_FIRMWARE_A = "git://github.com/TexasInstruments/arm-trusted-firmware.git;protocol=https"
6TFA_INSTALL_TARGET:k3 = "bl31" 6SRCBRANCH = "ti-master"
7TFA_SPD:k3 = "opteed" 7SRC_URI = "${SRC_URI_TRUSTED_FIRMWARE_A};name=tfa;branch=${SRCBRANCH}"
8 8
9EXTRA_OEMAKE:append:k3 = "${@ ' K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}" 9LIC_FILES_CHKSUM = "file://docs/license.rst;md5=1118e32884721c0be33267bd7ae11130"
10EXTRA_OEMAKE:append:k3 = "${@ ' K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}" 10COMPATIBLE_MACHINE = "k3"
11
12TFA_BUILD_TARGET = "all"
13TFA_INSTALL_TARGET = "bl31"
14TFA_SPD = "opteed"
15
16# For am62lxx, install bl1 & bl31 using TFA_INSTALL_TARGET
17TFA_INSTALL_TARGET:am62lxx = "bl31 bl1"
18TFA_SPD:am62lxx = ""
19
20EXTRA_OEMAKE += "${@ 'K3_USART=' + d.getVar('TFA_K3_USART') if d.getVar('TFA_K3_USART') else ''}"
21EXTRA_OEMAKE += "${@ 'K3_PM_SYSTEM_SUSPEND=' + d.getVar('TFA_K3_SYSTEM_SUSPEND') if d.getVar('TFA_K3_SYSTEM_SUSPEND') else ''}"
22EXTRA_OEMAKE:append:ti-falcon = " PRELOADED_BL33_BASE=0x82000000 K3_HW_CONFIG_BASE=0x88000000"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
index d32c6529..e334ada0 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/ti-extras.inc
@@ -1,12 +1,12 @@
1 1
2# This will have priority over generic uboot path 2# This will have priority over generic uboot path
3 3
4COMPATIBLE_MACHINE = "am62xx|am62pxx" 4COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
5 5
6BRANCH = "ti-u-boot-2023.04" 6BRANCH = "ti-u-boot-2025.01"
7BRANCH:tie-jailhouse = "ti-u-boot-2023.04-jailhouse" 7BRANCH:tie-jailhouse = "ti-u-boot-2025.01-jailhouse"
8 8
9SRCREV = "b0d868ee086eb5c96a3d32f72a7cb9670abf5b90" 9SRCREV = "e718bbcec3ebf663c021839753034a224be4cc53"
10SRCREV:tie-jailhouse = "765cab112d16fcf68a3266738073663dae67a55d" 10SRCREV:tie-jailhouse = "e718bbcec3ebf663c021839753034a224be4cc53"
11 11
12UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git" 12UBOOT_GIT_URI = "git://git.ti.com/git/processor-sdk/u-boot.git"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb
index f497054c..ba7a6e8d 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-mainline_git.bb
@@ -1,16 +1,9 @@
1require u-boot-ti.inc 1require u-boot-ti.inc
2 2
3PR = "r0" 3SUMMARY = "Mainline U-Boot for TI devices"
4 4
5PV = "2024.01" 5PV = "2025.04"
6 6
7# For the un-initiated:
8# The actual URL you'd use with a git clone for example would be:
9# https://source.denx.de/u-boot/u-boot.git/
10# However, in the context of OE, we have to explicitly split things up:
11# a) we want it to use git fetcher - hence git:// prefix in GIT_URI (if we
12# used https here, we'd endup attempting wget instead of git)
13# b) and we want git fetcher to use https protocol, hence GIT_PROTOCOL as https
14UBOOT_GIT_URI = "git://source.denx.de/u-boot/u-boot.git" 7UBOOT_GIT_URI = "git://source.denx.de/u-boot/u-boot.git"
15UBOOT_GIT_PROTOCOL = "https" 8
16SRCREV = "866ca972d6c3cabeaf6dbac431e8e08bb30b3c8e" 9SRCREV = "34820924edbc4ec7803eb89d9852f4b870fa760a"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-next_git.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-next_git.bb
new file mode 100644
index 00000000..9bdedfa3
--- /dev/null
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-next_git.bb
@@ -0,0 +1,5 @@
1require u-boot-ti-mainline_git.bb
2
3SUMMARY = "U-Boot master-next for TI devices"
4
5BRANCH = "master-next"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
index f2da156b..b26c59d4 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2023.04.bb
@@ -6,4 +6,6 @@ PR = "r0"
6 6
7BRANCH = "ti-u-boot-2023.04" 7BRANCH = "ti-u-boot-2023.04"
8 8
9SRCREV = "f9b966c674731a1a29a20a8e143c61d4e046f13c" 9SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch"
10
11SRCREV = "2bedcd265ca6de803c90505df5962cbd70cda611"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb
index bafd4f19..e0371bfa 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2024.04.bb
@@ -1,11 +1,11 @@
1require u-boot-ti.inc 1require u-boot-ti.inc
2 2
3DEFAULT_PREFERENCE = "-1"
4
5include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''} 3include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
6 4
7PR = "r0" 5PR = "r0"
8 6
9BRANCH = "ti-u-boot-2024.04" 7BRANCH = "ti-u-boot-2024.04"
10 8
11SRCREV = "25049ad560826f7dc1c4740883b0016014a59789" 9SRC_URI += "file://0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch"
10
11SRCREV = "29d0c23d67ee7b88e46fe1753cd020e2b04c2ef6"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
new file mode 100644
index 00000000..329c2af0
--- /dev/null
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti-staging_2025.01.bb
@@ -0,0 +1,9 @@
1require u-boot-ti.inc
2
3include ${@ 'recipes-bsp/u-boot/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
4
5PR = "r0"
6
7BRANCH = "ti-u-boot-2025.01"
8
9SRCREV = "c99a1f082ba4970678c9cb5100d13a986e77817c"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
index bad8371f..660ac557 100644
--- a/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot-ti.inc
@@ -5,6 +5,10 @@ do_compile:prepend () {
5 echo ${scm_version} > ${S}/.scmversion 5 echo ${scm_version} > ${S}/.scmversion
6} 6}
7 7
8inherit gitpkgv
9PKGV = "${PV}${GITPKGV}"
10UBOOT_VERSION = "${PKGV}-${PKGR}"
11
8UBOOT_SUFFIX ?= "img" 12UBOOT_SUFFIX ?= "img"
9SPL_BINARY ?= "MLO" 13SPL_BINARY ?= "MLO"
10 14
@@ -14,6 +18,8 @@ require u-boot-mergeconfig.inc
14 18
15FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:" 19FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot:"
16 20
21FILES:${PN}-falcon = "boot/tispl_falcon.bin"
22
17SUMMARY = "u-boot bootloader for TI devices" 23SUMMARY = "u-boot bootloader for TI devices"
18 24
19LICENSE = "GPL-2.0-or-later" 25LICENSE = "GPL-2.0-or-later"
@@ -21,11 +27,15 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
21 27
22BRANCH ?= "master" 28BRANCH ?= "master"
23UBOOT_GIT_URI ?= "git://git.ti.com/git/ti-u-boot/ti-u-boot.git" 29UBOOT_GIT_URI ?= "git://git.ti.com/git/ti-u-boot/ti-u-boot.git"
24UBOOT_GIT_PROTOCOL = "https" 30UBOOT_GIT_PROTOCOL ?= "https"
25SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};branch=${BRANCH}" 31UBOOT_GIT_BRANCH ?= "branch=${BRANCH}"
32SRC_URI = "${UBOOT_GIT_URI};protocol=${UBOOT_GIT_PROTOCOL};${UBOOT_GIT_BRANCH}"
26 33
27PV:append = "+git" 34PV:append = "+git"
28 35
36# u-boot builds a tool mkeficapsule and it needs this
37DEPENDS += "gnutls-native"
38
29# u-boot needs devtree compiler to parse dts files 39# u-boot needs devtree compiler to parse dts files
30DEPENDS += "dtc-native bc-native flex-native bison-native python3-setuptools-native" 40DEPENDS += "dtc-native bc-native flex-native bison-native python3-setuptools-native"
31 41
@@ -36,7 +46,13 @@ DEPENDS += "python3-pyelftools-native python3-pyyaml-native python3-jsonschema-n
36DEPENDS:append:k3 = " ti-sci-fw" 46DEPENDS:append:k3 = " ti-sci-fw"
37DEPENDS:append:k3r5 = " ti-sci-fw" 47DEPENDS:append:k3r5 = " ti-sci-fw"
38 48
49# HSM Demo Firmware is only applicable for J721S2 & J784S4 devices
50DEPENDS:append:j721s2 = " ti-hsm-demo-fw"
51DEPENDS:append:j784s4 = " ti-hsm-demo-fw"
52
39DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f" 53DM_FIRMWARE = "ipc_echo_testb_mcu1_0_release_strip.xer5f"
54DM_FIRMWARE:am62axx = "dm_edgeai_mcu1_0_release_strip.out"
55DM_FIRMWARE:am62pxx = "${@oe.utils.conditional('DISPLAY_CLUSTER_ENABLE', '1', 'dss_display_share.wkup-r5f0_0.release.strip.out', 'ipc_echo_testb_mcu1_0_release_strip.xer5f', d)}"
40 56
41PLAT_SFX = "" 57PLAT_SFX = ""
42PLAT_SFX:j721e = "j721e" 58PLAT_SFX:j721e = "j721e"
@@ -44,15 +60,19 @@ PLAT_SFX:j7200 = "j7200"
44PLAT_SFX:j721s2 = "j721s2" 60PLAT_SFX:j721s2 = "j721s2"
45PLAT_SFX:j784s4 = "j784s4" 61PLAT_SFX:j784s4 = "j784s4"
46PLAT_SFX:j722s = "j722s" 62PLAT_SFX:j722s = "j722s"
63PLAT_SFX:j742s2 = "j742s2"
47PLAT_SFX:am65xx = "am65xx" 64PLAT_SFX:am65xx = "am65xx"
48PLAT_SFX:am64xx = "am64xx" 65PLAT_SFX:am64xx = "am64xx"
49PLAT_SFX:am62xx = "am62xx" 66PLAT_SFX:am62xx = "am62xx"
50PLAT_SFX:am62axx = "am62axx" 67PLAT_SFX:am62axx = "am62axx"
68PLAT_SFX:am62dxx = "am62axx"
69PLAT_SFX:am62lxx = "am62lxx"
51PLAT_SFX:am62pxx = "am62pxx" 70PLAT_SFX:am62pxx = "am62pxx"
52 71
72PACKAGECONFIG[ap-trusted-rom] = "BL1=${STAGING_DIR_HOST}/firmware/bl1.bin,,trusted-firmware-a"
53PACKAGECONFIG[atf] = "BL31=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a" 73PACKAGECONFIG[atf] = "BL31=${STAGING_DIR_HOST}/firmware/bl31.bin,,trusted-firmware-a"
54PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/bl32.bin,,optee-os" 74PACKAGECONFIG[optee] = "TEE=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/bl32.bin,,optee-os"
55PACKAGECONFIG[dm] = "DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE},,ti-dm-fw" 75PACKAGECONFIG[dm] = "TI_DM=${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware/ti-dm/${PLAT_SFX}/${DM_FIRMWARE},,ti-dm-fw"
56 76
57PACKAGECONFIG:append:aarch64 = " atf optee" 77PACKAGECONFIG:append:aarch64 = " atf optee"
58PACKAGECONFIG:append:j721e = " dm" 78PACKAGECONFIG:append:j721e = " dm"
@@ -60,13 +80,16 @@ PACKAGECONFIG:append:j7200 = " dm"
60PACKAGECONFIG:append:j721s2 = " dm" 80PACKAGECONFIG:append:j721s2 = " dm"
61PACKAGECONFIG:append:j784s4 = " dm" 81PACKAGECONFIG:append:j784s4 = " dm"
62PACKAGECONFIG:append:j722s = " dm" 82PACKAGECONFIG:append:j722s = " dm"
83PACKAGECONFIG:append:j742s2 = " dm"
63PACKAGECONFIG:append:am62xx = " dm" 84PACKAGECONFIG:append:am62xx = " dm"
64PACKAGECONFIG:append:am62axx = " dm" 85PACKAGECONFIG:append:am62axx = " dm"
86PACKAGECONFIG:append:am62dxx = " dm"
87PACKAGECONFIG:append:am62lxx = " ap-trusted-rom"
65PACKAGECONFIG:append:am62pxx = " dm" 88PACKAGECONFIG:append:am62pxx = " dm"
66 89
67COMPATIBLE_MACHINE = "(ti-soc)" 90COMPATIBLE_MACHINE = "(ti-soc)"
68 91
69BINMAN_INDIRS="${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware" 92BINMAN_INDIRS = "${STAGING_DIR_HOST}${nonarch_base_libdir}/firmware"
70 93
71EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS} BINMAN_INDIRS=${BINMAN_INDIRS}" 94EXTRA_OEMAKE += "${PACKAGECONFIG_CONFARGS} BINMAN_INDIRS=${BINMAN_INDIRS}"
72 95
@@ -75,8 +98,6 @@ PKG:${PN} = "u-boot"
75PKG:${PN}-dev = "u-boot-dev" 98PKG:${PN}-dev = "u-boot-dev"
76PKG:${PN}-dbg = "u-boot-dbg" 99PKG:${PN}-dbg = "u-boot-dbg"
77 100
78S = "${WORKDIR}/git"
79
80# Support for secure devices - detailed info is in doc/README.ti-secure 101# Support for secure devices - detailed info is in doc/README.ti-secure
81inherit ti-secdev 102inherit ti-secdev
82 103
@@ -86,131 +107,152 @@ SYSROOT_DIRS += "/boot"
86SPL_UART_BINARY = "u-boot-spl.bin" 107SPL_UART_BINARY = "u-boot-spl.bin"
87SPL_UART_BINARY:k3r5 = "" 108SPL_UART_BINARY:k3r5 = ""
88 109
89SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${PV}-${PR}" 110SPL_UART_IMAGE ?= "${SPL_UART_BINARY}-${MACHINE}-${UBOOT_VERSION}"
90SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}" 111SPL_UART_SYMLINK ?= "${SPL_UART_BINARY}-${MACHINE}"
91 112
92SPL_HS_MLO_BINARY = "u-boot-spl_HS_MLO" 113SPL_HS_MLO_BINARY = "u-boot-spl_HS_MLO"
93SPL_HS_MLO_IMAGE = "u-boot-spl_HS_MLO-${MACHINE}-${PV}-${PR}" 114SPL_HS_MLO_IMAGE = "u-boot-spl_HS_MLO-${MACHINE}-${UBOOT_VERSION}"
94SPL_HS_MLO_SYMLINK = "u-boot-spl_HS_MLO-${MACHINE}" 115SPL_HS_MLO_SYMLINK = "u-boot-spl_HS_MLO-${MACHINE}"
95 116
96# HS XLD 117# HS XLD
97UBOOT_HS_XLD_BINARY = "u-boot-spl_HS_X-LOADER" 118UBOOT_HS_XLD_BINARY = "u-boot-spl_HS_X-LOADER"
98UBOOT_HS_XLD_IMAGE = "u-boot-spl_HS_X-LOADER-${MACHINE}-${PV}-${PR}" 119UBOOT_HS_XLD_IMAGE = "u-boot-spl_HS_X-LOADER-${MACHINE}-${UBOOT_VERSION}"
99UBOOT_HS_XLD_SYMLINK = "u-boot-spl_HS_X-LOADER-${MACHINE}" 120UBOOT_HS_XLD_SYMLINK = "u-boot-spl_HS_X-LOADER-${MACHINE}"
100 121
101# HS MLO 122# HS MLO
102UBOOT_HS_MLO_BINARY = "u-boot_HS_MLO" 123UBOOT_HS_MLO_BINARY = "u-boot_HS_MLO"
103UBOOT_HS_MLO_IMAGE = "u-boot_HS_MLO-${MACHINE}-${PV}-${PR}" 124UBOOT_HS_MLO_IMAGE = "u-boot_HS_MLO-${MACHINE}-${UBOOT_VERSION}"
104UBOOT_HS_MLO_SYMLINK = "u-boot_HS_MLO-${MACHINE}" 125UBOOT_HS_MLO_SYMLINK = "u-boot_HS_MLO-${MACHINE}"
105 126
106# HS ISSW 127# HS ISSW
107UBOOT_HS_ISSW_BINARY = "u-boot-spl_HS_ISSW" 128UBOOT_HS_ISSW_BINARY = "u-boot-spl_HS_ISSW"
108UBOOT_HS_ISSW_IMAGE = "u-boot-spl_HS_ISSW-${MACHINE}-${PV}-${PR}" 129UBOOT_HS_ISSW_IMAGE = "u-boot-spl_HS_ISSW-${MACHINE}-${UBOOT_VERSION}"
109UBOOT_HS_ISSW_SYMLINK = "u-boot-spl_HS_ISSW-${MACHINE}" 130UBOOT_HS_ISSW_SYMLINK = "u-boot-spl_HS_ISSW-${MACHINE}"
110 131
111# HS 2ND 132# HS 2ND
112UBOOT_HS_2ND_BINARY = "u-boot-spl_HS_2ND" 133UBOOT_HS_2ND_BINARY = "u-boot-spl_HS_2ND"
113UBOOT_HS_2ND_IMAGE = "u-boot-spl_HS_2ND-${MACHINE}-${PV}-${PR}" 134UBOOT_HS_2ND_IMAGE = "u-boot-spl_HS_2ND-${MACHINE}-${UBOOT_VERSION}"
114UBOOT_HS_2ND_SYMLINK = "u-boot-spl_HS_2ND-${MACHINE}" 135UBOOT_HS_2ND_SYMLINK = "u-boot-spl_HS_2ND-${MACHINE}"
115 136
116do_compile:append:k3r5 () { 137uboot_compile:append () {
117 if [ -n "${UBOOT_CONFIG}" ]; 138 if ! [ -f ${B}/${UBOOT_BINARY} ]; then
118 then 139 ln -s spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${UBOOT_BINARY}
119 for config in ${UBOOT_MACHINE}; do 140 fi
120 i=$(expr $i + 1);
121 for type in ${UBOOT_CONFIG}; do
122 j=$(expr $j + 1);
123 if [ $j -eq $i ];
124 then
125 if ! [ -L ${B}/${config}/${UBOOT_BINARY} ] && ! [ -f ${B}/${config}/${UBOOT_BINARY} ]; then
126 ln -s ${B}/${config}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${config}/${UBOOT_BINARY}
127 fi
128 fi
129 done
130 unset j
131 done
132 unset i
133 else
134 if ! [ -f ${B}/${UBOOT_BINARY} ]; then
135 ln -s spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${UBOOT_BINARY}
136 fi
137 fi
138} 141}
139 142
140do_install:append () { 143uboot_compile_config_copy_binary:k3r5 () {
141 if [ -n "${UBOOT_CONFIG}" ] 144 config=$1
142 then 145 type=$2
143 for config in ${UBOOT_MACHINE}; do 146 binary=$3
144 i=$(expr $i + 1); 147
145 for type in ${UBOOT_CONFIG}; do 148 if ! [ -L ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ] && ! [ -f ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX} ]; then
146 j=$(expr $j + 1); 149 ln -s ${B}/${config}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${config}/${UBOOT_BINARYNAME}-${type}.${UBOOT_SUFFIX}
147 if [ $j -eq $i ] 150 fi
148 then 151
149 if [ "x${SPL_UART_BINARY}" != "x" ]; then 152 if ! [ -L ${B}/${config}/${binary} ] && ! [ -f ${B}/${config}/${binary} ]; then
150 install ${B}/${config}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}-${type} 153 ln -s ${B}/${config}/spl/u-boot-spl.${UBOOT_SUFFIX} ${B}/${config}/${binary}
151 ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY}-${type} 154 fi
152 ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY} 155}
153 fi 156
154 if [ -f ${B}/${config}/${SPL_HS_MLO_BINARY} ]; then 157uboot_install_config:append () {
155 install ${B}/${config}/${SPL_HS_MLO_BINARY} ${D}/boot/${SPL_HS_MLO_IMAGE}-${type} 158 if [ "x${SPL_UART_BINARY}" != "x" ]; then
156 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY}-${type} 159 install ${B}/${config}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}-${type}
157 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY} 160 ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY}-${type}
158 fi 161 ln -sf ${SPL_UART_IMAGE}-${type} ${D}/boot/${SPL_UART_BINARY}
159 if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then 162 fi
160 install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}-${type} 163 if [ -f ${B}/${config}/${SPL_HS_MLO_BINARY} ]; then
161 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${D}/boot/${UBOOT_HS_XLD_BINARY}-${type} 164 install ${B}/${config}/${SPL_HS_MLO_BINARY} ${D}/boot/${SPL_HS_MLO_IMAGE}-${type}
162 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${D}/boot/${UBOOT_HS_XLD_BINARY} 165 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY}-${type}
163 fi 166 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${D}/boot/${SPL_HS_MLO_BINARY}
164 if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then 167 fi
165 install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE}-${type} 168 if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then
166 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${D}/boot/${UBOOT_HS_MLO_BINARY}-${type} 169 install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}-${type}
167 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${D}/boot/${UBOOT_HS_MLO_BINARY} 170 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${D}/boot/${UBOOT_HS_XLD_BINARY}-${type}
168 fi 171 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${D}/boot/${UBOOT_HS_XLD_BINARY}
169 if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then 172 fi
170 install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${D}/boot/${UBOOT_HS_ISSW_IMAGE}-${type} 173 if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then
171 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${D}/boot/${UBOOT_HS_ISSW_BINARY}-${type} 174 install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE}-${type}
172 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${D}/boot/${UBOOT_HS_ISSW_BINARY} 175 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${D}/boot/${UBOOT_HS_MLO_BINARY}-${type}
173 fi 176 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${D}/boot/${UBOOT_HS_MLO_BINARY}
174 if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then 177 fi
175 install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${D}/boot/${UBOOT_HS_2ND_IMAGE}-${type} 178 if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then
176 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${D}/boot/${UBOOT_HS_2ND_BINARY}-${type} 179 install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${D}/boot/${UBOOT_HS_ISSW_IMAGE}-${type}
177 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${D}/boot/${UBOOT_HS_2ND_BINARY} 180 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${D}/boot/${UBOOT_HS_ISSW_BINARY}-${type}
178 fi 181 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${D}/boot/${UBOOT_HS_ISSW_BINARY}
179 fi 182 fi
180 done 183 if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then
181 unset j 184 install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${D}/boot/${UBOOT_HS_2ND_IMAGE}-${type}
182 done 185 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${D}/boot/${UBOOT_HS_2ND_BINARY}-${type}
183 unset i 186 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${D}/boot/${UBOOT_HS_2ND_BINARY}
184 else 187 fi
185 if [ "x${SPL_UART_BINARY}" != "x" ]; then 188}
186 install ${B}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE} 189
187 ln -sf ${SPL_UART_IMAGE} ${D}/boot/${SPL_UART_BINARY} 190uboot_install:append () {
188 fi 191 if [ "x${SPL_UART_BINARY}" != "x" ]; then
189 if [ -f ${B}/${SPL_HS_MLO_BINARY} ]; then 192 install ${B}/spl/${SPL_UART_BINARY} ${D}/boot/${SPL_UART_IMAGE}
190 install ${B}/${SPL_HS_MLO_BINARY} ${D}/boot/${SPL_HS_MLO_IMAGE} 193 ln -sf ${SPL_UART_IMAGE} ${D}/boot/${SPL_UART_BINARY}
191 ln -sf ${SPL_HS_MLO_IMAGE} ${D}/boot/${SPL_HS_MLO_BINARY} 194 fi
192 fi 195 if [ -f ${B}/${SPL_HS_MLO_BINARY} ]; then
193 if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then 196 install ${B}/${SPL_HS_MLO_BINARY} ${D}/boot/${SPL_HS_MLO_IMAGE}
194 install ${B}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE} 197 ln -sf ${SPL_HS_MLO_IMAGE} ${D}/boot/${SPL_HS_MLO_BINARY}
195 ln -sf ${UBOOT_HS_XLD_IMAGE} ${D}/boot/${UBOOT_HS_XLD_BINARY} 198 fi
196 fi 199 if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
197 if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then 200 install ${B}/${UBOOT_HS_XLD_BINARY} ${D}/boot/${UBOOT_HS_XLD_IMAGE}
198 install ${B}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE} 201 ln -sf ${UBOOT_HS_XLD_IMAGE} ${D}/boot/${UBOOT_HS_XLD_BINARY}
199 ln -sf ${UBOOT_HS_MLO_IMAGE} ${D}/boot/${UBOOT_HS_MLO_BINARY} 202 fi
203 if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
204 install ${B}/${UBOOT_HS_MLO_BINARY} ${D}/boot/${UBOOT_HS_MLO_IMAGE}
205 ln -sf ${UBOOT_HS_MLO_IMAGE} ${D}/boot/${UBOOT_HS_MLO_BINARY}
206 fi
207 if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then
208 install ${B}/${UBOOT_HS_ISSW_BINARY} ${D}/boot/${UBOOT_HS_ISSW_IMAGE}
209 ln -sf ${UBOOT_HS_ISSW_IMAGE} ${D}/boot/${UBOOT_HS_ISSW_BINARY}
210 fi
211 if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then
212 install ${B}/${UBOOT_HS_2ND_BINARY} ${D}/boot/${UBOOT_HS_2ND_IMAGE}
213 ln -sf ${UBOOT_HS_2ND_IMAGE} ${D}/boot/${UBOOT_HS_2ND_BINARY}
214 fi
215}
216
217do_deploy:append:k3r5 () {
218 rm -f ${DEPLOYDIR}/u-boot-initial-env*
219 rm -f ${DEPLOYDIR}/${PN}-initial-env*
220 rm -f ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}*
221 rm -f ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}*
222 rm -f ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${UBOOT_VERSION}*
223 rm -f ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${UBOOT_VERSION}*
224}
225
226uboot_deploy_config:append:k3r5 () {
227 for f in ${B}/${config}/tiboot3-*.bin; do
228 if [ -f "$f" ]; then
229 f_base=$(basename $f)
230 install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
231 ln -sf ${f_base}-${type} ${DEPLOYDIR}/${f_base}
200 fi 232 fi
201 if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then 233 done
202 install ${B}/${UBOOT_HS_ISSW_BINARY} ${D}/boot/${UBOOT_HS_ISSW_IMAGE} 234
203 ln -sf ${UBOOT_HS_ISSW_IMAGE} ${D}/boot/${UBOOT_HS_ISSW_BINARY} 235 for f in ${B}/${config}/sysfw*.itb; do
236 if [ -f "$f" ]; then
237 f_base=$(basename $f)
238 install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
239 ln -sf ${f_base}-${type} ${DEPLOYDIR}/${f_base}
204 fi 240 fi
205 if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then 241 done
206 install ${B}/${UBOOT_HS_2ND_BINARY} ${D}/boot/${UBOOT_HS_2ND_IMAGE} 242}
207 ln -sf ${UBOOT_HS_2ND_IMAGE} ${D}/boot/${UBOOT_HS_2ND_BINARY} 243
244uboot_deploy_config:append:am62lxx () {
245 for f in ${B}/${config}/tiboot3-*.bin; do
246 if [ -f "$f" ]; then
247 f_base=$(basename $f)
248 install -m 644 $f ${DEPLOYDIR}/${f_base}-${type}
249 ln -sf ${f_base}-${type} ${DEPLOYDIR}/${f_base}
208 fi 250 fi
209 fi 251 done
210} 252}
211 253
212do_deploy:append:k3r5 () { 254uboot_deploy:append:k3r5 () {
213 for f in ${B}/tiboot3-*.bin; do 255 for f in ${B}/tiboot3-*.bin; do
214 if [ -f "$f" ]; then 256 if [ -f "$f" ]; then
215 install -m 644 $f ${DEPLOYDIR}/ 257 install -m 644 $f ${DEPLOYDIR}/
216 fi 258 fi
@@ -221,122 +263,106 @@ do_deploy:append:k3r5 () {
221 install -m 644 $f ${DEPLOYDIR}/ 263 install -m 644 $f ${DEPLOYDIR}/
222 fi 264 fi
223 done 265 done
224
225 rm ${DEPLOYDIR}/u-boot-initial-env || true
226 rm ${DEPLOYDIR}/${PN}-initial-env || true
227 rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE} || true
228 rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE} || true
229 rm ${DEPLOYDIR}/u-boot-initial-env-${MACHINE}-${PV}-${PR} || true
230 rm ${DEPLOYDIR}/${PN}-initial-env-${MACHINE}-${PV}-${PR} || true
231} 266}
232 267
233do_deploy:append () { 268uboot_deploy:append:am62lxx () {
234 if [ -n "${UBOOT_CONFIG}" ] 269 for f in ${B}/tiboot3*.bin; do
235 then 270 if [ -f "$f" ]; then
236 for config in ${UBOOT_MACHINE}; do 271 install -m 644 $f ${DEPLOYDIR}/
237 i=$(expr $i + 1);
238 for type in ${UBOOT_CONFIG}; do
239 j=$(expr $j + 1);
240 if [ $j -eq $i ]
241 then
242 cd ${DEPLOYDIR}
243 if [ "x${SPL_UART_BINARY}" != "x" ]; then
244 install ${B}/${config}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type}
245 rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
246 ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}-${type}
247 ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}
248 ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type}
249 ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}
250 fi
251 if [ -f ${B}/${config}/${SPL_HS_MLO_BINARY} ]; then
252 install ${B}/${config}/${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_IMAGE}-${type}
253 rm -f ${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_SYMLINK}
254 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK}-${type}
255 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK}
256 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY}-${type}
257 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY}
258 fi
259 if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then
260 install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type}
261 rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
262 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type}
263 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}
264 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}-${type}
265 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}
266 fi
267 if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then
268 install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type}
269 rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
270 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type}
271 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}
272 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}-${type}
273 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}
274 fi
275 if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then
276 install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type}
277 rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
278 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type}
279 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}
280 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}-${type}
281 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}
282 fi
283 if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then
284 install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type}
285 rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
286 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type}
287 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}
288 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_BINARY}-${type}
289 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_BINARY}
290 fi
291 fi
292 done
293 unset j
294 done
295 unset i
296 else
297 cd ${DEPLOYDIR}
298 if [ "x${SPL_UART_BINARY}" != "x" ]; then
299 install ${B}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}
300 rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
301 ln -sf ${SPL_UART_IMAGE} ${SPL_UART_BINARY}
302 ln -sf ${SPL_UART_IMAGE} ${SPL_UART_SYMLINK}
303 fi
304 if [ -f ${B}/${SPL_HS_MLO_BINARY} ]; then
305 install ${B}/${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_IMAGE}
306 rm -f ${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_SYMLINK}
307 ln -sf ${SPL_HS_MLO_IMAGE} ${SPL_HS_MLO_SYMLINK}
308 ln -sf ${SPL_HS_MLO_IMAGE} ${SPL_HS_MLO_BINARY}
309 fi
310 if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
311 install ${B}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}
312 rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
313 ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK}
314 ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY}
315 fi
316 if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
317 install ${B}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}
318 rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
319 ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK}
320 ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY}
321 fi
322 if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then
323 install ${B}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}
324 rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
325 ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_SYMLINK}
326 ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_BINARY}
327 fi
328 if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then
329 install ${B}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}
330 rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
331 ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_SYMLINK}
332 ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY}
333 fi 272 fi
334 fi 273 done
335} 274}
336 275
337do_install:append:am62xx() { 276uboot_deploy_config:append () {
338 install -d ${D}/boot 277 cd ${DEPLOYDIR}
339 install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${D}/boot 278 if [ "x${SPL_UART_BINARY}" != "x" ]; then
279 install ${B}/${config}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}-${type}
280 rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
281 ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}-${type}
282 ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_BINARY}
283 ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}-${type}
284 ln -sf ${SPL_UART_IMAGE}-${type} ${SPL_UART_SYMLINK}
285 fi
286 if [ -f ${B}/${config}/${SPL_HS_MLO_BINARY} ]; then
287 install ${B}/${config}/${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_IMAGE}-${type}
288 rm -f ${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_SYMLINK}
289 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK}-${type}
290 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_SYMLINK}
291 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY}-${type}
292 ln -sf ${SPL_HS_MLO_IMAGE}-${type} ${SPL_HS_MLO_BINARY}
293 fi
294 if [ -f ${B}/${config}/${UBOOT_HS_XLD_BINARY} ]; then
295 install ${B}/${config}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}-${type}
296 rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
297 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}-${type}
298 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_SYMLINK}
299 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}-${type}
300 ln -sf ${UBOOT_HS_XLD_IMAGE}-${type} ${UBOOT_HS_XLD_BINARY}
301 fi
302 if [ -f ${B}/${config}/${UBOOT_HS_MLO_BINARY} ]; then
303 install ${B}/${config}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}-${type}
304 rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
305 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}-${type}
306 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_SYMLINK}
307 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}-${type}
308 ln -sf ${UBOOT_HS_MLO_IMAGE}-${type} ${UBOOT_HS_MLO_BINARY}
309 fi
310 if [ -f ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ]; then
311 install ${B}/${config}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}-${type}
312 rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
313 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}-${type}
314 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_SYMLINK}
315 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}-${type}
316 ln -sf ${UBOOT_HS_ISSW_IMAGE}-${type} ${UBOOT_HS_ISSW_BINARY}
317 fi
318 if [ -f ${B}/${config}/${UBOOT_HS_2ND_BINARY} ]; then
319 install ${B}/${config}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}-${type}
320 rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
321 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}-${type}
322 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_SYMLINK}
323 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_BINARY}-${type}
324 ln -sf ${UBOOT_HS_2ND_IMAGE}-${type} ${UBOOT_HS_2ND_BINARY}
325 fi
326}
327
328uboot_deploy:append () {
329 cd ${DEPLOYDIR}
330 if [ "x${SPL_UART_BINARY}" != "x" ]; then
331 install ${B}/spl/${SPL_UART_BINARY} ${SPL_UART_IMAGE}
332 rm -f ${SPL_UART_BINARY} ${SPL_UART_SYMLINK}
333 ln -sf ${SPL_UART_IMAGE} ${SPL_UART_BINARY}
334 ln -sf ${SPL_UART_IMAGE} ${SPL_UART_SYMLINK}
335 fi
336 if [ -f ${B}/${SPL_HS_MLO_BINARY} ]; then
337 install ${B}/${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_IMAGE}
338 rm -f ${SPL_HS_MLO_BINARY} ${SPL_HS_MLO_SYMLINK}
339 ln -sf ${SPL_HS_MLO_IMAGE} ${SPL_HS_MLO_SYMLINK}
340 ln -sf ${SPL_HS_MLO_IMAGE} ${SPL_HS_MLO_BINARY}
341 fi
342 if [ -f ${B}/${UBOOT_HS_XLD_BINARY} ]; then
343 install ${B}/${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_IMAGE}
344 rm -f ${UBOOT_HS_XLD_BINARY} ${UBOOT_HS_XLD_SYMLINK}
345 ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_SYMLINK}
346 ln -sf ${UBOOT_HS_XLD_IMAGE} ${UBOOT_HS_XLD_BINARY}
347 fi
348 if [ -f ${B}/${UBOOT_HS_MLO_BINARY} ]; then
349 install ${B}/${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_IMAGE}
350 rm -f ${UBOOT_HS_MLO_BINARY} ${UBOOT_HS_MLO_SYMLINK}
351 ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_SYMLINK}
352 ln -sf ${UBOOT_HS_MLO_IMAGE} ${UBOOT_HS_MLO_BINARY}
353 fi
354 if [ -f ${B}/${UBOOT_HS_ISSW_BINARY} ]; then
355 install ${B}/${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_IMAGE}
356 rm -f ${UBOOT_HS_ISSW_BINARY} ${UBOOT_HS_ISSW_SYMLINK}
357 ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_SYMLINK}
358 ln -sf ${UBOOT_HS_ISSW_IMAGE} ${UBOOT_HS_ISSW_BINARY}
359 fi
360 if [ -f ${B}/${UBOOT_HS_2ND_BINARY} ]; then
361 install ${B}/${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_IMAGE}
362 rm -f ${UBOOT_HS_2ND_BINARY} ${UBOOT_HS_2ND_SYMLINK}
363 ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_SYMLINK}
364 ln -sf ${UBOOT_HS_2ND_IMAGE} ${UBOOT_HS_2ND_BINARY}
365 fi
340} 366}
341 367
342do_deploy:append:am62xx() { 368do_deploy:append:am62xx() {
@@ -344,14 +370,21 @@ do_deploy:append:am62xx() {
344 install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR} 370 install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR}
345} 371}
346 372
347do_install:append:am62pxx() {
348 install -d ${D}/boot
349 install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${D}/boot
350}
351
352do_deploy:append:am62pxx() { 373do_deploy:append:am62pxx() {
353 install -d ${DEPLOYDIR} 374 install -d ${DEPLOYDIR}
354 install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR} 375 install -m 0644 ${S}/tools/logos/ti_logo_414x97_32bpp.bmp.gz ${DEPLOYDIR}
355} 376}
356 377
378do_install:append:ti-falcon() {
379 install -m 0644 ${B}/tispl_falcon.bin ${D}/boot
380}
381
382FALCON_PKG = ""
383FALCON_PKG:ti-falcon = "${PN}-falcon "
384
385PACKAGES:prepend:am62xx-evm = "${FALCON_PKG} "
386PACKAGES:prepend:am62axx-evm = "${FALCON_PKG} "
387PACKAGES:prepend:am62pxx-evm = "${FALCON_PKG} "
388PACKAGES:prepend:am62xx-lp-evm = "${FALCON_PKG} "
389
357TOOLCHAIN = "gcc" 390TOOLCHAIN = "gcc"
diff --git a/meta-ti-bsp/recipes-bsp/u-boot/u-boot/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch b/meta-ti-bsp/recipes-bsp/u-boot/u-boot/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
new file mode 100644
index 00000000..b6b90fcc
--- /dev/null
+++ b/meta-ti-bsp/recipes-bsp/u-boot/u-boot/0001-scripts-dtc-pylibfdt-libfdt.i_shipped-Use-SWIG_Appen.patch
@@ -0,0 +1,59 @@
1From e093607e9a08e9c29b7bbaa6aeb137036db798a6 Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Wed, 30 Oct 2024 05:46:00 +0100
4Subject: [PATCH] scripts/dtc/pylibfdt/libfdt.i_shipped: Use SWIG_AppendOutput
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Swig has changed language specific AppendOutput functions. The helper
10macro SWIG_AppendOutput remains unchanged. Use that instead
11of SWIG_Python_AppendOutput, which would require an extra parameter
12since swig 4.3.0.
13
14/home/flk/poky/build-test/tmp/work/qemux86_64-poky-linux/u-boot/2024.10/git/arch/x86/cpu/u-boot-64.lds
15| scripts/dtc/pylibfdt/libfdt_wrap.c: In function ‘_wrap_fdt_next_node’:
16| scripts/dtc/pylibfdt/libfdt_wrap.c:5581:17: error: too few arguments to function ‘SWIG_Python_AppendOutput’
17| 5581 | resultobj = SWIG_Python_AppendOutput(resultobj, val);
18| | ^~~~~~~~~~~~~~~~~~~~~~~~
19
20Upstream-Status: Backport [https://github.com/u-boot/u-boot/commit/a63456b9191fae2fe49f4b121e025792022e3950]
21
22Signed-off-by: Markus Volk <f_l_k@t-online.de>
23---
24 scripts/dtc/pylibfdt/libfdt.i_shipped | 6 +++---
25 1 file changed, 3 insertions(+), 3 deletions(-)
26
27diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped
28index 56cc5d48f4..e4659489a9 100644
29--- a/scripts/dtc/pylibfdt/libfdt.i_shipped
30+++ b/scripts/dtc/pylibfdt/libfdt.i_shipped
31@@ -1037,7 +1037,7 @@ typedef uint32_t fdt32_t;
32 fdt_string(fdt1, fdt32_to_cpu($1->nameoff)));
33 buff = PyByteArray_FromStringAndSize(
34 (const char *)($1 + 1), fdt32_to_cpu($1->len));
35- resultobj = SWIG_Python_AppendOutput(resultobj, buff);
36+ resultobj = SWIG_AppendOutput(resultobj, buff);
37 }
38 }
39
40@@ -1076,7 +1076,7 @@ typedef uint32_t fdt32_t;
41
42 %typemap(argout) int *depth {
43 PyObject *val = Py_BuildValue("i", *arg$argnum);
44- resultobj = SWIG_Python_AppendOutput(resultobj, val);
45+ resultobj = SWIG_AppendOutput(resultobj, val);
46 }
47
48 %apply int *depth { int *depth };
49@@ -1092,7 +1092,7 @@ typedef uint32_t fdt32_t;
50 if (PyTuple_GET_SIZE(resultobj) == 0)
51 resultobj = val;
52 else
53- resultobj = SWIG_Python_AppendOutput(resultobj, val);
54+ resultobj = SWIG_AppendOutput(resultobj, val);
55 }
56 }
57
58--
592.47.0
diff --git a/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb b/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb
index 4ec09a70..ba320f5f 100644
--- a/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb
+++ b/meta-ti-bsp/recipes-bsp/vis-fw/vis_01.50.07.15.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Radio Application Firmware" 1SUMMARY = "Radio Application Firmware"
2LICENSE = "TI-TSPA" 2LICENSE = "TI-TSPA"
3LIC_FILES_CHKSUM = "file://${S}/J6_VIS_DEMO_LINUX_BINARY_01.50.07.15-Manifest.html;md5=a59aa54b9470f555cf086b91dca0afa3" 3LIC_FILES_CHKSUM = "file://${S}/J6_VIS_DEMO_LINUX_BINARY_01.50.07.15-Manifest.html;md5=a59aa54b9470f555cf086b91dca0afa3"
4 4
@@ -11,7 +11,7 @@ SRC_URI = "http://downloads.ti.com/dsps/dsps_public_sw/glsdk/vis/01_50_07_15/exp
11SRC_URI[md5sum] = "fe8b00e398fb3b7ada0c15b601867acb" 11SRC_URI[md5sum] = "fe8b00e398fb3b7ada0c15b601867acb"
12SRC_URI[sha256sum] = "6e2aa47ae892910616ebdc96646af778af9a59ca0657716ab4fa4b24a9afae69" 12SRC_URI[sha256sum] = "6e2aa47ae892910616ebdc96646af778af9a59ca0657716ab4fa4b24a9afae69"
13 13
14S = "${WORKDIR}" 14S = "${UNPACKDIR}"
15 15
16DSPAPP = "dra7-dsp1-fw-radio.xe66" 16DSPAPP = "dra7-dsp1-fw-radio.xe66"
17GPPAPP = "RadioApp" 17GPPAPP = "RadioApp"
diff --git a/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb b/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb
index 8af49577..f147b234 100644
--- a/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb
+++ b/meta-ti-bsp/recipes-bsp/vpdma-fw/vpdma-fw_03-2012.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "VPDMA firmware for Video Input Port and Video Processing Engine" 1SUMMARY = "VPDMA firmware for Video Input Port and Video Processing Engine"
2 2
3LICENSE = "TI-TSPA" 3LICENSE = "TI-TSPA"
4LIC_FILES_CHKSUM = "file://COPYING;md5=fd463c9500441ed91d07a0331baa635c" 4LIC_FILES_CHKSUM = "file://COPYING;md5=fd463c9500441ed91d07a0331baa635c"
@@ -9,7 +9,6 @@ SRC_URI = "http://downloads.ti.com/dsps/dsps_public_sw/glsdk/vpdma-fw/03-2012/ex
9SRC_URI[dra7xx-evm.md5sum] = "80176df1350c21d9efa90171789c546e" 9SRC_URI[dra7xx-evm.md5sum] = "80176df1350c21d9efa90171789c546e"
10SRC_URI[dra7xx-evm.sha256sum] = "a0b254ffd0c7f481cb3989e632088f5e4a233c73a1c676faa3061721ea60dc90" 10SRC_URI[dra7xx-evm.sha256sum] = "a0b254ffd0c7f481cb3989e632088f5e4a233c73a1c676faa3061721ea60dc90"
11 11
12S = "${WORKDIR}/vpdma-fw-${PV}"
13TARGET = "vpdma-1b8.bin" 12TARGET = "vpdma-1b8.bin"
14 13
15do_install() { 14do_install() {
diff --git a/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb b/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb
index 7f4e8b77..d48adea5 100644
--- a/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb
+++ b/meta-ti-bsp/recipes-bsp/vpe-tests/vpe-tests_git.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "VPE test program" 1SUMMARY = "VPE test program"
2 2
3LICENSE = "BSD-3-Clause" 3LICENSE = "BSD-3-Clause"
4LIC_FILES_CHKSUM = "file://COPYING;md5=74d2f71d8898c54e3d1c9d0058c484aa" 4LIC_FILES_CHKSUM = "file://COPYING;md5=74d2f71d8898c54e3d1c9d0058c484aa"
@@ -16,8 +16,6 @@ BRANCH ?= "master"
16 16
17SRC_URI = "git://git.ti.com/git/vpe_tests/vpe_tests.git;protocol=https;branch=${BRANCH}" 17SRC_URI = "git://git.ti.com/git/vpe_tests/vpe_tests.git;protocol=https;branch=${BRANCH}"
18 18
19S = "${WORKDIR}/git"
20
21FLOATABI = "${@bb.utils.contains("TUNE_FEATURES", "vfp", bb.utils.contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}" 19FLOATABI = "${@bb.utils.contains("TUNE_FEATURES", "vfp", bb.utils.contains("TUNE_FEATURES", "callconvention-hard", " -mfloat-abi=hard", " -mfloat-abi=softfp", d), "" ,d)}"
22 20
23# The test application needs additional include headers from the kernel 21# The test application needs additional include headers from the kernel
diff --git a/meta-ti-bsp/recipes-bsp/zephyr-fw/zephyr-openamp-rsc-table-fw.bb b/meta-ti-bsp/recipes-bsp/zephyr-fw/zephyr-openamp-rsc-table-fw.bb
index 4efc99ac..c7287e1f 100644
--- a/meta-ti-bsp/recipes-bsp/zephyr-fw/zephyr-openamp-rsc-table-fw.bb
+++ b/meta-ti-bsp/recipes-bsp/zephyr-fw/zephyr-openamp-rsc-table-fw.bb
@@ -6,6 +6,7 @@ FW_NAME = "zephyr_openamp_rsc_table.elf"
6# List of cores for which this demo has a build 6# List of cores for which this demo has a build
7FW_CORES = "" 7FW_CORES = ""
8FW_CORES:am62xx = "mcu-m4f0_0" 8FW_CORES:am62xx = "mcu-m4f0_0"
9FW_CORES:am64xx = "mcu-m4f0_0"
9 10
10# Note: Everything below is common to all our Zephyr firmwares and can be 11# Note: Everything below is common to all our Zephyr firmwares and can be
11# factored out to a common include file once we have more than one demo 12# factored out to a common include file once we have more than one demo
@@ -18,14 +19,13 @@ COMPATIBLE_MACHINE = "k3"
18PACKAGE_ARCH = "${MACHINE_ARCH}" 19PACKAGE_ARCH = "${MACHINE_ARCH}"
19 20
20SRC_URI = "git://github.com/glneo/zephyr-firmware.git;protocol=https;branch=main" 21SRC_URI = "git://github.com/glneo/zephyr-firmware.git;protocol=https;branch=main"
21SRCREV = "146d4f9b3930722d73685d600958f0b10ea97de2" 22SRCREV = "ef5aec48e589902839ebae7ad753c68cf498c15f"
22PV = "3.6.0" 23PV = "3.6.0"
23#PR = "r1" 24#PR = "r1"
24 25
25S = "${WORKDIR}/git"
26
27FW_PLAT = "" 26FW_PLAT = ""
28FW_PLAT:am62xx = "am62" 27FW_PLAT:am62xx = "am62"
28FW_PLAT:am64xx = "am64"
29 29
30FW_INSTALL_DIR = "${nonarch_base_libdir}/firmware/zephyr/${FW_PLAT}" 30FW_INSTALL_DIR = "${nonarch_base_libdir}/firmware/zephyr/${FW_PLAT}"
31 31
diff --git a/meta-ti-bsp/recipes-core/udev/eudev_%.bbappend b/meta-ti-bsp/recipes-core/udev/eudev_%.bbappend
index ddb1e75d..dee46cda 100644
--- a/meta-ti-bsp/recipes-core/udev/eudev_%.bbappend
+++ b/meta-ti-bsp/recipes-core/udev/eudev_%.bbappend
@@ -8,6 +8,6 @@ SRC_URI:append:ti-soc = " \
8PR:append:ti-soc = ".3" 8PR:append:ti-soc = ".3"
9 9
10do_install:append:ti-soc() { 10do_install:append:ti-soc() {
11 install -m 0644 ${WORKDIR}/omap-tty.rules ${D}${sysconfdir}/udev/rules.d/ 11 install -m 0644 ${UNPACKDIR}/omap-tty.rules ${D}${sysconfdir}/udev/rules.d/
12 install -m 0644 ${WORKDIR}/firmware.rules ${D}${sysconfdir}/udev/rules.d/ 12 install -m 0644 ${UNPACKDIR}/firmware.rules ${D}${sysconfdir}/udev/rules.d/
13} 13}
diff --git a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
index c8da6674..ffc48d84 100644
--- a/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
+++ b/meta-ti-bsp/recipes-devtools/k3conf/k3conf_git.bb
@@ -10,8 +10,6 @@ PV = "0.3+git"
10COMPATIBLE_MACHINE = "k3" 10COMPATIBLE_MACHINE = "k3"
11 11
12BRANCH ?= "master" 12BRANCH ?= "master"
13SRCREV = "85a7433202aafafbccea8a7b2491f4df8b1ecd80" 13SRCREV = "ea9938bf9cafd9c0cb05ef060a713ab4ac72270f"
14 14
15SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}" 15SRC_URI = "git://git.ti.com/git/k3conf/k3conf.git;protocol=https;branch=${BRANCH}"
16
17S = "${WORKDIR}/git"
diff --git a/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb b/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
index 807f421c..bd7cf015 100644
--- a/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
+++ b/meta-ti-bsp/recipes-graphics/libgal/ti-gc320-libs_5.0.11.p7.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Userspace libraries for GC320 chipset on TI SoCs" 1SUMMARY = "Userspace libraries for GC320 chipset on TI SoCs"
2HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-libs" 2HOMEPAGE = "https://git.ti.com/graphics/ti-gc320-libs"
3LICENSE = "TI-TSPA" 3LICENSE = "TI-TSPA"
4LIC_FILES_CHKSUM = "file://Manifest.html;md5=a9121e8936ace09820d23f7626daaca5" 4LIC_FILES_CHKSUM = "file://Manifest.html;md5=a9121e8936ace09820d23f7626daaca5"
@@ -14,7 +14,7 @@ CLEANBROKEN = "1"
14BRANCH = "ti-${PV}" 14BRANCH = "ti-${PV}"
15 15
16SRC_URI = "git://git.ti.com/git/graphics/ti-gc320-libs.git;protocol=https;branch=${BRANCH}" 16SRC_URI = "git://git.ti.com/git/graphics/ti-gc320-libs.git;protocol=https;branch=${BRANCH}"
17SRCREV = "c0afab259de59909cfe74c01f3f7fbaa147f94b5" 17SRCREV = "85c175e8425c33dda6e272aeb45afe0f69a79096"
18 18
19RRECOMMENDS:${PN} = "ti-gc320-driver" 19RRECOMMENDS:${PN} = "ti-gc320-driver"
20 20
@@ -34,8 +34,6 @@ TARGET_PRODUCT = "jacinto6evm"
34 34
35PR = "r3" 35PR = "r3"
36 36
37S = "${WORKDIR}/git"
38
39EXTRA_OEMAKE += "DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} LIBDIR=${libdir}" 37EXTRA_OEMAKE += "DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} LIBDIR=${libdir}"
40 38
41do_install() { 39do_install() {
@@ -43,4 +41,8 @@ do_install() {
43 chown -R root:root ${D} 41 chown -R root:root ${D}
44} 42}
45 43
46INSANE_SKIP:${PN} += "ldflags" 44PACKAGES = "${PN} ${PN}-dev"
45FILES:${PN} += "${libdir}/libGAL.so"
46FILES:${PN}-dev = "/usr/include"
47
48INSANE_SKIP:${PN} += "ldflags already-stripped dev-so"
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch
new file mode 100644
index 00000000..7d4fe078
--- /dev/null
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch
@@ -0,0 +1,65 @@
1From bb2db56ffec6e527d88751f75117ae690227cd6c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Kai=20Wasserb=C3=A4ch?= <kai@dev.carbon-project.org>
3Date: Sat, 11 Feb 2023 18:38:01 +0100
4Subject: [PATCH] fix: gallivm: fix LLVM #include of Host.h, moved to
5 TargetParser
6
7Upstream moved Host.h from Support to TargetParser in LLVM 17.
8
9This shouldn't lead to a FTBFS, since there is a forwarding include left
10behind. Sadly the added deprecation warning #pragma is invalid and thus
11causes a build failure right away. But since we would have to follow the
12move anyway in the future, just do it right away.
13
14Reference: https://github.com/llvm/llvm-project/commit/d768bf994f508d7eaf9541a568be3d71096febf5
15Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
16Closes: #8275
17Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21263>
18
19Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/bb2db56ffec6e527d88751f75117ae690227cd6c]
20
21---
22 src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 7 ++++++-
23 src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 4 +++-
24 2 files changed, 9 insertions(+), 2 deletions(-)
25
26diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
27index 54bc5d5ada36c..f78f04f042be8 100644
28--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
29+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
30@@ -35,9 +35,14 @@
31 #include <llvm-c/Disassembler.h>
32 #include <llvm/Support/raw_ostream.h>
33 #include <llvm/Support/Format.h>
34-#include <llvm/Support/Host.h>
35 #include <llvm/IR/Module.h>
36
37+#if LLVM_VERSION_MAJOR >= 17
38+#include <llvm/TargetParser/Host.h>
39+#else
40+#include <llvm/Support/Host.h>
41+#endif
42+
43 #include "util/u_math.h"
44 #include "util/u_debug.h"
45
46diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
47index 334c13530394b..5e7a30a6cc2e3 100644
48--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
49+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
50@@ -60,7 +60,11 @@
51 #include <llvm/Analysis/TargetLibraryInfo.h>
52 #include <llvm/ExecutionEngine/SectionMemoryManager.h>
53 #include <llvm/Support/CommandLine.h>
54+#if LLVM_VERSION_MAJOR >= 17
55+#include <llvm/TargetParser/Host.h>
56+#else
57 #include <llvm/Support/Host.h>
58+#endif
59 #include <llvm/Support/PrettyStackTrace.h>
60 #include <llvm/ExecutionEngine/ObjectCache.h>
61 #include <llvm/Support/TargetSelect.h>
62
63--
64GitLab
65
diff --git a/meta-ti-bsp/recipes-graphics/mesa/files/0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch
index 905fad04..905fad04 100644
--- a/meta-ti-bsp/recipes-graphics/mesa/files/0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch
diff --git a/meta-ti-bsp/recipes-graphics/mesa/files/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch
index f0775176..f0775176 100644
--- a/meta-ti-bsp/recipes-graphics/mesa/files/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch
diff --git a/meta-ti-bsp/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-17.patch
index bdfe7bb8..bdfe7bb8 100644
--- a/meta-ti-bsp/recipes-graphics/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-17.patch
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-18-and-19.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-18-and-19.patch
new file mode 100644
index 00000000..37888c34
--- /dev/null
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gallium-Fix-build-with-llvm-18-and-19.patch
@@ -0,0 +1,53 @@
1From 6c5033bb01a3a1341d4db5007586a5f2e2727b0a Mon Sep 17 00:00:00 2001
2From: Ryan Eatmon <reatmon@ti.com>
3Date: Mon, 4 Nov 2024 13:37:29 -0600
4Subject: [PATCH] gallium: Fix build with llvm 18 and 19
5
6- CodeGenOpt::Level changed to CodeGenOoptLevel. [1]
7- llvm::sys::getHostCPUFeatures() now returns the features instead of
8modifying the passed in argument. [2]
9
10Upstream-Status: Backport [1][https://gitlab.freedesktop.org/mesa/mesa/-/commit/f79617fe804ea6524651ff1bc3a91098d3199179]
11Upstream-Status: Backport [2][https://gitlab.freedesktop.org/mesa/mesa/-/commit/fa9cd89a85b904615ebc11da609445b5b751e68d]
12
13Signed-off-by: Ryan Eatmon <reatmon@ti.com>
14---
15 src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 14 ++++++++++++--
16 1 file changed, 12 insertions(+), 2 deletions(-)
17
18diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
19index 5e7a30a6cc2..dbc777e3096 100644
20--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
21+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
22@@ -368,7 +368,11 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
23 builder.setEngineKind(EngineKind::JIT)
24 .setErrorStr(&Error)
25 .setTargetOptions(options)
26+#if LLVM_VERSION_MAJOR >= 18
27+ .setOptLevel((CodeGenOptLevel)OptLevel);
28+#else
29 .setOptLevel((CodeGenOpt::Level)OptLevel);
30+#endif
31
32 #ifdef _WIN32
33 /*
34@@ -392,8 +396,14 @@ lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
35 * which allows us to enable/disable code generation based
36 * on the results of cpuid on these architectures.
37 */
38- llvm::StringMap<bool> features;
39- llvm::sys::getHostCPUFeatures(features);
40+ #if LLVM_VERSION_MAJOR >= 19
41+ /* llvm-19+ returns StringMap from getHostCPUFeatures.
42+ */
43+ auto features = llvm::sys::getHostCPUFeatures();
44+ #else
45+ llvm::StringMap<bool> features;
46+ llvm::sys::getHostCPUFeatures(features);
47+ #endif
48
49 for (StringMapIterator<bool> f = features.begin();
50 f != features.end();
51--
522.17.1
53
diff --git a/meta-ti-bsp/recipes-graphics/mesa/files/0001-gbm-backend-fix-gbm-compile-without-dri.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gbm-backend-fix-gbm-compile-without-dri.patch
index 289ff032..289ff032 100644
--- a/meta-ti-bsp/recipes-graphics/mesa/files/0001-gbm-backend-fix-gbm-compile-without-dri.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-gbm-backend-fix-gbm-compile-without-dri.patch
diff --git a/meta-ti-bsp/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
index 35bd0ea1..35bd0ea1 100644
--- a/meta-ti-bsp/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
diff --git a/meta-ti-bsp/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-meson.build-check-for-all-linux-host_os-combinations.patch
index f0c1de46..f0c1de46 100644
--- a/meta-ti-bsp/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-meson.build-check-for-all-linux-host_os-combinations.patch
diff --git a/meta-ti-bsp/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-util-format-Check-for-NEON-before-using-it.patch
index 6eea5ed8..6eea5ed8 100644
--- a/meta-ti-bsp/recipes-graphics/mesa/files/0001-util-format-Check-for-NEON-before-using-it.patch
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-22.3.5/0001-util-format-Check-for-NEON-before-using-it.patch
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-Update-lp_bld_misc.cpp-to-support-llvm-19.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-Update-lp_bld_misc.cpp-to-support-llvm-19.patch
new file mode 100644
index 00000000..9e5bb342
--- /dev/null
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-Update-lp_bld_misc.cpp-to-support-llvm-19.patch
@@ -0,0 +1,38 @@
1From fa9cd89a85b904615ebc11da609445b5b751e68d Mon Sep 17 00:00:00 2001
2From: Satadru Pramanik <satadru@umich.edu>
3Date: Sat, 5 Oct 2024 13:35:52 +0000
4Subject: [PATCH] Update lp_bld_misc.cpp to support llvm-19+.
5
6Fixes #11896.
7cc: mesa-stable
8
9Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31533>
10Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/fa9cd89a85b904615ebc11da609445b5b751e68d]
11Signed-off-by: Randolph Sapp <rs@ti.com>
12---
13 src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 10 ++++++++--
14 1 file changed, 8 insertions(+), 2 deletions(-)
15
16diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
17index 7975fcf1ac9..5b615d627ff 100644
18--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
19+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
20@@ -329,8 +329,14 @@ lp_build_fill_mattrs(std::vector<std::string> &MAttrs)
21 * which allows us to enable/disable code generation based
22 * on the results of cpuid on these architectures.
23 */
24- llvm::StringMap<bool> features;
25- llvm::sys::getHostCPUFeatures(features);
26+ #if LLVM_VERSION_MAJOR >= 19
27+ /* llvm-19+ returns StringMap from getHostCPUFeatures.
28+ */
29+ auto features = llvm::sys::getHostCPUFeatures();
30+ #else
31+ llvm::StringMap<bool> features;
32+ llvm::sys::getHostCPUFeatures(features);
33+ #endif
34
35 for (llvm::StringMapIterator<bool> f = features.begin();
36 f != features.end();
37--
382.47.1
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-drisw-fix-build-without-dri3.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-drisw-fix-build-without-dri3.patch
new file mode 100644
index 00000000..9d662b34
--- /dev/null
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-drisw-fix-build-without-dri3.patch
@@ -0,0 +1,57 @@
1From 4bd15a419e892da843489c374c58c5b29c40b5d6 Mon Sep 17 00:00:00 2001
2From: Romain Naour <romain.naour@smile.fr>
3Date: Tue, 6 Feb 2024 09:47:09 +0100
4Subject: [PATCH 1/2] drisw: fix build without dri3
5
6commit 1887368df41 ("glx/sw: check for modifier support in the kopper path")
7added dri3_priv.h header and dri3_check_multibuffer() function in drisw that
8can be build without dri3.
9
10 i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver':
11 drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer'
12 collect2: error: ld returned 1 exit status
13
14Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using
15dri3_check_multibuffer().
16
17Fixes: 1887368df41 ("glx/sw: check for modifier support in the kopper path")
18
19Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478]
20Signed-off-by: Romain Naour <romain.naour@smile.fr>
21Signed-off-by: Khem Raj <raj.khem@gmail.com>
22---
23 src/glx/drisw_glx.c | 4 ++++
24 1 file changed, 4 insertions(+)
25
26diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
27index 3d3f752..4b19e2d 100644
28--- a/src/glx/drisw_glx.c
29+++ b/src/glx/drisw_glx.c
30@@ -32,7 +32,9 @@
31 #include <dlfcn.h>
32 #include "dri_common.h"
33 #include "drisw_priv.h"
34+#ifdef HAVE_DRI3
35 #include "dri3_priv.h"
36+#endif
37 #include <X11/extensions/shmproto.h>
38 #include <assert.h>
39 #include <vulkan/vulkan_core.h>
40@@ -995,6 +997,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv,
41 goto handle_error;
42 }
43
44+#ifdef HAVE_DRI3
45 if (pdpyp->zink) {
46 bool err;
47 psc->has_multibuffer = dri3_check_multibuffer(priv->dpy, &err);
48@@ -1005,6 +1008,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv,
49 goto handle_error;
50 }
51 }
52+#endif
53
54 glx_config_destroy_list(psc->base.configs);
55 psc->base.configs = configs;
56--
572.44.0
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallium-Fix-build-with-llvm-17.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallium-Fix-build-with-llvm-17.patch
new file mode 100644
index 00000000..738ff267
--- /dev/null
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallium-Fix-build-with-llvm-17.patch
@@ -0,0 +1,40 @@
1From 6d07f6aa7f92f40d78a2db645f16f0f3e7d3c2e8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 23 Jun 2023 01:20:38 -0700
4Subject: [PATCH] gallium: Fix build with llvm 17
5
6These headers are not available for C files in llvm 17+
7and they seem to be not needed to compile after all with llvm 17
8so add conditions to exclude them for llvm >= 17
9
10Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
13---
14 src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 +++++-
15 1 file changed, 5 insertions(+), 1 deletion(-)
16
17diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
18index cd2108f..b1a4d03 100644
19--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
20+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
21@@ -46,15 +46,19 @@
22 #if GALLIVM_USE_NEW_PASS == 1
23 #include <llvm-c/Transforms/PassBuilder.h>
24 #elif GALLIVM_HAVE_CORO == 1
25+#if LLVM_VERSION_MAJOR < 17
26 #include <llvm-c/Transforms/Scalar.h>
27-#if LLVM_VERSION_MAJOR >= 7
28+#endif
29+#if LLVM_VERSION_MAJOR >= 7 && LLVM_VERSION_MAJOR < 17
30 #include <llvm-c/Transforms/Utils.h>
31 #endif
32 #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64)
33 #include <llvm-c/Transforms/IPO.h>
34 #endif
35+#if LLVM_VERSION_MAJOR < 17
36 #include <llvm-c/Transforms/Coroutines.h>
37 #endif
38+#endif
39
40 unsigned gallivm_perf = 0;
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallivm-Call-StringMapIterator-from-llvm-scope.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallivm-Call-StringMapIterator-from-llvm-scope.patch
new file mode 100644
index 00000000..1751df6f
--- /dev/null
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-gallivm-Call-StringMapIterator-from-llvm-scope.patch
@@ -0,0 +1,31 @@
1From d17338d403980e1932a42f5d11c2a1fb7b25127b Mon Sep 17 00:00:00 2001
2From: MastaG <mastag@gmail.com>
3Date: Wed, 3 Jul 2024 21:00:42 +0200
4Subject: [PATCH] gallivm: Call StringMapIterator from llvm:: scope
5
6Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11392
7Fixes: b035d9cab5a4 ("gallivm: use getHostCPUFeatures on x86/llvm-4.0+.")
8Reviewed-by: David Heidelberg <david@ixit.cz>
9Signed-off-by: David Heidelberg <david@ixit.cz>
10Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30009>
11Upstream-Status: Backport [https://gitlab.freedesktop.org/mesa/mesa/-/commit/d17338d403980e1932a42f5d11c2a1fb7b25127b]
12Signed-off-by: Randolph Sapp <rs@ti.com>
13---
14 src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
18index 95a8a6c6a08..f3c10652ed6 100644
19--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
20+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
21@@ -332,7 +332,7 @@ lp_build_fill_mattrs(std::vector<std::string> &MAttrs)
22 llvm::StringMap<bool> features;
23 llvm::sys::getHostCPUFeatures(features);
24
25- for (StringMapIterator<bool> f = features.begin();
26+ for (llvm::StringMapIterator<bool> f = features.begin();
27 f != features.end();
28 ++f) {
29 MAttrs.push_back(((*f).second ? "+" : "-") + (*f).first().str());
30--
312.47.1
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
new file mode 100644
index 00000000..35bd0ea1
--- /dev/null
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
@@ -0,0 +1,25 @@
1From 3ef37c63f03ad6f2af407de350486fdd25e9132a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 13 Jan 2020 15:23:47 -0800
4Subject: [PATCH] meson misdetects 64bit atomics on mips/clang
5
6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9---
10 src/util/u_atomic.c | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/src/util/u_atomic.c b/src/util/u_atomic.c
14index 5a5eab4..e499516 100644
15--- a/src/util/u_atomic.c
16+++ b/src/util/u_atomic.c
17@@ -21,7 +21,7 @@
18 * IN THE SOFTWARE.
19 */
20
21-#if defined(MISSING_64BIT_ATOMICS) && defined(HAVE_PTHREAD)
22+#if !defined(__clang__) && defined(MISSING_64BIT_ATOMICS) && defined(HAVE_PTHREAD)
23
24 #include <stdint.h>
25 #include <pthread.h>
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson.build-check-for-all-linux-host_os-combinations.patch
new file mode 100644
index 00000000..964e0a44
--- /dev/null
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0001-meson.build-check-for-all-linux-host_os-combinations.patch
@@ -0,0 +1,43 @@
1From f2fe76d506f356de055b8eca83a7c9d0744a40af Mon Sep 17 00:00:00 2001
2From: Alistair Francis <alistair@alistair23.me>
3Date: Thu, 14 Nov 2019 13:04:49 -0800
4Subject: [PATCH] meson.build: check for all linux host_os combinations
5
6Make sure that we are also looking for our host_os combinations like
7linux-musl etc. when assuming support for DRM/KMS.
8
9Also delete a duplicate line.
10
11Upstream-Status: Pending
12
13Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
14Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
15Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
16Signed-off-by: Alistair Francis <alistair@alistair23.me>
17
18---
19 meson.build | 4 ++--
20 1 file changed, 2 insertions(+), 2 deletions(-)
21
22diff --git a/meson.build b/meson.build
23index 35cc5f1..9a49c0d 100644
24--- a/meson.build
25+++ b/meson.build
26@@ -128,7 +128,7 @@
27 # Only build shared_glapi if at least one OpenGL API is enabled
28 with_shared_glapi = with_shared_glapi and with_any_opengl
29
30-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system())
31+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux')
32
33 gallium_drivers = get_option('gallium-drivers')
34 if gallium_drivers.contains('auto')
35@@ -998,7 +998,7 @@
36 endif
37
38 # TODO: this is very incomplete
39-if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system())
40+if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux')
41 pre_args += '-D_GNU_SOURCE'
42 elif host_machine.system() == 'sunos'
43 pre_args += '-D__EXTENSIONS__'
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch
new file mode 100644
index 00000000..1203c446
--- /dev/null
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr-24.0.1/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch
@@ -0,0 +1,41 @@
1From 62495ebb977866c52d5bed8499a547c49f0d9bc1 Mon Sep 17 00:00:00 2001
2From: Romain Naour <romain.naour@smile.fr>
3Date: Tue, 6 Feb 2024 09:47:10 +0100
4Subject: [PATCH 2/2] glxext: don't try zink if not enabled in mesa
5
6Commit 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers")
7added an automatic zink fallback even when the zink gallium is not
8enabled at build time.
9
10It leads to unexpected error log while loading drisw driver and
11zink is not installed on the rootfs:
12
13 MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so
14
15Fixes: 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers")
16
17Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478]
18Signed-off-by: Romain Naour <romain.naour@smile.fr>
19Signed-off-by: Khem Raj <raj.khem@gmail.com>
20---
21 src/glx/glxext.c | 2 ++
22 1 file changed, 2 insertions(+)
23
24diff --git a/src/glx/glxext.c b/src/glx/glxext.c
25index 05c825a..7a06aa9 100644
26--- a/src/glx/glxext.c
27+++ b/src/glx/glxext.c
28@@ -908,9 +908,11 @@ __glXInitialize(Display * dpy)
29 #endif /* HAVE_DRI3 */
30 if (!debug_get_bool_option("LIBGL_DRI2_DISABLE", false))
31 dpyPriv->dri2Display = dri2CreateDisplay(dpy);
32+#if defined(HAVE_ZINK)
33 if (!dpyPriv->dri3Display && !dpyPriv->dri2Display)
34 try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) &&
35 !getenv("GALLIUM_DRIVER");
36+#endif /* HAVE_ZINK */
37 }
38 #endif /* GLX_USE_DRM */
39 if (glx_direct)
40--
412.44.0
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr.inc b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr.inc
new file mode 100644
index 00000000..45d5ada3
--- /dev/null
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr.inc
@@ -0,0 +1,370 @@
1# Copy of mesa.inc from OE-core before commit f9eb0468e45e ("mesa: upgrade 24.0.7 -> 25.0.2")
2
3SUMMARY = "A free implementation of the OpenGL API"
4DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \
5a system for rendering interactive 3D graphics. \
6A variety of device drivers allows Mesa to be used in many different environments \
7ranging from software emulation to complete hardware acceleration for modern GPUs. \
8Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \
9environment."
10
11HOMEPAGE = "http://mesa3d.org"
12BUGTRACKER = "https://bugs.freedesktop.org"
13SECTION = "x11"
14LICENSE = "MIT"
15LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10"
16
17PE = "2"
18
19SRC_URI = "https://archive.mesa3d.org/mesa-${PV}.tar.xz \
20 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
21 file://0001-drisw-fix-build-without-dri3.patch \
22 file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \
23 file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \
24 file://0001-amd-Include-missing-llvm-IR-header-Module.h.patch \
25 file://0001-freedreno-don-t-encode-build-path-into-binaries.patch\
26"
27
28SRC_URI[sha256sum] = "7454425f1ed4a6f1b5b107e1672b30c88b22ea0efea000ae2c7d96db93f6c26a"
29PV = "24.0.7"
30
31UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
32
33#because we cannot rely on the fact that all apps will use pkgconfig,
34#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
35do_install:append() {
36 # sed can't find EGL/eglplatform.h as it doesn't get installed when glvnd enabled.
37 # So, check if EGL/eglplatform.h exists before running sed.
38 if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)} && [ -f ${D}${includedir}/EGL/eglplatform.h ]; then
39 sed -i -e 's/^#elif defined(__unix__) && defined(EGL_NO_X11)$/#elif defined(__unix__) \&\& defined(EGL_NO_X11) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
40 fi
41}
42
43DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib chrpath-replacement-native python3-mako-native gettext-native"
44DEPENDS:append:class-target = " ${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'mesa-native', '', d)}"
45EXTRANATIVEPATH += "chrpath-native"
46PROVIDES = " \
47 ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} \
48 ${@bb.utils.contains('PACKAGECONFIG', 'glvnd', 'virtual/libglx', '', d)} \
49 ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1 virtual/libgles2 virtual/libgles3', '', d)} \
50 ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'virtual/egl', '', d)} \
51 ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'virtual/libgbm', '', d)} \
52 virtual/mesa \
53 "
54
55inherit meson pkgconfig python3native gettext features_check
56
57BBCLASSEXTEND = "native nativesdk"
58
59ANY_OF_DISTRO_FEATURES = "opengl vulkan"
60
61PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}"
62
63# set the MESA_BUILD_TYPE to either 'release' (default) or 'debug'
64# by default the upstream mesa sources build a debug release
65# here we assume the user will want a release build by default
66MESA_BUILD_TYPE ?= "release"
67def check_buildtype(d):
68 _buildtype = d.getVar('MESA_BUILD_TYPE')
69 if _buildtype not in ['release', 'debug']:
70 bb.fatal("unknown build type (%s), please set MESA_BUILD_TYPE to either 'release' or 'debug'" % _buildtype)
71 if _buildtype == 'debug':
72 return 'debugoptimized'
73 return 'plain'
74MESON_BUILDTYPE = "${@check_buildtype(d)}"
75
76EXTRA_OEMESON = " \
77 -Dshared-glapi=enabled \
78 -Dglx-read-only-text=true \
79 -Dplatforms='${@",".join("${PLATFORMS}".split())}' \
80"
81
82EXTRA_OEMESON:append:class-target = " ${@bb.utils.contains('PACKAGECONFIG', 'opencl', '-Dintel-clc=system', '', d)}"
83EXTRA_OEMESON:append:class-native = " ${@bb.utils.contains('PACKAGECONFIG', 'opencl', '-Dintel-clc=enabled', '', d)}"
84
85def strip_comma(s):
86 return s.strip(',')
87
88PACKAGECONFIG = " \
89 gallium \
90 video-codecs \
91 ${@bb.utils.filter('DISTRO_FEATURES', 'x11 vulkan wayland', d)} \
92 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm virgl', '', d)} \
93 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'dri3', '', d)} \
94 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \
95 ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'zink', '', d)} \
96"
97
98PACKAGECONFIG:append:class-native = " gallium-llvm r600"
99
100# "gbm" requires "opengl"
101PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled"
102
103X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr"
104# "x11" requires "opengl"
105PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}"
106PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols"
107
108PACKAGECONFIG[dri3] = "-Ddri3=enabled, -Ddri3=disabled, xorgproto libxshmfence"
109
110# Vulkan drivers need dri3 enabled
111# amd could be enabled as well but requires gallium-llvm with llvm >= 3.9
112VULKAN_DRIVERS = ""
113VULKAN_DRIVERS:append:x86 = ",intel,amd"
114VULKAN_DRIVERS:append:x86-64 = ",intel,amd"
115# i686 is a 32 bit override for mesa-native
116VULKAN_DRIVERS:append:i686 = ",intel,amd"
117VULKAN_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}"
118VULKAN_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'broadcom', ',broadcom', '', d)}"
119VULKAN_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',swrast', '', d)}"
120VULKAN_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'imagination', ',imagination-experimental', '', d)}"
121PACKAGECONFIG[vulkan] = "-Dvulkan-drivers=${@strip_comma('${VULKAN_DRIVERS}')}, -Dvulkan-drivers='',glslang-native vulkan-loader vulkan-headers"
122
123# mesa development and testing tools support, per driver
124TOOLS = ""
125TOOLS_DEPS = ""
126TOOLS:append = "${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}"
127TOOLS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}"
128TOOLS:append = "${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}"
129TOOLS:append = "${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panfrost', '', d)}"
130TOOLS:append = "${@bb.utils.contains('PACKAGECONFIG', 'imagination', ',imagination', '', d)}"
131
132# dependencies for tools.
133TOOLS_DEPS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ' ncurses libxml2 ', '', d)}"
134
135# the fdperf tool requires libconfig (a part of meta-oe) so it needs special
136# treatment in addition to the usual 'freedreno tools'.
137PACKAGECONFIG[freedreno-fdperf] = ",,libconfig"
138
139PACKAGECONFIG[tools] = "-Dtools=${@strip_comma('${TOOLS}')}, -Dtools='', ${TOOLS_DEPS}"
140
141PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false"
142PACKAGECONFIG[glvnd] = "-Dglvnd=true, -Dglvnd=false, libglvnd"
143
144# "gles" requires "opengl"
145PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled -Dgles2=disabled"
146
147# "egl" requires "opengl"
148PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled"
149
150# "opencl" requires libclc from meta-clang and spirv-tools from OE-Core
151OPENCL_NATIVE = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', '-Dopencl-native=true', '', d)}"
152PACKAGECONFIG[opencl] = "-Dgallium-opencl=icd -Dopencl-spirv=true ${OPENCL_NATIVE},-Dgallium-opencl=disabled -Dopencl-spirv=false,libclc spirv-tools python3-ply-native"
153
154PACKAGECONFIG[broadcom] = ""
155PACKAGECONFIG[etnaviv] = ",,python3-pycparser-native"
156PACKAGECONFIG[freedreno] = ""
157PACKAGECONFIG[kmsro] = ""
158PACKAGECONFIG[vc4] = ""
159PACKAGECONFIG[v3d] = ""
160PACKAGECONFIG[zink] = ""
161
162GALLIUMDRIVERS = "swrast"
163# gallium swrast was found to crash Xorg on startup in x32 qemu
164GALLIUMDRIVERS:x86-x32 = ""
165GALLIUMDRIVERS:append:x86 = ",i915,iris,crocus"
166GALLIUMDRIVERS:append:x86-64 = ",i915,iris,crocus"
167# i686 is a 32 bit override for mesa-native
168GALLIUMDRIVERS:append:i686 = ",i915,iris,crocus"
169
170GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}"
171GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}"
172GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'kmsro', ',kmsro', '', d)}"
173GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'vc4', ',vc4', '', d)}"
174GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'v3d', ',v3d', '', d)}"
175GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'zink', ',zink', '', d)}"
176
177# radeonsi requires LLVM
178GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',radeonsi', '', d)}"
179GALLIUMDRIVERS_LLVM = ",r300,nouveau${GALLIUMDRIVERS_RADEONSI}"
180GALLIUMDRIVERS_LLVM:append:x86 = ",svga"
181GALLIUMDRIVERS_LLVM:append:x86-64 = ",svga"
182# i686 is a 32 bit override for mesa-native
183GALLIUMDRIVERS_LLVM:append:i686 = ",svga"
184
185PACKAGECONFIG[r600] = ""
186PACKAGECONFIG[virgl] = ""
187
188GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', '${GALLIUMDRIVERS_LLVM}', '', d)}"
189GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600', '', d)}"
190GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl', ',virgl', '', d)}"
191
192PACKAGECONFIG[gallium] = "-Dgallium-drivers=${@strip_comma('${GALLIUMDRIVERS}')}, -Dgallium-drivers='', libdrm"
193PACKAGECONFIG[gallium-llvm] = "-Dllvm=enabled -Dshared-llvm=enabled, -Dllvm=disabled, llvm llvm-native elfutils"
194PACKAGECONFIG[xa] = "-Dgallium-xa=enabled, -Dgallium-xa=disabled"
195PACKAGECONFIG[va] = "-Dgallium-va=enabled,-Dgallium-va=disabled,libva-initial"
196PACKAGECONFIG[vdpau] = "-Dgallium-vdpau=enabled,-Dgallium-vdpau=disabled,libvdpau"
197
198PACKAGECONFIG[imagination] = "-Dimagination-srv=true,-Dimagination-srv=false"
199
200PACKAGECONFIG[lima] = ""
201GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}"
202
203PACKAGECONFIG[panfrost] = ""
204GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panfrost', '', d)}"
205
206PACKAGECONFIG[tegra] = ""
207GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'tegra', ',tegra,nouveau', '', d)}"
208
209PACKAGECONFIG[vulkan-beta] = "-Dvulkan-beta=true,-Dvulkan-beta=false"
210
211PACKAGECONFIG[osmesa] = "-Dosmesa=true,-Dosmesa=false"
212
213PACKAGECONFIG[perfetto] = "-Dperfetto=true,-Dperfetto=false,libperfetto"
214
215PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind"
216
217PACKAGECONFIG[lmsensors] = "-Dlmsensors=enabled,-Dlmsensors=disabled,lmsensors"
218
219VIDEO_CODECS ?= "${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'all', 'all_free', d)}"
220PACKAGECONFIG[video-codecs] = "-Dvideo-codecs=${VIDEO_CODECS}, -Dvideo-codecs=''"
221
222# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2)
223FULL_OPTIMIZATION:append = " -fno-omit-frame-pointer"
224
225CFLAGS:append:armv5 = " -DMISSING_64BIT_ATOMICS"
226CFLAGS:append:armv6 = " -DMISSING_64BIT_ATOMICS"
227
228# Remove the mesa dependency on mesa-dev, as mesa is empty
229DEV_PKG_DEPENDENCY = ""
230
231# GLES2 and GLES3 implementations are packaged in a single library in libgles2-mesa.
232# Add a dependency so the GLES3 dev package is associated with its implementation.
233RPROVIDES:libgles2-mesa += "libgles3-mesa"
234RPROVIDES:libgles2-mesa-dev += "libgles3-mesa-dev"
235
236RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'libclc spirv-tools', '', d)}"
237
238PACKAGES =+ "libegl-mesa libegl-mesa-dev \
239 libosmesa libosmesa-dev \
240 libgl-mesa libgl-mesa-dev \
241 libglx-mesa libglx-mesa-dev \
242 libglapi libglapi-dev \
243 libgbm libgbm-dev \
244 libgles1-mesa libgles1-mesa-dev \
245 libgles2-mesa libgles2-mesa-dev \
246 libopencl-mesa libopencl-mesa-dev \
247 libxatracker libxatracker-dev \
248 mesa-megadriver mesa-vulkan-drivers \
249 mesa-vdpau-drivers mesa-tools \
250 "
251
252do_install:append () {
253 # Drivers never need libtool .la files
254 rm -f ${D}${libdir}/dri/*.la
255 rm -f ${D}${libdir}/egl/*.la
256 rm -f ${D}${libdir}/gallium-pipe/*.la
257 rm -f ${D}${libdir}/gbm/*.la
258
259 # libwayland-egl has been moved to wayland 1.15+
260 rm -f ${D}${libdir}/libwayland-egl*
261 rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc
262}
263
264do_install:append:class-native () {
265 if ${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'true', 'false', d)}; then
266 install -d ${D}${bindir}
267 install -m0755 ${B}/src/intel/compiler/intel_clc ${D}${bindir}
268 fi
269}
270
271# For the packages that make up the OpenGL interfaces, inject variables so that
272# they don't get Debian-renamed (which would remove the -mesa suffix), and
273# RPROVIDEs/RCONFLICTs on the generic libgl name.
274python __anonymous() {
275 pkgconfig = (d.getVar('PACKAGECONFIG') or "").split()
276 suffix = ""
277 if "-native" in d.getVar("PN"):
278 suffix = "-native"
279 for p in (("egl", "libegl", "libegl1"),
280 ("opengl", "libgl", "libgl1"),
281 ("glvnd", "libglx",),
282 ("gles", "libgles1", "libglesv1-cm1"),
283 ("gles", "libgles2", "libglesv2-2", "libgles3"),
284 ("opencl", "libopencl",)):
285 if not p[0] in pkgconfig:
286 continue
287 mlprefix = d.getVar("MLPREFIX")
288 fullp = mlprefix + p[1] + "-mesa" + suffix
289 mlprefix = d.getVar("MLPREFIX")
290 pkgs = " " + " ".join(mlprefix + x + suffix for x in p[1:])
291 d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1")
292 d.appendVar("RREPLACES:" + fullp, pkgs)
293 d.appendVar("RPROVIDES:" + fullp, pkgs)
294 d.appendVar("RCONFLICTS:" + fullp, pkgs)
295
296 d.appendVar("RRECOMMENDS:" + fullp, " ${MLPREFIX}mesa-megadriver" + suffix)
297
298 # For -dev, the first element is both the Debian and original name
299 fullp = mlprefix + p[1] + "-mesa-dev" + suffix
300 pkgs = " " + mlprefix + p[1] + "-dev" + suffix
301 d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1")
302 d.appendVar("RREPLACES:" + fullp, pkgs)
303 d.appendVar("RPROVIDES:" + fullp, pkgs)
304 d.appendVar("RCONFLICTS:" + fullp, pkgs)
305}
306
307python mesa_populate_packages() {
308 pkgs = ['mesa', 'mesa-dev', 'mesa-dbg']
309 for pkg in pkgs:
310 d.setVar("RPROVIDES:%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
311 d.setVar("RCONFLICTS:%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
312 d.setVar("RREPLACES:%s" % pkg, pkg.replace("mesa", "mesa-dri", 1))
313
314 import re
315 dri_drivers_root = oe.path.join(d.getVar('PKGD'), d.getVar('libdir'), "dri")
316 if os.path.isdir(dri_drivers_root):
317 dri_pkgs = sorted(os.listdir(dri_drivers_root))
318 lib_name = d.expand("${MLPREFIX}mesa-megadriver")
319 for p in dri_pkgs:
320 m = re.match(r'^(.*)_dri\.so$', p)
321 if m:
322 pkg_name = " ${MLPREFIX}mesa-driver-%s" % legitimize_package_name(m.group(1))
323 d.appendVar("RPROVIDES:%s" % lib_name, pkg_name)
324 d.appendVar("RCONFLICTS:%s" % lib_name, pkg_name)
325 d.appendVar("RREPLACES:%s" % lib_name, pkg_name)
326
327 pipe_drivers_root = os.path.join(d.getVar('libdir'), "gallium-pipe")
328 do_split_packages(d, pipe_drivers_root, r'^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='')
329}
330
331PACKAGESPLITFUNCS =+ "mesa_populate_packages"
332
333PACKAGES_DYNAMIC += "^mesa-driver-.*"
334PACKAGES_DYNAMIC:class-native = "^mesa-driver-.*-native"
335
336FILES:mesa-megadriver = "${libdir}/dri/* ${datadir}/drirc.d"
337FILES:mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${libdir}/libpowervr_rogue.so ${datadir}/vulkan"
338FILES:${PN}-vdpau-drivers = "${libdir}/vdpau/*.so.*"
339FILES:libegl-mesa = "${libdir}/libEGL*.so.* ${datadir}/glvnd/egl_vendor.d"
340FILES:libgbm = "${libdir}/libgbm.so.*"
341FILES:libgles1-mesa = "${libdir}/libGLESv1*.so.*"
342FILES:libgles2-mesa = "${libdir}/libGLESv2.so.*"
343FILES:libgl-mesa = "${libdir}/libGL.so.*"
344FILES:libglx-mesa = "${libdir}/libGLX*.so.*"
345FILES:libopencl-mesa = "${libdir}/libMesaOpenCL.so.* ${libdir}/gallium-pipe/*.so ${sysconfdir}/OpenCL/vendors/mesa.icd"
346FILES:libglapi = "${libdir}/libglapi.so.*"
347FILES:libosmesa = "${libdir}/libOSMesa.so.*"
348FILES:libxatracker = "${libdir}/libxatracker.so.*"
349
350FILES:${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan ${libdir}/vdpau/*.so"
351FILES:libegl-mesa-dev = "${libdir}/libEGL*.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
352FILES:libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h"
353FILES:libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc"
354FILES:libglx-mesa-dev = "${libdir}/libGLX*.*"
355FILES:libglapi-dev = "${libdir}/libglapi.*"
356FILES:libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc"
357FILES:libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${includedir}/GLES3 ${libdir}/pkgconfig/glesv2.pc"
358FILES:libopencl-mesa-dev = "${libdir}/libMesaOpenCL.so"
359FILES:libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc"
360FILES:libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \
361 ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \
362 ${libdir}/pkgconfig/xatracker.pc"
363# catch all to get all the tools and data
364FILES:${PN}-tools = "${bindir} ${datadir}"
365ALLOW_EMPTY:${PN}-tools = "1"
366
367# Fix upgrade path from mesa to mesa-megadriver
368RREPLACES:mesa-megadriver = "mesa"
369RCONFLICTS:mesa-megadriver = "mesa"
370RPROVIDES:mesa-megadriver = "mesa"
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb
index 5abd0793..2f160141 100644
--- a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_22.3.5.bb
@@ -2,9 +2,9 @@
2# upstream yet. This allows us to build the shims we need without completely 2# upstream yet. This allows us to build the shims we need without completely
3# clobbering mesa. 3# clobbering mesa.
4 4
5require recipes-graphics/mesa/mesa.inc 5require recipes-graphics/mesa/mesa-pvr.inc
6 6
7SUMMARY += " (with PowerVR support for TI platforms)" 7SUMMARY += " (with PowerVR for TI parts)"
8 8
9LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10" 9LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10"
10 10
@@ -19,16 +19,17 @@ SRC_URI = " \
19 file://0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch \ 19 file://0001-freedreno-pm4-Use-unsigned-instead-of-uint-to-fix-mu.patch \
20 file://0001-gallium-Fix-build-with-llvm-17.patch \ 20 file://0001-gallium-Fix-build-with-llvm-17.patch \
21 file://0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch \ 21 file://0001-fix-gallivm-limit-usage-of-LLVMContextSetOpaquePoint.patch \
22 file://0001-fix-gallivm-fix-LLVM-include-of-Host-h-moved-to-TargetParser.patch \
23 file://0001-gallium-Fix-build-with-llvm-18-and-19.patch \
22" 24"
23 25
24S = "${WORKDIR}/git"
25
26PACKAGECONFIG:append = " \ 26PACKAGECONFIG:append = " \
27 ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver', 'pvr', '', d)} \ 27 ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver', 'pvr', '', d)} \
28 ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \ 28 ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \
29" 29"
30 30
31SRCREV = "1be98ba80452ebe38546a7fca26b5a70f2629083" 31SRCREV = "c9f0919367589b38f5682183846de9d60eec082d"
32PV = "22.3.5"
32 33
33PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss" 34PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss"
34PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS}," 35PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"
diff --git a/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb
new file mode 100644
index 00000000..e4f99d36
--- /dev/null
+++ b/meta-ti-bsp/recipes-graphics/mesa/mesa-pvr_24.0.1.bb
@@ -0,0 +1,52 @@
1# PowerVR Graphics require several patches that have not made their way
2# upstream yet. This allows us to build the shims we need without completely
3# clobbering mesa.
4
5require recipes-graphics/mesa/mesa-pvr.inc
6
7SUMMARY += " (with PowerVR for TI parts)"
8
9LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10"
10
11BRANCH = "powervr/${PV}"
12
13SRC_URI = " \
14 git://gitlab.freedesktop.org/StaticRocket/mesa.git;protocol=https;branch=${BRANCH} \
15 file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
16 file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
17 file://0001-gallium-Fix-build-with-llvm-17.patch \
18 file://0001-drisw-fix-build-without-dri3.patch \
19 file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \
20 file://0001-gallivm-Call-StringMapIterator-from-llvm-scope.patch \
21 file://0001-Update-lp_bld_misc.cpp-to-support-llvm-19.patch \
22"
23
24PACKAGECONFIG:append = " \
25 ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-img-rogue-driver', 'pvr', '', d)} \
26 ${@bb.utils.contains('PREFERRED_PROVIDER_virtual/gpudriver', 'ti-sgx-ddk-km', 'sgx', '', d)} \
27"
28
29SRCREV = "82e6a9293c476267417c5b6b906b01fb73a34e38"
30PV = "24.0.1"
31
32PVR_DISPLAY_CONTROLLER_ALIAS ??= "tidss"
33PACKAGECONFIG[pvr] = "-Dgallium-pvr-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"
34PACKAGECONFIG[sgx] = "-Dgallium-sgx-alias=${PVR_DISPLAY_CONTROLLER_ALIAS},"
35
36
37PACKAGE_ARCH = "${MACHINE_ARCH}"
38
39GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pvr', ',pvr', '', d)}"
40GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'sgx', ',sgx', '', d)}"
41
42VULKAN_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'pvr', ',pvr', '', d)}"
43
44do_install:append () {
45 # remove pvr custom pkgconfig
46 rm -rf ${D}${datadir}/pkgconfig
47}
48
49FILES:${PN}-dev += "${datadir}/mesa/wayland-drm.xml"
50FILES:mesa-vulkan-drivers += "${libdir}/libpvr_mesa_wsi.so"
51
52RRECOMMENDS:mesa-megadriver:append:class-target = " ${@d.getVar('PREFERRED_PROVIDER_virtual/gpudriver')}"
diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb
index a0a9a295..5dc6c211 100644
--- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb
+++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_23.3.6512818.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "Userspace libraries for PowerVR Rogue GPU on TI SoCs" 1SUMMARY = "Userspace libraries for PowerVR Rogue GPU on TI SoCs"
2HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs" 2HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs"
3LICENSE = "TI-TFL" 3LICENSE = "TI-TFL"
4LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f" 4LIC_FILES_CHKSUM = "file://git/LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"
5 5
6inherit bin_package 6inherit bin_package
7 7
@@ -12,10 +12,10 @@ COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|am62xx|am62pxx|j722s"
12 12
13PR = "r3" 13PR = "r3"
14 14
15BRANCH = "linuxws/scarthgap/k6.6/${PV}" 15BRANCH = "linuxws/kirkstone/k6.1/${PV}"
16SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}" 16SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}"
17SRCREV = "0b9e64254269be2fa95c4f3e1dd925d6e4d58199" 17SRCREV = "0b9e64254269be2fa95c4f3e1dd925d6e4d58199"
18S = "${WORKDIR}/git/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}" 18S:append = "/targetfs/${TARGET_PRODUCT}/${PVR_WS}/${PVR_BUILD}"
19 19
20TARGET_PRODUCT:j721e = "j721e_linux" 20TARGET_PRODUCT:j721e = "j721e_linux"
21TARGET_PRODUCT:j721s2 = "j721s2_linux" 21TARGET_PRODUCT:j721s2 = "j721s2_linux"
@@ -44,7 +44,7 @@ PACKAGECONFIG[opencl] = ",,,,${OPENCL_PACKAGES}"
44def get_file_list(package_list_var, d): 44def get_file_list(package_list_var, d):
45 file_list = [] 45 file_list = []
46 package_list = d.getVar(package_list_var) 46 package_list = d.getVar(package_list_var)
47 prefix = f"{d.getVar('S')}/" 47 prefix = f"{d.getVar('D')}/"
48 if package_list: 48 if package_list:
49 for package in package_list.split(): 49 for package in package_list.split():
50 package_file_string = d.getVar(f"FILES:{package}") 50 package_file_string = d.getVar(f"FILES:{package}")
@@ -53,7 +53,7 @@ def get_file_list(package_list_var, d):
53 file_list.append(f"{prefix}{package_file}") 53 file_list.append(f"{prefix}{package_file}")
54 return " ".join(file_list) 54 return " ".join(file_list)
55 55
56do_install:prepend() { 56do_install:append() {
57 if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then 57 if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then
58 for file in ${@get_file_list('GLES_PACKAGES', d)}; do 58 for file in ${@get_file_list('GLES_PACKAGES', d)}; do
59 rm -rf ${file} 59 rm -rf ${file}
@@ -70,13 +70,13 @@ do_install:prepend() {
70 done 70 done
71 fi 71 fi
72 if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then 72 if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
73 if [ -e ${S}/lib/firmware ]; then 73 if [ -e ${D}/lib/firmware ]; then
74 mv ${S}/lib/firmware ${S}${nonarch_base_libdir} 74 mv ${D}/lib/firmware ${D}${nonarch_base_libdir}
75 fi 75 fi
76 fi 76 fi
77 77
78 # clean up any empty directories 78 # clean up any empty directories
79 find "${S}" -empty -type d -delete 79 find "${D}" -empty -type d -delete
80} 80}
81 81
82GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue" 82GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue"
@@ -109,7 +109,7 @@ python __anonymous() {
109 mlprefix = d.getVar("MLPREFIX") 109 mlprefix = d.getVar("MLPREFIX")
110 pkgs = " " + " ".join(mlprefix + x + suffix for x in p[1:]) 110 pkgs = " " + " ".join(mlprefix + x + suffix for x in p[1:])
111 d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") 111 d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1")
112 d.setVar("INSANE_SKIP:" + fullp, "dev-so") 112 d.setVar("INSANE_SKIP:" + fullp, "dev-so ldflags")
113 d.appendVar("RRECOMMENDS:" + fullp, " ${MLPREFIX}ti-img-rogue-umlibs" + suffix) 113 d.appendVar("RRECOMMENDS:" + fullp, " ${MLPREFIX}ti-img-rogue-umlibs" + suffix)
114} 114}
115 115
@@ -129,10 +129,12 @@ RDEPENDS:libopencl-rogue += "opencl-icd-loader"
129RRECOMMENDS:libopencl-rogue += "libopencl-rogue-tools" 129RRECOMMENDS:libopencl-rogue += "libopencl-rogue-tools"
130FILES:libopencl-rogue-tools += "${bindir}/ocl*" 130FILES:libopencl-rogue-tools += "${bindir}/ocl*"
131DEBIAN_NOAUTONAME:libopencl-rogue-tools = "1" 131DEBIAN_NOAUTONAME:libopencl-rogue-tools = "1"
132INSANE_SKIP:libopencl-rogue-tools = "ldflags"
132 133
133# optional tools and tests 134# optional tools and tests
134FILES:${PN}-tools = "${bindir}/" 135FILES:${PN}-tools = "${bindir}/"
135RDEPENDS:${PN}-tools = "python3-core ${PN}" 136RDEPENDS:${PN}-tools = "python3-core ${PN}"
137INSANE_SKIP:${PN}-tools = "ldflags"
136 138
137# required firmware 139# required firmware
138FILES:${PN}-firmware = "${base_libdir}/firmware/*" 140FILES:${PN}-firmware = "${base_libdir}/firmware/*"
@@ -142,4 +144,4 @@ RRECOMMENDS:${PN} += " \
142 ${PN}-tools \ 144 ${PN}-tools \
143" 145"
144 146
145INSANE_SKIP:${PN} += "already-stripped dev-so" 147INSANE_SKIP:${PN} += "already-stripped dev-so ldflags"
diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb
new file mode 100644
index 00000000..949c2d5d
--- /dev/null
+++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-img-rogue-umlibs_24.2.6643903.bb
@@ -0,0 +1,154 @@
1SUMMARY = "Userspace libraries for PowerVR Rogue GPU on TI SoCs"
2HOMEPAGE = "http://git.ti.com/graphics/ti-img-rogue-umlibs"
3LICENSE = "TI-TFL"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"
5
6PACKAGE_ARCH = "${MACHINE_ARCH}"
7COMPATIBLE_MACHINE = "j721e|j721s2|j784s4|j742s2|am62xx|am62pxx|j722s"
8
9PR = "r4"
10
11BRANCH = "linuxws/scarthgap/k6.12/${PV}"
12SRC_URI = "git://git.ti.com/git/graphics/ti-img-rogue-umlibs.git;protocol=https;branch=${BRANCH}"
13SRCREV = "1ed9ee185cd876200e6747192854015b8e94a7b0"
14
15TARGET_PRODUCT:j721e = "j721e_linux"
16TARGET_PRODUCT:j721s2 = "j721s2_linux"
17TARGET_PRODUCT:j784s4 = "j784s4_linux"
18TARGET_PRODUCT:j742s2 = "j784s4_linux"
19TARGET_PRODUCT:am62xx = "am62_linux"
20TARGET_PRODUCT:am62pxx = "am62p_linux"
21TARGET_PRODUCT:j722s = "j722s_linux"
22PVR_BUILD = "release"
23PVR_WS = "lws-generic"
24
25RDEPENDS:${PN} = " \
26 libdrm \
27 ti-img-rogue-driver \
28 ${PN}-firmware \
29"
30
31PACKAGECONFIG ?= " \
32 ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan wayland', 'vulkan', '', d)} \
33 ${@bb.utils.filter('DISTRO_FEATURES', 'opengl opencl', d)} \
34"
35
36PACKAGECONFIG[opengl] = ",,,,${GLES_PACKAGES}"
37PACKAGECONFIG[vulkan] = ",,,,${VULKAN_PACKAGES}"
38PACKAGECONFIG[opencl] = ",,,,${OPENCL_PACKAGES}"
39
40def get_file_list(package_list_var, d):
41 file_list = []
42 package_list = d.getVar(package_list_var)
43 prefix = f"{d.getVar('D')}/"
44 if package_list:
45 for package in package_list.split():
46 package_file_string = d.getVar(f"FILES:{package}")
47 if package_file_string:
48 for package_file in package_file_string.split():
49 file_list.append(f"{prefix}{package_file}")
50 return " ".join(file_list)
51
52EXTRA_OEMAKE += 'BUILD=${PVR_BUILD} TARGET_PRODUCT=${TARGET_PRODUCT} WINDOW_SYSTEM=${PVR_WS}'
53
54do_configure[noexec] = "1"
55do_compile[noexec] = "1"
56do_install() {
57 oe_runmake 'DESTDIR=${D}' install
58 if ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'false', 'true', d)}; then
59 for file in ${@get_file_list('GLES_PACKAGES', d)}; do
60 rm -rf ${file}
61 done
62 fi
63 if ${@bb.utils.contains('PACKAGECONFIG', 'vulkan', 'false', 'true', d)}; then
64 for file in ${@get_file_list('VULKAN_PACKAGES', d)}; do
65 rm -rf ${file}
66 done
67 fi
68 if ${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'false', 'true', d)}; then
69 for file in ${@get_file_list('OPENCL_PACKAGES', d)}; do
70 rm -rf ${file}
71 done
72 fi
73 if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
74 if [ -e ${D}/lib/firmware ]; then
75 mv ${D}/lib/firmware ${D}${nonarch_base_libdir}
76 fi
77 fi
78
79 # clean up any empty directories
80 find "${D}" -empty -type d -delete
81
82 # fix permissions
83 chown -R root:root "${D}"
84}
85
86GLES_PACKAGES = "libgles1-rogue libgles2-rogue libgles3-rogue"
87VULKAN_PACKAGES = "libvk-rogue"
88OPENCL_PACKAGES = "libopencl-rogue libopencl-rogue-tools"
89
90PACKAGES = " \
91 ${@bb.utils.contains('PACKAGECONFIG', 'opengl', d.getVar('GLES_PACKAGES'), '', d)} \
92 ${@bb.utils.contains('PACKAGECONFIG', 'vulkan', d.getVar('VULKAN_PACKAGES'), '', d)} \
93 ${@bb.utils.contains('PACKAGECONFIG', 'opencl', d.getVar('OPENCL_PACKAGES'), '', d)} \
94 ${PN}-tools \
95 ${PN}-firmware \
96 ${PN} \
97"
98
99# Inject variables so that packages don't get Debian-renamed (which would
100# remove the -rogue suffix), but don't RPROVIDEs/RCONFLICTs on the generic
101# libgl name to prevent colliding with swrast libs
102python __anonymous() {
103 suffix = ""
104 if "-native" in d.getVar("PN"):
105 suffix = "-native"
106 for p in (("vulkan", "libvk",),
107 ("gles", "libgles1", "libglesv1-cm1"),
108 ("gles", "libgles2", "libglesv2-2"),
109 ("gles", "libgles3",),
110 ("opencl", "libopencl",)):
111 mlprefix = d.getVar("MLPREFIX")
112 fullp = mlprefix + p[1] + "-rogue" + suffix
113 mlprefix = d.getVar("MLPREFIX")
114 pkgs = " " + " ".join(mlprefix + x + suffix for x in p[1:])
115 d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1")
116 d.setVar("INSANE_SKIP:" + fullp, "dev-so ldflags")
117 d.appendVar("RRECOMMENDS:" + fullp, " ${MLPREFIX}ti-img-rogue-umlibs" + suffix)
118}
119
120# gles specific shared objects
121FILES:libgles1-rogue = "${libdir}/libGLESv1*.so*"
122FILES:libgles2-rogue = "${libdir}/libGLESv2*.so*"
123RDEPENDS:libgles1-rogue += "mesa-megadriver"
124RDEPENDS:libgles2-rogue += "mesa-megadriver"
125
126# vulkan specific shared objects and configs
127FILES:libvk-rogue = "${libdir}/libVK_IMG.so* ${datadir}/vulkan"
128RDEPENDS:libvk-rogue += "vulkan-loader wayland libdrm"
129
130# opencl specific shared objects and configs
131FILES:libopencl-rogue = "${libdir}/libPVROCL.so* ${sysconfdir}/OpenCL"
132RDEPENDS:libopencl-rogue += "opencl-icd-loader"
133RRECOMMENDS:libopencl-rogue += "libopencl-rogue-tools"
134FILES:libopencl-rogue-tools += "${bindir}/ocl*"
135DEBIAN_NOAUTONAME:libopencl-rogue-tools = "1"
136INSANE_SKIP:libopencl-rogue-tools = "ldflags"
137
138# optional tools and tests
139FILES:${PN}-tools = "${bindir}/"
140RDEPENDS:${PN}-tools = "python3-core libdrm ${PN}"
141INSANE_SKIP:${PN}-tools = "ldflags"
142
143# required firmware
144FILES:${PN}-firmware = "${base_libdir}/firmware/*"
145INSANE_SKIP:${PN}-firmware += "arch"
146
147# common libraries
148FILES:${PN} = "${libdir}"
149
150RRECOMMENDS:${PN} += " \
151 ${PN}-tools \
152"
153
154INSANE_SKIP:${PN} += "already-stripped dev-so ldflags"
diff --git a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb
index d2565318..84a9afcf 100644
--- a/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb
+++ b/meta-ti-bsp/recipes-graphics/powervr-umlibs/ti-sgx-ddk-um_1.17.4948957.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Userspace libraries for PowerVR SGX chipset on TI SoCs" 1SUMMARY = "Userspace libraries for PowerVR SGX chipset on TI SoCs"
2HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-um-linux" 2HOMEPAGE = "https://git.ti.com/graphics/omap5-sgx-ddk-um-linux"
3LICENSE = "TI-TSPA" 3LICENSE = "TI-TSPA"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=7232b98c1c58f99e3baa03de5207e76f"
@@ -13,18 +13,27 @@ BRANCH = "${PV}/mesa/glibc-2.35"
13SRC_URI = " \ 13SRC_URI = " \
14 git://git.ti.com/git/graphics/omap5-sgx-ddk-um-linux.git;protocol=https;branch=${BRANCH} \ 14 git://git.ti.com/git/graphics/omap5-sgx-ddk-um-linux.git;protocol=https;branch=${BRANCH} \
15" 15"
16SRCREV = "70364424dd496833fad5b243c9e6cc8b077f04ac" 16SRCREV = "84a396a4fb379f10931421e489ac8a199d6a9f2c"
17 17
18INITSCRIPT_NAME = "rc.pvr" 18INITSCRIPT_NAME = "rc.pvr"
19INITSCRIPT_PARAMS = "defaults 8" 19INITSCRIPT_PARAMS = "defaults 8"
20SYSTEMD_SERVICE:${PN} = "pvrsrvctl.service"
20 21
22# Prefer udev rules over everything, but we do have init services if necessary
21PACKAGECONFIG ??= "udev" 23PACKAGECONFIG ??= "udev"
22PACKAGECONFIG[udev] = "UDEV=true,,,udev" 24PACKAGECONFIG[udev] = "UDEV=true,UDEV=false,,udev,,sysvinit systemd"
25PACKAGECONFIG[systemd] = "SYSTEMD=true,SYSTEMD=false,,,,udev sysvinit"
26PACKAGECONFIG[sysvinit] = ",,,,,udev systemd"
23 27
24def use_sysvinit(d): 28def pick_init(d):
25 return d.getVar('VIRTUAL-RUNTIME_init_manager') == 'sysvinit' 29 packageconfig = d.getVar('PACKAGECONFIG').split()
30 if 'udev' not in packageconfig:
31 if d.getVar('VIRTUAL-RUNTIME_init_manager') == 'sysvinit':
32 return "update-rc.d"
33 return "systemd"
34 return ""
26 35
27inherit ${@oe.utils.ifelse(use_sysvinit(d), 'update-rc.d', '')} 36inherit ${@pick_init(d)}
28 37
29TARGET_PRODUCT:ti33x = "ti335x_linux" 38TARGET_PRODUCT:ti33x = "ti335x_linux"
30TARGET_PRODUCT:ti43x = "ti437x_linux" 39TARGET_PRODUCT:ti43x = "ti437x_linux"
@@ -35,10 +44,10 @@ RDEPENDS:${PN} += "libdrm"
35 44
36RRECOMMENDS:${PN} += "ti-sgx-ddk-km" 45RRECOMMENDS:${PN} += "ti-sgx-ddk-km"
37 46
38S = "${WORKDIR}/git"
39
40EXTRA_OEMAKE += "DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} ${PACKAGECONFIG_CONFARGS}" 47EXTRA_OEMAKE += "DESTDIR=${D} TARGET_PRODUCT=${TARGET_PRODUCT} ${PACKAGECONFIG_CONFARGS}"
41 48
49do_configure[noexec] = "1"
50do_compile[noexec] = "1"
42do_install() { 51do_install() {
43 oe_runmake install 52 oe_runmake install
44} 53}
diff --git a/meta-ti-bsp/recipes-kernel/linux/files/0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch b/meta-ti-bsp/recipes-kernel/linux/files/0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch
new file mode 100644
index 00000000..56a06e01
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/files/0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch
@@ -0,0 +1,55 @@
1From 2c78d22a78584f2a17eb33b5b5fd6fa602c2af8d Mon Sep 17 00:00:00 2001
2From: Ryan Eatmon <reatmon@ti.com>
3Date: Wed, 17 Jul 2024 16:19:20 -0500
4Subject: [PATCH] drivers: gpu: drm: msm: registers: improve reproducibility
5
6The files generated by gen_header.py capture the source path to the
7input files and the date. While that can be informative, it varies
8based on where and when the kernel was built as the full path is
9captured.
10
11Since all of the files that this tool is run on is under the drivers
12directory, this modifies the application to strip all of the path before
13drivers. Additionally it prints <stripped> instead of the date.
14
15Both changes solve the reproducibility issue.
16
17Upstream-Status: Inappropriate
18
19Signed-off-by: Ryan Eatmon <reatmon@ti.com>
20---
21 drivers/gpu/drm/msm/registers/gen_header.py | 8 +++++---
22 1 file changed, 5 insertions(+), 3 deletions(-)
23
24diff --git a/drivers/gpu/drm/msm/registers/gen_header.py b/drivers/gpu/drm/msm/registers/gen_header.py
25index 3926485bb197..a409404627c7 100644
26--- a/drivers/gpu/drm/msm/registers/gen_header.py
27+++ b/drivers/gpu/drm/msm/registers/gen_header.py
28@@ -11,6 +11,7 @@ import collections
29 import argparse
30 import time
31 import datetime
32+import re
33
34 class Error(Exception):
35 def __init__(self, message):
36@@ -877,13 +878,14 @@ The rules-ng-ng source files this header was generated from are:
37 """)
38 maxlen = 0
39 for filepath in p.xml_files:
40- maxlen = max(maxlen, len(filepath))
41+ new_filepath = re.sub("^.+drivers","drivers",filepath)
42+ maxlen = max(maxlen, len(new_filepath))
43 for filepath in p.xml_files:
44- pad = " " * (maxlen - len(filepath))
45+ pad = " " * (maxlen - len(new_filepath))
46 filesize = str(os.path.getsize(filepath))
47 filesize = " " * (7 - len(filesize)) + filesize
48 filetime = time.ctime(os.path.getmtime(filepath))
49- print("- " + filepath + pad + " (" + filesize + " bytes, from " + filetime + ")")
50+ print("- " + new_filepath + pad + " (" + filesize + " bytes, from <stripped>)")
51 if p.copyright_year:
52 current_year = str(datetime.date.today().year)
53 print()
54--
552.17.1
diff --git a/meta-ti-bsp/recipes-kernel/linux/files/0001-gcc-plugins-Fix-build-for-upcoming-GCC-release.patch b/meta-ti-bsp/recipes-kernel/linux/files/0001-gcc-plugins-Fix-build-for-upcoming-GCC-release.patch
deleted file mode 100644
index 3dfa31a1..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/files/0001-gcc-plugins-Fix-build-for-upcoming-GCC-release.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 3cd29a3d7c25cca9989e7d8966141f725fa99c68 Mon Sep 17 00:00:00 2001
2From: Palmer Dabbelt <palmer@rivosinc.com>
3Date: Fri, 13 Jan 2023 09:30:33 -0800
4Subject: [PATCH] gcc-plugins: Fix build for upcoming GCC release
5
6The upcoming GCC release has refactored the gimple plugin interface a
7bit and unless gimple-iterator.h is included before gimple-fold.h I end
8up with a bunch of missing declarations when building the stack
9protector plugin.
10
11Upstream-Status: Backport [https://lore.kernel.org/all/20230113173033.4380-1-palmer@rivosinc.com/]
12Reported-by: Palmer Dabbelt <palmer@rivosinc.com>
13Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
14Link: https://lore.kernel.org/all/20230113173033.4380-1-palmer@rivosinc.com/
15Cc: linux-hardening@vger.kernel.org
16Signed-off-by: Kees Cook <keescook@chromium.org>
17---
18 scripts/gcc-plugins/gcc-common.h | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21--- a/scripts/gcc-plugins/gcc-common.h
22+++ b/scripts/gcc-plugins/gcc-common.h
23@@ -108,7 +108,9 @@
24 #include "varasm.h"
25 #include "stor-layout.h"
26 #include "internal-fn.h"
27+#include "gimple.h"
28 #include "gimple-expr.h"
29+#include "gimple-iterator.h"
30 #include "gimple-fold.h"
31 #include "context.h"
32 #include "tree-ssa-alias.h"
33@@ -124,13 +126,10 @@
34 #include "gimplify.h"
35 #endif
36
37-#include "gimple.h"
38-
39 #if BUILDING_GCC_VERSION >= 4009
40 #include "tree-ssa-operands.h"
41 #include "tree-phinodes.h"
42 #include "tree-cfg.h"
43-#include "gimple-iterator.h"
44 #include "gimple-ssa.h"
45 #include "ssa-iterators.h"
46 #endif
diff --git a/meta-ti-bsp/recipes-kernel/linux/files/0001-perf-python-Fix-compile-for-32bit-platforms.patch b/meta-ti-bsp/recipes-kernel/linux/files/0001-perf-python-Fix-compile-for-32bit-platforms.patch
new file mode 100644
index 00000000..12e12c68
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/files/0001-perf-python-Fix-compile-for-32bit-platforms.patch
@@ -0,0 +1,32 @@
1From a51ebf08cec81d84ac258da1c0ead139d6ddc94f Mon Sep 17 00:00:00 2001
2From: Ryan Eatmon <reatmon@ti.com>
3Date: Tue, 2 Jul 2024 11:07:14 -0500
4Subject: [master][PATCH] perf python: Fix compile for 32bit platforms
5
6The definition for perf_sample is missing on 32bit compiles:
7
8tools/perf/util/python.c:75:28: error: field 'sample' has incomplete type
9 75 | struct perf_sample sample;
10
11Adding #include "sample.h" fixes it.
12
13Upstream-Status: Inappropriate
14
15Signed-off-by: Ryan Eatmon <reatmon@ti.com>
16---
17 tools/perf/util/python.c | 2 ++
18 1 file changed, 2 insertions(+)
19
20diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
21index 3be882b2e845..de64ca3cf2d1 100644
22--- a/tools/perf/util/python.c
23+++ b/tools/perf/util/python.c
24@@ -1,3 +1,5 @@
25+#include "sample.h"
26+
27 // SPDX-License-Identifier: GPL-2.0
28 #include <Python.h>
29 #include <structmember.h>
30--
312.17.1
32
diff --git a/meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility-for-v6.10.patch b/meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility-for-v6.10.patch
new file mode 100644
index 00000000..f9fdece8
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility-for-v6.10.patch
@@ -0,0 +1,60 @@
1From 4907fa9ff1dbdd72ce9fa7855091fb604a35a62d Mon Sep 17 00:00:00 2001
2From: Ryan Eatmon <reatmon@ti.com>
3Date: Wed, 17 Jul 2024 14:55:10 -0500
4Subject: [PATCH] vt/conmakehash: improve reproducibility for v6.10
5
6The file generated by conmakehash capture the application
7path used to generate the file. While that can be informative,
8it varies based on where the kernel was built, as the full
9path is captured.
10
11We tweak the application to use a second input as the "capture
12name", and then modify the Makefile to pass the basename of
13the source, making it reproducible.
14
15This could be improved by using some sort of path mapping,
16or the application manipualing argv[1] itself, but for now
17this solves the reprodicibility issue.
18
19Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
20
21Upstream-Status: Inappropriate
22
23Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
24
25This is a minior rework of Bruce's original patch for the v6.10 kernel.
26
27Signed-off-by: Ryan Eatmon <reatmon@ti.com>
28---
29 drivers/tty/vt/Makefile | 2 +-
30 drivers/tty/vt/conmakehash.c | 2 ++
31 2 files changed, 3 insertions(+), 1 deletion(-)
32
33diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
34index 2c8ce8b592ed..8532077ed3bb 100644
35--- a/drivers/tty/vt/Makefile
36+++ b/drivers/tty/vt/Makefile
37@@ -15,7 +15,7 @@ clean-files := consolemap_deftbl.c defkeymap.c
38 hostprogs += conmakehash
39
40 quiet_cmd_conmk = CONMK $@
41- cmd_conmk = $(obj)/conmakehash $< > $@
42+ cmd_conmk = $(obj)/conmakehash $< $(shell basename $<) > $@
43
44 $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
45 $(call cmd,conmk)
46diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c
47index dc2177fec715..9cd4096a8ffa 100644
48--- a/drivers/tty/vt/conmakehash.c
49+++ b/drivers/tty/vt/conmakehash.c
50@@ -112,6 +112,8 @@ int main(int argc, char *argv[])
51 else
52 rel_tblname = tblname;
53
54+ rel_tblname = argv[2];
55+
56 /* For now we assume the default font is always 256 characters. */
57 fontlen = 256;
58
59--
602.17.1
diff --git a/meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility.patch b/meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility.patch
new file mode 100644
index 00000000..211460c1
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/files/0001-vt-conmakehash-improve-reproducibility.patch
@@ -0,0 +1,56 @@
1From 0f586f4ee8adacac79b64d1f3d47799a5eb7fbea Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Sun, 10 Jul 2022 21:37:07 -0400
4Subject: [PATCH] vt/conmakehash: improve reproducibility
5
6The file generated by conmakehash capture the application
7path used to generate the file. While that can be informative,
8it varies based on where the kernel was built, as the full
9path is captured.
10
11We tweak the application to use a second input as the "capture
12name", and then modify the Makefile to pass the basename of
13the source, making it reproducible.
14
15This could be improved by using some sort of path mapping,
16or the application manipualing argv[1] itself, but for now
17this solves the reprodicibility issue.
18
19Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
20
21Upstream-Status: Inappropriate
22
23Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
24---
25 drivers/tty/vt/Makefile | 2 +-
26 drivers/tty/vt/conmakehash.c | 2 +-
27 2 files changed, 2 insertions(+), 2 deletions(-)
28
29diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
30index fe30ce512819..cb51c21b58f9 100644
31--- a/drivers/tty/vt/Makefile
32+++ b/drivers/tty/vt/Makefile
33@@ -15,7 +15,7 @@ clean-files := consolemap_deftbl.c defkeymap.c
34 hostprogs += conmakehash
35
36 quiet_cmd_conmk = CONMK $@
37- cmd_conmk = $(obj)/conmakehash $< > $@
38+ cmd_conmk = $(obj)/conmakehash $< $(shell basename $<) > $@
39
40 $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
41 $(call cmd,conmk)
42diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c
43index cddd789fe46e..d62510b280e9 100644
44--- a/drivers/tty/vt/conmakehash.c
45+++ b/drivers/tty/vt/conmakehash.c
46@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
47 #include <linux/types.h>\n\
48 \n\
49 u8 dfont_unicount[%d] = \n\
50-{\n\t", argv[1], fontlen);
51+{\n\t", argv[2], fontlen);
52
53 for ( i = 0 ; i < fontlen ; i++ )
54 {
55--
562.25.1
diff --git a/meta-ti-bsp/recipes-kernel/linux/files/init_disassemble_info-signature-changes-causes-compile-failures.patch b/meta-ti-bsp/recipes-kernel/linux/files/init_disassemble_info-signature-changes-causes-compile-failures.patch
deleted file mode 100644
index e1e04c34..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/files/init_disassemble_info-signature-changes-causes-compile-failures.patch
+++ /dev/null
@@ -1,111 +0,0 @@
1
2Adaption of a patch [A] applied to meta-arm for the kernel. But since TI has it's own
3kernel we have to "adjust" the patch to match our files.
4
5[A] https://patchwork.yoctoproject.org/project/arm/patch/20220824025819.4888-1-jon.mason@arm.com/#5104
6
7Upstream-Status: Pending
8
9Signed-off-by: Ryan Eatmon <reatmon@ti.com>
10
11
12
13From 1b2013986271de39360cf79e62ed9b7d2cc59f9b Mon Sep 17 00:00:00 2001
14From: Andres Freund <andres@anarazel.de>
15Date: Wed, 22 Jun 2022 11:19:18 -0700
16Subject: [PATCH] init_disassemble_info() signature changes causes compile
17 failures
18MIME-Version: 1.0
19Content-Type: text/plain; charset=UTF-8
20Content-Transfer-Encoding: 8bit
21
22Hi,
23
24binutils changed the signature of init_disassemble_info(), which now causes
25perf and bpftool to fail to compile (e.g. on debian unstable).
26
27Relevant binutils commit: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=60a3da00bd5407f07d64dff82a4dae98230dfaac
28
29util/annotate.c: In function ?symbol__disassemble_bpf?:
30util/annotate.c:1765:9: error: too few arguments to function ?init_disassemble_info?
31 1765 | init_disassemble_info(&info, s,
32 | ^~~~~~~~~~~~~~~~~~~~~
33In file included from util/annotate.c:1718:
34/usr/include/dis-asm.h:472:13: note: declared here
35 472 | extern void init_disassemble_info (struct disassemble_info *dinfo, void *stream,
36 | ^~~~~~~~~~~~~~~~~~~~~
37
38with equivalent failures in
39
40tools/bpf/bpf_jit_disasm.c
41tools/bpf/bpftool/jit_disasm.c
42
43The fix is easy enough, add a wrapper around fprintf() that conforms to the
44new signature.
45
46However I assume the necessary feature test and wrapper should only be added
47once? I don't know the kernel stuff well enough to choose the right structure
48here.
49
50Attached is my local fix for perf. Obviously would need work to be a real
51solution.
52
53Greetings,
54
55Andres Freund
56---
57
58binutils 2.39 changed the signature of init_disassemble_info(),
59which now causes perf and bpftool to fail to compile.
60
61Relevant binutils commit: [1]
62
63There is a proper fix in development upstream[2].
64This is a work-around for older kernels.
65
66[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=60a3da00bd5407f07d64dff82a4dae98230dfaac
67[2] https://patchwork.kernel.org/project/netdevbpf/cover/20220801013834.156015-1-andres@anarazel.de/
68
69Upstream-Status: Pending
70Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>
71
72
73 tools/perf/util/annotate.c | 15 ++++++++++++++-
74 1 file changed, 14 insertions(+), 1 deletion(-)
75
76diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
77index 308189454788..6573d2b07548 100644
78--- a/tools/perf/util/annotate.c
79+++ b/tools/perf/util/annotate.c
80@@ -1685,6 +1685,18 @@
81 #include <bfd.h>
82 #include <dis-asm.h>
83
84+static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...)
85+{
86+ va_list args;
87+ int r;
88+
89+ va_start(args, fmt);
90+ r = vprintf(fmt, args);
91+ va_end(args);
92+
93+ return r;
94+}
95+
96 static int symbol__disassemble_bpf(struct symbol *sym,
97 struct annotate_args *args)
98 {
99@@ -1727,7 +1739,8 @@ static int symbol__disassemble_bpf(struct symbol *sym,
100 goto out;
101 }
102 init_disassemble_info(&info, s,
103- (fprintf_ftype) fprintf);
104+ (fprintf_ftype) fprintf,
105+ fprintf_styled);
106
107 info.arch = bfd_get_arch(bfdf);
108 info.mach = bfd_get_mach(bfdf);
109--
1102.17.1
111
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch
deleted file mode 100644
index a7806c22..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-blk-iocost-avoid-64-bit-division-in-ioc_timer_fn.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1From 5f2779dfa7b8cc7dfd4a1b6586d86e0d193266f3 Mon Sep 17 00:00:00 2001
2From: Arnd Bergmann <arnd@arndb.de>
3Date: Wed, 18 Jan 2023 09:07:01 +0100
4Subject: [PATCH] blk-iocost: avoid 64-bit division in ioc_timer_fn
5
6The behavior of 'enum' types has changed in gcc-13, so now the
7UNBUSY_THR_PCT constant is interpreted as a 64-bit number because
8it is defined as part of the same enum definition as some other
9constants that do not fit within a 32-bit integer. This in turn
10leads to some inefficient code on 32-bit architectures as well
11as a link error:
12
13arm-linux-gnueabi/bin/arm-linux-gnueabi-ld: block/blk-iocost.o: in function `ioc_timer_fn':
14blk-iocost.c:(.text+0x68e8): undefined reference to `__aeabi_uldivmod'
15arm-linux-gnueabi-ld: blk-iocost.c:(.text+0x6908): undefined reference to `__aeabi_uldivmod'
16
17Split the enum definition to keep the 64-bit timing constants in
18a separate enum type from those constants that can clearly fit
19within a smaller type.
20
21Signed-off-by: Arnd Bergmann <arnd@arndb.de>
22Acked-by: Tejun Heo <tj@kernel.org>
23Link: https://lore.kernel.org/r/20230118080706.3303186-1-arnd@kernel.org
24Signed-off-by: Jens Axboe <axboe@kernel.dk>
25---
26 block/blk-iocost.c | 8 +++++---
27 1 file changed, 5 insertions(+), 3 deletions(-)
28
29diff --git a/block/blk-iocost.c b/block/blk-iocost.c
30index 6955605629e4..b691b6bb498f 100644
31--- a/block/blk-iocost.c
32+++ b/block/blk-iocost.c
33@@ -258,6 +258,11 @@ enum {
34 VRATE_MIN = VTIME_PER_USEC * VRATE_MIN_PPM / MILLION,
35 VRATE_CLAMP_ADJ_PCT = 4,
36
37+ /* switch iff the conditions are met for longer than this */
38+ AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC,
39+};
40+
41+enum {
42 /* if IOs end up waiting for requests, issue less */
43 RQ_WAIT_BUSY_PCT = 5,
44
45@@ -296,9 +301,6 @@ enum {
46 /* don't let cmds which take a very long time pin lagging for too long */
47 MAX_LAGGING_PERIODS = 10,
48
49- /* switch iff the conditions are met for longer than this */
50- AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC,
51-
52 /*
53 * Count IO size in 4k pages. The 12bit shift helps keeping
54 * size-proportional components of cost calculation in closer
55--
562.40.1
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch
deleted file mode 100644
index f5d0f476..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-block-blk-iocost-gcc13-keep-large-values-in-a-new-en.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From ff1cc97b1f4c10db224f276d9615b22835b8c424 Mon Sep 17 00:00:00 2001
2From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
3Date: Tue, 13 Dec 2022 13:08:26 +0100
4Subject: [PATCH] block/blk-iocost (gcc13): keep large values in a new enum
5
6Since gcc13, each member of an enum has the same type as the enum [1]. And
7that is inherited from its members. Provided:
8 VTIME_PER_SEC_SHIFT = 37,
9 VTIME_PER_SEC = 1LLU << VTIME_PER_SEC_SHIFT,
10 ...
11 AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC,
12the named type is unsigned long.
13
14This generates warnings with gcc-13:
15 block/blk-iocost.c: In function 'ioc_weight_prfill':
16 block/blk-iocost.c:3037:37: error: format '%u' expects argument of type 'unsigned int', but argument 4 has type 'long unsigned int'
17
18 block/blk-iocost.c: In function 'ioc_weight_show':
19 block/blk-iocost.c:3047:34: error: format '%u' expects argument of type 'unsigned int', but argument 3 has type 'long unsigned int'
20
21So split the anonymous enum with large values to a separate enum, so
22that they don't affect other members.
23
24[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=36113
25
26Cc: Martin Liska <mliska@suse.cz>
27Cc: Tejun Heo <tj@kernel.org>
28Cc: Josef Bacik <josef@toxicpanda.com>
29Cc: Jens Axboe <axboe@kernel.dk>
30Cc: cgroups@vger.kernel.org
31Cc: linux-block@vger.kernel.org
32Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
33Link: https://lore.kernel.org/r/20221213120826.17446-1-jirislaby@kernel.org
34Signed-off-by: Jens Axboe <axboe@kernel.dk>
35---
36 block/blk-iocost.c | 2 ++
37 1 file changed, 2 insertions(+)
38
39diff --git a/block/blk-iocost.c b/block/blk-iocost.c
40index d1bdc12deaa7..549ddc9e0c6f 100644
41--- a/block/blk-iocost.c
42+++ b/block/blk-iocost.c
43@@ -232,7 +232,9 @@ enum {
44
45 /* 1/64k is granular enough and can easily be handled w/ u32 */
46 WEIGHT_ONE = 1 << 16,
47+};
48
49+enum {
50 /*
51 * As vtime is used to calculate the cost of each IO, it needs to
52 * be fairly high precision. For example, it should be able to
53--
542.40.1
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
deleted file mode 100644
index 144028e5..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
+++ /dev/null
@@ -1,35 +0,0 @@
1SECTION = "kernel"
2SUMMARY = "BeagleBoard.org Linux kernel"
3LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
5
6COMPATIBLE_MACHINE = "beagle.*"
7
8inherit kernel
9
10require recipes-kernel/linux/setup-defconfig.inc
11require recipes-kernel/linux/ti-kernel.inc
12
13# BB.org hasn't switched to "vendored" DTB layout by default yet
14KERNEL_DTBVENDORED = "0"
15
16DEPENDS += "gmp-native libmpc-native"
17
18KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
19
20S = "${WORKDIR}/git"
21
22# 6.1.69 version for 32-bit
23SRCREV:armv7a = "a1f26a19581970f76220c68c438981796ce5b767"
24PV:armv7a = "6.1.69+git"
25BRANCH:armv7a = "v6.1.69-ti-r22"
26
27# 6.1.69 version for 64-bit
28SRCREV:aarch64 = "bc76b5d278271f66a6faeb2d09cb09fc6c57dd3c"
29PV:aarch64 = "6.1.69+git"
30BRANCH:aarch64 = "v6.1.69-ti-arm64-r24"
31
32SRC_URI = " \
33 git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH} \
34 file://defconfig \
35"
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 5c495d46..388110ad 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
@@ -3,40 +3,31 @@ SUMMARY = "Mainline Linux kernel for TI devices"
3LICENSE = "GPL-2.0-only" 3LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
5 5
6inherit kernel 6inherit kernel_deprecated
7 7
8require recipes-kernel/linux/ti-kernel.inc 8require recipes-kernel/linux/ti-kernel.inc
9 9
10DEPENDS += "gmp-native libmpc-native" 10DEPENDS += "gmp-native libmpc-native"
11 11
12KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ 12KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
13 ${EXTRA_DTC_ARGS}"
14 13
15S = "${WORKDIR}/git" 14S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
16 15
17# 6.6 Mainline version 16# 6.12 Mainline version
18SRCREV = "ffc253263a1375a65fa6c9f62a893e9767fbebfa" 17SRCREV = "adc218676eef25575469234709c2d87185ca223a"
19PV = "6.6+git" 18PV = "6.12"
20
21# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
22MACHINE_KERNEL_PR:append = "b"
23PR = "${MACHINE_KERNEL_PR}"
24 19
25KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" 20KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
26KERNEL_GIT_PROTOCOL = "https" 21BRANCH = "master"
27KERNEL_GIT_BRANCH = "master" 22
28SRC_URI += " \ 23KERNEL_DEFCONFIG = ""
29 ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${KERNEL_GIT_BRANCH} \ 24
25KERNEL_REPRODUCIBILITY_PATCHES = " \
26 file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \
27 file://0001-perf-python-Fix-compile-for-32bit-platforms.patch \
30" 28"
31 29
32DEFCONFIG_NAME = "multi_v7_defconfig" 30DEFCONFIG_NAME = "multi_v7_defconfig"
33DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig" 31DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig"
34DEFCONFIG_NAME:k3 = "defconfig" 32DEFCONFIG_NAME:k3 = "defconfig"
35KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}" 33KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}"
36
37do_shared_workdir:prepend() {
38 cd ${B}
39 echo >> Module.symvers
40}
41
42FILES:${KERNEL_PACKAGE_NAME}-devicetree += "/${KERNEL_IMAGEDEST}/*.itb"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb
index f1a14ab1..1feb7564 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-next_git.bb
@@ -1,26 +1,13 @@
1SECTION = "kernel" 1require linux-ti-mainline_git.bb
2SUMMARY = "Linux-next kernel for TI devices"
3LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
5 2
6inherit kernel 3SUMMARY = "Linux-next kernel for TI devices"
7 4
8require recipes-kernel/linux/ti-kernel.inc
9include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''} 5include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
10 6
11DEPENDS += "gmp-native libmpc-native"
12
13KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
14
15S = "${WORKDIR}/git"
16
17# 6.6.0-rc3+ version 7# 6.6.0-rc3+ version
18SRCREV = "6465e260f48790807eef06b583b38ca9789b6072" 8SRCREV = "6465e260f48790807eef06b583b38ca9789b6072"
19PV = "6.6.0-rc3+git" 9PV = "6.6.0-rc3+git"
20 10
21SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master" 11KERNEL_GIT_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git"
22 12
23DEFCONFIG_NAME = "multi_v7_defconfig" 13KERNEL_REPRODUCIBILITY_PATCHES = ""
24DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig"
25DEFCONFIG_NAME:k3 = "defconfig"
26KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/defconfig
index 24b53cf7..24b53cf7 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/defconfig
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/k3/defconfig
index ef1d3efd..ef1d3efd 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/k3/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/k3/defconfig
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/omapl138/defconfig
index 099493af..099493af 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.1/omapl138/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/omapl138/defconfig
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti33x/defconfig
index 24b53cf7..24b53cf7 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti33x/defconfig
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti43x/defconfig
new file mode 100644
index 00000000..24b53cf7
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-6.12/ti43x/defconfig
@@ -0,0 +1,2 @@
1use-kernel-config=multi_v7_defconfig
2config-fragment=kernel/configs/ti_multi_v7_prune.config
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig
new file mode 100644
index 00000000..43089dc8
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/defconfig
@@ -0,0 +1,2 @@
1use-kernel-config=multi_v7_defconfig
2config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/k3/defconfig
new file mode 100644
index 00000000..47d78664
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/k3/defconfig
@@ -0,0 +1,2 @@
1use-kernel-config=defconfig
2config-fragment=kernel/configs/ti_arm64_prune.config kernel/configs/ti_rt.config
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/omapl138/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/omapl138/defconfig
index 099493af..3d890b6e 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/omapl138/defconfig
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/omapl138/defconfig
@@ -1 +1,2 @@
1use-kernel-config=davinci_all_defconfig 1use-kernel-config=davinci_all_defconfig
2config-fragment=
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti33x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti33x/defconfig
new file mode 100644
index 00000000..43089dc8
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti33x/defconfig
@@ -0,0 +1,2 @@
1use-kernel-config=multi_v7_defconfig
2config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti43x/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti43x/defconfig
new file mode 100644
index 00000000..43089dc8
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt-6.12/ti43x/defconfig
@@ -0,0 +1,2 @@
1use-kernel-config=multi_v7_defconfig
2config-fragment=kernel/configs/ti_multi_v7_prune.config kernel/configs/ti_rt.config
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb
index 45461419..9fe0eb02 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.1.bb
@@ -8,8 +8,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:"
8 8
9BRANCH = "ti-rt-linux-6.1.y" 9BRANCH = "ti-rt-linux-6.1.y"
10 10
11SRCREV = "01dbe4e64bacaa4c891c1997f2724c320698d61f" 11SRCREV = "9e8992fb839c642e3c20ee8ce69a30dbaae7f498"
12 12
13include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''} 13include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}
14 14
15PV = "6.1.82+git" 15PV = "6.1.119+git"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb
new file mode 100644
index 00000000..9e5c4ee4
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.12.bb
@@ -0,0 +1,9 @@
1require linux-ti-staging_6.12.bb
2
3KERNEL_LOCALVERSION:append = "-rt"
4
5# Look in the generic major.minor directory for files
6# This will have priority over generic non-rt path
7FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:"
8
9include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb
index e527e070..e817b530 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-rt_6.6.bb
@@ -1,7 +1,5 @@
1require linux-ti-staging_6.6.bb 1require linux-ti-staging_6.6.bb
2 2
3DEFAULT_PREFERENCE = "-1"
4
5KERNEL_LOCALVERSION:append = "-rt" 3KERNEL_LOCALVERSION:append = "-rt"
6 4
7# Look in the generic major.minor directory for files 5# Look in the generic major.minor directory for files
@@ -10,8 +8,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
10 8
11BRANCH = "ti-rt-linux-6.6.y" 9BRANCH = "ti-rt-linux-6.6.y"
12 10
13SRCREV = "82fd2ecb48b6bdb66081cb2f24b9bdfce218dea6" 11SRCREV = "c79d7ef3a56ff61dd83d5527520b419a4f0e32e2"
14 12
15include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''} 13include ${@ 'recipes-kernel/linux/ti-extras-rt.inc' if d.getVar('TI_EXTRAS') else ''}
16 14
17PV = "6.6.23+git" 15PV = "6.6.58+git"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/k3/defconfig b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/k3/defconfig
deleted file mode 100644
index ef1d3efd..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest-6.6/k3/defconfig
+++ /dev/null
@@ -1,2 +0,0 @@
1use-kernel-config=defconfig
2config-fragment=kernel/configs/ti_arm64_prune.config
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.1.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.1.bb
deleted file mode 100644
index 9c170e65..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.1.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require linux-ti-staging_6.1.bb
2
3# Look in the generic major.minor directory for files
4# This will have priority over generic non-rt path
5FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.6.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.6.bb
deleted file mode 100644
index 21090904..00000000
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging-systest_6.6.bb
+++ /dev/null
@@ -1,7 +0,0 @@
1require linux-ti-staging_6.6.bb
2
3DEFAULT_PREFERENCE = "-1"
4
5# Look in the generic major.minor directory for files
6# This will have priority over generic non-rt path
7FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
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 a58494df..97fa6463 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
@@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
5 5
6inherit ti-secdev 6inherit ti-secdev
7inherit kernel 7inherit kernel_deprecated
8 8
9require recipes-kernel/linux/setup-defconfig.inc 9require recipes-kernel/linux/setup-defconfig.inc
10require recipes-kernel/linux/ti-kernel.inc 10require recipes-kernel/linux/ti-kernel.inc
@@ -19,21 +19,12 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.1:"
19KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ 19KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
20 ${EXTRA_DTC_ARGS}" 20 ${EXTRA_DTC_ARGS}"
21 21
22S = "${WORKDIR}/git" 22S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
23 23
24BRANCH ?= "ti-linux-6.1.y" 24BRANCH ?= "ti-linux-6.1.y"
25 25
26SRCREV ?= "e44f83d2aa4366b3097307c5915d03696cf3e1b8" 26SRCREV ?= "e4e8b16e66f592749984b2d287e0479e93ef35b3"
27PV = "6.1.82+git" 27PV = "6.1.119+git"
28
29# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
30MACHINE_KERNEL_PR:append = "b"
31PR = "${MACHINE_KERNEL_PR}"
32
33KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
34KERNEL_GIT_PROTOCOL = "https"
35SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \
36 file://defconfig"
37 28
38# Special configuration for remoteproc/rpmsg IPC modules 29# Special configuration for remoteproc/rpmsg IPC modules
39module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample" 30module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
new file mode 100644
index 00000000..15ff3311
--- /dev/null
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.12.bb
@@ -0,0 +1,37 @@
1SECTION = "kernel"
2SUMMARY = "Linux kernel for TI devices"
3LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
5
6inherit ti-secdev
7inherit kernel_deprecated
8
9require recipes-kernel/linux/setup-defconfig.inc
10require recipes-kernel/linux/ti-kernel.inc
11include ${@ 'recipes-kernel/linux/ti-kernel-devicetree-prefix.inc' if d.getVar('KERNEL_DEVICETREE_PREFIX') else ''}
12include ${@ 'recipes-kernel/linux/ti-extras.inc' if d.getVar('TI_EXTRAS') else ''}
13
14DEPENDS += "gmp-native libmpc-native"
15
16# Look in the generic major.minor directory for files
17FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.12:"
18
19KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
20 ${EXTRA_DTC_ARGS}"
21
22S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
23
24BRANCH ?= "ti-linux-6.12.y"
25
26SRCREV ?= "34d0b070130a8cd2cddd9260389ad974e8cb8468"
27PV = "6.12.33+git"
28
29KERNEL_REPRODUCIBILITY_PATCHES = " \
30 file://0001-drivers-gpu-drm-msm-registers-improve-reproducibilit.patch \
31"
32
33# Special configuration for remoteproc/rpmsg IPC modules
34module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
35module_conf_ti_k3_r5_remoteproc = "softdep ti_k3_r5_remoteproc pre: virtio_rpmsg_bus"
36module_conf_ti_k3_dsp_remoteproc = "softdep ti_k3_dsp_remoteproc pre: virtio_rpmsg_bus"
37KERNEL_MODULE_PROBECONF += "rpmsg_client_sample ti_k3_r5_remoteproc ti_k3_dsp_remoteproc"
diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb
index 4871f3cf..4714bba1 100644
--- a/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb
+++ b/meta-ti-bsp/recipes-kernel/linux/linux-ti-staging_6.6.bb
@@ -4,9 +4,7 @@ LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" 4LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
5 5
6inherit ti-secdev 6inherit ti-secdev
7inherit kernel 7inherit kernel_deprecated
8
9DEFAULT_PREFERENCE = "-1"
10 8
11require recipes-kernel/linux/setup-defconfig.inc 9require recipes-kernel/linux/setup-defconfig.inc
12require recipes-kernel/linux/ti-kernel.inc 10require recipes-kernel/linux/ti-kernel.inc
@@ -21,21 +19,16 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:"
21KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \ 19KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
22 ${EXTRA_DTC_ARGS}" 20 ${EXTRA_DTC_ARGS}"
23 21
24S = "${WORKDIR}/git" 22S = "${UNPACKDIR}/${BB_GIT_DEFAULT_DESTSUFFIX}"
25 23
26BRANCH ?= "ti-linux-6.6.y" 24BRANCH ?= "ti-linux-6.6.y"
27 25
28SRCREV ?= "02bfb99615b1c26a06d0af269e97401251a25c40" 26SRCREV ?= "a7758da17c2807e5285d6546b6797aae1d34a7d6"
29PV = "6.6.23+git" 27PV = "6.6.58+git"
30
31# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
32MACHINE_KERNEL_PR:append = "b"
33PR = "${MACHINE_KERNEL_PR}"
34 28
35KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git" 29KERNEL_REPRODUCIBILITY_PATCHES = " \
36KERNEL_GIT_PROTOCOL = "https" 30 file://0001-vt-conmakehash-improve-reproducibility.patch \
37SRC_URI += "${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH} \ 31"
38 file://defconfig"
39 32
40# Special configuration for remoteproc/rpmsg IPC modules 33# Special configuration for remoteproc/rpmsg IPC modules
41module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample" 34module_conf_rpmsg_client_sample = "blacklist rpmsg_client_sample"
diff --git a/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc b/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc
index 8da90c79..213f6871 100644
--- a/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/setup-defconfig.inc
@@ -9,7 +9,7 @@ do_configure() {
9 # Always copy the defconfig file to .config to keep consistency 9 # Always copy the defconfig file to .config to keep consistency
10 # between the case where there is a real config and the in kernel 10 # between the case where there is a real config and the in kernel
11 # tree config 11 # tree config
12 cp ${WORKDIR}/defconfig ${B}/.config 12 cp ${UNPACKDIR}/defconfig ${B}/.config
13 13
14 scm_version=$(printf '%s%s' -g $(git -C ${S} rev-parse --verify HEAD 2>/dev/null | cut -c1-12)) 14 scm_version=$(printf '%s%s' -g $(git -C ${S} rev-parse --verify HEAD 2>/dev/null | cut -c1-12))
15 15
diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc b/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc
index 530a1783..dba9ef38 100644
--- a/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/ti-extras-rt.inc
@@ -2,10 +2,10 @@
2# Use different commit, repo and branch for TI extras build 2# Use different commit, repo and branch for TI extras build
3# This will have priority over generic rt path 3# This will have priority over generic rt path
4 4
5COMPATIBLE_MACHINE = "am62xx|am62pxx" 5COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
6 6
7BRANCH = "ti-rt-linux-6.1.y" 7BRANCH = "ti-linux-6.12.y"
8BRANCH:tie-jailhouse = "ti-rt-linux-6.1.y-jailhouse" 8BRANCH:tie-jailhouse = "ti-linux-6.12.y-jailhouse"
9 9
10SRCREV = "685e77152461bd6b791500f717bec62d17c1b36d" 10SRCREV = "c9e21a1ebd757f2b4487035382bbf65299cf8170"
11SRCREV:tie-jailhouse = "a74088b40b4d27478a2af5c20cdc0b4ec8ed9470" 11SRCREV:tie-jailhouse = "229a48602ad1557612a4ffabec6a3cbcdd745f87"
diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
index 0b22aca9..4b7a9f20 100644
--- a/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/ti-extras.inc
@@ -2,13 +2,13 @@
2# Use different commit, repo and branch for TI extras build 2# Use different commit, repo and branch for TI extras build
3# This will have priority over generic rt path 3# This will have priority over generic rt path
4 4
5COMPATIBLE_MACHINE = "am62xx|am62pxx" 5COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
6 6
7BRANCH = "ti-linux-6.1.y" 7BRANCH = "ti-linux-6.12.y"
8BRANCH:tie-jailhouse = "ti-linux-6.1.y-jailhouse" 8BRANCH:tie-jailhouse = "ti-linux-6.12.y-jailhouse"
9 9
10SRCREV = "ec058c3ddc5377c629e988a95ef84826b14a3307" 10SRCREV = "c9e21a1ebd757f2b4487035382bbf65299cf8170"
11SRCREV:tie-jailhouse = "d035e0cc72399f1c087a63c4210d29e79a7a66e4" 11SRCREV:tie-jailhouse = "229a48602ad1557612a4ffabec6a3cbcdd745f87"
12 12
13KERNEL_GIT_URI = "git://git.ti.com/git/processor-sdk/linux.git" 13KERNEL_GIT_URI = "git://git.ti.com/git/processor-sdk/linux.git"
14 14
diff --git a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
index dd5578f5..8c14446a 100644
--- a/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
+++ b/meta-ti-bsp/recipes-kernel/linux/ti-kernel.inc
@@ -12,3 +12,17 @@ EXTRA_DTC_ARGS += "${@get_extra_dtc_args(d)}"
12# the kernel. 12# the kernel.
13KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb" 13KERNEL_DTBDEST = "${KERNEL_IMAGEDEST}/dtb"
14KERNEL_DTBVENDORED = "1" 14KERNEL_DTBVENDORED = "1"
15
16KERNEL_GIT_URI ?= "git://git.ti.com/git/ti-linux-kernel/ti-linux-kernel.git"
17KERNEL_GIT_PROTOCOL ?= "https"
18KERNEL_GIT_BRANCH ?= "branch=${BRANCH}"
19
20KERNEL_DEFCONFIG ?= "file://defconfig"
21
22KERNEL_REPRODUCIBILITY_PATCHES ?= ""
23
24SRC_URI = " \
25 ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};${KERNEL_GIT_BRANCH} \
26 ${KERNEL_DEFCONFIG} \
27 ${KERNEL_REPRODUCIBILITY_PATCHES} \
28"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
index 16fbd6c5..a628e446 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-client-ti-version.inc
@@ -1,2 +1,6 @@
1PV = "4.1.0+git" 1PV = "4.4.0+git"
2SRCREV = "f7e4ced15d1fefd073bbfc484fe0e1f74afe96c2" 2SRCREV = "d221676a58b305bddbf97db00395205b3038de8e"
3
4SRC_URI:remove = " \
5 file://0001-tee-supplicant-add-udev-rule-and-systemd-service-fil.patch \
6"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc
index 23cd7580..8c21bc75 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-examples-ti-version.inc
@@ -1,2 +1,2 @@
1PV = "4.0.0+git" 1PV = "4.4.0+git"
2SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035" 2SRCREV = "378dc0db2d5dd279f58a3b6cb3f78ffd6b165035"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-4.0.0/0002ti-core-Define-section-attributes-for-clang.patch b/meta-ti-bsp/recipes-security/optee/optee-os-4.0.0/0002ti-core-Define-section-attributes-for-clang.patch
deleted file mode 100644
index 06a8ff60..00000000
--- a/meta-ti-bsp/recipes-security/optee/optee-os-4.0.0/0002ti-core-Define-section-attributes-for-clang.patch
+++ /dev/null
@@ -1,249 +0,0 @@
1
2This is a fixup of the patch in meta-arm. The file:
3 core/arch/arm/mm/pgt_cache.c
4was moved to:
5 core/mm/pgt_cache.c
6
7Ryan Eatmon <reatmon@ti.com>
8
9
10From 6f588813a170a671ebf1d6b51cebc7bc761295dc Mon Sep 17 00:00:00 2001
11From: Emekcan Aras <emekcan.aras@arm.com>
12Date: Wed, 21 Dec 2022 10:55:58 +0000
13Subject: [PATCH] core: Define section attributes for clang
14
15Clang's attribute section is not same as gcc, here we need to add flags
16to sections so they can be eventually collected by linker into final
17output segments. Only way to do so with clang is to use
18
19pragma clang section ...
20
21The behavious is described here [1], this allows us to define names bss
22sections. This was not an issue until clang-15 where LLD linker starts
23to detect the section flags before merging them and throws the following
24errors
25
26| ld.lld: error: section type mismatch for .nozi.kdata_page
27| >>> /mnt/b/yoe/master/build/tmp/work/qemuarm64-yoe-linux/optee-os-tadevkit/3.17.0-r0/build/core/arch/arm/kernel/thread.o:(.nozi.kdata_page): SHT_PROGBITS
28| >>> output section .nozi: SHT_NOBITS
29|
30| ld.lld: error: section type mismatch for .nozi.mmu.l2
31| >>> /mnt/b/yoe/master/build/tmp/work/qemuarm64-yoe-linux/optee-os-tadevkit/3.17.0-r0/build/core/arch/arm/mm/core_mmu_lpae.o:(.nozi.mmu.l2): SHT_PROGBITS
32| >>> output section .nozi: SHT_NOBITS
33
34These sections should be carrying SHT_NOBITS but so far it was not
35possible to do so, this patch tries to use clangs pragma to get this
36going and match the functionality with gcc.
37
38[1] https://intel.github.io/llvm-docs/clang/LanguageExtensions.html#specifying-section-names-for-global-objects-pragma-clang-section
39
40Upstream-Status: Pending
41Signed-off-by: Khem Raj <raj.khem@gmail.com>
42---
43 core/arch/arm/kernel/thread.c | 19 +++++++++++++++--
44 core/arch/arm/mm/core_mmu_lpae.c | 35 +++++++++++++++++++++++++++----
45 core/arch/arm/mm/core_mmu_v7.c | 36 +++++++++++++++++++++++++++++---
46 core/arch/arm/mm/pgt_cache.c | 12 ++++++++++-
47 core/kernel/thread.c | 13 +++++++++++-
48 5 files changed, 104 insertions(+), 11 deletions(-)
49
50diff --git a/core/arch/arm/kernel/thread.c b/core/arch/arm/kernel/thread.c
51index 4487ef026df9..f3624389611b 100644
52--- a/core/arch/arm/kernel/thread.c
53+++ b/core/arch/arm/kernel/thread.c
54@@ -44,15 +44,30 @@ static size_t thread_user_kcode_size __nex_bss;
55 #if defined(CFG_CORE_UNMAP_CORE_AT_EL0) && \
56 defined(CFG_CORE_WORKAROUND_SPECTRE_BP_SEC) && defined(ARM64)
57 long thread_user_kdata_sp_offset __nex_bss;
58+#ifdef __clang__
59+#ifndef CFG_VIRTUALIZATION
60+#pragma clang section bss=".nozi.kdata_page"
61+#else
62+#pragma clang section bss=".nex_nozi.kdata_page"
63+#endif
64+#endif
65 static uint8_t thread_user_kdata_page[
66 ROUNDUP(sizeof(struct thread_core_local) * CFG_TEE_CORE_NB_CORE,
67 SMALL_PAGE_SIZE)]
68 __aligned(SMALL_PAGE_SIZE)
69+#ifndef __clang__
70 #ifndef CFG_NS_VIRTUALIZATION
71- __section(".nozi.kdata_page");
72+ __section(".nozi.kdata_page")
73 #else
74- __section(".nex_nozi.kdata_page");
75+ __section(".nex_nozi.kdata_page")
76 #endif
77+#endif
78+ ;
79+#endif
80+
81+/* reset BSS section to default ( .bss ) */
82+#ifdef __clang__
83+#pragma clang section bss=""
84 #endif
85
86 #ifdef ARM32
87diff --git a/core/arch/arm/mm/core_mmu_lpae.c b/core/arch/arm/mm/core_mmu_lpae.c
88index 7e79f780ad28..ec4db9dc98c5 100644
89--- a/core/arch/arm/mm/core_mmu_lpae.c
90+++ b/core/arch/arm/mm/core_mmu_lpae.c
91@@ -233,19 +233,46 @@ typedef uint16_t l1_idx_t;
92 typedef uint64_t base_xlat_tbls_t[CFG_TEE_CORE_NB_CORE][NUM_BASE_LEVEL_ENTRIES];
93 typedef uint64_t xlat_tbl_t[XLAT_TABLE_ENTRIES];
94
95+#ifdef __clang__
96+#pragma clang section bss=".nozi.mmu.base_table"
97+#endif
98 static base_xlat_tbls_t base_xlation_table[NUM_BASE_TABLES]
99 __aligned(NUM_BASE_LEVEL_ENTRIES * XLAT_ENTRY_SIZE)
100- __section(".nozi.mmu.base_table");
101+#ifndef __clang__
102+ __section(".nozi.mmu.base_table")
103+#endif
104+;
105+#ifdef __clang__
106+#pragma clang section bss=""
107+#endif
108
109+#ifdef __clang__
110+#pragma clang section bss=".nozi.mmu.l2"
111+#endif
112 static xlat_tbl_t xlat_tables[MAX_XLAT_TABLES]
113- __aligned(XLAT_TABLE_SIZE) __section(".nozi.mmu.l2");
114+ __aligned(XLAT_TABLE_SIZE)
115+#ifndef __clang__
116+ __section(".nozi.mmu.l2")
117+#endif
118+;
119+#ifdef __clang__
120+#pragma clang section bss=""
121+#endif
122
123 #define XLAT_TABLES_SIZE (sizeof(xlat_tbl_t) * MAX_XLAT_TABLES)
124
125+#ifdef __clang__
126+#pragma clang section bss=".nozi.mmu.l2"
127+#endif
128 /* MMU L2 table for TAs, one for each thread */
129 static xlat_tbl_t xlat_tables_ul1[CFG_NUM_THREADS]
130- __aligned(XLAT_TABLE_SIZE) __section(".nozi.mmu.l2");
131-
132+#ifndef __clang__
133+ __aligned(XLAT_TABLE_SIZE) __section(".nozi.mmu.l2")
134+#endif
135+;
136+#ifdef __clang__
137+#pragma clang section bss=""
138+#endif
139 /*
140 * TAs page table entry inside a level 1 page table.
141 *
142diff --git a/core/arch/arm/mm/core_mmu_v7.c b/core/arch/arm/mm/core_mmu_v7.c
143index 61e703da89c8..1960c08ca688 100644
144--- a/core/arch/arm/mm/core_mmu_v7.c
145+++ b/core/arch/arm/mm/core_mmu_v7.c
146@@ -204,16 +204,46 @@ typedef uint32_t l1_xlat_tbl_t[NUM_L1_ENTRIES];
147 typedef uint32_t l2_xlat_tbl_t[NUM_L2_ENTRIES];
148 typedef uint32_t ul1_xlat_tbl_t[NUM_UL1_ENTRIES];
149
150+#ifdef __clang__
151+#pragma clang section bss=".nozi.mmu.l1"
152+#endif
153 static l1_xlat_tbl_t main_mmu_l1_ttb
154- __aligned(L1_ALIGNMENT) __section(".nozi.mmu.l1");
155+ __aligned(L1_ALIGNMENT)
156+#ifndef __clang__
157+ __section(".nozi.mmu.l1")
158+#endif
159+;
160+#ifdef __clang__
161+#pragma clang section bss=""
162+#endif
163
164 /* L2 MMU tables */
165+#ifdef __clang__
166+#pragma clang section bss=".nozi.mmu.l2"
167+#endif
168 static l2_xlat_tbl_t main_mmu_l2_ttb[MAX_XLAT_TABLES]
169- __aligned(L2_ALIGNMENT) __section(".nozi.mmu.l2");
170+ __aligned(L2_ALIGNMENT)
171+#ifndef __clang__
172+ __section(".nozi.mmu.l2")
173+#endif
174+;
175+#ifdef __clang__
176+#pragma clang section bss=""
177+#endif
178
179 /* MMU L1 table for TAs, one for each thread */
180+#ifdef __clang__
181+#pragma clang section bss=".nozi.mmu.ul1"
182+#endif
183 static ul1_xlat_tbl_t main_mmu_ul1_ttb[CFG_NUM_THREADS]
184- __aligned(UL1_ALIGNMENT) __section(".nozi.mmu.ul1");
185+ __aligned(UL1_ALIGNMENT)
186+#ifndef __clang__
187+ __section(".nozi.mmu.ul1")
188+#endif
189+;
190+#ifdef __clang__
191+#pragma clang section bss=""
192+#endif
193
194 struct mmu_partition {
195 l1_xlat_tbl_t *l1_table;
196diff --git a/core/mm/pgt_cache.c b/core/mm/pgt_cache.c
197index 79553c6d2183..b9efdf42780b 100644
198--- a/core/mm/pgt_cache.c
199+++ b/core/mm/pgt_cache.c
200@@ -410,8 +410,18 @@ void pgt_init(void)
201 * has a large alignment, while .bss has a small alignment. The current
202 * link script is optimized for small alignment in .bss
203 */
204+#ifdef __clang__
205+#pragma clang section bss=".nozi.mmu.l2"
206+#endif
207 static uint8_t pgt_tables[PGT_CACHE_SIZE][PGT_SIZE]
208- __aligned(PGT_SIZE) __section(".nozi.pgt_cache");
209+ __aligned(PGT_SIZE)
210+#ifndef __clang__
211+ __section(".nozi.pgt_cache")
212+#endif
213+ ;
214+#ifdef __clang__
215+#pragma clang section bss=""
216+#endif
217 size_t n;
218
219 for (n = 0; n < ARRAY_SIZE(pgt_tables); n++) {
220diff --git a/core/kernel/thread.c b/core/kernel/thread.c
221index 2a1f22dce635..5516b677141a 100644
222--- a/core/kernel/thread.c
223+++ b/core/kernel/thread.c
224@@ -39,13 +39,24 @@ static uint32_t end_canary_value = 0xababab00;
225 name[stack_num][sizeof(name[stack_num]) / sizeof(uint32_t) - 1]
226 #endif
227
228+#define DO_PRAGMA(x) _Pragma (#x)
229+
230+#ifdef __clang__
231+#define DECLARE_STACK(name, num_stacks, stack_size, linkage) \
232+DO_PRAGMA (clang section bss=".nozi_stack." #name) \
233+linkage uint32_t name[num_stacks] \
234+ [ROUNDUP(stack_size + STACK_CANARY_SIZE + STACK_CHECK_EXTRA, \
235+ STACK_ALIGNMENT) / sizeof(uint32_t)] \
236+ __attribute__((aligned(STACK_ALIGNMENT))); \
237+DO_PRAGMA(clang section bss="")
238+#else
239 #define DECLARE_STACK(name, num_stacks, stack_size, linkage) \
240 linkage uint32_t name[num_stacks] \
241 [ROUNDUP(stack_size + STACK_CANARY_SIZE + STACK_CHECK_EXTRA, \
242 STACK_ALIGNMENT) / sizeof(uint32_t)] \
243 __attribute__((section(".nozi_stack." # name), \
244 aligned(STACK_ALIGNMENT)))
245-
246+#endif
247 #define GET_STACK(stack) ((vaddr_t)(stack) + STACK_SIZE(stack))
248
249 DECLARE_STACK(stack_tmp, CFG_TEE_CORE_NB_CORE, STACK_TMP_SIZE,
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc
index 0ea30907..d1de4368 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-overrides.inc
@@ -3,12 +3,14 @@ inherit ti-secdev
3 3
4EXTRA_OEMAKE:remove = "CFG_MAP_EXT_DT_SECURE=y" 4EXTRA_OEMAKE:remove = "CFG_MAP_EXT_DT_SECURE=y"
5 5
6EXTRA_OEMAKE:append:k3 = "${@ ' CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}" 6EXTRA_OEMAKE:append:k3 = " ${@ 'CFG_CONSOLE_UART='+ d.getVar('OPTEE_K3_USART') if d.getVar('OPTEE_K3_USART') else ''}"
7 7
8EXTRA_OEMAKE:append:am62xx = " CFG_TEE_CORE_LOG_LEVEL=1" 8EXTRA_OEMAKE:append:am62xx = " CFG_TEE_CORE_LOG_LEVEL=1"
9EXTRA_OEMAKE:append:am62pxx = " CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1" 9EXTRA_OEMAKE:append:am62lxx = " CFG_TEE_CORE_LOG_LEVEL=1"
10EXTRA_OEMAKE:append:am62pxx = " CFG_TEE_CORE_LOG_LEVEL=1"
10EXTRA_OEMAKE:append:am62axx = " CFG_TEE_CORE_LOG_LEVEL=1" 11EXTRA_OEMAKE:append:am62axx = " CFG_TEE_CORE_LOG_LEVEL=1"
11EXTRA_OEMAKE:append:j722s = " CFG_WITH_SOFTWARE_PRNG=y CFG_TEE_CORE_LOG_LEVEL=1" 12EXTRA_OEMAKE:append:am62dxx = " CFG_TEE_CORE_LOG_LEVEL=1"
13EXTRA_OEMAKE:append:j722s = " CFG_TEE_CORE_LOG_LEVEL=1"
12 14
13do_compile:append:k3() { 15do_compile:append:k3() {
14 cp ${B}/core/tee-pager_v2.bin ${B}/bl32.bin 16 cp ${B}/core/tee-pager_v2.bin ${B}/bl32.bin
@@ -46,10 +48,6 @@ do_install:append() {
46 install -m 644 ${B}/*.optee ${D}${nonarch_base_libdir}/firmware/ || true 48 install -m 644 ${B}/*.optee ${D}${nonarch_base_libdir}/firmware/ || true
47 install -m 644 ${B}/bl32.bin ${D}${nonarch_base_libdir}/firmware/ || true 49 install -m 644 ${B}/bl32.bin ${D}${nonarch_base_libdir}/firmware/ || true
48 install -m 644 ${B}/bl32.elf ${D}${nonarch_base_libdir}/firmware/ || true 50 install -m 644 ${B}/bl32.elf ${D}${nonarch_base_libdir}/firmware/ || true
49
50 # Install embedded TAs
51 mkdir -p ${D}${nonarch_base_libdir}/optee_armtz/
52 install -D -p -m0444 ${B}/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz/
53} 51}
54 52
55optee_deploy_legacyhs() { 53optee_deploy_legacyhs() {
@@ -72,7 +70,8 @@ do_deploy:append:k3() {
72 ln -sf optee/bl32.elf ${DEPLOYDIR}/ 70 ln -sf optee/bl32.elf ${DEPLOYDIR}/
73} 71}
74 72
75FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/" 73# Make the OS depend on embedded TAs
74RDEPENDS:${PN} += "${PN}-ta"
76 75
77# This is needed for bl32.elf 76# This is needed for bl32.elf
78INSANE_SKIP:${PN}:append:k3 = " textrel" 77INSANE_SKIP:${PN}:append:k3 = " textrel"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc
index 9db67567..6b70c029 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-os-ti-version.inc
@@ -1,7 +1,9 @@
1PV = "4.1.0+git" 1PV = "4.5.0+git"
2SRCREV = "012cdca49db398693903e05c42a254a3a0c0d8f2" 2SRCREV = "ef1ebdc23034a804a72da2207f1a825ce96a1464"
3 3
4# Fixes for pointing to 4.0.0 before upstream meta-arm 4SRC_URI:remove = " \
5FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os-4.0.0:" 5 file://0001-mk-compile.mk-remove-absolute-build-time-paths.patch \
6SRC_URI:remove = "file://0002-core-Define-section-attributes-for-clang.patch" 6 file://0001-compile.mk-use-CFLAGS-from-environment.patch \
7SRC_URI:append = " file://0002ti-core-Define-section-attributes-for-clang.patch" 7 file://0002-link.mk-use-CFLAGS-with-version.o.patch \
8 file://0003-link.mk-generate-version.o-in-link-out-dir.patch \
9"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
index 16b2dfc3..e4b3a384 100644
--- a/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
+++ b/meta-ti-bsp/recipes-security/optee/optee-test-ti-version.inc
@@ -1,6 +1,5 @@
1PV = "4.1.0+git" 1FILESEXTRAPATHS:prepend := "${THISDIR}/optee-test:"
2SRCREV = "2e1e7a9c9d659585566a75fc8802f4758c42bcb2"
3
4# Fixes for pointing to 4.0.0 before upstream meta-arm
5SRC_URI:remove = "file://0001-xtest-regression_1000-remove-unneeded-stat.h-include.patch"
6 2
3PV = "4.4.0+git"
4SRCREV = "695231ef8987866663a9ed5afd8f77d1bae3dc08"
5SRC_URI += "file://0001-Suppress-new-gcc-15-Wunterminated-string-initializat.patch"
diff --git a/meta-ti-bsp/recipes-security/optee/optee-test/0001-Suppress-new-gcc-15-Wunterminated-string-initializat.patch b/meta-ti-bsp/recipes-security/optee/optee-test/0001-Suppress-new-gcc-15-Wunterminated-string-initializat.patch
new file mode 100644
index 00000000..018952f8
--- /dev/null
+++ b/meta-ti-bsp/recipes-security/optee/optee-test/0001-Suppress-new-gcc-15-Wunterminated-string-initializat.patch
@@ -0,0 +1,68 @@
1From a8e58203dcb4c13ee340259cd2692202ac8414d1 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@konsulko.com>
3Date: Tue, 6 May 2025 21:35:55 -0400
4Subject: [PATCH] Suppress new gcc-15 -Wunterminated-string-initialization
5
6GCC 15 now warns when character arrays are being initialized by strings
7and terminating NUL character doesn't fit. GCC 15.1 also allows marking
8such arrays with nonstring attribute to suppress the warning. W/o such
9attribute, the warning becomes error due to the global -Werror. Add the
10attribute accordingly.
11
12Fixes these errors:
13
14| ./regression_4000_data.h:7919:9: error: initializer-string for array of 'unsigned char' truncates NUL terminator but destination lacks 'nonstring' attribute (20 chars into 19 available) [-Werror=unterminated-string-initialization]
15| 7919 | "encryption standard";
16| | ^~~~~~~~~~~~~~~~~~~~~
17| ./regression_4000_data.h:8387:9: error: initializer-string for array of 'unsigned char' truncates NUL terminator but destination lacks 'nonstring' attribute (113 chars into 112 available) [-Werror=unterminated-string-initialization]
18| 8387 | "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomn"
19| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
20| ./regression_4000.c:1295:47: error: initializer-string for array of 'unsigned char' truncates NUL terminator but destination lacks 'nonstring' attribute (4 chars into 3 available) [-Werror=unterminated-string-initialization]
21| 1295 | static const uint8_t hash_data_sm3_a1_in[3] = "abc";
22| | ^~~~~
23
24Upstream-Status: Pending
25
26Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
27---
28 host/xtest/regression_4000.c | 2 +-
29 host/xtest/regression_4000_data.h | 4 ++--
30 2 files changed, 3 insertions(+), 3 deletions(-)
31
32diff --git a/host/xtest/regression_4000.c b/host/xtest/regression_4000.c
33index 3aa15be..46e6f8e 100644
34--- a/host/xtest/regression_4000.c
35+++ b/host/xtest/regression_4000.c
36@@ -1292,7 +1292,7 @@ static const uint8_t hash_data_shake256_out2[] = {
37 * https://tools.ietf.org/html/draft-sca-cfrg-sm3-02
38 * Appendix A.1
39 */
40-static const uint8_t hash_data_sm3_a1_in[3] = "abc";
41+static const uint8_t hash_data_sm3_a1_in[3] __attribute__((nonstring)) = "abc";
42
43 static const uint8_t hash_data_sm3_a1_out[] = {
44 0x66, 0xc7, 0xf0, 0xf4, 0x62, 0xee, 0xed, 0xd9,
45diff --git a/host/xtest/regression_4000_data.h b/host/xtest/regression_4000_data.h
46index 0881ac3..eb101b2 100644
47--- a/host/xtest/regression_4000_data.h
48+++ b/host/xtest/regression_4000_data.h
49@@ -7914,7 +7914,7 @@ static struct derive_key_ecdh_t {
50 };
51
52 /* G/MT 0003 (SM2) Part 5 Annex C.2 - encryption/decryption */
53-static const uint8_t gmt_0003_part5_c2_sm2_testvector_ptx[19] =
54+static const uint8_t gmt_0003_part5_c2_sm2_testvector_ptx[19] __attribute__((nonstring)) =
55 /* M */
56 "encryption standard";
57 static const uint8_t gmt_0003_part5_c2_sm2_testvector_private[] = {
58@@ -8383,7 +8383,7 @@ static const uint8_t mac_data_sha3_512_out1[] = {
59 * GM/T 0042-2015
60 * Section D.3 Test vector 1
61 */
62-static const uint8_t mac_data_sm3_d31_in[112] =
63+static const uint8_t mac_data_sm3_d31_in[112] __attribute__((nonstring)) =
64 "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomn"
65 "opnopqabcdbcdecdefdefgefghfghighijhijkijkljklmklmn"
66 "lmnomnopnopq";
67--
682.25.1
diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc b/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc
index ec1e71be..da7e4733 100644
--- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc-common.inc
@@ -3,7 +3,7 @@ INC_PR = "r0"
3 3
4PACKAGE_ARCH = "${MACHINE_ARCH}" 4PACKAGE_ARCH = "${MACHINE_ARCH}"
5COMPATIBLE_HOST ?= "null" 5COMPATIBLE_HOST ?= "null"
6COMPATIBLE_HOST:ti-soc = "(.*)" 6COMPATIBLE_HOST:ti-soc = ".*-linux"
7 7
8PLATFORM = "UNKNOWN" 8PLATFORM = "UNKNOWN"
9PLATFORM:dra7xx = "DRA7XX" 9PLATFORM:dra7xx = "DRA7XX"
diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc b/meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc
index 44be2466..375de8bf 100644
--- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc.inc
@@ -1,5 +1,6 @@
1SUMMARY = "TI Inter Process Communication (IPC) Mechanisms"
1DESCRIPTION = "TI Inter Process Communication (IPC) Mechanisms (for Uni- and Multi- Processor Configurations)" 2DESCRIPTION = "TI Inter Process Communication (IPC) Mechanisms (for Uni- and Multi- Processor Configurations)"
2HOMEPAGE="http://processors.wiki.ti.com/index.php/Category:IPC" 3HOMEPAGE = "http://processors.wiki.ti.com/index.php/Category:IPC"
3 4
4LICENSE = "BSD-3-Clause" 5LICENSE = "BSD-3-Clause"
5LIC_FILES_CHKSUM = "file://${S}/ipc-linux.mak;beginline=1;endline=30;md5=7b327f9b710fd7c95e545b91cec79255" 6LIC_FILES_CHKSUM = "file://${S}/ipc-linux.mak;beginline=1;endline=30;md5=7b327f9b710fd7c95e545b91cec79255"
@@ -16,5 +17,3 @@ SRC_URI = "${TI_IPC_GIT_URI};protocol=${TI_IPC_GIT_PROTOCOL};branch=${BRANCH};na
16SRCREV = "${TI_IPC_SRCREV}" 17SRCREV = "${TI_IPC_SRCREV}"
17 18
18CFLAGS += "-fcommon" 19CFLAGS += "-fcommon"
19
20S = "${WORKDIR}/git"
diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb
index e2db6efd..539a83f9 100644
--- a/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-ipc_git.bb
@@ -1,5 +1,6 @@
1SUMMARY = "TI Inter Process Communication (IPC) Mechanisms"
1DESCRIPTION = "TI Inter Process Communication (IPC) Mechanisms (for Uni- and Multi- Processor Configurations)" 2DESCRIPTION = "TI Inter Process Communication (IPC) Mechanisms (for Uni- and Multi- Processor Configurations)"
2HOMEPAGE="http://processors.wiki.ti.com/index.php/Category:IPC" 3HOMEPAGE = "http://processors.wiki.ti.com/index.php/Category:IPC"
3 4
4require ti-ipc.inc 5require ti-ipc.inc
5require ti-ipc-common.inc 6require ti-ipc-common.inc
@@ -18,7 +19,7 @@ SRC_URI += "file://tiipclad-daemon.sh \
18 file://0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch \ 19 file://0001-MmRpc-Stop-looking-for-rpmsg_rpc.h-in-the-kernel.patch \
19 " 20 "
20 21
21CFLAGS += "-I${WORKDIR}" 22CFLAGS += "-I${UNPACKDIR} -fdebug-prefix-map=${UNPACKDIR}=${TARGET_DBGSRC_DIR}"
22 23
23DAEMON = "UNKNOWN" 24DAEMON = "UNKNOWN"
24DAEMON:dra7xx = "lad_dra7xx" 25DAEMON:dra7xx = "lad_dra7xx"
@@ -45,18 +46,18 @@ do_install:append() {
45 46
46 # Modify the startup scripts to point to the right 47 # Modify the startup scripts to point to the right
47 # lad daemon executable. 48 # lad daemon executable.
48 sed -i -e "s/__LAD_DAEMON__/${DAEMON}/" ${WORKDIR}/tiipclad-daemon.sh 49 sed -i -e "s/__LAD_DAEMON__/${DAEMON}/" ${UNPACKDIR}/tiipclad-daemon.sh
49 sed -i -e "s/__LAD_DAEMON__/${DAEMON}/" ${WORKDIR}/tiipclad-daemon.service 50 sed -i -e "s/__LAD_DAEMON__/${DAEMON}/" ${UNPACKDIR}/tiipclad-daemon.service
50 51
51 install -d ${D}${systemd_system_unitdir} 52 install -d ${D}${systemd_system_unitdir}
52 install -m 0644 ${WORKDIR}/tiipclad-daemon.service ${D}${systemd_system_unitdir} 53 install -m 0644 ${UNPACKDIR}/tiipclad-daemon.service ${D}${systemd_system_unitdir}
53 install -d ${D}${sysconfdir}/init.d/ 54 install -d ${D}${sysconfdir}/init.d/
54 install -c -m 755 ${WORKDIR}/tiipclad-daemon.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME} 55 install -c -m 755 ${UNPACKDIR}/tiipclad-daemon.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
55} 56}
56 57
57do_install:append:dra7xx() { 58do_install:append:dra7xx() {
58 install -d ${D}${sysconfdir}/modprobe.d/ 59 install -d ${D}${sysconfdir}/modprobe.d/
59 install -c -m 644 ${WORKDIR}/omap_remoteproc.conf ${D}${sysconfdir}/modprobe.d/ 60 install -c -m 644 ${UNPACKDIR}/omap_remoteproc.conf ${D}${sysconfdir}/modprobe.d/
60} 61}
61 62
62PACKAGES =+ "${PN}-test" 63PACKAGES =+ "${PN}-test"
diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-librpmsg-dma_1.0.bb b/meta-ti-bsp/recipes-ti/ipc/ti-librpmsg-dma_1.0.bb
new file mode 100644
index 00000000..8a78d9ac
--- /dev/null
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-librpmsg-dma_1.0.bb
@@ -0,0 +1,12 @@
1SUMMARY = "RPMsg DMA shared library"
2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://LICENSE;md5=744e63d2bb8c6151dcdd97f49aa02c53"
4
5SRC_URI = "git://github.com/TexasInstruments/rpmsg-dma.git;protocol=https;branch=main"
6SRCREV = "609fd72f458ba56f80d06810509ef88d010d2c03"
7
8inherit cmake
9
10DEPENDS = "ti-rpmsg-char"
11
12EXTRA_OECMAKE += "-DBUILD_LIB=ON -DBUILD_EXAMPLE=OFF"
diff --git a/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc b/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc
index 4710be09..0350152d 100644
--- a/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc
+++ b/meta-ti-bsp/recipes-ti/ipc/ti-rpmsg-char.inc
@@ -7,12 +7,9 @@ PROTOCOL = "https"
7BRANCH = "master" 7BRANCH = "master"
8SRC_URI = "git://git.ti.com/git/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};" 8SRC_URI = "git://git.ti.com/git/rpmsg/ti-rpmsg-char.git;protocol=${PROTOCOL};branch=${BRANCH};"
9 9
10# 0.6.6 release 10# 0.6.9 release
11SRCREV = "55a6f4032246631a309f8608af5e822024664b59" 11SRCREV = "09b064c6663ed46e4a402291dd87c8fe96135bd7"
12 12
13PV = "0.6.6+git" 13PV = "0.6.9+git"
14 14
15S = "${WORKDIR}/git" 15COMPATIBLE_MACHINE = "^(k3)$"
16
17COMPATIBLE_HOST ?= "null"
18COMPATIBLE_HOST:ti-soc = "(.*)"
diff --git a/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb b/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb
index e3267a23..bf8e0d00 100644
--- a/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb
+++ b/meta-ti-bsp/recipes-ti/secdev/ti-k3-secdev_git.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Security development tools for High-Security(HS) TI K3 processors." 1SUMMARY = "Security development tools for High-Security(HS) TI K3 processors."
2HOMEPAGE = "https://git.ti.com/cgit/security-development-tools/core-secdev-k3" 2HOMEPAGE = "https://git.ti.com/cgit/security-development-tools/core-secdev-k3"
3SECTION = "devel" 3SECTION = "devel"
4LICENSE = "BSD-3-Clause" 4LICENSE = "BSD-3-Clause"
@@ -20,8 +20,6 @@ GIT_SRCREV = "ed6951fd3877c6cac7f1237311f7278ac21634f3"
20SRC_URI = "${GIT_URI};protocol=${GIT_PROTOCOL};branch=${GIT_BRANCH}" 20SRC_URI = "${GIT_URI};protocol=${GIT_PROTOCOL};branch=${GIT_BRANCH}"
21SRCREV = "${GIT_SRCREV}" 21SRCREV = "${GIT_SRCREV}"
22 22
23S = "${WORKDIR}/git"
24
25do_install() { 23do_install() {
26 CP_ARGS="-Prf --preserve=mode,links,timestamps --no-preserve=ownership" 24 CP_ARGS="-Prf --preserve=mode,links,timestamps --no-preserve=ownership"
27 install -d ${D}${TI_K3_SECDEV_INSTALL_DIR_RECIPE} 25 install -d ${D}${TI_K3_SECDEV_INSTALL_DIR_RECIPE}
diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/files/empty b/meta-ti-bsp/recipes-ti/ti-rtos-bin/files/empty
deleted file mode 100644
index c6cac692..00000000
--- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/files/empty
+++ /dev/null
@@ -1 +0,0 @@
1empty
diff --git a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb b/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb
deleted file mode 100644
index feee1cf9..00000000
--- a/meta-ti-bsp/recipes-ti/ti-rtos-bin/ti-rtos-metadata.bb
+++ /dev/null
@@ -1,47 +0,0 @@
1LICENSE = "BSD-3-Clause"
2LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9"
3
4COMPATIBLE_MACHINE = "j721e|j7200|am65xx|am64xx"
5
6PACKAGE_ARCH = "${MACHINE_ARCH}"
7
8INHIBIT_DEFAULT_DEPS = "1"
9
10inherit nopackages deploy
11
12PLAT_SFX = ""
13PLAT_SFX:j721e = "/j721e"
14PLAT_SFX:j7200 = "/j7200"
15PLAT_SFX:am65xx = "/am65xx"
16PLAT_SFX:am64xx = "/am64x"
17
18# Use weak assignment to set defaults to TI_RTOS_METADATA_* variables
19TI_RTOS_METADATA_URI ?= "git://git.ti.com/git/processor-sdk/coresdk_rtos_releases.git"
20TI_RTOS_METADATA_PROTOCOL ?= "https"
21TI_RTOS_METADATA_SRCREV ?= "2ecbf45af64bc47806623cc5bf7ab493489acaf9"
22TI_RTOS_METADATA_BRANCH ?= "master"
23TI_RTOS_METADATA_DIR ?= "${PLAT_SFX}"
24TI_RTOS_METADATA_FILE ?= "${S}${TI_RTOS_METADATA_DIR}/metadata.inc"
25TI_RTOS_METADATA_FILE:am64xx ?= "${S}${TI_RTOS_METADATA_DIR}/mcusdk_metadata.inc"
26
27PV = "1.0.0+git"
28
29S = "${WORKDIR}/git"
30
31SRC_URI = "${TI_RTOS_METADATA_URI};branch=${TI_RTOS_METADATA_BRANCH};protocol=${TI_RTOS_METADATA_PROTOCOL}"
32SRCREV = "${TI_RTOS_METADATA_SRCREV}"
33
34do_configure[noexec] = "1"
35do_compile[noexec] = "1"
36do_install[noexec] = "1"
37
38do_deploy () {
39 :
40}
41
42do_deploy:k3 () {
43 install -d ${DEPLOYDIR}
44 install -m 0644 ${TI_RTOS_METADATA_FILE} ${DEPLOYDIR}/
45}
46
47addtask deploy before do_build after do_compile
diff --git a/meta-ti-extras/SECURITY b/meta-ti-extras/SECURITY
new file mode 100644
index 00000000..367adc34
--- /dev/null
+++ b/meta-ti-extras/SECURITY
@@ -0,0 +1,20 @@
1How to Report a Potential Vulnerability?
2========================================
3
4If you would like to report a public issue (for example, one with a released
5CVE number), please report it to the mailing list:
6
7 https://lists.yoctoproject.org/g/meta-ti
8
9If you are dealing with a not-yet released or urgent issue, please send a
10message to one of the maintainers listed in the README. Include as many
11details as possible:
12 - the layer or software module affected
13 - the recipe and its version
14 - any example code, if available
15
16Branches maintained with security fixes
17---------------------------------------
18
19See https://wiki.yoctoproject.org/wiki/Releases for the list of current
20releases. We only accept patches for the LTS releases and the master branch.
diff --git a/meta-ti-extras/conf/layer.conf b/meta-ti-extras/conf/layer.conf
index f2d6b250..d340c414 100644
--- a/meta-ti-extras/conf/layer.conf
+++ b/meta-ti-extras/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "meta-ti-extras"
9BBFILE_PATTERN_meta-ti-extras := "^${LAYERDIR}/" 9BBFILE_PATTERN_meta-ti-extras := "^${LAYERDIR}/"
10BBFILE_PRIORITY_meta-ti-extras = "6" 10BBFILE_PRIORITY_meta-ti-extras = "6"
11 11
12LAYERSERIES_COMPAT_meta-ti-extras = "nanbield scarthgap styhead" 12LAYERSERIES_COMPAT_meta-ti-extras = "walnascar whinlatter"
13 13
14LICENSE_PATH += "${LAYERDIR}/licenses" 14LICENSE_PATH += "${LAYERDIR}/licenses"
15 15
diff --git a/meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb b/meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb
index 9a5a6ffa..0d856362 100644
--- a/meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb
+++ b/meta-ti-extras/recipes-bsp/bt-fw/bt-fw_git.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Firmware files for Bluetooth" 1SUMMARY = "Firmware files for Bluetooth"
2LICENSE = "TI-TSPA" 2LICENSE = "TI-TSPA"
3LIC_FILES_CHKSUM = "file://LICENSE;md5=f39eac9f4573be5b012e8313831e72a9" 3LIC_FILES_CHKSUM = "file://LICENSE;md5=f39eac9f4573be5b012e8313831e72a9"
4 4
@@ -10,8 +10,6 @@ SRCREV = "0ee619b598d023fffc77679f099bc2a4815510e4"
10BRANCH = "master" 10BRANCH = "master"
11SRC_URI = "git://git.ti.com/git/ti-bt/service-packs.git;protocol=https;branch=${BRANCH}" 11SRC_URI = "git://git.ti.com/git/ti-bt/service-packs.git;protocol=https;branch=${BRANCH}"
12 12
13S = "${WORKDIR}/git"
14
15do_compile() { 13do_compile() {
16 : 14 :
17} 15}
diff --git a/meta-ti-extras/recipes-bsp/cc33xx-fw/cc33xx-fw_git.bb b/meta-ti-extras/recipes-bsp/cc33xx-fw/cc33xx-fw_git.bb
new file mode 100644
index 00000000..d5597ab9
--- /dev/null
+++ b/meta-ti-extras/recipes-bsp/cc33xx-fw/cc33xx-fw_git.bb
@@ -0,0 +1,20 @@
1SUMMARY = "Firmware files for use with TI cc33xx"
2LICENSE = "TI-TSPA"
3LIC_FILES_CHKSUM = "file://LICENCE;md5=df68504cbd0a4da1643ebcfd5783dbc9"
4
5SRCREV = "988ded3a7d4d0e46de62e9ebfcb685c502bd9edf"
6SRC_URI = "git://git.ti.com/git/cc33xx-wlan/cc33xx-fw.git;protocol=https;branch=master"
7
8PV = "1.7.0.120"
9
10CLEANBROKEN = "1"
11
12do_compile[no_exec] = "1"
13
14EXTRA_OEMAKE = "DEST_DIR=${D} BASE_LIB_DIR=${nonarch_base_libdir}"
15
16do_install() {
17 oe_runmake install
18}
19
20FILES:${PN} = "${nonarch_base_libdir}/firmware/ti-connectivity/*"
diff --git a/meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb b/meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb
deleted file mode 100644
index 491ee0f3..00000000
--- a/meta-ti-extras/recipes-bsp/dspdce-fw/dspdce-fw_git.bb
+++ /dev/null
@@ -1,65 +0,0 @@
1SUMMARY = "Firmware for DSP for an example application called copycodectest"
2LICENSE = "TI-TSPA"
3LIC_FILES_CHKSUM = "file://src/ti/framework/dce/dce.c;startline=1;endline=31;md5=2c6e9aba6ed75f22b1a2b7544b1c809d"
4
5COMPATIBLE_MACHINE = "dra7xx"
6
7inherit features_check
8
9REQUIRED_MACHINE_FEATURES = "dsp"
10
11SRC_URI = "git://git.ti.com/git/glsdk/dspdce.git;protocol=https;branch=master"
12
13SRCREV = "de6e599f067b25c46cc0c8f74a22cc3b8aafbae8"
14
15PV = "1.00.00.07"
16
17S = "${WORKDIR}/git"
18
19require recipes-ti/includes/ti-paths.inc
20
21PR = "r4"
22inherit update-alternatives
23
24DEPENDS = "ti-xdctools-native ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-ipc-rtos ti-osal ti-cgt6x-native"
25
26export HWVERSION = "ES10"
27export BIOSTOOLSROOT = "${STAGING_DIR_TARGET}/usr/share/ti"
28
29export XDCVERSION = "ti-xdctools-tree"
30export BIOSVERSION = "ti-sysbios-tree"
31export IPCVERSION = "ti-ipc-tree"
32export CEVERSION = "ti-codec-engine-tree"
33export FCVERSION = "ti-framework-components-tree"
34export XDAISVERSION = "ti-xdais-tree"
35export OSALVERSION = "ti-osal-tree"
36
37export IPCSRC = "${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree"
38export C66XCGTOOLSPATH = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
39
40do_configure() {
41 cd ${S}
42 make unconfig
43 make vayu_config
44}
45
46do_compile() {
47 cd ${S}
48 make dspbin
49}
50
51TARGET = "dra7-dsp1-fw.xe66"
52
53do_install() {
54 install -d ${D}${nonarch_base_libdir}/firmware
55 install -m 0644 ${S}/dra7xx-c66x-dsp.xe66 ${D}${nonarch_base_libdir}/firmware/${TARGET}.${BPN}
56}
57
58ALTERNATIVE:${PN} = "dra7-dsp1-fw.xe66"
59ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${nonarch_base_libdir}/firmware/${TARGET}"
60ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${nonarch_base_libdir}/firmware/${TARGET}.${BPN}"
61ALTERNATIVE_PRIORITY = "10"
62
63INSANE_SKIP:${PN} = "arch"
64
65FILES:${PN} += "${nonarch_base_libdir}/firmware/*"
diff --git a/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb b/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
index 9d85829b..d8e759d9 100644
--- a/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
@@ -1,13 +1,10 @@
1DESCRIPTION = "Debug Sub-System (DebugSS) driver for Keystone and DRA7xx devices" 1SUMMARY = "Debug Sub-System (DebugSS) driver for Keystone and DRA7xx devices"
2LICENSE = "GPL-2.0-only" 2LICENSE = "GPL-2.0-only"
3LIC_FILES_CHKSUM = "file://COPYING.txt;md5=9d4316fe434ba450dca4da25348ca5a3" 3LIC_FILES_CHKSUM = "file://COPYING.txt;md5=9d4316fe434ba450dca4da25348ca5a3"
4 4
5# This package builds a kernel module, use kernel PR as base and append a local
6MACHINE_KERNEL_PR:append = "d"
7PR = "${MACHINE_KERNEL_PR}"
8PV:append = "+git" 5PV:append = "+git"
9 6
10S = "${WORKDIR}/git/debugss_module/debugss-mod" 7S:append = "/debugss_module/debugss-mod"
11 8
12inherit module 9inherit module
13 10
@@ -20,3 +17,8 @@ COMPATIBLE_MACHINE = "dra7xx"
20PACKAGE_ARCH = "${MACHINE_ARCH}" 17PACKAGE_ARCH = "${MACHINE_ARCH}"
21 18
22include dsptop.inc 19include dsptop.inc
20
21SRC_URI += "\
22 file://0001-debugss_kmodule-Add-include-for-mod_devicetable.h.patch \
23 file://0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch \
24"
diff --git a/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb b/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
index 90ce8943..5e8c56b8 100644
--- a/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/dsptop_git.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "TI dsptop utility." 1SUMMARY = "TI dsptop utility."
2LICENSE = "BSD-3-Clause" 2LICENSE = "BSD-3-Clause"
3LIC_FILES_CHKSUM = "file://debian/copyright;md5=309825aa8f5edfcf2c44912ac094b979" 3LIC_FILES_CHKSUM = "file://debian/copyright;md5=309825aa8f5edfcf2c44912ac094b979"
4 4
@@ -6,7 +6,7 @@ DEPENDS = "libulm ncurses"
6 6
7PR = "${INC_PR}.2" 7PR = "${INC_PR}.2"
8 8
9S = "${WORKDIR}/git/dsptop" 9S:append = "/dsptop"
10 10
11DEVICE = "" 11DEVICE = ""
12DEVICE:dra7xx = "DRA7xx" 12DEVICE:dra7xx = "DRA7xx"
diff --git a/meta-ti-extras/recipes-bsp/dsptop/files/0001-debugss_kmodule-Add-include-for-mod_devicetable.h.patch b/meta-ti-extras/recipes-bsp/dsptop/files/0001-debugss_kmodule-Add-include-for-mod_devicetable.h.patch
new file mode 100644
index 00000000..19c6791e
--- /dev/null
+++ b/meta-ti-extras/recipes-bsp/dsptop/files/0001-debugss_kmodule-Add-include-for-mod_devicetable.h.patch
@@ -0,0 +1,32 @@
1From 5a514f6a6bb1c49bdbaf8eabc1776f54851227af Mon Sep 17 00:00:00 2001
2From: Ryan Eatmon <reatmon@ti.com>
3Date: Sun, 4 Aug 2024 11:17:28 -0500
4Subject: [PATCH] debugss_kmodule: Add include for mod_devicetable.h
5
6Add include for <linux/mod_devicetable.h> to fix compile error:
7
8git/debugss_module/debugss-mod/debugss_kmodule.c:1149:34: error:
9array type has incomplete element type 'struct of_device_id'
10
11Upstream-Status: Inactive-Upstream
12
13Signed-off-by: Ryan Eatmon <reatmon@ti.com>
14---
15 debugss_kmodule.c | 2 ++
16 1 file changed, 2 insertions(+)
17
18diff --git a/debugss_kmodule.c b/debugss_kmodule.c
19index 6fac61d..9e084eb 100644
20--- a/debugss_kmodule.c
21+++ b/debugss_kmodule.c
22@@ -26,6 +26,8 @@
23 #include <linux/of_device.h>
24 #include "debugss_kmodule.h"
25
26+#include <linux/mod_devicetable.h>
27+
28 /* un-comment the line below to enable printing for kernel debug messages */
29 //#define DEBUGSS_DRV_DEBUG
30
31--
322.17.1
diff --git a/meta-ti-extras/recipes-bsp/dsptop/files/0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch b/meta-ti-extras/recipes-bsp/dsptop/files/0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch
new file mode 100644
index 00000000..0afe0264
--- /dev/null
+++ b/meta-ti-extras/recipes-bsp/dsptop/files/0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch
@@ -0,0 +1,57 @@
1From aaddf1fa8b92db23ae2ebc83826c2bb5f5c87c35 Mon Sep 17 00:00:00 2001
2From: Ryan Eatmon <reatmon@ti.com>
3Date: Thu, 3 Oct 2024 14:25:18 -0500
4Subject: [PATCH] debugss_kmodule: kernel 6.11 changed return value for remove
5 slot
6
7In kernel version 6.11 the function footprint changed for the remove
8slot to return a void instead of an int. [1]
9
10Add ifdef checking code to look for kernel version and pick the correct
11return code.
12
13[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/include/linux/platform_device.h?id=0edb555a65d1ef047a9805051c36922b52a38a9d
14
15Upstream-Status: Inactive-Upstream [lastcommit: 2021-04-20]
16
17Signed-off-by: Ryan Eatmon <reatmon@ti.com>
18---
19 debugss_kmodule.c | 4 ++++
20 1 file changed, 4 insertions(+)
21
22diff --git a/debugss_kmodule.c b/debugss_kmodule.c
23index 9e084eb..4191be8 100644
24--- a/debugss_kmodule.c
25+++ b/debugss_kmodule.c
26@@ -27,6 +27,7 @@
27 #include "debugss_kmodule.h"
28
29 #include <linux/mod_devicetable.h>
30+#include <linux/version.h>
31
32 /* un-comment the line below to enable printing for kernel debug messages */
33 //#define DEBUGSS_DRV_DEBUG
34@@ -1132,7 +1133,11 @@ static int dra7xx_debugss_probe(struct platform_device *pdev)
35 return retval;
36 }
37
38+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0))
39 static int dra7xx_debugss_remove(struct platform_device *pdev)
40+#else
41+static void dra7xx_debugss_remove(struct platform_device *pdev)
42+#endif
43 {
44 __D("%s:\n",__FUNCTION__);
45
46@@ -1145,7 +1150,9 @@ static int dra7xx_debugss_remove(struct platform_device *pdev)
47 /* Un-prepare debugSS clock */
48 clk_disable_unprepare(sys_clk_in1);
49
50+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0))
51 return 0;
52+#endif
53 }
54
55 static const struct of_device_id dra7xx_debugss_of_match[] = {
56--
572.17.1
diff --git a/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb b/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
index 6a2cde30..73c7831e 100644
--- a/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
+++ b/meta-ti-extras/recipes-bsp/dsptop/libulm_git.bb
@@ -9,9 +9,9 @@ REQUIRED_MACHINE_FEATURES = "dsp"
9DEPENDS = "ti-cgt6x-native" 9DEPENDS = "ti-cgt6x-native"
10PR = "${INC_PR}.0" 10PR = "${INC_PR}.0"
11 11
12S = "${WORKDIR}/git/dsptop/ulm" 12S:append = "/dsptop/ulm"
13 13
14DEVICE="" 14DEVICE = ""
15DEVICE:dra7xx = "DRA7xx" 15DEVICE:dra7xx = "DRA7xx"
16 16
17EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX}" 17EXTRA_OEMAKE = "release DEVICE=${DEVICE} CROSS_COMPILE=${TARGET_PREFIX}"
@@ -42,4 +42,14 @@ include dsptop.inc
42 42
43ALLOW_EMPTY:${PN} = "1" 43ALLOW_EMPTY:${PN} = "1"
44 44
45PARALLEL_MAKE= "" 45PARALLEL_MAKE = ""
46
47# Disable the "buildpaths" check while we figure out how we are
48# going to address this issue.
49#
50# The ti-cgt6x compiler is a custom TI compiler for the TI C6000
51# Digital Signal Processor(DSP) platform. It does not currently
52# support reproducible builds and is provided via a binary blob
53# download that we cannot patch in the recipe to address the
54# issue.
55INSANE_SKIP:${PN}-dev += "buildpaths"
diff --git a/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb b/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
index 8d066eb0..bfdf1ac5 100644
--- a/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
+++ b/meta-ti-extras/recipes-bsp/ipumm-fw/ipumm-fw_git.bb
@@ -15,8 +15,6 @@ SRC_URI = "git://git.ti.com/git/ivimm/ipumm.git;protocol=https;branch=master"
15 15
16SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5" 16SRCREV = "df4c50aecc9aad7ab3eb1ca9ebacfe473fcad7c5"
17 17
18S = "${WORKDIR}/git"
19
20PV = "3.00.15.00" 18PV = "3.00.15.00"
21PR = "r7" 19PR = "r7"
22 20
@@ -26,18 +24,18 @@ inherit update-alternatives
26 24
27DEPENDS = "ti-xdctools-native ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-cgt-arm-native ti-ipc-rtos" 25DEPENDS = "ti-xdctools-native ti-sysbios ti-codec-engine ti-framework-components ti-xdais ti-cgt-arm-native ti-ipc-rtos"
28 26
29export HWVERSION="ES10" 27export HWVERSION = "ES10"
30export BIOSTOOLSROOT="${STAGING_DIR_TARGET}/usr/share/ti" 28export BIOSTOOLSROOT = "${STAGING_DIR_TARGET}/usr/share/ti"
31 29
32export XDCVERSION="ti-xdctools-tree" 30export XDCVERSION = "ti-xdctools-tree"
33export BIOSVERSION="ti-sysbios-tree" 31export BIOSVERSION = "ti-sysbios-tree"
34export IPCVERSION="ti-ipc-tree" 32export IPCVERSION = "ti-ipc-tree"
35export CEVERSION="ti-codec-engine-tree" 33export CEVERSION = "ti-codec-engine-tree"
36export FCVERSION="ti-framework-components-tree" 34export FCVERSION = "ti-framework-components-tree"
37export XDAISVERSION="ti-xdais-tree" 35export XDAISVERSION = "ti-xdais-tree"
38 36
39export TMS470CGTOOLPATH="${M4_TOOLCHAIN_INSTALL_DIR}" 37export TMS470CGTOOLPATH = "${M4_TOOLCHAIN_INSTALL_DIR}"
40export IPCSRC="${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree" 38export IPCSRC = "${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree"
41 39
42EXTRA_OEMAKE += "XDCDIST_TREE=${STAGING_DIR_NATIVE}/usr/share/ti/${XDCVERSION}" 40EXTRA_OEMAKE += "XDCDIST_TREE=${STAGING_DIR_NATIVE}/usr/share/ti/${XDCVERSION}"
43 41
@@ -65,3 +63,12 @@ ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/${TARGE
65ALTERNATIVE_PRIORITY = "20" 63ALTERNATIVE_PRIORITY = "20"
66 64
67FILES:${PN} += "${nonarch_base_libdir}/firmware/*" 65FILES:${PN} += "${nonarch_base_libdir}/firmware/*"
66
67# Disable the "buildpaths" check while we figure out how we are
68# going to address this issue.
69#
70# The ti-cgt-arm compiler is a custom TI compiler. It does not
71# currently support reproducible builds and is provided via a
72# binary blob download that we cannot patch in the recipe to address
73# the issue.
74INSANE_SKIP:${PN} += "buildpaths"
diff --git a/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb b/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb
index b01dd6a5..73b582a2 100644
--- a/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb
+++ b/meta-ti-extras/recipes-bsp/pru/pru-icss_git.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Programmable Real-time Unit Software Package" 1SUMMARY = "Programmable Real-time Unit Software Package"
2HOMEPAGE = "http://processors.wiki.ti.com/index.php/PRU-ICSS" 2HOMEPAGE = "http://processors.wiki.ti.com/index.php/PRU-ICSS"
3LICENSE = "BSD-3-Clause & PD" 3LICENSE = "BSD-3-Clause & PD"
4 4
@@ -29,8 +29,6 @@ RDEPENDS:${PN}:append = " \
29 29
30DEPENDS = "ti-cgt-pru-native" 30DEPENDS = "ti-cgt-pru-native"
31 31
32S = "${WORKDIR}/git"
33
34export PRU_CGT = "${TI_CGT_PRU_INSTALL_DIR}" 32export PRU_CGT = "${TI_CGT_PRU_INSTALL_DIR}"
35export PRU_SSP = "${S}" 33export PRU_SSP = "${S}"
36 34
diff --git a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw/0001-Add-Makefile-to-install-firmware-files.patch b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw/0001-Add-Makefile-to-install-firmware-files.patch
deleted file mode 100644
index bb05c6fe..00000000
--- a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw/0001-Add-Makefile-to-install-firmware-files.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 3a8fc3ccf00796254d6cef4b6d4cd70dc37012e1 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denys@ti.com>
3Date: Fri, 10 Mar 2017 13:28:29 -0500
4Subject: [PATCH] Add Makefile to install firmware files
5
6Upstream-Status: Pending
7
8Signed-off-by: Denys Dmytriyenko <denys@ti.com>
9---
10 Makefile | 9 +++++++++
11 1 file changed, 9 insertions(+)
12 create mode 100644 Makefile
13
14diff --git a/Makefile b/Makefile
15new file mode 100644
16index 0000000..1cf38e3
17--- /dev/null
18+++ b/Makefile
19@@ -0,0 +1,9 @@
20+# Installs the the ti-connectivity wlan firmware files into the root file system
21+
22+install:
23+ @if [ ! -d $(DESTDIR) ] ; then \
24+ echo "Target filesystem directory doesn't exist."; \
25+ exit 1; \
26+ fi
27+ install -d $(DEST_DIR)/lib/firmware/ti-connectivity
28+ cp *.bin $(DEST_DIR)/lib/firmware/ti-connectivity/
29--
302.7.4
31
diff --git a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
index dbae5a21..3e61db88 100644
--- a/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
+++ b/meta-ti-extras/recipes-bsp/wl18xx-fw/wl18xx-fw_8.9.0.0.86.bb
@@ -1,17 +1,12 @@
1DESCRIPTION = "Firmware files for use with TI wl18xx" 1SUMMARY = "Firmware files for use with TI wl18xx"
2LICENSE = "TI-TSPA" 2LICENSE = "TI-TSPA"
3LIC_FILES_CHKSUM = "file://LICENCE;md5=4977a0fe767ee17765ae63c435a32a9e" 3LIC_FILES_CHKSUM = "file://LICENCE;md5=4977a0fe767ee17765ae63c435a32a9e"
4 4
5SRC_URI = " \ 5SRC_URI = "git://git.ti.com/git/wilink8-wlan/wl18xx_fw.git;protocol=https;branch=${BRANCH}"
6 git://git.ti.com/git/wilink8-wlan/wl18xx_fw.git;protocol=https;branch=${BRANCH} \
7 file://0001-Add-Makefile-to-install-firmware-files.patch \
8"
9 6
10SRCREV = "5ec05007f2662f460f881c5868311fd3ab7e6e71" 7SRCREV = "5ec05007f2662f460f881c5868311fd3ab7e6e71"
11BRANCH = "master" 8BRANCH = "master"
12 9
13S = "${WORKDIR}/git"
14
15CLEANBROKEN = "1" 10CLEANBROKEN = "1"
16 11
17do_compile() { 12do_compile() {
@@ -19,11 +14,8 @@ do_compile() {
19} 14}
20 15
21do_install() { 16do_install() {
22 if ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','true','false',d)}; then 17 install -d ${D}${nonarch_base_libdir}/firmware/ti-connectivity
23 oe_runmake 'DEST_DIR=${D}/usr' install 18 install -m 0644 ${S}/*.bin ${D}${nonarch_base_libdir}/firmware/ti-connectivity/
24 else
25 oe_runmake 'DEST_DIR=${D}' install
26 fi
27} 19}
28 20
29FILES:${PN} = "${nonarch_base_libdir}/firmware/ti-connectivity/*" 21FILES:${PN} = "${nonarch_base_libdir}/firmware/ti-connectivity/*"
diff --git a/meta-ti-extras/recipes-connectivity/cc33calibrator/cc33calibrator_git.bb b/meta-ti-extras/recipes-connectivity/cc33calibrator/cc33calibrator_git.bb
new file mode 100644
index 00000000..57311667
--- /dev/null
+++ b/meta-ti-extras/recipes-connectivity/cc33calibrator/cc33calibrator_git.bb
@@ -0,0 +1,24 @@
1SUMMARY = "The calibrator utility for TI wireless solution based on cc33xx driver"
2LICENSE = "BSD-3-Clause"
3LIC_FILES_CHKSUM = "file://COPYING;md5=d5fc448a36efe573623542dcb989afc4"
4
5SRCREV = "89d7e55b40972cbfc84f0734c35a7a6b4f7f5b31"
6SRC_URI = "git://git.ti.com/git/cc33xx-wlan/cc33xx-utils.git;branch=master;protocol=https"
7
8PV = "1.0.0.50"
9
10DEPENDS = "libnl"
11
12S:append = "/cc33calibrator"
13
14export CROSS_COMPILE = "${TARGET_PREFIX}"
15
16EXTRA_OEMAKE = "CFLAGS="${CFLAGS} -I${STAGING_INCDIR}/libnl3/ -DCONFIG_LIBNL32 " \
17 LDFLAGS="${LDFLAGS} -L${STAGING_LIBDIR}" \
18 CC="${CC}" \
19 NLVER=3"
20
21do_install() {
22 install -d ${D}${bindir}
23 install -m 0755 cc33calibrator ${D}${bindir}/
24}
diff --git a/meta-ti-extras/recipes-connectivity/cc33conf/cc33conf_git.bb b/meta-ti-extras/recipes-connectivity/cc33conf/cc33conf_git.bb
new file mode 100644
index 00000000..724be6e5
--- /dev/null
+++ b/meta-ti-extras/recipes-connectivity/cc33conf/cc33conf_git.bb
@@ -0,0 +1,29 @@
1SUMMARY = "Configuration utility for TI CC33xx wireless devices"
2LICENSE = "BSD-3-Clause"
3LIC_FILES_CHKSUM = "file://COPYING;md5=d5fc448a36efe573623542dcb989afc4"
4
5SRCREV = "a2f84140b8d67cfc94472cf92676a409d1e47d86"
6SRC_URI = "git://git.ti.com/git/cc33xx-wlan/cc33xx-utils.git;branch=master;protocol=https"
7
8PV = "1.7.0.120"
9
10S:append = "/cc33conf"
11
12EXTRA_OEMAKE = "CC="${CC}""
13
14do_install() {
15 install -d ${D}${sbindir}
16 install -d ${D}${sbindir}/cc33conf/
17
18 install -m 0755 cc33xxconf ${D}${sbindir}/cc33conf/
19 install -m 0755 dictionary.txt ${D}${sbindir}/cc33conf/
20 install -m 0755 default.conf ${D}${sbindir}/cc33conf/
21 install -m 0755 README ${D}${sbindir}/cc33conf/
22 install -m 0755 cc33xx-conf.conf ${D}${sbindir}/cc33conf/
23 install -m 0755 cc33xx-conf.ini ${D}${sbindir}/cc33conf/
24 install -m 0755 conf.h ${D}${sbindir}/cc33conf/
25}
26
27FILES:${PN} += " \
28 ${sbindir}/cc33conf \
29"
diff --git a/meta-ti-extras/recipes-connectivity/cc33xx-target-scripts/cc33xx-target-scripts_git.bb b/meta-ti-extras/recipes-connectivity/cc33xx-target-scripts/cc33xx-target-scripts_git.bb
new file mode 100644
index 00000000..e3fe6f80
--- /dev/null
+++ b/meta-ti-extras/recipes-connectivity/cc33xx-target-scripts/cc33xx-target-scripts_git.bb
@@ -0,0 +1,18 @@
1SUMMARY = "Scripts and configuration files for TI cc33xx wireless drivers"
2LICENSE = "BSD-3-Clause"
3LIC_FILES_CHKSUM = "file://COPYING;md5=904443cf7fae5c09c3d5f83f8557c265"
4
5SRCREV = "4371c93ea01b339f6f73f77d6d6bfcc185def8c0"
6SRC_URI = "git://git.ti.com/git/cc33xx-wlan/cc33xx-target-scripts.git;protocol=https;branch=master"
7
8FILES:${PN} += "${datadir}/cc33xx/"
9
10do_install() {
11 install -d ${D}${datadir}/cc33xx/
12
13 scripts=`find ./* -type f -name "*.*"`
14 for s in $scripts
15 do
16 install -m 0755 $s ${D}${datadir}/cc33xx/
17 done
18}
diff --git a/meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb b/meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb
index 2e528376..707f7c77 100644
--- a/meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb
+++ b/meta-ti-extras/recipes-connectivity/uim/uim-sysfs_8.5.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Shared Transport Line Discipline User Mode initialisation Manager Daemon" 1SUMMARY = "Shared Transport Line Discipline User Mode initialisation Manager Daemon"
2LICENSE = "GPL-2.0-or-later" 2LICENSE = "GPL-2.0-or-later"
3LIC_FILES_CHKSUM = "file://uim.c;beginline=1;endline=18;md5=9f0bbfbc10c67689e81a523e2976c31e" 3LIC_FILES_CHKSUM = "file://uim.c;beginline=1;endline=18;md5=9f0bbfbc10c67689e81a523e2976c31e"
4 4
@@ -10,8 +10,6 @@ inherit update-rc.d
10SRCREV = "a75f45be2d5c74fc1dd913d08afc30f09a230aa9" 10SRCREV = "a75f45be2d5c74fc1dd913d08afc30f09a230aa9"
11SRC_URI = "git://git.ti.com/git/ti-bt/uim.git;branch=master;protocol=https" 11SRC_URI = "git://git.ti.com/git/ti-bt/uim.git;branch=master;protocol=https"
12 12
13S = "${WORKDIR}/git"
14
15do_install() { 13do_install() {
16 install -d ${D}${bindir} 14 install -d ${D}${bindir}
17 install -m 0755 uim ${D}${bindir} 15 install -m 0755 uim ${D}${bindir}
diff --git a/meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb b/meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb
index 1e9c445d..fac0524e 100644
--- a/meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb
+++ b/meta-ti-extras/recipes-connectivity/wl18xx-calibrator/wl18xx-calibrator_8.7.3.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "The calibrator utility for TI wireless solution based on wl18xx driver" 1SUMMARY = "The calibrator utility for TI wireless solution based on wl18xx driver"
2LICENSE = "BSD-3-Clause" 2LICENSE = "BSD-3-Clause"
3LIC_FILES_CHKSUM = "file://COPYING;md5=4725015cb0be7be389cf06deeae3683d" 3LIC_FILES_CHKSUM = "file://COPYING;md5=4725015cb0be7be389cf06deeae3683d"
4 4
@@ -11,8 +11,6 @@ SRC_URI = "git://git.ti.com/git/wilink8-wlan/18xx-ti-utils.git;branch=master;pro
11 file://0001-plt.h-Do-not-define-EFUSE_PARAMETER_TYPE_ENMT-type-e.patch \ 11 file://0001-plt.h-Do-not-define-EFUSE_PARAMETER_TYPE_ENMT-type-e.patch \
12 " 12 "
13 13
14S = "${WORKDIR}/git"
15
16export CROSS_COMPILE = "${TARGET_PREFIX}" 14export CROSS_COMPILE = "${TARGET_PREFIX}"
17 15
18EXTRA_OEMAKE = "CFLAGS="${CFLAGS} -I${STAGING_INCDIR}/libnl3/ -DCONFIG_LIBNL32 " \ 16EXTRA_OEMAKE = "CFLAGS="${CFLAGS} -I${STAGING_INCDIR}/libnl3/ -DCONFIG_LIBNL32 " \
diff --git a/meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.8.1.bb b/meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.8.1.bb
index 87890a31..e3ea98aa 100644
--- a/meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.8.1.bb
+++ b/meta-ti-extras/recipes-connectivity/wl18xx-target-scripts/wl18xx-target-scripts_8.8.1.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Scripts and configuration files for TI wireless drivers" 1SUMMARY = "Scripts and configuration files for TI wireless drivers"
2LICENSE = "GPL-2.0-only" 2LICENSE = "GPL-2.0-only"
3LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=b8d6a0865f50159bf5c0d175d1f4a705" 3LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=b8d6a0865f50159bf5c0d175d1f4a705"
4 4
@@ -11,8 +11,6 @@ file://0001-print_stat.sh-replace-system-bin-sh-with-bin-sh.patch \
11 11
12PR = "r1" 12PR = "r1"
13 13
14S = "${WORKDIR}/git"
15
16FILES:${PN} += "${datadir}/wl18xx/" 14FILES:${PN} += "${datadir}/wl18xx/"
17 15
18do_install() { 16do_install() {
diff --git a/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb b/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb
index a2a8b775..8285bf9f 100644
--- a/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb
+++ b/meta-ti-extras/recipes-connectivity/wlconf/wlconf_8.7.3.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Configuration utility for TI wireless drivers" 1SUMMARY = "Configuration utility for TI wireless drivers"
2LICENSE = "GPL-2.0-only" 2LICENSE = "GPL-2.0-only"
3LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=adc05a1903d3f107f85c90328e3a9438" 3LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=adc05a1903d3f107f85c90328e3a9438"
4 4
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=adc05a1903d3f107f85
6SRCREV = "5048b59a444ac59ba7171d6e122d5a84581aebf2" 6SRCREV = "5048b59a444ac59ba7171d6e122d5a84581aebf2"
7SRC_URI = "git://git.ti.com/git/wilink8-wlan/18xx-ti-utils.git;branch=master;protocol=https" 7SRC_URI = "git://git.ti.com/git/wilink8-wlan/18xx-ti-utils.git;branch=master;protocol=https"
8 8
9S = "${WORKDIR}/git/wlconf" 9S:append = "/wlconf"
10 10
11EXTRA_OEMAKE = "CC="${CC}"" 11EXTRA_OEMAKE = "CC="${CC}""
12 12
diff --git a/meta-ti-extras/recipes-devtools/cuia/cuia_1.0.0.13.bb b/meta-ti-extras/recipes-devtools/cuia/cuia_1.0.0.13.bb
index 8b16830f..20548443 100644
--- a/meta-ti-extras/recipes-devtools/cuia/cuia_1.0.0.13.bb
+++ b/meta-ti-extras/recipes-devtools/cuia/cuia_1.0.0.13.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "TI Unified Instrumentation Architecture in C (cUIA)" 1SUMMARY = "TI Unified Instrumentation Architecture in C (cUIA)"
2LICENSE = "BSD-3-Clause" 2LICENSE = "BSD-3-Clause"
3LIC_FILES_CHKSUM = "file://cuia_${CUIA_PV}_manifest.html;md5=0eea94e3bb94de4ddee77653eba1c7c5" 3LIC_FILES_CHKSUM = "file://cuia_${CUIA_PV}_manifest.html;md5=0eea94e3bb94de4ddee77653eba1c7c5"
4 4
@@ -9,7 +9,7 @@ SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_ccstudio/UIA/SCMCSD
9SRC_URI[cuia.md5sum] = "ef53989ac70c191841cd656cdc8770be" 9SRC_URI[cuia.md5sum] = "ef53989ac70c191841cd656cdc8770be"
10SRC_URI[cuia.sha256sum] = "f16d138a9146fdc7d52cba77bd30596da65835f6ffe4092baf2b33d1c1a4fb0d" 10SRC_URI[cuia.sha256sum] = "f16d138a9146fdc7d52cba77bd30596da65835f6ffe4092baf2b33d1c1a4fb0d"
11 11
12S = "${WORKDIR}/cuia_${CUIA_PV}${CUIA_PVExtra}" 12S = "${UNPACKDIR}/cuia_${CUIA_PV}${CUIA_PVExtra}"
13 13
14CLEANBROKEN = "1" 14CLEANBROKEN = "1"
15 15
diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb b/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb
index d3ada9c6..b803ac5b 100644
--- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbc6x_git.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "GNU debugger for TI C6X DSP." 1SUMMARY = "GNU debugger for TI C6X DSP."
2SECTION = "devel" 2SECTION = "devel"
3LICENSE = "GPL-3.0-or-later" 3LICENSE = "GPL-3.0-or-later"
4LIC_FILES_CHKSUM = "file://debian/copyright;md5=bf0fe2872eb3dfeebb2cbe38206fe81f" 4LIC_FILES_CHKSUM = "file://debian/copyright;md5=bf0fe2872eb3dfeebb2cbe38206fe81f"
@@ -14,12 +14,12 @@ SRC_URI:append = " \
14 file://0001-libbfd.h-suppress-GCC9-Wstringop-truncation.patch;striplevel=2 \ 14 file://0001-libbfd.h-suppress-GCC9-Wstringop-truncation.patch;striplevel=2 \
15" 15"
16 16
17S = "${WORKDIR}/git/gdbc6x" 17S:append = "/gdbc6x"
18 18
19inherit update-rc.d 19inherit update-rc.d
20inherit gettext 20inherit gettext
21 21
22CFLAGS += "-fcommon" 22CFLAGS += "-fcommon -fpermissive -std=gnu11"
23 23
24do_configure () { 24do_configure () {
25 cd ${S} 25 cd ${S}
@@ -36,7 +36,7 @@ do_install () {
36 cp -rf ${S}/install_gdb/include/* ${D}${includedir} 36 cp -rf ${S}/install_gdb/include/* ${D}${includedir}
37 37
38 install -d ${D}${sysconfdir}/init.d 38 install -d ${D}${sysconfdir}/init.d
39 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/gdbserverproxy 39 install -m 0755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/gdbserverproxy
40} 40}
41 41
42RDEPENDS:${PN} = "gdbserverproxy-module-drv bash" 42RDEPENDS:${PN} = "gdbserverproxy-module-drv bash"
@@ -47,3 +47,7 @@ INITSCRIPT_NAME = "gdbserverproxy"
47INITSCRIPT_PARAMS = "defaults 95" 47INITSCRIPT_PARAMS = "defaults 95"
48 48
49PARALLEL_MAKE = "" 49PARALLEL_MAKE = ""
50
51# Disable the "buildpaths" check while we figure out how we are
52# going to address this issue.
53INSANE_SKIP:${PN} += "buildpaths"
diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
index 3460eadb..6c538817 100644
--- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserver-c6x_git.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "TI gdb-server to be used with c6xgdb." 1SUMMARY = "TI gdb-server to be used with c6xgdb."
2LICENSE = "BSD-3-Clause" 2LICENSE = "BSD-3-Clause"
3LIC_FILES_CHKSUM = "file://../debian/copyright;md5=82c616b6c8f9c11c46feaaf8f9a11495" 3LIC_FILES_CHKSUM = "file://../debian/copyright;md5=82c616b6c8f9c11c46feaaf8f9a11495"
4 4
@@ -6,7 +6,7 @@ DEPENDS = "ti-xdais ti-framework-components ti-cgt6x-native ti-sysbios ti-xdctoo
6 6
7PR = "${INC_PR}.0" 7PR = "${INC_PR}.0"
8 8
9S = "${WORKDIR}/git/gdbserver-c6x/src" 9S:append = "/gdbserver-c6x/src"
10 10
11PLATFORM = "" 11PLATFORM = ""
12PLATFORM:dra7xx = "DRA7xx_PLATFORM" 12PLATFORM:dra7xx = "DRA7xx_PLATFORM"
@@ -47,3 +47,13 @@ require recipes-ti/includes/ti-paths.inc
47ALLOW_EMPTY:${PN} = "1" 47ALLOW_EMPTY:${PN} = "1"
48 48
49PARALLEL_MAKE = "" 49PARALLEL_MAKE = ""
50
51# Disable the "buildpaths" check while we figure out how we are
52# going to address this issue.
53#
54# The ti-cgt6x compiler is a custom TI compiler for the TI C6000
55# Digital Signal Processor(DSP) platform. It does not currently
56# support reproducible builds and is provided via a binary blob
57# download that we cannot patch in the recipe to address the
58# issue.
59INSANE_SKIP:${PN}-dev += "buildpaths"
diff --git a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
index 8bea12f7..2ee97269 100644
--- a/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
+++ b/meta-ti-extras/recipes-devtools/gdbc6x/gdbserverproxy-module-drv_git.bb
@@ -1,10 +1,7 @@
1DESCRIPTION = "Interface for GDB to commincate witha TI C66X DSP" 1SUMMARY = "Interface for GDB to commincate witha TI C66X DSP"
2LICENSE = "GPL-2.0-only" 2LICENSE = "GPL-2.0-only"
3LIC_FILES_CHKSUM = "file://COPYING.txt;md5=75859989545e37968a99b631ef42722e" 3LIC_FILES_CHKSUM = "file://COPYING.txt;md5=75859989545e37968a99b631ef42722e"
4 4
5# This package builds a kernel module, use kernel PR as base and append a local
6MACHINE_KERNEL_PR:append = "b"
7PR = "${MACHINE_KERNEL_PR}"
8PV:append = "+git" 5PV:append = "+git"
9 6
10SRC_URI:append = "\ 7SRC_URI:append = "\
@@ -12,7 +9,7 @@ SRC_URI:append = "\
12 file://0002-Support-Linux-kernels-v6.6.patch;patchdir=../.. \ 9 file://0002-Support-Linux-kernels-v6.6.patch;patchdir=../.. \
13" 10"
14 11
15S = "${WORKDIR}/git/kernel_module/gdbproxy-mod" 12S:append = "/kernel_module/gdbproxy-mod"
16 13
17inherit module 14inherit module
18 15
diff --git a/meta-ti-extras/recipes-devtools/python-yamllint/python3-yamllint_1.33.0.bb b/meta-ti-extras/recipes-devtools/python-yamllint/python3-yamllint_1.33.0.bb
deleted file mode 100644
index 4b7bd065..00000000
--- a/meta-ti-extras/recipes-devtools/python-yamllint/python3-yamllint_1.33.0.bb
+++ /dev/null
@@ -1,15 +0,0 @@
1SUMMARY = "A linter for YAML files."
2HOMEPAGE = "https://github.com/adrienverge/yamllint"
3LICENSE = "GPL-3.0-only"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464"
5
6inherit pypi setuptools3
7
8PYPI_PACKAGE = "yamllint"
9
10SRC_URI[sha256sum] = "2dceab9ef2d99518a2fcf4ffc964d44250ac4459be1ba3ca315118e4a1a81f7d"
11
12DEPENDS += "${PYTHON_PN}-setuptools-scm-native"
13RDEPENDS:${PN} += "${PYTHON_PN}-pyyaml"
14
15BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb b/meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb
index 54f6ff8a..2ae44086 100644
--- a/meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb
+++ b/meta-ti-extras/recipes-multimedia/libdce/libdce_3.00.15.00.bb
@@ -6,10 +6,10 @@ inherit autotools pkgconfig
6 6
7DEPENDS = "libdrm ti-ipc" 7DEPENDS = "libdrm ti-ipc"
8 8
9SRC_URI = "git://git.omapzoom.org/repo/libdce.git;protocol=git;branch=master" 9SRC_URI = "git://git.ti.com/git/omapzoom/libdce.git;protocol=https;branch=master"
10SRCREV = "ec14e1d5cea1ed3c3ea0e2b9cf1fd581acff93e3" 10
11SRCREV = "182aea18596eb2b3a82cffc536a6404f5000fb30"
11 12
12S = "${WORKDIR}/git"
13EXTRA_OECONF += "IPC_HEADERS=${STAGING_INCDIR}/ti/ipc/mm" 13EXTRA_OECONF += "IPC_HEADERS=${STAGING_INCDIR}/ti/ipc/mm"
14 14
15COMPATIBLE_HOST ?= "null" 15COMPATIBLE_HOST ?= "null"
diff --git a/meta-ti-extras/recipes-ti/beagleboard/beaglebone-capes.bb b/meta-ti-extras/recipes-ti/beagleboard/beaglebone-capes.bb
index ceefe0d6..22fa67fd 100644
--- a/meta-ti-extras/recipes-ti/beagleboard/beaglebone-capes.bb
+++ b/meta-ti-extras/recipes-ti/beagleboard/beaglebone-capes.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Userspace setup for beaglebone capes" 1SUMMARY = "Userspace setup for beaglebone capes"
2 2
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" 4LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
@@ -14,13 +14,13 @@ SRC_URI = "file://cape.service \
14 14
15do_install() { 15do_install() {
16 install -d ${D}${base_libdir}/systemd/system/ 16 install -d ${D}${base_libdir}/systemd/system/
17 install -m 0644 ${WORKDIR}/cape.service ${D}${base_libdir}/systemd/system 17 install -m 0644 ${UNPACKDIR}/cape.service ${D}${base_libdir}/systemd/system
18 18
19 install -d ${D}${base_libdir}/systemd/system/basic.target.wants 19 install -d ${D}${base_libdir}/systemd/system/basic.target.wants
20 ln -sf ../cape.service ${D}${base_libdir}/systemd/system/basic.target.wants/ 20 ln -sf ../cape.service ${D}${base_libdir}/systemd/system/basic.target.wants/
21 21
22 install -d ${D}${bindir} 22 install -d ${D}${bindir}
23 install -m 0755 ${WORKDIR}/cape*.sh ${D}${bindir} 23 install -m 0755 ${UNPACKDIR}/cape*.sh ${D}${bindir}
24} 24}
25 25
26FILES:${PN} += "${base_libdir}/systemd/system" 26FILES:${PN} += "${base_libdir}/systemd/system"
diff --git a/meta-ti-extras/recipes-ti/beagleboard/beaglebone-getting-started.bb b/meta-ti-extras/recipes-ti/beagleboard/beaglebone-getting-started.bb
index 85ab861d..8ad75f26 100644
--- a/meta-ti-extras/recipes-ti/beagleboard/beaglebone-getting-started.bb
+++ b/meta-ti-extras/recipes-ti/beagleboard/beaglebone-getting-started.bb
@@ -10,8 +10,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f6f02761e31334c48f7021fb94c89aaa"
10SRCREV = "05bedba192646152b7bc80b0accaea75aef864e5" 10SRCREV = "05bedba192646152b7bc80b0accaea75aef864e5"
11SRC_URI = "git://github.com/jadonk/beaglebone-getting-started.git;protocol=https;branch=master" 11SRC_URI = "git://github.com/jadonk/beaglebone-getting-started.git;protocol=https;branch=master"
12 12
13S = "${WORKDIR}/git"
14
15do_install() { 13do_install() {
16 install -d ${D}${datadir}/${PN} 14 install -d ${D}${datadir}/${PN}
17 cp -R --no-dereference --preserve=mode,links ${S}/* ${D}${datadir}/${PN} 15 cp -R --no-dereference --preserve=mode,links ${S}/* ${D}${datadir}/${PN}
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init.bb b/meta-ti-extras/recipes-ti/beagleboard/gadget-init.bb
deleted file mode 100644
index 3ab00ec3..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init.bb
+++ /dev/null
@@ -1,60 +0,0 @@
1DESCRIPTION = "Units to initialize usb gadgets"
2
3PR = "r19"
4
5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
7
8COMPATIBLE_MACHINE = "(ti33x)"
9PACKAGE_ARCH = "${MACHINE_ARCH}"
10
11SRC_URI = "file://storage-gadget-init.service \
12 file://network-gadget-init.service \
13 file://udhcpd.service \
14 file://udhcpd.conf \
15 file://bone-gmass-eject.rules \
16 file://udhcpd.rules \
17 file://g-storage-reinsert.sh \
18 file://g-ether-start-service.sh \
19 file://g-ether-load.sh \
20 file://update-image-info-on-mmcblk0p1.sh \
21 "
22
23do_install() {
24 install -d ${D}${base_libdir}/systemd/system/basic.target.wants
25 install -m 0644 ${WORKDIR}/*.service ${D}${base_libdir}/systemd/system
26
27 for i in ${WORKDIR}/storage-gadget-init.service ; do
28 install -m 0644 $i ${D}${base_libdir}/systemd/system
29 ln -sf ../$(basename $i) ${D}${base_libdir}/systemd/system/basic.target.wants/
30 done
31
32 install -d ${D}${sysconfdir}/udev/rules.d
33 install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d
34 install -m 0644 ${WORKDIR}/*.conf ${D}${sysconfdir}
35
36 install -d ${D}${bindir}
37 install -m 0755 ${WORKDIR}/*.sh ${D}${bindir}
38}
39
40PACKAGES =+ "${PN}-storage ${PN}-network ${PN}-udhcpd"
41
42ALLOW_EMPTY:${PN} = "1"
43
44FILES:${PN}-storage = "${base_libdir}/systemd/system/storage-gadget-init.service \
45 ${base_libdir}/systemd/system/basic.target.wants/storage-gadget-init.service \
46 ${bindir}/g-storage-reinsert.sh \
47 ${bindir}/update-image-info-on-mmcblk0p1.sh \
48 ${sysconfdir}/udev/rules.d/bone-gmass-eject.rules"
49
50FILES:${PN}-network = "${base_libdir}/systemd/system/network-gadget-init.service \
51 ${base_libdir}/systemd/system/basic.target.wants/network-gadget-init.service \
52 ${bindir}/g-ether-load.sh \
53 ${bindir}/g-ether-start-service.sh \
54 ${sysconfdir}/udev/rules.d/udhcpd.rules"
55
56FILES:${PN}-udhcpd = "${base_libdir}/systemd/system/udhcpd.service \
57 ${base_libdir}/systemd/system/basic.target.wants/udhcpd.service \
58 ${sysconfdir}/udhcpd.conf"
59
60RRECOMMENDS:${PN} = "${PN}-storage ${PN}-network ${PN}-udhcpd"
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/bone-gmass-eject.rules b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/bone-gmass-eject.rules
deleted file mode 100644
index ee6f93e2..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/bone-gmass-eject.rules
+++ /dev/null
@@ -1 +0,0 @@
1SUBSYSTEM=="block",ACTION=="change",KERNEL=="mmcblk0p1",RUN+="/usr/bin/g-ether-start-service.sh"
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-ether-load.sh b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-ether-load.sh
deleted file mode 100755
index f9400649..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-ether-load.sh
+++ /dev/null
@@ -1,46 +0,0 @@
1#!/bin/sh
2
3function get_devmem()
4{
5 /usr/bin/devmem2 $1 | grep ": " | cut -d ":" -f 2|cut -d "x" -f 2
6}
7
8function hex_to_mac_addr()
9{
10 addr=$1
11 n=0
12 mac_addr=$(echo ${addr} | while read -r -n2 c; do
13 if [ ! -z "$c" ]; then
14 if [ $n -ne 0 ] ; then
15 echo -n ":${c}"
16 else
17 echo -n "${c}"
18 fi
19 fi
20 n=$(($n+1))
21 done)
22 echo ${mac_addr}
23}
24
25function reverse_bytes()
26{
27 addr=$1
28 New_addr=$(echo ${addr} | while read -r -n2 c; do
29 if [ ! -z "$c" ]; then
30 New_addr=${c}${New_addr}
31 else echo
32 echo ${New_addr}
33 fi
34 done)
35 echo ${New_addr}
36}
37
38DEVMEM_ADDR_LO=$(get_devmem 0x44e10638|bc)
39DEVMEM_ADDR_LO=$(reverse_bytes ${DEVMEM_ADDR_LO})
40
41DEVMEM_ADDR_HI=$(get_devmem 0x44e1063C)
42DEVMEM_ADDR_HI=$(reverse_bytes ${DEVMEM_ADDR_HI})
43
44DEV_ADDR=$(hex_to_mac_addr "${DEVMEM_ADDR_HI}${DEVMEM_ADDR_LO}")
45
46modprobe g_ether host_addr=${DEV_ADDR}
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-ether-start-service.sh b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-ether-start-service.sh
deleted file mode 100755
index 6e73b155..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-ether-start-service.sh
+++ /dev/null
@@ -1,10 +0,0 @@
1#!/bin/sh
2if [ -a /sys/devices/platform/omap/musb-ti81xx/musb-hdrc.0/gadget/lun0/file ]
3then
4 x=$(cat /sys/devices/platform/omap/musb-ti81xx/musb-hdrc.0/gadget/lun0/file)
5 if [ -z "$x" ]
6 then
7 /bin/systemctl stop storage-gadget-init.service
8 /bin/systemctl start network-gadget-init.service
9 fi
10fi
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-storage-reinsert.sh b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-storage-reinsert.sh
deleted file mode 100755
index d358640a..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/g-storage-reinsert.sh
+++ /dev/null
@@ -1,4 +0,0 @@
1#!/bin/sh
2/bin/systemctl stop storage-gadget-init.service
3/bin/systemctl stop network-gadget-init.service
4/bin/systemctl start storage-gadget-init.service
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/network-gadget-init.service b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/network-gadget-init.service
deleted file mode 100644
index 0ee29147..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/network-gadget-init.service
+++ /dev/null
@@ -1,11 +0,0 @@
1[Unit]
2Description=Start USB Ethernet gadget
3Conflicts=storage-gadget-init.service
4
5[Service]
6RemainAfterExit=yes
7ExecStart=/usr/bin/g-ether-load.sh
8ExecStop=/sbin/rmmod g_ether
9
10[Install]
11WantedBy=gether.target
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/storage-gadget-init.service b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/storage-gadget-init.service
deleted file mode 100644
index 9a8513e8..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/storage-gadget-init.service
+++ /dev/null
@@ -1,11 +0,0 @@
1[Unit]
2Description=Start usb mass storage gadget
3After=dev-mmcblk0p1.device
4
5[Service]
6RemainAfterExit=yes
7ExecStart=/sbin/modprobe g_mass_storage file=/dev/mmcblk0p1 cdrom=0 stall=0 removable=1 nofua=1
8ExecStop=/sbin/rmmod g_mass_storage
9
10[Install]
11WantedBy=basic.target
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.conf b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.conf
deleted file mode 100644
index 3bcf00f0..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
1start 192.168.7.1
2end 192.168.7.1
3interface usb0
4max_leases 1
5option subnet 255.255.255.252
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.rules b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.rules
deleted file mode 100644
index db65f9ac..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.rules
+++ /dev/null
@@ -1,2 +0,0 @@
1SUBSYSTEM=="net",ACTION=="add",KERNEL=="usb0",RUN+="/sbin/ifconfig usb0 192.168.7.2 netmask 255.255.255.252",RUN+="/bin/systemctl start udhcpd.service"
2SUBSYSTEM=="net",ACTION=="remove",KERNEL=="usb0",RUN+="/bin/systemctl stop udhcpd.service"
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.service b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.service
deleted file mode 100644
index 1f4ac688..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/udhcpd.service
+++ /dev/null
@@ -1,12 +0,0 @@
1[Unit]
2Description=DHCP server for USB0 network gadget
3After=dev-usb0.device
4Conflicts=storage-gadget-init.service
5
6[Service]
7ExecStart=/usr/sbin/udhcpd -f -S /etc/udhcpd.conf
8ExecStop=/bin/kill -TERM $MAINPID
9KillSignal=SIGINT
10
11[Install]
12WantedBy=gether.target
diff --git a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/update-image-info-on-mmcblk0p1.sh b/meta-ti-extras/recipes-ti/beagleboard/gadget-init/update-image-info-on-mmcblk0p1.sh
deleted file mode 100755
index a4daf734..00000000
--- a/meta-ti-extras/recipes-ti/beagleboard/gadget-init/update-image-info-on-mmcblk0p1.sh
+++ /dev/null
@@ -1,37 +0,0 @@
1#!/bin/sh
2mount /dev/mmcblk0p1 /mnt
3echo "Image info snapshot" > /mnt/info.txt
4
5echo >> /mnt/info.txt
6echo "/etc/angstrom-version:" >> /mnt/info.txt
7cat /etc/angstrom-version >> /mnt/info.txt
8
9echo >> /mnt/info.txt
10echo "/proc/cpuinfo:" >> /mnt/info.txt
11cat /proc/cpuinfo >> /mnt/info.txt
12
13echo >> /mnt/info.txt
14echo "uname -a:" >> /mnt/info.txt
15uname -a >> /mnt/info.txt
16
17echo >> /mnt/info.txt
18echo "/proc/cmdline:" >> /mnt/info.txt
19cat /proc/cmdline >> /mnt/info.txt
20
21echo >> /mnt/info.txt
22echo "ifconfig:" >> /mnt/info.txt
23ifconfig >> /mnt/info.txt
24
25echo >> /mnt/info.txt
26echo "/etc/angstrom-build-info:" >> /mnt/info.txt
27cat /etc/angstrom-build-info >> /mnt/info.txt
28
29echo >> /mnt/info.txt
30echo "/etc/image-version-info:" >> /mnt/info.txt
31cat /etc/image-version-info >> /mnt/info.txt
32
33echo >> /mnt/info.txt
34echo "opkg list-installed:" >> /mnt/info.txt
35opkg list-installed >> /mnt/info.txt
36
37umount /mnt
diff --git a/meta-ti-extras/recipes-ti/bios/ti-sysbios.inc b/meta-ti-extras/recipes-ti/bios/ti-sysbios.inc
index f31decec..edcea538 100644
--- a/meta-ti-extras/recipes-ti/bios/ti-sysbios.inc
+++ b/meta-ti-extras/recipes-ti/bios/ti-sysbios.inc
@@ -1,4 +1,4 @@
1DESCRIPTION = "TI SYS/BIOS v6 Kernel" 1SUMMARY = "TI SYS/BIOS v6 Kernel"
2HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/sysbios" 2HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/sysbios"
3SECTION = "devel" 3SECTION = "devel"
4LICENSE = "BSD-3-Clause" 4LICENSE = "BSD-3-Clause"
@@ -7,16 +7,18 @@ require ../includes/ti-paths.inc
7require ../includes/ti-staging.inc 7require ../includes/ti-staging.inc
8require ../includes/ti-eula-unpack.inc 8require ../includes/ti-eula-unpack.inc
9 9
10S = "${WORKDIR}/bios_${PV}" 10S = "${UNPACKDIR}/bios_${PV}"
11 11
12SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/sysbios/${PV}/exports/bios_setuplinux_${PV}.bin;name=sysbiosbin" 12SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/sysbios/${PV}/exports/bios_setuplinux_${PV}.bin;name=sysbiosbin"
13BINFILE="bios_${PV}.bin" 13BINFILE = "bios_${PV}.bin"
14TI_BIN_UNPK_CMDS="Y: q:workdir:Y" 14TI_BIN_UNPK_CMDS = "Y: q:workdir:Y"
15 15
16do_install() { 16do_install() {
17 CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" 17 CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
18 install -d ${D}${SYSBIOS_INSTALL_DIR_RECIPE} 18 install -d ${D}${SYSBIOS_INSTALL_DIR_RECIPE}
19 cp ${CP_ARGS} ${S}/* ${D}${SYSBIOS_INSTALL_DIR_RECIPE} 19 cp ${CP_ARGS} ${S}/* ${D}${SYSBIOS_INSTALL_DIR_RECIPE}
20
21 rm ${D}${SYSBIOS_INSTALL_DIR_RECIPE}/bios_${PV}*.log
20} 22}
21 23
22ALLOW_EMPTY:${PN} = "1" 24ALLOW_EMPTY:${PN} = "1"
diff --git a/meta-ti-extras/recipes-ti/bios/ti-sysbios_6.76.03.01.bb b/meta-ti-extras/recipes-ti/bios/ti-sysbios_6.76.03.01.bb
index d242510f..4b0723df 100644
--- a/meta-ti-extras/recipes-ti/bios/ti-sysbios_6.76.03.01.bb
+++ b/meta-ti-extras/recipes-ti/bios/ti-sysbios_6.76.03.01.bb
@@ -10,7 +10,7 @@ SRC_URI[sysbiosbin.md5sum] = "647243209d66d5dd35503b0ec5a84ab9"
10SRC_URI[sysbiosbin.sha256sum] = "b762b7f2343d26d367f952488e529046785128005158cc921c3baef08e97116a" 10SRC_URI[sysbiosbin.sha256sum] = "b762b7f2343d26d367f952488e529046785128005158cc921c3baef08e97116a"
11 11
12TI_BIN_UNPK_CMDS = "" 12TI_BIN_UNPK_CMDS = ""
13TI_BIN_UNPK_ARGS = "--mode unattended --prefix ${WORKDIR}" 13TI_BIN_UNPK_ARGS = "--mode unattended --prefix ${UNPACKDIR}"
14 14
15BINFILE = "bios_${PV}.run" 15BINFILE = "bios_${PV}.run"
16SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/sysbios/${PV}/exports/${BINFILE};name=sysbiosbin" 16SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/bios/sysbios/${PV}/exports/${BINFILE};name=sysbiosbin"
diff --git a/meta-ti-extras/recipes-ti/codec-engine/ti-codec-engine_3.24.00.08.bb b/meta-ti-extras/recipes-ti/codec-engine/ti-codec-engine_3.24.00.08.bb
index 2e25ea76..b248683b 100644
--- a/meta-ti-extras/recipes-ti/codec-engine/ti-codec-engine_3.24.00.08.bb
+++ b/meta-ti-extras/recipes-ti/codec-engine/ti-codec-engine_3.24.00.08.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Codec Engine for TI ARM/DSP processors" 1SUMMARY = "Codec Engine for TI ARM/DSP processors"
2HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ce" 2HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ce"
3SECTION = "devel" 3SECTION = "devel"
4LICENSE = "BSD-3-Clause" 4LICENSE = "BSD-3-Clause"
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://codec_engine_${PV}_Manifest.html;md5=de7d9c2594a6f386
14SRC_URI[cetarball.md5sum] = "d66a8ccbd6cdfe9f735af9f4a07e2b9b" 14SRC_URI[cetarball.md5sum] = "d66a8ccbd6cdfe9f735af9f4a07e2b9b"
15SRC_URI[cetarball.sha256sum] = "ed7b7399903bbf76af06ee6457836f344ad75b903618339bae82b3967f27ffa1" 15SRC_URI[cetarball.sha256sum] = "ed7b7399903bbf76af06ee6457836f344ad75b903618339bae82b3967f27ffa1"
16 16
17S = "${WORKDIR}/codec_engine_${PV}" 17S = "${UNPACKDIR}/codec_engine_${PV}"
18 18
19SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ce/${PV}/exports/codec_engine_${PV},lite.tar.gz;name=cetarball " 19SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/ce/${PV}/exports/codec_engine_${PV},lite.tar.gz;name=cetarball "
20 20
diff --git a/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb b/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb
index 400221f9..4043da55 100644
--- a/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb
+++ b/meta-ti-extras/recipes-ti/ctoolslib/libaet_git.bb
@@ -13,9 +13,9 @@ SRCREV = "de7954abab0f0caa8a2c7b53095c30226d901a31"
13DEPENDS = "ti-cgt6x-native" 13DEPENDS = "ti-cgt6x-native"
14PR = "r0" 14PR = "r0"
15 15
16S = "${WORKDIR}/git/aet" 16S:append = "/aet"
17 17
18DEVICE="" 18DEVICE = ""
19DEVICE:dra7xx = "DRA7xx" 19DEVICE:dra7xx = "DRA7xx"
20 20
21EXTRA_OEMAKE = "C6X_C_DIR=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x/include" 21EXTRA_OEMAKE = "C6X_C_DIR=${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x/include"
diff --git a/meta-ti-extras/recipes-ti/devtools/gcc-arm-baremetal_7-2018-q2-update.bb b/meta-ti-extras/recipes-ti/devtools/gcc-arm-baremetal_7-2018-q2-update.bb
index 64bac240..df34a39e 100644
--- a/meta-ti-extras/recipes-ti/devtools/gcc-arm-baremetal_7-2018-q2-update.bb
+++ b/meta-ti-extras/recipes-ti/devtools/gcc-arm-baremetal_7-2018-q2-update.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "Baremetal GCC for ARM" 1SUMMARY = "Baremetal GCC for ARM"
2LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" 2LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only"
3 3
4LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=f77466c63f5787f4bd669c402aabe061" 4LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=f77466c63f5787f4bd669c402aabe061"
@@ -10,7 +10,7 @@ SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2018q2/gcc
10SRC_URI[gcc-arm-none.md5sum] = "299ebd3f1c2c90930d28ab82e5d8d6c0" 10SRC_URI[gcc-arm-none.md5sum] = "299ebd3f1c2c90930d28ab82e5d8d6c0"
11SRC_URI[gcc-arm-none.sha256sum] = "bb17109f0ee697254a5d4ae6e5e01440e3ea8f0277f2e8169bf95d07c7d5fe69" 11SRC_URI[gcc-arm-none.sha256sum] = "bb17109f0ee697254a5d4ae6e5e01440e3ea8f0277f2e8169bf95d07c7d5fe69"
12 12
13S = "${WORKDIR}/gcc-arm-none-eabi-7-2018-q2-update" 13S = "${UNPACKDIR}/gcc-arm-none-eabi-7-2018-q2-update"
14 14
15# only x86_64 is supported 15# only x86_64 is supported
16COMPATIBLE_HOST = "x86_64.*-linux" 16COMPATIBLE_HOST = "x86_64.*-linux"
@@ -23,7 +23,7 @@ do_install() {
23 23
24FILES:${PN} = "${GCC_ARM_NONE_TOOLCHAIN_RECIPE}/*" 24FILES:${PN} = "${GCC_ARM_NONE_TOOLCHAIN_RECIPE}/*"
25 25
26INSANE_SKIP:${PN} = "already-stripped libdir staticdev build-deps file-rdeps" 26INSANE_SKIP:${PN} = "already-stripped libdir staticdev build-deps file-rdeps arch"
27INHIBIT_PACKAGE_DEBUG_SPLIT = "1" 27INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
28 28
29BBCLASSEXTEND = "native nativesdk" 29BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cg-xml_2.61.00.bb b/meta-ti-extras/recipes-ti/devtools/ti-cg-xml_2.61.00.bb
index c7608a76..4341acb0 100644
--- a/meta-ti-extras/recipes-ti/devtools/ti-cg-xml_2.61.00.bb
+++ b/meta-ti-extras/recipes-ti/devtools/ti-cg-xml_2.61.00.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "TI CG_XML" 1SUMMARY = "TI CG_XML"
2HOMEPAGE = "http://software-dl.ti.com/ccs/non-esd/releases/other/applications_packages/cg_xml/index.htm" 2HOMEPAGE = "http://software-dl.ti.com/ccs/non-esd/releases/other/applications_packages/cg_xml/index.htm"
3SECTION = "devel" 3SECTION = "devel"
4LICENSE = "BSD-3-Clause" 4LICENSE = "BSD-3-Clause"
@@ -9,7 +9,7 @@ require recipes-ti/includes/ti-unpack.inc
9 9
10PV = "2.61.00" 10PV = "2.61.00"
11PE = "1" 11PE = "1"
12S = "${WORKDIR}/cg_xml_${PV}" 12S = "${UNPACKDIR}/cg_xml_${PV}"
13 13
14SRC_URI = "\ 14SRC_URI = "\
15 http://software-dl.ti.com/ccs/non-esd/releases/other/applications_packages/cg_xml/cg_xml_v${@'${PV}'.replace('.','_')}/cgxml-${PV}-linux-installer.run;name=cgxmlbin_linux \ 15 http://software-dl.ti.com/ccs/non-esd/releases/other/applications_packages/cg_xml/cg_xml_v${@'${PV}'.replace('.','_')}/cgxml-${PV}-linux-installer.run;name=cgxmlbin_linux \
@@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://cg_xml_${PV}_Manifest.pdf;md5=fc02a39748ba50373f32b2f
19SRC_URI[cgxmlbin_linux.md5sum] = "6ce60caa97bbf15158d806fb062fadff" 19SRC_URI[cgxmlbin_linux.md5sum] = "6ce60caa97bbf15158d806fb062fadff"
20SRC_URI[cgxmlbin_linux.sha256sum] = "da77cb10bd3d5de89e27e4ce8f4408a2e50775c8980225f9a828ddc242bb81f9" 20SRC_URI[cgxmlbin_linux.sha256sum] = "da77cb10bd3d5de89e27e4ce8f4408a2e50775c8980225f9a828ddc242bb81f9"
21 21
22BINFILE="cgxml-${PV}-linux-installer.run" 22BINFILE = "cgxml-${PV}-linux-installer.run"
23TI_BIN_UNPK_CMDS="" 23TI_BIN_UNPK_CMDS = ""
24TI_BIN_UNPK_ARGS="--prefix ${S} --mode unattended" 24TI_BIN_UNPK_ARGS = "--prefix ${S} --mode unattended"
25 25
26do_install() { 26do_install() {
27 CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" 27 CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb b/meta-ti-extras/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb
index b7b6d9b1..031d889f 100644
--- a/meta-ti-extras/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb
+++ b/meta-ti-extras/recipes-ti/devtools/ti-cgt-arm_18.12.5.bb
@@ -8,7 +8,7 @@ require recipes-ti/includes/ti-unpack.inc
8require recipes-ti/includes/ti-staging.inc 8require recipes-ti/includes/ti-staging.inc
9require recipes-ti/includes/ti-paths.inc 9require recipes-ti/includes/ti-paths.inc
10 10
11S = "${WORKDIR}/ti-cgt-arm-${PV}" 11S = "${UNPACKDIR}/ti-cgt-arm-${PV}"
12 12
13PE = "1" 13PE = "1"
14PR = "r0" 14PR = "r0"
diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb b/meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb
index c96113fe..7ef20b7a 100644
--- a/meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb
+++ b/meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb
@@ -1,8 +1,8 @@
1DESCRIPTION = "TI PRU Code Generation Tools" 1SUMMARY = "TI PRU Code Generation Tools"
2HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm" 2HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm"
3LICENSE = "(TI-TSPA & Thai-Open-Source-Software-Center) & BSD-3-Clause & BSL-1.0 & Hewlett-Packard & AFL-3.0 & MIT & BSD-2-Clause & PD" 3LICENSE = "(TI-TSPA & Thai-Open-Source-Software-Center) & BSD-3-Clause & BSL-1.0 & Hewlett-Packard & AFL-3.0 & MIT & BSD-2-Clause & PD"
4 4
5LIC_FILES_CHKSUM = "file://ti-cgt-pru_${PV}/PRU_Code_Generation_Tools_2.3.x_manifest.html;md5=e22f9d8240f7cca0c0aa5242d9ffa5bc" 5LIC_FILES_CHKSUM = "file://${UNPACKDIR}/ti-cgt-pru_${PV}/PRU_Code_Generation_Tools_2.3.x_manifest.html;md5=e22f9d8240f7cca0c0aa5242d9ffa5bc"
6LIC_FILES_CHKSUM:class-target = "file://usr/share/doc/ti/cgt-pru/PRU_Code_Generation_Tools_2.3.x_manifest.html;md5=e22f9d8240f7cca0c0aa5242d9ffa5bc" 6LIC_FILES_CHKSUM:class-target = "file://usr/share/doc/ti/cgt-pru/PRU_Code_Generation_Tools_2.3.x_manifest.html;md5=e22f9d8240f7cca0c0aa5242d9ffa5bc"
7 7
8require recipes-ti/includes/ti-paths.inc 8require recipes-ti/includes/ti-paths.inc
@@ -10,7 +10,7 @@ require recipes-ti/includes/ti-unpack.inc
10 10
11BINFILE = "ti_cgt_pru_${PV}_linux_installer_x86.bin" 11BINFILE = "ti_cgt_pru_${PV}_linux_installer_x86.bin"
12BINFILE_NAME = "cgt-pru-x86" 12BINFILE_NAME = "cgt-pru-x86"
13TI_BIN_UNPK_ARGS = "--prefix ${S}" 13TI_BIN_UNPK_ARGS = "--prefix ${UNPACKDIR}"
14TI_BIN_UNPK_CMDS = "" 14TI_BIN_UNPK_CMDS = ""
15 15
16BINFILE:class-target = "ti_cgt_pru_${PV}_armlinuxa8hf_busybox_installer.sh" 16BINFILE:class-target = "ti_cgt_pru_${PV}_armlinuxa8hf_busybox_installer.sh"
@@ -24,14 +24,17 @@ SRC_URI[cgt-pru-x86.sha256sum] = "1f1405167214f2c0ef848591b17a7799fdcd9f55f11bc9
24SRC_URI[cgt-pru-arm.md5sum] = "648a6d7d8162fd6a89f381c7b974e6b0" 24SRC_URI[cgt-pru-arm.md5sum] = "648a6d7d8162fd6a89f381c7b974e6b0"
25SRC_URI[cgt-pru-arm.sha256sum] = "8390cb77b46b728ce2940595b81406f76d86dfed58c21258e3206a7c1232ccf2" 25SRC_URI[cgt-pru-arm.sha256sum] = "8390cb77b46b728ce2940595b81406f76d86dfed58c21258e3206a7c1232ccf2"
26 26
27S = "${UNPACKDIR}"
28
27do_install() { 29do_install() {
28 install -d ${D}${TI_CGT_PRU_INSTALL_DIR_RECIPE} 30 install -d ${D}${TI_CGT_PRU_INSTALL_DIR_RECIPE}
29 cp -r ${S}/ti-cgt-pru_${PV}/. \ 31 cp -r ${S}/ti-cgt-pru_${PV}/. \
30 ${D}${TI_CGT_PRU_INSTALL_DIR_RECIPE}/ 32 ${D}${TI_CGT_PRU_INSTALL_DIR_RECIPE}/
33 rm ${D}${TI_CGT_PRU_INSTALL_DIR_RECIPE}/*installer_install.log
31} 34}
32 35
33do_install:class-target() { 36do_install:class-target() {
34 ${WORKDIR}/${BINFILE} --prefix ${D} 37 ${S}/${BINFILE} --prefix ${D}
35} 38}
36 39
37FILES:${PN} += "${datadir}/ti/*" 40FILES:${PN} += "${datadir}/ti/*"
diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cgt470.inc b/meta-ti-extras/recipes-ti/devtools/ti-cgt470.inc
index f0992aa7..f32bc0d3 100644
--- a/meta-ti-extras/recipes-ti/devtools/ti-cgt470.inc
+++ b/meta-ti-extras/recipes-ti/devtools/ti-cgt470.inc
@@ -1,4 +1,4 @@
1DESCRIPTION = "TI ARM Code Generation Tools" 1SUMMARY = "TI ARM Code Generation Tools"
2HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/CodeGenerationTools.htm" 2HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/CodeGenerationTools.htm"
3SECTION = "devel" 3SECTION = "devel"
4LICENSE = "TI" 4LICENSE = "TI"
@@ -9,13 +9,13 @@ require ../includes/ti-paths.inc
9require ../includes/ti-staging.inc 9require ../includes/ti-staging.inc
10require ../includes/ti-eula-unpack.inc 10require ../includes/ti-eula-unpack.inc
11 11
12S = "${WORKDIR}/cgt470_${PV}" 12S = "${UNPACKDIR}/cgt470_${PV}"
13 13
14SRC_URI = "http://install.source.dir.local/ti_cgt_tms470_${PVwithdots}_setup_linux_x86.bin;name=cgt470bin" 14SRC_URI = "http://install.source.dir.local/ti_cgt_tms470_${PVwithdots}_setup_linux_x86.bin;name=cgt470bin"
15 15
16BINFILE="ti_cgt_tms470_${PVwithdots}_setup_linux_x86.bin" 16BINFILE = "ti_cgt_tms470_${PVwithdots}_setup_linux_x86.bin"
17TI_BIN_UNPK_CMDS="Y:qY:workdir: : " 17TI_BIN_UNPK_CMDS = "Y:qY:workdir: : "
18TI_BIN_UNPK_WDEXT="/cgt470_${PV}" 18TI_BIN_UNPK_WDEXT = "/cgt470_${PV}"
19 19
20do_install() { 20do_install() {
21 install -d ${D}${CODEGEN_ARM_INSTALL_DIR_RECIPE} 21 install -d ${D}${CODEGEN_ARM_INSTALL_DIR_RECIPE}
diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cgt6x-7_7.4.16.bb b/meta-ti-extras/recipes-ti/devtools/ti-cgt6x-7_7.4.16.bb
index a7de8e38..adf21563 100644
--- a/meta-ti-extras/recipes-ti/devtools/ti-cgt6x-7_7.4.16.bb
+++ b/meta-ti-extras/recipes-ti/devtools/ti-cgt6x-7_7.4.16.bb
@@ -11,15 +11,15 @@ LICENSE = "TI-TSPA"
11 11
12LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b6311962635a4f15630e36ec2d875eca" 12LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b6311962635a4f15630e36ec2d875eca"
13 13
14S = "${WORKDIR}/c6000_7.4.16" 14S = "${UNPACKDIR}/c6000_7.4.16"
15 15
16require recipes-ti/includes/ti-paths.inc 16require recipes-ti/includes/ti-paths.inc
17require recipes-ti/includes/ti-unpack.inc 17require recipes-ti/includes/ti-unpack.inc
18 18
19BINFILE = "ti_cgt_c6000_7.4.16_linux_installer_x86.bin" 19BINFILE = "ti_cgt_c6000_7.4.16_linux_installer_x86.bin"
20BINFILE_NAME = "cgt6x_7.4.16_x86_installer" 20BINFILE_NAME = "cgt6x_7.4.16_x86_installer"
21TI_BIN_UNPK_ARGS = "--prefix ${WORKDIR} --mode unattended" 21TI_BIN_UNPK_ARGS = "--prefix ${UNPACKDIR} --mode unattended"
22TI_BIN_UNPK_CMDS="" 22TI_BIN_UNPK_CMDS = ""
23 23
24SRC_URI = "http://install.source.dir.local/${BINFILE};name=${BINFILE_NAME}" 24SRC_URI = "http://install.source.dir.local/${BINFILE};name=${BINFILE_NAME}"
25 25
@@ -32,7 +32,7 @@ COMPATIBLE_HOST:class-target = "null"
32 32
33do_install() { 33do_install() {
34 install -d ${D}/${TI_CGT6X_7_INSTALL_DIR_RECIPE} 34 install -d ${D}/${TI_CGT6X_7_INSTALL_DIR_RECIPE}
35 cp -rP --preserve=mode,links,timestamps --no-preserve=ownership ${WORKDIR}/c6000_7.4.16/. ${D}/${TI_CGT6X_7_INSTALL_DIR_RECIPE} 35 cp -rP --preserve=mode,links,timestamps --no-preserve=ownership ${UNPACKDIR}/c6000_7.4.16/. ${D}/${TI_CGT6X_7_INSTALL_DIR_RECIPE}
36} 36}
37 37
38FILES:${PN} += "${TI_CGT6X_7_INSTALL_DIR_RECIPE}" 38FILES:${PN} += "${TI_CGT6X_7_INSTALL_DIR_RECIPE}"
diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cgt6x_8.3.2.bb b/meta-ti-extras/recipes-ti/devtools/ti-cgt6x_8.3.2.bb
index fd34657a..25e0f596 100644
--- a/meta-ti-extras/recipes-ti/devtools/ti-cgt6x_8.3.2.bb
+++ b/meta-ti-extras/recipes-ti/devtools/ti-cgt6x_8.3.2.bb
@@ -1,4 +1,4 @@
1DESCRIPTION = "TI DSP Code Generation Tools" 1SUMMARY = "TI DSP Code Generation Tools"
2HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm" 2HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm"
3LICENSE = "(TI-TSPA & Thai-Open-Source-Software-Center) & BSD-3-Clause & BSL-1.0 & Patrick-Powell & AFL-3.0 & MIT & BSD-2-Clause & PD" 3LICENSE = "(TI-TSPA & Thai-Open-Source-Software-Center) & BSD-3-Clause & BSL-1.0 & Patrick-Powell & AFL-3.0 & MIT & BSD-2-Clause & PD"
4 4
@@ -92,7 +92,7 @@ do_install() {
92} 92}
93 93
94do_install:class-target() { 94do_install:class-target() {
95 ${WORKDIR}/${BINFILE} --prefix ${D} 95 ${UNPACKDIR}/${BINFILE} --prefix ${D}
96} 96}
97 97
98FILES:${PN} += "${datadir}/ti/*" 98FILES:${PN} += "${datadir}/ti/*"
diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cgt7x_1.2.0.bb b/meta-ti-extras/recipes-ti/devtools/ti-cgt7x_1.2.0.bb
index b45b52a3..04b16032 100644
--- a/meta-ti-extras/recipes-ti/devtools/ti-cgt7x_1.2.0.bb
+++ b/meta-ti-extras/recipes-ti/devtools/ti-cgt7x_1.2.0.bb
@@ -30,11 +30,11 @@ TI_BIN_UNPK_CMDS = ""
30SRC_URI[cgt7x_x86_installer.md5sum] = "813840908f333dd2a31f92edec71c1fb" 30SRC_URI[cgt7x_x86_installer.md5sum] = "813840908f333dd2a31f92edec71c1fb"
31SRC_URI[cgt7x_x86_installer.sha256sum] = "21379811a8857489f72ca8ec45a46eb086ced0bdbb58e78f73a86e63984ab2f5" 31SRC_URI[cgt7x_x86_installer.sha256sum] = "21379811a8857489f72ca8ec45a46eb086ced0bdbb58e78f73a86e63984ab2f5"
32 32
33S = "${WORKDIR}/c7000_${PV}" 33S = "${UNPACKDIR}/c7000_${PV}"
34 34
35do_install() { 35do_install() {
36 install -d ${D}/${TI_CGT7X_INSTALL_DIR_RECIPE} 36 install -d ${D}/${TI_CGT7X_INSTALL_DIR_RECIPE}
37 cp -rP --preserve=mode,links,timestamps --no-preserve=ownership ${WORKDIR}/c7000_${PV}/ti-cgt-c7000_${PV}.STS/. ${D}/${TI_CGT7X_INSTALL_DIR_RECIPE} 37 cp -rP --preserve=mode,links,timestamps --no-preserve=ownership ${UNPACKDIR}/c7000_${PV}/ti-cgt-c7000_${PV}.STS/. ${D}/${TI_CGT7X_INSTALL_DIR_RECIPE}
38} 38}
39 39
40 40
diff --git a/meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb b/meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb
index b1361804..969518e2 100644
--- a/meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb
+++ b/meta-ti-extras/recipes-ti/devtools/ti-xdctools_3.55.02.22.bb
@@ -1,3 +1,4 @@
1SUMMARY = "TI XDCtools (RTSC - Real Time Software Components"
1DESCRIPTION = "TI XDCtools (RTSC - Real Time Software Components - http://rtsc.eclipse.org)" 2DESCRIPTION = "TI XDCtools (RTSC - Real Time Software Components - http://rtsc.eclipse.org)"
2HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc" 3HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc"
3SECTION = "devel" 4SECTION = "devel"
@@ -69,7 +70,7 @@ COMPATIBLE_HOST:ti-soc = "(.*)"
69COMPATIBLE_HOST:class-native = "(.*)" 70COMPATIBLE_HOST:class-native = "(.*)"
70COMPATIBLE_HOST:class-nativesdk = "(.*)" 71COMPATIBLE_HOST:class-nativesdk = "(.*)"
71 72
72S = "${WORKDIR}/xdctools_${PV}_core" 73S = "${UNPACKDIR}/xdctools_${PV}_core"
73 74
74SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/${PV}/exports/xdccore/xdctools_${PV}_core_linux.zip;name=xdczip" 75SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/${PV}/exports/xdccore/xdctools_${PV}_core_linux.zip;name=xdczip"
75 76
diff --git a/meta-ti-extras/recipes-ti/dsplib/dsplib.inc b/meta-ti-extras/recipes-ti/dsplib/dsplib.inc
index 6ebc3b34..566dab0a 100644
--- a/meta-ti-extras/recipes-ti/dsplib/dsplib.inc
+++ b/meta-ti-extras/recipes-ti/dsplib/dsplib.inc
@@ -11,11 +11,8 @@ DEPENDS = "ti-cgt6x-native \
11 ti-xdctools-native \ 11 ti-xdctools-native \
12 ti-sysbios \ 12 ti-sysbios \
13 doxygen-native \ 13 doxygen-native \
14 zip-native \
15 swtools" 14 swtools"
16 15
17S = "${WORKDIR}/git"
18
19DSPLIB_GIT_BRANCH = "master" 16DSPLIB_GIT_BRANCH = "master"
20DSPLIB_GIT_PROTOCOL = "https" 17DSPLIB_GIT_PROTOCOL = "https"
21DSPLIB_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/dsplib.git" 18DSPLIB_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/dsplib.git"
@@ -26,19 +23,19 @@ SRCREV = "${DSPLIB_SRCREV}"
26 23
27LIC_FILES_CHKSUM = "file://ti/dsplib/src/common/c66/lnk.cmd;beginline=1;endline=37;md5=0f0c9c4d51d8af75419781591ace190b" 24LIC_FILES_CHKSUM = "file://ti/dsplib/src/common/c66/lnk.cmd;beginline=1;endline=37;md5=0f0c9c4d51d8af75419781591ace190b"
28 25
29export DSPLIB_WORK_DIR="${S}" 26export DSPLIB_WORK_DIR = "${S}"
30export CGTOOLS_INSTALL_DIR = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" 27export CGTOOLS_INSTALL_DIR = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
31export C64PCODEGENTOOL="${CGTOOLS_INSTALL_DIR}" 28export C64PCODEGENTOOL = "${CGTOOLS_INSTALL_DIR}"
32export C674CODEGENTOOL="${CGTOOLS_INSTALL_DIR}" 29export C674CODEGENTOOL = "${CGTOOLS_INSTALL_DIR}"
33export C66CODEGENTOOL ="${CGTOOLS_INSTALL_DIR}" 30export C66CODEGENTOOL = "${CGTOOLS_INSTALL_DIR}"
34export SWTOOLS_PATH = "${SWTOOLS_INSTALL_DIR}/ti/mas/swtools" 31export SWTOOLS_PATH = "${SWTOOLS_INSTALL_DIR}/ti/mas/swtools"
35export XDCBUILDCFG="${SWTOOLS_PATH}/config.bld" 32export XDCBUILDCFG = "${SWTOOLS_PATH}/config.bld"
36export INCDIR="${MATHLIB_INSTALL_DIR}/" 33export INCDIR = "${MATHLIB_INSTALL_DIR}/"
37 34
38PATH:append = ":${XDC_INSTALL_DIR}" 35PATH:append = ":${XDC_INSTALL_DIR}"
39 36
40XDCPATH.="${XDCCGROOT}/include;${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages;" 37XDCPATH .= "${XDCCGROOT}/include;${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages;"
41XDCPATH.="${SWTOOLS_INSTALL_DIR};${MATHLIB_INSTALL_DIR};${DSPLIB_WORK_DIR};" 38XDCPATH .= "${SWTOOLS_INSTALL_DIR};${MATHLIB_INSTALL_DIR};${DSPLIB_WORK_DIR};"
42 39
43export XDCPATH 40export XDCPATH
44 41
@@ -57,19 +54,6 @@ do_install() {
57 rm -r ${D}${DSPLIB_INSTALL_DIR_RECIPE}/dsplib 54 rm -r ${D}${DSPLIB_INSTALL_DIR_RECIPE}/dsplib
58} 55}
59 56
60inherit deploy
61addtask deploy before do_build after do_install
62
63do_deploy() {
64 install -d ${DEPLOYDIR}
65 # zip up files in ${D}${DSPLIB_INSTALL_DIR_RECIPE}
66 # and place the zip file in ${DEPLOYDIR}
67 mkdir ./${DSPLIB_PACKAGE_NAME}
68 cp -r ${D}${DSPLIB_INSTALL_DIR_RECIPE}/. ./${DSPLIB_PACKAGE_NAME}
69 zip -9 -y -r -q ${DEPLOYDIR}/${DSPLIB_PACKAGE_NAME}.zip ./${DSPLIB_PACKAGE_NAME}
70 rm -r ./${DSPLIB_PACKAGE_NAME}
71}
72
73ALLOW_EMPTY:${PN} = "1" 57ALLOW_EMPTY:${PN} = "1"
74FILES:${PN}-dev += "${DSPLIB_INSTALL_DIR_RECIPE}" 58FILES:${PN}-dev += "${DSPLIB_INSTALL_DIR_RECIPE}"
75 59
diff --git a/meta-ti-extras/recipes-ti/framework-components/ti-framework-components.inc b/meta-ti-extras/recipes-ti/framework-components/ti-framework-components.inc
index 81407ed7..6a1768a3 100644
--- a/meta-ti-extras/recipes-ti/framework-components/ti-framework-components.inc
+++ b/meta-ti-extras/recipes-ti/framework-components/ti-framework-components.inc
@@ -1,11 +1,11 @@
1DESCRIPTION = "TI Framework Components" 1SUMMARY = "TI Framework Components"
2HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/fc" 2HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/fc"
3SECTION = "devel" 3SECTION = "devel"
4LICENSE = "BSD-3-Clause" 4LICENSE = "BSD-3-Clause"
5 5
6require recipes-ti/includes/ti-paths.inc 6require recipes-ti/includes/ti-paths.inc
7 7
8S = "${WORKDIR}/framework_components_${PV}" 8S = "${UNPACKDIR}/framework_components_${PV}"
9 9
10SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/fc/${PV}/exports/framework_components_${PV},lite.tar.gz;name=fctarball" 10SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/fc/${PV}/exports/framework_components_${PV},lite.tar.gz;name=fctarball"
11 11
diff --git a/meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc b/meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc
index ab5cbdb6..8fa2ceca 100644
--- a/meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc
+++ b/meta-ti-extras/recipes-ti/imglib/imglib-c66x.inc
@@ -1,3 +1,4 @@
1SUMMARY = "IMGLIB for TI DSPs"
1DESCRIPTION = "IMGLIB contains optimized general-purpose image/video processing routines for TI DSPs" 2DESCRIPTION = "IMGLIB contains optimized general-purpose image/video processing routines for TI DSPs"
2HOMEPAGE = "http://www.ti.com/tool/sprc264" 3HOMEPAGE = "http://www.ti.com/tool/sprc264"
3SECTION = "devel" 4SECTION = "devel"
@@ -11,7 +12,7 @@ COMPATIBLE_MACHINE = "omap-a15"
11 12
12SRC_URI = "http://software-dl.ti.com/sdoemb/sdoemb_public_sw/imglib/${PV}/exports/${BINFILE};name=imglib" 13SRC_URI = "http://software-dl.ti.com/sdoemb/sdoemb_public_sw/imglib/${PV}/exports/${BINFILE};name=imglib"
13 14
14S = "${WORKDIR}/imglib-c66x-${PV}" 15S = "${UNPACKDIR}/imglib-c66x-${PV}"
15 16
16BINFILE = "imglib_c66x_${PV}_Linux.bin" 17BINFILE = "imglib_c66x_${PV}_Linux.bin"
17TI_BIN_UNPK_ARGS = "--mode silent --prefix ${S}" 18TI_BIN_UNPK_ARGS = "--mode silent --prefix ${S}"
diff --git a/meta-ti-extras/recipes-ti/includes/ti-paths.inc b/meta-ti-extras/recipes-ti/includes/ti-paths.inc
index e8b0f17b..9f8b5897 100644
--- a/meta-ti-extras/recipes-ti/includes/ti-paths.inc
+++ b/meta-ti-extras/recipes-ti/includes/ti-paths.inc
@@ -20,7 +20,6 @@ export MATHLIB_C66_INSTALL_DIR_RECIPE = "${installdir}/ti-mathlib-c66x-tree"
20export MATHLIB_C674_INSTALL_DIR_RECIPE = "${installdir}/ti-mathlib-c674x-tree" 20export MATHLIB_C674_INSTALL_DIR_RECIPE = "${installdir}/ti-mathlib-c674x-tree"
21export MPM_INSTALL_DIR_RECIPE = "${installdir}/ti-mpm-tree" 21export MPM_INSTALL_DIR_RECIPE = "${installdir}/ti-mpm-tree"
22export OMP_INSTALL_DIR_RECIPE = "${installdir}/ti-omp-tree" 22export OMP_INSTALL_DIR_RECIPE = "${installdir}/ti-omp-tree"
23export OSAL_INSTALL_DIR_RECIPE = "${installdir}/ti-osal-tree"
24export PDK_INSTALL_DIR_RECIPE = "${installdir}/ti-pdk-tree" 23export PDK_INSTALL_DIR_RECIPE = "${installdir}/ti-pdk-tree"
25export SYSBIOS_INSTALL_DIR_RECIPE = "${installdir}/ti-sysbios-tree" 24export SYSBIOS_INSTALL_DIR_RECIPE = "${installdir}/ti-sysbios-tree"
26export SWTOOLS_INSTALL_DIR_RECIPE = "${installdir}/ti-swtools-tree" 25export SWTOOLS_INSTALL_DIR_RECIPE = "${installdir}/ti-swtools-tree"
@@ -48,7 +47,6 @@ export MATHLIB_C66_INSTALL_DIR = "${STAGING_DIR_TARGET}${MATHLIB_C66_INSTALL_DI
48export MATHLIB_C674_INSTALL_DIR = "${STAGING_DIR_TARGET}${MATHLIB_C674_INSTALL_DIR_RECIPE}" 47export MATHLIB_C674_INSTALL_DIR = "${STAGING_DIR_TARGET}${MATHLIB_C674_INSTALL_DIR_RECIPE}"
49export MPM_INSTALL_DIR = "${STAGING_DIR_TARGET}${MPM_INSTALL_DIR_RECIPE}" 48export MPM_INSTALL_DIR = "${STAGING_DIR_TARGET}${MPM_INSTALL_DIR_RECIPE}"
50export OMP_INSTALL_DIR = "${STAGING_DIR_TARGET}${OMP_INSTALL_DIR_RECIPE}" 49export OMP_INSTALL_DIR = "${STAGING_DIR_TARGET}${OMP_INSTALL_DIR_RECIPE}"
51export OSAL_INSTALL_DIR = "${STAGING_DIR_TARGET}${OSAL_INSTALL_DIR_RECIPE}"
52export PDK_INSTALL_DIR = "${STAGING_DIR_TARGET}${PDK_INSTALL_DIR_RECIPE}" 50export PDK_INSTALL_DIR = "${STAGING_DIR_TARGET}${PDK_INSTALL_DIR_RECIPE}"
53export SWTOOLS_INSTALL_DIR = "${STAGING_DIR_TARGET}${SWTOOLS_INSTALL_DIR_RECIPE}" 51export SWTOOLS_INSTALL_DIR = "${STAGING_DIR_TARGET}${SWTOOLS_INSTALL_DIR_RECIPE}"
54export SYSBIOS_INSTALL_DIR = "${STAGING_DIR_TARGET}${SYSBIOS_INSTALL_DIR_RECIPE}" 52export SYSBIOS_INSTALL_DIR = "${STAGING_DIR_TARGET}${SYSBIOS_INSTALL_DIR_RECIPE}"
diff --git a/meta-ti-extras/recipes-ti/includes/ti-unpack.inc b/meta-ti-extras/recipes-ti/includes/ti-unpack.inc
index 13068843..4cefefbf 100644
--- a/meta-ti-extras/recipes-ti/includes/ti-unpack.inc
+++ b/meta-ti-extras/recipes-ti/includes/ti-unpack.inc
@@ -5,7 +5,7 @@
5# TI_BIN_UNPK_ARGS - contains the arguments to be passed to the bin file. 5# TI_BIN_UNPK_ARGS - contains the arguments to be passed to the bin file.
6# TI_BIN_UNPK_CMDS - contains list of commands separated with colon to be 6# TI_BIN_UNPK_CMDS - contains list of commands separated with colon to be
7# passed while unpacking the bin file. The keyword 7# passed while unpacking the bin file. The keyword
8# workdir expands to WORKDIR and commands are appendded 8# workdir expands to UNPACKDIR and commands are appendded
9# with '\n'. Eg. TI_BIN_UNPK_CMDS="Y:Y: qY:workdir" 9# with '\n'. Eg. TI_BIN_UNPK_CMDS="Y:Y: qY:workdir"
10# TI_BIN_UNPK_WDEXT - This variable extends workdir path, if user wants to put 10# TI_BIN_UNPK_WDEXT - This variable extends workdir path, if user wants to put
11# the output in some internal directory 11# the output in some internal directory
@@ -30,7 +30,7 @@ python ti_bin_do_unpack() {
30 30
31 # Change to the working directory 31 # Change to the working directory
32 save_cwd = os.getcwd() 32 save_cwd = os.getcwd()
33 workdir = localdata.getVar('WORKDIR') 33 workdir = localdata.getVar('UNPACKDIR')
34 workdir = bb.data.expand(workdir, localdata) 34 workdir = bb.data.expand(workdir, localdata)
35 os.chdir(workdir) 35 os.chdir(workdir)
36 36
diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux/0001-examples-ClusterMgr-sys_errlist-has-been-deprecated-.patch b/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux/0001-examples-ClusterMgr-sys_errlist-has-been-deprecated-.patch
deleted file mode 100644
index ea514695..00000000
--- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux/0001-examples-ClusterMgr-sys_errlist-has-been-deprecated-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From cca4fd812959a0cd241dd3bbebfd461ece94c9b8 Mon Sep 17 00:00:00 2001
2From: Denys Dmytriyenko <denis@denix.org>
3Date: Mon, 29 Mar 2021 19:42:00 -0400
4Subject: [PATCH] examples/ClusterMgr: sys_errlist[] has been deprecated in
5 glibc
6
7Use strerror() instead.
8
9Upstream-Status: Pending
10
11Signed-off-by: Denys Dmytriyenko <denis@denix.org>
12---
13 src/examples/templates/ex46_graph/manager/ClusterMgr.c | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/src/examples/templates/ex46_graph/manager/ClusterMgr.c b/src/examples/templates/ex46_graph/manager/ClusterMgr.c
17index 19216c9..a1fa679 100644
18--- a/src/examples/templates/ex46_graph/manager/ClusterMgr.c
19+++ b/src/examples/templates/ex46_graph/manager/ClusterMgr.c
20@@ -714,7 +714,7 @@ static pid_t ClusterMgr_system(char *cmd, bool wait)
21 pid = fork();
22
23 if (pid == -1) {
24- LOG "CM_system: fork error: %s\n", sys_errlist[errno] LOGF
25+ LOG "CM_system: fork error: %s\n", strerror(errno) LOGF
26 status = -1;
27 goto leave;
28 }
29@@ -739,7 +739,7 @@ static pid_t ClusterMgr_system(char *cmd, bool wait)
30 else {
31 /* overlay a new executable */
32 execvp(argv[0], argv);
33- LOG "CM_system: execvp error: %s\n", sys_errlist[errno] LOGF
34+ LOG "CM_system: execvp error: %s\n", strerror(errno) LOGF
35 status = -1;
36 }
37
38--
392.7.4
40
diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux_git.bb b/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux_git.bb
deleted file mode 100644
index 81706592..00000000
--- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples-linux_git.bb
+++ /dev/null
@@ -1,49 +0,0 @@
1DESCRIPTION = "TI Inter Process Communication (IPC) examples with Host running bios"
2require ti-ipc-examples.inc
3
4SRC_URI += "file://0001-examples-ClusterMgr-sys_errlist-has-been-deprecated-.patch;patchdir=../git/ipc-examples"
5
6DEPENDS = "ti-ipc ti-xdctools-native ti-sysbios ti-ipc-rtos zip-native"
7
8do_compile:append() {
9
10 if [ "${PLATFORM}" != "UNKNOWN" ]; then
11 oe_runmake extract HOSTOS="linux" IPC_INSTALL_DIR="${IPC_INSTALL_DIR}"
12
13 if [ ! -z ${ALT_PLATFORM} ]; then
14 oe_runmake extract PLATFORM="${ALT_PLATFORM}" HOSTOS="linux" \
15 IPC_INSTALL_DIR="${IPC_INSTALL_DIR}"
16 fi
17 oe_runmake -C examples all HOSTOS="linux" \
18 LINUX_SYSROOT_DIR="${STAGING_INCDIR}" \
19 IPC_INSTALL_DIR="${IPC_INSTALL_DIR}"
20
21 if [ ! -z ${ALT_PLATFORM} ]; then
22 oe_runmake -C examples all HOSTOS="linux" \
23 LINUX_SYSROOT_DIR="${STAGING_INCDIR}" \
24 IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
25 PLATFORM="${ALT_PLATFORM}"
26 fi
27 fi
28}
29
30do_install:append() {
31 cd ${S_ipc-examples}/src
32
33 if [ "${PLATFORM}" != "UNKNOWN" ]; then
34 # Install directory for linux examples
35 install -d ${D}${bindir}/ipc/examples
36 oe_runmake -C examples install IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
37 LINUX_SYSROOT_DIR="${STAGING_INCDIR}" \
38 HOSTOS="linux" EXEC_DIR="${D}/${bindir}/ipc/examples"
39
40 if [ ! -z ${ALT_PLATFORM} ]; then
41 oe_runmake -C examples install IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
42 LINUX_SYSROOT_DIR="${STAGING_INCDIR}" \
43 HOSTOS="linux" EXEC_DIR="${D}/${bindir}/ipc/examples" \
44 PLATFORM="${ALT_PLATFORM}"
45 fi
46 fi
47}
48
49FILES:${PN} += "${bindir}/*"
diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples.inc b/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples.inc
deleted file mode 100644
index 09352505..00000000
--- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples.inc
+++ /dev/null
@@ -1,31 +0,0 @@
1HOMEPAGE = "http://processors.wiki.ti.com/index.php/Category:IPC"
2require recipes-ti/ipc/ti-ipc-common.inc
3require ti-ipc-rtos.inc
4
5LICENSE = "BSD-3-Clause"
6LIC_FILES_CHKSUM = "file://${S_ipc-examples}/src/makefile;beginline=1;endline=30;md5=a52324bd5033bb49ea07bade1244ac9a"
7
8INSANE_SKIP:${PN} += "arch"
9
10ALLOW_EMPTY:${PN} = "1"
11
12IPC_INSTALL_DIR = "${STAGING_DIR_TARGET}/usr/share/ti/ti-ipc-tree"
13
14do_compile() {
15
16 cd ${S_ipc-examples}/src
17 oe_runmake .examples \
18 IPCTOOLS="${S_ipc-metadata}/src/etc"
19
20 for alt_platform in ${ALT_PLATFORM}; do
21 oe_runmake .examples "PLATFORM=${alt_platform}" \
22 IPCTOOLS="${S_ipc-metadata}/src/etc"
23 done
24}
25
26do_install() {
27 cd ${S_ipc-examples}/src
28 IPC_VERSION=`echo ${PV}${RELEASE_SUFFIX} | sed -e 's|\.|_|g'`
29}
30
31INHIBIT_PACKAGE_STRIP = "1"
diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples_git.bb b/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples_git.bb
deleted file mode 100644
index bcc8674e..00000000
--- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-examples_git.bb
+++ /dev/null
@@ -1,44 +0,0 @@
1DESCRIPTION = "TI Inter Process Communication (IPC) examples with Host running linux"
2require ti-ipc-examples.inc
3
4DEPENDS = "ti-ipc ti-xdctools-native ti-sysbios ti-ipc-rtos zip-native"
5
6do_compile:append() {
7
8 if [ "${PLATFORM}" != "UNKNOWN" ]; then
9 oe_runmake extract HOSTOS="bios" IPC_INSTALL_DIR="${IPC_INSTALL_DIR}"
10
11 for alt_platform in ${ALT_PLATFORM}; do
12 oe_runmake extract PLATFORM="${alt_platform}" HOSTOS="bios" \
13 IPC_INSTALL_DIR="${IPC_INSTALL_DIR}"
14 done
15 oe_runmake -C examples all HOSTOS="bios" \
16 IPC_INSTALL_DIR="${IPC_INSTALL_DIR}"
17 for alt_platform in ${ALT_PLATFORM}; do
18 oe_runmake -C examples all HOSTOS="bios" \
19 IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" PLATFORM="${alt_platform}"
20 done
21 fi
22}
23
24do_install:append() {
25 if [ "${PLATFORM}" != "UNKNOWN" ]; then
26 # Install directory for bios examples
27 install -d ${D}/ipc_${IPC_VERSION}/examples/bios
28 oe_runmake -C examples install IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
29 HOSTOS="bios" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples/bios"
30 oe_runmake -C examples install_rov IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
31 HOSTOS="bios" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples/bios"
32
33 for alt_platform in ${ALT_PLATFORM}; do
34 oe_runmake -C examples install IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
35 HOSTOS="bios" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples/${alt_platform}/bios" \
36 PLATFORM="${alt_platform}"
37 oe_runmake -C examples install_rov IPC_INSTALL_DIR="${IPC_INSTALL_DIR}" \
38 HOSTOS="bios" EXEC_DIR="${D}/ipc_${IPC_VERSION}/examples/${alt_platform}/bios" \
39 PLATFORM="${alt_platform}"
40 done
41 fi
42}
43
44FILES:${PN} += "ipc_*"
diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc
index 14ac7c77..2f93db72 100644
--- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc
+++ b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos.inc
@@ -1,7 +1,7 @@
1require recipes-ti/includes/ti-paths.inc 1require recipes-ti/includes/ti-paths.inc
2 2
3TI_IPC_EXAMPLES_GIT_URI = "git://git.ti.com/git/ipc/ipc-examples.git" 3TI_IPC_EXAMPLES_GIT_URI = "git://git.ti.com/git/ipc/ipc-examples.git"
4TI_IPC_EXAMPLES_DEST_SUFFIX = "git/ipc-examples" 4TI_IPC_EXAMPLES_DEST_SUFFIX = "${BB_GIT_DEFAULT_DESTSUFFIX}/ipc-examples"
5TI_IPC_EXAMPLES_GIT_PROTOCOL = "https" 5TI_IPC_EXAMPLES_GIT_PROTOCOL = "https"
6TI_IPC_EXAMPLES_GIT_BRANCH = "master" 6TI_IPC_EXAMPLES_GIT_BRANCH = "master"
7TI_IPC_EXAMPLES_NAME = "ipc-examples" 7TI_IPC_EXAMPLES_NAME = "ipc-examples"
@@ -13,7 +13,7 @@ branch=${TI_IPC_EXAMPLES_GIT_BRANCH};\
13name=${TI_IPC_EXAMPLES_NAME}" 13name=${TI_IPC_EXAMPLES_NAME}"
14 14
15TI_IPC_METADATA_GIT_URI = "git://git.ti.com/git/ipc/ipc-metadata.git" 15TI_IPC_METADATA_GIT_URI = "git://git.ti.com/git/ipc/ipc-metadata.git"
16TI_IPC_METADATA_DEST_SUFFIX = "git/ipc-metadata" 16TI_IPC_METADATA_DEST_SUFFIX = "${BB_GIT_DEFAULT_DESTSUFFIX}/ipc-metadata"
17TI_IPC_METADATA_GIT_PROTOCOL = "https" 17TI_IPC_METADATA_GIT_PROTOCOL = "https"
18TI_IPC_METADATA_GIT_BRANCH = "master" 18TI_IPC_METADATA_GIT_BRANCH = "master"
19TI_IPC_METADATA_NAME = "ipc-metadata" 19TI_IPC_METADATA_NAME = "ipc-metadata"
@@ -33,8 +33,8 @@ SRCREV_FORMAT = "default"
33SRCREV_ipc-metadata = "${TI_IPC_METADATA_SRCREV}" 33SRCREV_ipc-metadata = "${TI_IPC_METADATA_SRCREV}"
34SRCREV_ipc-examples = "${TI_IPC_EXAMPLES_SRCREV}" 34SRCREV_ipc-examples = "${TI_IPC_EXAMPLES_SRCREV}"
35 35
36S_ipc-examples = "${WORKDIR}/git/ipc-examples" 36S_ipc-examples = "${S}/ipc-examples"
37S_ipc-metadata = "${WORKDIR}/git/ipc-metadata" 37S_ipc-metadata = "${S}/ipc-metadata"
38 38
39RELEASE_TYPE = "GA" 39RELEASE_TYPE = "GA"
40RELEASE_SUFFIX = "" 40RELEASE_SUFFIX = ""
diff --git a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb
index 999993ea..853fa117 100644
--- a/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb
+++ b/meta-ti-extras/recipes-ti/ipc/ti-ipc-rtos_git.bb
@@ -2,6 +2,9 @@ require recipes-ti/ipc/ti-ipc.inc
2require recipes-ti/ipc/ti-ipc-common.inc 2require recipes-ti/ipc/ti-ipc-common.inc
3require ti-ipc-rtos.inc 3require ti-ipc-rtos.inc
4 4
5inherit deploy
6inherit update-alternatives
7
5DEPENDS = "ti-xdctools-native ti-sysbios doxygen-native zip-native" 8DEPENDS = "ti-xdctools-native ti-sysbios doxygen-native zip-native"
6 9
7PACKAGES =+ "${PN}-fw" 10PACKAGES =+ "${PN}-fw"
@@ -78,24 +81,43 @@ KFPLAT = ""
78 81
79ALTERNATIVE_PRIORITY = "5" 82ALTERNATIVE_PRIORITY = "5"
80 83
81pkg_postinst:${PN}-fw:omap-a15 () { 84ALTERNATIVE:${PN}-fw:omapl138 = "rproc-dsp-fw"
82 update-alternatives --install /lib/firmware/dra7-dsp1-fw.xe66 dra7-dsp1-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66 ${ALTERNATIVE_PRIORITY} 85ALTERNATIVE:${PN}-fw:omap-a15 = "dra7-dsp1-fw.xe66 \
83 update-alternatives --install /lib/firmware/dra7-dsp2-fw.xe66 dra7-dsp2-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66 ${ALTERNATIVE_PRIORITY} 86 dra7-dsp2-fw.xe66 \
84 update-alternatives --install /lib/firmware/dra7-ipu1-fw.xem4 dra7-ipu1-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4 ${ALTERNATIVE_PRIORITY} 87 dra7-ipu1-fw.xem4 \
85 update-alternatives --install /lib/firmware/dra7-ipu2-fw.xem4 dra7-ipu2-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu2/test_omx_ipu2_vayu.xem4 ${ALTERNATIVE_PRIORITY} 88 dra7-ipu2-fw.xem4 \
86} 89 "
87 90
88pkg_postrm:${PN}-fw:omap-a15 () { 91ALTERNATIVE_LINK_NAME[rproc-dsp-fw] = "${nonarch_base_libdir}/firmware/rproc-dsp-fw"
89 update-alternatives --remove dra7-dsp1-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66 92ALTERNATIVE_LINK_NAME[dra7-dsp1-fw.xe66] = "${nonarch_base_libdir}/firmware/dra7-dsp1-fw.xe66"
90 update-alternatives --remove dra7-dsp2-fw.xe66 ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66 93ALTERNATIVE_LINK_NAME[dra7-dsp2-fw.xe66] = "${nonarch_base_libdir}/firmware/dra7-dsp2-fw.xe66"
91 update-alternatives --remove dra7-ipu1-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4 94ALTERNATIVE_LINK_NAME[dra7-ipu1-fw.xem4] = "${nonarch_base_libdir}/firmware/dra7-ipu1-fw.xem4"
92 update-alternatives --remove dra7-ipu2-fw.xem4 ipc/ti_platforms_evmDRA7XX_ipu2/test_omx_ipu2_vayu.xem4 95ALTERNATIVE_LINK_NAME[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/dra7-ipu2-fw.xem4"
96
97ALTERNATIVE_TARGET[rproc-dsp-fw] = "${nonarch_base_libdir}/firmware/ipc/ti_platforms_evmOMAPL138_DSP/messageq_single.xe674"
98ALTERNATIVE_TARGET[dra7-dsp1-fw.xe66] = "${nonarch_base_libdir}/firmware/ipc/ti_platforms_evmDRA7XX_dsp1/test_omx_dsp1_vayu.xe66"
99ALTERNATIVE_TARGET[dra7-dsp2-fw.xe66] = "${nonarch_base_libdir}/firmware/ipc/ti_platforms_evmDRA7XX_dsp2/test_omx_dsp2_vayu.xe66"
100ALTERNATIVE_TARGET[dra7-ipu1-fw.xem4] = "${nonarch_base_libdir}/firmware/ipc/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4"
101ALTERNATIVE_TARGET[dra7-ipu2-fw.xem4] = "${nonarch_base_libdir}/firmware/ipc/ti_platforms_evmDRA7XX_ipu2/test_omx_ipu2_vayu.xem4"
102
103do_deploy() {
104 install -d ${DEPLOYDIR}
93} 105}
94 106
95pkg_postinst:${PN}-fw:omapl138 () { 107do_deploy:append:omap-a15() {
96 update-alternatives --install /lib/firmware/rproc-dsp-fw rproc-dsp-fw ipc/ti_platforms_evmOMAPL138_DSP/messageq_single.xe674 ${ALTERNATIVE_PRIORITY} 108 install -d ${DEPLOYDIR}/ipc
109 install -m 0644 ${S}/packages/ti/ipc/tests/bin/ti_platforms_evmDRA7XX_ipu1/test_omx_ipu1_vayu.xem4 ${DEPLOYDIR}/ipc/dra7-ipu1-fw.xem4
97} 110}
98 111
99pkg_postrm:${PN}-fw:omapl138 () { 112addtask deploy after do_install
100 update-alternatives --remove rproc-dsp-fw ipc/ti_platforms_evmOMAPL138_DSP/messageq_single.xe674 113
101} 114# Disable the "buildpaths" check while we figure out how we are
115# going to address this issue.
116#
117# The ti-cgt6x compiler is a custom TI compiler for the TI C6000
118# Digital Signal Processor(DSP) platform. It does not currently
119# support reproducible builds and is provided via a binary blob
120# download that we cannot patch in the recipe to address the
121# issue.
122INSANE_SKIP:${PN}-dev += "buildpaths"
123INSANE_SKIP:${PN}-fw += "buildpaths"
diff --git a/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb b/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
index 98ec0e9e..0113a916 100644
--- a/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
+++ b/meta-ti-extras/recipes-ti/jailhouse/jailhouse_git.bb
@@ -10,11 +10,13 @@ JH_CELL_FILES ?= "*.cell"
10JH_CELL_FILES:k3 ?= "k3-*.cell" 10JH_CELL_FILES:k3 ?= "k3-*.cell"
11JH_CELL_FILES:am62xx ?= "k3-am625-*.cell" 11JH_CELL_FILES:am62xx ?= "k3-am625-*.cell"
12JH_CELL_FILES:am62pxx ?= "k3-am62p5-*.cell" 12JH_CELL_FILES:am62pxx ?= "k3-am62p5-*.cell"
13JH_CELL_FILES:am62lxx ?= "k3-am62l*.cell"
13 14
14JH_INMATE_DTB ?= "" 15JH_INMATE_DTB ?= ""
15JH_INMATE_DTB:am62xx ?= "inmate-k3-am625-sk.dtb" 16JH_INMATE_DTB:am62xx ?= "inmate-k3-am625-sk.dtb"
16JH_INMATE_DTB:am65xx ?= "inmate-k3-am654-idk.dtb" 17JH_INMATE_DTB:am65xx ?= "inmate-k3-am654-idk.dtb"
17JH_INMATE_DTB:am62pxx ?= "inmate-k3-am62p5-sk.dtb" 18JH_INMATE_DTB:am62pxx ?= "inmate-k3-am62p5-sk.dtb"
19JH_INMATE_DTB:am62lxx ?= "inmate-k3-am62l3-evm.dtb"
18JH_INMATE_DTB:j7 ?= "inmate-k3-j721e-evm.dtb" 20JH_INMATE_DTB:j7 ?= "inmate-k3-j721e-evm.dtb"
19JH_INMATE_DTB:j7200-evm ?= "inmate-k3-j7200-evm.dtb" 21JH_INMATE_DTB:j7200-evm ?= "inmate-k3-j7200-evm.dtb"
20 22
@@ -22,6 +24,7 @@ JH_LINUX_DEMO_CELL ?= ""
22JH_LINUX_DEMO_CELL:am62xx ?= "k3-am625-sk-linux-demo.cell" 24JH_LINUX_DEMO_CELL:am62xx ?= "k3-am625-sk-linux-demo.cell"
23JH_LINUX_DEMO_CELL:am65xx ?= "k3-am654-idk-linux-demo.cell" 25JH_LINUX_DEMO_CELL:am65xx ?= "k3-am654-idk-linux-demo.cell"
24JH_LINUX_DEMO_CELL:am62pxx ?= "k3-am62p5-sk-linux-demo.cell" 26JH_LINUX_DEMO_CELL:am62pxx ?= "k3-am62p5-sk-linux-demo.cell"
27JH_LINUX_DEMO_CELL:am62lxx ?= "k3-am62l3-evm-linux-demo.cell"
25JH_LINUX_DEMO_CELL:j7 ?= "k3-j721e-evm-linux-demo.cell" 28JH_LINUX_DEMO_CELL:j7 ?= "k3-j721e-evm-linux-demo.cell"
26JH_LINUX_DEMO_CELL:j7200-evm ?= "k3-j7200-evm-linux-demo.cell" 29JH_LINUX_DEMO_CELL:j7200-evm ?= "k3-j7200-evm-linux-demo.cell"
27 30
@@ -31,6 +34,7 @@ JH_RAMFS_IMAGE ?= "${INITRAMFS_IMAGE}"
31JH_CMDLINE ?= "" 34JH_CMDLINE ?= ""
32JH_CMDLINE:am62xx ?= "console=ttyS3,115200n8 earlycon=ns16550a,mmio32,0x02810000" 35JH_CMDLINE:am62xx ?= "console=ttyS3,115200n8 earlycon=ns16550a,mmio32,0x02810000"
33JH_CMDLINE:am62pxx ?= "console=ttyS1,115200n8" 36JH_CMDLINE:am62pxx ?= "console=ttyS1,115200n8"
37JH_CMDLINE:am62lxx ?= "console=ttyS3,115200n8"
34JH_CMDLINE:am65xx ?= "console=ttyS1,115200n8" 38JH_CMDLINE:am65xx ?= "console=ttyS1,115200n8"
35JH_CMDLINE:j7 ?= "console=ttyS3,115200n8" 39JH_CMDLINE:j7 ?= "console=ttyS3,115200n8"
36JH_CMDLINE:j7200-evm ?= "console=ttyS3,115200n8" 40JH_CMDLINE:j7200-evm ?= "console=ttyS3,115200n8"
@@ -51,11 +55,11 @@ do_install() {
51 install -d ${D}/boot 55 install -d ${D}/boot
52 if [ -n "${JH_RAMFS_IMAGE}" ] 56 if [ -n "${JH_RAMFS_IMAGE}" ]
53 then 57 then
54 if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ] 58 if [ -f ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}*-${MACHINE}.rootfs.cpio ]
55 then 59 then
56 install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}-${MACHINE}.cpio ${D}/boot 60 install -m 0644 ${DEPLOY_DIR_IMAGE}/${JH_RAMFS_IMAGE}*-${MACHINE}.rootfs.cpio ${D}/boot
57 else 61 else
58 bberror "Could not find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}-${MACHINE}.cpio)!" 62 bberror "Could not find JH_RAMFS_IMAGE (${JH_RAMFS_IMAGE}*-${MACHINE}.rootfs.cpio)!"
59 bberror "Please make sure that \"cpio\" is in IMAGE_FSTYPES." 63 bberror "Please make sure that \"cpio\" is in IMAGE_FSTYPES."
60 fi 64 fi
61 fi 65 fi
@@ -68,7 +72,7 @@ do_install() {
68 ./jailhouse-cell-linux -w ${D}${JH_DATADIR}/${JH_INMATE_DTB} \ 72 ./jailhouse-cell-linux -w ${D}${JH_DATADIR}/${JH_INMATE_DTB} \
69 -a ${JH_ARCH} -c "${JH_CMDLINE}" \ 73 -a ${JH_ARCH} -c "${JH_CMDLINE}" \
70 -d ../configs/${JH_ARCH}/dts/${JH_INMATE_DTB} \ 74 -d ../configs/${JH_ARCH}/dts/${JH_INMATE_DTB} \
71 -i ${D}/boot/${JH_RAMFS_IMAGE}-${MACHINE}.cpio \ 75 -i ${D}/boot/${JH_RAMFS_IMAGE}*-${MACHINE}.rootfs.cpio \
72 ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \ 76 ${D}${CELL_DIR}/${JH_LINUX_DEMO_CELL} \
73 ${DEPLOY_DIR_IMAGE}/Image \ 77 ${DEPLOY_DIR_IMAGE}/Image \
74 | tr -cd '\11\12\15\40-\176' \ 78 | tr -cd '\11\12\15\40-\176' \
@@ -96,7 +100,8 @@ RDEPENDS:pyjailhouse = "python3-core python3-ctypes python3-fcntl python3-shell"
96 100
97RRECOMMENDS:${PN} = "${PN}-tools" 101RRECOMMENDS:${PN} = "${PN}-tools"
98 102
99INSANE_SKIP:${PN} = "ldflags" 103INSANE_SKIP:${PN} = "ldflags usrmerge"
104INSANE_SKIP:${PN}-dbg = "usrmerge buildpaths"
100 105
101KERNEL_MODULE_AUTOLOAD += "jailhouse" 106KERNEL_MODULE_AUTOLOAD += "jailhouse"
102 107
@@ -117,10 +122,7 @@ python __anonymous () {
117} 122}
118 123
119FILES:${PN} = " \ 124FILES:${PN} = " \
120 /boot/* \ 125 /boot \
121 /usr/libexec \ 126 /usr \
122 /usr/sbin/* \ 127 /lib \
123 /usr/libexec/* \
124 /usr/share/* \
125 /lib/firmware/* \
126" 128"
diff --git a/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc b/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc
index 6faf16b8..e8374201 100644
--- a/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc
+++ b/meta-ti-extras/recipes-ti/jailhouse/ti-jailhouse.inc
@@ -11,10 +11,10 @@ LIC_FILES_CHKSUM = " \
11 file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \ 11 file://COPYING;md5=9fa7f895f96bde2d47fd5b7d95b6ba4d \
12" 12"
13 13
14COMPATIBLE_MACHINE = "am62xx|am62pxx" 14COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx"
15TARGET_CC_ARCH += "${LDFLAGS}" 15TARGET_CC_ARCH += "${LDFLAGS}"
16PV = "0.12+git" 16PV = "0.12+git"
17SRCREV = "603819ef9a771a3c253a141220daab8e61751a43" 17SRCREV = "ef512f9591febed854d8f07ad8c1fa731c2d3c69"
18BRANCH = "master" 18BRANCH = "master"
19SRC_URI = " \ 19SRC_URI = " \
20 git://git.ti.com/git/jailhouse/ti-jailhouse.git;protocol=https;branch=${BRANCH} \ 20 git://git.ti.com/git/jailhouse/ti-jailhouse.git;protocol=https;branch=${BRANCH} \
@@ -43,7 +43,6 @@ export JH_ARCH = "${@map_jh_arch(d.getVar('TARGET_ARCH', True), d)}"
43 43
44COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" 44COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
45 45
46S = "${WORKDIR}/git"
47B = "${S}" 46B = "${S}"
48 47
49DEPENDS = "virtual/kernel dtc-native python3-mako-native python3-mako make-native" 48DEPENDS = "virtual/kernel dtc-native python3-mako-native python3-mako make-native"
@@ -63,6 +62,7 @@ JH_SYSCONFIG_CELL ?= ""
63JH_SYSCONFIG_CELL:am62xx ?= "k3-am625-sk.cell" 62JH_SYSCONFIG_CELL:am62xx ?= "k3-am625-sk.cell"
64JH_SYSCONFIG_CELL:am65xx ?= "k3-am654-idk.cell" 63JH_SYSCONFIG_CELL:am65xx ?= "k3-am654-idk.cell"
65JH_SYSCONFIG_CELL:am62pxx ?= "k3-am62p5-sk.cell" 64JH_SYSCONFIG_CELL:am62pxx ?= "k3-am62p5-sk.cell"
65JH_SYSCONFIG_CELL:am62lxx ?= "k3-am62l3-evm.cell"
66JH_SYSCONFIG_CELL:j7 ?= "k3-j721e-evm.cell" 66JH_SYSCONFIG_CELL:j7 ?= "k3-j721e-evm.cell"
67JH_SYSCONFIG_CELL:j7200-evm ?= "k3-j7200-evm.cell" 67JH_SYSCONFIG_CELL:j7200-evm ?= "k3-j7200-evm.cell"
68 68
diff --git a/meta-ti-extras/recipes-ti/mathlib/mathlib.inc b/meta-ti-extras/recipes-ti/mathlib/mathlib.inc
index 6ad073ec..ae70cc37 100644
--- a/meta-ti-extras/recipes-ti/mathlib/mathlib.inc
+++ b/meta-ti-extras/recipes-ti/mathlib/mathlib.inc
@@ -11,11 +11,8 @@ DEPENDS = "ti-cgt6x-native \
11 ti-xdctools-native \ 11 ti-xdctools-native \
12 ti-sysbios \ 12 ti-sysbios \
13 doxygen-native \ 13 doxygen-native \
14 zip-native \
15 swtools" 14 swtools"
16 15
17S = "${WORKDIR}/git"
18
19MATHLIB_GIT_BRANCH = "master" 16MATHLIB_GIT_BRANCH = "master"
20MATHLIB_GIT_PROTOCOL = "https" 17MATHLIB_GIT_PROTOCOL = "https"
21MATHLIB_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/mathlib.git" 18MATHLIB_GIT_URI = "git://git.ti.com/git/ep-processor-libraries/mathlib.git"
@@ -26,18 +23,18 @@ SRCREV = "${MATHLIB_SRCREV}"
26 23
27LIC_FILES_CHKSUM = "file://ti/mathlib/src/acosdp/acosdp.h;beginline=1;endline=35;md5=c133f7e139b46385906c861dd9552250" 24LIC_FILES_CHKSUM = "file://ti/mathlib/src/acosdp/acosdp.h;beginline=1;endline=35;md5=c133f7e139b46385906c861dd9552250"
28 25
29export MATHLIB_WORK_DIR="${S}" 26export MATHLIB_WORK_DIR = "${S}"
30export CGTOOLS_INSTALL_DIR = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x" 27export CGTOOLS_INSTALL_DIR = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
31export C64PCODEGENTOOL="${CGTOOLS_INSTALL_DIR}" 28export C64PCODEGENTOOL = "${CGTOOLS_INSTALL_DIR}"
32export C674CODEGENTOOL="${CGTOOLS_INSTALL_DIR}" 29export C674CODEGENTOOL = "${CGTOOLS_INSTALL_DIR}"
33export C66CODEGENTOOL ="${CGTOOLS_INSTALL_DIR}" 30export C66CODEGENTOOL = "${CGTOOLS_INSTALL_DIR}"
34export SWTOOLS_PATH = "${SWTOOLS_INSTALL_DIR}/ti/mas/swtools" 31export SWTOOLS_PATH = "${SWTOOLS_INSTALL_DIR}/ti/mas/swtools"
35export XDCBUILDCFG="${SWTOOLS_PATH}/config.bld" 32export XDCBUILDCFG = "${SWTOOLS_PATH}/config.bld"
36 33
37PATH:append = ":${XDC_INSTALL_DIR}" 34PATH:append = ":${XDC_INSTALL_DIR}"
38 35
39XDCPATH.="${XDCCGROOT}/include;${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages;" 36XDCPATH .= "${XDCCGROOT}/include;${XDC_INSTALL_DIR}/packages;${SYSBIOS_INSTALL_DIR}/packages;"
40XDCPATH.="${SWTOOLS_INSTALL_DIR};${MATHLIB_WORK_DIR};" 37XDCPATH .= "${SWTOOLS_INSTALL_DIR};${MATHLIB_WORK_DIR};"
41 38
42export XDCPATH 39export XDCPATH
43 40
@@ -56,19 +53,6 @@ do_install() {
56 rm -r ${D}${MATHLIB_INSTALL_DIR_RECIPE}/mathlib 53 rm -r ${D}${MATHLIB_INSTALL_DIR_RECIPE}/mathlib
57} 54}
58 55
59inherit deploy
60addtask deploy before do_build after do_install
61
62do_deploy() {
63 install -d ${DEPLOYDIR}
64 # zip up files in ${D}${MATHLIB_INSTALL_DIR_RECIPE}
65 # and place the zip file in ${DEPLOYDIR}
66 mkdir ./${MATHLIB_PACKAGE_NAME}
67 cp -r ${D}${MATHLIB_INSTALL_DIR_RECIPE}/. ./${MATHLIB_PACKAGE_NAME}
68 zip -9 -y -r -q ${DEPLOYDIR}/${MATHLIB_PACKAGE_NAME}.zip ./${MATHLIB_PACKAGE_NAME}
69 rm -r ./${MATHLIB_PACKAGE_NAME}
70}
71
72ALLOW_EMPTY:${PN} = "1" 56ALLOW_EMPTY:${PN} = "1"
73FILES:${PN}-dev += "${MATHLIB_INSTALL_DIR_RECIPE}" 57FILES:${PN}-dev += "${MATHLIB_INSTALL_DIR_RECIPE}"
74 58
diff --git a/meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb b/meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb
deleted file mode 100644
index aa4bc6cd..00000000
--- a/meta-ti-extras/recipes-ti/openmp-rtos/openmp-rtos_git.bb
+++ /dev/null
@@ -1,62 +0,0 @@
1DESCRIPTION = "TI OpenMP RTOS"
2HOMEPAGE = "git://git.ti.com/git/openmp/ti-openmp-dsp-runtime.git"
3LICENSE = "BSD-3-Clause"
4
5require recipes-ti/includes/ti-paths.inc
6
7inherit features_check
8
9REQUIRED_MACHINE_FEATURES = "dsp"
10REQUIRED_DISTRO_FEATURES = "openmp"
11
12PV = "2_06_03_00"
13PR = "r0"
14
15OPENMP_RTOS_GIT_URI = "git://git.ti.com/git/openmp/ti-openmp-dsp-runtime.git"
16OPENMP_RTOS_GIT_PROTOCOL = "https"
17OPENMP_RTOS_GIT_BRANCH = "master"
18
19BRANCH = "${OPENMP_RTOS_GIT_BRANCH}"
20SRC_URI = "${OPENMP_RTOS_GIT_URI};protocol=${OPENMP_RTOS_GIT_PROTOCOL};branch=${BRANCH}"
21
22SRCREV = "c090eb664d9815a36ead0e14f31e102590680fb8"
23
24LIC_FILES_CHKSUM = "file://docs/license/omp_manifest_template.html;md5=61a6972303c0447b7c056195d7ebafee"
25
26DEPENDS = "common-csl-ip-rtos doxygen-native libulm ti-xdctools-native ti-ipc-rtos ti-sysbios ti-cgt6x-native zip-native"
27
28COMPATIBLE_MACHINE = "omap-a15"
29PACKAGE_ARCH = "${MACHINE_ARCH}"
30
31S = "${WORKDIR}/git"
32export IPC_DIR = "${IPC_INSTALL_DIR}"
33export XDC_DIR = "${XDC_INSTALL_DIR}"
34export BIOS_DIR = "${SYSBIOS_INSTALL_DIR}"
35export ULM_DIR ="${STAGING_DIR_TARGET}/usr/share/ti/ulm"
36export C6636_PDK_DIR ="${PDK_INSTALL_DIR}"
37export AM572_PDK_DIR ="${PDK_INSTALL_DIR}"
38export XDCCGROOT = "${STAGING_DIR_NATIVE}/usr/share/ti/cgt-c6x"
39
40export BUILD_AM572 = "0"
41
42BUILD_AM572:omap-a15 = "1"
43
44RELEASE_TARGET = ""
45RELEASE_TARGET:omap-a15 = "am57xx"
46
47do_compile() {
48 make -f utils/product/Makefile .zipfile
49}
50
51do_install() {
52 install -d ${D}${OMP_INSTALL_DIR_RECIPE}
53 cp -r ${S}/exports/openmp_dsp_${RELEASE_TARGET}_*/. -d ${D}${OMP_INSTALL_DIR_RECIPE}
54}
55
56ALLOW_EMPTY:${PN} = "1"
57
58FILES:${PN}-dev += " \
59 ${OMP_INSTALL_DIR_RECIPE}/ \
60"
61
62INSANE_SKIP:${PN}-dev = "arch"
diff --git a/meta-ti-extras/recipes-ti/osal/ti-osal.inc b/meta-ti-extras/recipes-ti/osal/ti-osal.inc
deleted file mode 100644
index b0470793..00000000
--- a/meta-ti-extras/recipes-ti/osal/ti-osal.inc
+++ /dev/null
@@ -1,24 +0,0 @@
1DESCRIPTION = "TI Operating System Abstraction Library (OSAL)"
2HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/osal"
3LICENSE = "BSD-3-Clause & EPL-1.0"
4SECTION = "devel"
5
6require ../includes/ti-paths.inc
7require ../includes/ti-staging.inc
8
9S = "${WORKDIR}/osal_${PV}"
10
11SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/osal/${PV}/exports/osal_${PV}.tar.gz;name=osaltarball"
12
13do_install() {
14 install -d ${D}${OSAL_INSTALL_DIR_RECIPE}
15 cp -pPrf ${S}/* ${D}${OSAL_INSTALL_DIR_RECIPE}
16}
17
18INSANE_SKIP:${PN}-dev = "staticdev"
19
20ALLOW_EMPTY:${PN} = "1"
21FILES:${PN}-dev += "${OSAL_INSTALL_DIR_RECIPE}"
22
23COMPATIBLE_HOST ?= "null"
24COMPATIBLE_HOST:ti-soc = "(.*)"
diff --git a/meta-ti-extras/recipes-ti/osal/ti-osal_1.24.00.09.bb b/meta-ti-extras/recipes-ti/osal/ti-osal_1.24.00.09.bb
deleted file mode 100644
index 226458be..00000000
--- a/meta-ti-extras/recipes-ti/osal/ti-osal_1.24.00.09.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1require ti-osal.inc
2
3PV = "1_24_00_09"
4PR = "r0"
5
6LIC_FILES_CHKSUM = "file://osal_${PV}_Manifest.html;md5=c110191994d011cee4cd02189ed3c9f4"
7
8SRC_URI[osaltarball.md5sum] = "a7ea85447fa0ff0f786d527a52fa6e8b"
9SRC_URI[osaltarball.sha256sum] = "d14f1f43c8a7965e86add69bd813cea56ea7e38abeb55de3fdcdaf4a69f19bf3"
diff --git a/meta-ti-extras/recipes-ti/swtools/swtools_git.bb b/meta-ti-extras/recipes-ti/swtools/swtools_git.bb
index 4bcd6754..82de2040 100644
--- a/meta-ti-extras/recipes-ti/swtools/swtools_git.bb
+++ b/meta-ti-extras/recipes-ti/swtools/swtools_git.bb
@@ -12,7 +12,6 @@ DEPENDS = "ti-cgt6x-native \
12 12
13PV = "5_0_8" 13PV = "5_0_8"
14PR = "r3" 14PR = "r3"
15S = "${WORKDIR}/git"
16 15
17SWTOOLS_GIT_BRANCH = "master" 16SWTOOLS_GIT_BRANCH = "master"
18SWTOOLS_GIT_PROTOCOL = "https" 17SWTOOLS_GIT_PROTOCOL = "https"
diff --git a/meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc b/meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc
index 6b5e186c..94c5d33b 100644
--- a/meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc
+++ b/meta-ti-extras/recipes-ti/vlib/vlib-c66x.inc
@@ -1,4 +1,4 @@
1DESCRIPTION = "TI Vision Library (VLIB) for C66x" 1SUMMARY = "TI Vision Library (VLIB) for C66x"
2HOMEPAGE = "http://software-dl.ti.com/libs/vlib/latest/index_FDS.html" 2HOMEPAGE = "http://software-dl.ti.com/libs/vlib/latest/index_FDS.html"
3SECTION = "devel" 3SECTION = "devel"
4LICENSE = "TI-TSPA & BSD-3-Clause" 4LICENSE = "TI-TSPA & BSD-3-Clause"
@@ -11,11 +11,11 @@ COMPATIBLE_MACHINE = "omap-a15"
11 11
12SRC_URI = "http://software-dl.ti.com/libs/vlib/${PV}//exports/vlib_c66x_obj_${PV}_Linux.bin;name=vlibbin" 12SRC_URI = "http://software-dl.ti.com/libs/vlib/${PV}//exports/vlib_c66x_obj_${PV}_Linux.bin;name=vlibbin"
13 13
14S = "${WORKDIR}/vlib_c66x_${PV}" 14S = "${UNPACKDIR}/vlib_c66x_${PV}"
15 15
16BINFILE="vlib_c66x_obj_${PV}_Linux.bin" 16BINFILE = "vlib_c66x_obj_${PV}_Linux.bin"
17TI_BIN_UNPK_ARGS = "--mode silent --prefix ${S}" 17TI_BIN_UNPK_ARGS = "--mode silent --prefix ${S}"
18TI_BIN_UNPK_CMDS="" 18TI_BIN_UNPK_CMDS = ""
19 19
20do_install() { 20do_install() {
21 CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership" 21 CP_ARGS="-Prf --preserve=mode,timestamps --no-preserve=ownership"
diff --git a/meta-ti-extras/recipes-ti/xdais/ti-xdais.inc b/meta-ti-extras/recipes-ti/xdais/ti-xdais.inc
index 67d19022..070e28c3 100644
--- a/meta-ti-extras/recipes-ti/xdais/ti-xdais.inc
+++ b/meta-ti-extras/recipes-ti/xdais/ti-xdais.inc
@@ -1,4 +1,4 @@
1DESCRIPTION = "TI eXpress DSP Algorithm Interface Standard (XDAIS) specification" 1SUMMARY = "TI eXpress DSP Algorithm Interface Standard (XDAIS) specification"
2HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais" 2HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais"
3LICENSE = "GPL-2.0-only" 3LICENSE = "GPL-2.0-only"
4SECTION = "devel" 4SECTION = "devel"
@@ -6,7 +6,7 @@ SECTION = "devel"
6require ../includes/ti-paths.inc 6require ../includes/ti-paths.inc
7require ../includes/ti-staging.inc 7require ../includes/ti-staging.inc
8 8
9S = "${WORKDIR}/xdais_${PV}" 9S = "${UNPACKDIR}/xdais_${PV}"
10 10
11SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais/${PV}/exports/xdais_${PV}.tar.gz;name=xdaistarball" 11SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/xdais/${PV}/exports/xdais_${PV}.tar.gz;name=xdaistarball"
12 12