From patchwork Wed Apr 3 19:53:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919405 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 4V8wSJ4FsWz1yYP for ; Thu, 4 Apr 2024 06:54:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 09391417C7; Wed, 3 Apr 2024 19:54: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 G74PBhhqowbP; Wed, 3 Apr 2024 19:54:21 +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 8D3C9418CB Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 8D3C9418CB; Wed, 3 Apr 2024 19:54:21 +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 4A1C11BF982 for ; Wed, 3 Apr 2024 19:54:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 83B77607E7 for ; Wed, 3 Apr 2024 19:54:11 +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 bTxgAPQgh9-H for ; Wed, 3 Apr 2024 19:54:09 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::42b; helo=mail-wr1-x42b.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 13EB36073E DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 13EB36073E Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by smtp3.osuosl.org (Postfix) with ESMTPS id 13EB36073E for ; Wed, 3 Apr 2024 19:54:08 +0000 (UTC) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-3436ffd65ebso113955f8f.0 for ; Wed, 03 Apr 2024 12:54:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174047; x=1712778847; 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=Eh8GqQMDYBjdjEZ8NsprfNfBCkmdc+DwRk5Y7cna3oQgHB3/aoC3k+US4B38YupyoU GmZfZsFSe0VOnDi2QRGa/YlgtWGCVyC2fS8DCoaWGnAo3E6lPulJY4iFoPlskOW2prZv glBVOyZSOGSSZhtBSGfcFut0aYz10qI9EPR3adFT7DBUo+d+Xzo6MS3IL+1udaEe49jE laqkoD7HFEDgiuDPk9oteHFiQ2OzAY5d2q+3jwZKHbiVlbGKqWeIClkrhtNeIES9GH8Z mFkp17NCbVP2EcmndpN+dxOwuLCczZ2DQtDIFf6vbLveiWuCD7qYh+ODZtqhpC9LzKXu HknQ== X-Gm-Message-State: AOJu0Yx058kl2vCT1Wv+aRr+yuW0jJzAjbhv8oid0Cl8+sZIAEpZIs6Z M63eH/VWSEHYcor7bbqAfEeD42/kcdSwO5gVC9gvjSh9EB2aqGXqbJlth1Mdv1hiwASzbW2RXmp T X-Google-Smtp-Source: AGHT+IGHRX8ZQ/YtiFAcUX0dC5dyUkW85Y5Piu+il5ZWWQJbV8bXbFjIVmBUo/VmFXu4m/70ndc7Cg== X-Received: by 2002:a5d:5152:0:b0:343:9230:e079 with SMTP id u18-20020a5d5152000000b003439230e079mr304125wrt.71.1712174046806; Wed, 03 Apr 2024 12:54:06 -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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:06 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:35 +0200 Message-ID: <20240403195403.1359007-2-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174047; x=1712778847; 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=lzwWLsP0DSqhCERODcr7c47SJXTpCN5uKFWk05IBYR6mvgGo9Hf+mcBdDKPinwHp1Y RQ8/lleTo9UjQ+TB5EXZTom0cZBXHkiVq0cqjbqtv4SiU+/MTp6XvjqYoCxYgwpOxElU bsTd+kqPTL3DKdhIpBnajHOm5kYPU7ij5uVMv/HlCMXSp0rlaMft9u0zMQqK8RCYZLr5 zObtN8XYOugQKO26uTqN3teSHuntS3wUcSQKm0CjzwhZjFMZ0lN17Lizp7FItxQ/oQkG P1S5dzC8Jsv6oXdFitTo1MeW67sZ1qQ3mPYDj9BKz1z5rqtJ11ceoXgxTGynBscfoZ+4 1NkA== 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, unprotected) header.d=smile-fr.20230601.gappssmtp.com header.i=@smile-fr.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=lzwWLsP0 Subject: [Buildroot] [PATCH v11 01/17] 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 Wed Apr 3 19:53:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919403 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 4V8wS95NYzz1yYP for ; Thu, 4 Apr 2024 06:54:17 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 36E57418B9; Wed, 3 Apr 2024 19:54:16 +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 pjGMh8-3ih8e; Wed, 3 Apr 2024 19:54:15 +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 ACA74418A7 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id ACA74418A7; Wed, 3 Apr 2024 19:54:14 +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 AA80D1BF4D5 for ; Wed, 3 Apr 2024 19:54:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 97703607E7 for ; Wed, 3 Apr 2024 19:54:10 +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 5lWkyOXulMpP for ; Wed, 3 Apr 2024 19:54:10 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::433; helo=mail-wr1-x433.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 854C960751 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 854C960751 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by smtp3.osuosl.org (Postfix) with ESMTPS id 854C960751 for ; Wed, 3 Apr 2024 19:54:09 +0000 (UTC) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3438f079ff5so116163f8f.2 for ; Wed, 03 Apr 2024 12:54:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174047; x=1712778847; 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=CpLGL/1PRmAKhLtAVB5ceTabaJ/505YTiKxzUYAY0Kv4ASAqNoHkRkTkKlOgtDhQzd sxIzy8t7Q4MeyhJrpLkUmlN0hWluNRvU6tVeH2XdQGdlB3ToYSGGZo5y7yRWDvZlAfxh rGHXFkYfU0Ty3MTRnk5pdjSlh4muzDwX5+zPZqbv4BQbUFY146Rq/P28kpdLlrljXW60 +z29t8ggQftzLmgRSfW97ifGer5Xvab6wERWjG9sdgkgr8ZIcWaMuRaQiVBJKgrvN0g/ o6RbRMHRNBjiAhgM77DXjlKSWMQ7hIv0C2M7NaHjnB/rkphRC2xV2hJg0DPNAwVkbEfA P6VQ== X-Gm-Message-State: AOJu0YwihSJGklwHZXuIAI4RSa1DS7SZXaJu6kF3oGgy8imvXGfk5q2b skM/prI6IEHXTiUAHpUWgCq3JCknAdXGbAUlHOqCNDeyANYiJf/LzZGLEGWSvqwTxYIKPiu5v80 T X-Google-Smtp-Source: AGHT+IEqxRtT828KzRL3xmbxIBpxZNnHyDTh3+FmKuPUYRof2GG4ri1WDR3MJheW4Nu4u6h9B3pJLA== X-Received: by 2002:a5d:6385:0:b0:33e:c389:69ff with SMTP id p5-20020a5d6385000000b0033ec38969ffmr323156wru.68.1712174047412; Wed, 03 Apr 2024 12:54:07 -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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:07 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:36 +0200 Message-ID: <20240403195403.1359007-3-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174047; x=1712778847; 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=DgxcATPgiYhMK1uyK9xYV/e3cnnOKjBodBZSdUNph1nRB29F4UC4I0c21dGIYO3glW 0Na56xo/38tiuw0XHtazd8UmLGFfAGb/y8tmcHXC7ySdm4QrsbVew4cBLm7TOb1HyTCB wgg5LGb29l+Rn2S1dm2jsyD6YaGlFsX3YWGMHTf1+1j0q2Lthf+JN4jOMLLV8w94ZRoq eVo3PG5y0MAq1Tk4LjAKOhR/AIKIRltFSzuFVL/g4PkYN02pA7aL44Pj5nuqWfsNpQhe 9TbPs0B4qiT4oXTL7Aebd2QV7772PCbspQpmvwh8YoskzrlN/srzEt4dLrYAu9J4C5gZ MGig== 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=DgxcATPg Subject: [Buildroot] [PATCH v11 02/17] 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 Wed Apr 3 19:53:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919404 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 4V8wSF2jpbz1yYP for ; Thu, 4 Apr 2024 06:54:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C8D33418B7; Wed, 3 Apr 2024 19:54: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 dsMFfP3VrEXT; Wed, 3 Apr 2024 19:54:18 +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 57F2D418BF Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 57F2D418BF; Wed, 3 Apr 2024 19:54:18 +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 4303F1BF4D5 for ; Wed, 3 Apr 2024 19:54:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id C868E60751 for ; Wed, 3 Apr 2024 19:54:10 +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 5VqXhqANAhFn for ; Wed, 3 Apr 2024 19:54:10 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::335; helo=mail-wm1-x335.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org B27966079A DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org B27966079A Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by smtp3.osuosl.org (Postfix) with ESMTPS id B27966079A for ; Wed, 3 Apr 2024 19:54:09 +0000 (UTC) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4162514dc22so2000515e9.2 for ; Wed, 03 Apr 2024 12:54:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174048; x=1712778848; 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=91oSwtyemJRy23KCF0JF13OTLIzZTRzYzM3DsARpxC0=; b=DNEXH/oqiCbgsXYlLVovCdB2+cv1FIga43kdwmNjO23IXXMoJ8O6qLz2YQ85yiaNqK jFl9I6Kknr64dm3HlRhHH7ePh7nlqRq7PhjbhS7BKhzhRPl9Z5D0/bTmEOP4XWUPPI9a 1/HByZhrgmh5GKyWHpr5bq2A+Qj+zTBNDpAbkyE/1/bJ4rMfSigM4Q1uZX7goi5IsZBd 0wa2SwFOf6bYowd3uqCTYvvhqRGKO+e88ppEfS5QSQ7gSheQOrS2cxftRtVTrMCx2yCP lkgdwe/Nbzu0yNOlv7IPldMnok5dS1NWPPkedYTx+hIiWrRlbaAg4m5BnM8e4w67oe24 dSDw== X-Gm-Message-State: AOJu0YyWSZ0qV9jLFQvku07hvWKrL3L2wZ/AKuRFHM2EJTuJfW4WvEWR aUV309+20w/kzERYjE01ssbakNueGoIxYbFOpONxqTfLAEYe3mJABHilg2Un1ZyDu4q8LZKtjMM D X-Google-Smtp-Source: AGHT+IF9nc3Oxd2u6DuEI4AZkIhRRJ4rgaAeyAuctUEWZ26HWLtDQntZdQgzuLCcGW4BWUJHAAv34w== X-Received: by 2002:adf:f052:0:b0:341:e367:e7bf with SMTP id t18-20020adff052000000b00341e367e7bfmr387682wro.69.1712174047865; Wed, 03 Apr 2024 12:54:07 -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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:07 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:37 +0200 Message-ID: <20240403195403.1359007-4-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174048; x=1712778848; 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=91oSwtyemJRy23KCF0JF13OTLIzZTRzYzM3DsARpxC0=; b=LANWsjqFHKlS29ZZXjH2SG8xUQDI+AjDhiwbNgMBNwOZ0fDw33OgtXVw+P8ffyFoIO QuvVdap/Tcp/ZxmHBX7QfgCqRuc30SEZ+VykJkJxQGzHRyt+Yxr68uTU8ltKT7+M+/w4 XMij/swu4ZNZDVlIQeaRWITXBX4s53olU6k95rogZYcdc7vf8vXxD6GwoZdyxnXljf4K 2GdBc2br7yGURQvIOr/EbRb7LOqiGvnZbZxJjNKSYkuvoglyDSpK/uquA1w0uaXEKu73 2pk6KXXRFg+8VxnJ754XB5+fMcv/KwkxWNe1N+ZEn+sEhgv7vUC0063VBdRSo2Wx9XdS 8N3A== 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=LANWsjqF Subject: [Buildroot] [PATCH v11 03/17] package/ti-k3-image-gen: disable HS-FS for AM65 SOC 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 It seems that some TI K3 SoC variant doesn't provide all SECTYPE. For example: AM65 provide only GP or HS, there is no HS-FS. This can be checked in meta-ti: 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" So BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS must not be selected if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X is used. Note: The HS_FS and HS SECTYPE are currently broken in Buildroot since the package ti-k3-core-secdev needed to sign binaries is missing [1]. Since this tool is nowaday legacy and superseded by uboot's binman tool, HS_FS and HS SECTYPE will be fixed by using binman with the version bump to u-boot 2024.01. [1] http://lists.busybox.net/pipermail/buildroot/2023-November/680216.html Suggested-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- v11: moved at the begining of this patch series before any refactoring/rework. Added in v7 --- boot/ti-k3-image-gen/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in index d76cef82e9..eb0f589fa7 100644 --- a/boot/ti-k3-image-gen/Config.in +++ b/boot/ti-k3-image-gen/Config.in @@ -48,6 +48,7 @@ config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS bool "hs-fs" + depends on !BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS bool "hs" From patchwork Wed Apr 3 19:53:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919406 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 4V8wSM5rWHz1yYP for ; Thu, 4 Apr 2024 06:54:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 44822417ED; Wed, 3 Apr 2024 19:54: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 LZrqoxWZm6HK; Wed, 3 Apr 2024 19:54:24 +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 3FC38418D3 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 3FC38418D3; Wed, 3 Apr 2024 19:54: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 2FAC11BF4D5 for ; Wed, 3 Apr 2024 19:54:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1C84440568 for ; Wed, 3 Apr 2024 19:54:12 +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 1HazltNTO3VY for ; Wed, 3 Apr 2024 19:54:11 +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 smtp2.osuosl.org 8DEC2402E6 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8DEC2402E6 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by smtp2.osuosl.org (Postfix) with ESMTPS id 8DEC2402E6 for ; Wed, 3 Apr 2024 19:54:10 +0000 (UTC) Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3434c6e1941so105710f8f.0 for ; Wed, 03 Apr 2024 12:54:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174048; x=1712778848; 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=WMODm7u2Yp++QmI1JL1QQdaE0q9Bka3HE1srQjiefyg=; b=EFh4513IC7hWs3jQc1lyOWNfn4faRzEWtoNVBjT/wgcMMo5DwyWRAdocX3NIgRyncl WpUXsSI+l733hfMb+j30cfDr0+s+9DLQOJzv0tx670HS/oxGKJd+nhk8RvTchBZtPDqL UuQzU4S61MOi5NuAT7fJKXsahzeXET4utFDBMsLmsdjL1YAtCr6SbsU6a0rS+1+v96Xk 95NDFoHalkjpekaFDLD1FwRF5Kf98mP1VhIutN1RZE/ClzjxYjLL4NIhFh9mvmCi7ZDZ aijVRw3q+yIiO6b6XaRjQtf2ZvW4rk6LILT6gMPPQCYJ5D9WzYM1PErigL03NJsn92EY Km2g== X-Gm-Message-State: AOJu0Yz/aB319juMGeAmnxS0VV7tE6egVaKAWD3j8w4hy8Pjwj3l+agc 0m4Lle8rMB1O7UgrRg46jv5eJScC3WIClchwqLkbtOsmp8hMMH3cwb4V4GC+6PPfGOsMIsHnsZV z X-Google-Smtp-Source: AGHT+IF3qo0RfF1nUmSYk9PJTFOzOyMHtztZjOAdu6H8tUHAenjdEW8+aX351hzk7cJQPN8mqF66nQ== X-Received: by 2002:a05:6000:190:b0:33e:737f:9363 with SMTP id p16-20020a056000019000b0033e737f9363mr284946wrx.70.1712174048454; Wed, 03 Apr 2024 12:54:08 -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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:08 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:38 +0200 Message-ID: <20240403195403.1359007-5-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174048; x=1712778848; 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=WMODm7u2Yp++QmI1JL1QQdaE0q9Bka3HE1srQjiefyg=; b=HkAvZbLyAfgAcCQAkCOlYyLxeWkx1yDK2C8WYJb+oL/zuJFuik2JenYVcPJ2Pr/+Sf z4ok5IzULxVbc6wesoCnpFloH8syW+e2a1w5QDyjALZQF5/3UA0rYzSDPA9gtKnP2eRQ 7Cp8o1l0G3+nufJZ45FeUSicIgyg3CKMimNPPqanBlgpcTdu02TovHTR+FaN25ZMH9+b jCOtHMVntui+yL31+M9NVfJjNj+kBPlUAqAbCCxH9+l1cAKuWOb8aDVUJOpDFPsbHkUv wLLL2b274SB3yk6WevdTFoNac2GK1WfvDg4Dwa/LnOPyW0NEtF8zktLFwKdkohXzAOJl N9Yw== 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=HkAvZbLy Subject: [Buildroot] [PATCH v11 04/17] package/ti-k3: move SoC familly and security type choices out of the image-gen scope 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 versions of U-Boot can use Binman to compile and sign the generated binaries, thus making the use of custom tools like ti-k3-image-gen no longer necessary. In ti-k3-image-gen, options such as SECTYPE and SOC were configured and used outside of it. This patch allows setting such options even if the package is not enabled. Move only the "SoC family" and "Security type" booleans to the new ti-k3 package since it will no longer be necessary to define strings variant currently used only by ti-k3-image-gen. The BR2_TARGET_UBOOT_NEEDS_TI_K3_DM option is actually only needed using ti-k3-image-gen and will be removed when all TI based defconfig will be updated to use binman. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- Changes in v11: - Move only the "SoC family" and "Security type" booleans - keep BR2_TARGET_UBOOT_NEEDS_TI_K3_DM depends on ti-k3-image-gen - Update the patch title Changes in v7: - Revert change disabling BR2_PACKAGE_TI_K3_SECTYPE_HS_FS for BR2_PACKAGE_TI_K3_SOC_AM65X. The change is moved in a separate patch. Changes in v6: - Move BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME to ti-k3 (BR2_PACKAGE_TI_K3_DM). - Disable BR2_PACKAGE_TI_K3_SECTYPE_HS_FS for BR2_PACKAGE_TI_K3_SOC_AM65X Changes in v5: - Add SOB tag - Move the new ti-k3 from boot to package Added in v4 --- boot/ti-k3-image-gen/Config.in | 63 ++++++---------------------------- boot/uboot/Config.in | 10 +++--- configs/ti_am62x_sk_defconfig | 3 +- configs/ti_am64x_sk_defconfig | 3 +- package/Config.in | 1 + package/ti-k3/Config.in | 43 +++++++++++++++++++++++ package/ti-k3/ti-k3.mk | 7 ++++ 7 files changed, 71 insertions(+), 59 deletions(-) create mode 100644 package/ti-k3/Config.in create mode 100644 package/ti-k3/ti-k3.mk diff --git a/boot/ti-k3-image-gen/Config.in b/boot/ti-k3-image-gen/Config.in index eb0f589fa7..5cdf52d452 100644 --- a/boot/ti-k3-image-gen/Config.in +++ b/boot/ti-k3-image-gen/Config.in @@ -13,66 +13,25 @@ config BR2_TARGET_TI_K3_IMAGE_GEN 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" - depends on !BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -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 + default "am62ax" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "am62x" if BR2_PACKAGE_TI_K3_SOC_AM62X + default "am64x" if BR2_PACKAGE_TI_K3_SOC_AM64X + default "am65x" if BR2_PACKAGE_TI_K3_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 + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62X + default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X + default "ti-sci" if BR2_PACKAGE_TI_K3_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 + default "gp" if BR2_PACKAGE_TI_K3_SECTYPE_GP + default "hs-fs" if BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + default "hs" if BR2_PACKAGE_TI_K3_SECTYPE_HS endif diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index beafb38930..31ecdeec12 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -242,10 +242,10 @@ config BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE 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 + # We use the SoC selection defined for the ti-k3 package + depends on BR2_PACKAGE_TI_K3 + depends on BR2_PACKAGE_TI_K3_SOC_AM62AX || BR2_PACKAGE_TI_K3_SOC_AM62X help Some TI K3 devices need the Device Manager (DM) firmware to be available for the U-Boot build. @@ -254,8 +254,8 @@ if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM 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 + default "am62axx" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "am62xx" if BR2_PACKAGE_TI_K3_SOC_AM62X endif diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index 37df7a93f7..19f7a7bd77 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -12,6 +12,8 @@ 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_PACKAGE_TI_K3=y +BR2_PACKAGE_TI_K3_SOC_AM62X=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" @@ -24,7 +26,6 @@ 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" diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 1ebdec68ac..a19cf6f855 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -12,6 +12,8 @@ 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_PACKAGE_TI_K3=y +BR2_PACKAGE_TI_K3_SOC_AM64X=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" @@ -24,7 +26,6 @@ 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" diff --git a/package/Config.in b/package/Config.in index 410fe0f493..15ee978b6a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -630,6 +630,7 @@ endmenu source "package/sysstat/Config.in" source "package/targetcli-fb/Config.in" source "package/ti-gfx/Config.in" + source "package/ti-k3/Config.in" source "package/ti-sgx-demos/Config.in" source "package/ti-sgx-km/Config.in" source "package/ti-sgx-um/Config.in" diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in new file mode 100644 index 0000000000..1c48f1cb55 --- /dev/null +++ b/package/ti-k3/Config.in @@ -0,0 +1,43 @@ +config BR2_PACKAGE_TI_K3 + bool "TI K3" + depends on BR2_aarch64 + help + The TI K3 SOC specific selections. + +if BR2_PACKAGE_TI_K3 + +choice + prompt "SoC family" + +config BR2_PACKAGE_TI_K3_SOC_AM62AX + bool "am62ax" + +config BR2_PACKAGE_TI_K3_SOC_AM62X + bool "am62x" + +config BR2_PACKAGE_TI_K3_SOC_AM64X + bool "am64x" + +config BR2_PACKAGE_TI_K3_SOC_AM65X + bool "am65x" + +endchoice + +choice + prompt "Security type" + help + The target SoC security type option. + +config BR2_PACKAGE_TI_K3_SECTYPE_GP + bool "gp" + +config BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + bool "hs-fs" + depends on !BR2_PACKAGE_TI_K3_SOC_AM65X + +config BR2_PACKAGE_TI_K3_SECTYPE_HS + bool "hs" + +endchoice + +endif diff --git a/package/ti-k3/ti-k3.mk b/package/ti-k3/ti-k3.mk new file mode 100644 index 0000000000..a2da29f514 --- /dev/null +++ b/package/ti-k3/ti-k3.mk @@ -0,0 +1,7 @@ +################################################################################ +# +# ti-k3 +# +################################################################################ + +include $(sort $(wildcard package/ti-k3/*/*.mk)) From patchwork Wed Apr 3 19:53:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919407 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 4V8wSR2ZNyz1yYP for ; Thu, 4 Apr 2024 06:54:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C703741839; Wed, 3 Apr 2024 19:54: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 SfJF37khGZJh; Wed, 3 Apr 2024 19:54:28 +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 A723F418D3 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id A723F418D3; Wed, 3 Apr 2024 19:54:27 +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 D3FB41BF4D5 for ; Wed, 3 Apr 2024 19:54:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C08E64189D for ; Wed, 3 Apr 2024 19:54: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 lgvGngMZbjMh for ; Wed, 3 Apr 2024 19:54:11 +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 smtp4.osuosl.org 1F9044179A DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 1F9044179A Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by smtp4.osuosl.org (Postfix) with ESMTPS id 1F9044179A for ; Wed, 3 Apr 2024 19:54:11 +0000 (UTC) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-41628f4c665so601575e9.0 for ; Wed, 03 Apr 2024 12:54:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174049; x=1712778849; 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=UI1+swYjYFANSCbIFUDzf5WUSEx5UH9HtbCMhP5aam0=; b=gxb2Xqe37m99jKg/AGHBnrEgYPSCxL13Zf0R1S47INdCEKcAHUCJ+bnINeIIf71hS0 0furqkH7UmQpwZ6oRhYLkGIhKvpNReWbz3zjIgrlmtyEnQp0zDVm+6+V5hAIOckSd83s qH5WOO5en1oL3fbKSmftpEuoG4p0Mc/oFSI6dvTvrlvGp3hxcGghlo+FX/eG8xyErDXR 2upX9mh71cN92wXiERJkzck7p9h/hKx49TR6oKPOGLxqMqxA/zEmF3y9LJw1jvuLM0/D /mgHBxElm8PVqwUGPwBFSwGJh17clY1yg+j9fQ1rDb1zPFrUoRnO+WIZU1v/ZNDUGUaF FCVA== X-Gm-Message-State: AOJu0Yy6qjVjt5tNSV+1CKoQoEKFbweLPxk3CSDrpcYCs43VBMdgJp/O LfFHEhFQSuH/N0r/JABwU9ChQOabFGlgBCKGjQ58rtgS4pIqVYJW8QFwgYSefipjkRax6VksNde Q X-Google-Smtp-Source: AGHT+IGutxhzc3HGNAQjsSzuW97D7IwTA2EpFZ/FOVWrO9woPwaCMBYrfovKtc4r3eaI62l+RupzdQ== X-Received: by 2002:adf:b309:0:b0:341:db6c:1eec with SMTP id j9-20020adfb309000000b00341db6c1eecmr389051wrd.0.1712174049015; Wed, 03 Apr 2024 12:54:09 -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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:08 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:39 +0200 Message-ID: <20240403195403.1359007-6-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174049; x=1712778849; 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=UI1+swYjYFANSCbIFUDzf5WUSEx5UH9HtbCMhP5aam0=; b=M/JW1ItayyN6ONib/mnSur9I5ZECZhqLVSfIIGOd7JikOKwGsyifQqU8NnoYSksbbO 4fXhaENjcxN6ZPH4c6SWOYwVVhQMjiRr/YODgueT97uuLj93s92FWm7f/Tg2GHWVfjZT 2dJdEZp7y8PChA4kfTLWWDhJLbs70uyT6WCZ1O/tDlZnvocrmxsUcSUiOu3bp/Y8Q11C Wl3ax424KH+A9zS61+ocXPhAqz3Oip+9x6yrLam1e3ROU2IH7C+NIf+amYpw1vV987xx dzitV9p+ZktbhPVfLVoEEph/G/1krNvCb/Oh7WGHsrRz9gtHLa+6eIp7KvEz1TJei1Nx naRg== 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=M/JW1Ita Subject: [Buildroot] [PATCH v11 05/17] 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 | 8 ++++++++ boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 15 +++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 5f86c045c9..cfae45ac98 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -93,4 +93,12 @@ 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 + 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 Wed Apr 3 19:53:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919408 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 4V8wSV3qKyz1yYP for ; Thu, 4 Apr 2024 06:54:34 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id F1239418DF; Wed, 3 Apr 2024 19:54:32 +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 odkOKeevjfci; Wed, 3 Apr 2024 19:54: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 69416418ED Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 69416418ED; Wed, 3 Apr 2024 19:54:31 +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 90AB91BF4D5 for ; Wed, 3 Apr 2024 19:54:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E8F03402E6 for ; Wed, 3 Apr 2024 19:54:12 +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 MY-5uBYPwdDi for ; Wed, 3 Apr 2024 19:54:12 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::335; helo=mail-wm1-x335.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org AE1B440437 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org AE1B440437 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by smtp2.osuosl.org (Postfix) with ESMTPS id AE1B440437 for ; Wed, 3 Apr 2024 19:54:11 +0000 (UTC) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-41625000a61so1461025e9.3 for ; Wed, 03 Apr 2024 12:54:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174049; x=1712778849; 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=hmeqXEPrZJAIFb+871yeIjIlzCEvmwfy/iThmb6WAZY=; b=vPQH118abT0yvXF2rb5dDt/pAevhvIQPWFnYvt9ZQtNhaj/B40Sd5cekS9VS1f4vZb cspX+33JHfGZkEqpjEl1a3zvzCQEAzUPoC1K2Qf9Xv8XbHsOCHuq1dSStfABP+YhRU+e /ne2dt/9TbKAEvZWgrb+Y7ve6lwbc//7f1PSCieKG6Xj7EfsWozPrfGslNeB/SRJuldV dU2uAY5lzqdv6Hgf2C9ZwaXj+zW3hFa64EdzyXB+D1D0VPpR93QvOWUswgyDXg9nziZe ALgmihb1cGXQCgyIICR432/eVhTwDXajn315hTEB0AqHPV/vp/HrANwrWVCclhPGRTp7 Fy0w== X-Gm-Message-State: AOJu0Yyl3WdcWMoxttQDd6FjtLW+0jtf3aNmfjRcOtzocf1jHZpo2HOz zn0JgFr5geEYkj2OF3ZoQZiw/ygkATAOE2/HGYZXPvo/6aO4Cc2Hakwzw0mcXMSciuUE34X3TgI q X-Google-Smtp-Source: AGHT+IF6nDG5k+74vCm5ROoxWQ8rCrSxK76FfUzpXjxf8bVqNNjAyNCN3rx2CNcLzyz9c8PKn7LIOw== X-Received: by 2002:adf:e845:0:b0:33e:69a8:fe85 with SMTP id d5-20020adfe845000000b0033e69a8fe85mr351475wrn.37.1712174049646; Wed, 03 Apr 2024 12:54:09 -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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:09 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:40 +0200 Message-ID: <20240403195403.1359007-7-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174049; x=1712778849; 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=hmeqXEPrZJAIFb+871yeIjIlzCEvmwfy/iThmb6WAZY=; b=ocD6oaRqBDgjWr2nl/ZUF8Beta1c8LCL3xA3ykBAJG9HvNyBbXBDao1TCGbxPD42eV xrKWTz4ufMWG8vk+qX/WbxtF/5V+fwRC6Nf9vU6ty9BP+fGqOks83COqhmkCsLcl1B+g pKq41xjX5v/GeINp6eB+xwcLl+ZH219nbNUjBSr3AvyCLOeVaNBLGoBEJa2s1RtkV4rL 9wuXW0yy5R/Gknt5PX3srf7CNS4vK30fmh6FdHg5nzCgVqf3UhODFo2qVM70AG8+FgFx QJgDOzxg9jFw85G0LcWcbjlaV/mHhnxfurbt068WzKoMq4DSQaV9THZM2iS9s2JZ+yxz Hacg== 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=ocD6oaRq Subject: [Buildroot] [PATCH v11 06/17] 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]. Furthermore, the use of Binman no longer makes it necessary to set `UBOOT_MAKE_OPTS += DM=...' for TI K3 SoCs using a Device Manager (DM) firmware, BINMAN_INDIRS instead to find such firmware. We had the explanation from [2]: For all TI K3 SoCs using binman, install ti-k3-boot-firmware before building u-boot to provide DM (if any) and SYSFW binaries installed in BINARIES_DIR. Note: BR2_TARGET_UBOOT_NEEDS_TI_K3_DM is still needed when binman is not used. This option will be removed when all TI K3 based defconfig will be updated to use binman. [1] https://docs.u-boot.org/en/v2024.01/develop/package/binman.html#invoking-binman-within-u-boot [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 Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- 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 | 12 ++++++++++++ 2 files changed, 23 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 31ecdeec12..2dc20e4770 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -290,6 +290,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 dda606a880..be366e7c31 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -269,6 +269,18 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_XXD),y) UBOOT_DEPENDENCIES += host-vim endif +ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN)$(BR2_PACKAGE_TI_K3),yy) +UBOOT_DEPENDENCIES += ti-k3-boot-firmware +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 Wed Apr 3 19:53:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919415 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 4V8wSx10M5z1yYP for ; Thu, 4 Apr 2024 06:54:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 904CE4192F; Wed, 3 Apr 2024 19:54:55 +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 e1SSXmT-IhbL; Wed, 3 Apr 2024 19:54:54 +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 EFDAA41937 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id EFDAA41937; Wed, 3 Apr 2024 19:54:53 +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 25A8A1BF4D5 for ; Wed, 3 Apr 2024 19:54:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 919ED6073E for ; Wed, 3 Apr 2024 19:54:13 +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 WzOywrm3wWZy for ; Wed, 3 Apr 2024 19:54:12 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::42d; helo=mail-wr1-x42d.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 14F326080B DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 14F326080B Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by smtp3.osuosl.org (Postfix) with ESMTPS id 14F326080B for ; Wed, 3 Apr 2024 19:54:11 +0000 (UTC) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3434c6e1941so105736f8f.0 for ; Wed, 03 Apr 2024 12:54:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174050; x=1712778850; 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=W9GwVenUutWlyUlHlqJHDSHCEdEls2M/DihmVeGIs4s=; b=o7lxnZiQd3ja/W9MqETrgyGlqQNd2/3Gmh3zb1tJkJpb3OS+cmycYZ+4GIG07dbTob AxSl8R/oorgJW8c4gOkWVYn60Fh4msi79luZaMEhTqmjEXK0QdPSNFkXTLvzRZ/QCNV3 2SDNudL0FZWW1N3u/0pJr0aV7o6XTYuoIHCiHYDNppkKF6JEimoV6LIJz+F+NITpQFaF J+q9A6V1bUIS3jZjDvVAJH14f29HNwHOibFK3s9vSXgMUwP40ZCXzc2V9JnS9YK/lTpr BlU5/yf90wQie2zDOMShH3nbKUqJeIaYYgkWJ/2Q+hTOtskNna2zMTQnwhGHkIXiZfkX jDhA== X-Gm-Message-State: AOJu0Yw5jyASTB/qCG1iS7L3ZXe2tuK0TpIceBQhjtxAp2cZz5O+ih3H jvsW2clxqDd3SIs7/gozpPk0uBkKX6Yf0r7UZUQJWHcnYcPf267kCG7t1VPzhJoq3nYC5p2HmNB Q X-Google-Smtp-Source: AGHT+IFDuiX/lH+elu/HLZiYElBr4B/uJg32smPF/yzfT1K87V/Ur96t/4RUWLy8kVgxfEBiKdHyzA== X-Received: by 2002:a5d:4a0a:0:b0:341:bdd4:aedf with SMTP id m10-20020a5d4a0a000000b00341bdd4aedfmr345880wrq.25.1712174050233; Wed, 03 Apr 2024 12:54:10 -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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:10 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:41 +0200 Message-ID: <20240403195403.1359007-8-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174050; x=1712778850; 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=W9GwVenUutWlyUlHlqJHDSHCEdEls2M/DihmVeGIs4s=; b=0hZ1H71mJrvDykkvPWqqZGcCZNdaL7FKR/iaHfB+d4xpaUXNUFdAfZCGHMZYbf8Fvi NEI6nWRu01IMmgJVLyslvYCK4NGoWma+sUzE/+aYXj0F2nqWjZl6ZguE5tWlZmPWqfJ9 DkQWwZtTnFcb6bzR2mgUX/X05Tmoxme833XNq/T5MZHd3CM/T2un65xMe9ZxOQgrnWNa zzNfhda6psXOVzvYZg5S6uhdLdlA198Lf8ZPzYICnufQKPnSqbz0z3t1gLIMb4iwAWBq Ow4a+e7EvvNW5TM61ly2Sfm4Rd+Xfk+CEAiK5TwZfJMSnk5lWNyxwfvImF0fqbi5L9Im EWEw== 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=0hZ1H71m Subject: [Buildroot] [PATCH v11 07/17] 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 U-boot for k3 r5 core (ti-k3-r5-loader) can install different target image (tiboot3*.bin) depending on the k3 SoC variant using different 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 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" Define BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN and BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB strings set with the binary file to use according to the SoC family choice and the Security type. [1] https://source.denx.de/u-boot/u-boot/-/blob/v2024.01/doc/board/ti/k3.rst Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- 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 | 19 +++++++++++++++++++ boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 13 +++++++++++++ 2 files changed, 32 insertions(+) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index cfae45ac98..a580b6ca61 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -101,4 +101,23 @@ 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 + default "tiboot3-am62ax-gp-evm.bin" if BR2_PACKAGE_TI_K3_SOC_AM62AX && BR2_PACKAGE_TI_K3_SECTYPE_GP + default "tiboot3-am62ax-hs-evm.bin" if BR2_PACKAGE_TI_K3_SOC_AM62AX && BR2_PACKAGE_TI_K3_SECTYPE_HS + default "tiboot3-am62ax-hs-fs-evm.bin" if BR2_PACKAGE_TI_K3_SOC_AM62AX && BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + default "tiboot3-am62x-gp-evm.bin" if BR2_PACKAGE_TI_K3_SOC_AM62X && BR2_PACKAGE_TI_K3_SECTYPE_GP + default "tiboot3-am62x-hs-evm.bin" if BR2_PACKAGE_TI_K3_SOC_AM62X && BR2_PACKAGE_TI_K3_SECTYPE_HS + default "tiboot3-am62x-hs-fs-evm.bin" if BR2_PACKAGE_TI_K3_SOC_AM62X && BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + default "tiboot3-am64x-gp-evm.bin" if BR2_PACKAGE_TI_K3_SOC_AM64X && BR2_PACKAGE_TI_K3_SECTYPE_GP + default "tiboot3-am64x_sr2-hs-evm.bin" if BR2_PACKAGE_TI_K3_SOC_AM64X && BR2_PACKAGE_TI_K3_SECTYPE_HS + default "tiboot3-am64x_sr2-hs-fs-evm.bin" if BR2_PACKAGE_TI_K3_SOC_AM64X && BR2_PACKAGE_TI_K3_SECTYPE_HS_FS + default "tiboot3-am65x_sr2-gp-evm.bin" if BR2_PACKAGE_TI_K3_SOC_AM65X && BR2_PACKAGE_TI_K3_SECTYPE_GP + default "tiboot3-am65x_sr2-hs-evm.bin" if BR2_PACKAGE_TI_K3_SOC_AM65X && BR2_PACKAGE_TI_K3_SECTYPE_HS + +config BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB + string + default "sysfw-am65x_sr2-gp-evm.itb" if BR2_PACKAGE_TI_K3_SOC_AM65X && BR2_PACKAGE_TI_K3_SECTYPE_GP + default "sysfw-am65x_sr2-hs-evm.itb" if BR2_PACKAGE_TI_K3_SOC_AM65X && BR2_PACKAGE_TI_K3_SECTYPE_HS + 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..ef7f8df6f7 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.mk @@ -73,14 +73,27 @@ TI_K3_R5_LOADER_DEPENDENCIES += \ host-python-pylibfdt \ host-python-setuptools TI_K3_R5_LOADER_MAKE_OPTS += BINMAN_INDIRS=$(BINARIES_DIR) +define TI_K3_R5_LOADER_INSTALL_TIBOOT3_BIN + cp $(@D)/$(TI_K3_R5_LOADER_TIBOOT3_BIN) $(BINARIES_DIR)/tiboot3.bin +endef +# sysfw*.itb are only generated for Split binary based Boot Flow (eg: am65, j721e) +ifneq ($(BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB),) +define TI_K3_R5_LOADER_INSTALL_SWSFW_ITB + cp $(@D)/$(BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB) $(BINARIES_DIR)/sysfw.itb +endef +endif 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 +TI_K3_R5_LOADER_TIBOOT3_BIN = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3_BIN)) + 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 $(eval $(kconfig-package)) From patchwork Wed Apr 3 19:53:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919411 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 4V8wSh6FhGz1yYP for ; Thu, 4 Apr 2024 06:54:44 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 061D1418A8; Wed, 3 Apr 2024 19:54:43 +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 r9kErH4EF0v7; Wed, 3 Apr 2024 19:54:41 +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 B1A034190D Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id B1A034190D; Wed, 3 Apr 2024 19:54:40 +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 19A6D1BF4D5 for ; Wed, 3 Apr 2024 19:54:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E65C6418B9 for ; Wed, 3 Apr 2024 19:54: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 zSgP1Nbh3ikM for ; Wed, 3 Apr 2024 19:54:14 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::436; helo=mail-wr1-x436.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org CDC444179A DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org CDC444179A Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by smtp4.osuosl.org (Postfix) with ESMTPS id CDC444179A for ; Wed, 3 Apr 2024 19:54:12 +0000 (UTC) Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-34339f01cd2so116126f8f.2 for ; Wed, 03 Apr 2024 12:54:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174051; x=1712778851; 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=DMEsu9eCAnLxwA9OSDxal4zrZ3wluHX/zpoOYOWbLMc=; b=MwZVGa04lQi38jcYSQ7x2fUzM0tqHeWIRlCJflMPpJ46iR6eW/PpNn9rpoZELcOkNx KnxUGZrTiSqNLD2ZNH330pKepU87D1wuEqZuTTAi0p6T+f7fAv8kJr6IyegEDwQ5AuxJ VU9JOTaZY1WehbtnB9uUwrLv55iLPuBkSS9EM4mvfviafoA1RUaRclc51toeIChknL8f 2jObg1ClXyz6zHD3d4crdQgb6nCaDe1s3tVL3+9stHuS+ZzRtXPNCW4UtoTGCYB45kyM jSo5vUNDSCGZg3GKHrOvzUDHashVDQef9dDKEjR2sI0aaR+y+CrCTrP9SAFa27A9ZvdP g44Q== X-Gm-Message-State: AOJu0YxQLk0w4SubhEIVQJY9mwvHipbQ5iU/BN8bGmLwNzFsxoBKsteG GiSOc4TAuJOOnRLGxlApO2RNeitRA9/kDA/nJfPUZp9WUePr5vT+mbensb0elCvXBzlXTTa+9SA U X-Google-Smtp-Source: AGHT+IEFtxRE1ZsNjfSAcP/8rZJ0//I/5/YwXIcNd7zJsYHLtFfdauRWz7BYmraXW3gmtSJbhoPk9A== X-Received: by 2002:a5d:6612:0:b0:343:617e:26ba with SMTP id n18-20020a5d6612000000b00343617e26bamr284198wru.54.1712174050814; Wed, 03 Apr 2024 12:54:10 -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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:10 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:42 +0200 Message-ID: <20240403195403.1359007-9-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174051; x=1712778851; 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=DMEsu9eCAnLxwA9OSDxal4zrZ3wluHX/zpoOYOWbLMc=; b=nHPGUEAlvnOaL0vrP+BEz4inzmdW4ASTy1qLpgeg0g8ctSO6CkG/oH4zpCG6x7NYJx K2Rl3Tq0eemjEAzwpfIglRQiw6Lgsj5ZPVr1J/mdEqihLTb8vuiXoqAdijnjE35V/gtf 43oBI99kP212um3/BEVOKOicS04+kiYRkfZAPXCBTtoAhaSRsl2QUgEVb6I51COPdxbf cVd+0Zkk7GYvGFA0IfQLYcKkbVyvMuMT4GzDKJgZ4crerKf5SIObjA3goLBRsyrOafYS 4AERcB/RKMsofV0pBP7tpEmi/WATahf6V5qZITsKPIB4OMA5qmIqO0iWW9pGyQkAudPt f9VA== 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=nHPGUEAl Subject: [Buildroot] [PATCH v11 08/17] 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. - Remove BR2_TARGET_UBOOT_NEEDS_TI_K3_DM since ti-k3-boot-firmware is now required by binman for TI K3 SoC support. Tested on SK-AM62B-P1. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- 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 19f7a7bd77..d664935db5 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_PACKAGE_TI_K3=y @@ -25,20 +26,21 @@ 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_BOOT_FIRMWARE=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_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_DM=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 Wed Apr 3 19:53:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919410 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 4V8wSc5WSJz1yYP for ; Thu, 4 Apr 2024 06:54:40 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 360934188C; Wed, 3 Apr 2024 19:54:39 +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 rvkLIugCh9nj; Wed, 3 Apr 2024 19:54:38 +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 404BE418F5 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 404BE418F5; Wed, 3 Apr 2024 19:54:38 +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 9D9121BF4D5 for ; Wed, 3 Apr 2024 19:54:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 90D45418B9 for ; Wed, 3 Apr 2024 19:54: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 pCz-QsbfAClh for ; Wed, 3 Apr 2024 19:54:14 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::436; helo=mail-wr1-x436.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 88AF341880 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 88AF341880 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by smtp4.osuosl.org (Postfix) with ESMTPS id 88AF341880 for ; Wed, 3 Apr 2024 19:54:13 +0000 (UTC) Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-33ddd1624beso111785f8f.1 for ; Wed, 03 Apr 2024 12:54:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174051; x=1712778851; 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=gOIECONNUUZhs73wsoswej8xN2LvAigrdEFP4BKe250=; b=hK9w+jq7k03EKYouqc9jZJpUkq3ZuyJCEk1oF69/T4dDayX7kawqSLC1MOu2OOo1r6 zQJyczODaAU1CU9ZkZCKde3OpoqeW4OuoEnBgscnERp/L6LqABMGWdmaSKROHNMgc67m fDeZ+NM7rTIHp4iyhgrIxGV4GPW6zSzezr1SyjBNaBrCcmv3/1gIgyjl+NLP5PpJOvlT BOgk1fdWhYFzsbYFsCXdOQ1WJXHqIg+w2wO+3G/z8rwvp8sNdnAZuEDCgWCfbiS7mB+Z ht97S777tx9gKZnohK6tiGLvNOhS6V42wzIsjgGm6oKRxOVhBckFgmt0YnoTBA2kauYF ifjA== X-Gm-Message-State: AOJu0YzCyzNNbfpaOvEXThlV+brhpecMJFPfM/ctsPMnw6ZAHERibr5j Z51TxEbeETtSUkcWiEYu8tb6IAvKJQfedlAU7w8YyiE8g9jkWcmpU7On4KC7NO+TgDH3BvtGEgs / X-Google-Smtp-Source: AGHT+IE5Z1tP3630gSomQ0htmmd67kpDALZij98kqE7YfjRXGGSWCnIRUayDO1E0JPNmM3GqvWrpPg== X-Received: by 2002:a05:6000:14b:b0:33e:c0fc:5e4b with SMTP id r11-20020a056000014b00b0033ec0fc5e4bmr3264657wrx.2.1712174051396; Wed, 03 Apr 2024 12:54:11 -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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:11 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:43 +0200 Message-ID: <20240403195403.1359007-10-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174051; x=1712778851; 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=gOIECONNUUZhs73wsoswej8xN2LvAigrdEFP4BKe250=; b=ewJl7dle7xMjs2RQV/B7aaZ1TEFb/vUeIIJEzqjaphDRBTXZrjfrmLI5oOksq16qyI gbgtKvH/7tIG7qIzNLxtutDsfO7qTylZXsQ9C5Zyszv+fCBgX9ezSjpJ+g4jRacl5xsw 5pMRshIkp5ROYvdrZZJth8G4egQ9fiNIG2XfZNl6BmsqD9Eoydn/o6+zKx8KInGuckOf jVfZeYFnwWOmUXbRxsy16541ABsI6kJreANKS29lVxu5lNM3NMeBC+t8+hQVBjxNiJdO KyTCH+P9Kn1DXwpB/xPUFDlE4XcejWgrF0AL6EdSXi4+9yBZ732I7ptOoiRvGc9DBLkK eKdg== 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=ewJl7dle Subject: [Buildroot] [PATCH v11 09/17] 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 d664935db5..68e414ee6e 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 Wed Apr 3 19:53:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919409 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 4V8wSY3swWz1yYP for ; Thu, 4 Apr 2024 06:54:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 0EB75418FC; Wed, 3 Apr 2024 19:54:36 +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 1W68noaKa5Aq; Wed, 3 Apr 2024 19:54:34 +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 6ED30418EA Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 6ED30418EA; Wed, 3 Apr 2024 19:54:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 1632B1BF4D5 for ; Wed, 3 Apr 2024 19:54:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 040E740437 for ; Wed, 3 Apr 2024 19:54:15 +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 dZRPcIaEW6wF for ; Wed, 3 Apr 2024 19:54:14 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::42e; helo=mail-wr1-x42e.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org EFC0C402E6 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org EFC0C402E6 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by smtp2.osuosl.org (Postfix) with ESMTPS id EFC0C402E6 for ; Wed, 3 Apr 2024 19:54:13 +0000 (UTC) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-343b4601415so68336f8f.0 for ; Wed, 03 Apr 2024 12:54:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174052; x=1712778852; 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=BH9LBWRYkxmvG4g6L5QmUcdxaUHLc/m0Xq69POMF/t8=; b=rJb5Orj42Aw1UqpV1qxYHAlPFjjyzSpkwlY/M/sNHAxEeF/iTaKnR5D/CmJ6t5B7j/ TUEQQVTvNMt0MxlMtSAxxGdGjO7eBliVEbzf9lrye1SSr7TjX16msckpOUoVsgCd/p9Y jX8f7Trp6XKvxh8MPPgD4uYzl/LQrvKB/tpXidfWBtsy/BGedhZYRLWpYL4uZUBVCUdZ ImZvQ1ymWkRGLNrjd8ZoMYisI+nUxknqFVnUJV1WuZcQ9y4YxBeRwHeWMAdI1tRW2C59 hB3+yDziutrBUJIgGPZ4g/9+7zoO74KjvFnAFgEILziaCLGnQtD3Tg/6O1wfMr+Jt7RW QfXg== X-Gm-Message-State: AOJu0YzuzewsGFtC2S2M0UfAM7tKc1enjX8UsLcZvrdeldb+UrTu/knI meJCwJJc49u1HZ/2XF6gYtPjCY5U9g/JWG41xkNfuzcTWSNKLuAHybunNYNJUb5+GA/V0Tnsn7l C X-Google-Smtp-Source: AGHT+IGYNUxUj+uZlWQYjs/izjw3Mbe7CZ3oBlE+1vqApn4pMf7XCjBf/ZHSQ7InUgZOfAdNGY58Vw== X-Received: by 2002:a05:6000:1249:b0:343:44cd:7d1e with SMTP id j9-20020a056000124900b0034344cd7d1emr538596wrx.17.1712174052087; Wed, 03 Apr 2024 12:54:12 -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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:11 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:44 +0200 Message-ID: <20240403195403.1359007-11-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174052; x=1712778852; 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=BH9LBWRYkxmvG4g6L5QmUcdxaUHLc/m0Xq69POMF/t8=; b=PMnNJ3E9bdzLQTTAnU1bPFoay4s0qM+0ONq90NSfWA9A1s7IN44P43HfOuxSmyREMb xeHv4TwYhUeFqB2u9I+ZcNaIYF7ip6hwmGOFbmU24/VyQ9QffxIe1XBeveSASA+JtK5u PFqgdvmaaKEDKwEEfpDwIGld4WdV8mWlECaF9WwFZZsTzDOPl5UAEmMTU9CcKxO+be+O rhJJ0vlRaPRnLNaCXMJwsmyhjASIOLFoLleZRpWuOBf7fu9TM4wN17QZdpj7k4m61JhO lHxR1B5ud0O2PuSLD/I/dadJKJ6FplKrcAEPy2VYr7RjK9zYiVNC+lMXRmPbHyAo3MQ2 gPMg== 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=PMnNJ3E9 Subject: [Buildroot] [PATCH v11 10/17] 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 68e414ee6e..df7733f526 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 Wed Apr 3 19:53:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919419 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 4V8wTC3qpKz1yYf for ; Thu, 4 Apr 2024 06:55:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B393F41999; Wed, 3 Apr 2024 19:55:09 +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 wu8P9gOe3jDI; Wed, 3 Apr 2024 19:55:08 +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 651FD41989 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 651FD41989; Wed, 3 Apr 2024 19:55:08 +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 5EA181BF4D5 for ; Wed, 3 Apr 2024 19:54:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id BF5B46080B for ; Wed, 3 Apr 2024 19:54:15 +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 FMS80qyRRYcf for ; Wed, 3 Apr 2024 19:54:15 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::335; helo=mail-wm1-x335.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org BB6046079A DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org BB6046079A Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by smtp3.osuosl.org (Postfix) with ESMTPS id BB6046079A for ; Wed, 3 Apr 2024 19:54:14 +0000 (UTC) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-41628d9c907so705985e9.0 for ; Wed, 03 Apr 2024 12:54:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174053; x=1712778853; 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=yAuSAY3CxW/MGO9Ot7OeLHyKyvr1PZgeeBvraSRotUg=; b=VhLszJzcsZugEpiKM9RHObXZ1OktG5QfMddaNaPj+ZDrqHDNUMkvePhUboBtcDmbcz 6wNJ+ag4Lfh62OIEt1qO7qAOjJeEDdYPQYQ4Vvesbr5b0golDtMj1f5W9bU6Lcd1iyC6 MUlw8EFAxw8uFOdxc9/5zmrJ0tvLr9eInXV9Aaeyg3Bh/4OupECR/2FbCMeDE/MsyooN S4euUYjk7/icE2sxWpTSDv/T3ULOZpveE3LgYKMWFaFhO+IMaLNVUE6nqGTsqOCQVxUY VJfmXkz7zLXacSboM2SWXzghWuIXCnfXGffpP5h03HM5242TlzBzp+IygHE8B2HUUsa+ +sUw== X-Gm-Message-State: AOJu0Yyyx1Xjb5V/idIq1qLi14iqQLGUMigNkEIor+SzsjA3TtXEtL+D XDHbai1uQNgoxTNh1fWtDkQT1GseJkQQk7IKgVQbfyn7MDxtdIg/UYat5EnYT6gjuZdIv3tf4ac J X-Google-Smtp-Source: AGHT+IHt0Y+RSp5m6/+tTCvQDmQdWGNCEW9yyc0E8JPdf6spstidXH6gzd1sPS0kY2D72sXVuH6crA== X-Received: by 2002:a05:600c:4d1e:b0:414:8c0d:8e53 with SMTP id u30-20020a05600c4d1e00b004148c0d8e53mr479304wmp.8.1712174052937; Wed, 03 Apr 2024 12:54:12 -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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:12 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:45 +0200 Message-ID: <20240403195403.1359007-12-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174053; x=1712778853; 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=yAuSAY3CxW/MGO9Ot7OeLHyKyvr1PZgeeBvraSRotUg=; b=W4lKfwVX+IpcLtyvp5DfiuF9MTn7MvnX53bPgCK0+uiplvUKNrIWAJBYEjk/4KDz9l Ot4fecP5IlDDiJ0SmyX9nUdpvXO7tCcTizx0G+TBL2vYXQPMhg4cUhC1C9hKNyvacTQz 7CMadxr9unaV2sL6nH2zNaTqMO/EgE/Y64XRtyTaC9eQovVaK2SeqhZ8y71ZOTNoP/nL 69YbYbE4mwiqyTjZxVED9gmNSljsbfljJe82iIuThlo1UWMpT0OJilBxYN9Dfx+vq4wL UkpMUXCM9Y7urmShBl5hgOKJm5L0IkD6Ea/l44VQbMQdu/YEGMLVvxqar3SogHKEhTzg WiCw== 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=W4lKfwVX Subject: [Buildroot] [PATCH v11 11/17] 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 df7733f526..a1110597b3 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 Wed Apr 3 19:53:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919412 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 4V8wSl3rNLz1yYP for ; Thu, 4 Apr 2024 06:54:47 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C64FE418B6; Wed, 3 Apr 2024 19:54:45 +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 U0Z9uZn4CHyF; Wed, 3 Apr 2024 19:54:44 +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 33161418C7 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 33161418C7; Wed, 3 Apr 2024 19:54:44 +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 B62A61BF4D5 for ; Wed, 3 Apr 2024 19:54:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id B0E1D81FF5 for ; Wed, 3 Apr 2024 19:54:16 +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 F5pXv-CpV63P for ; Wed, 3 Apr 2024 19:54:16 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::329; helo=mail-wm1-x329.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org A214E817B5 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org A214E817B5 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by smtp1.osuosl.org (Postfix) with ESMTPS id A214E817B5 for ; Wed, 3 Apr 2024 19:54:15 +0000 (UTC) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-41551500a7eso1475975e9.2 for ; Wed, 03 Apr 2024 12:54:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174053; x=1712778853; 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=Lw+M+Y2iD2pJvtnZmAuYKmDd5W1EcnSVH3iZ+u6IU4w=; b=owueVaKXngbRedvvCtr8A4C9/K14mTgZfq6ANpLiuZN+0Eom1oNUf5cdkrYQtygpu7 69hqufhguBfsuAzb3qVrM/RFXrMPD4kyF8hu1wMlt1B6tmvYawOz2LjrBROdOhZp7z/i fDnr+DM5XQBT6VS8p+qlV2RpMB1nE6gWhqa+Iqgvo9CTnWoKNQcpBAx9kFWXFESOZMiu nWAQAl3tNIgmAXWU8jeaZ4M6Sh+t/Gh7q6rjWwJYQrPGbMtC2sKPyCFp0q5Yu3boqTrW Thj6ZS4PyObZMqkXDLYo1xnyg4yKfLToOfjRNWK4yIPeI5jbim2Ujr3jCnicNdM0o+O/ 3vug== X-Gm-Message-State: AOJu0YwrKiXB4xyAVBsFmXcMGuI8RGgBkwtcOFbki2KHXJ76XzvaC1p4 h2qMExo4APTNCG8muKVlUE2Ec4AczAqIK9w1yqCNRBSsjM+dSBui9x3Z5IPK5vW5s/1XQaFIT29 k X-Google-Smtp-Source: AGHT+IGbvwEOOPxKhUudHPlvnp4fks1d+Mp0J3falBM+EFpJvnyHHxRtyeck282nLJoP8GBzuL0yow== X-Received: by 2002:a05:600c:5686:b0:412:d2dd:4bdd with SMTP id jt6-20020a05600c568600b00412d2dd4bddmr329187wmb.26.1712174053558; Wed, 03 Apr 2024 12:54:13 -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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:13 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:46 +0200 Message-ID: <20240403195403.1359007-13-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174053; x=1712778853; 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=Lw+M+Y2iD2pJvtnZmAuYKmDd5W1EcnSVH3iZ+u6IU4w=; b=qqwzUeKKEqPGlwEZkoNsTv38b3pjWES+LbFUEZN8bXfUJKmJIA4AJtH9uGg8YccCtO 3wn0RLTPpbq/dT9OZ2UuCuzXKQvB9QHGvDiprBCJ8FbPW4OcZ5mieVNQkbXPbdTNC7oO UWJf1+KjNK+rXQgawSn6qnlBI/+ml83Yz3lkY6WXnTe2FzupbksZ8wvj5O9BaRK7lWoN FaEqWq46to7KO9O6OxPtMEqo8CbwlUX11IZBD4ZxaDUqjunYpqMG8N/6WDlF9r+q2SZ1 /VYIN6ZEffWb2J47ByrsNE1ro1hybPBEJ0fX7idtfSpBnez3DzFVVpxOkUCJJIWLKQ5c NVdw== 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=qqwzUeKK Subject: [Buildroot] [PATCH v11 12/17] 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. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- 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 | 13 ++++++++----- 3 files changed, 15 insertions(+), 8 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 a19cf6f855..9a2faa5c6d 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_PACKAGE_TI_K3=y @@ -25,19 +26,21 @@ 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_BOOT_FIRMWARE=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_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_USE_BINMAN=y # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y From patchwork Wed Apr 3 19:53:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919414 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 4V8wSs4yKSz1yYP for ; Thu, 4 Apr 2024 06:54:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 17538418C2; Wed, 3 Apr 2024 19:54:52 +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 pePhroQGJXpi; Wed, 3 Apr 2024 19:54:51 +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 E7BD84192F Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id E7BD84192F; Wed, 3 Apr 2024 19:54:50 +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 083771BF983 for ; Wed, 3 Apr 2024 19:54:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id D5E78418A6 for ; Wed, 3 Apr 2024 19:54:16 +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 S9I9DLWY6hYM for ; Wed, 3 Apr 2024 19:54:16 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::42c; helo=mail-wr1-x42c.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 0C391418BA DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 0C391418BA Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by smtp4.osuosl.org (Postfix) with ESMTPS id 0C391418BA for ; Wed, 3 Apr 2024 19:54:15 +0000 (UTC) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-341c7c8adf3so146033f8f.0 for ; Wed, 03 Apr 2024 12:54:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174054; x=1712778854; 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=/jYRhXnFpFaB/rl049Q8i/jgARbOYSdLre0by+1QH+4=; b=ud7W4VupAKhd9saUmVwSwC13W69KU81bkxbhN8eXp5mzePo/VfSL4W+qfwfCJWPRYi RCDZFyFApeggFYx/DsR27XDayiQ2HmsuexlxaelYGHHwGd7ntA+B/yxsgUEySeCNkBro GyZqxochf0DqtHR/OJDih9FjtskYV8RWo6oIXppTtuHWY8tn08B9vNPxhKBp0vlrqsS2 g5/xS4g/YXhZBTIIbZ0PRs2l5h76k/tmTetsHc5aj6yDC4Oe9D+EHChQ3tus1hMSS3/P fjMyYBdZ/P8JnxV2/Uxroc+0bQXFkzz+cNN3G6dUYxJg5EidaAgv64y2yao32J49M6XI s0sA== X-Gm-Message-State: AOJu0Ywm8jSguyH6BkG9dpg6o3mOOvSShf/kM8p3mSz2CjwMfUP4qPNy 1fGhDPdGYDM0iFOp/lPnAgWj0Luh9+iBGhWFoWYzM5YG4LxuZzijgSryP5yjLwnT3mh2OCX0u1V G X-Google-Smtp-Source: AGHT+IEWS+fiZty0oOPaMqd+c6c4ajsAFchdWiBnw80cynbmNpXGRfJxWD6YskHfJ9CKe4gkNg9zZw== X-Received: by 2002:adf:a35d:0:b0:343:a21c:467a with SMTP id d29-20020adfa35d000000b00343a21c467amr361744wrb.7.1712174054114; Wed, 03 Apr 2024 12:54:14 -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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:13 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:47 +0200 Message-ID: <20240403195403.1359007-14-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174054; x=1712778854; 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=/jYRhXnFpFaB/rl049Q8i/jgARbOYSdLre0by+1QH+4=; b=QDXxEsvjkr5Lp2neBsmLaGICG44IzhZUFbNFOUizruhlYs3YX4EurF9GfprxBD4EQv KMlsFLqM4OxacOQkHQsxmBbLgO3OR7sAxzy6qM0s38wtiLGjN2bCujiVVejcoiokJh+6 MIl3r+tlHlmL4ssQmK/AJDcaklmYo+im9TE/87kcHdnx+jGvSx7ku7qXb0s4SM+GunM6 pvHxrgGJHD0SC/4JhP1/cbqClZuiqpdK2jOZfhMNXonqB4rkXXGUvttOLQzTUdrmabaS 49+OMqFFW8Y+4NnY1Mjc5BZhuCAt05y5UzsKvB9h/hVSqh6eoIZtB5E3eTXB5rBhBx8K iWkg== 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=QDXxEsvj Subject: [Buildroot] [PATCH v11 13/17] 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 9a2faa5c6d..8a3de181d4 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 Wed Apr 3 19:53:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919413 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 4V8wSq0zT2z1yZH for ; Thu, 4 Apr 2024 06:54:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6EED041922; Wed, 3 Apr 2024 19:54:49 +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 aWLRoEaABPmJ; Wed, 3 Apr 2024 19:54:48 +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 34F954191E Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 34F954191E; Wed, 3 Apr 2024 19:54:47 +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 C2E9E1BF4D5 for ; Wed, 3 Apr 2024 19:54:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id B0E8440437 for ; Wed, 3 Apr 2024 19:54:17 +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 JapZutf6JM_W for ; Wed, 3 Apr 2024 19:54:16 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::430; helo=mail-wr1-x430.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 7E70E402E6 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 7E70E402E6 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by smtp2.osuosl.org (Postfix) with ESMTPS id 7E70E402E6 for ; Wed, 3 Apr 2024 19:54:16 +0000 (UTC) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3438f079ff5so116232f8f.2 for ; Wed, 03 Apr 2024 12:54:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174054; x=1712778854; 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=uoWPTL33rAFGGWYYkvuijZliBbrbJIGWD++MRzuTJhM=; b=ZNCYbXzHyvxFxflsi5tMi5+eyzWBhariK1d14xRIdtmaVpYh99YeLu7kO+DifOZ79a uA5BA6HapXOhwA5bBPlOTCCUWRMtedaH5atF1Sv4cHlI2DR2K+xAo9rYEah156Q40+bS Xhqx+iubw+lK1s/tw+jJtXXMbQj2VYWYWtUgLB+JkWmZzps3Oo1A4ewWBlhZFcDwwk5p mPTBc69aH7I5ypmeNZcf22Wu/pkqQu1uiTLOPzLZVtxptxBslCBmh0unPW+vIzQBh75e 3Gtk8xxiDfJGDrJfIT8K4EWlpJ+1rsSX2yFqy4F73x/Co+1MWtOUwVQ9lTCUZ/IJQ/iy VVLw== X-Gm-Message-State: AOJu0YxGIT5QTLLQWYKc5lwFguY3byRZlKknOuIiQAvClOMfkkY+BvCc IkhxBT1ga0rIbduRzFx66qbp+HVQjBix83hQFvkpZjJPdxf3Al6GTX232BIAtJNhOLYhWkLmMzb 6 X-Google-Smtp-Source: AGHT+IEOMm/Rz2UADsMN/mgDhA57q20U0iM7I294cJGNsmWL96SQTo35Kga2XJNdjHtQJj30cuE9lA== X-Received: by 2002:adf:f605:0:b0:33e:38f1:77f6 with SMTP id t5-20020adff605000000b0033e38f177f6mr338413wrp.39.1712174054619; Wed, 03 Apr 2024 12:54:14 -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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:14 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:48 +0200 Message-ID: <20240403195403.1359007-15-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174054; x=1712778854; 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=uoWPTL33rAFGGWYYkvuijZliBbrbJIGWD++MRzuTJhM=; b=pHE7MIRKpH+o1K/5qZR9B/YMH9PXSjRHnTSE7eHQQ6gueBkPugAajUSB9dHXrTO3mz q96hSbLB/jOGIJ9FygkIAf8i6WAH13FKxjDz7l6vHdXJa4UJ6lbwUe8KLwih6uDfPcku OX0ldn4B+l+qkmbPFhcGR6pG6OFCzJ6GMjpBSQz7Jh6YXMYOXdIwbYc7bx2bxQZ8Nglr Laf6yRfg04oooilK4FjltO5Zl7da+hDOKDZr1VHD2X4y5+b8MubXz96PUwYp5ml9Nhb2 GcqRrrk/AeSs00yXoAM9uaWxPW88VaefwKMY0sqnkEaYHWhGwh9lea57xLOY3omgS0Ty 4U2g== 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=pHE7MIRK Subject: [Buildroot] [PATCH v11 14/17] boot/uboot: remove BR2_TARGET_UBOOT_NEEDS_TI_K3_DM 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 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 --- Config.in.legacy | 6 ++++++ boot/uboot/Config.in | 19 ------------------- boot/uboot/uboot.mk | 6 ------ 3 files changed, 6 insertions(+), 25 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index d00196e08b..7117f8f528 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ 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 removed." + select BR2_LEGACY + help + The TI K3 Device Manager handled by u-boot binman tool. + 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 2dc20e4770..57c41f6458 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -240,25 +240,6 @@ 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)" - depends on BR2_TARGET_TI_K3_IMAGE_GEN - # We use the SoC selection defined for the ti-k3 package - depends on BR2_PACKAGE_TI_K3 - depends on BR2_PACKAGE_TI_K3_SOC_AM62AX || BR2_PACKAGE_TI_K3_SOC_AM62X - help - Some TI K3 devices need the Device Manager (DM) firmware to - be available for the U-Boot build. - -if BR2_TARGET_UBOOT_NEEDS_TI_K3_DM - -config BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME - string - default "am62axx" if BR2_PACKAGE_TI_K3_SOC_AM62AX - default "am62xx" if BR2_PACKAGE_TI_K3_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 be366e7c31..26deda8402 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -186,12 +186,6 @@ UBOOT_DEPENDENCIES += optee-os UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf endif -ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) -UBOOT_DEPENDENCIES += ti-k3-boot-firmware -UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f -endif - ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPENSBI),y) UBOOT_DEPENDENCIES += opensbi UBOOT_MAKE_OPTS += OPENSBI=$(BINARIES_DIR)/fw_dynamic.bin From patchwork Wed Apr 3 19:53:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919416 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 4V8wT12lGbz1yYP for ; Thu, 4 Apr 2024 06:55:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id C88B7418C4; Wed, 3 Apr 2024 19:54:59 +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 F29jf2UwDV_Y; Wed, 3 Apr 2024 19:54:58 +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 BAAF141937 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id BAAF141937; Wed, 3 Apr 2024 19:54:57 +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 0632B1BF4D5 for ; Wed, 3 Apr 2024 19:54:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id D6D8C418C3 for ; Wed, 3 Apr 2024 19:54:18 +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 j4CrHoHxznNS for ; Wed, 3 Apr 2024 19:54:17 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::42e; helo=mail-wr1-x42e.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 4B57A417FF DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4B57A417FF Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by smtp4.osuosl.org (Postfix) with ESMTPS id 4B57A417FF for ; Wed, 3 Apr 2024 19:54:17 +0000 (UTC) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3439ce73766so85438f8f.2 for ; Wed, 03 Apr 2024 12:54:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174055; x=1712778855; 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=aK0JSiQtM7aP95Or6BoPBmbNlSMeUCsz21J0sTew2EE=; b=gbN7hQuuWvvlgXIN309q44jCoR2o5HbsxFZJuPKrWDFNdjuLIpegiIeRL6llpRwgSe qYUs7MqqUsuy2SpBhRvJNCvQNbCANyxt1ZQDgF8j7gi7wTXDjtE/k5hLybXAeq8rzC/a EeuJfl7v4qbsN7PgguQANgsVmcY0SN8lm4BwOwejUY/ttJO+NejUPPoqPZkakQ4kOkjt ZcSgywh1v/UJ9U39s+IbpLoT3Jjm1yVqP99ciA0Vcx4yNROtgJwVeJdmHdroGx/XNnb4 VRWYo8EEeb1G5l/s+iJk+oYQm4boOJVuh+m3xE7LjFOCuBLre+WL9z+791UKd30YfiO+ grNQ== X-Gm-Message-State: AOJu0Yyp+HklZ2KPC1t8GQozJtzzrsvzjJ40blG3xdTBssXLr6XZOgcV boG/JNGp44m9nw4hObS9pgRS/APD5jnPMXgDWG5TyXwDPZeDd5QufHXVWdgo8WaBImgTzJUk3GS o X-Google-Smtp-Source: AGHT+IGLzDacjUAqnDK4v1RYjKmYwxC/FkT13t6W7I80lI9k8GZnqw5f14csjeGR+fL7+CQTS0Avrw== X-Received: by 2002:adf:f605:0:b0:33e:c3dd:3fc5 with SMTP id t5-20020adff605000000b0033ec3dd3fc5mr313187wrp.42.1712174055286; Wed, 03 Apr 2024 12:54:15 -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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:15 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:49 +0200 Message-ID: <20240403195403.1359007-16-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174055; x=1712778855; 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=aK0JSiQtM7aP95Or6BoPBmbNlSMeUCsz21J0sTew2EE=; b=uU9mbj65F7JZjiTwn2+1/2421SfQ3j0QA5cBk2dTAfblsWvNqvZpW3iwE+mCwDTXVk 2euz7HO20NwKmEe1Aw/HsotuxSE8Dx8biO5390iuSN6gwEW/3X3ljF/CLVQ1C9GST8iA GMuC0WWAK/MOD0Koash/FHdEswJnPJRmic6HJhec7HlarJbwc3SfqEcoGWyq63CNBs0u GSjpEJsORtwISojR6d6Rf2RvBwKVe1/n8SMIWOqP2eEH+N/Sw1E4sbGF2Ny8djcKO42q PVQy6L7fRYaUgM0LYwcsifKwWy9jtH2zX+wvo43gsLnF2DSl1dZSu/FWLp1wRsefXXkz Nz0w== 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=uU9mbj65 Subject: [Buildroot] [PATCH v11 15/17] 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 | 37 ---------------- 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(+), 97 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 7117f8f528..b750bc457d 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 removed." select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 6b38db0857..5f0e20f1fa 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 @@ -3225,7 +3224,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 5cdf52d452..0000000000 --- a/boot/ti-k3-image-gen/Config.in +++ /dev/null @@ -1,37 +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 - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC - string - default "am62ax" if BR2_PACKAGE_TI_K3_SOC_AM62AX - default "am62x" if BR2_PACKAGE_TI_K3_SOC_AM62X - default "am64x" if BR2_PACKAGE_TI_K3_SOC_AM64X - default "am65x" if BR2_PACKAGE_TI_K3_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE - string - default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62AX - default "ti-fs" if BR2_PACKAGE_TI_K3_SOC_AM62X - default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM64X - default "ti-sci" if BR2_PACKAGE_TI_K3_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE - string - default "gp" if BR2_PACKAGE_TI_K3_SECTYPE_GP - default "hs-fs" if BR2_PACKAGE_TI_K3_SECTYPE_HS_FS - default "hs" if BR2_PACKAGE_TI_K3_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 Wed Apr 3 19:53:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919417 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 4V8wT60l3fz1yYf for ; Thu, 4 Apr 2024 06:55:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 7167B41936; Wed, 3 Apr 2024 19:55:04 +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 zxqq1vvVaZtw; Wed, 3 Apr 2024 19:55:02 +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 078F1418E1 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 078F1418E1; Wed, 3 Apr 2024 19:55:00 +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 2A3F81BF982 for ; Wed, 3 Apr 2024 19:54:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 25368817B5 for ; Wed, 3 Apr 2024 19:54:19 +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 gkEUhF88U0EJ for ; Wed, 3 Apr 2024 19:54:18 +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 smtp1.osuosl.org D6DC181FF5 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org D6DC181FF5 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by smtp1.osuosl.org (Postfix) with ESMTPS id D6DC181FF5 for ; Wed, 3 Apr 2024 19:54:17 +0000 (UTC) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-41551639550so1522145e9.2 for ; Wed, 03 Apr 2024 12:54:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174056; x=1712778856; 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=NHTr0cyJR6+sqdoS0fNwi5/C4OqhrlHztl/fhSEv5zo=; b=HJah+dkU/X2JHlfIvi1Wqi7zgQ82dw5/NNwslqeRpwal9bP/O1xutVpZpgzfVIiRN0 upzjswnc6ObDQw7SLCGKeXCTPn2SLER79DAL4bh0WYlw98IzXEBnFCczVaom25bM6PG/ 1pwSIuBf/9wqR5dpW7OEU49CG+FV9xd7FUU7AvXcnf+CzvYy95ssag9fGPZx4w51d0v5 E0j64gJUqrBGHa4HEtqWudvIZ4MFHbn2qtMxkrIWprme32obWGUSLQXI3vqEsUupJZyZ ZYtIyz/y4BoDxaQxXYFVa4zzzGYYaC0k4pVAxwPuF/X9I+d0FE4CpxWLVNbEVK57/QKR zntg== X-Gm-Message-State: AOJu0YwTVQfcICbKpgp6suw3MnEFQ5q5PIIptwx+I+yg9cT+vQUD3pGT VjafUysBtdwuQIMhXoFWMGPgRUzOtLeFGCf8uhUNXEsQQdoEbEb1mh1gadTa1uq3NYGb9sg/gms f X-Google-Smtp-Source: AGHT+IHYwl2bi72gMTS4/mo7v1YebKnyb8LB9S3qqk+fq/PC8pqKN7rj0w+RyHXRi5sEEk45om/K6g== X-Received: by 2002:a05:600c:55c9:b0:414:cc98:6093 with SMTP id jq9-20020a05600c55c900b00414cc986093mr547550wmb.10.1712174055881; Wed, 03 Apr 2024 12:54:15 -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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:15 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:50 +0200 Message-ID: <20240403195403.1359007-17-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174056; x=1712778856; 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=NHTr0cyJR6+sqdoS0fNwi5/C4OqhrlHztl/fhSEv5zo=; b=iIyW0JCHPyRb2UrrBZ3sbPJ0nlJt/kyG34TJmLs7Dtns3JqceFcHOw44iiVWA1CFCQ Ifjz0k+bKgPh/F96J7oEIzGU0T7GmBNnV2Dxi8A3dBzE1J2NvUbae+V95AR6BWE29EYe 08IQoqwaTGk1WTOqTRpcQ4CEJpzpoYf8Q8ZjvO54c9wphJ4ur6jkK3BNyOBLAOkJqEmV eEwhXRd/Zt4z9M0IzB6iNB9dr8N1dYHHbOD3WW0OWMuu8iCTVTPmY7jxChvFynVhtJuz W2GNpGRJ2v9S5Pu5/kHSH3OqvCmJ/irO897+jDRhckYnGaP0zjU522irTUjyJKcCxdWK /LMA== 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=iIyW0JCH Subject: [Buildroot] [PATCH v11 16/17] 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 | 9 +------ boot/ti-k3-r5-loader/ti-k3-r5-loader.mk | 33 ++++++++++--------------- configs/ti_am62x_sk_defconfig | 1 - configs/ti_am64x_sk_defconfig | 1 - 4 files changed, 14 insertions(+), 30 deletions(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index a580b6ca61..faf7129248 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -1,6 +1,7 @@ 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 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,14 +94,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 - 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 default "tiboot3-am62ax-gp-evm.bin" if BR2_PACKAGE_TI_K3_SOC_AM62AX && BR2_PACKAGE_TI_K3_SECTYPE_GP 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 ef7f8df6f7..b3c48109c8 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,31 +67,15 @@ 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)" + HOSTLDFLAGS="$(HOST_LDFLAGS)" \ + BINMAN_INDIRS=$(BINARIES_DIR) -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) -define TI_K3_R5_LOADER_INSTALL_TIBOOT3_BIN - cp $(@D)/$(TI_K3_R5_LOADER_TIBOOT3_BIN) $(BINARIES_DIR)/tiboot3.bin -endef # sysfw*.itb are only generated for Split binary based Boot Flow (eg: am65, j721e) ifneq ($(BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB),) define TI_K3_R5_LOADER_INSTALL_SWSFW_ITB cp $(@D)/$(BR2_TARGET_TI_K3_R5_LOADER_SWSFW_ITB) $(BINARIES_DIR)/sysfw.itb endef endif -endif define TI_K3_R5_LOADER_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(TI_K3_R5_LOADER_MAKE) -C $(@D) $(TI_K3_R5_LOADER_MAKE_OPTS) @@ -92,7 +85,7 @@ TI_K3_R5_LOADER_TIBOOT3_BIN = $(call qstrip,$(BR2_TARGET_TI_K3_R5_LOADER_TIBOOT3 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) + cp $(@D)/$(TI_K3_R5_LOADER_TIBOOT3_BIN) $(BINARIES_DIR)/tiboot3.bin $(TI_K3_R5_LOADER_INSTALL_SWSFW_ITB) endef diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index a1110597b3..a31a712f32 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -32,7 +32,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_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 8a3de181d4..0f13de302e 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -32,7 +32,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_USE_BINMAN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y From patchwork Wed Apr 3 19:53:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 1919418 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 4V8wT83dSdz1yYf for ; Thu, 4 Apr 2024 06:55:08 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id DD39A4194F; Wed, 3 Apr 2024 19:55:06 +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 4hQMXyHyRAJ7; Wed, 3 Apr 2024 19:55:05 +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 5BEB4418F0 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 5BEB4418F0; Wed, 3 Apr 2024 19:55:05 +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 1581A1BF4D5 for ; Wed, 3 Apr 2024 19:54:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E8E39418BA for ; Wed, 3 Apr 2024 19:54: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 flbKUKUTtTAo for ; Wed, 3 Apr 2024 19:54:19 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::230; helo=mail-lj1-x230.google.com; envelope-from=romain.naour@smile.fr; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org E0FFE417FF DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org E0FFE417FF Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by smtp4.osuosl.org (Postfix) with ESMTPS id E0FFE417FF for ; Wed, 3 Apr 2024 19:54:18 +0000 (UTC) Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2d718ee7344so2587221fa.2 for ; Wed, 03 Apr 2024 12:54:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712174057; x=1712778857; 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=egKshs99vfZZv+3k7rCSHxAcdYUCTFc7eB2x+SqhUJU=; b=whMiAVKls91Fkd2NEf7oY5/xw1h4LCpHAwk8HTCnT55CdMef4B8yzywdmzEXxhb5B7 qAp2X/8neO1G+MG6b/SzHDihpti3CGjU26MIekZcTxJzGt0thTl4Ixtq64beDyo7oNUp cZwqnr5DvhMaacJQga0KrqSwkzVTlC2ZnJlSfJ8fR4ZtpIOnfVJucs7+r3PJNDfTtRpg YBEcnmU7qVU0ji/goQlJDNkVh0O9+iNykujATY0jfzouY9ITVu28PkKOeevIlB7E/3hp 6xhWKv0wLEFk9EmZNbitFyC//9h2EH0eKY4p+V5LrF6NQB3dSC88dh8yeSDfW98wuah7 YcKA== X-Gm-Message-State: AOJu0YxxDWTT1/Mt3sYuGF8flmV942y/nBDDGBA318zlWifwgj6ofEGG 56eR2eNKzsCWyvxMgpIB5Yba9X9NKs405YlazsIxd6bEysmLa4mtM+aagdLvgkea4o+XcAAPDEK / X-Google-Smtp-Source: AGHT+IHAImWQv5isWHEmd8UthNRROAPPGMOFNCl43liHn2eOOBcVFUFsQzNaUt2rDQzpFeD0oanGAw== X-Received: by 2002:a05:651c:1050:b0:2d7:a1c8:71bd with SMTP id x16-20020a05651c105000b002d7a1c871bdmr552362ljm.0.1712174056678; Wed, 03 Apr 2024 12:54: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 cc13-20020a5d5c0d000000b00341b8edbe8csm15595571wrb.87.2024.04.03.12.54.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 12:54:16 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Wed, 3 Apr 2024 21:53:51 +0200 Message-ID: <20240403195403.1359007-18-romain.naour@smile.fr> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240403195403.1359007-1-romain.naour@smile.fr> References: <20240403195403.1359007-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=1712174057; x=1712778857; 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=egKshs99vfZZv+3k7rCSHxAcdYUCTFc7eB2x+SqhUJU=; b=hFj5SkTi1o1dzUMT2QCzgO06/2ttJPHrUTW5k8JSs3WIDEVlNVOGmupyMG4VvukaqL 1bkJ8mLV0WauVnfaGavS/UaFmGIhlMQtfurWrs6CHCHpGmNyq+wGUF6CMdEdc3RmPr5+ OP/FfW+4rcfwfMvqgTZ/NfiRpyeCaCFje9WCxGoTjoFPB/uR1JwXiA2nn+HOGmeqtwRP o4dzk8VyBOfE7W2qDg50UN1WPL4QfyABGl5QNWhcr6jMnfs5OWWt8XhE2kDvC/deATeX jnDVhXQNP1blH7VfGvpkASPKYIg0KHkp6N+WBkW3KfyXdW6ZqniorDTLDuwlH3TveM3P l1bg== 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=hFj5SkTi Subject: [Buildroot] [PATCH v11 17/17] package/ti-k3: switch AM62x/AM62Ax/AM64x 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 we have to switch back to BR2_PACKAGE_TI_K3_SECTYPE_GP. [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 + package/ti-k3/Config.in | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index a31a712f32..b062947527 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -16,6 +16,7 @@ BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y BR2_PACKAGE_TI_K3=y BR2_PACKAGE_TI_K3_SOC_AM62X=y +BR2_PACKAGE_TI_K3_SECTYPE_GP=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="256M" diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 0f13de302e..1024f3f7d7 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -16,6 +16,7 @@ BR2_PACKAGE_LINUX_FIRMWARE=y BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX=y BR2_PACKAGE_TI_K3=y BR2_PACKAGE_TI_K3_SOC_AM64X=y +BR2_PACKAGE_TI_K3_SECTYPE_GP=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="120M" diff --git a/package/ti-k3/Config.in b/package/ti-k3/Config.in index 1c48f1cb55..44f773eb8d 100644 --- a/package/ti-k3/Config.in +++ b/package/ti-k3/Config.in @@ -25,6 +25,10 @@ endchoice choice prompt "Security type" + default BR2_PACKAGE_TI_K3_SECTYPE_HS_FS if BR2_PACKAGE_TI_K3_SOC_AM62AX + default BR2_PACKAGE_TI_K3_SECTYPE_HS_FS if BR2_PACKAGE_TI_K3_SOC_AM62X + default BR2_PACKAGE_TI_K3_SECTYPE_HS_FS if BR2_PACKAGE_TI_K3_SOC_AM64X + default BR2_PACKAGE_TI_K3_SECTYPE_GP help The target SoC security type option.