From patchwork Mon May 31 21:27:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1485797 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=140.211.166.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=DYIAKFRh; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.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 4Fv7lZ5FGbz9sSn for ; Tue, 1 Jun 2021 07:31:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 93BC7401D6; Mon, 31 May 2021 21:31:36 +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 PC_Tuhku5eyC; Mon, 31 May 2021 21:31:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id DA0E64013A; Mon, 31 May 2021 21:31:34 +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 1AE671BF334 for ; Mon, 31 May 2021 21:28:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 8819A401F3 for ; Mon, 31 May 2021 21:28:10 +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 CGDhlEtlPnyS for ; Mon, 31 May 2021 21:28:09 +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 smtp2.osuosl.org (Postfix) with ESMTPS id 982044024C for ; Mon, 31 May 2021 21:28:09 +0000 (UTC) Received: by mail-lf1-x12d.google.com with SMTP id v8so18539404lft.8 for ; Mon, 31 May 2021 14:28:09 -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=HSS3xiDy2PTgmm4sHVq1S6tkFVTsfmTVEU561uBsJ40=; b=DYIAKFRh19Hx8IxRF8XoeEWR5JkGb+XElnsda7HYuHMVdAYdCUZHDjD6Bo3RXysZqi Jeayula0L7l6G3xjyX9QbAcG2XS6oT32szrnwpSEgPfn5SBbHVUCeKzpu4sEp+kJajeD czbHzbkMHlhK+JJ8kkWuxoiit428JwKk1XRwl7Hi8bW7dKj20VBGFfhYB/c3sWaOGfii 8blyM0/RaBv75QcYoJHPk6aqseEmQRaxovenyENeAbdhJCWMT6jcvFQmq0vcEQLhjIVJ ha5FtJ8EluI1HgEZboBy92r8qQMmWiJVpOkPV+5GdHMM0R139VJ7CHH6Ihu724DxfzJa aioA== 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=HSS3xiDy2PTgmm4sHVq1S6tkFVTsfmTVEU561uBsJ40=; b=YBDfEOG8z1HUXuUDg6t6sx7A89DnAdnqIMFHbj+J2QS0/CU7KfakdjGL5EK2SdbTUx dkwyub/HX20jpVO9qEpg5v8lbu14TxMlb1pUyznrdwH1/v5Od/l60+R+b23I6iuRDWyY Tkk0bEXVrDhMmt/VUYukysQA97h/2JMZU3MQfEW0Gu5UmmhePZJTiv24ByhBcQA+G2Dk PRL9YM5MdUACM6hWIRGn43LWw58YampvxPxVjbVecXg++JLevCue58yMLSghDCqyULtY Jy4kqT+vav+qazi4LeWwxZAZhOKUqe85DdHsvyk6BHE+fuEKQTuuWOaWSVE3XVS5KLNI DBHA== X-Gm-Message-State: AOAM532sylxsvdJptySVLdqdSzk+woEkA3Nil7P4qUDCxHwCPhseU0TG jvpMuW37BLz2IJolri1efo5NvNhR4iHFZw== X-Google-Smtp-Source: ABdhPJz+Rs0TITM4NFJFzm3C3uclGqgCpmQfC71EOyM8xDXlz5l24r2qeJlwXiV9I920WMHJeWNvCg== X-Received: by 2002:ac2:530c:: with SMTP id c12mr1677482lfh.514.1622496487425; Mon, 31 May 2021 14:28:07 -0700 (PDT) Received: from localhost.localdomain ([5.188.167.245]) by smtp.googlemail.com with ESMTPSA id z22sm830892ljg.27.2021.05.31.14.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 May 2021 14:28:07 -0700 (PDT) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Tue, 1 Jun 2021 00:27:37 +0300 Message-Id: <20210531212748.2378872-18-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 17/28] configs/orangepi-zero-plus2: 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-plus2/genimage.cfg | 10 ++-------- configs/orangepi_zero_plus2_defconfig | 11 +++++------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg index 98ebf5b475..255acdbecb 100644 --- a/board/orangepi/orangepi-zero-plus2/genimage.cfg +++ b/board/orangepi/orangepi-zero-plus2/genimage.cfg @@ -19,15 +19,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 = 1024000 # 1MB - 40K + 16K(GPT) + size = 1056768 # 1MB - 8K + 16K(GPT) } partition boot { diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig index 282418885f..53f035a7ac 100644 --- a/configs/orangepi_zero_plus2_defconfig +++ b/configs/orangepi_zero_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_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay" @@ -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_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" 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-plus2/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.10.10" +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-plus2"