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: 3048 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lj1-f199.google.com (mail-lj1-f199.google.com [209.85.208.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id D52DC42755 for ; Mon, 4 Mar 2024 16:34:26 +0100 (CET) Received: by mail-lj1-f199.google.com with SMTP id 38308e7fff4ca-2d2ecf61dd7sf36659011fa.1 for ; Mon, 04 Mar 2024 07:34:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709566466; cv=pass; d=google.com; s=arc-20160816; b=K8aON4WDI0R0aOcp8Pomy3dJiznYNq8qLyMchDfhCFCCs5U7p3yFrwZFW56NF3jpV4 lftM4X4Nu7d6fNJeR6HUdnzR4PZpMT7NWUnMQ9S0OZlb7CoieuloJsadjE08BBmJ12W/ HhKvxSxy8jRz2tNBcRxYx7ZAnG3TOG6LpPOlJgQor1J91AJnlC+TUxSIaOwISNc0y0KU iVCZQFC1E4cEmFdLNUITyIJWem+ruUZzkUxGlFIX+VpR82DCIJ28k9Zzx/Jz0D+8+hit 6oBksoId1V2YoOf9tyKoJS7poVzy3GOFWcdCgSJ4etcNyB6oLyyoHrC2diSKaMdfKCs7 A09A== 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=vf4SzDKGKvTfXuvwtmibjtmsynDSif0+5l8tFRoSMMI=; fh=BToX1w5AlA+a2Id5NKF1du8iKenze2PtrO3aJS5GSQM=; b=t/kucEr9cR6WGUgfA6lpLFSNq6/aT11bE3P+/A2TRGXLIyrbdr8bqIlnvsWUsU8uoY OinJdB6/oHZuvEwPhzyQYAdqkWBD59KO6XKkyqaMkulPuBrHleIbo3A2Tt6/rpcY1tym OMrGCWwdhvb5ezY3l6LndHwrpwrdvoK9tCdrH+9eulYZXVsiU5k1ZRgVlHhh+eeYpskc pspTjIgU84GzzkZ17o3IVOFDYjuRAuxlM4NkoTY3FM5STgMMr++lQ6bBY2GoZQ5l28Ac TBdKWHH9yGe4KDRwUYNGOy26YfsmAItL1sgo9iQdCz8rLjWbKi5jIoppkmbCkIboRuWk 1yLQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=co5C3HUS; 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=1709566466; x=1710171266; 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=vf4SzDKGKvTfXuvwtmibjtmsynDSif0+5l8tFRoSMMI=; b=WRvUJr0yazHcEWrBKiH41VqFp0rpSvUejv7SOltj2awoFYqmn6UrpyInhvziU9pA/h +HkTvIvG143Hlg3Bn7zTH5Jibw0aQEcnZFo0MtOGFbiimGz6AgPlWqD3qCDV8ulmC8tx R0OYNxThRMVPtZsHrgD/1jCY5ebWqYfOdqjng= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709566466; x=1710171266; 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=vf4SzDKGKvTfXuvwtmibjtmsynDSif0+5l8tFRoSMMI=; b=fxrKro9OVD/+ez01jZOiUoAse0H/HaU+1TEi5VvPrLPMDC3f4LDzDwPbwCYNpJ3jHI RNROiZZacKKW44U/uGi9GyB2aR6XGrgoRVssjJwMjInABdg499NIgnzLwYyyHbsBLhJS Y1Ujqlw7N3O+AknhZGiNnBK+eviama+gBZwEXlfeRUFsEnkP7dGyDxcLq30OJCDSJ6cV +Ew0nVUn99fB629RdV3fLQXOyh70KGHUN1hB37Ryfd9IEvbJMGax+BQ+mhHyPQ4tJZKh qi//7ypBUFMNs1P3ab6T0szRcC0Iqxqf7Bl7z3XwkgFfQgk2UNT6D7l2vBqF9a0BrPFF U6yA== X-Forwarded-Encrypted: i=2; AJvYcCVW/ehNV+H+4E9Hncqphw9vAlrX0Pm45Sc+60L/m1CecOiWw5TtC2i1x/X3mLQcWIbCvNwkAkl9rD7jEHxLvl1B36SHW8aELBOS38U+Xy4rNjVjJnGWEVP7KRG9vg== X-Gm-Message-State: AOJu0Yzdb4envvC2ryXBVv4OVibg924pHK/PWQ1PkCTLIZZTfSQ3Y006 7PxJYJBo7spzTrTFPrT18wo6ev6vcCt1FKZzra0jHNqntmWT2RmnQUNpg5VpFw4Stw== X-Google-Smtp-Source: AGHT+IHCEk1FuMKMm49FzwsMwYQnnpW1LgOKl3VzDuuRJOAIducDblm7Yeea1zCehUgKYPyvh1L7Ww== X-Received: by 2002:a05:6512:318f:b0:513:3ea7:770a with SMTP id i15-20020a056512318f00b005133ea7770amr4502478lfe.17.1709566466105; Mon, 04 Mar 2024 07:34:26 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6512:2026:b0:513:1813:feb9 with SMTP id s6-20020a056512202600b005131813feb9ls1141988lfs.0.-pod-prod-09-eu; Mon, 04 Mar 2024 07:34:24 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVnFYNpzZPHYqcii1JoTJJ85nU++P1WeN6Ar8mAJurEzDbkwVBe70ynv7gle3A5npbCE0BkzUlyhXjFoBh39tp415TOW740njQkNmfLFOnebGAp X-Received: by 2002:ac2:4d0d:0:b0:512:da6d:23aa with SMTP id r13-20020ac24d0d000000b00512da6d23aamr5733679lfi.67.1709566464272; Mon, 04 Mar 2024 07:34:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709566464; cv=none; d=google.com; s=arc-20160816; b=w63MgsTyu58IlUfbsIWjCMRgrBLCJT5kTmV3UcDkgD9XZ8TdopcUiF4GabFgSpJnAw hme2Xp33XEP+lVand9WY3gVCkXvsvZwRpR9qERSJlQkEt7YHJDfKcB7m4hwp+CFApHgk HZzpT39xXAc4chqFDSFDLljoXO+OplPIw6+Mn2sssukaMgVSJNgo7wmUlpxjonWga160 fjBoXWx5YxFuHgps/90gKpmWDDV2AUF0Gdk4C5b8Z3zNUiF/0NKLzDKppQxkaL9iGfU7 Z4zQenFNCNn96GEM4wXPG2t1qjCgXx+5WtQaYIVG0CsDj1udOPaY3SZqTpId1LNUmO+e mVOg== 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=Jth12OcHAh3eC/N3LQLZ7Nt6/3ytuVU+6J+5+OYl3EU=; fh=4oONpPjKXiASXUIK3r33lmFbprjiXry2+3IFq8fqq5E=; b=UWHe24JtjW1DXnxfmQMqDaXWCzYNY+jWRLO/hUp6tCI7HAXNcJkXIXXeimArOm3a6N eo6u1jwVJGV0DHJjB9GrRRd0/bxciMkyKAsQvFoHkkSiDqVCG0MbFqkDgzOyQOdNoblt f2LWKqJ+gtiTEu4ZuracWvDb6kLCXMAdnNKIMK3CP/enW0fAEPRiSuok933I6E0O88sA /q41Ge0nMpIWUArGeZsh+Ha3f4Vc96XJX4UmTmcOxbnuNE8cwWEz4eYputR4Y56F3lKc fji/OIhsXei0VbccbuYKzwFpSrxHpkskKZugYwfnUSiIN/z/7G2ZxxvMx2RLnEk8wtyN eZnA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=co5C3HUS; 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 g16-20020a19e050000000b005133fc53cb4sor833095lfj.17.2024.03.04.07.34.24 for (Google Transport Security); Mon, 04 Mar 2024 07:34:24 -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; AJvYcCX9TDp3j3F6SfUZFEYsw1LQZKETH7Gr5AKZxzKJ1l6xaqdj24uqCJgjBWkQL9Xq/3WAuolleWUW6BPjBfd8APfxkLvvk+2lB+Uczc+P2EYcvlRH 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 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 13/22] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope 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-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=co5C3HUS; 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: , 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))