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

KIRSKSTONE: overwrite syntax

Browse Source 
Signed-off-by: Christophe Priouzeau <christophe.priouzeau@foss.st.com>
This commit is contained in:
Christophe Priouzeau
2022-05-02 11:52:50 +02:00
parent 5e68bca87d
commit 483a6968fa
66 changed files with 551 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
classes/extlinuxconf-stm32mp.bbclass
View File

@ -243,8 +243,8 @@ python do_create_multiextlinux_config() {
extra_extlinuxlabels = labels
extra_cfile = os.path.join(d.getVar('B'), subdir , config + '_' + 'extlinux.conf')
# Configure dynamically the default menu configuration if there is no specific one configured
if d.getVar('UBOOT_EXTLINUX_DEFAULT_LABEL_%s' % config):
bb.note(">>> Specific configuration for UBOOT_EXTLINUX_DEFAULT_LABEL var detected for %s label: %s" % (config, d.getVar('UBOOT_EXTLINUX_DEFAULT_LABEL_%s' % config)))
if d.getVar('UBOOT_EXTLINUX_DEFAULT_LABEL:%s' % config):
bb.note(">>> Specific configuration for UBOOT_EXTLINUX_DEFAULT_LABEL var detected for %s label: %s" % (config, d.getVar('UBOOT_EXTLINUX_DEFAULT_LABEL:%s' % config)))
else:
bb.note(">>> Set UBOOT_EXTLINUX_DEFAULT_LABEL to %s" % config)
d.setVar('UBOOT_EXTLINUX_DEFAULT_LABEL', config)
@ -266,8 +266,8 @@ python do_create_multiextlinux_config() {
if socname_list and len(socname_list.split()) > 0:
for soc in socname_list.split():
if config.find(soc) > -1:
if d.getVar('UBOOT_EXTLINUX_SPLASH_%s' % soc):
splash = d.getVar('UBOOT_EXTLINUX_SPLASH_%s' % soc)
if d.getVar('UBOOT_EXTLINUX_SPLASH:%s' % soc):
splash = d.getVar('UBOOT_EXTLINUX_SPLASH:%s' % soc)
bb.note(">>> Specific configuration for SPLASH Screen detected with configuration: %s" % config)
bb.note(">>> Set UBOOT_EXTLINUX_SPLASH to %s" % splash)
d.setVar('UBOOT_EXTLINUX_SPLASH', splash)
@ -282,8 +282,8 @@ do_create_multiextlinux_config[cleandirs] += "${B}"
# Because of local overrides within create_multiextlinux_config() function, we
# need to make sure to add each variables to the vardeps list.
UBOOT_EXTLINUX_TARGET_VARS = "FIT LABELS BOOTPREFIXES TIMEOUT DEFAULT_LABEL TARGETS_EXTRA_CONFIG"
do_create_multiextlinux_config[vardeps] += "${@' '.join(['UBOOT_EXTLINUX_%s_%s' % (v, l) for v in d.getVar('UBOOT_EXTLINUX_TARGET_VARS').split() for l in d.getVar('UBOOT_EXTLINUX_TARGETS').split()])}"
do_create_multiextlinux_config[vardeps] += "${@' '.join(['UBOOT_EXTLINUX:%s:%s' % (v, l) for v in d.getVar('UBOOT_EXTLINUX_TARGET_VARS').split() for l in d.getVar('UBOOT_EXTLINUX_TARGETS').split()])}"
UBOOT_EXTLINUX_LABELS_VARS = "CONSOLE MENU_DESCRIPTION ROOT KERNEL_IMAGE FDTDIR FDT KERNEL_ARGS INITRD FIT"
UBOOT_EXTLINUX_LABELS_CONFIGURED = "${@' '.join(dict.fromkeys(' '.join('%s' % d.getVar('UBOOT_EXTLINUX_LABELS_%s' % o) for o in d.getVar('UBOOT_EXTLINUX_TARGETS').split()).split()))}"
UBOOT_EXTLINUX_LABELS_CONFIGURED += "${@' '.join(dict.fromkeys(' '.join('%s' % d.getVar('UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG_%s' % o) for o in d.getVar('UBOOT_EXTLINUX_TARGETS').split()).split()))}"
do_create_multiextlinux_config[vardeps] += "${@' '.join(['UBOOT_EXTLINUX_%s_%s' % (v, l) for v in d.getVar('UBOOT_EXTLINUX_LABELS_VARS').split() for l in d.getVar('UBOOT_EXTLINUX_LABELS_CONFIGURED').split()])}"
UBOOT_EXTLINUX_LABELS_CONFIGURED = "${@' '.join(dict.fromkeys(' '.join('%s' % d.getVar('UBOOT_EXTLINUX_LABELS:%s' % o) for o in d.getVar('UBOOT_EXTLINUX_TARGETS').split()).split()))}"
UBOOT_EXTLINUX_LABELS_CONFIGURED += "${@' '.join(dict.fromkeys(' '.join('%s' % d.getVar('UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG:%s' % o) for o in d.getVar('UBOOT_EXTLINUX_TARGETS').split()).split()))}"
do_create_multiextlinux_config[vardeps] += "${@' '.join(['UBOOT_EXTLINUX:%s:%s' % (v, l) for v in d.getVar('UBOOT_EXTLINUX_LABELS_VARS').split() for l in d.getVar('UBOOT_EXTLINUX_LABELS_CONFIGURED').split()])}"

14
classes/fip-utils-stm32mp.bbclass
View File

@ -3,9 +3,9 @@ DEPENDS += "tf-a-tools-native"
# Configure new package to provide fiptool wrapper for SDK usage
PACKAGES =+ "${FIPTOOL_WRAPPER}"
BBCLASSEXTEND_append = " nativesdk"
BBCLASSEXTEND:append = " nativesdk"
RRECOMMENDS_${FIPTOOL_WRAPPER}_append_class-nativesdk = " nativesdk-tf-a-tools"
RRECOMMENDS:${FIPTOOL_WRAPPER}:append:class-nativesdk = " nativesdk-tf-a-tools"
# Define default TF-A FIP namings
FIP_BASENAME ?= "fip"
@ -67,7 +67,7 @@ FIP_SIGN_SUFFIX ??= ''
# Define FIP dependency build
FIP_DEPENDS += "virtual/bootloader"
FIP_DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'virtual/optee-os', '', d)}"
FIP_DEPENDS_class-nativesdk = ""
FIP_DEPENDS:class-nativesdk = ""
# -----------------------------------------------
# Handle FIP config and set internal vars
@ -158,7 +158,7 @@ python () {
}
# Deploy the fip binary for current target
do_deploy_append_class-target() {
do_deploy:append:class-target() {
install -d ${DEPLOYDIR}
install -d ${FIP_DEPLOYDIR_FIP}
@ -281,11 +281,11 @@ do_deploy_append_class-target() {
}
# Stub do_compile for nativesdk use case as we only expect to provide FIPTOOL_WRAPPER
do_compile_class-nativesdk() {
do_compile:class-nativesdk() {
return
}
do_install_class-nativesdk() {
do_install:class-nativesdk() {
# Create the FIPTOOL_WRAPPER script to use on sdk side
cat << EOF > ${WORKDIR}/${FIPTOOL_WRAPPER}
#!/bin/bash -
@ -388,4 +388,4 @@ EOF
}
# Feed package for sdk with our fiptool wrapper
FILES_${FIPTOOL_WRAPPER}_class-nativesdk = "${bindir}/${FIPTOOL_WRAPPER}"
FILES:${FIPTOOL_WRAPPER}:class-nativesdk = "${bindir}/${FIPTOOL_WRAPPER}"

110
classes/flashlayout-stm32mp.bbclass
View File

@ -66,9 +66,9 @@
# - <config-label> from 'FLASHLAYOUT_CONFIG_LABELS' list
# Priority assignment is:
# It means the 'FLASHLAYOUT_PARTITION_LABELS' value can be overriden by setting:
# FLASHLAYOUT_PARTITION_LABELS_<bootscheme-label>_<config-label>
# FLASHLAYOUT_PARTITION_LABELS_<bootscheme-label>
# FLASHLAYOUT_PARTITION_LABELS_<config-label>
# FLASHLAYOUT_PARTITION_LABELS:<bootscheme-label>:<config-label>
# FLASHLAYOUT_PARTITION_LABELS:<bootscheme-label>
# FLASHLAYOUT_PARTITION_LABELS:<config-label>
# FLASHLAYOUT_PARTITION_LABELS
#
# Another override mechanism is also implemented for all other partition variables:
@ -217,11 +217,11 @@ def expand_var(var, bootscheme, config, partition, d):
bb.fatal('OVERRIDES not defined')
localdata.setVar('OVERRIDES', partition + ':' + overrides)
# Compute var according to priority assignment order defined above
expanded_var = localdata.getVar('%s_%s_%s' % (var, bootscheme, config))
expanded_var = localdata.getVar('%s:%s:%s' % (var, bootscheme, config))
if not expanded_var:
expanded_var = localdata.getVar('%s_%s' % (var, bootscheme))
expanded_var = localdata.getVar('%s:%s' % (var, bootscheme))
if not expanded_var:
expanded_var = localdata.getVar('%s_%s' % (var, config))
expanded_var = localdata.getVar('%s:%s' % (var, config))
if not expanded_var:
expanded_var = localdata.getVar(var)
if not expanded_var:
@ -296,11 +296,11 @@ def align_size(d, device, size, copy=1):
# Make sure to use device name and not device type
device_types = (d.getVar('DEVICE_STORAGE_TYPES') or "").split()
if device in device_types:
device = d.getVar('DEVICE_%s' % device) or ""
device = d.getVar('DEVICE:%s' % device) or ""
# Get device alignment size
alignment_size = d.getVar('DEVICE_ALIGNMENT_SIZE_%s' % device) or "none"
alignment_size = d.getVar('DEVICE_ALIGNMENT_SIZE:%s' % device) or "none"
if alignment_size == 'none':
bb.fatal('Missing DEVICE_ALIGNMENT_SIZE_%s value' % device)
bb.fatal('Missing DEVICE_ALIGNMENT_SIZE:%s value' % device)
# Check for default size alignment on erase block
if ( int(size) * 1024 ) % int(alignment_size, 16) == 0:
bb.debug(1, '>>> The partition size properly follows %s erase size' % alignment_size)
@ -337,19 +337,19 @@ def get_offset(new_offset, copy, current_device, bootscheme, config, partition,
"""
import re
# Get current_device alias
device_alias = d.getVar('DEVICE_%s' % current_device) or ""
device_alias = d.getVar('DEVICE:%s' % current_device) or ""
# Set offset
offset = expand_var('FLASHLAYOUT_PARTITION_OFFSET', bootscheme, config, partition, d)
bb.debug(1, '>>> Selected FLASHLAYOUT_PARTITION_OFFSET: %s' % offset)
# Set max offset
max_offset = d.getVar('DEVICE_MAX_OFFSET_%s' % device_alias) or "none"
max_offset = d.getVar('DEVICE_MAX_OFFSET:%s' % device_alias) or "none"
bb.debug(1, '>>> Selected DEVICE_MAX_OFFSET: %s' % max_offset)
if offset == 'none':
if new_offset == 'none':
bb.debug(1, '>>> No %s partition offset configured (%s device) for %s label for %s bootscheme, so default to default origin device one.' % (partition, current_device, config, bootscheme))
start_offset = d.getVar('DEVICE_START_OFFSET_%s' % device_alias) or "none"
start_offset = d.getVar('DEVICE_START_OFFSET:%s' % device_alias) or "none"
if start_offset == 'none':
bb.fatal('Missing DEVICE_START_OFFSET_%s value' % device_alias)
bb.fatal('Missing DEVICE_START_OFFSET:%s value' % device_alias)
offset = start_offset
else:
offset = new_offset
@ -394,7 +394,7 @@ def get_binaryname(labeltype, device, bootscheme, config, partition, d):
bb.debug(1, '>>> Selected FLASHLAYOUT_PARTITION_BIN2LOAD: %s' % binary_name)
# Set 'device' to alias name in lower case
if device != 'none':
device = d.getVar('DEVICE_%s' % device).lower()
device = d.getVar('DEVICE:%s' % device).lower()
# Init pattern to look for with current config value
update_patterns = '<BOOTSCHEME>;' + bootscheme
update_patterns += ' ' + '<CONFIG>;' + config.replace("-","_")
@ -506,14 +506,14 @@ python do_create_flashlayout_config() {
current_label = labeltype
# Init flashlayout file name
if config == 'none':
config_append = ''
config_addons = ''
else:
config_append = '_' + config
config_addons = '_' + config
if len(labeltypes.split()) < 2 and len(bootschemes.split()) < 2:
labeltype_append = ''
labeltype_addons = ''
else:
labeltype_append = '_' + labeltype + '-' + bootscheme
flashlayout_file = os.path.join(flashlayout_subfolder_path, d.expand("${FLASHLAYOUT_BASENAME}%s%s.${FLASHLAYOUT_SUFFIX}" % (config_append, labeltype_append)))
labeltype_addons = '_' + labeltype + '-' + bootscheme
flashlayout_file = os.path.join(flashlayout_subfolder_path, d.expand("${FLASHLAYOUT_BASENAME}%s%s.${FLASHLAYOUT_SUFFIX}" % (config_addons, labeltype_addons)))
# Get the partition list to write in flashlayout file
partitions = expand_var('FLASHLAYOUT_PARTITION_LABELS', bootscheme, config, '', d)
bb.debug(1, 'FLASHLAYOUT_PARTITION_LABELS: %s' % partitions)
@ -614,12 +614,12 @@ python do_create_flashlayout_config() {
os.remove(flashlayout_file)
break
# Get the supported labels for current storage device
partition_device_alias = d.getVar('DEVICE_%s' % partition_device) or ""
partition_type_supported_labels = d.getVar('DEVICE_BOARD_ENABLE_%s' % partition_device_alias) or "none"
partition_device_alias = d.getVar('DEVICE:%s' % partition_device) or ""
partition_type_supported_labels = d.getVar('DEVICE_BOARD_ENABLE:%s' % partition_device_alias) or "none"
# Check if partition type is supported for the current label
if partition_device != 'none' and current_label not in partition_type_supported_labels.split():
bb.debug(1, '>>> FLASHLAYOUT_PARTITION_DEVICE (%s, alias %s) is not supported for current label (%s): partition %s not appended in flashlayout file' % (partition_device, partition_device_alias, current_label, partition_name))
bb.debug(1, '>>> DEVICE_BOARD_ENABLE_%s: %s' % (partition_device_alias, partition_type_supported_labels))
bb.debug(1, '>>> DEVICE_BOARD_ENABLE:%s: %s' % (partition_device_alias, partition_type_supported_labels))
continue
# Write to flashlayout file the partition configuration
fl_file.write('%s\t%s\t%s\t%s\t%s\t%s\t%s\n' %
@ -658,7 +658,7 @@ python do_create_flashlayout_config() {
flashlayout_wrapper4dbg_subfolder_path = os.path.join(d.getVar('FLASHLAYOUT_DESTDIR'), bootscheme, "debug")
bb.utils.mkdirhier(flashlayout_wrapper4dbg_subfolder_path)
# Wrapper4dbg output filename
debug_flashlayout_file = os.path.join(flashlayout_wrapper4dbg_subfolder_path,d.expand("debug-${FLASHLAYOUT_BASENAME}%s%s.${FLASHLAYOUT_SUFFIX}" % (config_append, labeltype_append)))
debug_flashlayout_file = os.path.join(flashlayout_wrapper4dbg_subfolder_path,d.expand("debug-${FLASHLAYOUT_BASENAME}%s%s.${FLASHLAYOUT_SUFFIX}" % (config_addons, labeltype_addons)))
bb.debug(1, ">>> Update tf-a in %s" % (debug_flashlayout_file))
os.rename(tmp_flashlayout_file, debug_flashlayout_file)
else:
@ -705,11 +705,11 @@ python flashlayout_partition_config() {
images.
Based on PARTITIONS_CONFIG, PARTITIONS_BOOTLOADER_CONFIG and PARTITIONS_OPTEE_CONFIG
feed FLASHLAYOUT_PARTITION_ vars for each 'config' and 'label':
FLASHLAYOUT_PARTITION_ENABLE_<config>_<label>
FLASHLAYOUT_PARTITION_BIN2LOAD_<config>_<label>
FLASHLAYOUT_PARTITION_SIZE_<config>_<label>
FLASHLAYOUT_PARTITION_TYPE_<config>_<label>
FLASHLAYOUT_PARTITION_COPY_<config>_<label>
FLASHLAYOUT_PARTITION_ENABLE:<config>:<label>
FLASHLAYOUT_PARTITION_BIN2LOAD:<config>:<label>
FLASHLAYOUT_PARTITION_SIZE:<config>:<label>
FLASHLAYOUT_PARTITION_TYPE:<config>:<label>
FLASHLAYOUT_PARTITION_COPY:<config>:<label>
"""
# Init partition and flashlayout configuration vars
partitionconfig_list = 'PARTITIONS_CONFIG PARTITIONS_BOOTLOADER_CONFIG PARTITIONS_OPTEE_CONFIG'
@ -742,44 +742,44 @@ python flashlayout_partition_config() {
else:
bb.fatal('[%s] Missing partlabel setting' % partconfvar)
# Feed FLASHLAYOUT_PARTITION_* vars
if d.getVar('FLASHLAYOUT_PARTITION_ENABLE_%s_%s' % (config, fl_label)):
bb.debug(1, "FLASHLAYOUT_PARTITION_ENABLE_%s_%s is already set to: %s." % (config, fl_label, d.getVar('FLASHLAYOUT_PARTITION_ENABLE_%s_%s' % (config, fl_label))))
# Feed FLASHLAYOUT_PARTITION:* vars
if d.getVar('FLASHLAYOUT_PARTITION_ENABLE:%s:%s' % (config, fl_label)):
bb.debug(1, "FLASHLAYOUT_PARTITION_ENABLE:%s:%s is already set to: %s." % (config, fl_label, d.getVar('FLASHLAYOUT_PARTITION_ENABLE:%s:%s' % (config, fl_label))))
else:
bb.debug(1, "Set FLASHLAYOUT_PARTITION_ENABLE_%s_%s to 'P'." % (config, fl_label))
d.setVar('FLASHLAYOUT_PARTITION_ENABLE_%s_%s' % (config, fl_label), 'P')
bb.debug(1, "Set FLASHLAYOUT_PARTITION_ENABLE:%s:%s to 'P'." % (config, fl_label))
d.setVar('FLASHLAYOUT_PARTITION_ENABLE:%s:%s' % (config, fl_label), 'P')
if items[0] != '':
if d.getVar('FLASHLAYOUT_PARTITION_BIN2LOAD_%s_%s' % (config, fl_label)):
bb.debug(1, "FLASHLAYOUT_PARTITION_BIN2LOAD_%s_%s is already set to: %s." % (config, fl_label, d.getVar('FLASHLAYOUT_PARTITION_BIN2LOAD_%s_%s' % (config, fl_label))))
if d.getVar('FLASHLAYOUT_PARTITION_BIN2LOAD:%s:%s' % (config, fl_label)):
bb.debug(1, "FLASHLAYOUT_PARTITION_BIN2LOAD:%s:%s is already set to: %s." % (config, fl_label, d.getVar('FLASHLAYOUT_PARTITION_BIN2LOAD:%s:%s' % (config, fl_label))))
else:
bb.debug(1, "Set FLASHLAYOUT_PARTITION_BIN2LOAD_%s_%s to %s." % (config, fl_label, items[0]))
d.setVar('FLASHLAYOUT_PARTITION_BIN2LOAD_%s_%s' % (config, fl_label), items[0])
bb.debug(1, "Set FLASHLAYOUT_PARTITION_BIN2LOAD:%s:%s to %s." % (config, fl_label, items[0]))
d.setVar('FLASHLAYOUT_PARTITION_BIN2LOAD:%s:%s' % (config, fl_label), items[0])
else:
bb.debug(1, "No partdata setting for %s label : default setting would applied..." % fl_label)
if items[2] != '':
if d.getVar('FLASHLAYOUT_PARTITION_SIZE_%s_%s' % (config, fl_label)):
bb.debug(1, "FLASHLAYOUT_PARTITION_SIZE_%s_%s is already set to: %s." % (config, fl_label, d.getVar('FLASHLAYOUT_PARTITION_SIZE_%s_%s' % (config, fl_label))))
if d.getVar('FLASHLAYOUT_PARTITION_SIZE:%s:%s' % (config, fl_label)):
bb.debug(1, "FLASHLAYOUT_PARTITION_SIZE:%s:%s is already set to: %s." % (config, fl_label, d.getVar('FLASHLAYOUT_PARTITION_SIZE:%s:%s' % (config, fl_label))))
else:
bb.debug(1, "Set FLASHLAYOUT_PARTITION_SIZE_%s_%s to %s." % (config, fl_label, items[2]))
d.setVar('FLASHLAYOUT_PARTITION_SIZE_%s_%s' % (config, fl_label), items[2])
bb.debug(1, "Set FLASHLAYOUT_PARTITION_SIZE:%s:%s to %s." % (config, fl_label, items[2]))
d.setVar('FLASHLAYOUT_PARTITION_SIZE:%s:%s' % (config, fl_label), items[2])
else:
bb.debug(1, "No size setting for %s label : default setting would applied..." % fl_label)
if items[3] != '':
if d.getVar('FLASHLAYOUT_PARTITION_TYPE_%s_%s' % (config, fl_label)):
bb.debug(1, "FLASHLAYOUT_PARTITION_TYPE_%s_%s is already set to: %s." % (config, fl_label, d.getVar('FLASHLAYOUT_PARTITION_TYPE_%s_%s' % (config, fl_label))))
if d.getVar('FLASHLAYOUT_PARTITION_TYPE:%s:%s' % (config, fl_label)):
bb.debug(1, "FLASHLAYOUT_PARTITION_TYPE:%s:%s is already set to: %s." % (config, fl_label, d.getVar('FLASHLAYOUT_PARTITION_TYPE:%s:%s' % (config, fl_label))))
else:
bb.debug(1, "Set FLASHLAYOUT_PARTITION_TYPE_%s_%s to %s." % (config, fl_label, items[3]))
d.setVar('FLASHLAYOUT_PARTITION_TYPE_%s_%s' % (config, fl_label), items[3])
bb.debug(1, "Set FLASHLAYOUT_PARTITION_TYPE:%s:%s to %s." % (config, fl_label, items[3]))
d.setVar('FLASHLAYOUT_PARTITION_TYPE:%s:%s' % (config, fl_label), items[3])
else:
bb.debug(1, "No PARTITION_TYPE setting for %s label: default setting would applied..." % fl_label)
if len(items) == 4:
bb.debug(1, "No PARTITION_COPY setting for %s label : default setting would applied..." % fl_label)
elif items[4] != '':
if d.getVar('FLASHLAYOUT_PARTITION_COPY_%s_%s' % (config, fl_label)):
bb.debug(1, "FLASHLAYOUT_PARTITION_COPY_%s_%s is already set to: %s." % (config, fl_label, d.getVar('FLASHLAYOUT_PARTITION_COPY_%s_%s' % (config, fl_label))))
if d.getVar('FLASHLAYOUT_PARTITION_COPY:%s:%s' % (config, fl_label)):
bb.debug(1, "FLASHLAYOUT_PARTITION_COPY:%s:%s is already set to: %s." % (config, fl_label, d.getVar('FLASHLAYOUT_PARTITION_COPY:%s:%s' % (config, fl_label))))
else:
bb.debug(1, "Set FLASHLAYOUT_PARTITION_COPY_%s_%s to %s." % (config, fl_label, items[4]))
d.setVar('FLASHLAYOUT_PARTITION_COPY_%s_%s' % (config, fl_label), items[4])
bb.debug(1, "Set FLASHLAYOUT_PARTITION_COPY:%s:%s to %s." % (config, fl_label, items[4]))
d.setVar('FLASHLAYOUT_PARTITION_COPY:%s:%s' % (config, fl_label), items[4])
else:
bb.debug(1, "No PARTITION_COPY setting for %s label : default setting would applied..." % fl_label)
break
@ -792,14 +792,14 @@ python flashlayout_partition_config() {
FLASHLAYOUT_LABELS_VARS = "CONFIG_LABELS PARTITION_LABELS TYPE_LABELS"
FLASHLAYOUT_LABELS_OVERRIDES = "${FLASHLAYOUT_BOOTSCHEME_LABELS} ${FLASHLAYOUT_CONFIG_LABELS}"
FLASHLAYOUT_LABELS_OVERRIDES += "${@' '.join('%s_%s' % (b, c) for b in d.getVar('FLASHLAYOUT_BOOTSCHEME_LABELS').split() for c in d.getVar('FLASHLAYOUT_CONFIG_LABELS').split())}"
do_create_flashlayout_config[vardeps] += "${@' '.join(['FLASHLAYOUT_%s_%s' % (v, o) for v in d.getVar('FLASHLAYOUT_LABELS_VARS').split() for o in d.getVar('FLASHLAYOUT_LABELS_OVERRIDES').split()])}"
FLASHLAYOUT_LABELS_OVERRIDES += "${@' '.join('%s:%s' % (b, c) for b in d.getVar('FLASHLAYOUT_BOOTSCHEME_LABELS').split() for c in d.getVar('FLASHLAYOUT_CONFIG_LABELS').split())}"
do_create_flashlayout_config[vardeps] += "${@' '.join(['FLASHLAYOUT:%s:%s' % (v, o) for v in d.getVar('FLASHLAYOUT_LABELS_VARS').split() for o in d.getVar('FLASHLAYOUT_LABELS_OVERRIDES').split()])}"
FLASHLAYOUT_PARTITION_VARS = "ENABLE ID TYPE DEVICE OFFSET BIN2LOAD SIZE REPLACE_PATTERNS"
FLASHLAYOUT_PARTITION_CONFIGURED = "${@' '.join(dict.fromkeys(' '.join('%s' % d.getVar('FLASHLAYOUT_PARTITION_LABELS_%s' % o) for o in d.getVar('FLASHLAYOUT_LABELS_OVERRIDES').split()).split()))}"
FLASHLAYOUT_PARTITION_CONFIGURED = "${@' '.join(dict.fromkeys(' '.join('%s' % d.getVar('FLASHLAYOUT_PARTITION_LABELS:%s' % o) for o in d.getVar('FLASHLAYOUT_LABELS_OVERRIDES').split()).split()))}"
FLASHLAYOUT_PARTITION_OVERRIDES = "${FLASHLAYOUT_LABELS_OVERRIDES} ${FLASHLAYOUT_PARTITION_CONFIGURED}"
FLASHLAYOUT_PARTITION_OVERRIDES += "${@' '.join('%s_%s' % (o, p) for o in d.getVar('FLASHLAYOUT_LABELS_OVERRIDES').split() for p in d.getVar('FLASHLAYOUT_PARTITION_CONFIGURED').split())}"
do_create_flashlayout_config[vardeps] += "${@' '.join(['FLASHLAYOUT_PARTITION_%s_%s' % (v, o) for v in d.getVar('FLASHLAYOUT_PARTITION_VARS').split() for o in d.getVar('FLASHLAYOUT_PARTITION_OVERRIDES').split()])}"
FLASHLAYOUT_PARTITION_OVERRIDES += "${@' '.join('%s:%s' % (o, p) for o in d.getVar('FLASHLAYOUT_LABELS_OVERRIDES').split() for p in d.getVar('FLASHLAYOUT_PARTITION_CONFIGURED').split())}"
do_create_flashlayout_config[vardeps] += "${@' '.join(['FLASHLAYOUT_PARTITION:%s:%s' % (v, o) for v in d.getVar('FLASHLAYOUT_PARTITION_VARS').split() for o in d.getVar('FLASHLAYOUT_PARTITION_OVERRIDES').split()])}"
FLASHLAYOUT_DEVICE_VARS = "ALIGNMENT_SIZE BOARD_ENABLE START_OFFSET MAX_OFFSET"
do_create_flashlayout_config[vardeps] += "${@' '.join(['DEVICE_%s_%s' % (v, o) for v in d.getVar('FLASHLAYOUT_DEVICE_VARS').split() for o in d.getVar('DEVICE_STORAGE_NAMES').split()])}"
do_create_flashlayout_config[vardeps] += "${@' '.join(['DEVICE:%s:%s' % (v, o) for v in d.getVar('FLASHLAYOUT_DEVICE_VARS').split() for o in d.getVar('DEVICE_STORAGE_NAMES').split()])}"

2
classes/image_types-stubi.bbclass
View File

@ -30,7 +30,7 @@ python stmultiub_environment () {
IMAGE_PREPROCESS_COMMAND += "stmultiub_environment;"
IMAGE_CMD_stmultiubi () {
IMAGE_CMD:stmultiubi () {
. ${T}/stmultiubi_environment
# Split MKUBIFS_ARGS_<name> and UBINIZE_ARGS_<name>

16
classes/st-partitions-image.bbclass
View File

@ -46,25 +46,25 @@ python __anonymous () {
# Update IMAGE vars for each partition image
if items[1] != '':
bb.debug(1, "Set UBI_VOLNAME to %s for %s partition image." % (items[1], items[0]))
d.setVar('UBI_VOLNAME_pn-%s' % d.expand(items[0]), items[1])
d.setVar('UBI_VOLNAME:pn-%s' % d.expand(items[0]), items[1])
if d.expand(items[1])[-2:] != 'fs':
bb.debug(1, "Set IMAGE_NAME_SUFFIX to '.%sfs' for %s partition image." % (items[1], items[0]))
d.setVar('IMAGE_NAME_SUFFIX_pn-%s' % d.expand(items[0]), '.' + items[1] + 'fs')
d.setVar('IMAGE_NAME_SUFFIX:pn-%s' % d.expand(items[0]), '.' + items[1] + 'fs')
else:
bb.debug(1, "Set IMAGE_NAME_SUFFIX to '.%s' for %s partition image." % (items[1], items[0]))
d.setVar('IMAGE_NAME_SUFFIX_pn-%s' % d.expand(items[0]), '.' + items[1])
d.setVar('IMAGE_NAME_SUFFIX:pn-%s' % d.expand(items[0]), '.' + items[1])
else:
bb.fatal('[PARTITIONS_IMAGES] Missing label setting for %s image' % items[0])
# Make sure that we're dealing with partition image and not rootfs image
if items[2] != '':
# Mount point is available, so we're dealing with partition image
bb.debug(1, "Set IMAGE_PARTITION_MOUNTPOINT to %s for %s partition image." % (items[2], items[0]))
d.setVar('IMAGE_PARTITION_MOUNTPOINT_pn-%s' % d.expand(items[0]), items[2])
d.setVar('IMAGE_PARTITION_MOUNTPOINT:pn-%s' % d.expand(items[0]), items[2])
# Append image to image_partitions list
image_partitions.append(d.expand(items[0]))
if items[3] != '':
bb.debug(1, "Set IMAGE_ROOTFS_SIZE to %s for %s partition image." % (items[3], items[0]))
d.setVar('IMAGE_ROOTFS_SIZE_pn-%s' % d.expand(items[0]), items[3])
d.setVar('IMAGE_ROOTFS_SIZE:pn-%s' % d.expand(items[0]), items[3])
else:
bb.fatal('[PARTITIONS_IMAGES] Missing size setting for %s image' % items[0])
@ -83,7 +83,7 @@ python __anonymous () {
if len(ubiconfigs) > 0:
for ubi_config in ubiconfigs:
bb.debug(1, "Appending '%s' image with %s size to STM32MP_UBI_VOLUME." % (items[0], items[3]))
d.appendVar('STM32MP_UBI_VOLUME_%s' % ubi_config, ' ' + items[0] + ':' + items[3])
d.appendVar('STM32MP_UBI_VOLUME:%s' % ubi_config, ' ' + items[0] + ':' + items[3])
break
# Reset IMAGE_LIST_SUMMARY with computed partition configuration
@ -200,7 +200,7 @@ python image_rootfs_image_clean_task(){
package = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8").rstrip('\n')
package = re.sub(r":.*", "", package)
except subprocess.CalledProcessError as e:
bb.fatal("Cannot check package for file %s" % (os.path.join(root, f)))
bb.note("Cannot check package for file %s" % (os.path.join(root, f)))
if package:
# Use oe-pkgdata-util to list all files provided by a package
@ -239,7 +239,7 @@ python image_rootfs_image_clean_task(){
# -----------------------------------------------------------------------------
DEPLOY_BUILDINFO_FILE ??= "0"
buildinfo_append() {
buildinfo:append() {
if d.getVar('DEPLOY_BUILDINFO_FILE') != '1':
return
# Export build information to deploy dir

100
conf/machine/include/st-machine-common-stm32mp.inc
View File

@ -35,20 +35,17 @@ BOOTDEVICE_LABELS ??= "emmc nand-4-256 nor-sdcard sdcard"
# =========================================================================
# Default machine feature
MACHINE_FEATURES = "usbhost usbgadget alsa screen ext2"
MACHINE_FEATURES_append = " ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'optee', '', d)} "
MACHINE_FEATURES_append = " tpm2 "
MACHINE_FEATURES:append = " ${@bb.utils.contains('BOOTSCHEME_LABELS', 'optee', 'optee', '', d)} "
MACHINE_FEATURES:append = " tpm2 "
# Enable installation of INITRD image on bootfs side
MACHINE_FEATURES_append = " initrd "
MACHINE_FEATURES:append = " initrd "
# Remove InitRD package install from DISTRO_EXTRA_RRECOMMENDS to add it explicitly
# in our bootfs image (this avoid dependency loops as rootfs depends on bootfs...)
DISTRO_EXTRA_RRECOMMENDS_remove = " ${@bb.utils.contains('COMBINED_FEATURES', 'initrd', '${INITRD_PACKAGE}', '', d)} "
DISTRO_EXTRA_RRECOMMENDS:remove = " ${@bb.utils.contains('COMBINED_FEATURES', 'initrd', '${INITRD_PACKAGE}', '', d)} "
# Configure autoresize for any of the 'ext4' storage devices (through InitRD image)
MACHINE_FEATURES_append = " ${@bb.utils.contains_any('BOOTDEVICE_LABELS', ['emmc', 'sdcard'], 'autoresize', '', d)} "
# Use Little Kernel loader to program storage device
MACHINE_FEATURES += "kloader"
MACHINE_FEATURES:append = " ${@bb.utils.contains_any('BOOTDEVICE_LABELS', ['emmc', 'sdcard'], 'autoresize', '', d)} "
# Use FIP image for boot loaders
MACHINE_FEATURES += "fip"
@ -59,25 +56,25 @@ SERIAL_CONSOLES = "115200;ttySTM0"
SERIAL_CONSOLE = "115200 ttySTM0"
# Don't include kernels in standard images
RDEPENDS_${KERNEL_PACKAGE_NAME}-base = ""
RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
# Ship all kernel modules by default
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules kernel-imagebootfs"
# Default device tree list supported per board
STM32MP_DT_FILES_DK ??= ""
STM32MP_DT_FILES_ED ??= ""
STM32MP_DT_FILES_EV ??= ""
# Set default supported device tree list
STM32MP_DEVICETREE_append = " ${STM32MP_DT_FILES_DK} "
STM32MP_DEVICETREE_append = " ${STM32MP_DT_FILES_ED} "
STM32MP_DEVICETREE_append = " ${STM32MP_DT_FILES_EV} "
STM32MP_DEVICETREE:append = " ${STM32MP_DT_FILES_DK} "
STM32MP_DEVICETREE:append = " ${STM32MP_DT_FILES_ED} "
STM32MP_DEVICETREE:append = " ${STM32MP_DT_FILES_EV} "
# =========================================================================
# Machine specific packages
# =========================================================================
# Enable Software watchdog when sysvinit
MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES','sysvinit',' watchdog ','',d)} "
MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('DISTRO_FEATURES','sysvinit',' watchdog ','',d)} "
# =========================================================================
# Bootloader raw partition configuration : data, label, size (Kbytes)
@ -328,16 +325,16 @@ MULTIUBI_BUILD += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'spinand-2-128', 's
# UBI Args for NAND by default on MB1262 (Micron MT29F8G16ABACAH4)
# LEB = BLOCK_SIZE - (2 * page size): 256*1024 - (2*4096)
MKUBIFS_ARGS_nand_4_256 = "--min-io-size 4096 --leb-size 253952 --max-leb-cnt 4096 --space-fixup"
UBINIZE_ARGS_nand_4_256 = "--min-io-size 4096 --peb-size 256KiB"
MKUBIFS_ARGS:nand_4_256 = "--min-io-size 4096 --leb-size 253952 --max-leb-cnt 4096 --space-fixup"
UBINIZE_ARGS:nand_4_256 = "--min-io-size 4096 --peb-size 256KiB"
# Set extra size required for UBIFS volume size (KiB)
EXTRA_UBIFS_SIZE_nand_4_256 = "2304"
EXTRA_UBIFS_SIZE:nand_4_256 = "2304"
# UBI Args for SPI NAND by default on MB1262 (Micron MT29F2G01ABA)
# LEB = BLOCK_SIZE - (2 * page size): 128*1024 - (2*2048)
MKUBIFS_ARGS_spinand_2_128 = "--min-io-size 2048 --leb-size 126976 --max-leb-cnt 2048 --space-fixup"
UBINIZE_ARGS_spinand_2_128 = "--min-io-size 2048 --peb-size 128KiB"
MKUBIFS_ARGS:spinand_2_128 = "--min-io-size 2048 --leb-size 126976 --max-leb-cnt 2048 --space-fixup"
UBINIZE_ARGS:spinand_2_128 = "--min-io-size 2048 --peb-size 128KiB"
# Set extra size required for UBIFS volume size (KiB)
EXTRA_UBIFS_SIZE_spinand_2_128 = "1408"
EXTRA_UBIFS_SIZE:spinand_2_128 = "1408"
# Define two empty volumes to manage U-Boot config beginning of multivolume UBIFS
STM32MP_MULTIUBI_UENV1_LABEL = "uboot_config"
@ -345,11 +342,11 @@ STM32MP_MULTIUBI_UENV1_SIZE ?= "256"
STM32MP_MULTIUBI_UENV2_LABEL = "uboot_config_r"
STM32MP_MULTIUBI_UENV2_SIZE ?= "${STM32MP_MULTIUBI_UENV1_SIZE}"
STM32MP_UBI_VOLUME_nand_4_256_prepend = "\
STM32MP_UBI_VOLUME:nand_4_256:prepend = "\
${STM32MP_MULTIUBI_UENV1_LABEL}:${STM32MP_MULTIUBI_UENV1_SIZE}:empty \
${STM32MP_MULTIUBI_UENV2_LABEL}:${STM32MP_MULTIUBI_UENV2_SIZE}:empty \
"
STM32MP_UBI_VOLUME_spinand_2_128_prepend = "\
STM32MP_UBI_VOLUME:spinand_2_128:prepend = "\
${STM32MP_MULTIUBI_UENV1_LABEL}:${STM32MP_MULTIUBI_UENV1_SIZE}:empty \
${STM32MP_MULTIUBI_UENV2_LABEL}:${STM32MP_MULTIUBI_UENV2_SIZE}:empty \
"
@ -368,10 +365,10 @@ IMAGE_FSTYPES += "${@bb.utils.contains_any('BOOTDEVICE_LABELS', 'nand-4-256 spin
# So use IMAGE_NAME_SUFFIX name by removing the '.' and truncing to 16 caracters
# - Deactivate metadata_csum and dir_index (hashed b-trees): update not supported
# by U-Boot
EXTRA_IMAGECMD_ext4 = "-i 4096 -L ${@d.getVar('IMAGE_NAME_SUFFIX').replace('.', '', 1)[:16]} -O ^metadata_csum,^dir_index"
EXTRA_IMAGECMD:ext4 = "-i 4096 -L ${@d.getVar('IMAGE_NAME_SUFFIX').replace('.', '', 1)[:16]} -O ^metadata_csum,^dir_index"
# Allow debug on the platform with gdb and openocd tools
EXTRA_IMAGEDEPENDS_append = " \
EXTRA_IMAGEDEPENDS:append = " \
gdb-cross-${TARGET_ARCH} \
openocd-stm32mp-native \
stm32wrapper4dbg-native \
@ -392,51 +389,52 @@ ST_TOOLS_FOR_SDK = " \
ST_TOOLS_FOR_SDK_PERL = " \
nativesdk-perl-module-term-ansicolor \
nativesdk-perl-module-encode \
nativesdk-perl-module-encode-encoding \
nativesdk-perl-module-encode-mime-header \
"
# For some scripts in kernel source code
ST_TOOLS_FOR_SDK_PERL_append = " \
ST_TOOLS_FOR_SDK_PERL:append = " \
nativesdk-perl-module-file-spec-functions \
nativesdk-perl-module-integer \
"
ST_TOOLS_FOR_SDK_append = " ${ST_TOOLS_FOR_SDK_PERL} "
ST_TOOLS_FOR_SDK:append = " ${ST_TOOLS_FOR_SDK_PERL} "
# For support of python module for optee-os
ST_TOOLS_FOR_SDK_append = " \
ST_TOOLS_FOR_SDK:append = " \
nativesdk-python3-pyelftools \
nativesdk-python3-pycryptodomex \
nativesdk-python3-pycrypto \
"
# For support of string convertion (iconv) in SDK
ST_TOOLS_FOR_SDK_append = " \
ST_TOOLS_FOR_SDK:append = " \
nativesdk-glibc-gconv-utf-16 \
nativesdk-glibc-gconv-utf-32 \
"
# For support wayland-scanner in SDK
ST_TOOLS_FOR_SDK_append = " \
ST_TOOLS_FOR_SDK:append = " \
nativesdk-wayland \
"
# For Kernel yaml dependency
ST_TOOLS_FOR_SDK_remove = " \
ST_TOOLS_FOR_SDK:remove = " \
nativesdk-libyaml \
nativesdk-libyaml-dev \
"
# For CMSIS-SVD file parser with GDB
ST_TOOLS_FOR_SDK_append = " \
ST_TOOLS_FOR_SDK:append = " \
nativesdk-svd-tools \
"
# For Trusted Application development using OP-TEE TA SDK
ST_TOOLS_FOR_SDK_append = " \
ST_TOOLS_FOR_SDK:append = " \
nativesdk-optee-sdk \
"
# Fip tool
ST_TOOLS_FOR_SDK_append = " \
ST_TOOLS_FOR_SDK:append = " \
${@bb.utils.contains('MACHINE_FEATURES', 'fip', 'nativesdk-${FIPTOOL_WRAPPER}', '', d)} \
"
@ -446,28 +444,28 @@ ST_DEPENDENCIES_BUILD_FOR_SDK = " \
${@bb.utils.contains('KERNEL_ALT_IMAGETYPE', 'uImage', 'nativesdk-u-boot-mkimage', '', d)} \
"
# Make sure to append openssl to SDK for kernel-module and scripts build
ST_DEPENDENCIES_BUILD_FOR_SDK_append = " nativesdk-openssl-dev "
ST_DEPENDENCIES_BUILD_FOR_SDK:append = " nativesdk-openssl-dev "
# Make sure to append bison to SDK for u-boot build
ST_DEPENDENCIES_BUILD_FOR_SDK_append = " \
ST_DEPENDENCIES_BUILD_FOR_SDK:append = " \
${@bb.utils.contains('EXTRA_IMAGEDEPENDS', 'u-boot-stm32mp', 'nativesdk-bison', '', d)} \
"
# for populate_sdk, we will have all the tools
TOOLCHAIN_HOST_TASK_append = " ${ST_TOOLS_FOR_SDK} "
TOOLCHAIN_HOST_TASK_append = " ${ST_DEPENDENCIES_BUILD_FOR_SDK} "
TOOLCHAIN_HOST_TASK:append = " ${ST_TOOLS_FOR_SDK} "
TOOLCHAIN_HOST_TASK:append = " ${ST_DEPENDENCIES_BUILD_FOR_SDK} "
# for populate_sdk_ext, the tools are not desired as mandatory tools (aka basic
# tools for devtool)
TOOLCHAIN_HOST_TASK_remove_task-populate-sdk-ext = " ${ST_TOOLS_FOR_SDK} "
TOOLCHAIN_HOST_TASK_remove_task-populate-sdk-ext = " ${ST_DEPENDENCIES_BUILD_FOR_SDK} "
TOOLCHAIN_HOST_TASK:remove:task-populate-sdk-ext = " ${ST_TOOLS_FOR_SDK} "
TOOLCHAIN_HOST_TASK:remove:task-populate-sdk-ext = " ${ST_DEPENDENCIES_BUILD_FOR_SDK} "
# buildtools is used only by populate_sdk_ext
# populate_sdk_ext = buildtools + uninative + layer
# buildtools: sdk part of esdk (like sdk generated by populate_sdk)
# uninative: basic tools for devtool
TOOLCHAIN_HOST_TASK_remove_pn-buildtools-tarball = " ${ST_TOOLS_FOR_SDK_PERL} "
TOOLCHAIN_HOST_TASK:remove:pn-buildtools-tarball = " ${ST_TOOLS_FOR_SDK_PERL} "
TOOLCHAIN_TARGET_TASK += " bash-dev libgomp-dev"
TOOLCHAIN_TARGET_TASK_remove_pn-buildtools-tarball = " bash-dev libgomp-dev"
TOOLCHAIN_TARGET_TASK:remove:pn-buildtools-tarball = " bash-dev libgomp-dev"
# =========================================================================
# Debug trace
@ -518,7 +516,7 @@ EXTRA_IMAGEDEPENDS += "virtual/bootloader"
# Define default U-Boot config
UBOOT_CONFIG += "${@bb.utils.contains_any('BOOTSCHEME_LABELS', 'optee trusted', 'trusted_stm32mp15', '', d)}"
# The 'basic' config is only available for stm32mp1 machines
UBOOT_CONFIG_append_stm32mp1common = " basic_stm32mp15 "
UBOOT_CONFIG:append:stm32mp1common = " basic_stm32mp15 "
# Select u-boot binary that needs specific devicetree suffix (from UBOOT_DEVICETREE)
# For legacy mode keep the 'u-boot.stm32' but for FIP feature we need both
@ -558,9 +556,9 @@ UBOOT_MTDPART_CHECK ?= "\
${@bb.utils.contains('MACHINE_FEATURES', 'fip', '', '${UBOOT_MTDPART_4LEGACY}', d)} \
"
PREFERRED_PROVIDER_u-boot-fw-utils_stm32mp1common = "libubootenv"
PREFERRED_PROVIDER_u-boot-fw-utils:stm32mp1common = "libubootenv"
MACHINE_EXTRA_RRECOMMENDS_append_stm32mp1common = " \
MACHINE_EXTRA_RRECOMMENDS:append:stm32mp1common = " \
u-boot-fw-config-stm32mp \
"
@ -631,12 +629,12 @@ FIP_SIGN_SUFFIX ?= "${@bb.utils.contains('FIP_SIGN_ENABLE', '1', '_Signed', '',
# =========================================================================
# Xserver
# =========================================================================
XSERVER ?= " \
xserver-xorg \
xserver-xorg-module-libint10 \
xf86-input-evdev \
xf86-video-modesetting \
"
#XSERVER ?= " \
# xserver-xorg \
# xserver-xorg-module-libint10 \
# xf86-input-evdev \
# xf86-video-modesetting \
#"
# =========================================================================
# Enable deploy of bootloader elf files

66
conf/machine/include/st-machine-extlinux-config-stm32mp.inc
View File

@ -13,10 +13,10 @@ INITRD_IMAGE ??= ""
UBOOT_EXTLINUX_INITRD ?= "${@bb.utils.contains('COMBINED_FEATURES', 'initrd', '/${INITRD_IMAGE}', '', d)}"
# Define default SPLASH SCREEN
UBOOT_EXTLINUX_SPLASH ?= "${UBOOT_SPLASH_LANDSCAPE_IMAGE}"
UBOOT_EXTLINUX_SPLASH_stm32mp15 ?= "${UBOOT_SPLASH_PORTRAIT_IMAGE}"
UBOOT_EXTLINUX_SPLASH:stm32mp15 ?= "${UBOOT_SPLASH_PORTRAIT_IMAGE}"
UBOOT_EXTLINUX_KERNEL_ARGS ?= "rootwait rw"
UBOOT_EXTLINUX_KERNEL_ARGS_append += " ${@bb.utils.contains('ST_DEBUG_TRACE', '1', '', '${ST_CMD_LINE_DEBUG_TRACE}', d)} "
UBOOT_EXTLINUX_KERNEL_ARGS:append = " ${@bb.utils.contains('ST_DEBUG_TRACE', '1', '', '${ST_CMD_LINE_DEBUG_TRACE}', d)} "
# -----------------------------------------------------------------------------
# Configurations
@ -28,28 +28,28 @@ UBOOT_EXTLINUX_TARGETS += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'emmc', 'ta
UBOOT_EXTLINUX_TARGETS += "${@bb.utils.contains_any('BOOTDEVICE_LABELS', [ 'nand-4-256', 'nor-nand-4-256' ], 'target-nand', '', d)}"
# Define labels for each target
# (mandatory to allow specific var override if needed)
UBOOT_EXTLINUX_LABELS_target-sdcard += "rootfs"
UBOOT_EXTLINUX_LABELS_target-nor += "rootfs"
UBOOT_EXTLINUX_LABELS_target-emmc += "rootfs"
UBOOT_EXTLINUX_LABELS_target-nand += "rootfs"
UBOOT_EXTLINUX_LABELS:target-sdcard += "rootfs"
UBOOT_EXTLINUX_LABELS:target-nor += "rootfs"
UBOOT_EXTLINUX_LABELS:target-emmc += "rootfs"
UBOOT_EXTLINUX_LABELS:target-nand += "rootfs"
# Define specific bootprefix for each target
UBOOT_EXTLINUX_BOOTPREFIXES_target-sdcard = "${DEVICE_SDCARD}_"
UBOOT_EXTLINUX_BOOTPREFIXES_target-nor = "${DEVICE_NOR}_"
UBOOT_EXTLINUX_BOOTPREFIXES_target-emmc = "${DEVICE_EMMC}_"
UBOOT_EXTLINUX_BOOTPREFIXES_target-nand = "${DEVICE_NAND}_"
UBOOT_EXTLINUX_BOOTPREFIXES:target-sdcard = "${DEVICE:SDCARD}_"
UBOOT_EXTLINUX_BOOTPREFIXES:target-nor = "${DEVICE:NOR}_"
UBOOT_EXTLINUX_BOOTPREFIXES:target-emmc = "${DEVICE:EMMC}_"
UBOOT_EXTLINUX_BOOTPREFIXES:target-nand = "${DEVICE:NAND}_"
# Define ROOT overrides for each target
UBOOT_EXTLINUX_ROOT_target-nand = "ubi.mtd=UBI rootfstype=ubifs root=ubi0:rootfs"
UBOOT_EXTLINUX_ROOT_target-sdcard = "root=PARTUUID=${DEVICE_PARTUUID_ROOTFS_SDCARD}"
UBOOT_EXTLINUX_ROOT_target-nor = "root=/dev/mtdblock6"
UBOOT_EXTLINUX_ROOT_target-emmc = "root=PARTUUID=${DEVICE_PARTUUID_ROOTFS_EMMC}"
UBOOT_EXTLINUX_ROOT:target-nand = "ubi.mtd=UBI rootfstype=ubifs root=ubi0:rootfs"
UBOOT_EXTLINUX_ROOT:target-sdcard = "root=PARTUUID=${DEVICE_PARTUUID_ROOTFS:SDCARD}"
UBOOT_EXTLINUX_ROOT:target-nor = "root=/dev/mtdblock6"
UBOOT_EXTLINUX_ROOT:target-emmc = "root=PARTUUID=${DEVICE_PARTUUID_ROOTFS:EMMC}"
# Define INITRD overrides for nand target
UBOOT_EXTLINUX_INITRD_target-nand = ""
UBOOT_EXTLINUX_INITRD:target-nand = ""
# -----------------------------------------------------------------------------
# Configure default labels
# -----------------------------------------------------------------------------
# Define MENU_DESCRIPTION for rootfs label to default one to force selection
UBOOT_EXTLINUX_MENU_DESCRIPTION_rootfs = "OpenSTLinux"
UBOOT_EXTLINUX_MENU_DESCRIPTION:rootfs = "OpenSTLinux"
# -----------------------------------------------------------------------------
# Append specific examples configs
@ -64,15 +64,15 @@ UBOOT_EXTLINUX_MENU_DESCRIPTION_rootfs = "OpenSTLinux"
# the 'newlabel1' and 'newlabel2' labels.
# -----------------------------------------------------------------------------
# Define additional extra targets to consider
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG_target-sdcard += "${STM32MP_DT_FILES_DK}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG_target-sdcard += "${STM32MP_DT_FILES_ED}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG_target-sdcard += "${STM32MP_DT_FILES_EV}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG_target-emmc += "${STM32MP_DT_FILES_ED}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG_target-emmc += "${STM32MP_DT_FILES_EV}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG_target-nand += "${STM32MP_DT_FILES_ED}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG_target-nand += "${STM32MP_DT_FILES_EV}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG_target-nor += "${STM32MP_DT_FILES_ED}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG_target-nor += "${STM32MP_DT_FILES_EV}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG:target-sdcard += "${STM32MP_DT_FILES_DK}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG:target-sdcard += "${STM32MP_DT_FILES_ED}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG:target-sdcard += "${STM32MP_DT_FILES_EV}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG:target-emmc += "${STM32MP_DT_FILES_ED}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG:target-emmc += "${STM32MP_DT_FILES_EV}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG:target-nand += "${STM32MP_DT_FILES_ED}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG:target-nand += "${STM32MP_DT_FILES_EV}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG:target-nor += "${STM32MP_DT_FILES_ED}"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG:target-nor += "${STM32MP_DT_FILES_EV}"
# Define extra label configuration
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157c-dk2] += "stm32mp157c-dk2-a7-examples"
UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157f-dk2] += "stm32mp157f-dk2-a7-examples"
@ -88,16 +88,16 @@ UBOOT_EXTLINUX_TARGETS_EXTRA_CONFIG[stm32mp157f-ev1] += "stm32mp157f-ev1-m4-exam
# Configure A7 examples labels
# -----------------------------------------------------------------------------
# Define FDT overrides for new A7 labels
UBOOT_EXTLINUX_FDT_stm32mp157c-dk2-a7-examples = "/stm32mp157c-dk2-a7-examples.dtb"
UBOOT_EXTLINUX_FDT_stm32mp157c-ev1-a7-examples = "/stm32mp157c-ev1-a7-examples.dtb"
UBOOT_EXTLINUX_FDT_stm32mp157f-dk2-a7-examples = "/stm32mp157f-dk2-a7-examples.dtb"
UBOOT_EXTLINUX_FDT_stm32mp157f-ev1-a7-examples = "/stm32mp157f-ev1-a7-examples.dtb"
UBOOT_EXTLINUX_FDT:stm32mp157c-dk2-a7-examples = "/stm32mp157c-dk2-a7-examples.dtb"
UBOOT_EXTLINUX_FDT:stm32mp157c-ev1-a7-examples = "/stm32mp157c-ev1-a7-examples.dtb"
UBOOT_EXTLINUX_FDT:stm32mp157f-dk2-a7-examples = "/stm32mp157f-dk2-a7-examples.dtb"
UBOOT_EXTLINUX_FDT:stm32mp157f-ev1-a7-examples = "/stm32mp157f-ev1-a7-examples.dtb"
# -----------------------------------------------------------------------------
# Configure M4 examples labels
# -----------------------------------------------------------------------------
# Define FDT overrides for new M4 labels
UBOOT_EXTLINUX_FDT_stm32mp157c-dk2-m4-examples = "/stm32mp157c-dk2-m4-examples.dtb"
UBOOT_EXTLINUX_FDT_stm32mp157c-ev1-m4-examples = "/stm32mp157c-ev1-m4-examples.dtb"
UBOOT_EXTLINUX_FDT_stm32mp157f-dk2-m4-examples = "/stm32mp157f-dk2-m4-examples.dtb"
UBOOT_EXTLINUX_FDT_stm32mp157f-ev1-m4-examples = "/stm32mp157f-ev1-m4-examples.dtb"
UBOOT_EXTLINUX_FDT:stm32mp157c-dk2-m4-examples = "/stm32mp157c-dk2-m4-examples.dtb"
UBOOT_EXTLINUX_FDT:stm32mp157c-ev1-m4-examples = "/stm32mp157c-ev1-m4-examples.dtb"
UBOOT_EXTLINUX_FDT:stm32mp157f-dk2-m4-examples = "/stm32mp157f-dk2-m4-examples.dtb"
UBOOT_EXTLINUX_FDT:stm32mp157f-ev1-m4-examples = "/stm32mp157f-ev1-m4-examples.dtb"

4
conf/machine/include/st-machine-features-stm32mp.inc
View File

@ -57,11 +57,11 @@ WIFI_IMAGE_INSTALL = "${@bb.utils.contains('MACHINE_FEATURES', 'wifi', '${WIFI_L
# =========================================================================
# Image appends
# =========================================================================
EXTRA_IMAGEDEPENDS_append = " \
EXTRA_IMAGEDEPENDS:append = " \
${OPTEE_BINARY_INSTALL} \
"
MACHINE_EXTRA_RRECOMMENDS_append = " \
MACHINE_EXTRA_RRECOMMENDS:append = " \
${GPU_IMAGE_INSTALL} \
${ALSA_IMAGE_INSTALL} \
${BLUETOOTH_IMAGE_INSTALL} \

34
conf/machine/include/st-machine-flashlayout-deleteall-stm32mp.inc
View File

@ -6,13 +6,13 @@ FLASHLAYOUT_BOOTSCHEME_LABELS += "deleteall"
# -----------------------------------------------------------------------------
# Define config labels
# -----------------------------------------------------------------------------
FLASHLAYOUT_CONFIG_LABELS_deleteall = "disco eval"
FLASHLAYOUT_CONFIG_LABELS:deleteall = "disco eval"
# -----------------------------------------------------------------------------
# Define label types for each config
# -----------------------------------------------------------------------------
FLASHLAYOUT_TYPE_LABELS_deleteall_disco = "${STM32MP_DT_FILES_DK}"
FLASHLAYOUT_TYPE_LABELS_deleteall_eval = "${STM32MP_DT_FILES_ED} ${STM32MP_DT_FILES_EV}"
FLASHLAYOUT_TYPE_LABELS:deleteall:disco = "${STM32MP_DT_FILES_DK}"
FLASHLAYOUT_TYPE_LABELS:deleteall:eval = "${STM32MP_DT_FILES_ED} ${STM32MP_DT_FILES_EV}"
# -----------------------------------------------------------------------------
# Define partitions to consider for flashlayout file generation
@ -20,29 +20,29 @@ FLASHLAYOUT_TYPE_LABELS_deleteall_eval = "${STM32MP_DT_FILES_ED} ${STM32MP_DT_F
# NB: We re-use as much as possible partitions already defined in file
# 'st-machine-flashlayout-stm32mp.inc'
# -----------------------------------------------------------------------------
FLASHLAYOUT_PARTITION_LABELS_deleteall = "${FLASHLAYOUT_PROGRAMMER_SECTIONS} emmcboot0 emmcboot1 emmcall nandall norall sdcardall spinandall"
FLASHLAYOUT_PARTITION_LABELS:deleteall = "${FLASHLAYOUT_PROGRAMMER_SECTIONS} emmcboot0 emmcboot1 emmcall nandall norall sdcardall spinandall"
# -----------------------------------------------------------------------------
# Partition configuration for each partition label
FLASHLAYOUT_PARTITION_ENABLE_deleteall = "PED"
FLASHLAYOUT_PARTITION_ENABLE_deleteall_${STM32MP_FSBL1_NAME}-boot = "-"
FLASHLAYOUT_PARTITION_ENABLE_deleteall_${STM32MP_SSBL1_NAME}-boot = "-"
FLASHLAYOUT_PARTITION_ENABLE:deleteall = "PED"
FLASHLAYOUT_PARTITION_ENABLE:deleteall:${STM32MP_FSBL1_NAME}-boot = "-"
FLASHLAYOUT_PARTITION_ENABLE:deleteall:${STM32MP_SSBL1_NAME}-boot = "-"
FLASHLAYOUT_PARTITION_TYPE_emmcall = "RawImage"
FLASHLAYOUT_PARTITION_TYPE_nandall = "RawImage"
FLASHLAYOUT_PARTITION_TYPE_norall = "RawImage"
FLASHLAYOUT_PARTITION_TYPE_sdcardall = "RawImage"
FLASHLAYOUT_PARTITION_TYPE_spinandall = "RawImage"
FLASHLAYOUT_PARTITION_TYPE:emmcall = "RawImage"
FLASHLAYOUT_PARTITION_TYPE:nandall = "RawImage"
FLASHLAYOUT_PARTITION_TYPE:norall = "RawImage"
FLASHLAYOUT_PARTITION_TYPE:sdcardall = "RawImage"
FLASHLAYOUT_PARTITION_TYPE:spinandall = "RawImage"
FLASHLAYOUT_PARTITION_DEVICE_deleteall = "none:${FLASHLAYOUT_PROGRAMMER_SECTIONS},${DEVICE_EMMC}:emmcboot0 emmcboot1 emmcall,${DEVICE_NAND}:nandall,${DEVICE_NOR}:norall,${DEVICE_SDCARD}:sdcardall,${DEVICE_SPINAND}:spinandall"
FLASHLAYOUT_PARTITION_DEVICE:deleteall = "none:${FLASHLAYOUT_PROGRAMMER_SECTIONS},${DEVICE:EMMC}:emmcboot0 emmcboot1 emmcall,${DEVICE:NAND}:nandall,${DEVICE:NOR}:norall,${DEVICE:SDCARD}:sdcardall,${DEVICE:SPINAND}:spinandall"
FLASHLAYOUT_PARTITION_OFFSET_deleteall = "0x0"
FLASHLAYOUT_PARTITION_OFFSET_deleteall_emmcboot0 = "${DEVICE_START_OFFSET_BOOT0_EMMC}"
FLASHLAYOUT_PARTITION_OFFSET_deleteall_emmcboot1 = "${DEVICE_START_OFFSET_BOOT1_EMMC}"
FLASHLAYOUT_PARTITION_OFFSET:deleteall = "0x0"
FLASHLAYOUT_PARTITION_OFFSET:deleteall:emmcboot0 = "${DEVICE_START_OFFSET_BOOT0:EMMC}"
FLASHLAYOUT_PARTITION_OFFSET:deleteall:emmcboot1 = "${DEVICE_START_OFFSET_BOOT1:EMMC}"
# -----------------------------------------------------------------------------
# The 'deleteall' bootscheme is a trick to generate flashlayout files to clean
# all memory devices on board. There are no specific 'deleteall' bootloaders
# so we need to manage specific override for FLASHLAYOUT_PROGRAMMER_SECTIONS binaries
BOOTSCHEME_REPLACE = "${@'optee' if bb.utils.contains('BOOTSCHEME_LABELS', 'optee', True, False, d) and not bb.utils.contains('BOOTSCHEME_LABELS', 'trusted', True, False, d) else 'trusted'}"
FLASHLAYOUT_PARTITION_REPLACE_PATTERNS_${STM32MP_SSBL1_NAME}-boot_append = " deleteall;${BOOTSCHEME_REPLACE}"
FLASHLAYOUT_PARTITION_REPLACE_PATTERNS:${STM32MP_SSBL1_NAME}-boot:append = " deleteall;${BOOTSCHEME_REPLACE}"

10
conf/machine/include/st-machine-flashlayout-extensible-stm32mp.inc
View File

@ -8,24 +8,24 @@ FLASHLAYOUT_BOOTSCHEME_LABELS += "${@bb.utils.contains('BOOTSCHEME_LABELS', 'tru
# -----------------------------------------------------------------------------
# Define config labels
# -----------------------------------------------------------------------------
FLASHLAYOUT_CONFIG_LABELS_extensible = "${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard', 'sdcard', 'none', d)}"
FLASHLAYOUT_CONFIG_LABELS:extensible = "${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard', 'sdcard', 'none', d)}"
# -----------------------------------------------------------------------------
# Define label types
# -----------------------------------------------------------------------------
FLASHLAYOUT_TYPE_LABELS_extensible = "${@d.getVar('STM32MP_DT_FILES_DK') or 'none'}"
FLASHLAYOUT_TYPE_LABELS:extensible = "${@d.getVar('STM32MP_DT_FILES_DK') or 'none'}"
# -----------------------------------------------------------------------------
# Define partitions to use
# NOTE: extensible scheme is ONLY compatible with sdcard and trusted bootscheme
# So we only set partition labels for this particular configuration
# -----------------------------------------------------------------------------
FLASHLAYOUT_PARTITION_LABELS_extensible = "\
FLASHLAYOUT_PARTITION_LABELS:extensible = "\
${FLASHLAYOUT_PROGRAMMER_SECTIONS} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_BOOTLOADER_CONFIG', 'sdcard').split()])} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_CONFIG', 'sdcard').split()])} \
"
FLASHLAYOUT_PARTITION_LABELS_extensible_remove = "userfs"
FLASHLAYOUT_PARTITION_LABELS:extensible:remove = "userfs"
# -----------------------------------------------------------------------------
# The 'extensible' bootscheme is a trick to generate flashlayout files without
@ -34,4 +34,4 @@ FLASHLAYOUT_PARTITION_LABELS_extensible_remove = "userfs"
# install more applications via 'apt-get'
# Make sure to use 'trusted' bootscheme for binary naming instead of 'extensible'
# each time it is required
FLASHLAYOUT_PARTITION_REPLACE_PATTERNS_extensible_prepend = "extensible;trusted "
FLASHLAYOUT_PARTITION_REPLACE_PATTERNS:extensible:prepend = "extensible;trusted "

134
conf/machine/include/st-machine-flashlayout-stm32mp.inc
View File

@ -77,8 +77,8 @@ FLASHLAYOUT_CONFIG_LABELS += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'spinand
ST_EXAMPLE_IMAGE ??= "0"
# Remove NAND flashlayout when we are using st-example-image-* as rootfs too big for a NAND device size of 1 GBytes
FLASHLAYOUT_CONFIG_LABELS_remove = "${@bb.utils.contains('ST_EXAMPLE_IMAGE', '1', 'nand-4-256', '', d)}"
FLASHLAYOUT_CONFIG_LABELS_remove = "${@bb.utils.contains('ST_EXAMPLE_IMAGE', '1', 'spinand-2-128', '', d)}"
FLASHLAYOUT_CONFIG_LABELS:remove = "${@bb.utils.contains('ST_EXAMPLE_IMAGE', '1', 'nand-4-256', '', d)}"
FLASHLAYOUT_CONFIG_LABELS:remove = "${@bb.utils.contains('ST_EXAMPLE_IMAGE', '1', 'spinand-2-128', '', d)}"
# -----------------------------------------------------------------------------
# Define label types for each config
@ -86,43 +86,43 @@ FLASHLAYOUT_CONFIG_LABELS_remove = "${@bb.utils.contains('ST_EXAMPLE_IMAGE', '1'
# NOTE: We use devicetree to allow proper filtering on supported storage device
# -----------------------------------------------------------------------------
# Priority var assignment (where <OVERRIDES> are the usual override mechanism):
# 1) FLASHLAYOUT_TYPE_LABELS_<BOOTSCHEME>_<CONFIG>_<OVERRIDES>
# 2) FLASHLAYOUT_TYPE_LABELS_<BOOTSCHEME>_<CONFIG>
# 3) FLASHLAYOUT_TYPE_LABELS_<BOOTSCHEME>_<OVERRIDES>
# 4) FLASHLAYOUT_TYPE_LABELS_<BOOTSCHEME>
# 5) FLASHLAYOUT_TYPE_LABELS_<CONFIG>_<OVERRIDES>
# 6) FLASHLAYOUT_TYPE_LABELS_<CONFIG>
# 7) FLASHLAYOUT_TYPE_LABELS_<OVERRIDES>
# 1) FLASHLAYOUT_TYPE_LABELS:<BOOTSCHEME>:<CONFIG>:<OVERRIDES>
# 2) FLASHLAYOUT_TYPE_LABELS:<BOOTSCHEME>:<CONFIG>
# 3) FLASHLAYOUT_TYPE_LABELS:<BOOTSCHEME>:<OVERRIDES>
# 4) FLASHLAYOUT_TYPE_LABELS:<BOOTSCHEME>
# 5) FLASHLAYOUT_TYPE_LABELS:<CONFIG>:<OVERRIDES>
# 6) FLASHLAYOUT_TYPE_LABELS:<CONFIG>
# 7) FLASHLAYOUT_TYPE_LABELS:<OVERRIDES>
# 8) FLASHLAYOUT_TYPE_LABELS
# -----------------------------------------------------------------------------
# EMMC
# Set flashlayout file generation to eval board (mother and daughter) only
FLASHLAYOUT_TYPE_LABELS_emmc = "${DEVICE_BOARD_ENABLE_EMMC}"
FLASHLAYOUT_TYPE_LABELS:emmc = "${DEVICE_BOARD_ENABLE:EMMC}"
# NAND
# Set flashlayout file generation to eval board only
FLASHLAYOUT_TYPE_LABELS_nand-4-256 = "${DEVICE_BOARD_ENABLE_NAND}"
FLASHLAYOUT_TYPE_LABELS:nand-4-256 = "${DEVICE_BOARD_ENABLE:NAND}"
# NOR
# Set flashlayout file generation to eval board only
FLASHLAYOUT_TYPE_LABELS_nor = "${DEVICE_BOARD_ENABLE_NOR}"
FLASHLAYOUT_TYPE_LABELS_nor-sdcard = "${DEVICE_BOARD_ENABLE_NOR}"
FLASHLAYOUT_TYPE_LABELS:nor = "${DEVICE_BOARD_ENABLE:NOR}"
FLASHLAYOUT_TYPE_LABELS:nor-sdcard = "${DEVICE_BOARD_ENABLE:NOR}"
# SDCARD
# Set flashlayout file generation for all boards
FLASHLAYOUT_TYPE_LABELS_sdcard = "${DEVICE_BOARD_ENABLE_SDCARD}"
FLASHLAYOUT_TYPE_LABELS:sdcard = "${DEVICE_BOARD_ENABLE:SDCARD}"
# SPINAND
# Set flashlayout file generation for all boards
FLASHLAYOUT_TYPE_LABELS_spinand-2-128 = "${DEVICE_BOARD_ENABLE_SPINAND}"
FLASHLAYOUT_TYPE_LABELS:spinand-2-128 = "${DEVICE_BOARD_ENABLE:SPINAND}"
# -----------------------------------------------------------------------------
# Define partitions to consider for flashlayout file generation
# -----------------------------------------------------------------------------
# Priority var assignment (where <OVERRIDES> are the usual override mechanism):
# 1) FLASHLAYOUT_PARTITION_LABELS_<BOOTSCHEME>_<CONFIG>_<OVERRIDES>
# 2) FLASHLAYOUT_PARTITION_LABELS_<BOOTSCHEME>_<CONFIG>
# 3) FLASHLAYOUT_PARTITION_LABELS_<BOOTSCHEME>_<OVERRIDES>
# 4) FLASHLAYOUT_PARTITION_LABELS_<BOOTSCHEME>
# 5) FLASHLAYOUT_PARTITION_LABELS_<CONFIG>_<OVERRIDES>
# 6) FLASHLAYOUT_PARTITION_LABELS_<CONFIG>
# 7) FLASHLAYOUT_PARTITION_LABELS_<OVERRIDES>
# 1) FLASHLAYOUT_PARTITION_LABELS:<BOOTSCHEME>:<CONFIG>:<OVERRIDES>
# 2) FLASHLAYOUT_PARTITION_LABELS:<BOOTSCHEME>:<CONFIG>
# 3) FLASHLAYOUT_PARTITION_LABELS:<BOOTSCHEME>:<OVERRIDES>
# 4) FLASHLAYOUT_PARTITION_LABELS:<BOOTSCHEME>
# 5) FLASHLAYOUT_PARTITION_LABELS:<CONFIG>:<OVERRIDES>
# 6) FLASHLAYOUT_PARTITION_LABELS:<CONFIG>
# 7) FLASHLAYOUT_PARTITION_LABELS:<OVERRIDES>
# 8) FLASHLAYOUT_PARTITION_LABELS
# -----------------------------------------------------------------------------
FLASHLAYOUT_PROGRAMMER_SECTIONS ?= "${STM32MP_FSBL1_NAME}-boot ${STM32MP_SSBL1_NAME}-boot"
@ -130,71 +130,71 @@ FLASHLAYOUT_PROGRAMMER_SECTIONS ?= "${STM32MP_FSBL1_NAME}-boot ${STM32MP_SSBL1_N
# FLASHLAYOUT_PARTITION_IMAGES is initalized through PARTITIONS_CONFIG within 'flashlayout-stm32mp' class
FLASHLAYOUT_PARTITION_IMAGES ?= ""
FLASHLAYOUT_PARTITION_LABELS_optee_emmc = "\
FLASHLAYOUT_PARTITION_LABELS:optee:emmc = "\
${FLASHLAYOUT_PROGRAMMER_SECTIONS} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_BOOTLOADER_CONFIG', 'emmc').split()])} \
${@bb.utils.contains('MACHINE_FEATURES', 'fip', '', ' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_OPTEE_CONFIG', 'emmc').split()]), d)} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_CONFIG', 'emmc').split()])} \
"
FLASHLAYOUT_PARTITION_LABELS_optee_nand-4-256 = "\
FLASHLAYOUT_PARTITION_LABELS:optee:nand-4-256 = "\
${FLASHLAYOUT_PROGRAMMER_SECTIONS} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_BOOTLOADER_CONFIG', 'nand-4-256').split()])} \
${@bb.utils.contains('MACHINE_FEATURES', 'fip', '', ' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_OPTEE_CONFIG', 'nand-4-256').split()]), d)} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_CONFIG', 'nand-4-256').split()])} \
"
FLASHLAYOUT_PARTITION_LABELS_optee_nor = "\
FLASHLAYOUT_PARTITION_LABELS:optee:nor = "\
${FLASHLAYOUT_PROGRAMMER_SECTIONS} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_BOOTLOADER_CONFIG', 'nor').split()])} \
${@bb.utils.contains('MACHINE_FEATURES', 'fip', '', ' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_OPTEE_CONFIG', 'nor').split()]), d)} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_CONFIG', 'nor').split()])} \
"
FLASHLAYOUT_PARTITION_LABELS_optee_nor-sdcard = "\
FLASHLAYOUT_PARTITION_LABELS:optee:nor-sdcard = "\
${FLASHLAYOUT_PROGRAMMER_SECTIONS} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_BOOTLOADER_CONFIG', 'nor-sdcard').split()])} \
${@bb.utils.contains('MACHINE_FEATURES', 'fip', '', ' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_OPTEE_CONFIG', 'nor-sdcard').split()]), d)} \
empty \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_CONFIG', 'nor-sdcard').split()])} \
"
FLASHLAYOUT_PARTITION_LABELS_optee_sdcard = "\
FLASHLAYOUT_PARTITION_LABELS:optee:sdcard = "\
${FLASHLAYOUT_PROGRAMMER_SECTIONS} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_BOOTLOADER_CONFIG', 'sdcard').split()])} \
${@bb.utils.contains('MACHINE_FEATURES', 'fip', '', ' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_OPTEE_CONFIG', 'sdcard').split()]), d)} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_CONFIG', 'sdcard').split()])} \
"
FLASHLAYOUT_PARTITION_LABELS_optee_spinand-2-128 = "\
FLASHLAYOUT_PARTITION_LABELS:optee:spinand-2-128 = "\
${FLASHLAYOUT_PROGRAMMER_SECTIONS} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_BOOTLOADER_CONFIG', 'spinand-2-128').split()])} \
${@bb.utils.contains('MACHINE_FEATURES', 'fip', '', ' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_OPTEE_CONFIG', 'spinand-2-128').split()]), d)} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_CONFIG', 'spinand-2-128').split()])} \
"
FLASHLAYOUT_PARTITION_LABELS_trusted_emmc = "\
FLASHLAYOUT_PARTITION_LABELS:trusted:emmc = "\
${FLASHLAYOUT_PROGRAMMER_SECTIONS} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_BOOTLOADER_CONFIG', 'emmc').split()])} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_CONFIG', 'emmc').split()])} \
"
FLASHLAYOUT_PARTITION_LABELS_trusted_nand-4-256 = "\
FLASHLAYOUT_PARTITION_LABELS:trusted:nand-4-256 = "\
${FLASHLAYOUT_PROGRAMMER_SECTIONS} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_BOOTLOADER_CONFIG', 'nand-4-256').split()])} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_CONFIG', 'nand-4-256').split()])} \
"
FLASHLAYOUT_PARTITION_LABELS_trusted_nor = "\
FLASHLAYOUT_PARTITION_LABELS:trusted:nor = "\
${FLASHLAYOUT_PROGRAMMER_SECTIONS} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_BOOTLOADER_CONFIG', 'nor').split()])} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_CONFIG', 'nor').split()])} \
"
FLASHLAYOUT_PARTITION_LABELS_trusted_nor-sdcard = "\
FLASHLAYOUT_PARTITION_LABELS:trusted:nor-sdcard = "\
${FLASHLAYOUT_PROGRAMMER_SECTIONS} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_BOOTLOADER_CONFIG', 'nor-sdcard').split()])} \
empty \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_CONFIG', 'nor-sdcard').split()])} \
"
FLASHLAYOUT_PARTITION_LABELS_trusted_sdcard = "\
FLASHLAYOUT_PARTITION_LABELS:trusted:sdcard = "\
${FLASHLAYOUT_PROGRAMMER_SECTIONS} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_BOOTLOADER_CONFIG', 'sdcard').split()])} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_CONFIG', 'sdcard').split()])} \
"
FLASHLAYOUT_PARTITION_LABELS_trusted_spinand-2-128 = "\
FLASHLAYOUT_PARTITION_LABELS:trusted:spinand-2-128 = "\
${FLASHLAYOUT_PROGRAMMER_SECTIONS} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_BOOTLOADER_CONFIG', 'spinand-2-128').split()])} \
${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_CONFIG', 'spinand-2-128').split()])} \
@ -205,25 +205,25 @@ FLASHLAYOUT_PARTITION_LABELS_trusted_spinand-2-128 = "\
# -----------------------------------------------------------------------------
# Priority var assignment (where <OVERRIDES> are the usual override mechanism
# with dynamic append of ongoing 'partition name' item):
# 1) FLASHLAYOUT_PARTITION_xxx_<BOOTSCHEME>_<CONFIG>_<OVERRIDES>
# 2) FLASHLAYOUT_PARTITION_xxx_<BOOTSCHEME>_<CONFIG>
# 3) FLASHLAYOUT_PARTITION_xxx_<BOOTSCHEME>_<OVERRIDES>
# 4) FLASHLAYOUT_PARTITION_xxx_<BOOTSCHEME>
# 5) FLASHLAYOUT_PARTITION_xxx_<CONFIG>_<OVERRIDES>
# 6) FLASHLAYOUT_PARTITION_xxx_<CONFIG>
# 7) FLASHLAYOUT_PARTITION_xxx_<OVERRIDES>
# 1) FLASHLAYOUT_PARTITION_xxx:<BOOTSCHEME>:<CONFIG>:<OVERRIDES>
# 2) FLASHLAYOUT_PARTITION_xxx:<BOOTSCHEME>:<CONFIG>
# 3) FLASHLAYOUT_PARTITION_xxx:<BOOTSCHEME>:<OVERRIDES>
# 4) FLASHLAYOUT_PARTITION_xxx:<BOOTSCHEME>
# 5) FLASHLAYOUT_PARTITION_xxx:<CONFIG>:<OVERRIDES>
# 6) FLASHLAYOUT_PARTITION_xxx:<CONFIG>
# 7) FLASHLAYOUT_PARTITION_xxx:<OVERRIDES>
# 8) FLASHLAYOUT_PARTITION_xxx
# 9) Default 'FLASHLAYOUT_PARTITION_xxx' to 'none' when not defined
# -----------------------------------------------------------------------------
FLASHLAYOUT_PARTITION_ENABLE = "P"
FLASHLAYOUT_PARTITION_ENABLE_${STM32MP_FSBL1_NAME}-boot = "-"
FLASHLAYOUT_PARTITION_ENABLE_${STM32MP_SSBL1_NAME}-boot = "-"
FLASHLAYOUT_PARTITION_ENABLE_empty = "PE"
FLASHLAYOUT_PARTITION_ENABLE_nor_${STM32MP_UENV_NAME} = "PDE"
FLASHLAYOUT_PARTITION_ENABLE_nor-sdcard_${STM32MP_UENV_NAME} = "PDE"
FLASHLAYOUT_PARTITION_ENABLE:${STM32MP_FSBL1_NAME}-boot = "-"
FLASHLAYOUT_PARTITION_ENABLE:${STM32MP_SSBL1_NAME}-boot = "-"
FLASHLAYOUT_PARTITION_ENABLE:empty = "PE"
FLASHLAYOUT_PARTITION_ENABLE:nor:${STM32MP_UENV_NAME} = "PDE"
FLASHLAYOUT_PARTITION_ENABLE:nor-sdcard:${STM32MP_UENV_NAME} = "PDE"
# Need to make sure to delete partition that contains U-Boot env before update (gpt partitions only)
FLASHLAYOUT_PARTITION_ENABLE_sdcard_${STM32MP_SSBL1_NAME} = "PD"
FLASHLAYOUT_PARTITION_ENABLE_emmc_${STM32MP_SSBL1_NAME} = "PD"
FLASHLAYOUT_PARTITION_ENABLE:sdcard:${STM32MP_SSBL1_NAME} = "PD"
FLASHLAYOUT_PARTITION_ENABLE:emmc:${STM32MP_SSBL1_NAME} = "PD"
# -----------------------------------------------------------------------------
# Partition ID
# -----------------------------------------------------------------------------
@ -231,29 +231,29 @@ FLASHLAYOUT_PARTITION_ENABLE_emmc_${STM32MP_SSBL1_NAME} = "PD"
# reserved IDs on STM32CubeProgrammer side:
# 0x01 for FSBL
# 0x03 for SSBL
FLASHLAYOUT_PARTITION_ID_${STM32MP_FSBL1_NAME}-boot = "0x01"
FLASHLAYOUT_PARTITION_ID_${STM32MP_SSBL1_NAME}-boot = "0x03"
FLASHLAYOUT_PARTITION_ID:${STM32MP_FSBL1_NAME}-boot = "0x01"
FLASHLAYOUT_PARTITION_ID:${STM32MP_SSBL1_NAME}-boot = "0x03"
FLASHLAYOUT_PARTITION_TYPE = "Binary"
FLASHLAYOUT_PARTITION_TYPE_ubifs = "System"
FLASHLAYOUT_PARTITION_TYPE:ubifs = "System"
FLASHLAYOUT_PARTITION_COPY = "1"
FLASHLAYOUT_PARTITION_DEVICE_emmc = "none:${FLASHLAYOUT_PROGRAMMER_SECTIONS},${DEVICE_EMMC}:default"
FLASHLAYOUT_PARTITION_DEVICE_nand-4-256 = "none:${FLASHLAYOUT_PROGRAMMER_SECTIONS},${DEVICE_NAND}:default"
FLASHLAYOUT_PARTITION_DEVICE_nor = "none:${FLASHLAYOUT_PROGRAMMER_SECTIONS},${DEVICE_NOR}:default"
FLASHLAYOUT_PARTITION_DEVICE_nor-sdcard = "none:${FLASHLAYOUT_PROGRAMMER_SECTIONS},${DEVICE_NOR}:default,${DEVICE_SDCARD}:${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_CONFIG', 'nor-sdcard').split()])}"
FLASHLAYOUT_PARTITION_DEVICE_sdcard = "none:${FLASHLAYOUT_PROGRAMMER_SECTIONS},${DEVICE_SDCARD}:default"
FLASHLAYOUT_PARTITION_DEVICE_spinand-2-128 = "none:${FLASHLAYOUT_PROGRAMMER_SECTIONS},${DEVICE_SPINAND}:default"
FLASHLAYOUT_PARTITION_DEVICE:emmc = "none:${FLASHLAYOUT_PROGRAMMER_SECTIONS},${DEVICE:EMMC}:default"
FLASHLAYOUT_PARTITION_DEVICE:nand-4-256 = "none:${FLASHLAYOUT_PROGRAMMER_SECTIONS},${DEVICE:NAND}:default"
FLASHLAYOUT_PARTITION_DEVICE:nor = "none:${FLASHLAYOUT_PROGRAMMER_SECTIONS},${DEVICE:NOR}:default"
FLASHLAYOUT_PARTITION_DEVICE:nor-sdcard = "none:${FLASHLAYOUT_PROGRAMMER_SECTIONS},${DEVICE:NOR}:default,${DEVICE:SDCARD}:${@' '.join(['%s' % l.split(',')[1] for l in d.getVarFlag('PARTITIONS_CONFIG', 'nor-sdcard').split()])}"
FLASHLAYOUT_PARTITION_DEVICE:sdcard = "none:${FLASHLAYOUT_PROGRAMMER_SECTIONS},${DEVICE:SDCARD}:default"
FLASHLAYOUT_PARTITION_DEVICE:spinand-2-128 = "none:${FLASHLAYOUT_PROGRAMMER_SECTIONS},${DEVICE:SPINAND}:default"
FLASHLAYOUT_PARTITION_OFFSET_${STM32MP_FSBL1_NAME}-boot = "0x0"
FLASHLAYOUT_PARTITION_OFFSET_${STM32MP_SSBL1_NAME}-boot = "0x0"
FLASHLAYOUT_PARTITION_OFFSET_emmc_${STM32MP_FSBL1_NAME} = "${DEVICE_START_OFFSET_BOOT0_EMMC}"
FLASHLAYOUT_PARTITION_OFFSET_emmc_${STM32MP_FSBL2_NAME} = "${DEVICE_START_OFFSET_BOOT1_EMMC}"
FLASHLAYOUT_PARTITION_OFFSET_emmc_${STM32MP_SSBL1_NAME} = "${DEVICE_START_OFFSET_EMMC}"
FLASHLAYOUT_PARTITION_OFFSET:${STM32MP_FSBL1_NAME}-boot = "0x0"
FLASHLAYOUT_PARTITION_OFFSET:${STM32MP_SSBL1_NAME}-boot = "0x0"
FLASHLAYOUT_PARTITION_OFFSET:emmc:${STM32MP_FSBL1_NAME} = "${DEVICE_START_OFFSET_BOOT0:EMMC}"
FLASHLAYOUT_PARTITION_OFFSET:emmc:${STM32MP_FSBL2_NAME} = "${DEVICE_START_OFFSET_BOOT1:EMMC}"
FLASHLAYOUT_PARTITION_OFFSET:emmc:${STM32MP_SSBL1_NAME} = "${DEVICE_START_OFFSET_EMMC}"
# Size defined in Kbytes
FLASHLAYOUT_PARTITION_SIZE_empty = "0"
FLASHLAYOUT_PARTITION_SIZE:empty = "0"
# Set binaries to use for each partition
# -----------------------------------------------------------------------------
@ -264,8 +264,8 @@ FLASHLAYOUT_PARTITION_SIZE_empty = "0"
# '<TYPE>' (to insert label from FLASHLAYOUT_TYPE_LABELS)
# These patterns are processed to expand binary name for each config.
# -----------------------------------------------------------------------------
FLASHLAYOUT_PARTITION_BIN2LOAD_${STM32MP_FSBL1_NAME}-boot = "${@bb.utils.contains('MACHINE_FEATURES', 'fip', 'arm-trusted-firmware/tf-a-<TYPE>-usb.stm32', 'arm-trusted-firmware/tf-a-<TYPE>-serialboot.stm32', d)}"
FLASHLAYOUT_PARTITION_BIN2LOAD_${STM32MP_SSBL1_NAME}-boot = "${STM32MP_SSBL1_DATA}"
FLASHLAYOUT_PARTITION_BIN2LOAD:${STM32MP_FSBL1_NAME}-boot = "${@bb.utils.contains('MACHINE_FEATURES', 'fip', 'arm-trusted-firmware/tf-a-<TYPE>-usb.stm32', 'arm-trusted-firmware/tf-a-<TYPE>-serialboot.stm32', d)}"
FLASHLAYOUT_PARTITION_BIN2LOAD:${STM32MP_SSBL1_NAME}-boot = "${STM32MP_SSBL1_DATA}"
# -----------------------------------------------------------------------------
# Use the 'FLASHLAYOUT_PARTITION_REPLACE_PATTERNS' var to allow dynamic binary
@ -278,5 +278,5 @@ FLASHLAYOUT_PARTITION_BIN2LOAD_${STM32MP_SSBL1_NAME}-boot = "${STM32MP_SSBL1_DAT
# -----------------------------------------------------------------------------
# The daughter board does not support Programmer mode, so use eval one
# (valid for FLASHLAYOUT_PROGRAMMER_SECTIONS partitions)
FLASHLAYOUT_PARTITION_REPLACE_PATTERNS_${STM32MP_FSBL1_NAME}-boot_append = " ed1;ev1"
FLASHLAYOUT_PARTITION_REPLACE_PATTERNS_${STM32MP_SSBL1_NAME}-boot_append = " ed1;ev1"
FLASHLAYOUT_PARTITION_REPLACE_PATTERNS:${STM32MP_FSBL1_NAME}-boot:append = " ed1;ev1"
FLASHLAYOUT_PARTITION_REPLACE_PATTERNS:${STM32MP_SSBL1_NAME}-boot:append = " ed1;ev1"

72
conf/machine/include/st-machine-storage-device-stm32mp.inc
View File

@ -53,8 +53,8 @@ python () {
if device_type not in supported_device_types:
bb.fatal('Wrong DEVICE_STORAGE configuration: "%s" is not part of supported device type (%s)' % (device_type, supported_device_types))
# Configure alias
d.setVar('DEVICE_%s' % device_name, device_type)
d.setVar('DEVICE_%s' % device_type, device_name)
d.setVar('DEVICE:%s' % device_name, device_type)
d.setVar('DEVICE:%s' % device_type, device_name)
else:
bb.fatal('Wrong DEVICE_STORAGE configuration: expecting DEVICE_STORAGE = "<device_name1>:<devie_type1>,<device_name2>:<device_type2>"')
}
@ -64,79 +64,79 @@ python () {
# Extra space is required to store 'Protective MBR' and 'Primary GPT Header'
# Currently the required size is 17 KiB (i.e. 0x4400)
# We need to align this size to get the first offset to use
DEVICE_START_OFFSET_EMMC ?= "0x00080000"
DEVICE_START_OFFSET:EMMC ?= "0x00080000"
# 32 Gbit
DEVICE_MAX_OFFSET_EMMC ?= "0x100000000"
DEVICE_ALIGNMENT_SIZE_EMMC ?= "0x00080000"
DEVICE_MAX_OFFSET:EMMC ?= "0x100000000"
DEVICE_ALIGNMENT_SIZE:EMMC ?= "0x00080000"
# Specific to EMMC, there are two boot partitions using specific offset to access
DEVICE_START_OFFSET_BOOT0_EMMC ?= "boot1"
DEVICE_START_OFFSET_BOOT1_EMMC ?= "boot2"
DEVICE_START_OFFSET_BOOT0:EMMC ?= "boot1"
DEVICE_START_OFFSET_BOOT1:EMMC ?= "boot2"
# Configure the rootfs partition uid used in gpt partition table for EMMC
DEVICE_PARTUUID_ROOTFS_EMMC ?= "${@d.getVar(d.expand('DEVICE_PARTUUID_ROOTFS_${DEVICE_EMMC}')) or ''}"
DEVICE_PARTUUID_ROOTFS:EMMC ?= "${@d.getVar(d.expand('DEVICE_PARTUUID_ROOTFS:${DEVICE:EMMC}')) or ''}"
# Configure the list of boards that enable EMMC
DEVICE_BOARD_ENABLE_EMMC += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'emmc', '${STM32MP_DT_FILES_ED}', '', d)}"
DEVICE_BOARD_ENABLE_EMMC += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'emmc', '${STM32MP_DT_FILES_EV}', '', d)}"
DEVICE_BOARD_ENABLE:EMMC += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'emmc', '${STM32MP_DT_FILES_ED}', '', d)}"
DEVICE_BOARD_ENABLE:EMMC += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'emmc', '${STM32MP_DT_FILES_EV}', '', d)}"
# -----------------------------------------------------------------------------
# NAND
DEVICE_START_OFFSET_NAND ?= "0x00000000"
DEVICE_START_OFFSET:NAND ?= "0x00000000"
# 8 Gbit
DEVICE_MAX_OFFSET_NAND ?= "0x40000000"
DEVICE_ALIGNMENT_SIZE_NAND ?= "0x00040000"
DEVICE_MAX_OFFSET:NAND ?= "0x40000000"
DEVICE_ALIGNMENT_SIZE:NAND ?= "0x00040000"
# Configure the list of boards that enable NAND
DEVICE_BOARD_ENABLE_NAND += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'nand-4-256', '${STM32MP_DT_FILES_ED}', '', d)}"
DEVICE_BOARD_ENABLE_NAND += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'nand-4-256', '${STM32MP_DT_FILES_EV}', '', d)}"
DEVICE_BOARD_ENABLE:NAND += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'nand-4-256', '${STM32MP_DT_FILES_ED}', '', d)}"
DEVICE_BOARD_ENABLE:NAND += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'nand-4-256', '${STM32MP_DT_FILES_EV}', '', d)}"
# -----------------------------------------------------------------------------
# NOR
DEVICE_START_OFFSET_NOR ?= "0x00000000"
DEVICE_START_OFFSET:NOR ?= "0x00000000"
# 512 Mbit, only 1 NOR is used
DEVICE_MAX_OFFSET_NOR ?= "0x04000000"
DEVICE_ALIGNMENT_SIZE_NOR ?= "0x00010000"
DEVICE_MAX_OFFSET:NOR ?= "0x04000000"
DEVICE_ALIGNMENT_SIZE:NOR ?= "0x00010000"
# Configure the rootfs partition uid used in gpt partition table for NOR
DEVICE_PARTUUID_ROOTFS_NOR ?= "${@d.getVar(d.expand('DEVICE_PARTUUID_ROOTFS_${DEVICE_NOR}')) or ''}"
DEVICE_PARTUUID_ROOTFS:NOR ?= "${@d.getVar(d.expand('DEVICE_PARTUUID_ROOTFS:${DEVICE_NOR}')) or ''}"
# Configure the list of boards that enable NOR
DEVICE_BOARD_ENABLE_NOR += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'nor-sdcard' , '${STM32MP_DT_FILES_EV}', '', d)}"
DEVICE_BOARD_ENABLE_NOR += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'nor' , '${STM32MP_DT_FILES_EV}', '', d)}"
DEVICE_BOARD_ENABLE:NOR += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'nor-sdcard' , '${STM32MP_DT_FILES_EV}', '', d)}"
DEVICE_BOARD_ENABLE:NOR += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'nor' , '${STM32MP_DT_FILES_EV}', '', d)}"
# -----------------------------------------------------------------------------
# SDCARD
# Extra space is required to store 'Protective MBR' and 'Primary GPT Header'
# Currently the required size is 17 KiB (i.e. 0x4400)
# We need to align this size to get the first offset to use
DEVICE_START_OFFSET_SDCARD ?= "0x00004400"
DEVICE_START_OFFSET:SDCARD ?= "0x00004400"
# No limit for SDCARD
DEVICE_MAX_OFFSET_SDCARD ?= "none"
DEVICE_ALIGNMENT_SIZE_SDCARD ?= "0x00000200"
DEVICE_MAX_OFFSET:SDCARD ?= "none"
DEVICE_ALIGNMENT_SIZE:SDCARD ?= "0x00000200"
# Configure the rootfs partition uid used in gpt partition table for SDCARD
DEVICE_PARTUUID_ROOTFS_SDCARD ?= "${@d.getVar(d.expand('DEVICE_PARTUUID_ROOTFS_${DEVICE_SDCARD}')) or ''}"
DEVICE_PARTUUID_ROOTFS:SDCARD ?= "${@d.getVar(d.expand('DEVICE_PARTUUID_ROOTFS:${DEVICE:SDCARD}')) or ''}"
# Configure the list of boards that enable SDCARD
DEVICE_BOARD_ENABLE_SDCARD += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard', '${STM32MP_DT_FILES_DK}', '', d)}"
DEVICE_BOARD_ENABLE_SDCARD += "${@bb.utils.contains_any('BOOTDEVICE_LABELS', [ 'sdcard', 'nor-sdcard', 'nor' ], '${STM32MP_DT_FILES_ED}', '', d)}"
DEVICE_BOARD_ENABLE_SDCARD += "${@bb.utils.contains_any('BOOTDEVICE_LABELS', [ 'sdcard', 'nor-sdcard', 'nor' ], '${STM32MP_DT_FILES_EV}', '', d)}"
DEVICE_BOARD_ENABLE:SDCARD += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard', '${STM32MP_DT_FILES_DK}', '', d)}"
DEVICE_BOARD_ENABLE:SDCARD += "${@bb.utils.contains_any('BOOTDEVICE_LABELS', [ 'sdcard', 'nor-sdcard', 'nor' ], '${STM32MP_DT_FILES_ED}', '', d)}"
DEVICE_BOARD_ENABLE:SDCARD += "${@bb.utils.contains_any('BOOTDEVICE_LABELS', [ 'sdcard', 'nor-sdcard', 'nor' ], '${STM32MP_DT_FILES_EV}', '', d)}"
# -----------------------------------------------------------------------------
# SPI NAND
DEVICE_START_OFFSET_SPINAND ?= "0x00000000"
DEVICE_START_OFFSET:SPINAND ?= "0x00000000"
# 2 Gbit
DEVICE_MAX_OFFSET_SPINAND ?= "0x10000000"
DEVICE_ALIGNMENT_SIZE_SPINAND ?= "0x00020000"
DEVICE_MAX_OFFSET:SPINAND ?= "0x10000000"
DEVICE_ALIGNMENT_SIZE:SPINAND ?= "0x00020000"
# Configure the list of boards that enable SPINAND
DEVICE_BOARD_ENABLE_SPINAND += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'spinand-2-128', '', '', d)}"
DEVICE_BOARD_ENABLE:SPINAND += "${@bb.utils.contains('BOOTDEVICE_LABELS', 'spinand-2-128', '', '', d)}"
# -----------------------------------------------------------------------------
# Fixed configuration from U-Boot source code
# -----------------------------------------------------------------------------
DEVICE_PARTUUID_ROOTFS_mmc0 ?= "e91c4e10-16e6-4c0e-bd0e-77becf4a3582"
DEVICE_PARTUUID_ROOTFS_mmc1 ?= "491f6117-415d-4f53-88c9-6e0de54deac6"
DEVICE_PARTUUID_ROOTFS_mmc2 ?= "fd58f1c7-be0d-4338-8ee9-ad8f050aeb18"
DEVICE_PARTUUID_ROOTFS_nor0 ?= ""
DEVICE_PARTUUID_ROOTFS:mmc0 ?= "e91c4e10-16e6-4c0e-bd0e-77becf4a3582"
DEVICE_PARTUUID_ROOTFS:mmc1 ?= "491f6117-415d-4f53-88c9-6e0de54deac6"
DEVICE_PARTUUID_ROOTFS:mmc2 ?= "fd58f1c7-be0d-4338-8ee9-ad8f050aeb18"
DEVICE_PARTUUID_ROOTFS:nor0 ?= ""

2
conf/machine/stm32mp15-eval.conf
View File

@ -51,7 +51,7 @@ MACHINE_FEATURES += "${@'gpu' if d.getVar('ACCEPT_EULA_'+d.getVar('MACHINE')) ==
MACHINE_FEATURES += "m4copro"
MACHINE_FEATURES += "fit"
MACHINE_FEATURES_remove = "fip"
MACHINE_FEATURES:remove = "fip"
# Bluetooth
#BLUETOOTH_LIST += "linux-firmware-bluetooth-bcm4343"

4
recipes-bsp/alsa/alsa-lib_%.bbappend
View File

@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend_stm32mpcommon := "${THISDIR}/${PN}:"
SRC_URI_append_stm32mpcommon = " \
FILESEXTRAPATHS:prepend:stm32mpcommon := "${THISDIR}/${PN}:"
SRC_URI:append:stm32mpcommon = " \
file://0001-conf-add-card-configs-for-stm32mp15x-boards.patch \
"

4
recipes-bsp/alsa/alsa-state-stm32mp1.bb
View File

@ -25,7 +25,7 @@ SRC_URI = " \
S = "${WORKDIR}"
COMPATIBLE_MACHINE = "(stm32mpcommon)"
RDEPENDS_${PN} = "alsa-state"
RDEPENDS:${PN} = "alsa-state"
do_install() {
install -d ${D}${sysconfdir}
@ -59,4 +59,4 @@ do_install() {
fi
}
FILES_${PN} = "${localstatedir}/lib/alsa/*.state ${systemd_unitdir}/system-generators ${sysconfdir}/*.conf "
FILES:${PN} = "${localstatedir}/lib/alsa/*.state ${systemd_unitdir}/system-generators ${sysconfdir}/*.conf "

2
recipes-bsp/drivers/gcnano-driver-stm32mp.inc
View File

@ -1,7 +1,7 @@
COMPATIBLE_MACHINE = "(stm32mpcommon)"
# To share stm32mp1 patches between layers
FILESEXTRAPATHS_prepend := "${THISDIR}/gcnano-driver-stm32mp:"
FILESEXTRAPATHS:prepend := "${THISDIR}/gcnano-driver-stm32mp:"
inherit module

6
recipes-bsp/drivers/sysdig-driver_git.bb
View File

@ -53,7 +53,7 @@ export KERNELDIR = "${STAGING_KERNEL_BUILDDIR}"
MAKE_TARGETS = "all"
# Compile prepend for cmake build first
do_compile_prepend() {
do_compile:prepend() {
cmake_runcmake_build --target ${OECMAKE_TARGET_COMPILE}
}
@ -62,8 +62,8 @@ do_install() {
install -m 0755 ${B}/driver/sysdig-probe.ko ${D}${nonarch_base_libdir}/modules/${KERNEL_VERSION}/extra/
}
FILES_${PN} += " ${base_libdir}/modules/${KERNEL_VERSION}/extra "
FILES:${PN} += " ${base_libdir}/modules/${KERNEL_VERSION}/extra "
KERNEL_MODULES_META_PACKAGE = ""
RDEPENDS_${PN} = "bash"
RDEPENDS:${PN} = "bash"

4
recipes-bsp/trusted-firmware-a/tf-a-stm32mp-archiver.inc
View File

@ -1,11 +1,11 @@
#
# Archiver Configuration
#
SRC_URI_append = " file://README.HOW_TO.txt "
SRC_URI:append = " file://README.HOW_TO.txt "
inherit archiver
ARCHIVER_MODE[src] = "original"
COPYLEFT_LICENSE_INCLUDE_append = " BSD-3* "
COPYLEFT_LICENSE_INCLUDE:append = " BSD-3* "
inherit archiver_stm32mp_clean

16
recipes-bsp/trusted-firmware-a/tf-a-stm32mp-common.inc
View File

@ -1,6 +1,6 @@
PACKAGE_ARCH = "${MACHINE_ARCH}"
FILESEXTRAPATHS_prepend := "${THISDIR}/tf-a-stm32mp:"
FILESEXTRAPATHS:prepend := "${THISDIR}/tf-a-stm32mp:"
inherit deploy
inherit ${@bb.utils.contains('MACHINE_FEATURES', 'fip', 'fip-utils-stm32mp', '', d)}
@ -17,20 +17,20 @@ SRCREV_mbedtls = "523f0554b6cdc7ace5d360885c3f5bbcc73ec0e8"
LIC_FILES_CHKSUM_MBEDTLS = "file://mbedtls/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
LICENSE_MBEDTLS = "Apache-2.0"
# Add MBEDTLS to our sources
SRC_URI_append = " ${@bb.utils.contains('TF_A_SIGN_ENABLE', '1', '${SRC_URI_MBEDTLS}', '', d)}"
SRC_URI:append = " ${@bb.utils.contains('TF_A_SIGN_ENABLE', '1', '${SRC_URI_MBEDTLS}', '', d)}"
# Update license variables
LICENSE_append = "${@bb.utils.contains('TF_A_SIGN_ENABLE', '1', ' & ${LICENSE_MBEDTLS}', '', d)}"
LIC_FILES_CHKSUM_append = "${@bb.utils.contains('TF_A_SIGN_ENABLE', '1', ' ${LIC_FILES_CHKSUM_MBEDTLS}', '', d)}"
LICENSE:append = "${@bb.utils.contains('TF_A_SIGN_ENABLE', '1', ' & ${LICENSE_MBEDTLS}', '', d)}"
LIC_FILES_CHKSUM:append = "${@bb.utils.contains('TF_A_SIGN_ENABLE', '1', ' ${LIC_FILES_CHKSUM_MBEDTLS}', '', d)}"
# Add mbed TLS to version
SRCREV_FORMAT_append = "${@bb.utils.contains('TF_A_SIGN_ENABLE', '1', '_mbedtls', '', d)}"
SRCREV_FORMAT:append = "${@bb.utils.contains('TF_A_SIGN_ENABLE', '1', '_mbedtls', '', d)}"
# ------------------------------------
B = "${WORKDIR}/build"
# Configure build dir for externalsrc class usage through devtool
EXTERNALSRC_BUILD_pn-${PN} = "${WORKDIR}/build"
EXTERNALSRC_BUILD:pn-${PN} = "${WORKDIR}/build"
DEPENDS += "dtc-native"
DEPENDS_append = " ${@bb.utils.contains('TF_A_ENABLE_DEBUG_WRAPPER', '1', 'stm32wrapper4dbg-native', '', d)}"
DEPENDS:append = " ${@bb.utils.contains('TF_A_ENABLE_DEBUG_WRAPPER', '1', 'stm32wrapper4dbg-native', '', d)}"
# Default log level
ST_TF_A_DEBUG_LOG_LEVEL ??= "40"
@ -165,7 +165,7 @@ do_unpack[cleandirs] += "${S}"
do_unpack[cleandirs] += "${@bb.utils.contains('TFA_SHARED_SOURCES', '1', '${STAGING_TFA_DIR}', '', d)}"
do_clean[cleandirs] += "${S}"
do_clean[cleandirs] += "${@bb.utils.contains('TFA_SHARED_SOURCES', '1', '${STAGING_TFA_DIR}', '', d)}"
base_do_unpack_append () {
base_do_unpack:append () {
# 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_TFA_DIR here

10
recipes-bsp/trusted-firmware-a/tf-a-stm32mp-config.inc
View File

@ -14,11 +14,11 @@ TF_A_CONFIG[trusted] ?= "${STM32MP_DEVICETREE},AARCH32_SP=sp_min ${@bb.utils.con
TF_A_CONFIG[serialboot] ?= "${STM32MP_DEVICETREE},AARCH32_SP=sp_min STM32MP_UART_PROGRAMMER=1 STM32MP_USB_PROGRAMMER=1 STM32MP_USE_STM32IMAGE=1"
TF_A_CONFIG[emmc] ?= "${DEVICE_BOARD_ENABLE_EMMC},STM32MP_EMMC=1"
TF_A_CONFIG[nand] ?= "${DEVICE_BOARD_ENABLE_NAND},STM32MP_RAW_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NAND}' if ${TF_A_MTD_START_OFFSET_NAND} else ''}"
TF_A_CONFIG[nor] ?= "${DEVICE_BOARD_ENABLE_NOR},STM32MP_SPI_NOR=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NOR}' if ${TF_A_MTD_START_OFFSET_NOR} else ''}"
TF_A_CONFIG[sdcard] ?= "${DEVICE_BOARD_ENABLE_SDCARD},STM32MP_SDMMC=1"
TF_A_CONFIG[spinand] ?= "${DEVICE_BOARD_ENABLE_SPINAND},STM32MP_SPI_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_SPINAND}' if ${TF_A_MTD_START_OFFSET_SPINAND} else ''}"
TF_A_CONFIG[emmc] ?= "${DEVICE_BOARD_ENABLE:EMMC},STM32MP_EMMC=1"
TF_A_CONFIG[nand] ?= "${DEVICE_BOARD_ENABLE:NAND},STM32MP_RAW_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NAND}' if ${TF_A_MTD_START_OFFSET_NAND} else ''}"
TF_A_CONFIG[nor] ?= "${DEVICE_BOARD_ENABLE:NOR},STM32MP_SPI_NOR=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NOR}' if ${TF_A_MTD_START_OFFSET_NOR} else ''}"
TF_A_CONFIG[sdcard] ?= "${DEVICE_BOARD_ENABLE:SDCARD},STM32MP_SDMMC=1"
TF_A_CONFIG[spinand] ?= "${DEVICE_BOARD_ENABLE:SPINAND},STM32MP_SPI_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_SPINAND}' if ${TF_A_MTD_START_OFFSET_SPINAND} else ''}"
TF_A_CONFIG[uart] ?= "${STM32MP_DEVICETREE},STM32MP_UART_PROGRAMMER=1"
TF_A_CONFIG[usb] ?= "${STM32MP_DEVICETREE},STM32MP_USB_PROGRAMMER=1"

6
recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.4.bb
View File

@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://license.rst;md5=1dd070c98a281d18d9eefd938729b031"
PROVIDES += "virtual/trusted-firmware-a"
FILESEXTRAPATHS_prepend_stm32mpcommon := "${THISDIR}/tf-a-stm32mp:"
FILESEXTRAPATHS:prepend_stm32mpcommon := "${THISDIR}/tf-a-stm32mp:"
SRC_URI = "git://github.com/ARM-software/arm-trusted-firmware.git;protocol=https;nobranch=1"
SRCREV = "e2c509a39c6cc4dda8734e6509cdbe6e3603cdfc"
@ -48,8 +48,8 @@ include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'tf-a-stm32mp-
# ---------------------------------
BBCLASSEXTEND = "devupstream:target"
SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
SRCREV_class-devupstream = "3e1e3f0a6149d04946ff5debcd871173e782111c"
SRC_URI:class-devupstream = "git://github.com/STMicroelectronics/arm-trusted-firmware.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
SRCREV:class-devupstream = "3e1e3f0a6149d04946ff5debcd871173e782111c"
# ---------------------------------
# Configure default preference to manage dynamic selection between tarball and github

6
recipes-bsp/trusted-firmware-a/tf-a-tools_2.4.bb
View File

@ -9,7 +9,7 @@ SRCREV = "e2c509a39c6cc4dda8734e6509cdbe6e3603cdfc"
# Mandatory fix to allow feeding password through command line
SRC_URI += "file://0099-tools-allow-to-use-a-root-key-password-from-command-.patch"
DEPENDS_class-nativesdk = "nativesdk-openssl"
DEPENDS:class-nativesdk = "nativesdk-openssl"
S = "${WORKDIR}/git"
@ -25,8 +25,8 @@ do_install() {
install -m 0755 ${B}/tools/fiptool/fiptool ${D}${bindir}/fiptool
}
FILES_${PN}_class-nativesdk = "${bindir}/cert_create ${bindir}/fiptool"
FILES:${PN}:class-nativesdk = "${bindir}/cert_create ${bindir}/fiptool"
RDEPENDS_${PN}_class-nativesdk += "nativesdk-libcrypto"
RDEPENDS:${PN}:class-nativesdk += "nativesdk-libcrypto"
BBCLASSEXTEND += "native nativesdk"

4
recipes-bsp/u-boot/u-boot-fw-config-stm32mp_2020.10.bb
View File

@ -20,5 +20,5 @@ do_install () {
fi
}
FILES_${PN} += "${sysconfdir}/"
RDEPENDS_${PN} += "u-boot-fw-utils"
FILES:${PN} += "${sysconfdir}/"
RDEPENDS:${PN} += "u-boot-fw-utils"

2
recipes-bsp/u-boot/u-boot-stm32mp-archiver.inc
View File

@ -1,7 +1,7 @@
#
# Archiver Configuration
#
SRC_URI_append = " file://README.HOW_TO.txt "
SRC_URI:append = " file://README.HOW_TO.txt "
inherit archiver
ARCHIVER_MODE[src] = "original"

4
recipes-bsp/u-boot/u-boot-stm32mp-common_2020.10.inc
View File

@ -51,8 +51,8 @@ S = "${WORKDIR}/git"
# ---------------------------------
BBCLASSEXTEND = "devupstream:target"
SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/u-boot.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
SRCREV_class-devupstream = "6fde82adf71ebad4b16d99f76ed69abfd9cfaf42"
SRC_URI:class-devupstream = "git://github.com/STMicroelectronics/u-boot.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
SRCREV:class-devupstream = "6fde82adf71ebad4b16d99f76ed69abfd9cfaf42"
# ---------------------------------
# Configure default preference to manage dynamic selection between tarball and github

4
recipes-bsp/u-boot/u-boot-stm32mp-splash_2018.11.bb
View File

@ -27,5 +27,5 @@ do_install() {
fi
}
ALLOW_EMPTY_${PN} = "1"
FILES_${PN} = "/boot"
ALLOW_EMPTY:${PN} = "1"
FILES:${PN} = "/boot"

18
recipes-bsp/u-boot/u-boot-stm32mp.inc
View File

@ -1,9 +1,9 @@
require recipes-bsp/u-boot/u-boot.inc
FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot-stm32mp:"
FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-stm32mp:"
# Configure build dir for externalsrc class usage through devtool
EXTERNALSRC_BUILD_pn-${PN} = "${WORKDIR}/build"
EXTERNALSRC_BUILD:pn-${PN} = "${WORKDIR}/build"
B = "${WORKDIR}/build"
# Define dedicated var to configure SPL binary name to override U-Boot default
@ -34,7 +34,7 @@ STAGING_UBOOT_DIR = "${TMPDIR}/work-shared/${MACHINE}/uboot-source"
# the symlink.
do_unpack[cleandirs] += " ${S} ${STAGING_UBOOT_DIR}"
do_clean[cleandirs] += " ${S} ${STAGING_UBOOT_DIR}"
base_do_unpack_append () {
base_do_unpack:append () {
# 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_UBOOT_DIR here
@ -62,7 +62,7 @@ base_do_unpack_append () {
# -----------------------------------------------------------------------------
# Prepend configure to handle specific configuration (here fip)
#
do_configure_prepend() {
do_configure:prepend() {
if [ -n "${UBOOT_CONFIG}" ]; then
unset i j
for config in ${UBOOT_MACHINE}; do
@ -91,7 +91,7 @@ do_configure_prepend() {
# -----------------------------------------------------------------------------
# Append configure to handle specific MTDPART check if required
#
do_configure_append() {
do_configure:append() {
if [ -n "${UBOOT_MTDPART_CHECK_ENABLE}" ]; then
if [ -n "${UBOOT_CONFIG}" ]; then
for config in ${UBOOT_MACHINE}; do
@ -139,7 +139,7 @@ do_configure_append() {
# -----------------------------------------------------------------------------
# Append compile to handle specific device tree compilation
#
do_compile_append() {
do_compile:append() {
if [ -n "${UBOOT_DEVICETREE}" ]; then
if [ -n "${UBOOT_CONFIG}" ]; then
unset i j k
@ -194,7 +194,7 @@ do_compile_append() {
# Append deploy to handle specific device tree binary deployement
#
do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}/u-boot"
do_deploy_append() {
do_deploy:append() {
if [ -n "${UBOOT_DEVICETREE}" ]; then
if [ -n "${UBOOT_CONFIG}" ]; then
# Clean deploydir from any available binary first
@ -274,8 +274,8 @@ do_deploy_append() {
# ---------------------------------------------------------------------
# Avoid QA Issue: No GNU_HASH in the elf binary
INSANE_SKIP_${PN} += "ldflags"
INSANE_SKIP:${PN} += "ldflags"
# ---------------------------------------------------------------------
# Avoid QA Issue: ELF binary has relocations in .text
# (uboot no need -fPIC option : remove check)
INSANE_SKIP_${PN} += "textrel"
INSANE_SKIP:${PN} += "textrel"

2
recipes-bsp/u-boot/u-boot-stm32mp_2020.10.bb
View File

@ -5,7 +5,7 @@ SUMMARY = "Universal Boot Loader for embedded devices for stm32mp"
LICENSE = "GPLv2+"
PROVIDES += "u-boot"
RPROVIDES_${PN} += "u-boot"
RPROVIDES:${PN} += "u-boot"
# ---------------------------------
# Configure archiver use

4
recipes-connectivity/bluetooth/bluetooth-suspend.bb
View File

@ -11,7 +11,7 @@ SRC_URI = " \
inherit systemd
SYSTEMD_PACKAGES += "${PN}"
SYSTEMD_SERVICE_${PN} = "bluetooth-brcmfmac-sleep.service"
SYSTEMD_SERVICE:${PN} = "bluetooth-brcmfmac-sleep.service"
do_install() {
install -d ${D}${bindir}
@ -24,5 +24,5 @@ do_install() {
fi
}
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY:${PN} = "1"

2
recipes-core/base-files/base-files_%.bbappend
View File

@ -1 +1 @@
FILESEXTRAPATHS_prepend_stm32mpcommon := "${THISDIR}/${PN}:"
FILESEXTRAPATHS:prepend:stm32mpcommon := "${THISDIR}/${PN}:"

12
recipes-core/busybox/busybox_%.bbappend
View File

@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend_stm32mpcommon := "${THISDIR}/${PN}:"
FILESEXTRAPATHS:prepend:stm32mpcommon := "${THISDIR}/${PN}:"
SRC_URI_append_stm32mpcommon = " \
SRC_URI:append:stm32mpcommon = " \
file://${BUSYBOX_CONFIG_FRAGMENT} \
file://0001-miscutils-watchdog-Add-gettimeleft.patch \
file://ifplugd.conf \
@ -8,19 +8,19 @@ SRC_URI_append_stm32mpcommon = " \
file://ifplugd.sh \
"
BUSYBOX_CONFIG_FRAGMENT_stm32mpcommon = "busybox-stm32mp.cfg"
BUSYBOX_CONFIG_FRAGMENT:stm32mpcommon = "busybox-stm32mp.cfg"
#inherit update-rc.d
DEPENDS_append_stm32mpcommon = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'update-rc.d-native', d)}"
DEPENDS:append:stm32mpcommon = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'update-rc.d-native', d)}"
do_configure_append_stm32mpcommon () {
do_configure:append:stm32mpcommon () {
# merge specific configuration to newly generated .config
merge_config.sh -m -r -O ${B} ${B}/.config ${WORKDIR}/${BUSYBOX_CONFIG_FRAGMENT} 1>&2
# make sure to generate proper config file for busybox
cml1_do_configure
}
do_install_append_stm32mpcommon () {
do_install:append:stm32mpcommon () {
if [ "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '1', '0', d)}" = "0" ]; then
if grep -q "CONFIG_IFPLUGD=y" ${B}/.config; then
install -d ${D}${sysconfdir}/ifplugd

2
recipes-core/meta/target-sdk-provides-dummy.bbappend
View File

@ -1 +1 @@
DUMMYPROVIDES_remove_stm32mpcommon = "busybox-dev perl-dev"
DUMMYPROVIDES:remove:stm32mpcommon = "busybox-dev perl-dev"

2
recipes-core/systemd/systemd-conf_%.bbappend
View File

@ -1,4 +1,4 @@
do_install_append_stm32mpcommon() {
do_install:append:stm32mpcommon() {
# enable watchdog on systemd configuration
if ${@bb.utils.contains('MACHINE_FEATURES','watchdog','true','false',d)}; then
install -d ${D}${systemd_unitdir}/system.conf.d/

124
recipes-devtools/cmsis-svd/cmsis-svd_git.bb
View File

@ -50,7 +50,7 @@ CMSIS_SVD_DATA ?= "\
"
# Empty cmsis-svd packages to use it as a meta package for dependencies install
FILES_${PN}_class-target = ""
FILES:${PN}:class-target = ""
do_configure[noexec] = "1"
do_compile[noexec] = "1"
@ -84,122 +84,122 @@ do_install () {
}
# For parser and ARM_SAMPLE svd file example
LICENSE_${PN}-parser = "Apache-2.0"
LICENSE_${PN}-apache-license = "Apache-2.0"
LICENSE:${PN}-parser = "Apache-2.0"
LICENSE:${PN}-apache-license = "Apache-2.0"
FILES_${PN}-apache-license = "${INSTALL_PATH}/LICENSE-APACHE"
FILES_${PN}-parser = "${INSTALL_PATH}/*.py ${INSTALL_PATH}/examples ${INSTALL_PATH}/tests ${INSTALL_PATH}/data/ARM_SAMPLE/*.svd"
FILES:${PN}-apache-license = "${INSTALL_PATH}/LICENSE-APACHE"
FILES:${PN}-parser = "${INSTALL_PATH}/*.py ${INSTALL_PATH}/examples ${INSTALL_PATH}/tests ${INSTALL_PATH}/data/ARM_SAMPLE/*.svd"
RDEPENDS_${PN}-parser += "${PN}-apache-license"
RDEPENDS:${PN}-parser += "${PN}-apache-license"
# For python dependencies
RDEPENDS_${PN}-parser += "python3-json"
RDEPENDS_${PN}-parser += "python3-setuptools"
RDEPENDS_${PN}-parser += "python3-six"
RDEPENDS_${PN}-parser += "python3-xml"
RDEPENDS:${PN}-parser += "python3-json"
RDEPENDS:${PN}-parser += "python3-setuptools"
RDEPENDS:${PN}-parser += "python3-six"
RDEPENDS:${PN}-parser += "python3-xml"
# For Atmel
LICENSE_${PN}-data-atmel = "svd-Atmel"
LICENSE_${PN}-atmel-license = "svd-Atmel"
LICENSE:${PN}-data-atmel = "svd-Atmel"
LICENSE:${PN}-atmel-license = "svd-Atmel"
FILES_${PN}-atmel-license = "${INSTALL_PATH}/data/Atmel/License.html"
FILES_${PN}-data-atmel = "${INSTALL_PATH}/data/Atmel/*.svd"
FILES:${PN}-atmel-license = "${INSTALL_PATH}/data/Atmel/License.html"
FILES:${PN}-data-atmel = "${INSTALL_PATH}/data/Atmel/*.svd"
RDEPENDS_${PN}-data-atmel += "${PN}-atmel-license"
RDEPENDS:${PN}-data-atmel += "${PN}-atmel-license"
# For Freescale
LICENSE_${PN}-data-freescale = "svd-Freescale"
LICENSE_${PN}-freescale-license = "svd-Freescale"
LICENSE:${PN}-data-freescale = "svd-Freescale"
LICENSE:${PN}-freescale-license = "svd-Freescale"
FILES_${PN}-freescale-license = "${INSTALL_PATH}/data/Freescale/Freescale*CMSIS-SVD*License*Agreement.pdf"
FILES_${PN}-data-freescale = "${INSTALL_PATH}/data/Freescale/*.svd"
FILES:${PN}-freescale-license = "${INSTALL_PATH}/data/Freescale/Freescale*CMSIS-SVD*License*Agreement.pdf"
FILES:${PN}-data-freescale = "${INSTALL_PATH}/data/Freescale/*.svd"
RDEPENDS_${PN}-data-freescale += "${PN}-freescale-license"
RDEPENDS:${PN}-data-freescale += "${PN}-freescale-license"
# For Fujitsu
LICENSE_${PN}-data-fujitsu = "svd-Fujitsu"
LICENSE_${PN}-fujitsu-license = "svd-Fujitsu"
LICENSE:${PN}-data-fujitsu = "svd-Fujitsu"
LICENSE:${PN}-fujitsu-license = "svd-Fujitsu"
FILES_${PN}-fujitsu-license = "${INSTALL_PATH}/data/Fujitsu/License.html"
FILES_${PN}-data-fujitsu = "${INSTALL_PATH}/data/Fujitsu/*.svd"
FILES:${PN}-fujitsu-license = "${INSTALL_PATH}/data/Fujitsu/License.html"
FILES:${PN}-data-fujitsu = "${INSTALL_PATH}/data/Fujitsu/*.svd"
RDEPENDS_${PN}-data-fujitsu += "${PN}-fujitsu-license"
RDEPENDS:${PN}-data-fujitsu += "${PN}-fujitsu-license"
# For Holtek
LICENSE_${PN}-data-holtek = "Apache-2.0"
LICENSE:${PN}-data-holtek = "Apache-2.0"
FILES_${PN}-data-holtek = "${INSTALL_PATH}/data/Holtek/*.svd"
FILES:${PN}-data-holtek = "${INSTALL_PATH}/data/Holtek/*.svd"
RDEPENDS_${PN}-data-holtek += "${PN}-apache-license"
RDEPENDS:${PN}-data-holtek += "${PN}-apache-license"
# For Nordic
LICENSE_${PN}-data-nordic = "Apache-2.0"
LICENSE:${PN}-data-nordic = "Apache-2.0"
FILES_${PN}-data-nordic = "${INSTALL_PATH}/data/Nordic/*.svd"
FILES:${PN}-data-nordic = "${INSTALL_PATH}/data/Nordic/*.svd"
RDEPENDS_${PN}-data-nordic += "${PN}-apache-license"
RDEPENDS:${PN}-data-nordic += "${PN}-apache-license"
# For Nuvoton
LICENSE_${PN}-data-nuvoton = "Apache-2.0"
LICENSE:${PN}-data-nuvoton = "Apache-2.0"
FILES_${PN}-data-nuvoton = "${INSTALL_PATH}/data/Nuvoton/*.svd"
FILES:${PN}-data-nuvoton = "${INSTALL_PATH}/data/Nuvoton/*.svd"
RDEPENDS_${PN}-data-nuvoton += "${PN}-apache-license"
RDEPENDS:${PN}-data-nuvoton += "${PN}-apache-license"
# For NXP
LICENSE_${PN}-data-nxp = "Apache-2.0"
LICENSE:${PN}-data-nxp = "Apache-2.0"
FILES_${PN}-data-nxp = "${INSTALL_PATH}/data/NXP/*.svd"
FILES:${PN}-data-nxp = "${INSTALL_PATH}/data/NXP/*.svd"
RDEPENDS_${PN}-data-nxp += "${PN}-apache-license"
RDEPENDS:${PN}-data-nxp += "${PN}-apache-license"
# For SiliconLabs
LICENSE_${PN}-data-siliconlabs = "Apache-2.0"
LICENSE:${PN}-data-siliconlabs = "Apache-2.0"
FILES_${PN}-data-siliconlabs = "${INSTALL_PATH}/data/SiliconLabs/*.svd"
FILES:${PN}-data-siliconlabs = "${INSTALL_PATH}/data/SiliconLabs/*.svd"
RDEPENDS_${PN}-data-siliconlabs += "${PN}-apache-license"
RDEPENDS:${PN}-data-siliconlabs += "${PN}-apache-license"
# For Spansion
LICENSE_${PN}-data-spansion = "Apache-2.0"
LICENSE:${PN}-data-spansion = "Apache-2.0"
FILES_${PN}-data-spansion = "${INSTALL_PATH}/data/Spansion/*.svd"
FILES:${PN}-data-spansion = "${INSTALL_PATH}/data/Spansion/*.svd"
RDEPENDS_${PN}-data-spansion += "${PN}-apache-license"
RDEPENDS:${PN}-data-spansion += "${PN}-apache-license"
# For STMicro
LICENSE_${PN}-data-stmicro = "svd-STMicro"
LICENSE_${PN}-stmicro-license = "svd-STMicro"
LICENSE:${PN}-data-stmicro = "svd-STMicro"
LICENSE:${PN}-stmicro-license = "svd-STMicro"
FILES_${PN}-stmicro-license = "${INSTALL_PATH}/data/STMicro/License.html"
FILES_${PN}-data-stmicro = "${INSTALL_PATH}/data/STMicro/*.svd"
FILES:${PN}-stmicro-license = "${INSTALL_PATH}/data/STMicro/License.html"
FILES:${PN}-data-stmicro = "${INSTALL_PATH}/data/STMicro/*.svd"
RDEPENDS_${PN}-data-stmicro += "${PN}-stmicro-license"
RDEPENDS:${PN}-data-stmicro += "${PN}-stmicro-license"
# For TexasInstruments
LICENSE_${PN}-data-texasinstruments = "Apache-2.0"
LICENSE:${PN}-data-texasinstruments = "Apache-2.0"
FILES_${PN}-data-texasinstruments = "${INSTALL_PATH}/data/TexasInstruments/*.svd"
FILES:${PN}-data-texasinstruments = "${INSTALL_PATH}/data/TexasInstruments/*.svd"
RDEPENDS_${PN}-data-texasinstruments += "${PN}-apache-license"
RDEPENDS:${PN}-data-texasinstruments += "${PN}-apache-license"
# For Toshiba
LICENSE_${PN}-data-toshiba = "Apache-2.0"
LICENSE:${PN}-data-toshiba = "Apache-2.0"
FILES_${PN}-data-toshiba = "${INSTALL_PATH}/data/Toshiba/*.svd"
FILES:${PN}-data-toshiba = "${INSTALL_PATH}/data/Toshiba/*.svd"
RDEPENDS_${PN}-data-toshiba += "${PN}-apache-license"
RDEPENDS:${PN}-data-toshiba += "${PN}-apache-license"
# Make cmsis-svd package depend on all of the split-out packages
python populate_packages_prepend () {
python populate_packages:prepend () {
firmware_pkgs = oe.utils.packages_filter_out_system(d)
d.appendVar('RDEPENDS_cmsis-svd', ' ' + ' '.join(firmware_pkgs))
d.appendVar('RRECOMMENDS_cmsis-svd_append_class-nativesdk', ' ' + ' '.join(firmware_pkgs))
d.appendVar('RDEPENDS:cmsis-svd', ' ' + ' '.join(firmware_pkgs))
d.appendVar('RRECOMMENDS:cmsis-svd:append:class-nativesdk', ' ' + ' '.join(firmware_pkgs))
}
# Make sure also to add python dependencies
RRECOMMENDS_${PN}_append_class-nativesdk = " nativesdk-python3-json "
RRECOMMENDS_${PN}_append_class-nativesdk = " nativesdk-python3-setuptools "
RRECOMMENDS_${PN}_append_class-nativesdk = " nativesdk-python3-six "
RRECOMMENDS_${PN}_append_class-nativesdk = " nativesdk-python3-xml "
RRECOMMENDS:${PN}:append:class-nativesdk = " nativesdk-python3-json "
RRECOMMENDS:${PN}:append:class-nativesdk = " nativesdk-python3-setuptools "
RRECOMMENDS:${PN}:append:class-nativesdk = " nativesdk-python3-six "
RRECOMMENDS:${PN}:append:class-nativesdk = " nativesdk-python3-xml "
# Make sure to create the cmsis-svd package
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY:${PN} = "1"

4
recipes-devtools/cmsis-svd/cmsis-svd_git.bbappend
View File

@ -1,4 +1,4 @@
# Add stm32mp1 support
SRC_URI_append_stm32mpcommon = " file://0001-data-STMicro-add-support-of-stm32mp15xxx.patch"
SRC_URI:append:stm32mpcommon = " file://0001-data-STMicro-add-support-of-stm32mp15xxx.patch"
# Add the same for nativesdk
SRC_URI_append_class-nativesdk = " file://0001-data-STMicro-add-support-of-stm32mp15xxx.patch"
SRC_URI:append:class-nativesdk = " file://0001-data-STMicro-add-support-of-stm32mp15xxx.patch"

2
recipes-devtools/gcc-arm-none-eabi/gcc-arm-none-eabi_9.inc
View File

@ -16,6 +16,6 @@ do_install() {
cp -r ${S}/. ${D}/${datadir}/gcc-arm-none-eabi
}
INSANE_SKIP_${PN} = "already-stripped file-rdeps"
INSANE_SKIP:${PN} = "already-stripped file-rdeps"
INHIBIT_PACKAGE_STRIP = "1"
INHIBIT_SYSROOT_STRIP = "1"

8
recipes-devtools/gcc-arm-none-eabi/nativesdk-gcc-arm-none-eabi_9.bb
View File

@ -5,9 +5,9 @@ require gcc-arm-none-eabi_${PV}.inc
inherit nativesdk
FILES_${PN}-doc = "${datadir}/gcc-arm-none-eabi/share/doc"
FILES:${PN}-doc = "${datadir}/gcc-arm-none-eabi/share/doc"
FILES_${PN}-staticdev = "${datadir}/gcc-arm-none-eabi/*/*/*.a \
FILES:${PN}-staticdev = "${datadir}/gcc-arm-none-eabi/*/*/*.a \
${datadir}/gcc-arm-none-eabi/*/*/*/*.a \
${datadir}/gcc-arm-none-eabi/*/*/*/*/*.a \
${datadir}/gcc-arm-none-eabi/*/*/*/*/*/*.a \
@ -16,8 +16,8 @@ FILES_${PN}-staticdev = "${datadir}/gcc-arm-none-eabi/*/*/*.a \
${datadir}/gcc-arm-none-eabi/*/*/*/*/*/*/*/*/*.a \
"
FILES_${PN} += "${datadir}/gcc-arm-none-eabi"
FILES:${PN} += "${datadir}/gcc-arm-none-eabi"
# Some library files in the tarball are not at the expected place,
# and it's working. But QA will complain, so skip the complaint on libdir
INSANE_SKIP_${PN} += "libdir"
INSANE_SKIP:${PN} += "libdir"

8
recipes-devtools/gdb/gdb-cross-canadian_%.bbappend
View File

@ -1,18 +1,18 @@
FILESEXTRAPATHS_prepend_stm32mpcommon := "${THISDIR}/files:"
FILESEXTRAPATHS:prepend:stm32mpcommon := "${THISDIR}/files:"
#Add scripts for gdb/openocd/eclipse
SRC_URI_append_stm32mpcommon += " \
SRC_URI:append:stm32mpcommon = " \
file://gdbinit \
"
# Ref to yocto default conf at:
# openembedded-core/meta/recipes-devtools/gdb/gdb-common.inc
# We force activation of tui for the "layout" command.
EXTRA_OECONF_append_stm32mpcommon = " \
EXTRA_OECONF:append:stm32mpcommon = " \
--enable-tui \
"
do_install_append_stm32mpcommon() {
do_install:append:stm32mpcommon() {
install -d ${D}/${bindir}/
cp -a --no-preserve=ownership ${WORKDIR}/gdbinit ${D}/${bindir}/
}

8
recipes-devtools/gdb/gdb-cross_%.bbappend
View File

@ -1,18 +1,18 @@
FILESEXTRAPATHS_prepend_stm32mpcommon := "${THISDIR}/files:"
FILESEXTRAPATHS:prepend:stm32mpcommon := "${THISDIR}/files:"
#Add scripts for gdb/openocd/eclipse
SRC_URI_append_stm32mpcommon += " \
SRC_URI:append:stm32mpcommon = " \
file://gdbinit \
"
# Ref to yocto default conf at:
# openembedded-core/meta/recipes-devtools/gdb/gdb-common.inc
# We force activation of tui for the "layout" command.
EXTRA_OECONF_append_stm32mpcommon = " \
EXTRA_OECONF:append:stm32mpcommon = " \
--enable-tui \
"
do_install_append_stm32mpcommon() {
do_install:append:stm32mpcommon() {
install -d ${D}/${bindir}/
cp -a ${WORKDIR}/gdbinit ${D}/${bindir}/
}

17
recipes-devtools/openocd/openocd-stm32mp.inc
View File

@ -1,13 +1,13 @@
DEPENDS = "hidapi-stm32mp"
RDEPENDS_${PN} += "libusb1 hidapi-stm32mp"
RDEPENDS:${PN} += "libusb1 hidapi-stm32mp"
inherit pkgconfig autotools-brokensep gettext
SRC_URI = " \
git://repo.or.cz/git2cl.git;destsuffix=git/tools/git2cl;name=git2cl \
git://github.com/msteveb/jimtcl;protocol=https;destsuffix=git/jimtcl;name=jimtcl \
git://repo.or.cz/libjaylink.git;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \
git://repo.or.cz/git2cl.git;destsuffix=git/tools/git2cl;name=git2cl;branch=master \
git://github.com/msteveb/jimtcl;protocol=https;destsuffix=git/jimtcl;name=jimtcl;branch=master \
git://repo.or.cz/libjaylink.git;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \
"
SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba"
@ -19,10 +19,10 @@ S = "${WORKDIR}/git"
BBCLASSEXTEND += "native nativesdk"
DEPENDS += "hidapi-stm32mp"
DEPENDS_class-native = "hidapi-stm32mp-native"
DEPENDS_class-nativesdk = "nativesdk-hidapi-stm32mp"
DEPENDS:class-native = "hidapi-stm32mp-native"
DEPENDS:class-nativesdk = "nativesdk-hidapi-stm32mp"
RDEPENDS_${PN} += "libusb1 hidapi-stm32mp"
RDEPENDS:${PN} += "libusb1 hidapi-stm32mp"
EXTRA_OECONF = " \
--disable-doxygen-html \
@ -39,6 +39,7 @@ EXTRA_OECONF = " \
CCACHE_DISABLE = "1"
do_configure() {
export RANLIB="ranlib"
./bootstrap nosubmodule
oe_runconf ${EXTRA_OECONF}
}
@ -56,7 +57,7 @@ do_install() {
fi
}
FILES_${PN} = " \
FILES:${PN} = " \
${datadir}/openocd/* \
${bindir}/openocd \
"

6
recipes-devtools/optee-sdk/optee-sdk_1.0.0.bb
View File

@ -2,16 +2,16 @@ SUMMARY = "TA development kit built from optee_os, needed to build OP-TEE TAs"
LICENSE = "MIT"
SRC_URI_append_class-nativesdk = " file://environment.d-optee-sdk.sh"
SRC_URI:append:class-nativesdk = " file://environment.d-optee-sdk.sh"
BBCLASSEXTEND = " nativesdk"
do_configure[noexec] = "1"
do_compile[noexec] = "1"
do_install_append_class-nativesdk () {
do_install:append:class-nativesdk () {
mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
install -m 644 ${WORKDIR}/environment.d-optee-sdk.sh ${D}${SDKPATHNATIVE}/environment-setup.d/optee-sdk.sh
}
FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/optee-sdk.sh"
FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/optee-sdk.sh"

10
recipes-devtools/sdcard-raw-tools/sdcard-raw-tools.bb
View File

@ -9,9 +9,9 @@ SRC_URI = "file://create_sdcard_from_flashlayout.sh"
BBCLASSEXTEND = "native nativesdk"
RDEPENDS_${PN}_append = " bash "
RDEPENDS:${PN}:append = " bash "
RRECOMMENDS_${PN}_append_class-nativesdk = " nativesdk-gptfdisk "
RRECOMMENDS:${PN}:append:class-nativesdk = " nativesdk-gptfdisk "
inherit deploy
@ -28,8 +28,8 @@ do_configure() {
sed 's/^DEFAULT_RAW_SIZE=.*$/DEFAULT_RAW_SIZE='"$raw_size"'/' -i ${WORKDIR}/create_sdcard_from_flashlayout.sh
fi
bbnote "Update DEFAULT_SDCARD_PARTUUID to ${DEVICE_PARTUUID_ROOTFS_SDCARD}"
sed 's/^DEFAULT_SDCARD_PARTUUID=.*$/DEFAULT_SDCARD_PARTUUID='"${DEVICE_PARTUUID_ROOTFS_SDCARD}"'/' -i ${WORKDIR}/create_sdcard_from_flashlayout.sh
bbnote "Update DEFAULT_SDCARD_PARTUUID to ${DEVICE_PARTUUID_ROOTFS:SDCARD}"
sed 's/^DEFAULT_SDCARD_PARTUUID=.*$/DEFAULT_SDCARD_PARTUUID='"${DEVICE_PARTUUID_ROOTFS:SDCARD}"'/' -i ${WORKDIR}/create_sdcard_from_flashlayout.sh
fi
}
@ -41,7 +41,7 @@ do_install() {
do_deploy() {
:
}
do_deploy_class-native() {
do_deploy:class-native() {
install -d ${DEPLOYDIR}/${SCRIPT_DEPLOYDIR}
install -m 0755 ${WORKDIR}/create_sdcard_from_flashlayout.sh ${DEPLOYDIR}/${SCRIPT_DEPLOYDIR}/
}

10
recipes-devtools/svd-tools/svd-tools_git.bb
View File

@ -13,11 +13,11 @@ S = "${WORKDIR}/git"
BBCLASSEXTEND = "native nativesdk"
RDEPENDS_${PN} += "cmsis-svd"
RRECOMMENDS_${PN}_append_class-nativesdk = " nativesdk-cmsis-svd "
RDEPENDS:${PN} += "cmsis-svd"
RRECOMMENDS:${PN}:append:class-nativesdk = " nativesdk-cmsis-svd "
# For python dependencies
RDEPENDS_${PN} += "python3-terminaltables"
RRECOMMENDS_${PN}_append_class-nativesdk = " nativesdk-python3-terminaltables "
RDEPENDS:${PN} += "python3-terminaltables"
RRECOMMENDS:${PN}:append:class-nativesdk = " nativesdk-python3-terminaltables "
do_configure[noexec] = "1"
do_compile[noexec] = "1"
@ -30,4 +30,4 @@ do_install () {
install -m 0755 ${S}/gdb-svd.py ${D}${INSTALL_PATH}
}
FILES_${PN} = "${INSTALL_PATH}/*"
FILES:${PN} = "${INSTALL_PATH}/*"

4
recipes-devtools/svd-tools/svd-tools_git.bbappend
View File

@ -1,3 +1,3 @@
SRC_URI_append_stm32mpcommon = " file://0001-SDK-Add-relative-path-for-cmsis-svd.patch"
SRC_URI:append:stm32mpcommon = " file://0001-SDK-Add-relative-path-for-cmsis-svd.patch"
# Add the same for nativesdk
SRC_URI_append_class-nativesdk = " file://0001-SDK-Add-relative-path-for-cmsis-svd.patch"
SRC_URI:append:class-nativesdk = " file://0001-SDK-Add-relative-path-for-cmsis-svd.patch"

6
recipes-extended/linux-examples/linux-examples-stm32mp1.bb
View File

@ -16,10 +16,10 @@ S = "${WORKDIR}/git"
PACKAGES += "${PN}-userfs"
# Package -dev and -dbg are empty so don't generate them
ALLOW_EMPTY_${PN}-dev = "0"
ALLOW_EMPTY_${PN}-dbg = "0"
ALLOW_EMPTY:${PN}-dev = "0"
ALLOW_EMPTY:${PN}-dbg = "0"
FILES_${PN}-userfs = "${prefix}/local/Linux-A7-examples"
FILES:${PN}-userfs = "${prefix}/local/Linux-A7-examples"
do_install() {
# Install scripts and README in userfs:

2
recipes-extended/m4coredump/m4fwcoredump.bb
View File

@ -34,4 +34,4 @@ do_install() {
install -m 755 ${WORKDIR}/stm32mp-coredump-sysfs.sh ${D}${base_sbindir}/
fi
}
FILES_${PN} += "${systemd_unitdir}/system"
FILES:${PN} += "${systemd_unitdir}/system"

16
recipes-extended/m4projects/m4projects.inc
View File

@ -1,4 +1,4 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
COMPATIBLE_MACHINE = "(stm32mpcommon)"
@ -6,7 +6,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
B = "${WORKDIR}/build"
# For external source support with devtools
EXTERNALSRC_BUILD_pn-${PN} = "${WORKDIR}/build"
EXTERNALSRC_BUILD:pn-${PN} = "${WORKDIR}/build"
# M4 firwmare build file
SRC_URI += "file://Makefile.stm32"
@ -142,8 +142,8 @@ do_install() {
# -----------------------------------------------------------
# specific for service: start copro m4 firwmare at boot time
SYSTEMD_PACKAGES += " m4projects-stm32mp1 "
SYSTEMD_SERVICE_${PN} = "st-m4firmware-load.service"
SYSTEMD_AUTO_ENABLE_${PN} = "disable"
SYSTEMD_SERVICE:${PN} = "st-m4firmware-load.service"
SYSTEMD_AUTO_ENABLE:${PN} = "disable"
INITSCRIPT_NAME = "st-m4firmware-load-default.sh"
INITSCRIPT_PARAMS = "stop 22 5 3 ."
@ -152,8 +152,8 @@ INITSCRIPT_PARAMS = "stop 22 5 3 ."
INHIBIT_PACKAGE_STRIP = "1"
INHIBIT_SYSROOT_STRIP = "1"
FILES_${PN} += "${nonarch_base_libdir}/firmware ${sysconfdir}/init.d ${systemd_unitdir}/system ${systemd_unitdir}/system-shutdown"
FILES:${PN} += "${nonarch_base_libdir}/firmware ${sysconfdir}/init.d ${systemd_unitdir}/system ${systemd_unitdir}/system-shutdown"
# Configure package split
FILES_${PN} += "${@bb.utils.contains('M4_PACKAGE_4USERFS', '1', '', '${M4_OUTPUT_4USERFS}', d)}"
FILES_${PN}-userfs = "${@bb.utils.contains('M4_PACKAGE_4USERFS', '1', '${M4_OUTPUT_4USERFS}', '', d)}"
RDEPENDS_${PN}-userfs += "busybox"
FILES:${PN} += "${@bb.utils.contains('M4_PACKAGE_4USERFS', '1', '', '${M4_OUTPUT_4USERFS}', d)}"
FILES:${PN}-userfs = "${@bb.utils.contains('M4_PACKAGE_4USERFS', '1', '${M4_OUTPUT_4USERFS}', '', d)}"
RDEPENDS:${PN}-userfs += "busybox"

8
recipes-extended/sysdig/sysdig-stm32mp_git.bb
View File

@ -6,7 +6,7 @@ HOMEPAGE = "http://www.sysdig.org/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=f8fee3d59797546cffab04f3b88b2d44"
PROVIDES_append_stm32mpcommon += " sysdig "
PROVIDES:append:stm32mpcommon = " sysdig "
inherit cmake pkgconfig
@ -17,7 +17,7 @@ DEPENDS += "jsoncpp openssl curl jq"
DEPENDS += "tbb elfutils"
DEPENDS += "libb64"
RDEPENDS_${PN} = "bash"
RDEPENDS:${PN} = "bash"
SRC_URI = "git://github.com/draios/sysdig.git;protocol=https"
SRCREV = "aa82b2fb329ea97a8ade31590954ddaa675e1728"
@ -45,11 +45,11 @@ EXTRA_OECMAKE += ' \
-DUSE_BUNDLED_TBB="OFF" \
'
FILES_${PN} += " \
FILES:${PN} += " \
${DIR_ETC}/* \
${datadir}/zsh/* \
"
FILES_${PN}-dev = " ${prefix}/src/* "
FILES:${PN}-dev = " ${prefix}/src/* "
# luajit not supported on Aarch64
COMPATIBLE_HOST = "^(?!aarch64).*"

46
recipes-graphics/gcnano-userland/gcnano-userland-binary.inc
View File

@ -139,41 +139,41 @@ INHIBIT_PACKAGE_STRIP = "1"
INHIBIT_SYSROOT_STRIP = "1"
# Avoid QA Issue: No GNU_HASH in the elf binary
INSANE_SKIP_${PN} += "ldflags"
INSANE_SKIP:${PN} += "ldflags"
# Avoid QA Issue: non -dev/-dbg/nativesdk- package contains symlink .so
INSANE_SKIP_${PN} += "dev-so"
INSANE_SKIP:${PN} += "dev-so"
# Avoid QA Issue: file-rdeps
INSANE_SKIP_${PN} += "file-rdeps"
INSANE_SKIP:${PN} += "file-rdeps"
# Avoid QA Issue: debug-deps
INSANE_SKIP_${PN} += "debug-deps"
INSANE_SKIP:${PN} += "debug-deps"
INSANE_SKIP_${PN}-dev += "dev-elf dev-so ldflags file-rdeps"
INSANE_SKIP:${PN}-dev += "dev-elf dev-so ldflags file-rdeps"
# Monolitic configuration
RPROVIDES_${PN} = "libegl libegl1 libgles1 libglesv1-cm1 libgles2 libglesv2-2 libvg libgbm gbm_viv"
RREPLACES_${PN} = "libegl libegl1 libgles1 libglesv1-cm1 libgles2 libglesv2-2 libvg libgbm gbm_viv"
RCONFLICTS_${PN} = "libegl libegl1 libgles1 libglesv1-cm1 libgles2 libglesv2-2 libvg libgbm gbm_viv"
RPROVIDES:${PN} = "libegl libegl1 libgles1 libglesv1-cm1 libgles2 libglesv2-2 libvg libgbm gbm_viv"
RREPLACES:${PN} = "libegl libegl1 libgles1 libglesv1-cm1 libgles2 libglesv2-2 libvg libgbm gbm_viv"
RCONFLICTS:${PN} = "libegl libegl1 libgles1 libglesv1-cm1 libgles2 libglesv2-2 libvg libgbm gbm_viv"
PACKAGES = "${PN} ${PN}-dev "
SUMMARY_${PN} = "${SUMMARY}"
FILES_${PN} = "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libEGL.so* ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libEGL.*.${GCNANO_TYPE}.so"
FILES_${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libGLESv1_CM.so ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libGLESv1_CM.*.${GCNANO_TYPE}.so"
FILES_${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libGLESv2.so* ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libGLESv2.*.${GCNANO_TYPE}.so"
FILES_${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libOpenVG.so ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libOpenVG.*.${GCNANO_TYPE}.so"
FILES_${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libGAL.so ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libGAL.*.${GCNANO_TYPE}.so"
FILES_${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libVSC.so ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libVSC.*.${GCNANO_TYPE}.so"
FILES_${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libGLSLC.so ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libGLSLC.*.${GCNANO_TYPE}.so"
FILES_${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libgbm.so* ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libgbm.*.${GCNANO_TYPE}.so*"
FILES_${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libwayland-viv*.so*"
FILES_${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/gbm_viv.so ${GCNANO_USERLAND_OUTPUT_LIBDIR}/gbm_viv.*.${GCNANO_TYPE}.so"
FILES_${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libgbm_viv.so ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libgbm_viv.*.${GCNANO_TYPE}.so"
SUMMARY:${PN} = "${SUMMARY}"
FILES:${PN} = "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libEGL.so* ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libEGL.*.${GCNANO_TYPE}.so"
FILES:${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libGLESv1_CM.so ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libGLESv1_CM.*.${GCNANO_TYPE}.so"
FILES:${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libGLESv2.so* ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libGLESv2.*.${GCNANO_TYPE}.so"
FILES:${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libOpenVG.so ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libOpenVG.*.${GCNANO_TYPE}.so"
FILES:${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libGAL.so ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libGAL.*.${GCNANO_TYPE}.so"
FILES:${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libVSC.so ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libVSC.*.${GCNANO_TYPE}.so"
FILES:${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libGLSLC.so ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libGLSLC.*.${GCNANO_TYPE}.so"
FILES:${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libgbm.so* ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libgbm.*.${GCNANO_TYPE}.so*"
FILES:${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libwayland-viv*.so*"
FILES:${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/gbm_viv.so ${GCNANO_USERLAND_OUTPUT_LIBDIR}/gbm_viv.*.${GCNANO_TYPE}.so"
FILES:${PN} += "${GCNANO_USERLAND_OUTPUT_LIBDIR}/libgbm_viv.so ${GCNANO_USERLAND_OUTPUT_LIBDIR}/libgbm_viv.*.${GCNANO_TYPE}.so"
FILES_${PN} += "${libdir}/lib*.so ${libdir}/lib*${SOLIBS} ${libdir}/gbm*"
FILES:${PN} += "${libdir}/lib*.so ${libdir}/lib*${SOLIBS} ${libdir}/gbm*"
SUMMARY_${PN}-dev = "${SUMMARY_${PN}} - Development files"
FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig/ ${libdir}/"
SUMMARY:${PN}-dev = "${SUMMARY_${PN}} - Development files"
FILES:${PN}-dev = "${includedir} ${libdir}/pkgconfig/ ${libdir}/"
gcnano_sysroot() {
if [ ${GCNANO_USERLAND_USE_VENDOR_DIR} -eq 1 ];

4
recipes-graphics/gcnano-userland/gcnano-userland-multi-binary-debug-stm32mp.bb
View File

@ -8,10 +8,10 @@ DEPENDS += " libdrm wayland "
GCNANO_TYPE = "debug"
do_install_append() {
do_install:append() {
clean_release_file
}
include gcnano-userland-binary.inc
PROVIDES_remove = "gcnano-userland"
PROVIDES:remove = "gcnano-userland"

2
recipes-graphics/gcnano-userland/gcnano-userland-multi-binary-stm32mp.bb
View File

@ -8,7 +8,7 @@ DEPENDS += " libdrm wayland "
GCNANO_TYPE = "release"
do_install_append() {
do_install:append() {
clean_debug_file
}

2
recipes-graphics/mesa/mesa-gl_%.bbappend
View File

@ -1,3 +1,3 @@
do_install_append_stm32mpcommon() {
do_install:append:stm32mpcommon() {
rm -rf ${D}/usr/include/KHR
}

6
recipes-graphics/mesa/mesa_%.bbappend
View File

@ -1,6 +1,6 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/mesa:"
FILESEXTRAPATHS:prepend := "${THISDIR}/mesa:"
PACKAGECONFIG_stm32mpcommon = "${@bb.utils.filter('DISTRO_FEATURES', 'wayland ', d)} \
PACKAGECONFIG:stm32mpcommon = "${@bb.utils.filter('DISTRO_FEATURES', 'wayland ', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \
@ -9,4 +9,4 @@ PACKAGECONFIG_stm32mpcommon = "${@bb.utils.filter('DISTRO_FEATURES', 'wayland ',
"
# Enable Etnaviv support
GALLIUMDRIVERS_append_stm32mpcommon = ",etnaviv,kmsro"
GALLIUMDRIVERS:append:stm32mpcommon = ",etnaviv,kmsro"

12
recipes-kernel/linux-firmware/linux-firmware-bluetooth-bcm4343.bb
View File

@ -25,15 +25,15 @@ do_install() {
install -m 644 ${S}/LICENCE.cypress ${D}${nonarch_base_libdir}/firmware/LICENCE.cypress_bcm4343
}
LICENSE_${PN} = "Firmware-cypress-bcm4343"
LICENSE_${PN}-cypress-license = "Firmware-cypress-bcm4343"
LICENSE:${PN} = "Firmware-cypress-bcm4343"
LICENSE:${PN}-cypress-license = "Firmware-cypress-bcm4343"
FILES_${PN}-cypress-license = "${nonarch_base_libdir}/firmware/LICENCE.cypress_bcm4343"
FILES_${PN} = "${nonarch_base_libdir}/firmware/"
FILES:${PN}-cypress-license = "${nonarch_base_libdir}/firmware/LICENCE.cypress_bcm4343"
FILES:${PN} = "${nonarch_base_libdir}/firmware/"
RDEPENDS_${PN} += "${PN}-cypress-license"
RDEPENDS:${PN} += "${PN}-cypress-license"
RRECOMMENDS_${PN}_append_stm32mpcommon += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'bluetooth-suspend', '', d)}"
RRECOMMENDS:${PN}:append:stm32mpcommon = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'bluetooth-suspend', '', d)} "
# Firmware files are generally not ran on the CPU, so they can be
# allarch despite being architecture specific

12
recipes-kernel/linux-firmware/linux-firmware_%.bbappend
View File

@ -1,13 +1,13 @@
FILESEXTRAPATHS_prepend_stm32mpcommon := "${THISDIR}/${PN}:"
FILESEXTRAPATHS:prepend:stm32mpcommon := "${THISDIR}/${PN}:"
# Add calibration file
SRC_URI_append_stm32mpcommon = " git://github.com/murata-wireless/cyw-fmac-nvram.git;protocol=https;nobranch=1;name=nvram;destsuffix=nvram-murata "
SRC_URI:append:stm32mpcommon = " git://github.com/murata-wireless/cyw-fmac-nvram.git;protocol=https;nobranch=1;name=nvram;destsuffix=nvram-murata "
SRCREV_nvram = "45fe43ad51ad47a0c57ad307db3e87da766bf61e"
SRC_URI_append_stm32mpcommon = " git://github.com/murata-wireless/cyw-fmac-fw.git;protocol=https;nobranch=1;name=murata;destsuffix=murata "
SRC_URI:append:stm32mpcommon = " git://github.com/murata-wireless/cyw-fmac-fw.git;protocol=https;nobranch=1;name=murata;destsuffix=murata "
SRCREV_murata = "52174a18134c7ef4a674ecd9fb68fc6e2bced969"
SRCREV_FORMAT = "linux-firmware-murata"
do_install_append_stm32mpcommon() {
do_install:append:stm32mpcommon() {
# Install calibration file
install -m 0644 ${WORKDIR}/nvram-murata/cyfmac43430-sdio.1DX.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt
install -m 0644 ${WORKDIR}/nvram-murata/cyfmac43430-sdio.1DX.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.st,stm32mp157c-dk2.txt
@ -18,11 +18,11 @@ do_install_append_stm32mpcommon() {
install -m 0644 ${WORKDIR}/murata/cyfmac43430-sdio.1DX.clm_blob ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.clm_blob
}
FILES_${PN}-bcm43430_append_stm32mpcommon = " \
FILES:${PN}-bcm43430:append:stm32mpcommon = " \
${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt \
${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.st,stm32mp157c-dk2.txt \
${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.st,stm32mp157f-dk2.txt \
${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.clm_blob \
${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.bin \
"
RDEPENDS_${PN}-bcm43430_remove_stm32mpcommon = " ${PN}-cypress-license "
RDEPENDS:${PN}-bcm43430:remove:stm32mpcommon = " ${PN}-cypress-license "

2
recipes-kernel/linux/linux-stm32mp-archiver.inc
View File

@ -1,7 +1,7 @@
#
# Archiver Configuration
#
SRC_URI_append = " file://README.HOW_TO.txt "
SRC_URI:append = " file://README.HOW_TO.txt "
inherit archiver
ARCHIVER_MODE[src] = "original"

20
recipes-kernel/linux/linux-stm32mp.inc
View File

@ -7,10 +7,10 @@ DEPENDS += "openssl-native util-linux-native libyaml-native"
B = "${WORKDIR}/build"
# Configure build dir for externalsrc class usage through devtool
EXTERNALSRC_BUILD_pn-${PN} = "${WORKDIR}/build"
EXTERNALSRC_BUILD:pn-${PN} = "${WORKDIR}/build"
# To share config fragments between layers
FILESEXTRAPATHS_prepend := "${THISDIR}:"
FILESEXTRAPATHS:prepend := "${THISDIR}:"
do_deploy[sstate-outputdirs] = "${DEPLOY_DIR_IMAGE}/kernel"
@ -39,7 +39,7 @@ python () {
#
#If the defconfig is contained on the kernel tree (arch/${ARCH}/configs)
#you must use the following line
do_configure_append() {
do_configure:append() {
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS MACHINE
if [ ! -z ${KERNEL_DEFCONFIG} ];
then
@ -81,7 +81,7 @@ do_configure_append() {
}
# ---------------------------------------------------------------------
do_compile_kernelmodules_append() {
do_compile_kernelmodules:append() {
if (grep -q -i -e '^CONFIG_MODULES=y$' ${B}/.config); then
# 5.10+ kernels have module.lds that we need to copy for external module builds
if [ -e "${B}/scripts/module.lds" ]; then
@ -90,7 +90,7 @@ do_compile_kernelmodules_append() {
fi
}
# ---------------------------------------------------------------------
do_install_append() {
do_install:append() {
# Install KERNEL_IMAGETYPE for kernel-imagebootfs package
install -m 0644 ${KERNEL_OUTPUT_DIR}/${KERNEL_IMAGETYPE} ${D}/${KERNEL_IMAGEDEST}
@ -103,7 +103,7 @@ do_install_append() {
echo "softdep snd-soc-cs42l51 pre: snd-soc-cs42l51-i2c" > ${D}/${sysconfdir}/modprobe.d/stm32mp1-snd.conf
}
# ---------------------------------------------------------------------
do_deploy_append() {
do_deploy:append() {
if [ ${MODULE_TARBALL_DEPLOY} = "1" ] && (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
mkdir -p ${D}${root_prefix}/lib
tar -cvzf $deployDir/modules-stripped-${MODULE_TARBALL_NAME}.tgz -C ${WORKDIR}/package/${root_prefix} lib
@ -123,7 +123,7 @@ python do_loadaddrcheck() {
}
PACKAGES =+ "${KERNEL_PACKAGE_NAME}-headers ${KERNEL_PACKAGE_NAME}-imagebootfs"
FILES_${KERNEL_PACKAGE_NAME}-headers = "${exec_prefix}/src/linux*"
FILES_${KERNEL_PACKAGE_NAME}-image += "boot/ ${KERNEL_IMAGEDEST}"
FILES_${KERNEL_PACKAGE_NAME}-imagebootfs = "boot/*.dtb boot/${KERNEL_IMAGETYPE}"
FILES_${KERNEL_PACKAGE_NAME}-modules += "${sysconfdir}/modprobe.d"
FILES:${KERNEL_PACKAGE_NAME}-headers = "${exec_prefix}/src/linux*"
FILES:${KERNEL_PACKAGE_NAME}-image += "boot/ ${KERNEL_IMAGEDEST}"
FILES:${KERNEL_PACKAGE_NAME}-imagebootfs = "boot/*.dtb boot/${KERNEL_IMAGETYPE}"
FILES:${KERNEL_PACKAGE_NAME}-modules += "${sysconfdir}/modprobe.d"

10
recipes-kernel/linux/linux-stm32mp_5.10.bb
View File

@ -57,8 +57,8 @@ S = "${WORKDIR}/linux-${LINUX_VERSION}.${LINUX_SUBVERSION}"
# ---------------------------------
BBCLASSEXTEND = "devupstream:target"
SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/linux.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
SRCREV_class-devupstream = "64e6a220537c5cd7e8cc5b723ef09c6341388c98"
SRC_URI:class-devupstream = "git://github.com/STMicroelectronics/linux.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
SRCREV:class-devupstream = "64e6a220537c5cd7e8cc5b723ef09c6341388c98"
# ---------------------------------
# Configure default preference to manage dynamic selection between tarball and github
@ -87,9 +87,9 @@ SRC_URI += "file://${LINUX_VERSION}/fragment-04-modules.config;subdir=fragments"
SRC_URI += "file://${LINUX_VERSION}/fragment-05-signature.config;subdir=fragments"
# Don't forget to add/del for devupstream
SRC_URI_class-devupstream += "file://${LINUX_VERSION}/fragment-03-systemd.config;subdir=fragments"
SRC_URI_class-devupstream += "file://${LINUX_VERSION}/fragment-04-modules.config;subdir=fragments"
SRC_URI_class-devupstream += "file://${LINUX_VERSION}/fragment-05-signature.config;subdir=fragments"
SRC_URI:class-devupstream += "file://${LINUX_VERSION}/fragment-03-systemd.config;subdir=fragments"
SRC_URI:class-devupstream += "file://${LINUX_VERSION}/fragment-04-modules.config;subdir=fragments"
SRC_URI:class-devupstream += "file://${LINUX_VERSION}/fragment-05-signature.config;subdir=fragments"
# -------------------------------------------------------------
# Kernel Args

6
recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
View File

@ -1,13 +1,13 @@
FILESEXTRAPATHS_prepend_stm32mpcommon := "${THISDIR}/${PN}:"
FILESEXTRAPATHS:prepend:stm32mpcommon := "${THISDIR}/${PN}:"
# Pulse audio configuration files
SRC_URI_append_stm32mpcommon = " \
SRC_URI:append:stm32mpcommon = " \
file://default.pa \
file://system.pa \
"
# Pulse audio configuration files installation
do_install_append_stm32mpcommon() {
do_install:append:stm32mpcommon() {
if [ -e "${WORKDIR}/default.pa" ]; then
install -m 0644 ${WORKDIR}/default.pa ${D}/${sysconfdir}/pulse/default.pa
fi

4
recipes-security/optee/optee-os-stm32mp-archiver.inc
View File

@ -1,11 +1,11 @@
#
# Archiver Configuration
#
SRC_URI_append = " file://README.HOW_TO.txt "
SRC_URI:append = " file://README.HOW_TO.txt "
inherit archiver
ARCHIVER_MODE[src] = "original"
COPYLEFT_LICENSE_INCLUDE_append = " BSD-3* "
COPYLEFT_LICENSE_INCLUDE:append = " BSD-3* "
inherit archiver_stm32mp_clean

20
recipes-security/optee/optee-os-stm32mp-common.inc
View File

@ -1,13 +1,13 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/optee-os:"
FILESEXTRAPATHS:prepend := "${THISDIR}/optee-os:"
PACKAGE_ARCH = "${MACHINE_ARCH}"
PROVIDES += "virtual/optee-os"
RPROVIDES_${PN} += "virtual/optee-os virtual/systemd-bootconf"
RPROVIDES:${PN} += "virtual/optee-os virtual/systemd-bootconf"
B = "${WORKDIR}/build"
# Configure build dir for externalsrc class usage through devtool
EXTERNALSRC_BUILD_pn-${PN} = "${WORKDIR}/build"
EXTERNALSRC_BUILD:pn-${PN} = "${WORKDIR}/build"
DEPENDS += "dtc-native python3-pycryptodomex-native python3-pycrypto-native python3-pyelftools-native"
@ -31,11 +31,11 @@ EXTRA_OEMAKE += "${@bb.utils.contains('MACHINE_FEATURES', 'fip', '', 'CFG_STM32M
# debug and trace
EXTRA_OEMAKE += "${@bb.utils.contains('ST_OPTEE_DEBUG_TRACE', '1', 'CFG_TEE_CORE_LOG_LEVEL=${ST_OPTEE_DEBUG_LOG_LEVEL} CFG_TEE_CORE_DEBUG=n', '', d)}"
OPTEE_ARCH_armv7a = "arm32"
OPTEE_ARCH_armv7ve = "arm32"
OPTEE_ARCH_aarch64 = "arm64"
OPTEE_ARCH:armv7a = "arm32"
OPTEE_ARCH:armv7ve = "arm32"
OPTEE_ARCH:aarch64 = "arm64"
do_configure_prepend(){
do_configure:prepend(){
chmod 755 ${S}/scripts/bin_to_c.py
}
@ -102,9 +102,9 @@ do_deploy() {
}
addtask deploy before do_build after do_compile
FILES_${PN} = "${nonarch_base_libdir}/firmware/"
FILES_${PN}-dev = "/usr/include/optee"
FILES:${PN} = "${nonarch_base_libdir}/firmware/"
FILES:${PN}-dev = "/usr/include/optee"
INSANE_SKIP_${PN}-dev = "staticdev"
INSANE_SKIP:${PN}-dev = "staticdev"
INHIBIT_PACKAGE_STRIP = "1"

10
recipes-security/optee/optee-os-stm32mp_3.12.0.bb
View File

@ -27,13 +27,13 @@ S = "${WORKDIR}/git"
COMPATIBLE_MACHINE = "(stm32mpcommon)"
OPTEEMACHINE ?= "stm32mp1"
OPTEEMACHINE_stm32mp1common = "stm32mp1"
OPTEEMACHINE:stm32mp1common = "stm32mp1"
OPTEEOUTPUTMACHINE ?= "stm32mp1"
OPTEEOUTPUTMACHINE_stm32mp1common = "stm32mp1"
OPTEEOUTPUTMACHINE:stm32mp1common = "stm32mp1"
# The package is empty but must be generated to avoid apt-get installation issue
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY:${PN} = "1"
require optee-os-stm32mp-common.inc
@ -47,8 +47,8 @@ include ${@oe.utils.ifelse(d.getVar('ST_ARCHIVER_ENABLE') == '1', 'optee-os-stm3
# ---------------------------------
BBCLASSEXTEND = "devupstream:target"
SRC_URI_class-devupstream = "git://github.com/STMicroelectronics/optee_os.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
SRCREV_class-devupstream = "639a8566de8fa720d2cb7ab7231e8de105e7859d"
SRC_URI:class-devupstream = "git://github.com/STMicroelectronics/optee_os.git;protocol=https;branch=${ARCHIVER_ST_BRANCH}"
SRCREV:class-devupstream = "639a8566de8fa720d2cb7ab7231e8de105e7859d"
# ---------------------------------
# Configure default preference to manage dynamic selection between tarball and github

12
recipes-st/images/st-image-partitions.inc
View File

@ -9,16 +9,16 @@ ENABLE_FLASHLAYOUT_CONFIG = "0"
ENABLE_IMAGE_LICENSE_SUMMARY = "0"
# Remove WIC image generation for the partition image
IMAGE_FSTYPES_remove = "${WKS_IMAGE_FSTYPES}"
IMAGE_FSTYPES:remove = "${WKS_IMAGE_FSTYPES}"
# Append DISTRO to image name even if we're not using ST distro setting
# Mandatory to ease flashlayout file configuration
IMAGE_BASENAME_append = "${@'' if 'openstlinuxcommon' in OVERRIDES.split(':') else '-${DISTRO}'}"
IMAGE_BASENAME:append = "${@'' if 'openstlinuxcommon' in OVERRIDES.split(':') else '-${DISTRO}'}"
# Reset image feature
IMAGE_FEATURE = ""
# Reset PACKAGE_INSTALL to avoid getting installed packages added in machine through IMAGE_INSTALL_append:
# Reset PACKAGE_INSTALL to avoid getting installed packages added in machine through IMAGE_INSTALL:append:
PACKAGE_INSTALL = ""
# Reset LINGUAS_INSTALL to avoid getting installed any locale-base package
@ -29,15 +29,15 @@ IMAGE_LINGUAS = ""
LDCONFIGDEPEND = ""
# Remove from IMAGE_PREPROCESS_COMMAND useless buildinfo
IMAGE_PREPROCESS_COMMAND_remove = "buildinfo;"
IMAGE_PREPROCESS_COMMAND:remove = "buildinfo;"
# Remove from IMAGE_PREPROCESS_COMMAND the prelink_image as it could be run after
# we clean rootfs folder leading to cp error if '/etc/' folder is missing:
# cp: cannot create regular file
# ‘/local/YOCTO/build/tmp-glibc/work/stm32mp1-openstlinux_weston-linux-gnueabi/st-image-userfs/1.0-r0/rootfs/etc/prelink.conf’:
# No such file or directory
IMAGE_PREPROCESS_COMMAND_remove = "prelink_image;"
IMAGE_PREPROCESS_COMMAND:remove = "prelink_image;"
IMAGE_PREPROCESS_COMMAND_append = "reformat_rootfs;"
IMAGE_PREPROCESS_COMMAND:append = "reformat_rootfs;"
# Cleanup rootfs newly created
reformat_rootfs() {

4
recipes-st/images/st-image-vendorfs.bb
View File

@ -14,5 +14,5 @@ PACKAGE_INSTALL += " \
"
# Remove specific systemd task
IMAGE_PREPROCESS_COMMAND_remove = "systemd-systemctl-native;"
IMAGE_PREPROCESS_COMMAND_remove = "systemd_preset_all;"
IMAGE_PREPROCESS_COMMAND:remove = "systemd-systemctl-native;"
IMAGE_PREPROCESS_COMMAND:remove = "systemd_preset_all;"

2
recipes-st/packagegroups/packagegroup-st-demo.bb
View File

@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ad
inherit packagegroup
RDEPENDS_${PN} = "\
RDEPENDS:${PN} = "\
"

2
recipes-support/libopencsd/libopencsd_0.10.0.bb
View File

@ -12,7 +12,7 @@ SRC_URI += "file://0001-add-autotools-support.patch"
S = "${WORKDIR}/OpenCSD-${PV}"
do_install_append() {
do_install:append() {
install -d ${D}${includedir}/opencsd
cp ${S}/decoder/include/opencsd/ocsd_if_types.h ${D}${includedir}/opencsd
cp ${S}/decoder/include/opencsd/ocsd_if_version.h ${D}${includedir}/opencsd