From patchwork Sun Apr 7 10:34:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1920504 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VC7sX1blzz1yYf for ; Sun, 7 Apr 2024 20:35:28 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 7C7B94175C; Sun, 7 Apr 2024 10:35:26 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id DvCR38bsscTW; Sun, 7 Apr 2024 10:35:25 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D06E74179D Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id D06E74179D; Sun, 7 Apr 2024 10:35:24 +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 1887E1BF94D for ; Sun, 7 Apr 2024 10:35:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 12D4840AE6 for ; Sun, 7 Apr 2024 10:35:20 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Sz-K6S8-Z1vJ for ; Sun, 7 Apr 2024 10:35:19 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::235; helo=mail-lj1-x235.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org AA402403E9 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org AA402403E9 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by smtp2.osuosl.org (Postfix) with ESMTPS id AA402403E9 for ; Sun, 7 Apr 2024 10:35:18 +0000 (UTC) Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2d717603aa5so43095991fa.0 for ; Sun, 07 Apr 2024 03:35:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712486116; x=1713090916; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q3pj0TS3tsISaeTe0sEYU+cSRM8GHhE4IMrZv4c0ot4=; b=ODfP/cjP7ycTnacAm0wP40JSge5FiXdw0yGsRNvB+UPk4S6Hd53K2w8csuMCKn+RNU Wd4kW4YD9l6MJDSV/6LF2vAkHpv8s93onurIHQk3uoRySiMx2Cm2zEbeOyIpIe7xE8yJ Gic17p5u5fE1eee2OTWeKE1bIk7wc+QiboF+/7iADUjzyzEj+EiMmRUhTrFHbS9LJ+b3 P4Bk6AIVFzgfu6Stv+8g6aacAhtvVBVJ3uwSB/2LZfBOWRT+c4j3YtQMmf7l23XMlJYY BGsZfNKRjF9JIWixBtMTTMemzOL9rnQvvXB6Ushro7wWJu+yEtJB2h94Vd1eE9Hi3prP 93bg== X-Gm-Message-State: AOJu0YxTiRjvIX/VV4jodHn2VqFuNkcvttDjpPkbgDJ9zmHRtXtyh+5L MndwdG4oyn8YM0eVSRbIdjTXkl94ZOY9R/jD3EFFBdiXeVrkuVCidmqlShTf1/GEBEFpWNnvY8Q l X-Google-Smtp-Source: AGHT+IG72McZNsnykW2TNvGQXvHnTyh7WJZeLOGIv1E306YHs/amnc1l25XPN1WmhDJox08E67yt4g== X-Received: by 2002:a2e:864e:0:b0:2d5:122a:4b1f with SMTP id i14-20020a2e864e000000b002d5122a4b1fmr4858597ljj.43.1712486116300; Sun, 07 Apr 2024 03:35:16 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b004149536479esm9486542wmb.12.2024.04.07.03.35.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 03:35:16 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 7 Apr 2024 12:34:54 +0200 Message-ID: <20240407103512.1112712-2-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240407103512.1112712-1-romain.naour@smile.fr> References: <20240407103512.1112712-1-romain.naour@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1712486116; x=1713090916; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=q3pj0TS3tsISaeTe0sEYU+cSRM8GHhE4IMrZv4c0ot4=; b=sqsLfaHp8PExe5AGe7CDoQ4SeyncnCs5EpaWvU3LicimR5h2edDXyXg0x3+KM+em37 8A6+OLZmamqzLVvTylVAjgB1KEbHEQL2li0E4JCgZyISyAZlSts43G24O8l5zgvfPsMq wz9+wjeMd+pZ7bwoPPPyfrNp5g8+ozgS2fyuKSCTNS4UcpeKM1rKxHjo9kWwHSwxDv4p 1wzhic/jUmXL7nNXaNE5J2M7J//KGwrXqQxBlVRj9n4jm/iOrwvBxuvbEJPDIvtfgL9Y p4qIaXoPwaRy/wPsCH+TFwDg/mHg31ySpv46QKCjezLk9pLqjPDZTDXJCSzh9XnoqbbW Bjhg== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=sqsLfaHp Subject: [Buildroot] [PATCH v12 01/16] boot/ti-k3-r5-loader: drop hash for version 2022.10 X-BeenThere: buildroot@buildroot.org 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: Romain Naour , Dario Binacchi , "Yann E . Morin" Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Dario Binacchi The patch removes the hash for version 2022.10 of ti-k3-r5-loader (i. e. U-Boot), still allowing the ti_am6{2,4]x_sk_defconfig configurations to properly validate the downloaded package with the appropriate hash. Link: https://patchwork.ozlabs.org/project/buildroot/patch/20240304153253.732708-6-dario.binacchi@amarulasolutions.com Suggested-by: Yann E. Morin Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- Added in v10 --- board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 ++ board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 ++ boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 1 - configs/ti_am62x_sk_defconfig | 1 + configs/ti_am64x_sk_defconfig | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash create mode 100644 board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash diff --git a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 100644 index 0000000000..2a5c99c459 --- /dev/null +++ b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 diff --git a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash new file mode 100644 index 0000000000..2a5c99c459 --- /dev/null +++ b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash index 279cb7763a..fbe5d21540 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,4 +1,3 @@ # Locally computed: -sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index a129e216d2..37df7a93f7 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,5 +1,6 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" BR2_LINUX_KERNEL=y diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 26195194c7..1ebdec68ac 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -1,5 +1,6 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_GLOBAL_PATCH_DIR="board/ti/am64x-sk/patches" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg" BR2_LINUX_KERNEL=y From patchwork Sun Apr 7 10:34:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1920505 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VC7sb1rmBz1yYf for ; Sun, 7 Apr 2024 20:35:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id BBAD9416E0; Sun, 7 Apr 2024 10:35:29 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id J47gAsyP3Oz2; Sun, 7 Apr 2024 10:35:29 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A4D3C417F7 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id A4D3C417F7; Sun, 7 Apr 2024 10:35:28 +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 255151BF954 for ; Sun, 7 Apr 2024 10:35:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 1255A822AF for ; Sun, 7 Apr 2024 10:35:20 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id bTEdmZq00zBq for ; Sun, 7 Apr 2024 10:35:19 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::233; helo=mail-lj1-x233.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 06B99822A9 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 06B99822A9 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) by smtp1.osuosl.org (Postfix) with ESMTPS id 06B99822A9 for ; Sun, 7 Apr 2024 10:35:18 +0000 (UTC) Received: by mail-lj1-x233.google.com with SMTP id 38308e7fff4ca-2d80baf621eso39037801fa.1 for ; Sun, 07 Apr 2024 03:35:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712486117; x=1713090917; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kjkx1G1Z9V1cO7Wriss47M8Lw39FZhZROiaI4y2hCfg=; b=wpaENgWNkKpijG1T7EX6R/UUPnEVG9msMKsGGWbR6sCVQJfwoZpx5BfG3haQxz1kux b0uP3jZFqNharXODDrawOCXc886hjveESH6FYhLZ5PZWUUp+/Jh2He/81FgWDoge9qHx jufIu4WZkthYZeVZ311J4YrUq8H25JiWmxrALll6VWq4UfAYhdPGeSZ79dBIiBmL0WKe OA1rFvqOUHVPfU1CZ+xPD39pPeOIJOZwwWtkB2ec3hSKUidzCcH6jmIiRTv0kDlZYF1c 2i6Seo9FemSqH/zXFCU3RetCJY3bUwCEe9G4AP/MAZ6wBHCLjDP+MoNPXC10S9Fxmz6H hErw== X-Gm-Message-State: AOJu0YwDJfSY5oZrHZeQPI0p+mjlTOw5EKC4qDYkk1ftglsY34L6zkU6 cu6qLHazRYsc4p0oNu8Fu2reE8pgVFJao942uS5xRe/hZsxOQxf8RE+D9kZMyacWG5a8dBgoqDZ W X-Google-Smtp-Source: AGHT+IEyIUcpv+fpBnzhKLHzYGz1W/V27Q7adyD8SI1B7KJMciHp44njzc2EMb3mYwnbk/3YLMT2LQ== X-Received: by 2002:a2e:a417:0:b0:2d6:f16a:857f with SMTP id p23-20020a2ea417000000b002d6f16a857fmr3387119ljn.0.1712486116746; Sun, 07 Apr 2024 03:35:16 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b004149536479esm9486542wmb.12.2024.04.07.03.35.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 03:35:16 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 7 Apr 2024 12:34:55 +0200 Message-ID: <20240407103512.1112712-3-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240407103512.1112712-1-romain.naour@smile.fr> References: <20240407103512.1112712-1-romain.naour@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1712486117; x=1713090917; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kjkx1G1Z9V1cO7Wriss47M8Lw39FZhZROiaI4y2hCfg=; b=THx6NZRGBWgMrex7wljbiewp2q8M0ap5moABs+c2qPenoETLzn18qqTyt2DUvdMgUt QP67otOaqAo6DRdS5jVDn38LGW25sjZIvicg2UwDvjLpMr/xZQc0eRqQcUs17tCk8zh3 RKlkhEBogfqipkqisQM9hFqX9CTX+z9pvgy10KbT8p/TJyNoiwze98fTJd9RZdY/+GG6 Uy9lD5PXklL1dDXdF8bGNeZxOQWz1fcc1vN8FDlec03Zn8La59NN6wxZFfG+M79913ok DfsBbEorLXC5sZF72l6n2KB9t2Ayu1ZEZC8wGPGlFjHtZ7BlHZy99h5cvVKYshfW/Qcf 6enA== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=THx6NZRG Subject: [Buildroot] [PATCH v12 02/16] board/ti/am6{2, 4}x-sk: add arm-trusted-firmware v2.7 hash X-BeenThere: buildroot@buildroot.org 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: Romain Naour Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" We are going to enable BR2_DOWNLOAD_FORCE_CHECK_HASHES by default to enforce downloads to have at least one valid hash including those that use a custom version. Signed-off-by: Romain Naour --- .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ .../patches/arm-trusted-firmware/arm-trusted-firmware.hash | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash create mode 100644 board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash diff --git a/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..74fe35c9bc --- /dev/null +++ b/board/ti/am62x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz diff --git a/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash new file mode 100644 index 0000000000..74fe35c9bc --- /dev/null +++ b/board/ti/am64x-sk/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 327c65b1bc231608a7a808b068b00c1a22310e9fc86158813cd10a9711d5725e arm-trusted-firmware-v2.7.tar.gz From patchwork Sun Apr 7 10:34:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1920506 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VC7sf4sL4z1yYf for ; Sun, 7 Apr 2024 20:35:34 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 17FC941561; Sun, 7 Apr 2024 10:35:33 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Z97HV-Cyojyz; Sun, 7 Apr 2024 10:35:31 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 9F4EA4188E Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 9F4EA4188E; Sun, 7 Apr 2024 10:35:31 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 6FB741BF575 for ; Sun, 7 Apr 2024 10:35:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 5B713608E9 for ; Sun, 7 Apr 2024 10:35:20 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id fNBGDnlh3SKF for ; Sun, 7 Apr 2024 10:35:19 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::32f; helo=mail-wm1-x32f.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 1D8CC608ED DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 1D8CC608ED Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by smtp3.osuosl.org (Postfix) with ESMTPS id 1D8CC608ED for ; Sun, 7 Apr 2024 10:35:19 +0000 (UTC) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4163de295f9so3111505e9.2 for ; Sun, 07 Apr 2024 03:35:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712486117; x=1713090917; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NRdaR5n2Lz4Q1zUg+dzYDFTLZFwDakArgiUQpudUbQs=; b=EXZHPSErpaGNljYM0kZF+sXkisBFXCOjju0B/TalmnMNzASglnpAXVAFueZGrjjobN co9qssenw8pbn//o+VCQ3sNpZYvp/ruhszhnjEfRf3utBt8PTFQ1P+RPcU0THDwgeGrv +zQUB/Nsb9Njsn36x+HB6GmxD8j/vkY4WkiQ7BmQ0VYBq1BKvgaoLJP3gMy1c2BRkM7E u8f9T7GZ/VXHT7tguYF1Dmj3VcWgdOpkZAWDsRh8t5C/ycu9IyKR0/KbWp5c47gTpuEA hCUXmGIAEonJhXvd6qprC6jEk6oHAWAe50dqqLpa4Wnsux/eQKhL1R6DjQv82NSEgVK6 L99A== X-Gm-Message-State: AOJu0YwU3XESNWf9b6iYBG5qvrC1j6+ZZVNm7CcN5qsRjkYnIyxQyt22 u9V/Mwcc/fulIN0QFieleO1/UMfv/WTjGK6/mL0P6L/W2IVqRoJEBl7AyyoxE1kx2lQds6uvTCd O X-Google-Smtp-Source: AGHT+IE1FFH0i80vJvReiN2+pvllqoSb3TDvQBqiFqlrQA1YXVe7skcpmr+dZou4da18eACFd32O/A== X-Received: by 2002:a05:600c:4fc2:b0:414:8e02:e432 with SMTP id o2-20020a05600c4fc200b004148e02e432mr5187069wmq.7.1712486117216; Sun, 07 Apr 2024 03:35:17 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b004149536479esm9486542wmb.12.2024.04.07.03.35.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 03:35:17 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 7 Apr 2024 12:34:56 +0200 Message-ID: <20240407103512.1112712-4-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240407103512.1112712-1-romain.naour@smile.fr> References: <20240407103512.1112712-1-romain.naour@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1712486117; x=1713090917; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NRdaR5n2Lz4Q1zUg+dzYDFTLZFwDakArgiUQpudUbQs=; b=fEV9Tr8NmhoZ8oqgIE0XFJgezXi1rJOJF5RRoqAmg4IYgl2GY9l+F01J70+9gUsHjM IEyUaXRPpnF//ipeKfvkHo1CKulTuRnSxMThHms2ENpeiywaT0UaWExsMmEXPjxGPn8H L+0I+jSS/4e8CbFg9RFS8QRdIr8GeEnOSHJ87aNbcFiflKT9vHvc69yEk2kqDoFcmscc kS97uyPlj8UaCuyA6qQLCWSDyAbLWFwQ1oGrqNQIhn2NbDYHIkoSuwEEB0asZZct6uZj lX6AqSTrDwPfjoNhcSxwro1/yXSQyscK4IA8R30vFESMfZF5J0UjzqmXxRIlNRKCctlF WO+A== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=fEV9Tr8N Subject: [Buildroot] [PATCH v12 03/16] boot/uboot: rename TI_K3_DM option to cover further TI K3 SoCs support X-BeenThere: buildroot@buildroot.org 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: Romain Naour Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" BR2_TARGET_UBOOT_NEEDS_TI_K3_DM option has been introduced initially to support certain TI K3 devices such as AM62x and AM62Ax that require a Device Manager (DM) firmware. This option needs to be renamed to use a more generic name in order to cover further TI K3 SoCs support along with the new u-boot binman tool that will be added in followup patch. With binman enabled in u-boot on TI K3 SoC, ti-k3-boot-firmware is needed at buildtime to provide ti-sysfw (System Firmware) for all TI K3 SoC along with Device Manager (DM) firmware for AM62x and AM62Ax devices. With binman support enabled, we don't need to provide the path of the Device Manager firmware anymore (see [2]). We can remove DM=".xer5f" from UBOOT_MAKE_OPTS. It also means that we can also remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME used to define DM path. DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f For now, keep BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME and DM only when ti-k3-image-gen is used. We need to update ti_am62x_sk_defconfig to use binman before removing them along with ti-k3-image-gen. [1] 52ce606c05ee3ac869f8087292bc3dbb0d25b79b [2] https://software-dl.ti.com/processor-sdk-linux/esd/AM62X/09_01_00_08/exports/docs/linux/Foundational_Components/U-Boot/UG-General-Info.html Signed-off-by: Romain Naour --- Config.in.legacy | 8 ++++++++ boot/uboot/Config.in | 23 ++++++++++++++--------- boot/uboot/uboot.mk | 4 +++- configs/ti_am62x_sk_defconfig | 2 +- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index d00196e08b..4084ffa516 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2024.05" +config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM + bool "u-boot TI K3 DM option has been renamed." + select BR2_LEGACY + select BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE + help + The TI K3 Device Manager is already included in + ti-k3-boot-firmware. + config BR2_PACKAGE_FLUTTER_GALLERY bool "flutter-gallery removed" select BR2_LEGACY diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 39b3f2c81b..e310c09217 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -240,18 +240,23 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE U-Boot, and that the TEE variable pointing to OPTEE's tee.elf, is passed during the Buildroot build. -config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM - bool "U-Boot needs TI K3 Device Manager (DM)" - # We use the SoC selection defined for the ti-k3-image-gen - # package - depends on BR2_TARGET_TI_K3_IMAGE_GEN - depends on BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX || BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X +config BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE + bool "U-Boot needs ti-k3-boot-firmware" + depends on BR2_TARGET_TI_K3_BOOT_FIRMWARE help - Some TI K3 devices need the Device Manager (DM) firmware to - be available for the U-Boot build. + TI K3 devices needs at least ti-sysfw (System Firmware) when + built with u-boot's binman tool. -if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM + Some TI K3 devices using a split firmware boot flow (AM62, + j721e) also need the Device Manager (DM) firmware to be + available for the U-Boot build. +if BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE + +# TI_K3_DM_SOCNAME is only needed when ti-k3-image-gen is used for +# TI K3 devices using the Device Manager (DM) firmware. +# We use the SoC selection defined for the ti-k3-image-gen +# package. config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME string default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 491f654cec..47fb419e92 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -194,11 +194,13 @@ UBOOT_DEPENDENCIES += optee-os UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf endif -ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) +ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE),y) UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_DEPENDENCIES += ti-k3-boot-firmware +ifneq ($(UBOOT_TI_K3_DM_SOCNAME),) UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f endif +endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) UBOOT_DEPENDENCIES += opensbi diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 37df7a93f7..b2814526bb 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -37,7 +37,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y -BR2_TARGET_UBOOT_NEEDS_TI_K3_DM=y +BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y From patchwork Sun Apr 7 10:34:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1920508 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VC7sr1Q0Wz1yYf for ; Sun, 7 Apr 2024 20:35:44 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6EC7441779; Sun, 7 Apr 2024 10:35:42 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id LI-gBtKoo-3b; Sun, 7 Apr 2024 10:35:39 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A38DB418BC Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id A38DB418BC; Sun, 7 Apr 2024 10:35:38 +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 F27D21BF575 for ; Sun, 7 Apr 2024 10:35:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id EAD73403E9 for ; Sun, 7 Apr 2024 10:35:20 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id lQCJSxcp0CtV for ; Sun, 7 Apr 2024 10:35:20 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::32d; helo=mail-wm1-x32d.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org ACC6340614 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org ACC6340614 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by smtp2.osuosl.org (Postfix) with ESMTPS id ACC6340614 for ; Sun, 7 Apr 2024 10:35:19 +0000 (UTC) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-415446af364so26281365e9.0 for ; Sun, 07 Apr 2024 03:35:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712486118; x=1713090918; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yI1VSwtTAUPr3dyoJeMCgViOH+efd4q05v0ey0wQBPw=; b=itqgDRYUv20Rr56/pKRhhhRkTm9xa31/+WTMS+nyPypnLykkBJS7f3mUZ3LrZ9O7j8 RPZOxhRrdOyjjeQMA6JtuflXjI1GRZIM+ODXCGAt1Jke+8qwH7N6s/jOGTsG42x17hVL crbaJehnfvCxIF3Nt07J7RZGkuUysDz9ZwkNujS6mtkAzJHE438OXQNUKWY2ZVzoH274 r+96dNTII2eLw1cygCS1u2fJxM6MKjLTb3x2sBTkm+l5ATtSqbjgTa3BlXVthusnH9rU sZnrND+h5gclzYCR6pqada9HD+jWY+nCie0unfSUbAWnxBPwWGPdRGS/tPmv/vGVLimI zqHw== X-Gm-Message-State: AOJu0Yxz+H3OLYdbc4L9V6jRdVPeT9g0L7robiQbbehNDmGZ02IyXkfw axZBpHAYJTXLoLX1BQtA3HMv6PBzF6RPzgGM9LMgNKv3rXlnnlLRfIqy7G54mrcMcowy0jxYkKa b X-Google-Smtp-Source: AGHT+IExgbri1J13Nwp0xAmfZXRq1Ag50I+o4Vtm2Z96XyWuB6d8sO+l8iooPU2ilW2FUOP1HfZnpQ== X-Received: by 2002:a05:600c:3514:b0:415:666e:9355 with SMTP id h20-20020a05600c351400b00415666e9355mr5436170wmq.15.1712486117712; Sun, 07 Apr 2024 03:35:17 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b004149536479esm9486542wmb.12.2024.04.07.03.35.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 03:35:17 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 7 Apr 2024 12:34:57 +0200 Message-ID: <20240407103512.1112712-5-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240407103512.1112712-1-romain.naour@smile.fr> References: <20240407103512.1112712-1-romain.naour@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1712486118; x=1713090918; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yI1VSwtTAUPr3dyoJeMCgViOH+efd4q05v0ey0wQBPw=; b=AwRYQ6ojTezWInxNARZTp1VrYMsTDaXeb8F4gJeHmQExQ9kXh9U5vJGk2Sg4U4hFFP 7lj7Vpw69/M90/8K3Nq636YXk4gBxiL3csNIzNrJE0t4zyODy1oSYbt8FmTC5RLUYYEF 6In1yfZrHDtSAfQ+/8gffKb7/M2oo+vStfblYcJ3Z48crsBTfGjX6178eHx2Kemeoe0M ZxjL8auIc7fYk3ND1BEaZ+veyiPgf/B3oBL/odPTKTWqJD+456HgC45SpTRgxecsuZKT BIqdlRLkWshm7DZ2ixaxu3eZowqhPCfGOCEsARhMGS5XsCtXGZghaNWsQgUeMxejGPzm NrRg== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=AwRYQ6oj Subject: [Buildroot] [PATCH v12 04/16] boot/ti-k3-r5-loader: add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option X-BeenThere: buildroot@buildroot.org 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: Romain Naour , Dario Binacchi , Michael Trimarchi Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Dario Binacchi Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This tool uses additional host python modules that must be provided by Buildroot. So introduce a new option BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN to add additional host packages in U-Boot build dependency to use binman. When BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is set, BINMAN_INDIRS environment variable to provide the directory to search for binary blobs and select the packages required by binman. Make sure that ti-k3-boot-firmware package has been installed before building ti-k3-r5-loader in order to provide such firmwares. The BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option is currently needed since we are in the middle of the process to switch TI AM62 and AM64 board defconfig to binman. Keep BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN disabled for them until the u-boot/ti-k3-r5-loader version bump to 2024.01. The dependency of binman is not really easy to follow. First we have the packages list from binman.rst [1] then we have to install additional python modules [2]. Maybe in the future it will be necessary to add host-lzma and host-lz4 in the dependencies list. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/binman/binman.rst?plain=1#L377 [2] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- Changes in v11: - Use BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option while AM62 and AM64 still use ti-k3-image-gen - Add missing ti-k3-boot-firmware dependency Changes in v6: - Update the commit message adding the links of requirements. Changes in v5: - Add dependecy on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS - Drop runtime dependecies - Add host-python-pylibfdt dependency without requiring BR2_TARGET_UBOOT_NEEDS_PYLIBFDT configuration - Add host-python3 and host-python-setuptools dependencies - Add SOB and COB tags of Romain Naour Changes in v4: - Drop the BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option Changes in v2: - Change commit message - Add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option - Select packages required by binman if BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN is enabled --- boot/ti-k3-r5-loader/Config.in | 9 +++++++++ boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 15 +++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 5f86c045c9..5f4f33b220 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -93,4 +93,13 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE help Path to the TI K3 R5 Loader configuration file. +config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN + bool "ti-k3-r5-loader use binman" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema + select BR2_TARGET_TI_K3_BOOT_FIRMWARE + help + Use binman tool for generation and signing of boot images. + + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html + endif diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 0ffcb8235f..cf18b43871 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -60,6 +60,21 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ HOSTLDFLAGS="$(HOST_LDFLAGS)" +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN),y) +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +TI_K3_R5_LOADER_DEPENDENCIES += \ + host-python-jsonschema \ + host-python-pyyaml \ + ti-k3-boot-firmware +# Make sure that all binman requirements are build before ti-k3-r5-loader. +TI_K3_R5_LOADER_DEPENDENCIES += \ + host-python3 \ + host-python-pyelftools \ + host-python-pylibfdt \ + host-python-setuptools +TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) +endif + define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef From patchwork Sun Apr 7 10:34:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1920507 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VC7sk68YPz1yYf for ; Sun, 7 Apr 2024 20:35:38 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 1F84F4189B; Sun, 7 Apr 2024 10:35:37 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Kfyfg5_Qkmb6; Sun, 7 Apr 2024 10:35:35 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 9CA89417C9 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 9CA89417C9; Sun, 7 Apr 2024 10:35:34 +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 A8A461BF94D for ; Sun, 7 Apr 2024 10:35:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 96563822AF for ; Sun, 7 Apr 2024 10:35:21 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id kRmjW2CxJ8jW for ; Sun, 7 Apr 2024 10:35:20 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::432; helo=mail-wr1-x432.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 5C251822A9 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5C251822A9 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by smtp1.osuosl.org (Postfix) with ESMTPS id 5C251822A9 for ; Sun, 7 Apr 2024 10:35:20 +0000 (UTC) Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-344047ac7e4so595928f8f.0 for ; Sun, 07 Apr 2024 03:35:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712486118; x=1713090918; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8O5k9R+V9W4l6wDTdNo3pQXas1k84HgBXRpOJcSgdjE=; b=RnPHVlzvOy/nkFla90eFctoezWWMxo8MRp/PMFLj//XqRyQf99nItzr7IKwhPqEq+v OpPzDYBr+4Tu+wDyJADgNjJqxWFnudK3YAZA0gBtznb96cCv0gbjLN49v49Cyx0T3F0j hLScA3Np7zded0Ez/hXUewN76YHxizymJ2YZAdwTcJPkDNGFUKeGVPp9qkRs5x5aHV3l P8SOBguwk8ySu5ffD5LGxz+xfiM3yHkVSBIlvMlhWGtO2JMjzxcmVli171dr4CDy02vc IgeunKcu4EIfzJtRY3Gq6RB0Gn2Abki4EpUOjDfvSuLu+CFk4iXfVT6T9ZZZP/TDru4y 16Ag== X-Gm-Message-State: AOJu0Yw8eta5gmCp7kZf/IJQ8vtwRnpvYVr4aTkZQH5KWBybIY4/6zT0 Ws2kSq8V7MbXUUvJF4QfyXdk+sexqW12Ok3l4DpqMYwwT19GgBG78lyM/bLFReBQoAvz2F4PPfu d X-Google-Smtp-Source: AGHT+IHqk7vtFSN+rjmZXEwnqvmcR5KICkghrFZYZKnCerFKkZzBwL6YOK9TmQwmTWyVXrwgbyxlyQ== X-Received: by 2002:a5d:660b:0:b0:343:cee1:cbc1 with SMTP id n11-20020a5d660b000000b00343cee1cbc1mr6245638wru.14.1712486118230; Sun, 07 Apr 2024 03:35:18 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b004149536479esm9486542wmb.12.2024.04.07.03.35.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 03:35:18 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 7 Apr 2024 12:34:58 +0200 Message-ID: <20240407103512.1112712-6-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240407103512.1112712-1-romain.naour@smile.fr> References: <20240407103512.1112712-1-romain.naour@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1712486118; x=1713090918; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8O5k9R+V9W4l6wDTdNo3pQXas1k84HgBXRpOJcSgdjE=; b=GyFxGZv2z96Qf97mFtjsHEU0w2xw6tNMjEOncUzBAFqYs+JwcFassHTDt3UnsKPGc4 cdUxZgkS7nNvCUmqcN2vTgjhF67aOJ4xPDXEB1Z48FmVZS6SoheYa+AsYxVEx9XXKcI2 kDRn40TosmU26IL5yZc+kVp6bkovwD991KLW0s0FLJNoLw3X1amV2NPArRK+7uBfjRy/ ex0CQRq+QtJMgs5uI5gNR29zLGVrvnjtQFNAFt9jhUEhqmfmfHiI0KCARDHyfEYAZbZM jIrQ7DYLh36cMECY7Tmmi7wqr+ad2bCs1WpSpgTG3bOZY3/HEgIKKuMF69Vne4dQpD4N X4FA== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=GyFxGZv2 Subject: [Buildroot] [PATCH v12 05/16] boot/uboot: add BR2_TARGET_UBOOT_USE_BINMAN option X-BeenThere: buildroot@buildroot.org 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: Romain Naour , Dario Binacchi Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Dario Binacchi Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This tool uses additional host python modules that must be provided by Buildroot. So introduce a new option BR2_TARGET_UBOOT_USE_BINMAN to add additional host packages in U-Boot build dependency to use binman. The binman requirement is directly included in buildman dependency (tools/buildman/requirements.txt) since within U-Boot, binman is invoked by the build system, here buildman [1]. [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot Co-developed-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- Changes in v12: - remove BR2_PACKAGE_TI_K3 part since this option has been removed from this series - remove TI K3 specific part from the commit log Changes in v11: - Add ti-k3-boot-firmware depedendency when both BR2_TARGET_UBOOT_USE_BINMAN and BR2_PACKAGE_TI_K3 are set - drop BR2_TARGET_UBOOT_NEEDS_TI_K3_DM related changes Changes in v7: - Replace ifneq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) with ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),). - Update the commit message Changes in v6: - BR2_TARGET_UBOOT_USE_BINMAN - Binman tool is not specific to TI K3 platform, so add an option to specify the use of Binman in U-Boot. - Add runtime dependencies - Update commit message - Add SOB and COB tags of Romain Naour Changes in v5: - Drop "DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f" from UBOOT_MAKE_OPTS. no changes since v1: --- boot/uboot/Config.in | 11 +++++++++++ boot/uboot/uboot.mk | 8 ++++++++ 2 files changed, 19 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index e310c09217..39e49d681b 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -295,6 +295,17 @@ config BR2_TARGET_UBOOT_NEEDS_ROCKCHIP_RKBIN This option makes sure that the needed binary blobs are copied into the U-Boot source directory. +config BR2_TARGET_UBOOT_USE_BINMAN + bool "U-Boot use binman" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema + select BR2_TARGET_UBOOT_NEEDS_PYTHON3 + select BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS + select BR2_TARGET_UBOOT_NEEDS_PYLIBFDT + help + Use binman tool for generation and signing of boot images. + + https://docs.u-boot.org/en/v2024.01/develop/package/binman.html + menu "U-Boot binary format" config BR2_TARGET_UBOOT_FORMAT_AIS diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 47fb419e92..398485195e 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -279,6 +279,14 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) UBOOT_DEPENDENCIES += host-vim endif +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),y) +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +UBOOT_DEPENDENCIES += \ + host-python-jsonschema \ + host-python-pyyaml +UBOOT_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) +endif + # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE From patchwork Sun Apr 7 10:34:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1920512 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VC7t42SDlz1yYf for ; Sun, 7 Apr 2024 20:35:56 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C1D8141B6C; Sun, 7 Apr 2024 10:35:54 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id cXU0P0UX4FTl; Sun, 7 Apr 2024 10:35:53 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 59E0A4180D Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 59E0A4180D; Sun, 7 Apr 2024 10:35:53 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 634891BF575 for ; Sun, 7 Apr 2024 10:35:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 4CCF0416DC for ; Sun, 7 Apr 2024 10:35:23 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id gMgcOR1QeIk3 for ; Sun, 7 Apr 2024 10:35:21 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::235; helo=mail-lj1-x235.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 2E961415DB DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2E961415DB Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by smtp4.osuosl.org (Postfix) with ESMTPS id 2E961415DB for ; Sun, 7 Apr 2024 10:35:21 +0000 (UTC) Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2d52e65d4a8so55362761fa.0 for ; Sun, 07 Apr 2024 03:35:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712486119; x=1713090919; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mS439ZW+FduFo1jCPppJwj8/5fMZK/aUgldCOgHB9nE=; b=FpHAZELruUGTEzvdpL7F3Bu+HuYluFOHpzJOWP7oGDfCONAXnuJc0h35sGLTVlqTju GKJCRVfsw/KJvDwW0btRDitNK+z8HpUFZZpl/eZQkzyweQiRC+iUEs2RR+v9TeqZGgsn WcU/yGiJKRu2VFhYDEbZwSnqejeBNRsdi3kebOjTjceZDQUtB9HmAA+0lMPOXyjQz60y Lj+6QcyGmRilyGt8N5IqpT7JzDn1AtyDThwfVsCQyKoB+um7SSrxqdl3gPh+bgwXidLn bGLs7ilPnn8kgYbGgopIa9yQT5vy6Pkifs/KY0VFD3CcdCjOdhngOrPZVy+6Vep70jqD co9w== X-Gm-Message-State: AOJu0YwZtXYpfb9pZ/gMjmUzIntFVHQuUvpuJeJC8orQ6GJsDcGP8wfc NHkZlLGHO4qfMTVLlY00dgAB8L+M3BY9UBQaXdYsG3880VX/lzJ0QgogOWu+7t/NOVW/1K+ObMn + X-Google-Smtp-Source: AGHT+IGsl3WrfTb4e7fo6GGpRewxeTFTyKL9yaV9fL3ZwDJF9tFHkuFvuGgqhIEM5Zy7wDBYxjzdxA== X-Received: by 2002:a2e:8704:0:b0:2d4:1fa4:9eb8 with SMTP id m4-20020a2e8704000000b002d41fa49eb8mr3505572lji.40.1712486118835; Sun, 07 Apr 2024 03:35:18 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b004149536479esm9486542wmb.12.2024.04.07.03.35.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 03:35:18 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 7 Apr 2024 12:34:59 +0200 Message-ID: <20240407103512.1112712-7-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240407103512.1112712-1-romain.naour@smile.fr> References: <20240407103512.1112712-1-romain.naour@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1712486119; x=1713090919; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mS439ZW+FduFo1jCPppJwj8/5fMZK/aUgldCOgHB9nE=; b=SAv9PtnLmejZWdxAdiiDRrd3TUUACYpSAbJLTFkqQrS+URebLX6SulnBhrpYTiSHsj +MftrWmMHmRHri2mSbeh6RvJjLWpLd3/+F+4Bx719cKiHsFrR+vWXdZdAtk7AD7rbfjg NoNb84mzZoyNdIgq4YKmkhtUFbc+lNLNQ6APlHdfmsEji2WVUZ8PnEYUE7UFBFTd3bO1 G93uAUgeHx5Kctw170IHCWeb18Ld1YHIRD/nueQGJo6V1y2eyENxph7QhpScH7xEhdgR 0Vi5pPeO7F1dploN+reOMpBKjTp0tULkywacRClb0qsPvPd96c90YsqsbGDBz2e582/A dhKw== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=SAv9PtnL Subject: [Buildroot] [PATCH v12 06/16] boot/ti-k3-r5-loader: install tiboot3.bin and sysfw.itb to BINARIES_DIR X-BeenThere: buildroot@buildroot.org 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: Romain Naour , Dario Binacchi Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Dario Binacchi With binman support enabled, u-boot for k3 r5 core (ti-k3-r5-loader) install different target image (tiboot3*.bin) depending on the K3 SoC boot ROM: - General Purpose devices (gp) - High Security - Field Securable devices (hs-fs) - High Security - Security Enforcing devices (hs) An additional firmware binary is required on certain TI K3 devices such as AM65 and J721e due to the "Split binary" boot flow [1]: - Split binary with a combined firmware: (eg: AM65) - Combined binary with a combined firmware: (eg: AM64) - Split binary with a split firmware: (eg: J721E) - Combined binary with a split firmware: (eg: AM62) K3 SoC using Split Binary Boot Flow also requires sysfw-*.itb file to boot (eg: am65, j721e). Only tiboot3*.bin is needed for other boot flow. From [1]: "It's important to rename the generated tiboot3.bin and sysfw.itb to match exactly tiboot3.bin and sysfw.itb as ROM and the wakeup UBoot SPL will only look for and load the files with these names." See the (not exhaustive) list of all tiboot3*.bin and sysfw*.itb file variant found in meta-ti: meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf:UBOOT_IMAGE = "tiboot3-${MAINMACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" meta-ti-bsp/conf/machine/beaglebone-ai64-k3r5.conf:UBOOT_SYMLINK = "tiboot3-${MAINMACHINE}.${UBOOT_SUFFIX}" meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-gp-evm.bin" meta-ti-bsp/conf/machine/include/am62axx.inc:IMAGE_BOOT_FILES += "tiboot3-am62ax-hs-evm.bin" meta-ti-bsp/conf/machine/include/am62pxx.inc:IMAGE_BOOT_FILES += "tiboot3-am62px-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-gp-evm.bin" meta-ti-bsp/conf/machine/include/am62xx.inc:IMAGE_BOOT_FILES += "tiboot3-am62x-hs-evm.bin" meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x-gp-evm.bin" meta-ti-bsp/conf/machine/include/am64xx.inc:IMAGE_BOOT_FILES += "tiboot3-am64x_sr2-hs-evm.bin" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-gp-evm.bin" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "tiboot3-am65x_sr2-hs-evm.bin" meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200-gp-evm.bin" meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/j7200.inc:IMAGE_BOOT_FILES += "tiboot3-j7200_sr2-hs-evm.bin" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e-gp-evm.bin" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e_sr2-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "tiboot3-j721e_sr1_1-hs-evm.bin" meta-ti-bsp/conf/machine/include/j721s2.inc:IMAGE_BOOT_FILES += "tiboot3-j721s2-gp-evm.bin" meta-ti-bsp/conf/machine/include/j721s2.inc:IMAGE_BOOT_FILES += "tiboot3-j721s2-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/j722s.inc:IMAGE_BOOT_FILES += "tiboot3-j722s-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/j784s4.inc:IMAGE_BOOT_FILES += "tiboot3-j784s4-gp-evm.bin" meta-ti-bsp/conf/machine/include/j784s4.inc:IMAGE_BOOT_FILES += "tiboot3-j784s4-hs-fs-evm.bin" meta-ti-bsp/conf/machine/include/k3r5.inc:SPL_BINARY = "tiboot3-${SYSFW_SOC}-${SYSFW_SUFFIX}-${SYSFW_CONFIG}.${SPL_SUFFIX}" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw.itb" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw-am65x_sr2-gp-evm.itb" meta-ti-bsp/conf/machine/include/am65xx.inc:IMAGE_BOOT_FILES += "sysfw-am65x_sr2-hs-evm.itb" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw.itb" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e-gp-evm.itb" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e_sr2-hs-fs-evm.itb" meta-ti-bsp/conf/machine/include/j721e.inc:IMAGE_BOOT_FILES += "sysfw-j721e_sr1_1-hs-evm.itb" This firmware list can also be verified with the firmware name used in the u-boot devicetree k3-*-binman.dtsi files. On the SK-AM62B-P1, three tiboot3 binaries are built, one for each boot ROM variant: tiboot3-am62x-gp-evm.bin tiboot3-am62x-hs-evm.bin tiboot3-am62x-hs-fs-evm.bin A tiboot3.bin symlink is provided as default choice: tiboot3.bin -> tiboot3-am62x-hs-fs-evm.bin On this board, the tiboot3.bin symlink links to the hs-fs variant but it not always de case for all TI K3 devices. (ex: J721e use gp variant by default). The tiboot3.bin symlink links the -gp, -hs-fs, -hs tiboot3 binary according to where "symlink = "tiboot3.bin";" line is located in k3-*binman.dtsi. As reported by Michael Walle [2], such firmware name can also be customized by a SBC vendor [3], so we can't always be sure which firmware to use. If required, let the user provide a custom tiboot3 or sysfw firmware name from the defconfig. Otherwise use the default firmware choice by copying tiboot3.bin and sysfw.itb symlinks. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/doc/board/ti/k3.rst [2] http://lists.busybox.net/pipermail/buildroot/2024-April/688943.html [3] https://elixir.bootlin.com/u-boot/v2024.04/source/arch/arm/dts/k3-am625-phycore-som-binman.dtsi#L14 Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- Changes in v12: - allow a custom tiboot3 and sysfw firmware name: http://lists.busybox.net/pipermail/buildroot/2024-April/688953.html Changes in v11: - Introduce BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN and BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB strings to provide firmware name to copy at the end of ti-k3-r5-loader build. This replace the "find . -regex" from provious patch version. - Add sysfw.itb handling needed to TI K3 SoC using Split Binary Boot Flow. Changes in v8: - Use the `find' command in pipe with the `cp' command. Changes in v6: - Replace `find' command with `cp' one. Changes in v5: - Replace tiboot3-*-$(TI_K3_R5_LOADER_SECTYPE)-*.bin with tiboot3-$(TI_K3_R5_LOADER_SOC)-$(TI_K3_R5_LOADER_SECTYPE)-*.bin Added in v4 --- boot/ti-k3-r5-loader/Config.in | 40 +++++++++++++++++++++++++ boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 35 +++++++++++++++++++++- 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 5f4f33b220..c0c7222a10 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -102,4 +102,44 @@ config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN https://docs.u-boot.org/en/v2024.01/develop/package/binman.html +config BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN + string "tiboot3.bin binary name" + default "tiboot3.bin" + help + Name of the TI K3 tiboot3.bin binary to use. + + The tiboot3 binary name must match with the TI K3 SoC boot + ROM: + + - General Purpose devices (gp) + - High Security - Field Securable devices (hs-fs) + - High Security - Security Enforcing devices (hs) + + Or if the tiboot3 binary generated use a custom name. + + If unsure, use the default tiboot3.bin (symlink) generated by + binman. + +config BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB + string "sysfw.itb binary name" + default "sysfw.itb" + help + Name of the TI K3 sysfw.itb binary to use (if any required). + + sysfw*.itb are only generated for Split binary based Boot + Flow (eg: am65, j721e). This option is not used on other + TI K3 devices. + + The sysfw binary name must match with the TI K3 SoC boot + ROM: + + - General Purpose devices (gp) + - High Security - Field Securable devices (hs-fs) + - High Security - Security Enforcing devices (hs) + + Or if the sysfw binary generated use a custom name. + + If unsure, use the default sysfw.itb (symlink) generated by + binman. + endif diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index cf18b43871..0191a2501c 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -73,7 +73,24 @@ TI_K3_R5_LOADER_DEPENDENCIES += \ host-python-pylibfdt \ host-python-setuptools TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) -endif + +TI_K3_R5_LOADER_TIBOOT3_BIN = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN)) + +define TI_K3_R5_LOADER_INSTALL_TIBOOT3_BIN + cp $(@D)/$(TI_K3_R5_LOADER_TIBOOT3_BIN) $(BINARIES_DIR)/tiboot3.bin +endef + +TI_K3_R5_LOADER_SWSFW_ITB = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB)) + +# sysfw*.itb are only generated for Split binary based Boot Flow (eg: am65, j721e). +# So, if sysfw.itb symlink exist we must copy it or the custom sysfw.itb. +define TI_K3_R5_LOADER_INSTALL_SWSFW_ITB + if test -e $(@D)/sysfw.itb ; then \ + cp $(@D)/$(TI_K3_R5_LOADER_SWSFW_ITB) $(BINARIES_DIR)/sysfw.itb ; \ + fi +endef + +endif # BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) @@ -81,6 +98,22 @@ endef define TI_K3_R5_LOADER_INSTALL_IMAGES_CMDS cp $(@D)/spl/u-boot-spl.bin $(BINARIES_DIR)/r5-u-boot-spl.bin + $(TI_K3_R5_LOADER_INSTALL_TIBOOT3_BIN) + $(TI_K3_R5_LOADER_INSTALL_SWSFW_ITB) endef +# Checks to give errors that the user can understand +# Must be before we call to kconfig-package +ifeq ($(BR2_TARGET_TI_K3_R5_LOADER)$(BR_BUILDING),yy) + +ifeq ($(TI_K3_R5_LOADER_TIBOOT3_BIN),) +$(error No custom tiboot3 name specified, check your BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN setting) +endif + +ifeq ($(TI_K3_R5_LOADER_SWSFW_ITB),) +$(error No custom sysfw name specified, check your BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB setting) +endif + +endif # BR_BUILDING + $(eval $(kconfig-package)) From patchwork Sun Apr 7 10:35:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1920509 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VC7st4HpXz1yYf for ; Sun, 7 Apr 2024 20:35:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B997C4192B; Sun, 7 Apr 2024 10:35:44 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id HW6y6qu2-_i5; Sun, 7 Apr 2024 10:35:43 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4F44C41844 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 4F44C41844; Sun, 7 Apr 2024 10:35:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id B6EB21BF575 for ; Sun, 7 Apr 2024 10:35:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id A34D3608ED for ; Sun, 7 Apr 2024 10:35:22 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id uy9go2R0ULRC for ; Sun, 7 Apr 2024 10:35:21 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::332; helo=mail-wm1-x332.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 756CD608E9 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 756CD608E9 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by smtp3.osuosl.org (Postfix) with ESMTPS id 756CD608E9 for ; Sun, 7 Apr 2024 10:35:21 +0000 (UTC) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-4165d03308fso2455835e9.2 for ; Sun, 07 Apr 2024 03:35:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712486119; x=1713090919; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DI8Q/eDHnJpHmmd1kFAUDFuU5sTGlCMn5rsk0KIclZU=; b=X/l4qmW0rNpJKgMDDqtNMoSPix2shEXVywJFwzb4rmOEVJVevi6PJyyFIbEqyOfeB4 01pjjx3jjWZRH7J4NfyAUGGaXoeupxH6bxTdvtFxMIOYQqKX1P655dOGVmu7GGtJqjla gk0R8TAqKyzQ5YeA6sVED8ZJVHVHxCF87RePouElvKfu09PTw4YzlKHtJpJKhbZDRqdD jTvlf4v3f7YwA4OlH0A7VldnMBvxZ36s+zIa1v+JlmyG+5nGzzos8X3zwkoTuJbvEo1M PsOggQirRxtHgz+zDQQz1jPXiNBLO+zEaUA/VwYkSOhaEaSUARjCBuWeHqJM7p1mUHib tGiw== X-Gm-Message-State: AOJu0Yy1MHGRtcU+kVV5DVCNAP/Oj6AIiVxIfluCVxu7Ih2JFMshFM9N mxW92D7CIyWrg3pwJabBLN3Ytx8d5yxFIWNe5jUoQGBSMq0IojbgeGFYz/edFR6YlO7fLegsMeL K X-Google-Smtp-Source: AGHT+IHu3y1JI8FH8fRyaHdcBvUbzyFeeugVD2ltYRlefUDm3L+NciJexpWjRy8IKlzc4VEJ//ZjhA== X-Received: by 2002:a05:600c:3146:b0:416:4a4a:8cc9 with SMTP id h6-20020a05600c314600b004164a4a8cc9mr2067641wmo.27.1712486119354; Sun, 07 Apr 2024 03:35:19 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b004149536479esm9486542wmb.12.2024.04.07.03.35.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 03:35:19 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 7 Apr 2024 12:35:00 +0200 Message-ID: <20240407103512.1112712-8-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240407103512.1112712-1-romain.naour@smile.fr> References: <20240407103512.1112712-1-romain.naour@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1712486119; x=1713090919; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DI8Q/eDHnJpHmmd1kFAUDFuU5sTGlCMn5rsk0KIclZU=; b=uZjVtEsgo5Oje4b54zzVpZ8ZkBuhM/PpU68C8V5BpzDSfnJ6HOuusRdaHyTKfQzdug O3Z87hTqsoDxjzXNSoXKLYZ2lHpIPHv/ZhCxeM9REbN0h9xKg3jcto8mE+Cvcu+5IExM E3ok3boCz7eWHUeJdHDlKi/HewDLLB4dD6ZHib3JnEGl4UGqOCOiU5VIG67neeRhPSq7 SKUFqCvRUTLZ1YFAOAyUAmLmO1jn0b2xB3r+BdnYVNC0uJ2J3+4wP+pW5LNAeYSBb7nz Ov3giRct+T+h+4/4GdYK6SCRlbTpGGwG2USox86yEXHfZPA7EurQURodX2OmvpWd/ud1 fkFQ== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=uZjVtEsg Subject: [Buildroot] [PATCH v12 07/16] configs/ti_am62x_sk_defconfig: bump U-Boot version to 2024.01 X-BeenThere: buildroot@buildroot.org 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: Romain Naour , Dario Binacchi Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Dario Binacchi The 2024.01 version of U-Boot for the am62x-sk board has introduced two major changes: - The device tree k3-am625-sk.dtb is no longer searched in /boot, but in /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET and the use of extlinux.conf for the proper loading of the device tree. Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to auto-generate the extlinux.conf file so that developers can change the kernel loading options by modifying the .config. - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer necessary to use custom tools like ti-k3-image-gen. - Use a custom tiboot3.bin since the default is "hs-fs", but the ti_am62x_sk_defconfig expect the "gp" one Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- Changes in v12: - Use a custom tiboot3.bin since the default is "hs-fs", but the ti_am62x_sk_defconfig expect the "gp" one. Changes in v11: - remove BR2_TARGET_UBOOT_NEEDS_TI_K3_DM option - add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option - Use new BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS and BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS options to ease post build/image script. Changes in v7: - Add devicetree k3-am625-sk.dtb to extlinux.conf - Improve error messages in post-build.sh script Changes in v6: - Enable BR2_TARGET_UBOOT_USE_BINMAN option Changes in v5: - Update commit message. Changes in v4: - bump to 204.01 instead of 2023.10 - Update the commit message - Replace 'PARTUUID=00000000-02' with '/dev/mmcblk1p2' where to get rootfs in the BR2_ROOTFS_POST_SCRIPT_ARGS insided the ti_am62x_sk_defconfig. Changes in v2: - Update the commit message - Drop Python options required by binman. - Enable BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN. This option automatically selects the Python modules required by binman. --- board/ti/am62x-sk/genimage.cfg | 7 ++- .../ti-k3-r5-loader/ti-k3-r5-loader.hash | 2 +- board/ti/am62x-sk/post-build.sh | 54 +++++++++++++++++++ configs/ti_am62x_sk_defconfig | 14 ++--- 4 files changed, 69 insertions(+), 8 deletions(-) create mode 100755 board/ti/am62x-sk/post-build.sh diff --git a/board/ti/am62x-sk/genimage.cfg b/board/ti/am62x-sk/genimage.cfg index 26304fe98f..398209f4d8 100644 --- a/board/ti/am62x-sk/genimage.cfg +++ b/board/ti/am62x-sk/genimage.cfg @@ -4,10 +4,15 @@ image boot.vfat { "tiboot3.bin", "tispl.bin", "u-boot.img", + "k3-am625-sk.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf } } - size = 16M + size = 64M } image sdcard.img { diff --git a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash index 2a5c99c459..0e171c56f5 100644 --- a/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/board/ti/am62x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh new file mode 100755 index 0000000000..4f19f4d6cf --- /dev/null +++ b/board/ti/am62x-sk/post-build.sh @@ -0,0 +1,54 @@ +#!/bin/sh -x + +# genimage will need to find the extlinux.conf +# in the binaries directory + +die() { + cat <&2 +Error: $@ + +Usage: ${0} -c -r [-x ] +EOF + exit 1 +} + +o='c:d:r:x:' +O='console:,devicetree:,root:,extra-args:' +opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" +eval set -- "${opts}" +while [ ${#} -gt 0 ]; do + case "${1}" in + (-c|--console) + CONSOLE="${2}"; shift 2 + ;; + (-d|--devicetree) + DEVICETREE="${2}"; shift 2 + ;; + (-r|--root) + ROOT="${2}"; shift 2 + ;; + (-x|--extra-args) + EXTRA_ARGS="${2}"; shift 2 + ;; + (--) + shift 1; break + ;; + esac +done + +[ -n "${CONSOLE}" ] || die "Missing \`console' argument" +[ -n "${DEVICETREE}" ] || die "Missing \`devicetree' argument" +[ -n "${ROOT}" ] || die "Missing \`root' argument" +append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" +if [ -n "${EXTRA_ARGS}" ]; then + append="${append} ${EXTRA_ARGS}" +fi + +mkdir -p "${BINARIES_DIR}" +cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" + label am62x-sk-buildroot + kernel /Image + fdtdir / + devicetree /${DEVICETREE} + append ${append} + __HEADER_EOF diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index b2814526bb..7a411ed423 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,15 +1,16 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" +BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" -BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y BR2_TARGET_ROOTFS_EXT2=y @@ -23,21 +24,22 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" -BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" +BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin" +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am62x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y +BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y From patchwork Sun Apr 7 10:35:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1920513 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VC7t76GmHz1yYf for ; Sun, 7 Apr 2024 20:35:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 526FF41E3F; Sun, 7 Apr 2024 10:35:58 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 9PukLyktGtHw; Sun, 7 Apr 2024 10:35:57 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2CAAA418AD Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 2CAAA418AD; Sun, 7 Apr 2024 10:35:56 +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 7FEEB1BF575 for ; Sun, 7 Apr 2024 10:35:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 78174822AF for ; Sun, 7 Apr 2024 10:35:23 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id feI9Z6tTcnXF for ; Sun, 7 Apr 2024 10:35:22 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::234; helo=mail-lj1-x234.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 02D40822A9 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 02D40822A9 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by smtp1.osuosl.org (Postfix) with ESMTPS id 02D40822A9 for ; Sun, 7 Apr 2024 10:35:21 +0000 (UTC) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2d8863d8a6eso4961881fa.3 for ; Sun, 07 Apr 2024 03:35:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712486120; x=1713090920; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3Q2TUI1EDnTE2OuXHC8yATIvQYcs8fdX8Myo7ufKLuw=; b=ONkETC80j62ijreZVD5nz3Kn5VUvh5NNh1b2aRPfz6HmUmkfzy6no9zuSrQ3/mEw4O ePK2aiiiQmRJ9GsKHbLuwH2We7GWy4nN152n+a1MdB1cNMrZweziArC1REnI8ENsPiSm Hv7f47nknQV+5ogAqqje2IcTp44PrX90o8fSaBk5xrhXN9J8jQJbn1NoVNBuqpiKras8 lAlzwjfqDoX8dwwoVTyDjPgAdEhSunG4a6khr42Xm/a/sKOt9ruSAhLUncqV0hZVsrSv P1E30iy3Uz9aJ5ZmXxryB2tJ5Vh72xnoxqVnQg6mwVPLqInb8TVEi/5Er2I1kfVIcYst 0dtQ== X-Gm-Message-State: AOJu0YwyFisZAIXlSOxXLPef7Y86FDwwn5a/d0kWbUX+AC2MjhCrQW0e N7GDFRyMOrwbK/oZhJh4NAhRagYyYWWcMLaiuvxI0mrGrlFZvbs5ky/hgi9CoXFz+d9biwoChiT a X-Google-Smtp-Source: AGHT+IFBGtMczBKNRBcMnWvnyauXWx3ZjSuRnIraOeFLr2avDv1FvapDnPYdp+W6F8+CiXVcDy8MJA== X-Received: by 2002:a2e:8816:0:b0:2d7:10a1:482a with SMTP id x22-20020a2e8816000000b002d710a1482amr4458105ljh.31.1712486119781; Sun, 07 Apr 2024 03:35:19 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b004149536479esm9486542wmb.12.2024.04.07.03.35.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 03:35:19 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 7 Apr 2024 12:35:01 +0200 Message-ID: <20240407103512.1112712-9-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240407103512.1112712-1-romain.naour@smile.fr> References: <20240407103512.1112712-1-romain.naour@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1712486120; x=1713090920; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3Q2TUI1EDnTE2OuXHC8yATIvQYcs8fdX8Myo7ufKLuw=; b=bFXIZB/M2Mib8AEeH1M/VqPAm46rvJuqK3kNbLGrUcvfmiKyeZt/wPXbtTnCNHn8cx bXbLBzY1ZzF8DXT7VibUA3YQLQvVgRf90ktmpdqcO2GsnJMmHkchGnqp8vY+1znVpZff 32rJnNK4Tz6Hy546CJOgB1hF2AtJOmHO0Pe2LsYezK3bibF21Z609GJmHbEKCU82VsEG 26PuMA3kl6L+EHT6RKyXovxrUoHx7BPTcIOLmZtx82iFQoSoM0F5dPvmg/1z3uOUo1Xg hRY9ZtKfoAAj2UOrFeBIObjulvchCVgvaHS0wQTWW8dgoVc7v3YyT8Z/fMhoYwNLE3mW ummg== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=bFXIZB/M Subject: [Buildroot] [PATCH v12 08/16] configs/ti_am62x_sk_defconfig: bump Linux version to 6.6.18 X-BeenThere: buildroot@buildroot.org 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: Romain Naour , Dario Binacchi Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Dario Binacchi Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- Changes in v11: - Add BR2_DOWNLOAD_FORCE_CHECK_HASHES=y Changes in v8 - Bump to 6.6.18 from 6.6.17 - Update commit message Changes in v5 - Bump to 6.6.17 from 6.6.1 - Update commit message Changes in v4 - Add BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 to ti_am62x_sk_defconfig. no changes since v1 --- board/ti/am62x-sk/patches/linux-headers/linux-headers.hash | 1 + board/ti/am62x-sk/patches/linux/linux.hash | 2 ++ configs/ti_am62x_sk_defconfig | 5 +++-- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 120000 board/ti/am62x-sk/patches/linux-headers/linux-headers.hash create mode 100644 board/ti/am62x-sk/patches/linux/linux.hash diff --git a/board/ti/am62x-sk/patches/linux-headers/linux-headers.hash b/board/ti/am62x-sk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/ti/am62x-sk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/ti/am62x-sk/patches/linux/linux.hash b/board/ti/am62x-sk/patches/linux/linux.hash new file mode 100644 index 0000000000..cedae67f33 --- /dev/null +++ b/board/ti/am62x-sk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 7a411ed423..d4b19e5039 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -1,13 +1,14 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am625-sk" From patchwork Sun Apr 7 10:35:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1920510 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VC7sx506Jz1yYf for ; Sun, 7 Apr 2024 20:35:49 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 10C0541977; Sun, 7 Apr 2024 10:35:48 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id rj5tYoTxcRsr; Sun, 7 Apr 2024 10:35:46 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 322DA4188E Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 322DA4188E; Sun, 7 Apr 2024 10:35:46 +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 0BBF31BF575 for ; Sun, 7 Apr 2024 10:35:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E7B0A40614 for ; Sun, 7 Apr 2024 10:35:22 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id sFiFnF4VuU75 for ; Sun, 7 Apr 2024 10:35:22 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::32d; helo=mail-wm1-x32d.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 0A136403E9 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 0A136403E9 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by smtp2.osuosl.org (Postfix) with ESMTPS id 0A136403E9 for ; Sun, 7 Apr 2024 10:35:21 +0000 (UTC) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-416632343d0so1182505e9.0 for ; Sun, 07 Apr 2024 03:35:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712486120; x=1713090920; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BDZMNZNss5v+mTOVavgh0bNXypggo91SQ9lA/mgDH0o=; b=WoA4doCB9OFvyIb4cywe+zkG46qA0o+3Mi9qEt05l0GbFaR5sE9qiU8CBJhdaN2x54 Izn8l2qiaRpaov8hfJCX3HINCz9MrfRCIgTl80DcaDMa3EsWTOZB11yitc1bEIbgGDBu jlv3kfb9mCZ9F8TWBs4ijQAJoO++tSCkyFKud6JO74f1yIXDz0ufsbUMH/TR7+FOG66C 02qtpxuw89TndYR8IIq2mMXwSTZEcKbmeAz/3FSiF84dyRW9J16c9PWm9ZJRgd6ScHCw uAgb2DN5KNpQMRJaRSs7Z3MKgL+b0QrK1eOybCfNWRxtCmENkxhp9htI2ITTFN8ohmZY uvKQ== X-Gm-Message-State: AOJu0YzpeCBf7UVMRpYH/k5WsoMfZQY84JHN/HeHveSqoKJpywczBC7Q 2Xhufxk8oAzqe8pgWLPqmmuIJwr5Y61km6UAQNbUJKU4DDqZMBLIpxCHUhoh2azQMPd+/Adu3uq + X-Google-Smtp-Source: AGHT+IEFmjnfNPvt0Ve19Rn9N2V8o5kvjbK3rTfN6rlypGZtwmT2lbJva3eekMl09CWEE/yAvOJXkw== X-Received: by 2002:a05:600c:3b88:b0:416:6816:2b40 with SMTP id n8-20020a05600c3b8800b0041668162b40mr367815wms.28.1712486120226; Sun, 07 Apr 2024 03:35:20 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b004149536479esm9486542wmb.12.2024.04.07.03.35.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 03:35:20 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 7 Apr 2024 12:35:02 +0200 Message-ID: <20240407103512.1112712-10-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240407103512.1112712-1-romain.naour@smile.fr> References: <20240407103512.1112712-1-romain.naour@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1712486120; x=1713090920; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BDZMNZNss5v+mTOVavgh0bNXypggo91SQ9lA/mgDH0o=; b=w36tuOY83UCYrhWvpstIfqqPYXNzd58YFMZHqtZfI8OaQR96HfNvFyTs+RXqguGiOr vy4xXSmxYswN/Pl6Po7TwVjyoGN+CoN8BDDrTkVQoawI9bO895f7UBPH5Kgq0HRHRV4P MxRrpftZNrfAV3jATwXzWphYmgM8gUYdS1GiTWEdxpuW+IdkzWqW/uosS/8V3bDHwCc/ 5cmvY3hTDGlQXy1Rypu0e4WNhyxfd1XXkb+h1RPBGrGQrQa6Iy5PKqtqg95aleqDVgx1 eBdhc8uXT++tW9oGTtOvn5ZVVwYSAGFxHNohg2jObTs84/ErseHtSTjD1XqMXSmRcaRx wrog== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=w36tuOY8 Subject: [Buildroot] [PATCH v12 09/16] board/ti/am62x-sk: generalize post-build.sh X-BeenThere: buildroot@buildroot.org 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: Romain Naour , Dario Binacchi Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Dario Binacchi Removing any explicit reference to the ti_am62x_sk_defconfig configuration, the script can also be used by other configurations or at least by ti_am64x_sk_defconfig. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- Added in v8 --- board/ti/am62x-sk/post-build.sh | 10 +++++++--- configs/ti_am62x_sk_defconfig | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/am62x-sk/post-build.sh index 4f19f4d6cf..d066e28fd0 100755 --- a/board/ti/am62x-sk/post-build.sh +++ b/board/ti/am62x-sk/post-build.sh @@ -12,8 +12,8 @@ EOF exit 1 } -o='c:d:r:x:' -O='console:,devicetree:,root:,extra-args:' +o='c:d:l:r:x:' +O='console:,devicetree:,label:,root:,extra-args:' opts="$(getopt -n "${0##*/}" -o "${o}" -l "${O}" -- "${@}")" eval set -- "${opts}" while [ ${#} -gt 0 ]; do @@ -24,6 +24,9 @@ while [ ${#} -gt 0 ]; do (-d|--devicetree) DEVICETREE="${2}"; shift 2 ;; + (-l|--label) + LABEL="${2}"; shift 2 + ;; (-r|--root) ROOT="${2}"; shift 2 ;; @@ -38,6 +41,7 @@ done [ -n "${CONSOLE}" ] || die "Missing \`console' argument" [ -n "${DEVICETREE}" ] || die "Missing \`devicetree' argument" +[ -n "${LABEL}" ] || die "Missing \`label' argument" [ -n "${ROOT}" ] || die "Missing \`root' argument" append="console=${CONSOLE} root=${ROOT} rw rootfstype=ext4 rootwait" if [ -n "${EXTRA_ARGS}" ]; then @@ -46,7 +50,7 @@ fi mkdir -p "${BINARIES_DIR}" cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" - label am62x-sk-buildroot + label ${LABEL} kernel /Image fdtdir / devicetree /${DEVICETREE} diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index d4b19e5039..1c7085d04d 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -3,7 +3,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" -BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" +BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" BR2_LINUX_KERNEL=y From patchwork Sun Apr 7 10:35:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1920511 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VC7t064Jdz1yYf for ; Sun, 7 Apr 2024 20:35:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 47CDE415DB; Sun, 7 Apr 2024 10:35:51 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id eZ6AjVNmjg1X; Sun, 7 Apr 2024 10:35:50 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org BEAC441B18 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id BEAC441B18; Sun, 7 Apr 2024 10:35:49 +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 4AEFA1BF94D for ; Sun, 7 Apr 2024 10:35:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 38F0A822B2 for ; Sun, 7 Apr 2024 10:35:23 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id SfWyzDYultnL for ; Sun, 7 Apr 2024 10:35:22 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::32d; helo=mail-wm1-x32d.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 7A94A822AF DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 7A94A822AF Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by smtp1.osuosl.org (Postfix) with ESMTPS id 7A94A822AF for ; Sun, 7 Apr 2024 10:35:22 +0000 (UTC) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-41650ee55faso3417605e9.1 for ; Sun, 07 Apr 2024 03:35:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712486120; x=1713090920; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p9Q7XS1pC/pj2BDMnSN1LtfbEI65hfKhUVPlY0jTfqo=; b=wx4f5KIWf2bx49Hi5xFGAR1J9ivgehTcFdJzZq4FULyBWdxrr0MMxeJCOgdH0VQjHF zNGduE3/pxb5nAy2qY73rMwZYY0vKSSo2k5HtkhadgcbVRshDr8hi02jXp1R85Vte5QB Szfphd1zfxlsim2Ssjqo3BFH/eYouo8v0WWQiq8FVW2KGRkw/+ETxTzpd6aobjufZKgU mvkFErTd8bhbipLXSonQQZzzmR7FHI4Hkxa6ZfCulbMi/xYiA0EOWb6eALaCBgWpmLtf okf4/WYMFZHhHAJvHL4PhdrCS5n576eHEzNWPNnkUH1ZxEAFiIna82zgGTEG4CncDw/t ZgBw== X-Gm-Message-State: AOJu0YzkYf5TM3kotYEQMnU6i054TA+U677WeZJNNWI+tslZfD+Yt5+S dah9pc11E1lfMz8eelKdbyhish2TQKus40nQyQNFaUFLWU98waaHRvTrv4ka5mNUl7OtgSYHRuN 1 X-Google-Smtp-Source: AGHT+IFJXgV+kZixZIJ5Kfkf74/klNcNYBaV/qfO8wQj8OKs1sfNJ9nTDjIBi3Qd1KuVc1t5yQsWpw== X-Received: by 2002:a05:600c:1382:b0:413:ff06:83cd with SMTP id u2-20020a05600c138200b00413ff0683cdmr4358485wmf.3.1712486120696; Sun, 07 Apr 2024 03:35:20 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b004149536479esm9486542wmb.12.2024.04.07.03.35.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 03:35:20 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 7 Apr 2024 12:35:03 +0200 Message-ID: <20240407103512.1112712-11-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240407103512.1112712-1-romain.naour@smile.fr> References: <20240407103512.1112712-1-romain.naour@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1712486120; x=1713090920; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p9Q7XS1pC/pj2BDMnSN1LtfbEI65hfKhUVPlY0jTfqo=; b=uGS4AlgV8suxk7v+d2rNOk6XpQBunMyqtMeoz50K22LliObgN4b2/KRITMkQe5Wibc w+EcuclLkmjoUPSYnNDGXI+uLmCh852pq7Kt7E78fjd6j/hnRQQAjW7eUkjBilL3u7Qw 4dI3fma22AGwJak7ayIMN67J1fIlRlGKYGxVl5kFHe8Q0il7vGqU9hVgRVh8X+GFqgMI ionMp1DRLvUF2cygcQrIhk3+SBWVa/5XI/kI0Z2LJja7Mv/AU6Cu5yfk7PI6l4S3ife5 fPXRg1yACDowpJyzilRMQnv1GWz276yn80QcMfsT77YhcaZsXzDlt4NjFeBsOS1PnCAg Lctg== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=uGS4AlgV Subject: [Buildroot] [PATCH v12 10/16] board/ti/am62x-sk: move post-build.sh to board/ti/common/am6xx X-BeenThere: buildroot@buildroot.org 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: Romain Naour , Dario Binacchi Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Dario Binacchi The patch makes it clear that the moved script can be used by the am6{2,4}x platforms. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- Changes in v11: - Remove board/ti/common/am6xx/post-image.sh since we use BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS option instead. Added in v8 --- board/ti/{am62x-sk => common/am6xx}/post-build.sh | 0 configs/ti_am62x_sk_defconfig | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename board/ti/{am62x-sk => common/am6xx}/post-build.sh (100%) diff --git a/board/ti/am62x-sk/post-build.sh b/board/ti/common/am6xx/post-build.sh similarity index 100% rename from board/ti/am62x-sk/post-build.sh rename to board/ti/common/am6xx/post-build.sh diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 1c7085d04d..b62f624d82 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -2,7 +2,7 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/ti/am62x-sk/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y -BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/am62x-sk/post-build.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am625-sk.dtb -l am62x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am62x-sk/genimage.cfg" From patchwork Sun Apr 7 10:35:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1920514 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VC7tC2j2bz1yYf for ; Sun, 7 Apr 2024 20:36:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id DA2E741D8F; Sun, 7 Apr 2024 10:36:01 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Moryvpua8j98; Sun, 7 Apr 2024 10:36:00 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 8BD0E41DE1 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 8BD0E41DE1; Sun, 7 Apr 2024 10:36:00 +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 CF3CD1BF575 for ; Sun, 7 Apr 2024 10:35:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id BCE9040614 for ; Sun, 7 Apr 2024 10:35:24 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Jz2Sq8exsMoM for ; Sun, 7 Apr 2024 10:35:24 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::32a; helo=mail-wm1-x32a.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org A272C403E9 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org A272C403E9 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by smtp2.osuosl.org (Postfix) with ESMTPS id A272C403E9 for ; Sun, 7 Apr 2024 10:35:23 +0000 (UTC) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4166ccac761so170065e9.0 for ; Sun, 07 Apr 2024 03:35:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712486121; x=1713090921; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IxdGVp74EUfhbgS4vQZcnAyJwG1Jbb+yTlZk29IJkg4=; b=JRBo5dAH2pqs2BChfvPiUzJFTR7sa16rVn8As1EzB2HY7kv1smJ+fwep8WCpSSvrZt UK6FAVxLng4kNnewoG7iGNdz4oANVgk0hoOiOvIxWMNEznXdVFrCoyLhwiWX64QmNgeK XIgH65i9SB7Z+auSqVFBbKP0OiGlKH4Ncd2eqIb+a9TneBOeVDi01FJFcPhgMhDETnkM 0gck3N5DvOW/7UcQdBWJokEinxZoKqjWkygmtz/mo6hKpYXo6aIkLyzidymg4teJnmt1 J6iLCZoHUrJVtkTjGCpdpcJ3jQ4+OPW+8Mj9EM8X+p9eiHrlzq7/TwA4+oRVPhtdjRqn aBjg== X-Gm-Message-State: AOJu0YyvvaIdLBb4a5+Vo2wfSgSlxHeCanP8xiU897G+XM0eXgDiJFcV aWDhumnxoltFQ2EimFkKpWMGmbsNHXI3ocPkv2lkSmOnO8GTHX9BJUy+PJx1Q543LvI4NZmrz08 6 X-Google-Smtp-Source: AGHT+IG5LggnkHyenpK55K0drmQFBPCOLnTQijlozl4wLb2YK5qfDq7X10F00pDvqFGaBN8QeeqY3Q== X-Received: by 2002:a05:600c:1d29:b0:416:648f:8f4c with SMTP id l41-20020a05600c1d2900b00416648f8f4cmr558107wms.25.1712486121670; Sun, 07 Apr 2024 03:35:21 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b004149536479esm9486542wmb.12.2024.04.07.03.35.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 03:35:20 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 7 Apr 2024 12:35:04 +0200 Message-ID: <20240407103512.1112712-12-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240407103512.1112712-1-romain.naour@smile.fr> References: <20240407103512.1112712-1-romain.naour@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1712486121; x=1713090921; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IxdGVp74EUfhbgS4vQZcnAyJwG1Jbb+yTlZk29IJkg4=; b=Q+C6K0FCZtUBH1g+DXzS/b7yM7lCsWY0rkEdn7Jn2Y2myRywTlAM0ZwWlYN1f2QnMF midXKTuBLS0NwFx4lAWFsTJfaMX7LhZWyKBiy4aAGLBsFyKtgq8uFC9Tel5/pAs0G/eT YXofnqItI96RZ2cdcV3nwRPqFb8/3n4Ula0g1Jiu4zFoTg4uDnLdsNk/yxzLGDbjEVsd 1M10BLVdQoV7YYPfJr3YGyAed/zAGv9xs+CBhkgP3FgqJv0JdhXbFEGxsXeTF3cV2TEX KedzTXtf5F6QlX6QYeM4wkj4CRtCGAnI2WUtE3K7KhJTzUj0WHy6mIdK68Z4g5ysNhf9 855g== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=Q+C6K0FC Subject: [Buildroot] [PATCH v12 11/16] configs/ti_am64x_sk_defconfig: bump U-Boot version to 2024.01 X-BeenThere: buildroot@buildroot.org 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: Romain Naour , Dario Binacchi Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Dario Binacchi The 2024.01 version of U-Boot for the am64x-sk board has introduced two major changes: - The device tree k3-am642-sk.dtb is no longer searched in /boot, but in /boot/dtb/ti. Hence, the disabling of BR2_LINUX_KERNEL_INSTALL_TARGET and the use of extlinux.conf for the proper loading of the device tree. Furthermore, the parameter BR2_ROOTFS_POST_SCRIPT_ARGS was used to auto-generate the extlinux.conf file so that developers can change the kernel loading options by modifying the .config. - U-Boot is capable of building tiboot3.bin using Binman. So it's no longer necessary to use custom tools like ti-k3-image-gen. - Use a custom tiboot3.bin since the default is "hs-fs", but the ti_am64x_sk_defconfig expect the "gp" one. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- Changes in v12: - use a custom tiboot3.bin since the default one is the hs-fs, but the ti_am64x_sk_defconfig expect the gp one. Changes in v11: - add BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option - Use new BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS and BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS options to ease post build/image script. Changes in v9: - squashed with patch [v8,20/23] "package/ti-k3: fix BR2_PACKAGE_TI_K3_SOC setting for am64x SOC" - Update the commit message Added in v8 --- board/ti/am64x-sk/genimage.cfg | 7 ++++++- .../patches/ti-k3-r5-loader/ti-k3-r5-loader.hash | 3 +-- configs/ti_am64x_sk_defconfig | 15 +++++++++------ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/board/ti/am64x-sk/genimage.cfg b/board/ti/am64x-sk/genimage.cfg index 26304fe98f..88dff8fe23 100644 --- a/board/ti/am64x-sk/genimage.cfg +++ b/board/ti/am64x-sk/genimage.cfg @@ -4,10 +4,15 @@ image boot.vfat { "tiboot3.bin", "tispl.bin", "u-boot.img", + "k3-am642-sk.dtb", + "Image" + } + file extlinux/extlinux.conf { + image = extlinux.conf } } - size = 16M + size = 64M } image sdcard.img { diff --git a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash index 2a5c99c459..dbb4428738 100644 --- a/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/board/ti/am64x-sk/patches/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,2 +1 @@ -# Locally computed: -sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 1ebdec68ac..eaeccde316 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -1,15 +1,16 @@ BR2_aarch64=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y BR2_GLOBAL_PATCH_DIR="board/ti/am64x-sk/patches" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am642-sk.dtb -l am64x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg" +BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" -BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y BR2_TARGET_ROOTFS_EXT2=y @@ -23,20 +24,22 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" -BR2_TARGET_TI_K3_IMAGE_GEN=y -BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y -BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" +BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am64x-gp-evm.bin" +BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am64x_evm_a53" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y +BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE=y +BR2_TARGET_UBOOT_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y From patchwork Sun Apr 7 10:35:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1920516 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VC7tL2Ftzz1yYf for ; Sun, 7 Apr 2024 20:36:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C785941E72; Sun, 7 Apr 2024 10:36:08 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id fx8MjEsLf_ev; Sun, 7 Apr 2024 10:36:07 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 83F9E416E0 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 83F9E416E0; Sun, 7 Apr 2024 10:36:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 13BC71BF575 for ; Sun, 7 Apr 2024 10:35:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id F251D417D0 for ; Sun, 7 Apr 2024 10:35:25 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id XgYHxXWJ3sNI for ; Sun, 7 Apr 2024 10:35:25 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::231; helo=mail-lj1-x231.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 57C0441712 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 57C0441712 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) by smtp4.osuosl.org (Postfix) with ESMTPS id 57C0441712 for ; Sun, 7 Apr 2024 10:35:24 +0000 (UTC) Received: by mail-lj1-x231.google.com with SMTP id 38308e7fff4ca-2d68651e253so41355871fa.0 for ; Sun, 07 Apr 2024 03:35:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712486122; x=1713090922; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JQhknu/gZcrkS17syAC4uTGFlEZTHXMKIn7uf2phKFY=; b=f0QF9IZlAxnv1caH03ka2V60Cty0uo7QNXIRerMJN+5oyMxlQh9UL6Fuzg4+myBvpU WQgJFmOZHF+SiJ1OtLQhwoWpWV+OYIcp2lWbJxX6L3dhoOIuAKIrq9dN8NDBKKGFXu6V 9dIWAE0D+m9CFZuWgOsc+sZ5Ew+iEx0CmZgtONKg5f5MbNmRW7PkgF5X4j+Bw8Y0rgpO 9AX7FPRfABspvxsV+qXsnM44U+oNX8a4LGJyg8YfJWIuf56GltmHpVzXb1LAyfQ6dzAc Eo4IWWClro9XW7TIjNiCHlSo05LstkVN3OwVLEcTr8nyO2T5dpOt38qxMD2ksTMEbQjJ e1WQ== X-Gm-Message-State: AOJu0YwFDW869EDPqlRk1uzCuKQ8SIoFbpVAJ6nfL6rm7TfyADvbOIWO 3NdVe/vtG256NClqysXjQ6ZZSjO19O0dV1q1Dujlg6zIWaCrpG27rwx6WQmkaMom4N0z3uy1uDg C X-Google-Smtp-Source: AGHT+IFyph6QQXMK2v3yLy0eVaE+Iwi4ssndGUPnsrwZvpGe0jaH96cmriyvE/cH7T75MG5vwKGSmA== X-Received: by 2002:a2e:b61b:0:b0:2d8:70a6:9575 with SMTP id r27-20020a2eb61b000000b002d870a69575mr2884571ljn.7.1712486122168; Sun, 07 Apr 2024 03:35:22 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b004149536479esm9486542wmb.12.2024.04.07.03.35.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 03:35:21 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 7 Apr 2024 12:35:05 +0200 Message-ID: <20240407103512.1112712-13-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240407103512.1112712-1-romain.naour@smile.fr> References: <20240407103512.1112712-1-romain.naour@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1712486122; x=1713090922; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JQhknu/gZcrkS17syAC4uTGFlEZTHXMKIn7uf2phKFY=; b=E5zai18Ny7mStF4K6mLpuKzwdUZ4UxomPOh1hiBy/IomNPYfo+DQD/kiSvlCEWqFJw jzPIOb0P0wULV3RrugvMCDxXMB7HRmwozNx/OmEKfdmpgAq0XInThnG4lHbYXSrMaiET d1HgxDhMmWoLOp9cEHNHS1HkymDJZtZ8WE4JPRCG0U8h2qyZVS0ZHTYw7QoPAh2636Go NhhYsqAh0EKJs1PHckImHFNUnfMMPpSV11zNt+PmGnB4vKaUQHkzi1Il2MFiedf1A6BJ VZ6bYscQoG+SY6mffrYpJ5ED7KtgjlpknR/ASMew+QYAQceVsrw6sI+srvDO5uJh1LwS lbyw== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=E5zai18N Subject: [Buildroot] [PATCH v12 12/16] configs/ti_am64x_sk_defconfig: bump Linux version to 6.6.18 X-BeenThere: buildroot@buildroot.org 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: Romain Naour , Dario Binacchi Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Dario Binacchi Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- Changes in v11: - add BR2_DOWNLOAD_FORCE_CHECK_HASHES=y Added in v8 --- board/ti/am64x-sk/patches/linux-headers/linux-headers.hash | 1 + board/ti/am64x-sk/patches/linux/linux.hash | 2 ++ configs/ti_am64x_sk_defconfig | 5 +++-- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 120000 board/ti/am64x-sk/patches/linux-headers/linux-headers.hash create mode 100644 board/ti/am64x-sk/patches/linux/linux.hash diff --git a/board/ti/am64x-sk/patches/linux-headers/linux-headers.hash b/board/ti/am64x-sk/patches/linux-headers/linux-headers.hash new file mode 120000 index 0000000000..5808d92afe --- /dev/null +++ b/board/ti/am64x-sk/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/ti/am64x-sk/patches/linux/linux.hash b/board/ti/am64x-sk/patches/linux/linux.hash new file mode 100644 index 0000000000..cedae67f33 --- /dev/null +++ b/board/ti/am64x-sk/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index eaeccde316..56e1b23335 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -1,13 +1,14 @@ BR2_aarch64=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y BR2_GLOBAL_PATCH_DIR="board/ti/am64x-sk/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/ti/common/am6xx/post-build.sh" BR2_ROOTFS_POST_BUILD_SCRIPT_ARGS="-c ttyS2,115200n8 -d k3-am642-sk.dtb -l am64x-sk-buildroot -r /dev/mmcblk1p2 -x earlycon=ns16550a,mmio32,0x02800000" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT_ARGS="-c board/ti/am64x-sk/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.4.16" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.18" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="ti/k3-am642-sk" From patchwork Sun Apr 7 10:35:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1920515 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VC7tG5t2zz1yYf for ; Sun, 7 Apr 2024 20:36:06 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 2567C41E68; Sun, 7 Apr 2024 10:36:05 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id PPBes_XmTYac; Sun, 7 Apr 2024 10:36:04 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 87B2441E65 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 87B2441E65; Sun, 7 Apr 2024 10:36:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 6F4B01BF575 for ; Sun, 7 Apr 2024 10:35:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 66C8E608ED for ; Sun, 7 Apr 2024 10:35:25 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 39E20FJAQX8T for ; Sun, 7 Apr 2024 10:35:24 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::32a; helo=mail-wm1-x32a.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 77D37608E9 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 77D37608E9 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by smtp3.osuosl.org (Postfix) with ESMTPS id 77D37608E9 for ; Sun, 7 Apr 2024 10:35:24 +0000 (UTC) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-4164c9debf6so3048525e9.1 for ; Sun, 07 Apr 2024 03:35:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712486122; x=1713090922; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AJoYKQNNosphuQHB3Z1qkwS6Ja+T5pY1g62jfExKK10=; b=INxjVtdqOkiHKiXZTdH24rjaIrgpcfrdG1VFm90KgTM3/OFNlXFG4VDCV8g08otyZU mZtPMmhZWtV1m3aNgjlPBBwQX34nN65HOG3cc6oc3Mu1SFs0VprALrzqgwWd+SM8FHOt /wKCsvJyQtO6JzLupFwKAcgywmciD3S9nMRCEaoM+Ul/rvflINZYBR/DBfHZko8S2A+V s4BXi4yKhSFHeu/BwzBEQGH26XnnhHcJMuKb10ViGLBy3NE4bD3dDA5H4mYfo1IxI6Ne bsHqgfN/Glox9LY+uyda8XG3CGTRg6Yk1IFVauD7i7fixeAfK4vrYiTfJ9Hv0gbpTQz6 tvNA== X-Gm-Message-State: AOJu0YwaG04a+90rWbK5VrA2KoAr+js+j98OBgyivp2YSUyLIcSDg6Vx Je1yrz3vC63mj1ygzY0Q1gh1KbJkNhi9t33cxtGmB0GsJhm9zTrOQ/Ko8VYNMaTW7KyvbmW7Dye O X-Google-Smtp-Source: AGHT+IFP0J2/dKqjcidZJ6X7MAWRohtpwVARgp9gYtj8lEymyhpmdM/WWtkC+HG3J1bP0/Zaz5wzRw== X-Received: by 2002:a05:600c:4f54:b0:416:6abe:2975 with SMTP id m20-20020a05600c4f5400b004166abe2975mr170605wmq.15.1712486122620; Sun, 07 Apr 2024 03:35:22 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b004149536479esm9486542wmb.12.2024.04.07.03.35.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 03:35:22 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 7 Apr 2024 12:35:06 +0200 Message-ID: <20240407103512.1112712-14-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240407103512.1112712-1-romain.naour@smile.fr> References: <20240407103512.1112712-1-romain.naour@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1712486122; x=1713090922; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AJoYKQNNosphuQHB3Z1qkwS6Ja+T5pY1g62jfExKK10=; b=k8b1ex6AcmNNMOvWL5pnkMuEiqhe7fR6RQYR91n73E1H/6R40Q35Z/1QO1npLzEMZk E9KqyqpTNDffFJmK+emfOL+cOaxMhUepnv6aRT8mDef06OCH3V4tJRUBVVj4JGqGLrBX bPlvPpm9n6g1MwnY4GE7vp6Ze5iHOQnAihzdGvAJK139mUijZtJCTdWIp4K9rvWfJRdf 3OO+6+QeOG2nBL/eI6eHNK6uhbteRT7zCQJ79IyOLdX2QPjFdS74cjhsHAr2ORn36ouC E80UuHQrqRGLikqoOdrLOffMKImN7afV+ElEU6QA/3ksNiLjzsgruvHNCNhkyIrfOAuT lHww== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=k8b1ex6A Subject: [Buildroot] [PATCH v12 13/16] boot/uboot: remove BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME X-BeenThere: buildroot@buildroot.org 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: Romain Naour Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Previoulsy (without binman), when a TI K3 SoC using Combined binary with a split firmware boot method was used (am62ax or am62x) [1], the user had to select BR2_TARGET_UBOOT_NEEDS_TI_K3_DM in the defconfig to provide Device Manager firmware provided by ti-k3-boot-firmware. With binman, this option is no longer necessary since ti-k3-boot-firmware package is already in the u-boot dependency and the path to DM and SYSFW binaries are provided by BINMAN_INDIRS. We are going to remove ti-k3-image-gen, so binman is now mandatory on all TI K3 SoCs. [1] https://gitlab.com/buildroot.org/buildroot/-/commit/52ce606c05ee3ac869f8087292bc3dbb0d25b79b Signed-off-by: Romain Naour --- boot/uboot/Config.in | 13 ------------- boot/uboot/uboot.mk | 4 ---- 2 files changed, 17 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 39e49d681b..8d2228dc7d 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -251,19 +251,6 @@ config BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE j721e) also need the Device Manager (DM) firmware to be available for the U-Boot build. -if BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE - -# TI_K3_DM_SOCNAME is only needed when ti-k3-image-gen is used for -# TI K3 devices using the Device Manager (DM) firmware. -# We use the SoC selection defined for the ti-k3-image-gen -# package. -config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME - string - default "am62axx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - -endif - config BR2_TARGET_UBOOT_NEEDS_OPENSBI bool "U-Boot needs OpenSBI" depends on BR2_TARGET_OPENSBI diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 398485195e..a894654698 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -195,11 +195,7 @@ UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_BOOT_FIRMWARE),y) -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) UBOOT_DEPENDENCIES += ti-k3-boot-firmware -ifneq ($(UBOOT_TI_K3_DM_SOCNAME),) -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f -endif endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) From patchwork Sun Apr 7 10:35:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1920517 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VC7tP42LJz1yYf for ; Sun, 7 Apr 2024 20:36:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 13BCD415AB; Sun, 7 Apr 2024 10:36:12 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id qUsWiSIItb-E; Sun, 7 Apr 2024 10:36:10 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6E61441E7C Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 6E61441E7C; Sun, 7 Apr 2024 10:36:10 +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 9A53E1BF575 for ; Sun, 7 Apr 2024 10:35:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9497840AE6 for ; Sun, 7 Apr 2024 10:35:26 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id pjS-Ekg_qHmN for ; Sun, 7 Apr 2024 10:35:25 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::32a; helo=mail-wm1-x32a.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 309DD403E9 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 309DD403E9 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by smtp2.osuosl.org (Postfix) with ESMTPS id 309DD403E9 for ; Sun, 7 Apr 2024 10:35:25 +0000 (UTC) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-41551639550so24686855e9.2 for ; Sun, 07 Apr 2024 03:35:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712486123; x=1713090923; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9F6GS+IGzQrpbFrdDyF1kN+ND7RpRsJdeSgBZgkTaEc=; b=Wd9mlDili7tsXtJO+lX/fkp1bLz3Wel/r8Hx8ARS0yOA+mcL5uYhVy8j5/ouFCm7yo 8iX9yggzjGkKlrcetpI8oLsF4CTB5ew8585RJmBC+FmrcHiypxYTR0CZa7wQ9ACY5mO+ fGWVvmMfl0a0tj+6SDMtTNqsDm45YCW2/MPQQhwGGbkMxls3bYYcGdWuiUfVvQnqX8Ao fg4KP9ah5yVcBxtRUNpwu3lFqJ9YXg9PKqGco+QeSZy9A+rr59dm+xV0CAFhGnum8auK 04cYt9iwjcbXUKnIqRxLkVSo2HuozkSPPpyhTn9S+s3Ct4frx/2T7ERxyJrRV7erYITw HKzQ== X-Gm-Message-State: AOJu0Yym/kCldK6NegiZjqBkx2OKYDo+RJfog3rPxW/RVF0rHlT2vPnD DqMsjE5JcVm/tuzMw90sL8lx3WXM837i2B0I03cX1p+ELdFIIAFGZUlXAck8UuBA5f18b2yRiTC X X-Google-Smtp-Source: AGHT+IHjFX39r8NdlPc4FGK9OdPWZ3Ff0Vo7qUQxmg5kp7oUevmaxhIz6xh8GK4bXJbM7fuicPEtwQ== X-Received: by 2002:a05:600c:a0d:b0:416:331f:d3b3 with SMTP id z13-20020a05600c0a0d00b00416331fd3b3mr3652407wmp.38.1712486123288; Sun, 07 Apr 2024 03:35:23 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b004149536479esm9486542wmb.12.2024.04.07.03.35.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 03:35:23 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 7 Apr 2024 12:35:07 +0200 Message-ID: <20240407103512.1112712-15-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240407103512.1112712-1-romain.naour@smile.fr> References: <20240407103512.1112712-1-romain.naour@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1712486123; x=1713090923; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9F6GS+IGzQrpbFrdDyF1kN+ND7RpRsJdeSgBZgkTaEc=; b=tJQ1/5m9HrnEMJEDWEggvDYwiWjp3eSLKLwnztqC2+bP0wbFcEMaMEVuT9pZAEx2bx loawjtVhaqTfi5kwm9GjaIOLZpay7tXNd9P7/uto8Z3Ls3zd3FV231BJg0WDBGVMJuph LFjuvXH6y1n1Ca1KIyP1JKww2HDVIOJa1mSPswAXPcDFcLtRV4wROUO9jNjE5Q3spBu/ euLFnu2qUbzKl4uN1MaqZDfxuTosHb/7Vzado1YI3E5rGDkJDWIuIeSMl8P1bXEFjrW4 aAQ+74aO4kqFkg/U3VqP/ymBNjYRtp1bN/weB844T63RRcKcqA2+n3tcAprGPtZnOl9V 6Oqw== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=tJQ1/5m9 Subject: [Buildroot] [PATCH v12 14/16] boot/ti-k3-image-gen: remove package X-BeenThere: buildroot@buildroot.org 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: Xuanhao Shi , Romain Naour , Dario Binacchi , Alexander Sverdlin , Anand Gadiyar Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" ti-k3-image-gen tool is deprecated an replaced by binman [1]. All defconfig that was using it have been updated to use U-boot binman tool instead. So, we can safely remove ti-k3-image-gen package. [1] https://git.yoctoproject.org/meta-ti/commit/?id=835811cf8586926cf78a961d090f4e6150432235 Cc: Anand Gadiyar Cc: Xuanhao Shi Signed-off-by: Romain Naour Reviewed-by: Alexander Sverdlin Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- Config.in.legacy | 7 +++ DEVELOPERS | 2 - boot/Config.in | 1 - boot/ti-k3-image-gen/Config.in | 77 ----------------------- boot/ti-k3-image-gen/ti-k3-image-gen.hash | 3 - boot/ti-k3-image-gen/ti-k3-image-gen.mk | 54 ---------------- 6 files changed, 7 insertions(+), 137 deletions(-) delete mode 100644 boot/ti-k3-image-gen/Config.in delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.hash delete mode 100644 boot/ti-k3-image-gen/ti-k3-image-gen.mk diff --git a/Config.in.legacy b/Config.in.legacy index 4084ffa516..76af1da348 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.05" +config BR2_TARGET_TI_K3_IMAGE_GEN + bool "ti-k3-image-gen removed" + select BR2_LEGACY + help + ti-k3-image-gen tool has been removed and replaced by + U-Boot binman tool (requires U-boot >= 2023.10). + config BR2_TARGET_UBOOT_NEEDS_TI_K3_DM bool "u-boot TI K3 DM option has been renamed." select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index d78661cd60..399b2931ff 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -158,7 +158,6 @@ N: Anand Gadiyar F: board/ti/am62x-sk/ F: board/ti/am64x-sk/ F: boot/ti-k3-boot-firmware/ -F: boot/ti-k3-image-gen/ F: boot/ti-k3-r5-loader/ F: configs/ti_am62x_sk_defconfig F: configs/ti_am64x_sk_defconfig @@ -3193,7 +3192,6 @@ N: Xuanhao Shi F: board/ti/am62x-sk/ F: board/ti/am64x-sk/ F: boot/ti-k3-boot-firmware/ -F: boot/ti-k3-image-gen/ F: boot/ti-k3-r5-loader/ F: configs/ti_am62x_sk_defconfig F: configs/ti_am64x_sk_defconfig diff --git a/boot/Config.in b/boot/Config.in index e5fdf7ad43..87e1b7c00e 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -20,7 +20,6 @@ source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/syslinux/Config.in" source "boot/ti-k3-boot-firmware/Config.in" -source "boot/ti-k3-image-gen/Config.in" source "boot/ti-k3-r5-loader/Config.in" source "boot/uboot/Config.in" source "boot/vexpress-firmware/Config.in" diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in deleted file mode 100644 index d76cef82e9..0000000000 --- a/boot/ti-k3-image-gen/Config.in +++ /dev/null @@ -1,77 +0,0 @@ -config BR2_TARGET_TI_K3_IMAGE_GEN - bool "ti-k3-image-gen" - depends on BR2_TARGET_TI_K3_R5_LOADER - select BR2_TARGET_TI_K3_BOOT_FIRMWARE - # We need FIT support in uboot-tools, which is why we select a - # host package - select BR2_PACKAGE_HOST_UBOOT_TOOLS - select BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT - help - Use TI's k3-image-gen to build a separate bare metal boot - binary from a separate SPL that is running on the R5 core. - - https://git.ti.com/cgit/k3-image-gen/k3-image-gen/ - -if BR2_TARGET_TI_K3_IMAGE_GEN -choice - prompt "SoC family" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - bool "am62ax" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - bool "am62x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - bool "am64x" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - bool "am65x" - -endchoice - -choice - prompt "Security type" - help - The target SoC security type option for image gen. Valid - options are "gp" for General Purpose devices, "hs-fs" for - High Security - Field Securable devices, or "hs" for High - Security - Security Enforcing devices. Note for all High - Security device variants the TI_SECURE_DEV_PKG environmental - variable must be defined at build time pointing to a valid - core-secdev-k3 folder location, otherwise the build will - fail, see - https://git.ti.com/cgit/security-development-tools/core-secdev-k3 - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - bool "gp" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - bool "hs-fs" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - bool "hs" - -endchoice - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC - string - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE - string - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE - string - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - -endif diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.hash b/boot/ti-k3-image-gen/ti-k3-image-gen.hash deleted file mode 100644 index c968c5648f..0000000000 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 f89ea4b1f5c992455b1a682fde48359221b53f3294135df4bf20feea6aea90e4 k3-image-gen-08.06.00.007.tar.gz -sha256 f012e8d000d711d0539e5b4c812fc1d3a59c10fc1e3d6ea155556f5b78286845 LICENSE diff --git a/boot/ti-k3-image-gen/ti-k3-image-gen.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk deleted file mode 100644 index 64be9a18f2..0000000000 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# -# ti-k3-image-gen -# -################################################################################ - -TI_K3_IMAGE_GEN_VERSION = 08.06.00.007 -TI_K3_IMAGE_GEN_SITE = https://git.ti.com/cgit/k3-image-gen/k3-image-gen/snapshot -TI_K3_IMAGE_GEN_SOURCE = k3-image-gen-$(TI_K3_IMAGE_GEN_VERSION).tar.gz -TI_K3_IMAGE_GEN_LICENSE = BSD-3-Clause -TI_K3_IMAGE_GEN_LICENSE_FILES = LICENSE -TI_K3_IMAGE_GEN_INSTALL_IMAGES = YES - -# - ti-k3-image-gen is used to build tiboot3.bin, using the -# r5-u-boot-spl.bin file from the ti-k3-r5-loader package. Hence the -# dependency on ti-k3-r5-loader. -# - the ti-k3-image-gen makefiles seem to need some feature from Make -# v4.0, similar to u-boot. -TI_K3_IMAGE_GEN_DEPENDENCIES = \ - host-arm-gnu-toolchain \ - host-python3 \ - host-openssl \ - host-uboot-tools \ - ti-k3-r5-loader \ - ti-k3-boot-firmware \ - $(BR2_MAKE_HOST_DEPENDENCY) - -TI_K3_IMAGE_GEN_FW_TYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE)) -TI_K3_IMAGE_GEN_SOC = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SOC)) -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE)) - -TI_K3_IMAGE_GEN_SYSFW = $(TI_K3_IMAGE_GEN_FW_TYPE)-firmware-$(TI_K3_IMAGE_GEN_SOC)-$(TI_K3_IMAGE_GEN_SECTYPE).bin - -define TI_K3_IMAGE_GEN_CONFIGURE_CMDS - cp $(BINARIES_DIR)/ti-sysfw/$(TI_K3_IMAGE_GEN_SYSFW) $(@D) -endef - -define TI_K3_IMAGE_GEN_BUILD_CMDS - $(TARGET_MAKE_ENV) \ - $(BR2_MAKE) -C $(@D) \ - SOC=$(TI_K3_IMAGE_GEN_SOC) \ - SOC_TYPE=$(TI_K3_IMAGE_GEN_SECTYPE) \ - CONFIG=evm \ - CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ - SBL=$(BINARIES_DIR)/r5-u-boot-spl.bin \ - O=$(@D)/tmp \ - BIN_DIR=$(@D) -endef - -define TI_K3_IMAGE_GEN_INSTALL_IMAGES_CMDS - cp $(@D)/tiboot3.bin $(BINARIES_DIR) -endef - -$(eval $(generic-package)) From patchwork Sun Apr 7 10:35:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1920519 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) 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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VC7tY1qqmz1yYf for ; Sun, 7 Apr 2024 20:36:21 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 76546417D2; Sun, 7 Apr 2024 10:36:19 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id wKoCgxoteM6v; Sun, 7 Apr 2024 10:36:17 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 19A9841B51 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 19A9841B51; Sun, 7 Apr 2024 10:36:17 +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 33BB81BF94D for ; Sun, 7 Apr 2024 10:35:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 20F0F403E9 for ; Sun, 7 Apr 2024 10:35:27 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id adSCtRf9bTkG for ; Sun, 7 Apr 2024 10:35:26 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::331; helo=mail-wm1-x331.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org B6CB040614 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B6CB040614 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by smtp2.osuosl.org (Postfix) with ESMTPS id B6CB040614 for ; Sun, 7 Apr 2024 10:35:25 +0000 (UTC) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-41650de9e1eso2013655e9.1 for ; Sun, 07 Apr 2024 03:35:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712486124; x=1713090924; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3QmAOpyr34xuquXPEhJN5lDLk55Ljs55ZVIpCzAK1Z0=; b=f33dZaStPWWZEvgDQjdhK+RCYJlEsZKdW4T4xuqwHhAzynV2eLVfJMB7aYoTmhl+Cm i5Bp6EGAFKOTWPQcn5Et5qXEiyeuVoOlawZ63JRtyc6GmiS9QjC7uekH+gqN6VdC622A 3mvXswCQCVVBeYVaBZZR9RFiXkYmFhv8isSYhfF4sfiVgTy+jGD7496zzKln+EFpwUAs Yp1AKJ5Syazh0VZMqoo7S18MXRhqAKdFpr8hKxzUAyvBr3GWZFVUxI+jSwDWhTlbK1FL kF0dYx7/LoYiAZu/xwxmbR7pJQnnDqQ82XYxAtzQMU8Tlv1D3a+N+9USzD8MQUmKw/w7 qGmQ== X-Gm-Message-State: AOJu0Yx9eK1n8yxDkDIp+9qQrAr2QgzXWrJVhpArsOnh8aYoWSCfstUI ISgBarNN7T3hL9tXwt9pd7w0Ri8y7fm1Y/DZlgPfm7pzsQDRAcOAi33SEombIK+yfY4p+AeI55Z A X-Google-Smtp-Source: AGHT+IEzj8WudiDyX7KMn7wQScw0KPD4TjfV15L55024O+8d4oewYk12jqQyB6GZcMN6GAabK0XTtg== X-Received: by 2002:a05:600c:4592:b0:415:4379:d36d with SMTP id r18-20020a05600c459200b004154379d36dmr5975980wmo.2.1712486123755; Sun, 07 Apr 2024 03:35:23 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b004149536479esm9486542wmb.12.2024.04.07.03.35.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 03:35:23 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 7 Apr 2024 12:35:08 +0200 Message-ID: <20240407103512.1112712-16-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240407103512.1112712-1-romain.naour@smile.fr> References: <20240407103512.1112712-1-romain.naour@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1712486124; x=1713090924; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3QmAOpyr34xuquXPEhJN5lDLk55Ljs55ZVIpCzAK1Z0=; b=3C1xL3p5NUYwODt4msni734wSHVW3Q2QlsJyh1nqbmFbtpkijIeFZrbMUt9bS0S70M 6GTQZGYRBRMM7y/9jrKkFbTNj34BcN8sO7hKQztgSEQZe7SU/uxbXMKMG6ccAkWzc7sq SpMTUhPtDeQw4T6tFAogRVO2Lbvi8L7mjdX/zX3Ad+CPJEBpVvd2lmb0AlhSIRYKywrA yFUj1uUnG+5QMezFNmdLIuXHuFpQXbuoGjzCpwC4SaMJhgmCKvd0pBpdvjhCYWI5ibU7 eYQpqF4SqHdxgy+TqB4vgn2mWG2wr+nai9IPfjtxI4mRXStKxRduuqbUuFA974RyxW69 7BWQ== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=3C1xL3p5 Subject: [Buildroot] [PATCH v12 15/16] boot/ti-k3-r5-loader: remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN X-BeenThere: buildroot@buildroot.org 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: Romain Naour Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Since all AM62 and AM64 defconfig has been updated to use binman and ti-k3-image-gen has been removed, binman is now mandatory for all TI K3 SoC. So remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN option since since it can't be disabled anymore. We can remove BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN without legacy handling since this option is not part of any Buildroot release. Signed-off-by: Romain Naour --- boot/ti-k3-r5-loader/Config.in | 11 ++------- boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 30 ++++++++++--------------- configs/ti_am62x_sk_defconfig | 1 - configs/ti_am64x_sk_defconfig | 1 - 4 files changed, 14 insertions(+), 29 deletions(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index c0c7222a10..d91aefed79 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -1,6 +1,8 @@ config BR2_TARGET_TI_K3_R5_LOADER bool "ti-k3-r5-loader" depends on BR2_aarch64 + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema + select BR2_TARGET_TI_K3_BOOT_FIRMWARE # binman help Separate U-Boot SPL build for R5 core on TI's K3 processors. Usually used to build tiboot3.bin with k3-image-gen. @@ -93,15 +95,6 @@ config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_CONFIG_FILE help Path to the TI K3 R5 Loader configuration file. -config BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN - bool "ti-k3-r5-loader use binman" - depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-rpds-py -> python-jsonschema - select BR2_TARGET_TI_K3_BOOT_FIRMWARE - help - Use binman tool for generation and signing of boot images. - - https://docs.u-boot.org/en/v2024.01/develop/package/binman.html - config BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN string "tiboot3.bin binary name" default "tiboot3.bin" diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk index 0191a2501c..93d9e0b134 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -35,11 +35,20 @@ TI_K3_R5_LOADER_LICENSE_FILES = Licenses/gpl-2.0.txt TI_K3_R5_LOADER_CPE_ID_VENDOR = denx TI_K3_R5_LOADER_CPE_ID_PRODUCT = u-boot TI_K3_R5_LOADER_INSTALL_IMAGES = YES +# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt +# Make sure that all binman requirements are build before ti-k3-r5-loader. TI_K3_R5_LOADER_DEPENDENCIES = \ host-pkgconf \ $(BR2_MAKE_HOST_DEPENDENCY) \ host-arm-gnu-toolchain \ - host-openssl + host-openssl \ + host-python3 \ + host-python-jsonschema \ + host-python-pyelftools \ + host-python-pylibfdt \ + host-python-pyyaml \ + host-python-setuptools \ + ti-k3-boot-firmware TI_K3_R5_LOADER_MAKE = $(BR2_MAKE) TI_K3_R5_LOADER_MAKE_ENV = $(TARGET_MAKE_ENV) @@ -58,21 +67,8 @@ TI_K3_R5_LOADER_MAKE_OPTS = \ CROSS_COMPILE=$(HOST_DIR)/bin/arm-none-eabi- \ ARCH=arm \ HOSTCC="$(HOSTCC) $(subst -I/,-isystem /,$(subst -I /,-isystem /,$(HOST_CFLAGS)))" \ - HOSTLDFLAGS="$(HOST_LDFLAGS)" - -ifeq ($(BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN),y) -# https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/tools/buildman/requirements.txt -TI_K3_R5_LOADER_DEPENDENCIES += \ - host-python-jsonschema \ - host-python-pyyaml \ - ti-k3-boot-firmware -# Make sure that all binman requirements are build before ti-k3-r5-loader. -TI_K3_R5_LOADER_DEPENDENCIES += \ - host-python3 \ - host-python-pyelftools \ - host-python-pylibfdt \ - host-python-setuptools -TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) + HOSTLDFLAGS="$(HOST_LDFLAGS)" \ + BINMAN_INDIRS=$(BINARIES_DIR) TI_K3_R5_LOADER_TIBOOT3_BIN = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN)) @@ -90,8 +86,6 @@ define TI_K3_R5_LOADER_INSTALL_SWSFW_ITB fi endef -endif # BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN - define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) endef diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index b62f624d82..fa2c008d4c 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -30,7 +30,6 @@ BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin" -BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 56e1b23335..f7c6d16b35 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -30,7 +30,6 @@ BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am64x-gp-evm.bin" -BR2_TARGET_TI_K3_R5_LOADER_USE_BINMAN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y From patchwork Sun Apr 7 10:35:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1920518 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VC7tS5yxqz1yYf for ; Sun, 7 Apr 2024 20:36:16 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 39EFE41A2A; Sun, 7 Apr 2024 10:36:15 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 6BY_oVPecgRT; Sun, 7 Apr 2024 10:36:14 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 8FB2941E69 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 8FB2941E69; Sun, 7 Apr 2024 10:36:13 +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 316D91BF575 for ; Sun, 7 Apr 2024 10:35:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 1B4B0822AF for ; Sun, 7 Apr 2024 10:35:27 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id LwSjv1w2gzud for ; Sun, 7 Apr 2024 10:35:26 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::331; helo=mail-wm1-x331.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 03A05822A9 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 03A05822A9 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by smtp1.osuosl.org (Postfix) with ESMTPS id 03A05822A9 for ; Sun, 7 Apr 2024 10:35:25 +0000 (UTC) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4166ccac761so170175e9.0 for ; Sun, 07 Apr 2024 03:35:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712486124; x=1713090924; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MUbKXNEbnHvi4KZWhbaZeZ1lmko+lLC7O0bhdngjzHI=; b=DpXyFH2IX8CbFPYQKiU9laGbleDojEQN0Cn6uyol6iomZbzSVyiG2QKplx6/BKwaJs FcWCnVMzhOExTiy8VAVDP2kzhtSngdETaKmESC029sRSXoUSQ+u4Xr5Wzl5fZa4Srvjy XYOxHyUZww6y/eJCrIuW9SYwzaXnkM4ZYJRkpg/SrKY6MLS/Plzo/DvVzs9CxDrhVzW0 qDzVHqLYDournbYw5rz2yeBg1zI/uzMxpQxu3SWLta2ooOTS1lwqcyvjq2djvnasAE7j 5iaGqF1vsNcRGKi/vh7yLR7315qdfD1d7Voz9vJlXBTSSJCiyCnc6m1f8ClOtt/Wy/YZ CeYQ== X-Gm-Message-State: AOJu0Yw0l0Mq7FKNbPKR0YhKuJikjCFkp8NzqdRQGU+BcKo2j9EjTLz2 DYzbaHgfoU78t8RwLxYRrDwFjGRlGD2KKrBSyGmW8E+k+nZ6bCJCDkwWx7+Flg/1pKDAr6stTWG f X-Google-Smtp-Source: AGHT+IFA1UKA46Np1Ryp5pQLvlobusICV0MT6+ShvpwPRjBVBL/xdDbQ4IjQUltPcw8EReeX2DXE5A== X-Received: by 2002:a05:600c:4f8f:b0:416:605b:584d with SMTP id n15-20020a05600c4f8f00b00416605b584dmr830575wmq.3.1712486124180; Sun, 07 Apr 2024 03:35:24 -0700 (PDT) Received: from P-NTS-Evian.home (2a01cb05945b7e009bdc688723a24f31.ipv6.abo.wanadoo.fr. [2a01:cb05:945b:7e00:9bdc:6887:23a2:4f31]) by smtp.gmail.com with ESMTPSA id je4-20020a05600c1f8400b004149536479esm9486542wmb.12.2024.04.07.03.35.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Apr 2024 03:35:24 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Sun, 7 Apr 2024 12:35:09 +0200 Message-ID: <20240407103512.1112712-17-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240407103512.1112712-1-romain.naour@smile.fr> References: <20240407103512.1112712-1-romain.naour@smile.fr> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=smile-fr.20230601.gappssmtp.com; s=20230601; t=1712486124; x=1713090924; darn=buildroot.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MUbKXNEbnHvi4KZWhbaZeZ1lmko+lLC7O0bhdngjzHI=; b=WWGNyNEsNIFG9uxpjBaduo+lGfekBt3QfspnawdwGxxSXtYLLIbzLVmn0o3w6SE1/F C2ZlLYZvjnknMxV0gjNa2jK3shzFKUz+obNslXkt74HZ/wYZs1sOpfvS9CyKjY3lshW9 X42+ED6S0+ltvLujrJYAG7KWpJnF7iqf0xG1Wn3kCw+SxdM8BDbISC3yAlrjMBYdlNlF awurM/DAB7muuykVhBJMdqKd4wMziXbCenBAIcMvHmhB+vRuXQNgT1jOdbv+d3Eda60d Fw4DOcuvSzlrQc6UL1A4VUQ48UcLs9NJnmHUIiPGgnFUCMltWGqRnSaEKcC10Z4ae5iH g+Jg== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=smile.fr X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=WWGNyNEs Subject: [Buildroot] [PATCH v12 16/16] package/ti-k3: switch ti_am6{2, 4}x_sk_defconfig to HS-FS by default X-BeenThere: buildroot@buildroot.org 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: Romain Naour Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From Andreas Dannenberg (TI K3 architect) [1]: "HS-FS should be the default for all TI AM6x devices. This is our "production silicon" and what's used for (almost) all projects, especially new projects. This being said having support for GP device variants still is desirable for existing boards/projects, such as the current BeaglePlay boards (amongst earlier version of TI starter kit EVMs for AM6x)." See further details on e2e Forum [2]: "Unfortunately with this transition any existing GP device based AM62x (and AM64x) boards will no longer boot with MMC/SD card images generated" For such existing GP device based AM62x (and AM64x) boards, users have to provide the tiboot3.bin name using BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN. [1] https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1210443/faq-am625-generating-sitara-am62x-am62ax-am64x-gp-device-bootable-mmc-sd-card-images-using-sdk-v8-6-and-yocto [2] http://lists.busybox.net/pipermail/buildroot/2024-February/685821.html Signed-off-by: Romain Naour --- configs/ti_am62x_sk_defconfig | 1 - configs/ti_am64x_sk_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index fa2c008d4c..5c7b97b3b0 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -29,7 +29,6 @@ BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" -BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am62x-gp-evm.bin" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index f7c6d16b35..28e97f94e2 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -29,7 +29,6 @@ BR2_TARGET_TI_K3_R5_LOADER=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" -BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN="tiboot3-am64x-gp-evm.bin" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y