On Tue, Apr 11, 2023 at 12:40:34PM -0500, Andrew Davis via
lists.yoctoproject.org wrote:
> Mainline should test the mainline kernel as it is, not with out-of-tree
> changes like new DTB/DTBOs. Use only upstream DTB/DTBOs. As that was the
> last thing provided by ti-upstream-tools, remove it here.
>
> Signed-off-by: Andrew Davis <[email protected]>
> ---
> .../recipes-kernel/linux/linux-ti-mainline_git.bb | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> 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 7d948a85..d0f1b4e2 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
> @@ -1,5 +1,5 @@
> SECTION = "kernel"
> -SUMMARY = "Mainline Linux kernel for TI devices (with ti-upstream-tools)"
> +SUMMARY = "Mainline Linux kernel for TI devices"
> LICENSE = "GPL-2.0-only"
> LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
>
> @@ -15,9 +15,6 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} \
>
> S = "${WORKDIR}/git"
>
> -BRANCH = "master"
> -TOOLS_BRANCH = "master"
> -
> # 5.15 Mainline version
> SRCREV = "8bb7eca972ad531c9b149c0a51ab43a417385813"
> PV = "5.15+git${SRCPV}"
> @@ -28,12 +25,11 @@ PR = "${MACHINE_KERNEL_PR}"
>
> KERNEL_GIT_URI =
> "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
> KERNEL_GIT_PROTOCOL = "https"
> +KERNEL_GIT_BRANCH = "master"
> SRC_URI += " \
> -
> ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${BRANCH};name=linux
> \
> -
> git://git.ti.com/git/ti-linux-kernel/ti-upstream-tools.git;branch=${TOOLS_BRANCH};protocol=${KERNEL_GIT_PROTOCOL};name=ti-upstream-tools;destsuffix=git/ti-upstream-tools
> \
> +
> ${KERNEL_GIT_URI};protocol=${KERNEL_GIT_PROTOCOL};branch=${KERNEL_GIT_BRANCH};name=linux
> \
> "
>
> -SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95"
> SRCREV_FORMAT = "linux"
Remove SRCREV_FORMAT that is used for multi-SCM recipes, as well as
";name=linux" from SRC_URI above.
> DEFCONFIG_NAME = "multi_v7_defconfig"
> @@ -43,7 +39,6 @@ KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B}
> ${DEFCONFIG_NAME}"
>
> kernel_do_compile:append() {
> oe_runmake dtbs CC="${KERNEL_CC} $cc_extra " LD="${KERNEL_LD}"
> ${KERNEL_EXTRA_ARGS}
Are you keeping "make dtbs" to build ALL DTBs from the kernel? Same story as
with patch #5 for linux-ti-next - KERNEL_DEVICETREE has a list of upstreamed
DTBs that will be built automatically, so above line can also be removed.
(though j784s4-evm has an empty KERNEL_DEVICETREE - nothing got upstreamed?)
> - oe_runmake -C ${S}/ti-upstream-tools LINUX=${S}
> DTC=${B}/scripts/dtc/dtc O=${B} CC="${KERNEL_CC} $cc_extra "
> LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS}
> }
>
> do_shared_workdir:prepend() {
> --
> 2.39.2
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#16355):
https://lists.yoctoproject.org/g/meta-ti/message/16355
Mute This Topic: https://lists.yoctoproject.org/mt/98202847/21656
Group Owner: [email protected]
Unsubscribe:
https://lists.yoctoproject.org/g/meta-ti/leave/6695321/21656/1393940836/xyzzy
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
