diff options
| author | Furquan Shaikh <furquan@google.com> | 2016-06-10 11:05:16 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-06-12 12:44:23 +0200 |
| commit | fe42b11cdfd93e65517cd24f43496cfddff71d37 (patch) | |
| tree | cebecbc28ba041dfcb065953d7f2f764148b85d3 | |
| parent | d15e9aaa48d4382de827522c1020edc63fb135f2 (diff) | |
ifwitool: Correct pack order and header order
Update pack and header order and mark the entries as mandatory and
recommended w.r.t. ordering (mandatory = essential for booting,
recommended = okay to change, but this config is tested and known to work).
Change-Id: Ia089bdaa0703de830bb9553130caf91a3665d2c4
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/15144
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
| -rw-r--r-- | util/cbfstool/ifwitool.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/util/cbfstool/ifwitool.c b/util/cbfstool/ifwitool.c index e783cd5f83..a65c988d8a 100644 --- a/util/cbfstool/ifwitool.c +++ b/util/cbfstool/ifwitool.c @@ -242,47 +242,51 @@ enum bpdt_entry_type { * thus sub-partitions would have increasing offsets as we loop over pack_order. */ const enum bpdt_entry_type bpdt_header_order[MAX_SUBPARTS] = { + /* Order of the following entries is mandatory. */ CSE_IDLM_TYPE, IFP_OVERRIDE_TYPE, S_BPDT_TYPE, CSE_RBE_TYPE, UFS_PHY_TYPE, UFS_GPP_TYPE, - CSE_BUP_TYPE, + /* Order of the following entries is recommended. */ UEP_TYPE, NVM_CONFIG_TYPE, + UFS_RATE_B_TYPE, + IBB_TYPE, SMIP_TYPE, PMC_TYPE, + CSE_BUP_TYPE, UCODE_TYPE, - IBB_TYPE, DEBUG_TOKENS_TYPE, - UFS_RATE_B_TYPE, - ISH_TYPE, + IUNIT_TYPE, CSE_MAIN_TYPE, + ISH_TYPE, OBB_TYPE, - IUNIT_TYPE, }; const enum bpdt_entry_type bpdt_pack_order[MAX_SUBPARTS] = { - CSE_IDLM_TYPE, - UFS_PHY_TYPE, + /* Order of the following entries is mandatory. */ UFS_GPP_TYPE, + UFS_PHY_TYPE, IFP_OVERRIDE_TYPE, UEP_TYPE, - IBB_TYPE, NVM_CONFIG_TYPE, + UFS_RATE_B_TYPE, + /* Order of the following entries is recommended. */ + IBB_TYPE, SMIP_TYPE, CSE_RBE_TYPE, PMC_TYPE, CSE_BUP_TYPE, UCODE_TYPE, + CSE_IDLM_TYPE, DEBUG_TOKENS_TYPE, - UFS_RATE_B_TYPE, S_BPDT_TYPE, - ISH_TYPE, + IUNIT_TYPE, CSE_MAIN_TYPE, + ISH_TYPE, OBB_TYPE, - IUNIT_TYPE, }; /* Utility functions. */ |