diff options
| author | Aaron Massey <aaronmassey@chromium.org> | 2020-06-11 15:02:16 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-06-16 17:56:56 +0000 |
| commit | 110d598118702b6da049c3b609d216130b1baa51 (patch) | |
| tree | 520fa813eed0cb515bc0b075899f18e533f15642 | |
| parent | f67e376c045cd5abac54c7c858c88971ec9b2aa5 (diff) | |
| download | vboot-110d598118702b6da049c3b609d216130b1baa51.tar.gz | |
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>
| -rw-r--r-- | host/arch/arm/lib/crossystem_arch.c | 4 | ||||
| -rw-r--r-- | host/arch/x86/lib/crossystem_arch.c | 10 | ||||
| -rw-r--r-- | utility/crossystem.c | 1 |
3 files changed, 1 insertions, 14 deletions
diff --git a/host/arch/arm/lib/crossystem_arch.c b/host/arch/arm/lib/crossystem_arch.c index 43a59cf2..3a1876ec 100644 --- a/host/arch/arm/lib/crossystem_arch.c +++ b/host/arch/arm/lib/crossystem_arch.c @@ -473,9 +473,7 @@ VbSharedDataHeader *VbSharedDataRead(void) 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 f39d31c5..3d1c8181 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 VbGetArchPropertyInt(const char* name) { 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 8d1d1863..384c6717 100644 --- a/utility/crossystem.c +++ b/utility/crossystem.c @@ -52,7 +52,6 @@ const Param sys_param_list[] = { {"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)"}, |