crossystem - remove fmap_base utility
fmap_base utility no longer needed since b:157897361
BUG=chromium:1091253
BRANCH=none
TEST=Compiled, cros_workon_make test,
and cros deploy to kindred device to confirm
there was no fmap_parameter.
Change-Id: Idc89c82555531030beaf8f84ce483a5f49a86fbe
Signed-off-by: Aaron Massey <aaronmassey@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2241386
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
diff --git a/host/arch/arm/lib/crossystem_arch.c b/host/arch/arm/lib/crossystem_arch.c
index 43a59cf..3a1876e 100644
--- a/host/arch/arm/lib/crossystem_arch.c
+++ b/host/arch/arm/lib/crossystem_arch.c
@@ -473,9 +473,7 @@
int VbGetArchPropertyInt(const char* name)
{
- if (!strcasecmp(name, "fmap_base")) {
- return ReadFdtInt("fmap-offset");
- } else if (!strcasecmp(name, "devsw_cur")) {
+ if (!strcasecmp(name, "devsw_cur")) {
/* Systems with virtual developer switches return at-boot
* value */
return VbGetSystemPropertyInt("devsw_boot");
diff --git a/host/arch/x86/lib/crossystem_arch.c b/host/arch/x86/lib/crossystem_arch.c
index f39d31c..3d1c818 100644
--- a/host/arch/x86/lib/crossystem_arch.c
+++ b/host/arch/x86/lib/crossystem_arch.c
@@ -73,7 +73,6 @@
#define ACPI_BINF_PATH ACPI_BASE_PATH "/BINF"
#define ACPI_CHNV_PATH ACPI_BASE_PATH "/CHNV"
#define ACPI_CHSW_PATH ACPI_BASE_PATH "/CHSW"
-#define ACPI_FMAP_PATH ACPI_BASE_PATH "/FMAP"
#define ACPI_GPIO_PATH ACPI_BASE_PATH "/GPIO"
#define ACPI_VBNV_PATH ACPI_BASE_PATH "/VBNV"
#define ACPI_VDAT_PATH ACPI_BASE_PATH "/VDAT"
@@ -831,15 +830,6 @@
{
int value = -1;
- /* Values from ACPI */
- if (!strcasecmp(name,"fmap_base")) {
- unsigned fmap_base;
- if (ReadFileInt(ACPI_FMAP_PATH, &fmap_base) < 0)
- return -1;
- else
- value = (int)fmap_base;
- }
-
/* Switch positions */
if (!strcasecmp(name,"devsw_cur")) {
/* Systems with virtual developer switches return at-boot
diff --git a/utility/crossystem.c b/utility/crossystem.c
index 8d1d186..384c671 100644
--- a/utility/crossystem.c
+++ b/utility/crossystem.c
@@ -52,7 +52,6 @@
{"ecfw_act", IS_STRING, "Active EC firmware"},
{"post_ec_sync_delay", CAN_WRITE,
"Short delay after EC software sync (persistent, writable, eve only)"},
- {"fmap_base", 0, "Main firmware flashmap physical address", "0x%08x"},
{"fw_prev_result", IS_STRING, "Firmware result of previous boot (vboot2)"},
{"fw_prev_tried", IS_STRING, "Firmware tried on previous boot (vboot2)"},
{"fw_result", IS_STRING|CAN_WRITE, "Firmware result this boot (vboot2)"},
