Use block_size and page_size tokens when dump BCT data
Change to use block_size and page_size tokens instead of
block_size_log2 and page_size_log2 tokens when dump BCT
data.
Signed-off-by: Penny Chiu <pchiu@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
diff --git a/src/bct_dump.c b/src/bct_dump.c
index a8e3479..40ab3b4 100644
--- a/src/bct_dump.c
+++ b/src/bct_dump.c
@@ -40,8 +40,8 @@
static value_data const values[] = {
{ token_boot_data_version, "Version = ", format_u32_hex8 },
- { token_block_size_log2, "BlockSize = ", format_u32_hex8 },
- { token_page_size_log2, "PageSize = ", format_u32_hex8 },
+ { token_block_size, "BlockSize = ", format_u32_hex8 },
+ { token_page_size, "PageSize = ", format_u32_hex8 },
{ token_partition_size, "PartitionSize = ", format_u32_hex8 },
{ token_odm_data, "OdmData = ", format_u32_hex8 },
{ token_bootloader_used, "# Bootloader used = ", format_u32 },
@@ -180,9 +180,6 @@
if (e != 0)
data = -1;
- else if (values[i].id == token_block_size_log2 ||
- values[i].id == token_page_size_log2)
- data = 1 << data;
values[i].format(values[i].message, &data);
}
diff --git a/src/t114/nvbctlib_t114.c b/src/t114/nvbctlib_t114.c
index 2f45cc1..5b1f28b 100644
--- a/src/t114/nvbctlib_t114.c
+++ b/src/t114/nvbctlib_t114.c
@@ -98,8 +98,8 @@
parse_token t114_root_token_list[] = {
token_boot_data_version,
- token_block_size_log2,
- token_page_size_log2,
+ token_block_size,
+ token_page_size,
token_partition_size,
token_odm_data,
token_bootloader_used,
@@ -941,6 +941,18 @@
CASE_GET_NVU32(bootloader_used);
CASE_GET_NVU32(odm_data);
+ case token_block_size:
+ if (bct == NULL)
+ return -ENODATA;
+ *((u_int32_t *)data) = 1 << bct_ptr->block_size_log2;
+ break;
+
+ case token_page_size:
+ if (bct == NULL)
+ return -ENODATA;
+ *((u_int32_t *)data) = 1 << bct_ptr->page_size_log2;
+ break;
+
/*
* Constants.
*/
diff --git a/src/t124/nvbctlib_t124.c b/src/t124/nvbctlib_t124.c
index d44f3df..ad0c365 100644
--- a/src/t124/nvbctlib_t124.c
+++ b/src/t124/nvbctlib_t124.c
@@ -101,8 +101,8 @@
parse_token t124_root_token_list[] = {
token_boot_data_version,
- token_block_size_log2,
- token_page_size_log2,
+ token_block_size,
+ token_page_size,
token_partition_size,
token_odm_data,
token_bootloader_used,
@@ -942,6 +942,18 @@
CASE_GET_NVU32(bootloader_used);
CASE_GET_NVU32(odm_data);
+ case token_block_size:
+ if (bct == NULL)
+ return -ENODATA;
+ *((u_int32_t *)data) = 1 << bct_ptr->block_size_log2;
+ break;
+
+ case token_page_size:
+ if (bct == NULL)
+ return -ENODATA;
+ *((u_int32_t *)data) = 1 << bct_ptr->page_size_log2;
+ break;
+
/*
* Constants.
*/
diff --git a/src/t20/nvbctlib_t20.c b/src/t20/nvbctlib_t20.c
index 6576011..30a95a3 100644
--- a/src/t20/nvbctlib_t20.c
+++ b/src/t20/nvbctlib_t20.c
@@ -98,8 +98,8 @@
parse_token t20_root_token_list[] = {
token_boot_data_version,
- token_block_size_log2,
- token_page_size_log2,
+ token_block_size,
+ token_page_size,
token_partition_size,
token_odm_data,
token_bootloader_used,
@@ -530,6 +530,18 @@
CASE_GET_NVU32(bootloader_used);
CASE_GET_NVU32(odm_data);
+ case token_block_size:
+ if (bct == NULL)
+ return -ENODATA;
+ *((u_int32_t *)data) = 1 << bct_ptr->block_size_log2;
+ break;
+
+ case token_page_size:
+ if (bct == NULL)
+ return -ENODATA;
+ *((u_int32_t *)data) = 1 << bct_ptr->page_size_log2;
+ break;
+
/*
* Constants.
*/
diff --git a/src/t30/nvbctlib_t30.c b/src/t30/nvbctlib_t30.c
index 8c72d69..1e9697b 100644
--- a/src/t30/nvbctlib_t30.c
+++ b/src/t30/nvbctlib_t30.c
@@ -98,8 +98,8 @@
parse_token t30_root_token_list[] = {
token_boot_data_version,
- token_block_size_log2,
- token_page_size_log2,
+ token_block_size,
+ token_page_size,
token_partition_size,
token_odm_data,
token_bootloader_used,
@@ -737,6 +737,18 @@
CASE_GET_NVU32(bootloader_used);
CASE_GET_NVU32(odm_data);
+ case token_block_size:
+ if (bct == NULL)
+ return -ENODATA;
+ *((u_int32_t *)data) = 1 << bct_ptr->block_size_log2;
+ break;
+
+ case token_page_size:
+ if (bct == NULL)
+ return -ENODATA;
+ *((u_int32_t *)data) = 1 << bct_ptr->page_size_log2;
+ break;
+
/*
* Constants.
*/