From patchwork Mon Mar 4 15:32:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3058 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 124874275C for ; Mon, 4 Mar 2024 16:34:38 +0100 (CET) Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-51325ba078dsf3547389e87.3 for ; Mon, 04 Mar 2024 07:34:38 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709566477; cv=pass; d=google.com; s=arc-20160816; b=kgDG87eYmfyf9c2wCYXdpnV4ppBMGTcBoUYgL54iVIFgCrscGgRxnZKjK2I5UqKZsl 5lZ3buf5OpESpXEFFQw4ikMNNT4pSCd16b2ErD0UM/vWNGK3+DwPmWrWSTsWvuPBuiRv Qx1Vl3cuKvBzFqrqKMtKpeVCnOdsnaARfAO7byuOzp5FEv1t5um/dcMo+ivLTCQyZLd1 II3uHNqyTzg5yAftrNWSvabihtQcRHY8g8QLLESbUZOiyz88JB9z+emdW65OZy12bKnG KfAMNmQcIjY3ud2DRBVkJxURqdCUPeQ9553a8AzokI1umBRTmQEhGy4a5T813g0kRJlV EPXg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=vW0DlkxJm97SkoJMFten3OuIgPMME+8KLRaKtQ1bnNg=; fh=mGdKDD+lGhmen3Ea+pW0fESPgH6ybaWDifEkYn/J/gc=; b=N/cvl9RtBJYgfi71tY1TQPFnHdBg+V7MchBXEDTeVtwUnYjFyjzUmSCrWtj4Z0udln IDv30KOVhdZin+YlzhRfyibhL+I9IIbyX98cIBX2OxIuntKj4B5yFMVz4iz3mn3KLtjX EEU5cMnFG3hI7j4jCLDDS9QAZ6yQFgXi3ue41OtEPMV45lwgh0B1eZSDkhAmZBBdW146 TWFjMskWXC36wOGnL1xEnnPfrAd4MidJEv0gL+ap3OaF1EL8kPFfjtHG1wdz3z4LZEWG JEkMaT/o3VK2YklLgZYvU7z6jC7U3pFqqz/60bzGzMET5xK+oILshKMSOhs+trrIlnj2 44WQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=SojTu9cz; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1709566477; x=1710171277; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=vW0DlkxJm97SkoJMFten3OuIgPMME+8KLRaKtQ1bnNg=; b=L8bQwYOyLJ75Sk7vOb0CS5kmrTuSI59Ll/sEp/gDqPYNNhDAuYCxksdAqIyTKkJXS2 hSVzKgdSwl1zeSyMECi3zixLfMOi/6ONWRzghvZ5FicBm5HzBkB+4/HsBjQ8hIKHe2Ls j9z//tgbMTQR2JmREc2vd9MB84fWkImS3gv6k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709566477; x=1710171277; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vW0DlkxJm97SkoJMFten3OuIgPMME+8KLRaKtQ1bnNg=; b=gVjrzuHti7qChiuuIcbElo3/P41xI6ZmQJZIU21vKv09kQsRvYwu9kLdfP+KFYQtaA aME7Xh4xNsgG//s+viUqSV/f34I3/+nxih4TlZkCazMooUlc2ofFrj/jOTKQ0hjPLh1d imLkE8kXOLwOMf+Cra3cLNE+aoi0pp6h8LmyoE2aEF1FvlSI1aZoKwcxyVfsnEOXsv6l 9D1judH08SHtdv2aqpoY5Vs+eh79hZ0/L8juURREH5eLnXOZmIn5C2R4MmOyGwJ6RVph K8X9WI9rJLmdBH7JEjPeqWbTCwjkOjYdb/a1dtf8JJTxqB6xKHFGQaIG4FFwnunXJrff 9zPA== X-Forwarded-Encrypted: i=2; AJvYcCUKtnGDUoPBDsZ2H+aeV3NZlajD2sKEpg3h2OqMOBdZ0PkLCL7j1EzinlVpS2t/Z/7EhKPYQ90ULKF7tuJ9cGMEcKBtQJjVxwG8moKeAdE6xAsW3joeg7pEW+frOw== X-Gm-Message-State: AOJu0YyAlWC/7q0nYqaLMhuLNEEuTTuwYPM2cnEPt16yvdRYWq7z5neJ ewGMqGgFgRBeS9MwZ22/nJnCkQZHumVGrTNO+kBE9HkAJudgFLGdw27Gd10WA+Z4tw== X-Google-Smtp-Source: AGHT+IFZZcLyzlYj09UAZq8KjRLVAw1752lleo+m/cPUV17CWJi0KykeZirhOWKuZl+rkJP9bA9Fkw== X-Received: by 2002:a05:6512:1092:b0:513:4a2d:66dc with SMTP id j18-20020a056512109200b005134a2d66dcmr1708526lfg.43.1709566477188; Mon, 04 Mar 2024 07:34:37 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6512:3d26:b0:512:fd8b:14de with SMTP id d38-20020a0565123d2600b00512fd8b14dels291314lfv.0.-pod-prod-07-eu; Mon, 04 Mar 2024 07:34:35 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXPikI5lxF+UA6eQ6q3KVCmIggezD22riAIA7qF9U96x+hnzG15reRVgEHw9pg8phgo6JAE8merWiW1EO6CtHhplsnLD8HbbJ+tuJ5i3d0NQU6e X-Received: by 2002:a05:6512:31d6:b0:513:37a1:ae60 with SMTP id j22-20020a05651231d600b0051337a1ae60mr5903563lfe.34.1709566475461; Mon, 04 Mar 2024 07:34:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709566475; cv=none; d=google.com; s=arc-20160816; b=Z5pqHdIyCjINM29Kj6NHWRZETR/8GUEuBXjWyuSih6Vira1z7kciZ1gfHuLqpW034o mEal0mk65jCA37ACpNyTs0g5vC7zvKeFV7Mrf6QmciW6+00AMsAGPV0h9VpTb8j36eVK 867AIPNsRi+EBPUKpvhOGF5p0IQGADOIm84zvyVC8fhReaNCZsbxKGkqSS4QIv9kIaqM J4QpVDS01nn/YATHBQ7FVtj466ALn57Ch2RgFbifFv0SOOLwqjsBYMlYCh22hhoUBDYl dEUj4Fv0DpYbxfXFbUd7/X1pNjoo5whV8UMPSZjwovRdHdPNCWki0VzcRQeEhBy4tAgF zD2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=nWIWT5PixnLixKjh7FANy8dX0dXM/eplXXql3C6NhaY=; fh=xH4IoVq07YLRi+8Z/GBk1HNUSofwdllsfJtd7jhIeK8=; b=ksIrEiyfzRBcsq9/1CDuTtS2Y2GXA2JAonsrClX/c6qGXIpldmOs8lgYFCKLBNPzBN Xrk6aP4snl9E12y+Tf8gS8ZpYwJj6xpg6vsQRh6AKo4GO6MtLbH98bpDzU+1haX1xhqL OrxbtcqiJBYhixD7cg0vwXj7RySuiBCAHfsDfYXQYx4g5c9EDfnrt7YieNqoc9OzHKnA a8GG52VzPEbn2l19Vc42w/2MZ2/qQKktw6jEvuY8vZ4LZtQ5KAmtlqv31CXi/AJWUNZK ViiMqGASCh04aDejlPzGvPkdu6vw7kOaofmZg5tjYLLFk0+2c0yy57ZqZOppaVTE5hw6 +HJg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=SojTu9cz; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id j15-20020a056512028f00b00512eba38252sor2220591lfp.22.2024.03.04.07.34.35 for (Google Transport Security); Mon, 04 Mar 2024 07:34:35 -0800 (PST) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCVfWDW7XnYndDZA6AB0Nkedl9/7ZRPBNmPFekYG1o+Hg+bTgwHi5Q5TC9YSvAHCKJs7vvi+LILo2pur8S2HHnVur3mPgw1kxxEQtIpv9rvz3ogA X-Received: by 2002:ac2:58d5:0:b0:513:5d6:66dc with SMTP id u21-20020ac258d5000000b0051305d666dcmr4573123lfo.38.1709566475093; Mon, 04 Mar 2024 07:34:35 -0800 (PST) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2001:b07:6474:ebbf:72fe:558f:d55e:d423]) by smtp.gmail.com with ESMTPSA id sa20-20020a1709076d1400b00a4432543b21sm4936082ejc.198.2024.03.04.07.34.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:34:34 -0800 (PST) From: Dario Binacchi To: buildroot@buildroot.org Cc: Romain Naour , Alexander Sverdlin , Andreas Dannenberg , Yegor Yefremov , Xuanhao Shi , Anand Gadiyar , James Hilliard , Thomas Petazzoni , Dario Binacchi , michael@amarulasolutions.com, Asaf Kahlon , francois.perrad@gadz.org, linux-amarula@amarulasolutions.com, bryce@redpinelabs.com Subject: [PATCH v9 22/22] boot/ti-k3-image-gen: remove package Date: Mon, 4 Mar 2024 16:32:53 +0100 Message-ID: <20240304153253.732708-23-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240304153253.732708-1-dario.binacchi@amarulasolutions.com> References: <20240304153253.732708-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=SojTu9cz; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Romain Naour 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 Tested-by: Michael Trimarchi --- Changes in v9: - Fixed conflicts on rebasing on master (Config.in.legacy). Added in v8 Config.in.legacy | 7 +++ DEVELOPERS | 2 - boot/Config.in | 1 - boot/ti-k3-image-gen/Config.in | 24 ---------- 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(+), 84 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 1b15d25d6bf1..304f369da7b2 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.02" +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 >= 2024.01). + config BR2_PACKAGE_MYSQL bool "mysql virtual package removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 0bfe91f064a9..fb9555915ec1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -151,7 +151,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 @@ -3219,7 +3218,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 e5fdf7ad439e..87e1b7c00e35 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 a57319f4be6d..000000000000 --- a/boot/ti-k3-image-gen/Config.in +++ /dev/null @@ -1,24 +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_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 - -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 c968c5648f71..000000000000 --- 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 aca29bcf1bd4..000000000000 --- 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_PACKAGE_TI_K3_SOC)) -TI_K3_IMAGE_GEN_SECTYPE = $(call qstrip,$(BR2_PACKAGE_TI_K3_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))