From fe42b11cdfd93e65517cd24f43496cfddff71d37 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Fri, 10 Jun 2016 11:05:16 -0700 Subject: 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 Reviewed-on: https://review.coreboot.org/15144 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Paul Menzel --- util/cbfstool/ifwitool.c | 26 +++++++++++++++----------- 1 file 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. */ -- cgit v1.2.3