coreboot-mirror
/
vboot
mirror of https://review.coreboot.org/vboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "futility: Adds platform check quirk for zork" 

This reverts commit 8dac1697ae.

Reason for revert: Case sensitivity was turned off in https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2192537. This quirk is no longer needed. It could result in accidental overwriting with incompatible firmware. 

Original change's description:
> futility: Adds platform check quirk for zork
> 
> Adds a quirk for futility on zork boards.
> Zork boards before 13073 used lowercase for the firmware
> names which causes the compatible platform check fail.
> 
> This adds the disable_compatible_platform_check quirk and
> enables it by default for zork boards.
> 
> BUG=b:156119908, b:155941790
> TEST=flashed Google_trembyle.13066.0.0 using servo
>      chromeos-firmwareupdater --force
>      rebooted and confirmed Google_Trembyle.13073.0.0 was flashed
> BRANCH=none
> 
> Change-Id: I6fc6bf5bb42b725b5e7c9d0166f945b9c123bab4
> Signed-off-by: Rob Barnes <robbarnes@google.com>
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2191089
> Reviewed-by: Edward Hill <ecgh@chromium.org>
> Reviewed-by: Eric Peers <epeers@google.com>
> Commit-Queue: Edward Hill <ecgh@chromium.org>

Bug: b:156119908, b:155941790
Change-Id: I4688a380dbcd722e8875bf0b5331ecf797efd6a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2197277
Tested-by: Rob Barnes <robbarnes@google.com>
Tested-by: Bhanu Prakash Maiya <bhanumaiya@chromium.org>
Reviewed-by: Rob Barnes <robbarnes@google.com>
Commit-Queue: Bhanu Prakash Maiya <bhanumaiya@chromium.org>
Commit-Queue: Rob Barnes <robbarnes@google.com>
Auto-Submit: Rob Barnes <robbarnes@google.com>
This commit is contained in:
Rob Barnes 2020-05-12 18:30:10 +00:00 committed by Commit Bot
parent d5a4570063
commit 687a4244e4
3 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
futility/updater.c
View File

@ -1162,9 +1162,6 @@ enum updater_error_codes update_firmware(struct updater_config *cfg)
image_to->file_name, image_to->ro_version,
image_to->rw_version_a, image_to->rw_version_b);
if (try_apply_quirk(QUIRK_DISABLE_COMPATIBLE_PLATFORM_CHECK, cfg))
return UPDATE_ERR_PLATFORM;
if (try_apply_quirk(QUIRK_MIN_PLATFORM_VERSION, cfg))
return UPDATE_ERR_PLATFORM;

1
futility/updater.h
View File

@ -44,7 +44,6 @@ enum quirk_types {
QUIRK_ALLOW_EMPTY_WLTAG,
QUIRK_EC_PARTIAL_RECOVERY,
QUIRK_OVERRIDE_SIGNATURE_ID,
QUIRK_DISABLE_COMPATIBLE_PLATFORM_CHECK,
QUIRK_MAX,
};

29
futility/updater_quirks.c
View File

@ -59,18 +59,6 @@ static const struct quirks_record quirks_records[] = {
{ .match = "Google_Wizpig.", .quirks = "allow_empty_wltag" },
{ .match = "Google_Phaser.", .quirks = "override_signature_id" },
/* Zork Boards */
{ .match = "Google_Berknip.",
.quirks = "disable_compatible_platform_check" },
{ .match = "Google_Dalboz.",
.quirks = "disable_compatible_platform_check" },
{ .match = "Google_Ezkinil.",
.quirks = "disable_compatible_platform_check" },
{ .match = "Google_Morphius.",
.quirks = "disable_compatible_platform_check" },
{ .match = "Google_Trembyle.",
.quirks = "disable_compatible_platform_check" },
};
/* Preserves meta data and reload image contents from given file path. */
@ -392,16 +380,6 @@ static int quirk_ec_partial_recovery(struct updater_config *cfg)
return EC_RECOVERY_FULL;
}
/*
* Disables compatible platform check.
* The compatible platform check ensures the current platform and update
* start with the same name.
*/
static int quirk_disable_compatible_platform_check(struct updater_config *cfg) {
cfg->check_platform = 0;
return 0;
}
/*
* Registers known quirks to a updater_config object.
*/
@ -455,13 +433,6 @@ void updater_register_quirks(struct updater_config *cfg)
quirks->help = "chromium/146876241; override signature id for "
"devices shipped with different root key.";
quirks->apply = NULL; /* Simple config. */
quirks = &cfg->quirks[QUIRK_DISABLE_COMPATIBLE_PLATFORM_CHECK];
quirks->name = "disable_compatible_platform_check";
quirks->help = "b/155941790; Disables compatible platform check."
"The compatible platform check ensures the current"
" platform and update start with the same name.";
quirks->apply = quirk_disable_compatible_platform_check;
}
/*