From patchwork Wed Jun 9 20:00:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1490074 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ecnweHuN; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::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 ozlabs.org (Postfix) with ESMTPS id 4G0dQL53KNz9sRf for ; Thu, 10 Jun 2021 06:05:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C8BEA40589; Wed, 9 Jun 2021 20:05:44 +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 WbVnDSv9KvMm; Wed, 9 Jun 2021 20:05:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id C07F740592; Wed, 9 Jun 2021 20:05:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 77CBB1BF9C1 for ; Wed, 9 Jun 2021 20:00:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 723D783D0B for ; Wed, 9 Jun 2021 20:00:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LLJXHZ1tyNm4 for ; Wed, 9 Jun 2021 20:00:34 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [IPv6:2a00:1450:4864:20::136]) by smtp1.osuosl.org (Postfix) with ESMTPS id 93EC483CD5 for ; Wed, 9 Jun 2021 20:00:34 +0000 (UTC) Received: by mail-lf1-x136.google.com with SMTP id v22so38584469lfa.3 for ; Wed, 09 Jun 2021 13:00:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=265qDC9d2XT2Xt/NwQvPtHW7PPscTdFbVBszWDfXtuY=; b=ecnweHuNwSogAqcJHmyd4u4ziz/p0pviZdQpqbrG3/Z+bcUgXOcjAGFpaqDAw0VCI7 Agfdnf1Jr/gv/dXLeWSwhnR/1S0f2/abBKG8E4cOLKeK3pf6AkMUyOtOFJa5KQaQPy6c PuimfenZdfFG9yGQnEK1QL41nwzLbhKCEY3JF6HjcaHnFF6NJQsQvDrqUrFnGrqjL4ks XXlKIknuh8vDPuRgstSVcjafkv6jFvm+AEEeEfjCBBXBSrUOP76wPzgvmT2eWByqAgHM pDSn8pEWpGEYHX59EAdQl2rHpp12cUzVrEAgEX1F9Gjrm+lKNwJYK/9mMq6BYgvRNpX9 NafA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=265qDC9d2XT2Xt/NwQvPtHW7PPscTdFbVBszWDfXtuY=; b=PBRWszz/LJ0dixEflKL4OY1cVWy+wxPW9UkhHhgQKSR5gr9nGSiRKdFYcI1XTuI9hL yAEIsYi/S+xQOnNxDjgPBS2jrPudtg1QXby5i9lcqRt9/+as21s4EbhdJzEcf1gMVFjB bXlCoH85gwcvNmjYTHWlE4TcXcnWFRQgx00Y5WYXpIPdq18bsvE+sRjdBbSolvGsEGmS xv1TLfyZUsoPErGeprCgrYcEp+ejSOgEdIj1ArGv7HBqoXqWLlmSM47qW2Tz+zxQ9j54 lgVYHr3+3EhaDZSjYXAi8ww6nSMoVxcIRwgTNcW9mPXCcnwXlSvsoLIbOPuADwZBuWdl 6RHQ== X-Gm-Message-State: AOAM531xm6wPpR2Ok6CUr6THsJxdJ5oRA9YEwbWt1LodUqvwxBlWmq/O 7g4UCvramaH/1aDFEuGmHNPQ58wSzjQ0dg== X-Google-Smtp-Source: ABdhPJzo4ZmYImkwtfI+1elj93l61L3Zdk0xCGwzQpFsyn6+G+4hKM3itl7YTNdCvVhV+otSL5H5hw== X-Received: by 2002:a19:8157:: with SMTP id c84mr704991lfd.529.1623268832281; Wed, 09 Jun 2021 13:00:32 -0700 (PDT) Received: from localhost.localdomain ([5.188.167.245]) by smtp.googlemail.com with ESMTPSA id y21sm77100lfk.191.2021.06.09.13.00.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 13:00:31 -0700 (PDT) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Wed, 9 Jun 2021 23:00:00 +0300 Message-Id: <20210609200003.2866122-26-geomatsi@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210609200003.2866122-1-geomatsi@gmail.com> References: <20210609200003.2866122-1-geomatsi@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2 25/28] configs/friendlyarm_nanopi_neo_plus2_defconfig: bump BSP versions X-BeenThere: buildroot@busybox.net 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: Louis Aussedat , Sergey Matyukevich , Jan Kraval , Marcin Niestroj , Jagan Teki , Suniel Mahesh , Heiko Thiery Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Bump U-Boot and Linux kernel versions. Updating U-Boot to 2021.04 requires the following two changes. First, after switching to binman, u-boot.itb is no more generated for 64-bit sunxi boards. Combined u-boot-sunxi-with-spl.bin image should be used instead. This image contains SPL, U-Boot, and FIT image, where FIT image contains other binaries such as BL31 and SCP. Second, new U-Boot enables support for System Control Processor (SCP) firmware. SCP firmware is included by default into FIT image in the combined u-boot-sunxi-with-spl.bin binary. When SCP is not available or not needed, it should be explicitly disabled by pointing to an empty file. Support for Allwinner SCP firmware is not yet available neither in Buildroot nor in mainline kernel. So disable it for now using custom U-Boot build options. Signed-off-by: Sergey Matyukevich --- board/friendlyarm/nanopi-neo-plus2/genimage.cfg | 10 ++-------- configs/friendlyarm_nanopi_neo_plus2_defconfig | 12 ++++++------ 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/board/friendlyarm/nanopi-neo-plus2/genimage.cfg b/board/friendlyarm/nanopi-neo-plus2/genimage.cfg index fb871abd43..e883cbf725 100644 --- a/board/friendlyarm/nanopi-neo-plus2/genimage.cfg +++ b/board/friendlyarm/nanopi-neo-plus2/genimage.cfg @@ -15,15 +15,9 @@ image sdcard.img { partition spl { in-partition-table = "no" - image = "sunxi-spl.bin" + image = "u-boot-sunxi-with-spl.bin" offset = 8192 - } - - partition u-boot { - in-partition-table = "no" - image = "u-boot.itb" - offset = 40K - size = 1M # 1MB - 40K + size = 1040384 # 1MB - 8KB } partition boot { diff --git a/configs/friendlyarm_nanopi_neo_plus2_defconfig b/configs/friendlyarm_nanopi_neo_plus2_defconfig index 730ff3ee6f..a3ba469adc 100644 --- a/configs/friendlyarm_nanopi_neo_plus2_defconfig +++ b/configs/friendlyarm_nanopi_neo_plus2_defconfig @@ -2,7 +2,7 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_OVERLAY="board/friendlyarm/nanopi-neo-plus2/rootfs_overlay" @@ -18,20 +18,20 @@ R2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo_plus2" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM=y -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb" BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" +BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.2" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-h5-nanopi-neo-plus2"