From patchwork Fri Mar 1 13:36:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3035 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 799BF3F057 for ; Fri, 1 Mar 2024 14:36:53 +0100 (CET) Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-566aa1c194bsf1181372a12.2 for ; Fri, 01 Mar 2024 05:36:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709300213; cv=pass; d=google.com; s=arc-20160816; b=wvEmg3pXD8V3RHesyIvV4eLKRqg2hWwNjCCQEPa3RlHw9jdpYnUPZ914l+w712X1uf Cb3g9xi/8AnTMijg4nzt45tWG8vwnjPP28s7esK0HLZEOYgIlWJDza3+DHiJZj638gqa WD1uXTRD6VocolJd+phZqLmv9HyoIg47EaHbHhGGkgPYnHpSkua4CyfpPHhgrrxbram5 f7S3106vCiWBBzoxphItRS3APWRlxK1dIPk+8YUPrTG8wvyeP7l1mSVolw0oGarniVz6 F1kY+ZRO85VEFAh8ETUOz+WyoNI9lBr1NcogvpifP3eW1cb/WuJx0ZWj092tmlCvm/kT Cqag== 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=SD2TplRZeCV+yORCenhiCkJ4ASEpELPx9PL57mNj4gg=; fh=GO3Ab8lIJbrMQjYzMPgGkK4ns2Z2hs3+LNwllw82QKw=; b=gaswvMAzZAJ9xFf5sZ5NfEXQzxw5OiuH8JH9rAJ6VqkrMrvpUoA/k1ebXKrcYqx8MW 5fhe5uF1qQODoeNtuR66HU+Evdd3viILfFFB52qcTnxaBppIUBQ5Jjvm0/ZYIJC3CV9M C3d3rGG5OO6avJerMDyqzLaOeTNOFc/S3bUjQtHcI3IcCuY3P/6mHeO7QMHEe/uxRgVu LYtZJmwkbc+ukpSwkwrcaMHevWSVdLkDu1NZMEbKVHmzI2ImU04PjmzNvX7ZrcYcqpTL L1N9J9vWQK8HSItEUgNiN/So4aVfwfIAfxbtc0alzK0Mxs+T8HtMhMe4cPLgsrwAKvwe 3zkw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LJ8zMHPJ; 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=1709300213; x=1709905013; 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=SD2TplRZeCV+yORCenhiCkJ4ASEpELPx9PL57mNj4gg=; b=W4yp6frBwE3uFwIhlR1O3x+qWZZu2SRM1yIFW0mGgcVfT+VQh4BeYGuv6orNp9jcA0 qqOwwDLewB1qGQJYmExTMV2LrBnKAMEXNZEIRojbf/RNf6RNv6islMXw7kC/IdWVke3m QpZWJPT/KiDr7C+Zr8d7nNeeVPEl+DP7oJXoQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709300213; x=1709905013; 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=SD2TplRZeCV+yORCenhiCkJ4ASEpELPx9PL57mNj4gg=; b=fa/oVzzEZnDLpvmMT6aMTCtCUEB9MFgU5kWUkXAmzMR7SwYLfJLwsNeqi16MmO9uz6 Ng9+vNc+D7PVoklxQcX4vhuLRDqHIpS13yIsATfeeatoo9XYyZ8V08o0uROYMytUOhdH 6ZyDTC2LXK29ZZy01yhp67QsnNaIlesIOlU5SZ5J5qAxO7EzWW7VZxNrhwfebyyXzdgQ BgVGR59gqlQ0rnrmj2gAvdi7K/hznA5S1GNWJn5TsqE8k2QLvS4eCMXisFn1vEym1KqA /kGgI/HpdOxCxJsYqYxdmHjf4D5EZo8FeUum7RDudQAmrX5DSWgG6mStYzaxjtqIN47s aD3A== X-Forwarded-Encrypted: i=2; AJvYcCUKKmlohUulzdcMPuxm+608BoBtk7ONwoEW2ct4CACgtzqq3QarVyOoVT/b9E82jNAiLGpfxE+JdZqKeXXFOt2/3rMZ1FZA8J9NgMLrvpdg/oka//51JAiYSjLuOQ== X-Gm-Message-State: AOJu0Yy9THnH15GvAf+AFDfdJvfOkzMF4U07A3QKzkgxq93yAj2Y3kKl BBYiBYtd823/7KTzKYU8Pp7bVbFoJz3sJwXdD818CWlXORnPM+5J3oBlF2oV0WMcqw== X-Google-Smtp-Source: AGHT+IEqTY6lIjsCpWQiNQ/u5Yk6PsSfEtp8ZjvvwxFnjhhRn844jyRqSG2I/gzxfW0XbLjWIBApvA== X-Received: by 2002:a05:6402:5144:b0:566:b2e1:58f with SMTP id n4-20020a056402514400b00566b2e1058fmr1130841edd.41.1709300213215; Fri, 01 Mar 2024 05:36:53 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:4588:b0:566:3da3:bf05 with SMTP id ig8-20020a056402458800b005663da3bf05ls324567edb.0.-pod-prod-01-eu; Fri, 01 Mar 2024 05:36:52 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUl0vhTds3Xx7K6rddQwbRhShUHVNUCoPG75ppSfO115afHnzjvsJxnhBFNr26Ghsz8XO1FR8QjxPRbmAwDf0BrJjzS1l7qrV9jIZo2a4K3VCwv X-Received: by 2002:a17:906:7f95:b0:a44:2b:cdd0 with SMTP id f21-20020a1709067f9500b00a44002bcdd0mr1456269ejr.20.1709300211735; Fri, 01 Mar 2024 05:36:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709300211; cv=none; d=google.com; s=arc-20160816; b=hTvJfHKV+xi4C4QR4N84IWIbGWw+iowg6Wnk8Wx9gwcYR8i92hQpU2ZsLjmEaFKuBk ua9w0R3WUjLnTx+n3D/9K9y+ceFzEjBQpf0jkHB6eHiOFIbQbchrmznhMPCt0/jJ3qw2 7GI/UKu926CQdw+B520kZFYWgOsiSj/Dc47pKZjjg6lxAn1Ae9NfnRo1i5l4uRyGP1T7 CFACm16E3jq8TZe6zsm7fouMhX6c+B7IH1UkM3MWMbMdQR7a1Va3se7WpIaNK9n871rd TcH2Aik5n8xfjBUCN7esxTkPNW1L5ThV8JrbKfmcIo4ZdYmkKNZ4KY0u2XtKnUnP26fs RG2g== 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=iJ71s/QGpP5X5lkEqyzORGQ2zPtVEnK+RIn+rQevEaE=; fh=igmyEQiEac5+M3trhK7lYFloqIh7t7BJahg36akjJA4=; b=FCScHHdyHKJQbavhryYi/qLPC1GW7GFtN9Aq/6jj54HRTA9iGymUAKcIZ/hVM3J/8m z53UrZVNyqZyWD6Oeo55CRUs6P6Q65uUW35+1nOEzth75iG2UNI07G/isSoXzDqf+tFU Qiouu3TvILYbnyaFuc2ihdKhis8jwcWfGriWsLfUOAfZrWA9wlmOXorjoKcjQ/LxjC4f JT7u3lpj+ZTayoLGyEWpZSZNWnZzKvR1p1nLdlW449eNN70KCYPGWT4u/ozEJkTF4oO5 g4X5Ab4s8Theolu0JSfS7vzScld1uQpN4mr3Ul8dtv0bqCWr7XycIJ/L0pxDCCk+vZVQ uZyg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LJ8zMHPJ; 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 mc12-20020a170906eb4c00b00a3ec4844462sor1637886ejb.7.2024.03.01.05.36.51 for (Google Transport Security); Fri, 01 Mar 2024 05:36:51 -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; AJvYcCU+TJ17wEYWQRE1ph3dlFWzgd+DgdOqYJQo49qXWN3R1C1vooxofl+NIACCSKQy8omtHwzlafPDvorX8HC8g551RoHLmvLCiKXRJszZuZ+Ayv+3 X-Received: by 2002:a50:cac7:0:b0:564:ded0:6072 with SMTP id f7-20020a50cac7000000b00564ded06072mr1306928edi.1.1709300211439; Fri, 01 Mar 2024 05:36:51 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6474:ebbf:5260:58bc:42cc:9d46]) by smtp.gmail.com with ESMTPSA id q28-20020a056402033c00b005659ea1caf0sm1566608edw.6.2024.03.01.05.36.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 05:36:51 -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 v8 23/23] boot/ti-k3-image-gen: remove package Date: Fri, 1 Mar 2024 14:36:20 +0100 Message-ID: <20240301133620.3547430-24-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240301133620.3547430-1-dario.binacchi@amarulasolutions.com> References: <20240301133620.3547430-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=LJ8zMHPJ; 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 --- Added in v8 Signed-off-by: Dario Binacchi --- 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 a869279af781..2b59a65f1c8f 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_TINYMEMBENCH bool "tinymembench 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))