From patchwork Wed Jun 9 20:00:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1490075 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::136; helo=smtp3.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=U2E4domI; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (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 4G0dQb46pSz9sRf for ; Thu, 10 Jun 2021 06:05:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 890C760A3F; Wed, 9 Jun 2021 20:05:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IPFYlRYoOMLc; Wed, 9 Jun 2021 20:05:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id D4EB360851; Wed, 9 Jun 2021 20:05:55 +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 4BBC71BF9B5 for ; Wed, 9 Jun 2021 20:00:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 3A1DB401F6 for ; Wed, 9 Jun 2021 20:00:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp2.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com 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 79bfBEWa0SaH for ; Wed, 9 Jun 2021 20:00:36 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by smtp2.osuosl.org (Postfix) with ESMTPS id 32D1A402D4 for ; Wed, 9 Jun 2021 20:00:36 +0000 (UTC) Received: by mail-lj1-x232.google.com with SMTP id e2so1433915ljk.4 for ; Wed, 09 Jun 2021 13:00:36 -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=icBtOh2/NB+F8Xqlphll9bSI6Js9mHxpCwUurksfLjg=; b=U2E4domIF9acLC8uVB5LmgHjT1CLK/xsYs+5ANGJonoNgiNAqM7A1QDaxc5yZwUKlO pAk1qP08k3uF+hxHQkGZtuXGY0alJ5FnfEPCtyw4da2z1o1eRBF8UKUup6BLDYJlIOib UshHKKa6qxgLsvuqJJpqUSdWRekDVZvTcwVpWt5VI8u2d4FT10BQ7iHsZwygiXEWc8bm Z+wXKptHuBUkQQJWSOX629Wn/8PRoWxiE6swxmhENu1lmCXcDH7MECCZrwk2/gbyrvda 8GuPALYhLeX6DqtYmLY6bchfQnuqLF1StrfT7ZgATksecNAaNYuNy2CZfq1tc9n5Moeo FSbA== 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=icBtOh2/NB+F8Xqlphll9bSI6Js9mHxpCwUurksfLjg=; b=P7Ev5WJMPIsL+K8f1Z5gVwBasoO8L6rF43yMs0w3hp1krXkLl/RFSloG31iatW/dA0 SQD5pVZOeyxQfmUMH8F1t2n/4o5vTKeuVnmAO8Q/9YgUakgn7l42qZUpYjEgd8cLoBy8 ozroEL4S0jS0gS/jWxZz6OSupF4kGiLiBtOkFy8p+XtWSD1sZ39DTzysjSeN7WaDj3/N glRUAmPsO3xRJbedI85yb+jo9FCm624CWSzucX1dTi+BaWs/e9wl68fwvErHBKmlBwHg oPnAIdT1XPZD+fiQ7jfqzqUdWMgoMSq7xwmLYN+SjxPivZ7G2UwChkGriNaoqYUOM+C7 0I2w== X-Gm-Message-State: AOAM531QBAVIMvaK3eqM/Rj7mBHIVPPjg/+ae4qkFjY0Ej9Q3HmFw+1m oIHU4x08SsNMXgZF/twE3YePrjNc/HElpA== X-Google-Smtp-Source: ABdhPJz4NfFWgE/7Bd3CDTaFehM8RSIj2NzP2m8ttuhK+tDKfzfQIze5y2EImCfsB+hNPwRhePo3Gw== X-Received: by 2002:a05:651c:10b9:: with SMTP id k25mr1136252ljn.256.1623268833859; Wed, 09 Jun 2021 13:00:33 -0700 (PDT) Received: from localhost.localdomain ([5.188.167.245]) by smtp.googlemail.com with ESMTPSA id y21sm77100lfk.191.2021.06.09.13.00.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 13:00:33 -0700 (PDT) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Wed, 9 Jun 2021 23:00:02 +0300 Message-Id: <20210609200003.2866122-28-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 27/28] configs/pine64_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/pine64/pine64/genimage.cfg | 10 ++-------- configs/pine64_defconfig | 14 +++++++------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/board/pine64/pine64/genimage.cfg b/board/pine64/pine64/genimage.cfg index 2ff38d5415..f1f276a877 100644 --- a/board/pine64/pine64/genimage.cfg +++ b/board/pine64/pine64/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/pine64_defconfig b/configs/pine64_defconfig index 57a56da0ec..44c53fc4ff 100644 --- a/configs/pine64_defconfig +++ b/configs/pine64_defconfig @@ -2,8 +2,8 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_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.12 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y @@ -17,15 +17,15 @@ BR2_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.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pine64_plus" 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" BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/pine64/boot.cmd" @@ -33,7 +33,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/pine64/boot.cmd" # 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.12.2" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-pine64"