summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2021-10-09 23:13:08 -0700
committerFurquan Shaikh <furquan.shaikh.osc@gmail.com>2021-10-19 16:32:30 +0000
commitd0975ff5d5eba13f8be8f8e99daf88d41f04579c (patch)
treebb3de09e301752c3d08fa249a6b58f3780462c8a
parentbf848ad4b297cf59f9107c6390159687d4429009 (diff)
soc/intel/common/block/cse: Use newly added `create-cse-region`
This change uses the newly added `create-cse-region` command for cse_serger tool instead of performing `dd` operations for each partition. BUG=b:189177580 Change-Id: Ia915e3ac423f9461876e9ae186fb8ddce55f3194 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/58216 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
-rw-r--r--src/soc/intel/common/block/cse/Makefile.inc17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/soc/intel/common/block/cse/Makefile.inc b/src/soc/intel/common/block/cse/Makefile.inc
index 13f879ef9f..eac7d90424 100644
--- a/src/soc/intel/common/block/cse/Makefile.inc
+++ b/src/soc/intel/common/block/cse/Makefile.inc
@@ -53,19 +53,12 @@ $(objcse)/cse_%.bin: $(CSE_SERGER) cse_inputs $(cse_decomp_files)
$(foreach ingredient,$(cse_$*_ingredients),\
$(call cse_add_ingredient,$(@F),$(ingredient));)
-$(CSE_LAYOUT_BIN): $(obj)/fmap_config.h $(CSE_SERGER)
- printf " CREATE $(@F) (version $(CSE_BPDT_VERSION))\n"
- $(CSE_SERGER) $@ create-layout -v $(CSE_BPDT_VERSION) \
- --bp1 $(CSE_BP1_OFFSET):$(CSE_BP1_SIZE) \
- --bp2 $(CSE_BP2_OFFSET):$(CSE_BP2_SIZE) \
- --dp $(CSE_DP_OFFSET):$(CSE_DP_SIZE) > /dev/null
-
-$(OBJ_ME_BIN): $(CSE_BP1_BIN) $(CSE_BP2_BIN) $(CSE_DATA_INPUT) $(CSE_LAYOUT_BIN)
+$(OBJ_ME_BIN): $(CSE_BP1_BIN) $(CSE_BP2_BIN) $(CSE_DATA_INPUT) $(obj)/fmap_config.h
printf " CREATE $(@F)\n"
- dd if=$(CSE_LAYOUT_BIN) of=$@ bs=1 conv=notrunc 2> /dev/null
- dd if=$(CSE_BP1_BIN) of=$@ bs=1 conv=notrunc seek=$(CSE_BP1_OFFSET) 2> /dev/null
- dd if=$(CSE_BP2_BIN) of=$@ bs=1 conv=notrunc seek=$(CSE_BP2_OFFSET) 2> /dev/null
- dd if=$(CSE_DATA_INPUT) of=$@ bs=1 conv=notrunc seek=$(CSE_DP_OFFSET) 2> /dev/null
+ $(CSE_SERGER) $@ create-cse-region -v $(CSE_BPDT_VERSION) \
+ --bp1 $(CSE_BP1_OFFSET):$(CSE_BP1_SIZE) --bp1_file $(CSE_BP1_BIN) \
+ --bp2 $(CSE_BP2_OFFSET):$(CSE_BP2_SIZE) --bp2_file $(CSE_BP2_BIN) \
+ --dp $(CSE_DP_OFFSET):$(CSE_DP_SIZE) --dp_file $(CSE_DATA_INPUT) > /dev/null
endif