From patchwork Mon May 31 21:27:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1485799 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::133; helo=smtp2.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=FwAZPS0X; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (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 4Fv7m40yQ8z9sXM for ; Tue, 1 Jun 2021 07:32:04 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id EB96A403F5; Mon, 31 May 2021 21:32:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org 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 4mm7cyZ5Hg8W; Mon, 31 May 2021 21:32:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 15F7E403F8; Mon, 31 May 2021 21:32:00 +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 56D711BF334 for ; Mon, 31 May 2021 21:28:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 4525383C42 for ; Mon, 31 May 2021 21:28:12 +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 2tRmGnvsHw4w for ; Mon, 31 May 2021 21:28:11 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by smtp1.osuosl.org (Postfix) with ESMTPS id 4986A83C3D for ; Mon, 31 May 2021 21:28:11 +0000 (UTC) Received: by mail-lf1-x12d.google.com with SMTP id a2so18509837lfc.9 for ; Mon, 31 May 2021 14:28:11 -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=LfaJ9Gr/nyyQY28NpSOzJEaRO7xX27gN8DP6Pqlfhdk=; b=FwAZPS0XyzRgRNMDhgavwfGbl3JOPPwuVl1IKr498FqqvQdLdG5x0MKjkUAoVMgpbs cjSGdv9sHi/m6e1uh4GU0nU00STKftMcb/Oa4z0kowz4df25V1mw9ml5Fvn/UPp0Jxi6 xTnGszi9hxFxa1rR4cUPwGRDzHcVd07B1WiJ/5xsh2FLa2nCmCalxIIOrx58ljxfmLgh 0bADwJu3qehiP2HySEhTktgyqR3mH6Gm0hCSvwojEEq62c/MFWFjkvY4lPr+JW9NbkRb kLBYpINIKMJnEgGj4RpgzPh+GAPElWK+dawd54D5Ft701C0MeIOenMP46Hp3yJ8ppuwc tQUw== 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=LfaJ9Gr/nyyQY28NpSOzJEaRO7xX27gN8DP6Pqlfhdk=; b=ABIOmZHsu9N59lRZbT0KIIzW1emDxIWdA0wqWgvDf0MbLV8uwRlx3nLyZVuD6mdRjX kSFSG05zBMhaoWMLXva789BH8Qj+mr3nUjXV4P3gQwdeQ+pZ4ChEvZgkobjoUza6/VmW TJvpf6/lgIssAf+6t0xgbTBE6X/MMBEesO7vHDu0CeeDGhSXMp9hm9QdeLhO9U8QJSPk iRKropF3E2ZK+4Cr7Vc+TG/+TikeDg/iynclQG0gW7/XtM+zuY2tSznHwLd0wIHUz1Sx 1GuFMJI4FCGPd3WcbTLJwFM5YpQRutkq5SGlXWa6NQ2k88pmTjVP1JeV24ntwJV49G/u u/7Q== X-Gm-Message-State: AOAM532qPhOnVt6R9S9k/DHKGbshmvkF5nVaaM3Ndx3uZokuRSdSfegY hR1b38OC4fABV/dy1ogFcdbKQnB6DqcQzg== X-Google-Smtp-Source: ABdhPJxZOeXHBJGFS15oz9bQolANrD4R5pyhutBORuLUntTrTywk3j5I4nY2f1UhHAb+ZKKd8yTsPg== X-Received: by 2002:a05:6512:1328:: with SMTP id x40mr15436090lfu.589.1622496488973; Mon, 31 May 2021 14:28:08 -0700 (PDT) Received: from localhost.localdomain ([5.188.167.245]) by smtp.googlemail.com with ESMTPSA id z22sm830892ljg.27.2021.05.31.14.28.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 14:28:08 -0700 (PDT) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Tue, 1 Jun 2021 00:27:39 +0300 Message-Id: <20210531212748.2378872-20-geomatsi@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531212748.2378872-1-geomatsi@gmail.com> References: <20210531212748.2378872-1-geomatsi@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH/RFC 19/28] configs/orangepi_zero_plus_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 , Chakra Divi 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/orangepi/orangepi-zero-plus/genimage.cfg | 10 ++-------- configs/orangepi_zero_plus_defconfig | 11 +++++------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/board/orangepi/orangepi-zero-plus/genimage.cfg b/board/orangepi/orangepi-zero-plus/genimage.cfg index ec15898ddd..13f42533ca 100644 --- a/board/orangepi/orangepi-zero-plus/genimage.cfg +++ b/board/orangepi/orangepi-zero-plus/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/orangepi_zero_plus_defconfig b/configs/orangepi_zero_plus_defconfig index d3cd1d1b63..23b2d71fcd 100644 --- a/configs/orangepi_zero_plus_defconfig +++ b/configs/orangepi_zero_plus_defconfig @@ -2,7 +2,7 @@ BR2_aarch64=y BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" @@ -18,16 +18,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="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_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/orangepi/orangepi-zero-plus/boot.cmd" @@ -35,7 +34,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-pl # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19" +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-orangepi-zero-plus"