public/meta-st-stm32mp
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CLASS-DEVUPSTREAM: fix usage

Browse Source 
- Split properly between tf-a-stm32mp and tf-a-stm32mp-ssp.
- Remove use of PV_class-devupstream: no more needed since we avoid using
SRCPV inside default PV (this avoid also misalignment with PV when updated).
- Fix missing fragment files for linux-stm32mp when devupstream in use.

Signed-off-by: Romuald JEANNE <romuald.jeanne@st.com>
Change-Id: I57ed371c9eefce6dc31d816508e99c576a7db91a
This commit is contained in:
Romuald JEANNE committed 2020-10-15 14:26:06 +02:00
1 parent 36a9911705
commit ad054778ca
6 files changed
+33 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

recipes-bsp/trusted-firmware-a/tf-a-stm32mp-common_2.2.inc
-17
View File
@@ -16,20 +16,3 @@ TF_VERSION = "2.2"
PV = "${TF_VERSION}.r1"
S = "${WORKDIR}/git"
# ---------------------------------
# Configure devupstream class usage
# ---------------------------------
BBCLASSEXTEND = "devupstream:target"
SRC_URI_class-devupstream ?= "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;name=tfa;branch=v${TF_VERSION}-stm32mp"
SRCREV_class-devupstream ?= "e587179e7b0823b5c6e38e029e417d10f088db51"
SRCREV_FORMAT_class-devupstream = "tfa"
PV_class-devupstream = "${TF_VERSION}+github+${SRCPV}"
# ---------------------------------
# Configure default preference to manage dynamic selection between tarball and github
# ---------------------------------
STM32MP_SOURCE_SELECTION ?= "tarball"
DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}"
recipes-bsp/trusted-firmware-a/tf-a-stm32mp-ssp_2.2.bb
+10 -1
View File
@@ -31,5 +31,14 @@ include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'tf-a-stm32mp-
# ---------------------------------
# Configure devupstream class usage
# ---------------------------------
SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;name=tfa;branch=v${TF_VERSION}-stm32mp-ssp"
BBCLASSEXTEND = "devupstream:target"
SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;branch=v${TF_VERSION}-stm32mp-ssp"
SRCREV_class-devupstream = "3a5830ccfbcebfaa60540d50d42f0e37f3b532e9"
# ---------------------------------
# Configure default preference to manage dynamic selection between tarball and github
# ---------------------------------
STM32MP_SOURCE_SELECTION ?= "tarball"
DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}"
recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.2.bb
+15
View File
@@ -24,3 +24,18 @@ TF_A_ENABLE_DEBUG_WRAPPER ?= "1"
# Configure archiver use
# ---------------------------------
include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'tf-a-stm32mp-archiver.inc','')}
# ---------------------------------
# Configure devupstream class usage
# ---------------------------------
BBCLASSEXTEND = "devupstream:target"
SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;branch=v${TF_VERSION}-stm32mp"
SRCREV_class-devupstream = "e587179e7b0823b5c6e38e029e417d10f088db51"
# ---------------------------------
# Configure default preference to manage dynamic selection between tarball and github
# ---------------------------------
STM32MP_SOURCE_SELECTION ?= "tarball"
DEFAULT_PREFERENCE = "${@bb.utils.contains('STM32MP_SOURCE_SELECTION', 'github', '-1', '1', d)}"
recipes-bsp/u-boot/u-boot-stm32mp-common_2020.01.inc
+1 -3
View File
@@ -34,10 +34,8 @@ S = "${WORKDIR}/git"
# ---------------------------------
BBCLASSEXTEND = "devupstream:target"
SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/u-boot.git;name=uboot;protocol=https;branch=v${U_BOOT_VERSION}-stm32mp"
SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/u-boot.git;protocol=https;branch=v${U_BOOT_VERSION}-stm32mp"
SRCREV_class-devupstream = "764fc8b2591139fb6a729516ccb4f9836b310d63"
SRCREV_FORMAT_class-devupstream = "uboot"
PV_class-devupstream = "${U_BOOT_VERSION}+github+${SRCPV}"
# ---------------------------------
# Configure default preference to manage dynamic selection between tarball and github