| Message ID | 20240318133338.1811892-2-javad.rahimipetroudi@mind.be |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,1/2] configs/avenger96: bump Uboot version to 2024.01 | expand |
>>>>> "Javad" == Javad Rahimipetroudi <javad.rahimipetroudi@essensium.com> writes: > This patch upgrades Kernel version to 6.6.21 LTS on avenger96 board. > Beside that, the device tree path also modified to point the device > tree in proper location. Please document when this move was done as I requested - E.G. this commit from 6.5-rc1: commit 724ba6751532055db75992fc6ae21c3e322e94a7 Author: Rob Herring <robh@kernel.org> Date: Thu May 4 18:38:52 2023 -0500 ARM: dts: Move .dts files to vendor sub-directories The arm dts directory has grown to 1559 boards which makes it a bit unwieldy to maintain and use. Past attempts stalled out due to plans to move .dts files out of the kernel tree. Doing that is no longer planned (any time soon at least), so let's go ahead and group .dts files by vendors. This move aligns arm with arm64 .dts file structure. There's no change to dtbs_install as the flat structure is maintained on install. The naming of vendor directories is roughly in this order of preference: - Matching original and current SoC vendor prefix/name (e.g. ti, qcom) - Current vendor prefix/name if still actively sold (SoCs which have been aquired) (e.g. nxp/imx) - Existing platform name for older platforms not sold/maintained by any company (e.g. gemini, nspire) The whole move was scripted with the exception of MAINTAINERS and a few makefile fixups. > As another change, with the default root append (mmcblk1p4) in > 'extlinux.conf' file in the overlay directory of the board, > the rootfs was not possible to be detected. This file also > modified to point to the proper mmc block. Also document where this comes from. I would guess it is from this change in 5.10-rc1: commit 21b2cec61c04bd175f0860d9411a472d5a0e7ba1 Author: Douglas Anderson <dianders@chromium.org> Date: Thu Sep 3 16:24:36 2020 -0700 mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.4 This is like commit 3d3451124f3d ("mmc: sdhci-msm: Prefer asynchronous probe") but applied to a whole pile of drivers. This batch converts the drivers that appeared to be around in the v4.4 timeframe. Signed-off-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com> # SH_MMCIF Tested-by: Thierry Reding <treding@nvidia.com> Link: https://lore.kernel.org/r/20200903162412.1.Id501e96fa63224f77bb86b2135a5e8324ffb9c43@changeid Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Or the followup one from 6.5-rc1: commit 3108eb2e8aa7e955a9dd3a4c1bf19a7898961822 Author: Ulf Hansson <ulf.hansson@linaro.org> Date: Mon Jun 12 16:37:30 2023 +0200 mmc: mmci: Set PROBE_PREFER_ASYNCHRONOUS All mmc host drivers should have the asynchronous probe option enabled, but it seems like we failed to set it for mmci, so let's do that now. Fixes: 21b2cec61c04 ("mmc: Set PROBE_PREFER_ASYNCHRONOUS for drivers that existed in v4.4") Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Tested-by: Linus Walleij <linus.walleij@linaro.org> Tested-by: Yann Gautier <yann.gautier@foss.st.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20230612143730.210390-1-ulf.hansson@linaro.org
diff --git a/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf b/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf index 5d506b3dae..7d6d7f8a44 100644 --- a/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf +++ b/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf @@ -1,4 +1,4 @@ label stm32mp157c-dk2-buildroot kernel /boot/zImage devicetree /boot/stm32mp157a-dhcor-avenger96.dtb - append root=/dev/mmcblk1p4 rootwait + append root=/dev/mmcblk0p4 rootwait diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig index 0afdaacf8d..67b6d16749 100644 --- a/configs/avenger96_defconfig +++ b/configs/avenger96_defconfig @@ -3,7 +3,7 @@ BR2_arm=y BR2_cortex_a7=y # Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System configuration BR2_GLOBAL_PATCH_DIR="board/arrow/avenger96/patches" @@ -13,10 +13,10 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-im # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.21" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157a-dhcor-avenger96" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="st/stm32mp157a-dhcor-avenger96" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
This patch upgrades Kernel version to 6.6.21 LTS on avenger96 board. Beside that, the device tree path also modified to point the device tree in proper location. As another change, with the default root append (mmcblk1p4) in 'extlinux.conf' file in the overlay directory of the board, the rootfs was not possible to be detected. This file also modified to point to the proper mmc block. --- Changes v1 -> v2: - Remove uboot changes from Linux patch to Uboot (suggested by Peter) - Fix the kernel header version for the toolchain.(suggested by Peter) Signed-off-by: Javad Rahimipetroudi <javad.rahimipetroudi@mind.be> --- board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf | 2 +- configs/avenger96_defconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)