Fields related to hash computing have been removed from the image
structure. Removed openssl headers from rimage.h, which made it necessary
to add some missing includes in several files.
Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
Switched to use new hash functions. The parameter list for the rimage_sign
and rimage_verify functions has been simplified. The necessary information
is now included in the hash_context structure. In addition, code fragments
that may be common to different versions of the manifest have been
separated.
Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
Prepared a new set of functions for computing digest with error handling.
The hash context has been placed into a separate structure. This allows
to conveniently pass the calculated digest along with its length and used
algorithm.
Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
The version fields in the fw_ext_man_cavs_header structure describe version
of the structure itself, not the image. The correct version number has been
set.
Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
Modified the strtoul function parameter to automatically recognize
the value format. This will avoid the situation when a decimal value
is parsed as hexadecimal.
Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
A new function create_file_name has been created that prepares the name
of the output file with the given extensions. Unlike the previous solution,
it checks whether the new name will fit in the output buffer.
A new file_utils.c file has been prepared, into which generic functions to
simplify the use of files will be moved.
Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
A set of functions which make it easier to parse toml files has been
separated into a new file.
Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
In image re-signing mode or if there are no input files, the memory
allocated for heap_adsp was not released.
Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
The init_config is used to indicate if base config extension is
used (1) or not (0). Its default value is used if not specified
in module config, the default value for init_config should be zero
instead of one.
Signed-off-by: Chao Song <chao.song@linux.intel.com>
We don't include ROM sections into the output image. If conversion is
applied to them, they end up in the SRAM address range, which then
generates corrupted images.
Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
tgl.toml and tgl-h.toml are only used for xtos builds.
Suggested-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Set cached and uncached address aliases for all Intel ADSP platforms,
supported by Zephyr.
Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
A recent commit ec649f37d6 ("Convert all ELF addresses to cached
for calculations") had a bug: it assumed a call to
parse_uint32_hex_key() for an absent key would return an error by
default, which isn't the case. To force it set the default return
code to an error value.
Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Use some of the reserved bits to add a new field, init_config, in struct
sof_man_module_type. This will be used to specify the type of payload
that the module expects. For now, the 2 options are to have the base
config only or the base config with an extension that contains the pin
formats. This can be extended in the future to support additional
options for modules that need more than the base config or base config +
extension.
Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Rimage calculates sizes of ELF sections, for which it has to use
addresses from the same address space: either all cached or all
uncached. The ELF image itself can contain mixed addresses. Convert
all to cached for internal calculations.
Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
The load_type in extended manifest is used to indicate
if a module is a built-in module(0) or a loadable(1)
module.
We don't have loadable module yet, so load_type should
be zero for all modules.
Signed-off-by: Chao Song <chao.song@linux.intel.com>
The module_type member in module config should be assigned
according to the mod_type enum. Previously, for tgl and tgl-h,
it is assigned in an incremental way, which is wrong. MTL assigns
module_type in the correct way, so align the module_type with
mtl for tgl and tgl-h in this patch.
Signed-off-by: Chao Song <chao.song@linux.intel.com>
The IMR type can be specified either in the TOML configuration file
or on the command line. The command line value should override the
one from the configuration file. But the current code overwrites the
configuration file value with the default value even if no value has
been specified on the command line, which is wrong. Fix this by using
the default value when reading the configuration file and only
overwriting it when the respective command line parameter is used.
Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Currently some module types are incorrect and it was set by the change
sequence. The module type is used by windows driver not Linux driver.
It is defined in the following enum definition in cavs_ext_manifest.h.
UpDwMix module type is 5, Mux is 6 kpb is 11, and Selector is 12. The
module ASRC, GAIN, PROBE are type of efx (9) according to spec.
enum mod_type {
ebasefw = 0,
emixin,
emixout,
ecopier,
epeakvol,
eupdwmix,
emux,
esrc,
ewov,
efx,
eaec,
ekpb,
emicselect,
efxf, /*i.e.SmartAmp */
eaudclass,
efakecopier,
eiodriver,
ewhm,
egdbstub,
esensing,
emax,
einvalid = emax
} ;
Signed-off-by: Rander Wang <rander.wang@intel.com>
The original check for "i - 1 == type" is used to make
sure that all modules in toml file are in order from 0
to max continuously. But the problem is that some modules
are not supported now or some modules share the same module
type of efx, so this check is incorrect.
Signed-off-by: Rander Wang <rander.wang@intel.com>
error: invalid type 16error: key 'module' parsing error
probe module type is 10,which is treated hexally
Signed-off-by: Kwasowiec, Fabiola <fabiola.kwasowiec@intel.com>
Adrian Warecki