From patchwork Fri Mar 1 13:36:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3025 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 517873F057 for ; Fri, 1 Mar 2024 14:36:42 +0100 (CET) Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-566195235a4sf1376964a12.3 for ; Fri, 01 Mar 2024 05:36:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709300202; cv=pass; d=google.com; s=arc-20160816; b=qRtgDHPMTQCWLJiKo9Ou9/5yr3ewlAXMIYpp8POkqQtq8KhfsJCtzlETuAsmJ97P7E DuqSTfrtuH6NGTsd3tMkXu7sGostWvk7Wlg5HWKyT2j3HmCjYIULh9FRjNAaQF+3U3HN /Sd+hMqkl5YRYtrbDa4G07ze05r8yvLoHt4H5tKVInAcSSjodMEZeaLFHNhLwveEM0wX DjetRI3oGL9fCPnKJpN1j8tX6tLBPUFtxvz73FqgE5C7T6mS3cVbdauEPFiZfs+2Dxvi qROpBeSvMPSaPj8MR38mCSZHnBmPxMEgva63mch49i3WelsQGyvKLlx5dwaOik2VedIE vISQ== 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=HmHWqP8hfjISY0lGbsscUmUF66rNd3TnON+h4TEaoks=; fh=JWmaYOIq0VchJS7LzD0am1rfaMyOUny+x+fpmRCsxhU=; b=c3ptBNmSif0Tp0nCpljnEjWTKERKrhnJYfhRJH7llF1wghhpbGOjduKhn6y56txlC8 ZEBOYsMdVP48GccPDM4BgZnJE95Ym8vI2pdXT1fDCf3jhiNJKO29eImFC/A9MXiWWc+F HxDy2Ob5LzpuJ8OLdkJAs5F8qRks8iUR+pa8m6rwdJ61CBajutfbrjsoYO1KAoz3aIYO AMJ0n1mW5AUri0egcx4O15NkGk+pVW2BUjPJLHh8QHUC1+k6iCo0ffx5/LbPquznO241 t82+NMLEw4D9juhXKhgeVQoD4vTtwkPZX3fvnO9kuNAGI6mgXT2qt+VCB0rwJe1jLhkT 8YEw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=K2ACb3Fk; 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=1709300202; x=1709905002; 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=HmHWqP8hfjISY0lGbsscUmUF66rNd3TnON+h4TEaoks=; b=a+smuLwkJ5aHefotxg6SeDG+hZXWLFBgEfuGloh/zpRmVL1tn2WLYvuMHcaM/envt1 w6/DkLiis3cuttUgyr9kLum0Z4cn+BhLUdhi/3yTTYjqa1VIwe8EoPNeN8G46nlEmW9u M4HY2ZEbt5gl61NABzM3UoIOTpsL8I2CqmDD4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709300202; x=1709905002; 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=HmHWqP8hfjISY0lGbsscUmUF66rNd3TnON+h4TEaoks=; b=H6o9vXEyj255Q/ABhdwrmeJe65DKWa5Jt8m3h9eB3PRKPOA4/Kz54+Ige35bPJ/hkL irSuqC2fX1LLDUCiqgonkyo6OTX36zaBWzhoSQVjsNCC1jYHdcjtL8rPOBPj4tyLilTR LTnm97XmhqyKfkLUev4j6KUuirmzCQX1UB0crzBDz9PQLCMNcb79FU75KALagtwPVDH5 MgQv/WKGVxxu29kx0SbUfZs4ekhJnOY243OypRB5SrubgC7FaN8pfw0PmKQTg0cpDQLZ p0tJnmZQEb1+G9ax5QIRCOKCJqbA9gUAMEWHrPtiJchgUlea4CvA/oaWIkLo/M2Didtj Ei5A== X-Forwarded-Encrypted: i=2; AJvYcCWHOG5GLE/S/dvY6y7itJENfxZo5XJTd1wIacx3nzg8c0Myy4BCQIIYhQoGqkbxdctWXdz136F5d03cD/8PhpK4S5IOVn19uQ+T4rlGxeVf1O33sTdmFRDiqsqrtg== X-Gm-Message-State: AOJu0YxVnHJVI+2GjGT1Ts8FZAEGJHPRhIi+wPcUolckomxqg+vo7iFW H370TMdjaGDimaBe/0THrIPJOwUKLfcdwfNXLZQT3LFCf7DT+CDd7A+5XW8wuIR5Pu8V4A6Fng= = X-Google-Smtp-Source: AGHT+IF6+OQh2vuHUreZ7n+dkvdnEgVcZmDi0cq8R3o0dsGbjyYIYVt4c2//Ve/qAYTsyBIPLTj0vQ== X-Received: by 2002:a05:6402:b86:b0:566:806a:6f9e with SMTP id cf6-20020a0564020b8600b00566806a6f9emr1211629edb.28.1709300202148; Fri, 01 Mar 2024 05:36:42 -0800 (PST) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:5412:b0:566:3da3:bf40 with SMTP id ev18-20020a056402541200b005663da3bf40ls849747edb.0.-pod-prod-08-eu; Fri, 01 Mar 2024 05:36:40 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVBJ2G/nGR1Unk+1G/dTx0eFEzA53cncVZe6e4vr4uiyhIgkqFiMVDWZO/fkA3K0j6rF80JkS5kn53PLk4Lw987l3zepPKhBd3g5NdgMhN5G1uP X-Received: by 2002:a17:906:4e91:b0:a44:93cc:9a02 with SMTP id v17-20020a1709064e9100b00a4493cc9a02mr1047543eju.25.1709300200518; Fri, 01 Mar 2024 05:36:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709300200; cv=none; d=google.com; s=arc-20160816; b=fXtgZYR4/tfCy1yXQy/rFjd160r7lX7V+qm3vPdb7POsRXzQNEiAxgABOGWEKrtPRK ru8hqxxVICVOGxpV5iwLSkxxqpDgU6A9VvwLdKJAhsSJGA8blg82W5Lwyias1BKbi0Ri 90Xd3x6ZDRtsA9UAAC+fCwxVxOmUGrvJWVMgvU9oOJg2ahwSh7GfOvjkbTeuvepwO9Nu glHUwRHvIlcp67lhMx9PNZvVlnkCDgvNRd5jP88Cuut4eymEdZs+rwLaKGRdJLT3AhZH pgQJB6rGq5aTVsJAr4pNNtr5dOGnYd4/GBpVY8xTG864DKdEnAaNcKT6oNwzQXLkpnKW /OXw== 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=w3KI7gDy3tCDmAy3KOOSTnsiV1/LGOV0AnlK1nRW7tw=; fh=LXijzAoaBnhP7CD+FTbLHIj24qxSQ62wZgqjc5bUcQ8=; b=DEje4OqkFQV4MSTTd1hVV4cu4b/88J5qymvE9VUgW9Aot77580AtHLGkZDoKDtz/M/ OvvGlLQxSQQkuNBy939EiDzjPGUBCuiey67/eADcBfHmjbC1K/MmV5jFmGpRRy+/pFYA fM6LmmCbQMofBE/OWwAW7ND07nyTI1HPwKNUWaPaI1YXWH6JCXPVnt0Vw5zkUCwuqrF2 uHKxHVoHUt5pi732k99D/a4gb+x7cwbWCdyOZNEXnq9jAAZ6GkOUMr5sRxb7JEswgc5Y 3KBnt4OyjkhRwSdoDltXs9Vw5fcJIBwIRvwdhcZt0et+yj4+QQ9lZLgAg8vuotId/Peb pmlQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=K2ACb3Fk; 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 d7-20020a170906344700b00a4444499914sor1493167ejb.10.2024.03.01.05.36.40 for (Google Transport Security); Fri, 01 Mar 2024 05:36:40 -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; AJvYcCUhXLNpmLuK9SypQH388f1tnpD6o8LBO9UT2QcXRr+bPICe/VxS155eDuB01LVsc0kQrNyeaQsW2hxS0KJeKhTbvnPETCSSz33SsE+BlLP6Nxgg X-Received: by 2002:a50:c943:0:b0:563:c54e:f1 with SMTP id p3-20020a50c943000000b00563c54e00f1mr1399970edh.2.1709300200166; Fri, 01 Mar 2024 05:36:40 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 05:36:39 -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 13/23] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope Date: Fri, 1 Mar 2024 14:36:10 +0100 Message-ID: <20240301133620.3547430-14-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=K2ACb3Fk; 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 Signed-off-by: Dario Binacchi --- 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 bf0fe078b955..6d3ed34e121b 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))