From patchwork Wed Jun 9 19:59:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1490070 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.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=N6RYklnp; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.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 4G0dPC6DkJz9sRf for ; Thu, 10 Jun 2021 06:04:47 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 56F2260879; Wed, 9 Jun 2021 20:04:46 +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 JUMmgV8hV8CK; Wed, 9 Jun 2021 20:04:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id A08B86084E; Wed, 9 Jun 2021 20:04:44 +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 CCB251BF9B5 for ; Wed, 9 Jun 2021 20:00:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id BA4E7403ED for ; Wed, 9 Jun 2021 20:00:32 +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 XEkc2YwRsorV for ; Wed, 9 Jun 2021 20:00:32 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by smtp2.osuosl.org (Postfix) with ESMTPS id C3DC8400AB for ; Wed, 9 Jun 2021 20:00:31 +0000 (UTC) Received: by mail-lf1-x12a.google.com with SMTP id a1so30165467lfr.12 for ; Wed, 09 Jun 2021 13:00:31 -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=mpLh2mgz+lmnoyM1P8YTo+6TosOQ24NlSxAtB1YwR70=; b=N6RYklnpWqiGwBvwbbVv3rkKEa6BL5uTOpN5c9G+uGlWdpqRU/UKk3IWxq5YOh0czG qaPVbSFulzl1HuJhj4NpzFdHivla3KuS8VkHCabyhMO+Y/WKo87dVC9kwwgc60fRQT4g xCAXYMx+vGHSJhefetL/TI6d0zktiipOJs9SKtqds1/aaVqv93jO3yItjB6waDZVWn0+ w4gFTlBVBdRhU+YJ4zWdgaIq56TOabQ/xpzEbd2Iyn5ZhKnrRPNQaAJ5zRCLtHCw78bU hl3OVobLmE/Jme2moFCYs4VAvjFf6Iqr2eyUBGgXJFoXCq5SYim5Q5LQ/3s7YqXh576d 4+sg== 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=mpLh2mgz+lmnoyM1P8YTo+6TosOQ24NlSxAtB1YwR70=; b=s9pOqCklxBuJBOwDsx3cbGLJ68AVLMFCPft0xatcAA24wKshveMEacv8x0RtfZ0rme oJSjYEi02X2yXGBDqWpvuLSsRrsPUuv1VfBvYwQRo4cjnjA5LWrbI6TZwhSeDgn8TVTI lBs7slSzq1px7Jov7Grlwl3jHd9k992yxtCWs7PgsFGOaTDhMfkadweOQtwqIygAYkYh dLNhF64a1R2Blabxu7NEQMSRBacofroIxmpMgELSuwHQdLrwJR2970RPXP6+w3EXbVud wRDDyEiJI25KaNIFga4V0bQRADHlTVlyZpEn/OvIhcrY0iJtNqfw6v+H9a1eFTKaSaCm MIqg== X-Gm-Message-State: AOAM533uyRNAgV1CceVvsACPCz558Uhhc8bOjj76N81BdX4Wp30zhJW6 2BKXPjQQgkV3TGh7pyeq85bYn+qoC0+wFQ== X-Google-Smtp-Source: ABdhPJw1/jqO3v4TECu/aVZAyLXI8KlWeEw0OlMJAyCl1icHN58mK4+N7OA0NgyAXPZwBVOyUkq0vw== X-Received: by 2002:a05:6512:3693:: with SMTP id d19mr728917lfs.528.1623268828057; Wed, 09 Jun 2021 13:00:28 -0700 (PDT) Received: from localhost.localdomain ([5.188.167.245]) by smtp.googlemail.com with ESMTPSA id y21sm77100lfk.191.2021.06.09.13.00.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 13:00:27 -0700 (PDT) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Wed, 9 Jun 2021 22:59:55 +0300 Message-Id: <20210609200003.2866122-21-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 20/28] configs/orangepi_pc2_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-pc2/genimage.cfg | 10 ++-------- configs/orangepi_pc2_defconfig | 13 ++++++------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/board/orangepi/orangepi-pc2/genimage.cfg b/board/orangepi/orangepi-pc2/genimage.cfg index e10c67ffc3..c179efcc19 100644 --- a/board/orangepi/orangepi-pc2/genimage.cfg +++ b/board/orangepi/orangepi-pc2/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_pc2_defconfig b/configs/orangepi_pc2_defconfig index 3cd8bdb82b..acf5031e17 100644 --- a/configs/orangepi_pc2_defconfig +++ b/configs/orangepi_pc2_defconfig @@ -2,8 +2,7 @@ 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 +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y # Firmware BR2_TARGET_ARM_TRUSTED_FIRMWARE=y @@ -17,15 +16,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="orangepi_pc2" 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-pc2/boot.cmd" @@ -33,7 +32,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc2/boo # 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-h5-orangepi-pc2"