Re: [meta-ti] [master/kirkstone][PATCH 1/5] linux-bb.org: update to 5.10.162 and dedicated branches

[Denys Dmytriyenko <denis@denix.org>]

On Mon, Apr 10, 2023 at 11:19:37AM -0500, Ryan Eatmon wrote:
> 
> 
> On 4/7/2023 15:36, Denys Dmytriyenko wrote:
> >From: Denys Dmytriyenko <denys@konsulko.com>
> >
> >* Update both 32 and 64-bit trees to 5.10.162
> >* Switch from using a common branch that gets periodically rebased to using
> >   dedicated per-merge branches
> >* Patch 32-bit defconfig to use LZMA compression instead of LZO, that is
> >   being deprecated in OE-Core
> >
> >Cc: Robert Nelson <robertcnelson@gmail.com>
> >Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> >---
> >  ...h-default-kernel-compression-to-LZMA.patch | 30 +++++++++++++++++++
> >  .../recipes-kernel/linux/linux-bb.org_git.bb  | 18 ++++++-----
> >  2 files changed, 40 insertions(+), 8 deletions(-)
> >  create mode 100644 meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-defconfig-switch-default-kernel-compression-to-LZMA.patch
> >
> >diff --git a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-defconfig-switch-default-kernel-compression-to-LZMA.patch b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-defconfig-switch-default-kernel-compression-to-LZMA.patch
> >new file mode 100644
> >index 00000000..f6bff39f
> >--- /dev/null
> >+++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org/0001-defconfig-switch-default-kernel-compression-to-LZMA.patch
> >@@ -0,0 +1,30 @@
> >+From 0ccadc7a676341bbd66eb176308c7c59931e9dd2 Mon Sep 17 00:00:00 2001
> >+From: Denys Dmytriyenko <denys@konsulko.com>
> >+Date: Fri, 7 Apr 2023 01:44:56 +0000
> >+Subject: [PATCH] defconfig: switch default kernel compression to LZMA
> >+
> >+LZO compression and lzop tool haven't been maintained for long time and have
> >+been removed in recent versions of OE-Core, even though Debian may still use
> >+them. Switch to LZMA compression that is used by default in TI kernel config.
> >+
> >+Upstream-Status: Inappropriate [OE-specific]
> >+
> >+Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
> >+---
> >+ arch/arm/configs/bb.org_defconfig | 2 +-
> >+ 1 file changed, 1 insertion(+), 1 deletion(-)
> >+
> >+diff --git a/arch/arm/configs/bb.org_defconfig b/arch/arm/configs/bb.org_defconfig
> >+index 6bf0fb860683..7c035735172d 100644
> >+--- a/arch/arm/configs/bb.org_defconfig
> >++++ b/arch/arm/configs/bb.org_defconfig
> >+@@ -1,5 +1,5 @@
> >+ # CONFIG_LOCALVERSION_AUTO is not set
> >+-CONFIG_KERNEL_LZO=y
> >++CONFIG_KERNEL_LZMA=y
> >+ CONFIG_SYSVIPC=y
> >+ CONFIG_POSIX_MQUEUE=y
> >+ CONFIG_NO_HZ_IDLE=y
> >+--
> >+2.25.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
> >index 2c459ce5..19664ba8 100644
> >--- a/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
> >+++ b/meta-ti-bsp/recipes-kernel/linux/linux-bb.org_git.bb
> >@@ -15,18 +15,20 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT} ${EXTRA_DTC_ARGS}"
> >  S = "${WORKDIR}/git"
> >-# 5.10.145 version
> >-SRCREV = "9b11aaf2cdb1861ca74dc69d032a0f94cdd32bd6"
> >-PV = "5.10.145+git${SRCPV}"
> >-BRANCH = "5.10"
> >+# 5.10.162 version for 32-bit
> >+SRCREV:armv7a = "982fde4eb381f98ec8be946e8d33dd0c9f9416ab"
> >+PV:armv7a = "5.10.162+git${SRCPV}"
> >+BRANCH:armv7a = "v5.10.162-ti-r59"
> >-# 5.10.153 version
> >-SRCREV:k3 = "11ebcc09f32669fac8254dff56d500f86c4c2caf"
> >-PV:k3 = "5.10.153+git${SRCPV}"
> >-BRANCH:k3 = "5.10-arm64"
> >+# 5.10.162 version for 64-bit
> >+SRCREV:aarch64 = "a2f5d5746b6c389e58d20fda0a0fa88403da428b"
> >+PV:aarch64 = "5.10.162+git${SRCPV}"
> >+BRANCH:aarch64 = "v5.10.162-ti-arm64-r99"
> >  SRC_URI = "git://github.com/beagleboard/linux.git;protocol=https;branch=${BRANCH}"
> 
> There is an additional patch in SRC_URI on master.  Does that patch
> remain in the SRC_URI, or should it split out like the armv7a below?
> I'm leaving it in the SRC_URI for my initial testing, I am just
> looking for clarity.

Ah, sorry, missed that extra patch in master to fix perf - yes. that should go 
to the common/generic SRC_URI.


> >+SRC_URI:append:armv7a = " file://0001-defconfig-switch-default-kernel-compression-to-LZMA.patch"
> >+
> >  DEFCONFIG_NAME = "bb.org_defconfig"
> >  KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} ${DEFCONFIG_NAME}"