From d976c9c9f93847063bdde53ae7024766885e0d0e Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Tue, 27 Feb 2018 14:56:07 +1030 Subject: pnor_partition_table: Drop Table ctor with default location Make the caller be explicit about what they want. Also, rearrange calls in mboxd_pnor_partition_table.cpp to remove noise there as well. Change-Id: I8e36101b84b1b24cf0edbedb744f8edca15a834a Signed-off-by: Andrew Jeffery --- mboxd_pnor_partition_table.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'mboxd_pnor_partition_table.cpp') diff --git a/mboxd_pnor_partition_table.cpp b/mboxd_pnor_partition_table.cpp index 3a09c92..84a0314 100644 --- a/mboxd_pnor_partition_table.cpp +++ b/mboxd_pnor_partition_table.cpp @@ -22,9 +22,7 @@ void init_vpnor(struct mbox_context *context) strcpy(context->paths.prsv_loc, PARTITION_FILES_PRSV_LOC); strcpy(context->paths.patch_loc, PARTITION_FILES_PATCH_LOC); - context->vpnor = new vpnor_partition_table; - context->vpnor->table = new openpower::virtual_pnor::partition::Table( - 1 << context->erase_size_shift, context->flash_size); + vpnor_create_partition_table_from_path(context, PARTITION_FILES_RO_LOC); } } @@ -78,8 +76,11 @@ void vpnor_copy_bootloader_partition(const struct mbox_context *context) constexpr size_t tocMaxSize = 0x8000; constexpr size_t tocStart = pnorSize - tocMaxSize - pageSize; constexpr auto blPartitionName = "HBB"; + namespace fs = std::experimental::filesystem; + + openpower::virtual_pnor::partition::Table blTable( + fs::path{PARTITION_FILES_RO_LOC}, eraseSize, pnorSize); - openpower::virtual_pnor::partition::Table blTable(eraseSize, pnorSize); vpnor_partition_table vtbl{}; vtbl.table = &blTable; struct mbox_context local -- cgit v1.2.1