From patchwork Sat Mar 30 16:02:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3065 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 69C513F333 for ; Sat, 30 Mar 2024 17:02:57 +0100 (CET) Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-513e45ab9a8sf2157131e87.2 for ; Sat, 30 Mar 2024 09:02:57 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711814577; cv=pass; d=google.com; s=arc-20160816; b=U937TXZIh+EhK3UiJhxL2BAQDKCx7j+f4PFdLOQ9ypw+0tQ0TDSTu1FmB1S4TwTJYY KV8+Kgdb4kRINLSWLHwSddrTSkrtYLdLyjUGKKguchk3kutMaouEMvatFHfmLa0K3o7Y Dxf3/Pe0yGP6nVizGs4psNk0/I+7k3YIgvwQRASfH9ToS8YbVhJ8qbqQgW4P29v6BYxr p1p1iltXWY+FkkuvnBhENhHD8mIJ2Hae0TF/UBHpTGJA6lEJyAgsD+iZjDL1vM1CBHzB LLK76ZdbpMSBAdw0AHYXsEGhO7s23yJqyXv5Ciu16SqAziyCGnsRFxRLU04ITyB1vw5R oChA== 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=J9gbxQshNG/A5/pd/kbQ/ors5gQPPldBxl4m9mifvlc=; fh=PMC0K42vFnOqXRfGaVJ3rHpQp3FhdYH18AQKKJrATaY=; b=GPpEfo0bRphcmrmgaQfvdcexD8w0iUr8LHJ+Xw65ambS1M0i3BqwpdVwARGkN8uURp GpTlY1D4ilqf2flhsB+FCZgjHgyW0WmH92zL9FfriaVv0+f2cRjwUtlzKN2NpjXjuNwp Ol90vEXMNJX5f/1eAisYLIYlcTvBC6KIECY9DWZAwHVjVQ1rRvl9C3Tmrpprhhu3Quj5 4VLxXo0UEwbVV+iOdS17BoB/4vbGJN6E9OVsg73X1R0Gg07q5q7qQhfBjZluhg0w98qt Og9wm6MxNEgE6umCt/zs/w+hZtFj8w607FnB1U2NHXgowJlvpG62qMVYLxVH+VZ5iGsA mnag==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=A0+m+1RV; 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=1711814576; x=1712419376; 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=J9gbxQshNG/A5/pd/kbQ/ors5gQPPldBxl4m9mifvlc=; b=Wu3lCAx7hVtqP2TNjD3SGtBLedG7n4AAUBCQhD2puhKPqIL+K4+NTglJOSnLx7adUB UsKVFRGEKAdeKi/m56ONa+EeuSzah8UgqOQMtLkfWrO557JIkKCj4RZRwBc6OKk6gKJ9 BjL4fBjQPd798cHIy6T3Eqr3V8STnZ2F8J5qo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711814577; x=1712419377; 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=J9gbxQshNG/A5/pd/kbQ/ors5gQPPldBxl4m9mifvlc=; b=kA/yzms8nvLIp8lVFzM06BrfzAQf8Rjowb6sSfKIMqtlwIpDiecALPZvbtvMsaCy4R O+57H0VkKWmvynK8C41Kbndvk+Aygpq42HOAGZjYYdCgoo9PITpHNbobWYqyB6cdWSXQ sRDCV4AyHB7hZWd0VfxjwGG050Lka5neIZ7YFssrIuZu/+gF7+yi0F4UgXGbd3SUpun2 0d0UyVaUp6IkikkJQTkcvPcabetess2yN6ch2ZHB6/r9+NlS22DjMF3A8oOUmuHHQc4+ LV9HXR+4kdxZb71IAqMyqIiCX4Fz8cgcHtQFCorp8mkj6T1AG040Szi6OiddAUV+HEmB P9Xg== X-Forwarded-Encrypted: i=2; AJvYcCVTEqxr779MMlsjiBfAYQHD+n1Nb+IaJ84zORV297KriHqTfyZjztEzgc6g6PSoGEplnHVPauAxytZd0wnGGnDaAO3J9kzcaX10qaUKNgQ8evAKI69/r/Dn8fu2xQ== X-Gm-Message-State: AOJu0Yx7gEuHcHcIuRlgelNOdF5QD48Um0xKhJ7sqcpXbepQApKXLCCe oxqsXcsJ/vBBSFV4YUSl2epvfqbRy8N165T4IBDPm17vlHUuxboE385S1I4d4p6DBQ== X-Google-Smtp-Source: AGHT+IE/YLCUykr8Ueqm27zbGgHbzeEvGFjHQfYQs650TBFz0d4ITCHNPmMq+4hOJU1xD3da51nBUQ== X-Received: by 2002:a05:6512:401a:b0:516:9f03:6a9b with SMTP id br26-20020a056512401a00b005169f036a9bmr1381673lfb.4.1711814576644; Sat, 30 Mar 2024 09:02:56 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6512:1391:b0:515:b137:ffe0 with SMTP id fc17-20020a056512139100b00515b137ffe0ls659744lfb.1.-pod-prod-01-eu; Sat, 30 Mar 2024 09:02:55 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV8VWLIq4eoOPt9kST+j/7Vt39q0yGPORbncBEjA4wJzkyqe2LactdfLwr9v9yEAQxcXNRpBglnbjhb8G0XN4URPsIb4XTPQI3lmEtZDeSEX2Sd X-Received: by 2002:a05:6512:68:b0:515:aae5:6c11 with SMTP id i8-20020a056512006800b00515aae56c11mr3075057lfo.34.1711814574725; Sat, 30 Mar 2024 09:02:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711814574; cv=none; d=google.com; s=arc-20160816; b=saHz7IxDACD64Zzo43o0A43USwMScCvmV0UMmASqaHQ7+SFSwi4B6KHAn01Ru5xPxg tDqsASnBDf1csu1VwEyBW0zuMIxUrwAu2PXDZ16Od2Lusu35+AXR+thfhkR8e6XnUkj2 r6YiKeJiknSlNQezgU6zwtu3w/I5AySlw9NbSGRzt8atnLaaPtus6EzobJrCBd9oFfLs 1TBrcj37mId7r+OZpLVEjuLXTug6LP0+sASvHKluf9/nMgxlKTM4sjaBPrx2AP7YX+A5 lq+fM5Bw2Ifh9gz4yJVeQ9YPScjphxQhMkoLOAJXij2jxO72c2qIVWTKRZp6uMigZtqx 32KA== 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=6b2mFktqgsDVahTG36yqwYydAMnP8vuHi9nnxDrUDqw=; fh=tI095+iPDmgLs1fNotONOKgxmLK7v6F8hXcwAfR4148=; b=tuY7m0ogSwangG8Ns/NzMqWAISdabZkHI7cNOazaA/qwQ1fpGx0ykaA4mUX1sNmuzq kCSBuFwoQ5sHxMbO01eG6q9bPBBdaK+YmmFipjMa8KYVECYFPx3SWWKm52odPIaTDxH6 1tLb0N8X0xn76kPEFKhZ4bVmzP03INFV7aeFaDLuPBqOefEFttw2JYjz6rrhaodlhTAv I9QQgHmecY9RwntJ/5W70zuwRiIkMihYGXVP5c0FB/8qMauW/6NN/eeei7RfwpskMgbj /w8FV4caHKztSD8ip1QA3WnByA+xQZ4VGcGh3yerWf5VW2qsBuZxCU1iEvm1+OmxbGIW houQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=A0+m+1RV; 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 d11-20020a0565123d0b00b00514b4caea04sor1927113lfv.2.2024.03.30.09.02.54 for (Google Transport Security); Sat, 30 Mar 2024 09:02:54 -0700 (PDT) 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; AJvYcCWfegD7duKs791GAksu714imIpx1pbLKXk3xy6mPAqwaSKyovfHMEoFxiUTZU+wt6IgW0xSg7g2EZ84XW2EtNTyh7X4/nUwQzqy1pnaLT5uKXLM X-Received: by 2002:ac2:4a71:0:b0:516:9f28:f3d6 with SMTP id q17-20020ac24a71000000b005169f28f3d6mr913534lfp.1.1711814574081; Sat, 30 Mar 2024 09:02:54 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-87-8-99-67.retail.telecomitalia.it. [87.8.99.67]) by smtp.gmail.com with ESMTPSA id f13-20020a056402004d00b0056c633354c6sm2127107edu.45.2024.03.30.09.02.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Mar 2024 09:02:53 -0700 (PDT) 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, "Yann E . Morin" Subject: [PATCH v10 04/12] package/ti-k3: move TI_K3_{SECTYPE, SOC} out of the image-gen scope Date: Sat, 30 Mar 2024 17:02:36 +0100 Message-ID: <20240330160244.3214733-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240330160244.3214733-1-dario.binacchi@amarulasolutions.com> References: <20240330160244.3214733-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=A0+m+1RV; 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 37df7a93f77a..19f7a7bd771a 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -12,6 +12,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" @@ -24,7 +26,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 1ebdec68ac01..a19cf6f85572 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -12,6 +12,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" @@ -24,7 +26,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 410fe0f4935a..15ee978b6aba 100644 --- a/package/Config.in +++ b/package/Config.in @@ -630,6 +630,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))