| Message ID | 20230411215243.18230-2-afd@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [meta-ti,master/kirkstone,v3,1/6] linux-ti-mainline: Use upstream configs with upstream kernel | expand |
On Tue, Apr 11, 2023 at 04:52:39PM -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 <afd@ti.com> Reviewed-by: Denys Dmytriyenko <denys@konsulko.com> > --- > .../linux/linux-ti-mainline_git.bb | 17 +++-------------- > 1 file changed, 3 insertions(+), 14 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..842864cd 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,24 +25,16 @@ 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} \ > " > > -SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95" > -SRCREV_FORMAT = "linux" > - > DEFCONFIG_NAME = "multi_v7_defconfig" > DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig" > DEFCONFIG_NAME:k3 = "defconfig" > 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} > - 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() { > cd ${B} > echo >> Module.symvers > -- > 2.39.2
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..842864cd 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,24 +25,16 @@ 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} \ " -SRCREV_ti-upstream-tools = "0f60697843bba6f8d721b14da92b1652563ccb95" -SRCREV_FORMAT = "linux" - DEFCONFIG_NAME = "multi_v7_defconfig" DEFCONFIG_NAME:omapl138 = "davinci_all_defconfig" DEFCONFIG_NAME:k3 = "defconfig" 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} - 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() { cd ${B} echo >> Module.symvers
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 <afd@ti.com> --- .../linux/linux-ti-mainline_git.bb | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)