From patchwork Wed Oct 13 20:25:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giulio Benetti X-Patchwork-Id: 1540598 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aruba.it header.i=@aruba.it header.a=rsa-sha256 header.s=a1 header.b=UCxVFMxz; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HV3tt21pvz9sNH for ; Thu, 14 Oct 2021 07:25:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 2007540804; Wed, 13 Oct 2021 20:25:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pZSTiqS-EOvR; Wed, 13 Oct 2021 20:25:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 4CFB2407A6; Wed, 13 Oct 2021 20:25:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id B06451BF361 for ; Wed, 13 Oct 2021 20:25:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9F99240003 for ; Wed, 13 Oct 2021 20:25:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=aruba.it Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WZs8lggDxBBl for ; Wed, 13 Oct 2021 20:25:19 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from smtpcmd04132.aruba.it (smtpcmd04132.aruba.it [62.149.158.132]) by smtp2.osuosl.org (Postfix) with ESMTP id 54DAC40113 for ; Wed, 13 Oct 2021 20:25:19 +0000 (UTC) Received: from ubuntu.localdomain ([146.241.216.221]) by Aruba Outgoing Smtp with ESMTPSA id akoPm2PG2XvvIakoPmcUXx; Wed, 13 Oct 2021 22:25:18 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aruba.it; s=a1; t=1634156718; bh=Em08q8dzbAPky7NewG8cxropOvYKZdqmD6b3lzOMG2Q=; h=From:To:Subject:Date:MIME-Version; b=UCxVFMxziyDtMoIVHDUCESAPTIVrfrnnR5QP5H5pjAmL5X9FzyfozYAUkNzRqhtdF n90AxYXf1q7EvH8XAUZHCFoR79c0t8KcsgkkdcpwGcIqbsDUZxMr8o/P8gR6fafY8q lCk9GjHzqCPIJ1n1g8YBOKbqNdDy8q2Z7hP4B1q+RvcHzf13a8dK4Uc/BuU/9+ZyDX ZKyAFwVpASzJKCSZEh1p3iDL6es1FefvXXj3u+XxAMK5YRQO8xfSiRRzudg1Fd//B7 lQ6tLLbk8sVyzlVddvDlj7kPngPYHwb4g/17d3i/RMSu7H7SWayaKSUr7fXy5fOCXn 2RLszNTm9V+6g== From: Giulio Benetti To: buildroot@buildroot.org Date: Wed, 13 Oct 2021 22:25:16 +0200 Message-Id: <20211013202516.2113180-1-giulio.benetti@benettiengineering.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <337d0eeb-a062-da60-5b86-754a61da7b66@benettiengineering.com> References: <337d0eeb-a062-da60-5b86-754a61da7b66@benettiengineering.com> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfM/qmn78y/lslu+JlT0InqPz3dawrUnw6/GmwM54tsnmTOId+gdrJUhRepitsKqPiowXU+lAJkNFoNTx37YWY6jiu5g8zCAi6+f/cAV82RI6DT7lxLgM LbGVWvrE7Yvpj1pEE4b/AypCiOtgXut1uL6Bgotd4E/m6YZkhdOq7Xw9w221YzImM0EZ35rnYmc+4sHGSj7GOZ95a1lHtgP8HMNpb6k1bCx3Zz/cSEe0Epew 7C2aQDReLYJvfkRfTXHMguTHsNroIwhC7FmzFW62UVgBgHIBC2bnABfaHqzme9UgLMENDx9UMHunIgMA1btfiQ== Subject: [Buildroot] [PATCH v2] configs/asus_tinker_rk3288: bump to Linux kernel 5.14 and u-boot 2021.10 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Giulio Benetti , Jagan Teki Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" This bumps to linux/linux-headers 5.14 and u-boot version 2021.10 and drop local uboot patch where CONFIG_SYS_BOOTM_LEN was set to 16MB because on u-boot 2021.10 it's now set to 64MB as default to make room for Linux images. Signed-off-by: Giulio Benetti --- V1->V2: * remove local uboot patch --- ...Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch | 35 ------------------- configs/asus_tinker_rk3288_defconfig | 9 +++-- 2 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 board/asus/tinker/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch diff --git a/board/asus/tinker/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch b/board/asus/tinker/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch deleted file mode 100644 index 64a147c09e..0000000000 --- a/board/asus/tinker/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8ee2b03039cccf64402a72dea2185d7fe1972729 Mon Sep 17 00:00:00 2001 -From: Shyam Saini -Date: Mon, 15 Apr 2019 16:16:16 +0530 -Subject: [PATCH] include: configs: Increase CONFIG_SYS_BOOTM_LEN to 16MB - -The default value of CONFIG_SYS_BOOTM_LEN is 0x800000 i.e, 8MB which -causes board reset because of larger uImage size. - -Error log snippet: - Booting using the fdt blob at 0x1f00000 - Loading Kernel Image ... Image too large: increase CONFIG_SYS_BOOTM_LEN -Must RESET board to recover -resetting ... - -Signed-off-by: Shyam Saini ---- - include/configs/rk3288_common.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h -index 72a54bc0ab..eab7cf4d86 100644 ---- a/include/configs/rk3288_common.h -+++ b/include/configs/rk3288_common.h -@@ -9,6 +9,8 @@ - #include - #include "rockchip-common.h" - -+#define CONFIG_SYS_BOOTM_LEN (16 << 20) /* 16MB */ -+ - #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY - #define CONFIG_SYS_MALLOC_LEN (32 << 20) - #define CONFIG_SYS_CBSIZE 1024 --- -2.11.0 - diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index e95a19a757..257ad6236c 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_rk3288_defconfig @@ -3,14 +3,14 @@ BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y +# Linux headers same as kernel, a 5.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -22,7 +22,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000" @@ -43,4 +43,3 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/asus/tinker/genimage.cfg" BR2_ROOTFS_POST_BUILD_SCRIPT="board/asus/tinker/post-build.sh" -BR2_GLOBAL_PATCH_DIR="board/asus/tinker/patches/"