From 2f26da887f04c639e0e0bb405dfb8f87c174e627 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 23 Jul 2022 12:50:00 -0300 Subject: [PATCH] qoriq-cst: rename cst to qoriq-cst The QoriQ SoCs use a different cst tool for secure boot than i.MX SoCs so we should name it with SoC family prefix to avoid confusion. Signed-off-by: Otavio Salvador --- conf/machine/include/qoriq-base.inc | 2 +- recipes-bsp/atf/qoriq-atf_2.4.bb | 2 +- .../0001-tools-Mark-struct-input_field-file_field-extern.patch | 0 recipes-devtools/{cst/cst_git.bb => qoriq-cst/qoriq-cst_git.bb} | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename recipes-devtools/{cst/cst => qoriq-cst/qoriq-cst}/0001-tools-Mark-struct-input_field-file_field-extern.patch (100%) rename recipes-devtools/{cst/cst_git.bb => qoriq-cst/qoriq-cst_git.bb} (96%) diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc index 35b7d82e..4340c942 100644 --- a/conf/machine/include/qoriq-base.inc +++ b/conf/machine/include/qoriq-base.inc @@ -39,7 +39,7 @@ WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" MACHINE_FEATURES ?= "pci ext2 ext3 serial" MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf udev-rules-qoriq kernel-modules" -EXTRA_IMAGEDEPENDS += "u-boot cst-native" +EXTRA_IMAGEDEPENDS += "u-boot qoriq-cst-native" MACHINEOVERRIDES =. "qoriq:" diff --git a/recipes-bsp/atf/qoriq-atf_2.4.bb b/recipes-bsp/atf/qoriq-atf_2.4.bb index b6716272..ec953297 100644 --- a/recipes-bsp/atf/qoriq-atf_2.4.bb +++ b/recipes-bsp/atf/qoriq-atf_2.4.bb @@ -2,7 +2,7 @@ require recipes-bsp/atf/qoriq-atf-2.4.inc inherit deploy -DEPENDS += "u-boot-mkimage-native u-boot openssl openssl-native rcw cst-native bc-native" +DEPENDS += "u-boot-mkimage-native u-boot openssl openssl-native rcw qoriq-cst-native bc-native" DEPENDS:append:lx2160a = " ddr-phy" DEPENDS:append:lx2162a = " ddr-phy" do_compile[depends] += "u-boot:do_deploy rcw:do_deploy uefi:do_deploy" diff --git a/recipes-devtools/cst/cst/0001-tools-Mark-struct-input_field-file_field-extern.patch b/recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch similarity index 100% rename from recipes-devtools/cst/cst/0001-tools-Mark-struct-input_field-file_field-extern.patch rename to recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch diff --git a/recipes-devtools/cst/cst_git.bb b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb similarity index 96% rename from recipes-devtools/cst/cst_git.bb rename to recipes-devtools/qoriq-cst/qoriq-cst_git.bb index b9ac3e9e..ca0f35fb 100644 --- a/recipes-devtools/cst/cst_git.bb +++ b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e959d5d617e33779d0e90ce1d9043eff" -DEPENDS += "openssl cst-native" +DEPENDS += "openssl qoriq-cst-native" RDEPENDS:${PN} = "bash" GENKEYS ?= "${STAGING_BINDIR_NATIVE}/cst/gen_keys"