From: Denys Dmytriyenko <[email protected]> Some Beagle platforms are switching to 6.6 based Linux kernel and upstream U-boot 2024.07. Add corresponding recipes and extend beagle-bsp with required settings.
Note that U-boot recipe added is not BeagleBoard.org or TI specific, but version 2024.07 or later is required. Sufficiently newer version from OE-Core can also be used, as master now has 2024.10, but scarthgap has an older 2024.01 version. Signed-off-by: Denys Dmytriyenko <[email protected]> --- .../conf/machine/include/beagle-bsp.inc | 47 +++++++++++++------ .../u-boot/u-boot-bb.org_2024.07.bb | 12 +++++ .../linux/linux-bb.org-6.6/defconfig | 1 + .../recipes-kernel/linux/linux-bb.org_6.6.bb | 27 +++++++++++ 4 files changed, 73 insertions(+), 14 deletions(-) create mode 100644 meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.07.bb create mode 100644 meta-beagle/recipes-kernel/linux/linux-bb.org-6.6/defconfig create mode 100644 meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb diff --git a/meta-beagle/conf/machine/include/beagle-bsp.inc b/meta-beagle/conf/machine/include/beagle-bsp.inc index 77d0b483..51de2b73 100644 --- a/meta-beagle/conf/machine/include/beagle-bsp.inc +++ b/meta-beagle/conf/machine/include/beagle-bsp.inc @@ -1,24 +1,43 @@ # Use meta-ti-bsp "multi-BSP" facility to create a custom "bb_org" BSP profile # with default preferences for Beagle platforms -# Default is bb_org, but can override with any of the existing options -TI_PREFERRED_BSP ?= "bb_org" +# Default is bb_org-6_1, but can override with any of the existing options +TI_PREFERRED_BSP ?= "bb_org-6_1" # ========== -# bb_org +# bb_org-6_1 # BeagleBoard.org kernel 6.1, u-boot 2023.04 # based on TI staging trees with extra Beagle-specific features # but may not be up-to-date with TI version # ========== -BSP_KERNEL_PROVIDER:bsp-bb_org = "linux-bb.org" -BSP_KERNEL_VERSION:bsp-bb_org = "%" -BSP_BOOTLOADER_PROVIDER:bsp-bb_org = "u-boot-bb.org" -BSP_BOOTLOADER_VERSION:bsp-bb_org = "%" +BSP_KERNEL_PROVIDER:bsp-bb_org-6_1 = "linux-bb.org" +BSP_KERNEL_VERSION:bsp-bb_org-6_1 = "6.1.%" +BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_1 = "u-boot-bb.org" +BSP_BOOTLOADER_VERSION:bsp-bb_org-6_1 = "2023.%" -BSP_SGX_DRIVER_PROVIDER:bsp-bb_org = "ti-sgx-ddk-km" -BSP_SGX_DRIVER_VERSION:bsp-bb_org = "1.17%" -BSP_SGX_UMLIBS_VERSION:bsp-bb_org = "1.17%" -BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org = "ti-img-rogue-driver" -BSP_ROGUE_DRIVER_VERSION:bsp-bb_org = "23%" -BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org = "23%" -BSP_MESA_PVR_VERSION:bsp-bb_org = "22%" +BSP_SGX_DRIVER_PROVIDER:bsp-bb_or-6_1g = "ti-sgx-ddk-km" +BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_1 = "1.17%" +BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_1 = "1.17%" +BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_1 = "ti-img-rogue-driver" +BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_1 = "23%" +BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_1 = "23%" +BSP_MESA_PVR_VERSION:bsp-bb_org-6_1 = "22%" + +# ========== +# bb_org-6_6 +# BeagleBoard.org kernel 6.6, Upstream u-boot 2024.07 +# based on TI staging trees with extra Beagle-specific features +# but may not be up-to-date with TI version +# ========== +BSP_KERNEL_PROVIDER:bsp-bb_org-6_6 = "linux-bb.org" +BSP_KERNEL_VERSION:bsp-bb_org-6_6 = "6.6.%" +BSP_BOOTLOADER_PROVIDER:bsp-bb_org-6_6 = "u-boot-bb.org" +BSP_BOOTLOADER_VERSION:bsp-bb_org-6_6 = "2024.%" + +BSP_SGX_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-sgx-ddk-km" +BSP_SGX_DRIVER_VERSION:bsp-bb_org-6_6 = "1.17%" +BSP_SGX_UMLIBS_VERSION:bsp-bb_org-6_6 = "1.17%" +BSP_ROGUE_DRIVER_PROVIDER:bsp-bb_org-6_6 = "ti-img-rogue-driver" +BSP_ROGUE_DRIVER_VERSION:bsp-bb_org-6_6 = "24%" +BSP_ROGUE_UMLIBS_VERSION:bsp-bb_org-6_6 = "24%" +BSP_MESA_PVR_VERSION:bsp-bb_org-6_6 = "23%" diff --git a/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.07.bb b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.07.bb new file mode 100644 index 00000000..ca1b051b --- /dev/null +++ b/meta-beagle/recipes-bsp/u-boot/u-boot-bb.org_2024.07.bb @@ -0,0 +1,12 @@ +require recipes-bsp/u-boot/u-boot-ti.inc + +SUMMARY = "Upstream U-Boot for BeagleBoard.org devices" + +COMPATIBLE_MACHINE = "beagle.*" + +PV = "2024.07" + +UBOOT_GIT_URI = "git://github.com/u-boot/u-boot.git" +UBOOT_GIT_PROTOCOL = "https" +BRANCH = "master" +SRCREV = "3f772959501c99fbe5aa0b22a36efe3478d1ae1c" 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.bb b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb new file mode 100644 index 00000000..247c97f6 --- /dev/null +++ b/meta-beagle/recipes-kernel/linux/linux-bb.org_6.6.bb @@ -0,0 +1,27 @@ +# Look in the generic major.minor directory for files +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-6.6:" + +SECTION = "kernel" +SUMMARY = "BeagleBoard.org Linux kernel" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +COMPATIBLE_MACHINE = "beagle.*" + +inherit kernel + +require recipes-kernel/linux/setup-defconfig.inc +require recipes-kernel/linux/ti-kernel.inc + +DEPENDS += "gmp-native libmpc-native" + +KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}" + +S = "${WORKDIR}/git" + +# 6.6.44 version for 64-bit +SRCREV:aarch64 = "d66d2ae99dd7183277cad65bb2db0cc323a80c33" +PV:aarch64 = "6.6.44+git" +BRANCH:aarch64 = "v6.6.44-ti-arm64-r14" + +KERNEL_GIT_URI = "git://github.com/beagleboard/linux.git" -- 2.25.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#18061): https://lists.yoctoproject.org/g/meta-ti/message/18061 Mute This Topic: https://lists.yoctoproject.org/mt/109465470/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
