| Message ID | 20230810221020.12181-1-giulio.benetti@benettiengineering.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] configs/asus_tinker_rk3288_defconfig: switch to zImage and bump Linux to 6.1.44, U-Boot to 2023.07 | expand |
On Fri, 11 Aug 2023 00:10:20 +0200 Giulio Benetti <giulio.benetti@benettiengineering.com> wrote: > uImage is almost deprecated so let's switch to zImage. Let's also bump > Linux version to 6.1.44, U-Boot to 2023.07 and remove > BR2_TARGET_UBOOT_NEEDS_PYTHON3 since it's selected by > BR2_TARGET_UBOOT_NEEDS_PYLIBFDT. > > Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> > --- > V1->V2: > * changed uImage to zImage in extlinux.conf > --- > board/asus/tinker/extlinux.conf | 2 +- > configs/asus_tinker_rk3288_defconfig | 7 ++----- > 2 files changed, 3 insertions(+), 6 deletions(-) Applied to master, thanks. Thomas
diff --git a/board/asus/tinker/extlinux.conf b/board/asus/tinker/extlinux.conf index bb96ddb893..be21e246ec 100644 --- a/board/asus/tinker/extlinux.conf +++ b/board/asus/tinker/extlinux.conf @@ -1,4 +1,4 @@ label Tinker linux - kernel /boot/uImage + kernel /boot/zImage devicetree /boot/rk3288-tinker.dtb append console=ttyS2,115200n8 root=/dev/mmcblk0p1 rootwait diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index 40f4125880..b3e4502a45 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -10,10 +10,9 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y @@ -23,10 +22,8 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.2" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" -BR2_LINUX_KERNEL_UIMAGE=y -BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="rk3288-tinker" BR2_LINUX_KERNEL_INSTALL_TARGET=y
uImage is almost deprecated so let's switch to zImage. Let's also bump Linux version to 6.1.44, U-Boot to 2023.07 and remove BR2_TARGET_UBOOT_NEEDS_PYTHON3 since it's selected by BR2_TARGET_UBOOT_NEEDS_PYLIBFDT. Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> --- V1->V2: * changed uImage to zImage in extlinux.conf --- board/asus/tinker/extlinux.conf | 2 +- configs/asus_tinker_rk3288_defconfig | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-)