From patchwork Wed Jun 9 19:59:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1490068 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.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=YWoZkm9L; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4G0dNj3fjtz9sRf for ; Thu, 10 Jun 2021 06:04:21 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0862A40022; Wed, 9 Jun 2021 20:04:20 +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 RqFLMZ5vdzRd; Wed, 9 Jun 2021 20:04:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 11ADB40580; Wed, 9 Jun 2021 20:04:18 +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 2D5D41BF9C1 for ; Wed, 9 Jun 2021 20:00:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 1D3A283CF7 for ; Wed, 9 Jun 2021 20:00:31 +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 5HRmrFoXGDda for ; Wed, 9 Jun 2021 20:00:30 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by smtp1.osuosl.org (Postfix) with ESMTPS id AEEB683CD5 for ; Wed, 9 Jun 2021 20:00:29 +0000 (UTC) Received: by mail-lj1-x22b.google.com with SMTP id r16so1409999ljk.9 for ; Wed, 09 Jun 2021 13:00:29 -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=9zBn1xART1/S+33iJ29LI12wqf7zBuDv5Fgzs21vS3Y=; b=YWoZkm9LdD7qMcWjqWuVzkbUstGYjmbN77cvGDpfhYDRUdVjwsJ9GxhzIHhuclxik4 JfP6mn0jQtekMybvlgkXNASr+QHGYB1iL+TGFEGkjLgn8MYKYGo8640lAAx3ZX+cLxe6 YnzRWEwTj4Kh/qL2jzH2AiVYEpi6KM9ia3xmPecBm02oSojA1Xe3peXh2FwTpNDlCDVm ZtRuXLFwatRsQwtDKryZ+0bgJ2YPckUFNfgH94mTw1CkG82R6rE/aOkwb/HvSm57GhJj 2FzAc0boCVm1tHdtq1SPXiqnWElxzmwSMaIxXDgkr5Opm4ivJpGxuqC2CrT5AFwhBhRG FAQw== 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=9zBn1xART1/S+33iJ29LI12wqf7zBuDv5Fgzs21vS3Y=; b=BUT8MQL2ynLyIQw1pBQdQ5Rz+HK3CttZeK4JDHzDkDjOV2SwtKFg4Xdjj1wtknN4Fn iV3bNHvAddihHMH5maR0nmaP4sa68VvR5J2sDkks2gdbXhIAmM8EJvq7P6TcDl81etXw dhlkxbKfHtKaTOHuCRNa62HUFxs2V0FGaVwmrIUKo6F4Ye2aqv/dR8ZSfQq37ehndqKU UKJxC0GPFpM+nvjcZyr4oQvMmqyKxCcjqVbfGmrghREGWpGUA5DzIqoCvdoq5/C263a0 8a9r5k8THYvLZDdUSa/mtRDolSjQ4A48EZqncQL2cao2St3Mcj5ouliVAKthRuRigZGL QrZA== X-Gm-Message-State: AOAM530/vx1HobWIYaKNE20bR99RpbaRR64ljGIYTt0/pveRsMKrIAJL GyJ7tc3Ya8b9h94VznrwSeNvCkgNnivCkA== X-Google-Smtp-Source: ABdhPJzQFe/1qRRoDEG+MB1oCcj69AAiOrbdwQwOJQcLvFqI5vuKFcri0kBfukkhJByNa0/5irK6TA== X-Received: by 2002:a05:651c:4c7:: with SMTP id e7mr1140292lji.292.1623268827175; Wed, 09 Jun 2021 13:00:27 -0700 (PDT) Received: from localhost.localdomain ([5.188.167.245]) by smtp.googlemail.com with ESMTPSA id y21sm77100lfk.191.2021.06.09.13.00.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 13:00:26 -0700 (PDT) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Wed, 9 Jun 2021 22:59:54 +0300 Message-Id: <20210609200003.2866122-20-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 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 , 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/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 790dfff276..76dbbcdb6d 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"