From patchwork Mon Mar 4 15:32:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 1907684 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::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (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 4TpN6v6c7bz23fC for ; Tue, 5 Mar 2024 02:35:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 547C041495; Mon, 4 Mar 2024 15:35:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wL3rMJj8VFYN; Mon, 4 Mar 2024 15:34:59 +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 smtp2.osuosl.org DC4C64159A Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id DC4C64159A; Mon, 4 Mar 2024 15:34:58 +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 393061BF94D for ; Mon, 4 Mar 2024 15:34:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id CDBEF40228 for ; Mon, 4 Mar 2024 15:34:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pu1FtXA70fro for ; Mon, 4 Mar 2024 15:34:26 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::12a; helo=mail-lf1-x12a.google.com; envelope-from=dario.binacchi@amarulasolutions.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 7A9DD401FB DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 7A9DD401FB Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by smtp4.osuosl.org (Postfix) with ESMTPS id 7A9DD401FB for ; Mon, 4 Mar 2024 15:34:26 +0000 (UTC) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-512f3e75391so3601461e87.2 for ; Mon, 04 Mar 2024 07:34:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709566464; x=1710171264; 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=Jth12OcHAh3eC/N3LQLZ7Nt6/3ytuVU+6J+5+OYl3EU=; b=Tfx7cyVAmyFp3mUbzgil+RnUIJOQTTBf4GkyfFSMy/Ll4rT3yyrlKKPKbwFKpBy4ox Q9vsEkusr08sIudSMVe41L5e4qohDuzIxQQbCauIRTJ4vPLX9tJX6oWKEsfU1Z3dWK2V o4fFXCuIBbF245JSgoAgDGyIBn9RfwTLWrDwS14PgEUwtacK+TDgl46an7uYFq3KAuDp AGqp1Ra4jWIgS6ptsfKSAcNecjFUPTUEc+hmkaBJm4fTeau/MxAzwibkfbI3YyFnUSuU QKNoB6wTw7CPcw63JUpg4QDfg5dMocQGmo/erNbKptBIyOnAStoEf5FF0x+tHYj5xtE8 2MGQ== X-Gm-Message-State: AOJu0Yy4eqvChUqJo2vvduTQKIR1PSq1kZr3oHFYM1CXz4Khg7hjd8Sv oBvGVWIP2ZUOOdzDSSfL9Q6En1p/V8ISM1K9UaRjBjo5KuKhwh0M2xeNQaLlUVLWMRkrC31mv/1 iBTw= X-Google-Smtp-Source: AGHT+IH2Q3/qGAR3Q+MO/ogS9g4M64vwJYsQl9z+2CpTPBpM0220CZxNP+UmzBG9j8fbBASbqB0toQ== X-Received: by 2002:ac2:4648:0:b0:513:fe6:6003 with SMTP id s8-20020ac24648000000b005130fe66003mr5770335lfo.11.1709566463928; Mon, 04 Mar 2024 07:34:23 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 07:34:23 -0800 (PST) From: Dario Binacchi To: buildroot@buildroot.org Date: Mon, 4 Mar 2024 16:32:44 +0100 Message-ID: <20240304153253.732708-14-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-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1709566464; x=1710171264; 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=Jth12OcHAh3eC/N3LQLZ7Nt6/3ytuVU+6J+5+OYl3EU=; b=GBtvSSOocv4THqylNYixa+vSy8RJYQdD5zEoTVYrR5MMOJlzQavyaAz+gPDONOTznB W5ujISrfKO3jhecI5ovgKmJuhIeODDtOuY/mOPB5pUOQ4xG71jq6E8DZ+fJO9PgbjIvf 2iDmr2kyaDzz2Yu1n7UiUlax5xwyAHfyfxoNg= X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=GBtvSSOo Subject: [Buildroot] [PATCH v9 13/22] package/ti-k3: move TI_K3_{SECTYPE, SOC} 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: Dario Binacchi , michael@amarulasolutions.com, linux-amarula@amarulasolutions.com, Asaf Kahlon , Xuanhao Shi , James Hilliard , Thomas Petazzoni , Romain Naour , Andreas Dannenberg , Alexander Sverdlin , bryce@redpinelabs.com, Anand Gadiyar Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" 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. The patch makes an exception to the Buildroot rule "no subdirectory in package directory". Signed-off-by: Dario Binacchi --- 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 | 61 ++----------------------- boot/ti-k3-image-gen/ti-k3-image-gen.mk | 4 +- boot/uboot/Config.in | 12 +---- boot/uboot/uboot.mk | 2 +- configs/ti_am62x_sk_defconfig | 3 +- configs/ti_am64x_sk_defconfig | 3 +- package/Config.in | 1 + package/ti-k3/Config.in | 59 ++++++++++++++++++++++++ package/ti-k3/ti-k3.mk | 7 +++ 9 files changed, 79 insertions(+), 73 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 d76cef82e911..a57319f4be6d 100644 --- a/boot/ti-k3-image-gen/Config.in +++ b/boot/ti-k3-image-gen/Config.in @@ -13,65 +13,12 @@ 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" - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS - bool "hs" - -endchoice - -config BR2_TARGET_TI_K3_IMAGE_GEN_SOC - string - default "am62ax" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "am64x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "am65x" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X config BR2_TARGET_TI_K3_IMAGE_GEN_FW_TYPE string - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "ti-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X - default "ti-sci" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM65X - -config BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE - string - default "gp" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_GP - default "hs-fs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS_FS - default "hs" if BR2_TARGET_TI_K3_IMAGE_GEN_SECTYPE_HS + 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.mk b/boot/ti-k3-image-gen/ti-k3-image-gen.mk index 64be9a18f2c4..aca29bcf1bd4 100644 --- a/boot/ti-k3-image-gen/ti-k3-image-gen.mk +++ b/boot/ti-k3-image-gen/ti-k3-image-gen.mk @@ -26,8 +26,8 @@ TI_K3_IMAGE_GEN_DEPENDENCIES = \ $(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_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 diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index e6e7956adccb..821854d08acc 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -244,21 +244,11 @@ 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 + 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_TARGET_TI_K3_IMAGE_GEN_SOC_AM62AX - default "am62xx" if BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X - -endif - config BR2_TARGET_UBOOT_NEEDS_OPENSBI bool "U-Boot needs OpenSBI" depends on BR2_TARGET_OPENSBI diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 35a41d96a12d..7cd4636aa292 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -189,7 +189,7 @@ endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_TI_K3_DM),y) UBOOT_DEPENDENCIES += ti-k3-boot-firmware ifeq ($(BR2_TARGET_UBOOT_USE_BINMAN),) -UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_TARGET_UBOOT_TI_K3_DM_SOCNAME)) +UBOOT_TI_K3_DM_SOCNAME = $(call qstrip,$(BR2_PACKAGE_TI_K3_DM_SOCNAME)) UBOOT_MAKE_OPTS += DM=$(BINARIES_DIR)/ti-dm/$(UBOOT_TI_K3_DM_SOCNAME)/ipc_echo_testb_mcu1_0_release_strip.xer5f endif endif diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index a129e216d25b..2835404a57df 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -11,6 +11,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" @@ -23,7 +25,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 26195194c7d6..566cbbe4824f 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -11,6 +11,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" @@ -23,7 +25,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 33039331f7dc..b1638243790d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -629,6 +629,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 000000000000..2a51b1531487 --- /dev/null +++ b/package/ti-k3/Config.in @@ -0,0 +1,59 @@ +config BR2_PACKAGE_TI_K3 + bool "TI K3" + 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" + +config BR2_PACKAGE_TI_K3_SECTYPE_HS + bool "hs" + +endchoice + +config BR2_PACKAGE_TI_K3_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_PACKAGE_TI_K3_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 + +config BR2_PACKAGE_TI_K3_DM_SOCNAME + string + default "am62axx" if BR2_PACKAGE_TI_K3_SOC_AM62AX + default "am62xx" if BR2_PACKAGE_TI_K3_SOC_AM62X + +endif diff --git a/package/ti-k3/ti-k3.mk b/package/ti-k3/ti-k3.mk new file mode 100644 index 000000000000..a2da29f5148c --- /dev/null +++ b/package/ti-k3/ti-k3.mk @@ -0,0 +1,7 @@ +################################################################################ +# +# ti-k3 +# +################################################################################ + +include $(sort $(wildcard package/ti-k3/*/*.mk))