| Message ID | 20240319122344.3107639-2-javad.rahimipetroudi@mind.be |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v4,1/3] configs/avenger96_defconfig: bump U-Boot version to 2024.01 | expand |
On 19/03/2024 13:23, Javad Rahimipetroudi wrote: > This patch upgrades Kernel version to 6.6.22 LTS on avenger96 board. > Beside that, In accordance with the kernel 6.5rc1 commit > 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") > the device tree path also has been modified to point the device tree in > the proper location. > > As another change, due to commit 3108eb2e8aa7 > ("mmc: mmci: Set PROBE_PREFER_ASYNCHRONOUS"), the order of SD card and > eMMC probing has swapped. The SD card is now mmcblk0 instead of > mmcblk1. Thus, the default root append (mmcblk1p4) in 'extlinux.conf' > file in the overlay directory of the board is changed, otherwise the > rootfs was not possible to be detected. > > Signed-off-by: Javad Rahimipetroudi <javad.rahimipetroudi@mind.be> Applied to master, thanks. Regards, Arnout > --- > Changes v3 -> v4: > - Upgrade Linux version (suggested by Arnout) > - Modify commit message (suggested by Arnout) > - Modift commit title > Changes v2 -> v3: > - Update the commit to document the reason of changes (suggested by > Peter) > 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) > > --- > board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf | 2 +- > configs/avenger96_defconfig | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > 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 82702bcfc7..218955fc02 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.22" > 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 >
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 82702bcfc7..218955fc02 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.22" 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.22 LTS on avenger96 board. Beside that, In accordance with the kernel 6.5rc1 commit 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") the device tree path also has been modified to point the device tree in the proper location. As another change, due to commit 3108eb2e8aa7 ("mmc: mmci: Set PROBE_PREFER_ASYNCHRONOUS"), the order of SD card and eMMC probing has swapped. The SD card is now mmcblk0 instead of mmcblk1. Thus, the default root append (mmcblk1p4) in 'extlinux.conf' file in the overlay directory of the board is changed, otherwise the rootfs was not possible to be detected. Signed-off-by: Javad Rahimipetroudi <javad.rahimipetroudi@mind.be> --- Changes v3 -> v4: - Upgrade Linux version (suggested by Arnout) - Modify commit message (suggested by Arnout) - Modift commit title Changes v2 -> v3: - Update the commit to document the reason of changes (suggested by Peter) 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) --- board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf | 2 +- configs/avenger96_defconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)