From patchwork Wed Jun 9 20:00:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Matyukevich X-Patchwork-Id: 1490077 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=QU1x9kYL; 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 4G0dR51j97z9sRf for ; Thu, 10 Jun 2021 06:06:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id C8F6B60A35; Wed, 9 Jun 2021 20:06:22 +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 G7cvpAlBSrK4; Wed, 9 Jun 2021 20:06:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id C9B8460A52; Wed, 9 Jun 2021 20:06:20 +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 95C941BF9C1 for ; Wed, 9 Jun 2021 20:00:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 81F2783D11 for ; Wed, 9 Jun 2021 20:00:38 +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 JXs85V-deUDv for ; Wed, 9 Jun 2021 20:00:37 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) by smtp1.osuosl.org (Postfix) with ESMTPS id 2687983CF7 for ; Wed, 9 Jun 2021 20:00:37 +0000 (UTC) Received: by mail-lf1-x12f.google.com with SMTP id j20so10618286lfe.8 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=IcK4aI6tDNYMadHRdbt0QQnHDPk9zXcM3idJIujh+G4=; b=QU1x9kYLd2qr0JeX6DQBEK/1Av28C6SGmcF0j2carqFn+TBdpvSDhAXl7KHoG16Z2y lxOb1TRxFFxzZTrMBvlMeaAxUnjRVwGyxh/Yi03ZYxWS7Bvqu7EFWLlx/7BEYEExsnqN qEUatqCQsf/Ri/32UjbqITpWVO0QC99mDLJJx0pIgCzBb2SbM8MVw3vntSXntY97KSU5 i5P7nPu+EvzN8TyxKUJ3ZMi9Cw1I9dlKE8pHpPn60dttJNZZnUQbV2Yj99Q7yjydbl8P 1VrAl2QpyeRgEMIlPZ9mGLNZ0Xb2c1kVY78xGRerUydONJ22nsCdZD0hsltPw93rhi+h FSug== 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=IcK4aI6tDNYMadHRdbt0QQnHDPk9zXcM3idJIujh+G4=; b=l9xF2VLFWYusxfxR7NHL3pe6mZBMVBhL1dUwCKLnE0+sc34k2JuUD9FICXBLNXGgtd SnKUS+opLSp5jPPx9ImtSoVABvFwpfsDHy9R4u8/npYnN8ACcNoyF1/Cq4AQ76gBGwIE LcvCf4jae2zYtjEKDpWG4513LrTtc1sa4BOLGN0FdR2daxN9eEe8QAHohmGFaZ/o65mX i9FyOqp+hFIcInrbUfIOPN8XOj78JRWntjkEhU3ILN9ux1YLPMgqYIaOoZpmXLE6KmoE U+A8oaQhaXX48e5ft/O1RQHn2q0LueTEXvz3aJ9BM0exz2Tkq12ul0TZALWUWWzZi8cN NLew== X-Gm-Message-State: AOAM530OU6GoL42UFMuHM7/4nHV2yKcyXVSpIh9rmBRYqIKKUsLB2fUn lNzooPeGE8PjmEkpHdNyQbNjYo90qlD1nA== X-Google-Smtp-Source: ABdhPJw2+W20B50922FMo6WOVwbHxH5e+hbZKi0WQY5LJkOGweeitltOM0mYt1Awt7tBYDw7kOaAHw== X-Received: by 2002:a05:6512:3d20:: with SMTP id d32mr668772lfv.517.1623268834731; Wed, 09 Jun 2021 13:00:34 -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:34 -0700 (PDT) From: Sergey Matyukevich To: buildroot@buildroot.org Date: Wed, 9 Jun 2021 23:00:03 +0300 Message-Id: <20210609200003.2866122-29-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 28/28] configs/pine64_sopine_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/sopine/genimage.cfg | 10 ++-------- configs/pine64_sopine_defconfig | 13 ++++++------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/board/pine64/sopine/genimage.cfg b/board/pine64/sopine/genimage.cfg index 02ebe7ab9b..1f8c76c698 100644 --- a/board/pine64/sopine/genimage.cfg +++ b/board/pine64/sopine/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_sopine_defconfig b/configs/pine64_sopine_defconfig index 8dc0751108..5bbe743e0e 100644 --- a/configs/pine64_sopine_defconfig +++ b/configs/pine64_sopine_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="sopine_baseboard" 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/sopine/boot.cmd" @@ -33,7 +32,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/sopine/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-sopine-baseboard"