stm-st-stm32mp: scp-firmware: remove recipe integrated in optee-os v4.0.0
This commit removes the scp-firmware recipe, as it has been integrated into the optee-os recipe with the latest v4.0.0 from the ST BSP release. This update is based on the openstlinux-6.6-yocto-scarthgap-mpu-v24.11.06 tag for Yocto 5.0 (Scarthgap). https://onedigi.atlassian.net/browse/DEL-9381 Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra
parent
13a12520fe
commit
da6311bb3b
|
|
@ -1,10 +0,0 @@
|
|||
#
|
||||
# Archiver Configuration
|
||||
#
|
||||
SRC_URI:append = " file://README.HOW_TO.txt "
|
||||
COPYLEFT_LICENSE_INCLUDE:append = " BSD-3* "
|
||||
|
||||
inherit archiver
|
||||
ARCHIVER_MODE[src] = "original"
|
||||
|
||||
inherit archiver_stm32mp_clean
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
SUMMARY = "SCP Firmware for stm32mp"
|
||||
LICENSE = "BSD-3-Clause"
|
||||
LIC_FILES_CHKSUM = "file://${S}/license.md;md5=ef610a65bfb6d16f79778877cbfd45df"
|
||||
|
||||
SRC_URI = "gitsm://github.com/ARM-software/SCP-firmware;protocol=https;nobranch=1"
|
||||
SRCREV = "0c7236b1851d90124210a0414fd982dc55322c7c"
|
||||
|
||||
SRC_URI += " \
|
||||
file://0001-2.12-stm32mp-r1.patch \
|
||||
file://0001-Correct-git-error.patch \
|
||||
"
|
||||
|
||||
SCPFW_VERSION = "2.12"
|
||||
SCPFW_SUBVERSION = "stm32mp"
|
||||
SCPFW_RELEASE = "r1"
|
||||
|
||||
PV = "${SCPFW_VERSION}-${SCPFW_SUBVERSION}-${SCPFW_RELEASE}"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
###################################################################
|
||||
#inherit scp-firmware
|
||||
|
||||
# Enable use of scp-firmware shared folder
|
||||
STAGING_SCPFW_DIR = "${TMPDIR}/work-shared/${MACHINE}/scp-firmware"
|
||||
|
||||
do_compile[depends] += "scp-firmware:do_configure"
|
||||
###################################################################
|
||||
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
COMPATIBLE_MACHINE = "(stm32mpcommon)"
|
||||
|
||||
# Do not remove source code, even if rm_work is configured
|
||||
RM_WORK_EXCLUDE += "${PN}"
|
||||
|
||||
# -----------------------------------------------
|
||||
# Enable use of work-shared folder
|
||||
# Make sure to move ${S} to STAGING_SCPFW_DIR. We can't just
|
||||
# create the symlink in advance as the git fetcher can't cope with
|
||||
# the symlink.
|
||||
do_unpack[cleandirs] += "${S}"
|
||||
do_unpack[cleandirs] += "${STAGING_SCPFW_DIR}"
|
||||
do_clean[cleandirs] += "${S}"
|
||||
do_clean[cleandirs] += "${STAGING_SCPFW_DIR}"
|
||||
python do_symlink_scpfirmwaresrc() {
|
||||
# Specific part to update devtool-source class
|
||||
if bb.data.inherits_class('devtool-source', d):
|
||||
# We don't want to move the source to STAGING_SCPFW_DIR here
|
||||
if d.getVar('STAGING_SCPFW_DIR', d):
|
||||
d.setVar('STAGING_SCPFW_DIR', '${S}')
|
||||
|
||||
# Copy/Paste from kernel class with adaptation to SCPFW var
|
||||
s = d.getVar("S")
|
||||
if s[-1] == '/':
|
||||
# drop trailing slash, so that os.symlink(scpscr, s) doesn't use s as directory name and fail
|
||||
s=s[:-1]
|
||||
scpscr = d.getVar("STAGING_SCPFW_DIR")
|
||||
if s != scpscr:
|
||||
bb.utils.mkdirhier(scpscr)
|
||||
bb.utils.remove(scpscr, recurse=True)
|
||||
if d.getVar("EXTERNALSRC"):
|
||||
# With EXTERNALSRC S will not be wiped so we can symlink to it
|
||||
os.symlink(s, scpscr)
|
||||
else:
|
||||
import shutil
|
||||
shutil.move(s, scpscr)
|
||||
os.symlink(scpscr, s)
|
||||
}
|
||||
addtask symlink_scpfirmwaresrc before do_patch do_configure after do_unpack
|
||||
|
||||
# ---------------------------------
|
||||
# Configure archiver use
|
||||
# ---------------------------------
|
||||
include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'scp-firmware-archiver.inc','')}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,32 +0,0 @@
|
|||
From 27dd5642469b49aa6a94d99d97bce793f2473053 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Priouzeau <christophe.priouzeau@foss.st.com>
|
||||
Date: Tue, 28 Nov 2023 14:18:02 +0100
|
||||
Subject: [PATCH] Correct git error
|
||||
|
||||
When there is no .git for scp firmware, the git describe command
|
||||
return error:
|
||||
fatal: not a git repository (or any parent up to mount point /mnt)
|
||||
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).
|
||||
|
||||
To correct this kind of error, we can redirect the error on a variable
|
||||
|
||||
Signed-off-by: Christophe Priouzeau <christophe.priouzeau@foss.st.com>
|
||||
---
|
||||
framework/CMakeLists.txt | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
|
||||
index 9b9bb229..9a9f0bd4 100644
|
||||
--- a/framework/CMakeLists.txt
|
||||
+++ b/framework/CMakeLists.txt
|
||||
@@ -197,6 +197,7 @@ if(GIT_FOUND)
|
||||
COMMAND "${GIT_EXECUTABLE}" describe --tags --dirty --always
|
||||
WORKING_DIRECTORY "${SCP_SOURCE_DIR}"
|
||||
OUTPUT_VARIABLE SCP_DESCRIBE
|
||||
+ ERROR_VARIABLE _errorOut
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
endif()
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
Sharing scp firmware
|
||||
1. Prepare scp firmware source
|
||||
2. Manage scp firmware source code with GIT
|
||||
3. Configure scp firmware source code
|
||||
4. Test scp firmware source code
|
||||
|
||||
--------------------------------------
|
||||
1. Prepare scp-firmware source
|
||||
--------------------------------------
|
||||
If not already done, extract the sources from Developer Package tarball, for example:
|
||||
$ tar xf en.SOURCES-stm32mp1-*.tar.xz
|
||||
|
||||
In the scp firmware source directory (sources/*/##BP##-##PR##),
|
||||
you have one external dt tarball:
|
||||
- ##BP##-##PR##.tar.xz
|
||||
- 00*.patch
|
||||
|
||||
If you would like to have a git management for the source code move to
|
||||
to section 2 [Management of external dt source code with GIT].
|
||||
|
||||
Otherwise, to manage scp firmware source code without git, you must extract the
|
||||
tarball now and apply the patch:
|
||||
|
||||
$> tar xf ##BP##-##PR##.tar.xz
|
||||
$> cd ##BP##
|
||||
$> for p in `ls -1 ../*.patch`; do patch -p1 < $p; done
|
||||
|
||||
You can now move to section 3 [Configure scp firmware source code].
|
||||
|
||||
-------------------------------------
|
||||
2. Manage external dt source code with GIT
|
||||
-------------------------------------
|
||||
If you like to have a better management of change made on external dt source, you
|
||||
have following solutions to use git.
|
||||
|
||||
2.1 Create Git from tarball
|
||||
---------------------------
|
||||
$ cd <directory to scp firmware source code>
|
||||
$ test -d .git || git init . && git add . && git commit -m "new scp-firwmare" && git gc
|
||||
$ git checkout -b WORKING
|
||||
NB: this is the fastest way to get your scp firmware source code ready for development
|
||||
|
||||
-------------------------------
|
||||
3. Configure scp firmware source code
|
||||
-------------------------------
|
||||
To enable use of scp firmware source code for other component, you must set the
|
||||
SCPFW_DIR variable to your shell environement:
|
||||
|
||||
$> export SCPFW_DIR=$PWD/##BP##
|
||||
|
||||
---------------------------
|
||||
4. Test scp firmware source code
|
||||
---------------------------
|
||||
Nothing to do, scp-firmware is directly used by other component.
|
||||
|
||||
#> echo "*** Nothing to test ***"
|
||||
Loading…
Reference in New Issue