Change-Id: I0b73477ec1e19319fab2377b409105cac6999dc1
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-2213
Signed-off-by: Matt Wood <[email protected]>
Reviewed-on: https://android.intel.com:443/409635

Google Verified Boot for M-dessert removes the keystore support.  The
verity key is simply included into the .oemkeys section of
kernelflinger.

Change-Id: Ifcbab85bdf055707c5eb23a2299b9e3092c6e4f8
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-2150
Signed-off-by: Jeremy Compostella <[email protected]>
Reviewed-on: https://android.intel.com:443/409448

Current flashfiles.ini syntax is restricted to a defined set of fields
for each commands.
This patch allows to add generic fields into a commands section and each
field can contain a file variable wich will be interpreted.
Some fields like 'variant' are exceptions and are not converted to a
json one.

Change-Id: I8133bb8d1d012f1eb3b14550a71cd9d3445dbe27
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-1344
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/408886

Adb now offer the command: "reboot sideload-auto-reboot" that reboot
the device in sideload, waiting for the host to start transfering the
update package via sideload and when update is finished, reboot the
device.
Introduce the "-r" option to offer the possibility to use this method
to update the device using sideload. Default behavior is to proceed
like the fota app will do: push the package, call uncrypt service to
produce the blockmap, writting command to be excecuted to apply the
package then reboot to recovery.

Refactoring:
- number of options/parameters are growing, so use getopts to manage
them:
   $PACKAGE should now be preceded by "-p"
   $dutID   should now be preceded by "-s"
- when board is not encrypted or ota package is small, we never see
the property init.svc.uncrypt set to "started" so detect the creation
of the status_file rather than monitoring the property.

Example of use, updating via sideload:
./flash-update -s INV151700079 -p ota-update.zip -r

Change-Id: I474fe002384d9736e94fdc186e05006c81afb8fe
Signed-off-by: Leo Sartre <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-1665
Reviewed-on: https://android.intel.com:443/407048

Change-Id: Ia42fec9be15155aa430df005c88c34afcf3a849b
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-41
Signed-off-by: Perrot, ThomasX <[email protected]>
Reviewed-on: https://android.intel.com:443/356311
Reviewed-on: https://android.intel.com:443/405983

Change-Id: I6bcb7040a8264a2629d8d92ced4e73837db45979
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-4015
Signed-off-by: Chetan Rao <[email protected]>
Reviewed-on: https://android.intel.com:443/412364

Change-Id: I1b99b6f471ef04ddc0de4c5a3983be9d4c7b314a
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-4607
Signed-off-by: Jocelyn Falempe <[email protected]>
Reviewed-on: https://android.intel.com:443/420348

gvb_test_prepare: script that produce boot/recovery/system images
unsign_boot_img.py : tool to remove the signature of a boot or
recovery image.

Change-Id: I486a4c91968b798087bd4f74ec054a0c8cca2e58
Signed-off-by: Leo Sartre <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-3373
Reviewed-on: https://android.intel.com:443/410378

Change-Id: I359627873a89ce24c283c72928d803588dffea0f
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-5149
Signed-off-by: Fabien LOUIS <[email protected]>
Reviewed-on: https://android.intel.com:443/422618

- Remove all the hardcoded configuration names and use the
configurations list instead.
- Organize MV configuration files to have default mv config in root
directory and others in a subdirectory. Set also the default
configuration with an extra argument in flashfiles_from_target_files
script instead of hardcoding it.
- Fix erase mode : 2 (previous value) means no erase so remove it
                   1 (new version) means erase all (including NVM)

Change-Id: Ibda0f575cbb042e8be0a5dd74e84d058aabf1dde
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-924
Signed-off-by: Gaelle Nassiet <[email protected]>
Signed-off-by: Guillaume Betous <[email protected]>
Reviewed-on: https://android.intel.com:443/415624

If no device is enumerating in adb when the script is
launched the dutID will be initialised with an empty string.
The update will fail and loop on printing grep usage
error.
This patch loops on reading a deviceID before proceeding
to the update.

Change-Id: I8436aa1c6cb49809668d1ac82631c0ff9cc966d6
Signed-off-by: Khalifa Rouis <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-5283
Reviewed-on: https://android.intel.com:443/423734

Change-Id: I184f84c8dda52e3129a33f39141619cc03c96f6c
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-5325
Signed-off-by: Claude Brouat <[email protected]>
Reviewed-on: https://android.intel.com:443/422468

The key of a metablock needs to be encoded to a str to be written
out by struct. We're getting unicode from the json input, so
encode it with utf-8 to get the metablock's key.

Change-Id: I1c2ead31fb3ce999d79af88bbfd3163d8755fb21
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-4058
Signed-off-by: Scott D Phillips <[email protected]>
Reviewed-on: https://android.intel.com:443/394130
Reviewed-on: https://android.intel.com:443/410055

The contents of the fftf_opt file are not changed, just the
location from which it is loaded.

Change-Id: Id383aaa96209fe4e949106f4a581a4e16ea62690
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-4058
Signed-off-by: Scott D Phillips <[email protected]>
Reviewed-on: https://android.intel.com:443/398221
Reviewed-on: https://android.intel.com:443/410056

provdatazip is the general source for per-variant files in the
target files package. Extend the current variant file list to also
contain all files referenced by the flashfile configuration with
source 'provdatazip'

Change-Id: I61717ab0694ffe21100921d257f64be315e54ab1
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-4058
Signed-off-by: Scott D Phillips <[email protected]>
Reviewed-on: https://android.intel.com:443/405595
Reviewed-on: https://android.intel.com:443/410057

the make variable MV_CONFIG_DEFAULT_TYPE now must be specified
with a period and the variant string appended (e.g.,
MV_CONFIG_DEFAULT_TYPE.s3gr10m6s).

Change-Id: I543d290c23e4f96218784c55627c859f2e4cd57e
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-4058
Signed-off-by: Dave Lin <[email protected]>
Reviewed-on: https://android.intel.com:443/425944

renamed in the previous patch.

Change-Id: I83c42b1a74ef712b59b7ef96b82be1c241f21914
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-6137
Signed-off-by: Dave Lin <[email protected]>
Reviewed-on: https://android.intel.com:443/427408

Additional files which are not pointed by flashfiles.ini are not
declined by variants, they should.
For example in coho, btsdata.ini is variant specific but is not pointed
by flashfiles.ini

Change-Id: I135e5141f7b145398193ee46588e20fedaa8fad6
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-6268
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/427514

generate_blpolicy_oemvars has to run on both Linux and Windows and
must not suffer from any AOSP or Intel Android python dependency.

Change-Id: I3ac3b294967108731d7fcdb2ec6cf51df8af33dc
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-4013
Signed-off-by: Jeremy Compostella <[email protected]>
Reviewed-on: https://android.intel.com:443/423253

This target builds a ZIP archive suitable for RMA.  This archive
includes:
- the openssl executable
- the sign-efi-sig-list executable from efitools project
- the generate_blpolicy_oemvars scripts
- the action-authorization binary

This archive can also be built for Windows platform using the
USE_MINGW=y make variable.

Change-Id: Ic4ccf86a0585652a02045597dd57c825b46b4f7b
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-4013
Signed-off-by: Jeremy Compostella <[email protected]>
Reviewed-on: https://android.intel.com:443/416713

Use same wrappers as in https://android.intel.com/#/c/401710 for
bypassing the zip 2GiB limit.

Change-Id: Id8ed2f704bc970e7cdc5dfbe1b6c87067414b23f
Signed-off-by: Leo Sartre <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-5150
Reviewed-on: https://android.intel.com:443/427969

fastboot configuration is built to extract fastboot flash files from FLS
files, and flash them using fastboot.

For each FLS file present in the flash file json description and that
has the key fasboot set to yes, two PFT commands are being added:
 - one to extract the fastboot binary from the FLS file to a temporary
   directory
 - one to flash the extracted binary with fasboot
Default command parameters are defined through a global.

On the opposite side, the timeout value for configurations other than
fastboot are now retrieved from configurations parameters instead of
commands and the function to add a configuration adds automatically
all the parameters.

Finally, this patch fixes the PFT "restrict" key that should be given
a table of config name strings rather than a simple string (
nevertheless both are supported, but the table is the official format
for "restrict").

Change-Id: Idf0d8b7b02cbf7d3b0d8c3a8989ea7033607c568
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-5957
Signed-off-by: Gabriel Touzeau <[email protected]>
Signed-off-by: Gaelle Nassiet <[email protected]>
Reviewed-on: https://android.intel.com:443/424610

It is useful to have kernel debug symbols which are only available for
kernel built from source.

Stub the target when prebuilt kernel is used.

Change-Id: I322319a662733a737449ed6f30b1bff5e126b97b
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-6235
Signed-off-by: Laurent FERT <[email protected]>
Reviewed-on: https://android.intel.com:443/429768

An OTA requirement is that the platform shall have an
option to turn OFF the device at the end of an OTA_UPDATE
rather than rebooting it.
The option -o allows to test this capability.

Change-Id: I82c0c83f17259aa88aa042d46c7d5d6d716c9405
Signed-off-by: Khalifa Rouis <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-6389
Reviewed-on: https://android.intel.com:443/428005

FlsTool here has not been kept up to date. Might as well get rid
of one of the decoy copies.

Change-Id: I390c22442f3082552627c576808965c2e00cef60
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-7393
Signed-off-by: Scott D Phillips <[email protected]>
Reviewed-on: https://android.intel.com:443/397909
(cherry picked from commit 4b850bf54d2341f0340c005d01d7d38cd1d42561)
Reviewed-on: https://android.intel.com:443/432207

Broxton has now variants and its ifwi files are variant specific
However these files are not used in "args" option of flashfile.ini so
they are not picked by the script.

This patch extend the variant files detection to all dynamic files used
in flashfiles.ini, not only the ones from "args".
This patch also :
 - fix a redundancy which appears in variant configurations
   in case of multiple output files
-  fix telephony oemvars files for variants: The shortname of files must
   not be lower-cased or the clean_config_parameters() function will not
   find the match and will delete the file parameter from
   configurations.

Change-Id: I3d9ba6ccaa89fab2c55a4f94e6755ee502eea780
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-4301
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/418913

To be able to support variants with installer, we have to create one
installer output file per variant with adapted commands to use variant
specific files.

Change-Id: I1c2ab069c79c6ee4385e6b7e3da3c635eeaf6c6e
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-4301
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/431862

This patch adds Sofia specific changes to the
verify_from_target_files and intel_common.py scripts.

 - 'fastboot oem get-hashes' and process_fastboot_data are now
   run after GetBootloaderImageFromTFP() as image sizes are
   needed to be passed with 'fastboot oem get-hashes'
   USAGE: fastboot oem get-hashes:psi:slb:ucode_patch
          :mvconfig:secvm: hypervisor:splash.
   The sizes are calculated from the images obtained from
   GetBootloaderImagesFromFls().

 - The LoadMap.bin files are extracted from fls files present in the
   TFP and compared with the hash of each firmware component.

 - Comparision of the bootloader image is skipped for now. But we
   retain the logic to extract the bootloader from the TFP.

Change-Id: I7d527a9f9c2e7708a3e6637de1e5fefb68d46065
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-7321
Signed-off-by: adattatr <[email protected]>
Reviewed-on: https://android.intel.com:443/430369

Remove fixed definitions, nonefi_bootloader and img_to_partition
map for Sofia3GR. This information is now obtained from the
flashfiles_fls.json file present in the TFP.

Change-Id: I9e4cf3c65b88f2b6fab44fe9fb519c4ae96b982c
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-7321
Signed-off-by: adattatr <[email protected]>
Reviewed-on: https://android.intel.com:443/430374

- fftf_build.opt has been moved to provdata.zip.
  CheckIfSocEFI() is modified to read fftf_build.opt
  from provdata.zip or provdata_$VARIANT.zip.

- get_provdata_variants function is added. It returns
  the list of variants for a TFP.

- Currently we are assuming that smp_profiling images
  are not flashed on the device being tested. This is
  a temporary hack. The actual fix will not make this
  assumption and will compare the images on the device
  with the both the core configurations - smp and
  smp_profiling.

Change-Id: I2833fb8dc146235a34e736632dfe4cd164e59cf4
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-7321
Signed-off-by: adattatr <[email protected]>
Reviewed-on: https://android.intel.com:443/430376

The environment variable ANDROID_PRODUCT_OUT is defined when building
the package. If the script flashfiles_from_target_files is called with
a package that was built in a different environment than the one the
script is executed in, this variable will not be compliant.
The location of the file build.prop containing this variable should be
evaluated each time the script is called in function of the argument
and should not be configurable build time through flashfiles.

On the contrary, the path to the tool FlsTool and other scripts should
not be based on some package properties but should be retrieved
instead directly from the target files package (in provdata).

Finally, needs to create the directory FASTBOOT_IMG_DIR if it does not
exist.

Change-Id: Ic952a136208282a3b0052a97bac9322d80de61cc
Signed-off-by: Gaelle Nassiet <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-7289
Reviewed-on: https://android.intel.com:443/407182
Reviewed-on: https://android.intel.com:443/432309

the partition of slb/mobivisor/mvconfig/secvm/splash/ucode_patch
on sofia has secpack header, so it need add secpack when doing
hash check

Change-Id: I120bbeb46b25cac35c4696623daa8482ed794cd9
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-8119
Signed-off-by: xihua.chen <[email protected]>
Reviewed-on: https://android.intel.com:443/433562

Change-Id: Ia2829aa1c8fd25884d795bd547162563bced3645
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-7740
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/433834

Change-Id: I5aa13e98ab670a82aeb572de8bf71f22dc6a3e42
Tracked-On:https://jira01.devtools.intel.com/browse/OAM-8959
Signed-off-by: Louis Fabien <[email protected]>
Reviewed-on: https://android.intel.com:443/436915

By default flashfiles_from_target_files does not include
the variant suffix in flash.json if built for one variant.
This is done only for unified variants.
This patch activates the suffix logic for variants too.

Change-Id: Id6825aa35fccd60d923ea84d57cf45f4e55265e8
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-8570
Signed-off-by: Khalifa Rouis <[email protected]>
Reviewed-on: https://android.intel.com:443/435921

Variants should be able to amend some part of generic flashfiles

Change-Id: I752d3cf2687208956c152c6650c145dce6add587
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-8083
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/434639

Change-Id: Iad660b7c7de9a8aa262e9b3de9ca1e0a9100d90d
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-8083
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/436821

If a variant does not have an ifwi file, it should not be a problem.
This patch generates the file list to be picked-up by looking at each
variant ini file if the file is needed.
For the additional files, we need to check that the specific variant IP
have not removed an additional file from the generic list.

Change-Id: I9d0f45d6898c028dc05c7c787485a0623a198eee
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-8083
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/436822

This change allow to remove option data by using the "-=" syntax

Change-Id: I6db67ae53cc60597c8425c96829a1b908cd98711
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-8083
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/436823

Fixed KW bug list:
-------------------------------------------------------------------------------
Platform Config master_r2_Sf3gr_sr_garnet #74726: Input stream 'fis' is not closed on exit.
 File: /workspace1/AndroidKW103_master_r2_Sf3gr_sr_garnet/SourceCode/device/intel/build/ecss_signtools/verity/Utils.java:286 | read()
 Code: RLK.IN | Severity: Critical(1) | State: Existing | Status: Analyze
 Platform Config master_r2_Sf3gr_sr_garnet #74736: Output stream 'out' is not closed on exit.
 File: /workspace1/AndroidKW103_master_r2_Sf3gr_sr_garnet/SourceCode/device/intel/build/ecss_signtools/verity/Utils.java:295 | write()
 Code: RLK.OUT | Severity: Critical(1) | State: Existing | Status: Analyze
 Platform Config master_r2_Sf3gr_sr_garnet #74775: Null pointer dereference of 'new CMSSigner(...).signer' where null comes from constant
 File: /workspace1/AndroidKW103_master_r2_Sf3gr_sr_garnet/SourceCode/device/intel/build/ecss_signtools/signapk/SignApk.java:703 | signWholeFile()
 Code: NPE.CONST | Severity: Critical(1) | State: Existing | Status: Analyze
 Platform Config master_r2_Sf3gr_sr_garnet #74776: Input stream 'input' is not closed on exit.
 File: /workspace1/AndroidKW103_master_r2_Sf3gr_sr_garnet/SourceCode/device/intel/build/ecss_signtools/signapk/SignApk.java:343 | addOtacert()
 Code: RLK.IN | Severity: Critical(1) | State: Existing | Status: Analyze
 Platform Config master_r2_Sf3gr_sr_garnet #74780: Null pointer dereference of 'readPassword(...)' where null is returned from a method
 File: /workspace1/AndroidKW103_master_r2_Sf3gr_sr_garnet/SourceCode/device/intel/build/ecss_signtools/signapk/SignApk.java:214 | decryptPrivateKey()
 Code: NPE.RET | Severity: Critical(1) | State: Existing | Status: Analyze
-------------------------------------------------------------------------------

Change-Id: I74af773015252f66495dbd44b6ff1dff4013d00a
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-9394
Reviewed-on: https://android.intel.com:443/438572

If the target indicated in the flashfiles is a path with a folder, the
file declaration will be incorrect because it will contain only the
file name.
This patch allow to declare a file with a folder in the flashfiles.

Change-Id: If4dc7219414cd84547dadf88a7440d1055226b3d
Signed-off-by: Gaelle Nassiet <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-4814
Reviewed-on: https://android.intel.com:443/432827

Given an existing rsci binary table, this script display the RSCI
header and fields in a human readable format.
Example of output:

$ ./dump_rsci_table.py  ~/RSCI_v2
RSCI HEADER
        signature        : RSCI
        length           : 48
        revision         : 2
        oemid            : INTEL
        oem_table_id     : BOOTSRC
        oem_revision     : 1
        creator_id       : BRXT
        creator_revision : 0x100000d
RSCI FIELDS
        wake_source      : 4 (WAKE_POWER_BUTTON_PRESSED)
        reset_source     : 0 (RESET_NOT_APPLICABLE)
        reset_type       : 0 (NOT_APPLICABLE)
        shutdown_source  : 1 (SHTDWN_POWER_BUTTON_OVERRIDE)
        indicator        : 0
        reset extra info : 0x0

Change-Id: Ifef64a1b329aae4438f8a1fc5c1e4f157a6c04c8
Signed-off-by: Leo Sartre <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-3809
Reviewed-on: https://android.intel.com:443/415568

New kernel_dtb target which is needed when using Sofia makefile
from "device/intel-imc/common" for Splash Image generation

Change-Id: I80eef6ff198906734cb0587b6bc31834ef9e857e
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-10002
Signed-off-by: Chetan Rao <[email protected]>
Reviewed-on: https://android.intel.com:443/428770

After unzipping flash file, if .fls files are found then extract
fastboot images out of themm using FlsTool.

Change-Id: Ic476d39fb70a14533a0c186089349edd9da564d6
Signed-off-by: Gabriel Touzeau <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-9649
Reviewed-on: https://android.intel.com:443/409006
Signed-off-by: Gaelle Nassiet <[email protected]>
Reviewed-on: https://android.intel.com:443/440123

The fastboot-test-prepare script calls flashfiles_from_target_files
which needs the MV configuration type option for Sofia variants.

Change-Id: Id1ed49ea1906920957b7e8b36ceeea9450de5247
Signed-off-by: Gaelle Nassiet <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-9649
Reviewed-on: https://android.intel.com:443/440046

Tracked-On: https://jira01.devtools.intel.com/browse/OAM-6493
Change-Id: Ibb6722d90dff4ae46a037ed3f2b358faf9b3dd91
Signed-off-by: Benjamin Pujol <[email protected]>
Reviewed-on: https://android.intel.com:443/424163

Change-Id: I23845e3f09a0896cff5f2093a7ecbcb95af4a4ea
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-8407
Signed-off-by: Chetan Rao <[email protected]>
Reviewed-on: https://android.intel.com:443/435422

Change-Id: I4896c509e6db4de0e80165e40cd57c9aad28d31f
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-9975
Signed-off-by: Christophe Guerard <[email protected]>
Reviewed-on: https://android.intel.com:443/441348

When tagged "info", simply copy the file to the flashfile.zip

Change-Id: I6c610dc5e146b4a52644f1f042571dc194807870
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-7584
Signed-off-by: Guillaume Betous <[email protected]>
Reviewed-on: https://android.intel.com:443/435038

Since the kernel is built from source for most boards,
the following changes have been made in order to pick
up dtb files from LOCAL_KERNEL_PATH:
    * Copy all dtb files lively built from kernel
      source into LOCAL_KERNEL_PATH
    * Add option --dtb-path to pass LOCAL_KERNEL_PATH
      during build time. It overwrites "base_dir" that
      set in "meta" block.
    * Set device specific dtb file name in the JSON
      configuration file, example:

      "meta": {
       ...
       },
      "OARS7": {"dtb": "SF_3GR-s303.dtb"},
      "OARS7_EVT": {"dtb": "SF_3GR-s303-evt.dtb"},
      "S3GR10M6S": {"dtb": "SF_3GR-mrd6-p2.dtb"},
      "TH8": {"dtb": "SF_3GR-ecs-th8.dtb"},

The changes also applied to other blob types
(i.e. oemvars and bootvars).

Change-Id: Iacb802a2ab86f7962f1839b422aae92e4395c6de
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-9567
Signed-off-by: Dave Lin <[email protected]>
Reviewed-on: https://android.intel.com:443/442038

On BXT UFS we need to generate bootloader FAT32 images with a block size
of 4096 bytes.
This patch adds the capability to specify this block size.

Change-Id: I6e49ea763fa40f6846372c7787a5067ea194f526
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-11089
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/444087

that all of them would be built in the 2ndbootloader.

Change-Id: I6c3d0300e7136b89327795bb59cd9b6d7f8795df
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-11745
Signed-off-by: Dave Lin <[email protected]>
Reviewed-on: https://android.intel.com:443/446033

…or the partition.

Update error message which prints when an image is too large to fit into the
designated partition so that the number displayed is in bytes.

Change-Id: I514ec1db48b23600bca0cfb50c1b54a88b84285d
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-11261
Signed-off-by: Charles Johnson <[email protected]>
Reviewed-on: https://android.intel.com:443/444705

fishname from device_mapping does not necessarily correspond to the name
appended to the device name.
The reason is that fishname from dmap MUST be PRODUCT_DEVICE, because it
is used like this in ota_deployment_fixup script to replace the value of
ro.product.device.
So instead of this dmap entry, we use the fishname provided by build
variable TARGET_PRODUCT_FISHNAME which is the value that will
effectively be appended to the device name at runtime by autodetect.cpp

Change-Id: I73c7c7ed52b8629eb866b67d8a6af4fffc3eecc5
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-10138
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/443912

We have to keep compatibility of target files packages components to
generate incremental OTA based on old packages.

Change-Id: I7bca027b89d817b24a0cd045fafb27eeb3f22296
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-11995
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/446918

When TARGET_OUT was found in the module when LOCAL_PROPRIETARY_MODULE is
defined, checkvendor detects an issue.
This is not right as TARGET_OUT could be used in other lines than in
LOCAL_MODULE_PATH.

Add LOCAL_MODULE_PATH to the regular expression to avoid false
positives.

Also do not print informative messages when everything is in
vendor

Change-Id: I9cbc107766e2a54086f442d064ffbff2a7f36c17
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-12295
Signed-off-by: Benjamin Pujol <[email protected]>
Reviewed-on: https://android.intel.com:443/448234

According to comments in common.py, common.ZipWriteStr wrapper can be
used only if data does not exceed 2GiB, otherwise, ZipeWrite wrapper
should be used instead.

Change-Id: Idb003b5d311b7bb3d2b6933abd4c4fcff3d84db0
Signed-off-by: Leo Sartre <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-12013
Reviewed-on: https://android.intel.com:443/446910

use SECPACK_IN_SLB to configure for sofialte which has
secpack header in slb/mobivisor/mvconfig/secvm/splash/ucode_patch

Change-Id: I0e558138b11d4e20614d8a3fcd9b0916dc0f812c
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-9224
Signed-off-by: xihua.chen <[email protected]>
Reviewed-on: https://android.intel.com:443/438022

This target builds a ZIP archive suitable for RMA. This archive includes:

the openssl executable
the key_maker tool (sofia RSA key creation)
the sec_signing tool (sofia certificate building)
the OAK capability binary file
the action-authorization binary

Change-Id: Ic17ad3f84436a3219fe153a857ecb9f66f61bb42
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-12011
Signed-off-by: Gabriel Touzeau <[email protected]>
Reviewed-on: https://android.intel.com:443/446920

Change-Id: If5d43c9172fc739c4c81cf5cc10744f6c49bd56e
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-12347
Signed-off-by: Guillaume Betous <[email protected]>
Reviewed-on: https://android.intel.com:443/448446

sign-efi-sig-list requires a timestamp formatted as %Y-%m-%d %H:%M:%S
This patch correctly formats the timestamp before passing it
as an argument.

Change-Id: I547ada833571ac7bc0d3ac0453746c65894993d9
Signed-off-by: Khalifa Rouis <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-13705
Reviewed-on: https://android.intel.com:443/452621

Change-Id: I266f9d514480a70ef0e304efeda64c2f16308366
Signed-off-by: marie cecile Afantenos <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-14663
Reviewed-on: https://android.intel.com:443/454247

This patch allow a variant flashfiles.ini to defined additional files
which does not exist in generic flashfile.

Change-Id: I77180f58461bb280511ea4375f0204d487dcf3cc
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-14338
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/453927

ota-test-prepare's variants were specific to IRDA
this patch adds support for all platforms variants.
Variants are determined:
* From the build tree by parsing the lunch target's mixins.spec
* From TFP by checking the device_mapping.py inside the archive

Change-Id: I55fa9d29859ba017e54b46aa2db7bc386db4f2eb
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-8572
Signed-off-by: Khalifa Rouis <[email protected]>
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/454353

This reverts commit 3366319.

"adb wait-for-device" will block until a device shows up and enumerate
as "device". When using "-r" switch, the device will enumerate as
"sideload" hence "adb wait-for-device" will never return.
Revert this patch that introduce the use of "adb wait-for-device" for
the old version that was polling using "adb device" command.
This patch should be reverted when a version of adb with the patch:
https://android-review.googlesource.com/#/c/184290/ is packaged into
phoneflashtool.
Revert jira: https://jira01.devtools.intel.com/browse/OAM-14698

Change-Id: I61178b46705b9d189c729d7baf770b2b07735d4d
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-14697
Signed-off-by: Leo Sartre <[email protected]>
Reviewed-on: https://android.intel.com:443/454379

since hw_config has been removed from flashfiles, we have to declare
cfgpart.xml as an additional file to include it in the flashfile zip.

Change-Id: Iead3e848da8d1b950bcc3939caff37422c02fa57
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-14809
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/454611

Produce bootimages and system images to help validate Google Verified
Boot features:
gvb_test_prepare
unsign_boot_img.py

Flash an ota update package using various flow: from main Os, using
sideload:
flash-update

Unpack rsci binary table and display it in a human readable format:
dump_rsci_table.py

Produce ota packages to help validate all possible ota use cases:
ota-test-prepare

Test blob_store:
test_blobstore.py => Removed: blobstore.py interface was totally
redesigned by https://android.intel.com/376586. There is no reason to
keep this anymore. If a test program is needed, it should be written
with the new interface.
It would be helpfull to create a new script to test blobstore
generation: https://jira01.devtools.intel.com/browse/OAM-15204

Script to help running ota secure boot test cases:
ota-test-secureboot => fix path to test scripts, kept for reference, but
this need to be fixed: https://jira01.devtools.intel.com/browse/OAM-14972

Change-Id: Ic965f9f2ea19e1f32dcbcc9bbea93968ef438b14
Signed-off-by: Leo Sartre <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-10450
Reviewed-on: https://android.intel.com:443/442960

Change-Id: I8b081b4712455f292456a0cb25fd378c6fd4e055
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-14444
Signed-off-by: xihua.chen <[email protected]>
Reviewed-on: https://android.intel.com:443/452808

To execute ota_deployment_fixup script, we only need to access to files
in RADIO directory of target files package so we can unzip only this
subdir instead of the whole zip.
This reduces process time from 1m36s to 8s.

Change-Id: I2b6fd88cb030896ed3346fa3b87198d6261998d4
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-15038
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/455197

We don't need to unzip the generic ota file for ota_deployment_fixup, we
can use zipfile library to list files in it.

Change-Id: Ia3df77b2e4efd64a914d1d1b1ce728569aa95637
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-15492
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/456517

Instead of rewriting each OTA zip component one by one into the new zip
file we can copy the whole file and then modify the components we have
to.
This avoid the unzip/rezip process of each non touched components which
is the major part of the OTA zip file.

This reduces the process time for a full OTA package from 2m20 to 1m20.

Change-Id: I7744e7a864e0af029b1dbc1330aceceba325a923
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-15492
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/456518

Change-Id: Idfbd49e1f2eef47b788cb0f59b5f909d6ddf37a1
Signed-off-by: Gabriel Touzeau <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-15442
Reviewed-on: https://android.intel.com:443/456590

In function has_variant(), if the grep fail to match when affecting
HAS_VARIANTS variable, grep will raise SIG_ERR which is a trapped
signal.

Change-Id: Iaee84ebf1049467b051c9f1bd73472fb1af8d98f
Signed-off-by: Leo Sartre <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-15961
Reviewed-on: https://android.intel.com:443/458183

Change-Id: I89271bea093f156bc98fa7508d8e0a04fad497b7
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-14848
Signed-off-by: Chetan Rao <[email protected]>
Reviewed-on: https://android.intel.com:443/457632

Required time format for sign-efi-sig-list is "%Y-%m-%d %I:%M:%S" and
not "%m/%d/%Y %I:%M:%S".
This error leads to have always the timestamp 1-1-0 00:00:00 used for
the variables.

Change-Id: I129faef976a8b045e48ac349148d36488343c9c2
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-16419
Signed-off-by: Sylvain Chouleur <[email protected]>
Reviewed-on: https://android.intel.com:443/459401

In order to check if the rules for the vendor partition are respected
a rule in the makefiles will help to warn if a module
is not installed in vendor when it should be.

Change-Id: I0bcbcf6af8d56ebc77032ad712d59fc9489adc39
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-16968
Signed-off-by: Benjamin Pujol <[email protected]>
Reviewed-on: https://android.intel.com:443/459467

The dictionary was not supporting correctly all the versions
of the RSCI table. This patch updates certain fields that allows
a correct decoding of the information.
Rename it to "parse_rsci_table.py", as it does rather parse the
table than dumping it.

Change-Id: I1e43ec8157c043ccd8e5ef3d937239913dbd3dd4
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-16810
Signed-off-by: Florent Auger <[email protected]>
Reviewed-on: https://android.intel.com:443/460423

… Wifionly function

Change-Id: I828a62efdb98eec5a52e2f0c22be215bf52988fa
Tracked-On:https://jira01.devtools.intel.com/browse/OAM-17062
Signed-off-by: Peter,Zhang <[email protected]>
Reviewed-on: https://android.intel.com:443/461129

Fix the issue of flash SOFIA&3GR failed by PUPDR.

Change-Id: Ie367a36225cc8272fed6a8af004a9cca9f021b9e
Signed-off-by: weijian <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-16304
Reviewed-on: https://android.intel.com:443/459556

In favor of v2.36 in the intel-imc tools folder.  The current
work on the signing scripts depends on the new version.

Change-Id: I28002bd13450a9748b765f0e9ddcf0af7b2c44a3
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-18686
Signed-off-by: Brad Geltz <[email protected]>
Reviewed-on: https://android.intel.com:443/465715

Change-Id: Id71ce4208828a8366c26cbe76119aa2a156fb996
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-18804
Signed-off-by: Louis Fabien <[email protected]>
Reviewed-on: https://android.intel.com:443/464225

The following changes were made to enable fixed-up ota
update.zip for cohos3gr.

 - AddBinaryFiles and get_file_data which were moved to
   intel_common.py are renamed to AddFWImageFile and
   readfile_from_provdata respectively to reflect appropriate
   functionality.
 - ComputeFWUpdatePatches is added as the Sofia equivalent of
   ComputeBootloaderPatches and is used by releasetools.py and
   ota_deployment_fixup to calculate the diffs between files.
 - compute_new_bootloader_patches_sofia patches the updater script
   for Sofia variants. compute_new_bootloader_patches is renamed to
   compute_new_bootloader_patches_efi.
 - patch_or_verbatim_exists is generalized by removing the efi specific
   'bootloader' prefix. It is the calling function's responsibilty to provide
   the filepath.

Change-Id: Ic0a8339d20b744a6e8cda069d2c23855e578ee29
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-13125
Signed-off-by: adattatr <[email protected]>
Reviewed-on: https://android.intel.com:443/450590

Change-Id: Ic5f23158ea3b4d36db121e8e7a2bb9c1e8941fa3
Signed-off-by: weijian <[email protected]>
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-18295
Reviewed-on: https://android.intel.com:443/465085

Change-Id: Id5fa81db56b271205c998e15ba56687a712d2a47
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-13683
Signed-off-by: Guillaume Betous <[email protected]>
Signed-off-by: zhao yucai <[email protected]>
Reviewed-on: https://android.intel.com:443/453917

Google has replaced openssl with boringssl.  But We have a strong
dependency on the openssl project especially because boringssl miss
the PKCS7 support.  We moved the openssl project from external/ to
vendor/intel/external/.

Change-Id: I8df9e7501eab992982655395fa84d9d4e0455de4
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-18590
Signed-off-by: Jeremy Compostella <[email protected]>
Reviewed-on: https://android.intel.com:443/465645

As more checks will be added, the checks are moved
 to a dedicated makefile

Change-Id: I0d8c207d8f93853efb8e46c2a5c8964f78e3899e
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-19572
Signed-off-by: Benjamin Pujol <[email protected]>
Reviewed-on: https://android.intel.com:443/468642

When using LOCAL_MODULE_TAGS the module will be built unconditionally
(not depending on a specific target).
Using PRODUCT_PACKAGES defined in the makefile of the target is
preferred (in device/intel/...).

This rule is set to extract the list of modules that defines
LOCAL_MODULE_TAGS.

Change-Id: I5c8999d987088d8c2205581abe032f78f05e8ed2
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-19572
Signed-off-by: Benjamin Pujol <[email protected]>
Reviewed-on: https://android.intel.com:443/468196

Fix python list issue when using flash_cmd_generator.py
script in command line (main function is called in this
case)

Change-Id: Iee1f54b92bed5c5a9be112855260f524ec9de6ae
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-3707
Signed-off-by: Francois-Nicolas Muller <[email protected]>
Reviewed-on: https://android.intel.com:443/456374

Allows to quickly and easily create OTA test files.

For now here are the generated OTA files :
- Empty (very fast to execute)
- Unsigned (to check unsigned package rejection)
- Alternative signing (to check wrong signing package rejection)
- Possibility to specify the platform name (pre-check in updater-script)
- Possibility to check against very old date (pre-check in updater-script)

Change-Id: I3cdd11641769e1c3c45845c01ce0b7946b6cd3cf
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-17011
Signed-off-by: Guillaume Betous <[email protected]>
Reviewed-on: https://android.intel.com:443/460794

Wrapper tools around the standard FlsTool to support secure signing of
production binaries using pluggable cryptography.

Support for converting keys between standard and IMC formats, verifying
the content of FLS files, and signing FLS files with pluggable crypto.
Includes reference crypto pluggin using OpenSSL command line.

Change-Id: I86ca91a5ae4dc8a171f7e7182623c11dcb43845b
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-19687
Signed-off-by: Matt Wood <[email protected]>
Reviewed-on: https://android.intel.com:443/438507

- Modify AddFWImageFile to simplify logic by changing the
  input parameter to be unzipped tfp. This helps in eliminating
  additional checks for type of zipped or unzipped file etc.

- During ota fixup for Full updates, delete the empty fwu_image.bin
  in the ota zip directory. AddFWImageFile will add the fixed up
  fwu_image.bin.

Change-Id: Icd6092c27645ba7e7a591e843985c8e88ef89587
Tracked-On: https://jira01.devtools.intel.com/browse/OAM-20616
Signed-off-by: adattatr <[email protected]>
Reviewed-on: https://android.intel.com:443/470038