diff options
Diffstat (limited to 'common/flash.c')
| -rw-r--r-- | common/flash.c | 63 |
1 files changed, 26 insertions, 37 deletions
diff --git a/common/flash.c b/common/flash.c index 4f3f578eed..0a027fd312 100644 --- a/common/flash.c +++ b/common/flash.c @@ -232,13 +232,6 @@ static int flash_range_ok(int offset, int size_req, int align) } #ifdef CONFIG_MAPPED_STORAGE - -/** - * A test public variable allowing us to override the base address of - * flash_physical_dataptr(). - */ -test_export_static const char *flash_physical_dataptr_override; - /** * Get the physical memory address of a flash offset * @@ -252,9 +245,6 @@ test_export_static const char *flash_physical_dataptr_override; */ static const char *flash_physical_dataptr(int offset) { - if (IS_ENABLED(TEST_BUILD) && flash_physical_dataptr_override != NULL) { - return flash_physical_dataptr_override + offset; - } return (char *)((uintptr_t)CONFIG_MAPPED_STORAGE_BASE + offset); } @@ -988,8 +978,6 @@ DECLARE_DEFERRED(flash_erase_deferred); /* Console commands */ #ifdef CONFIG_CMD_FLASHINFO -#define BIT_TO_ON_OFF(value, mask) \ - ((((value) & (mask)) == (mask)) ? "ON" : "OFF") static int command_flash_info(int argc, const char **argv) { int i, flags; @@ -1014,35 +1002,36 @@ static int command_flash_info(int argc, const char **argv) ccprintf("Protect: %4d B\n", CONFIG_FLASH_BANK_SIZE); #endif flags = crec_flash_get_protect(); - ccprintf("Flags:\n"); - ccprintf(" wp_gpio_asserted: %s\n", - BIT_TO_ON_OFF(flags, EC_FLASH_PROTECT_GPIO_ASSERTED)); - ccprintf(" ro_at_boot: %s\n", - BIT_TO_ON_OFF(flags, EC_FLASH_PROTECT_RO_AT_BOOT)); - ccprintf(" all_at_boot: %s\n", - BIT_TO_ON_OFF(flags, EC_FLASH_PROTECT_ALL_AT_BOOT)); - ccprintf(" ro_now: %s\n", - BIT_TO_ON_OFF(flags, EC_FLASH_PROTECT_RO_NOW)); - ccprintf(" all_now: %s\n", - BIT_TO_ON_OFF(flags, EC_FLASH_PROTECT_ALL_NOW)); + ccprintf("Flags: "); + if (flags & EC_FLASH_PROTECT_GPIO_ASSERTED) + ccputs(" wp_gpio_asserted"); + if (flags & EC_FLASH_PROTECT_RO_AT_BOOT) + ccputs(" ro_at_boot"); + if (flags & EC_FLASH_PROTECT_ALL_AT_BOOT) + ccputs(" all_at_boot"); + if (flags & EC_FLASH_PROTECT_RO_NOW) + ccputs(" ro_now"); + if (flags & EC_FLASH_PROTECT_ALL_NOW) + ccputs(" all_now"); #ifdef CONFIG_FLASH_PROTECT_RW - ccprintf(" rw_at_boot: %s\n", - BIT_TO_ON_OFF(flags, EC_FLASH_PROTECT_RW_AT_BOOT)); - ccprintf(" rw_now: %s\n", - BIT_TO_ON_OFF(flags, EC_FLASH_PROTECT_RW_NOW)); + if (flags & EC_FLASH_PROTECT_RW_AT_BOOT) + ccputs(" rw_at_boot"); + if (flags & EC_FLASH_PROTECT_RW_NOW) + ccputs(" rw_now"); #endif - ccprintf(" STUCK: %s\n", - BIT_TO_ON_OFF(flags, EC_FLASH_PROTECT_ERROR_STUCK)); - ccprintf(" INCONSISTENT: %s\n", - BIT_TO_ON_OFF(flags, EC_FLASH_PROTECT_ERROR_INCONSISTENT)); - ccprintf(" UNKNOWN_ERROR: %s\n", - BIT_TO_ON_OFF(flags, EC_FLASH_PROTECT_ERROR_UNKNOWN)); + if (flags & EC_FLASH_PROTECT_ERROR_STUCK) + ccputs(" STUCK"); + if (flags & EC_FLASH_PROTECT_ERROR_INCONSISTENT) + ccputs(" INCONSISTENT"); + if (flags & EC_FLASH_PROTECT_ERROR_UNKNOWN) + ccputs(" UNKNOWN_ERROR"); #ifdef CONFIG_ROLLBACK - ccprintf(" rollback_at_boot: %s\n", - BIT_TO_ON_OFF(flags, EC_FLASH_PROTECT_ROLLBACK_AT_BOOT)); - ccprintf(" rollback_now: %s\n", - BIT_TO_ON_OFF(flags, EC_FLASH_PROTECT_ROLLBACK_NOW)); + if (flags & EC_FLASH_PROTECT_ROLLBACK_AT_BOOT) + ccputs(" rollback_at_boot"); + if (flags & EC_FLASH_PROTECT_ROLLBACK_NOW) + ccputs(" rollback_now"); #endif + ccputs("\n"); ccputs("Protected now:"); for (i = 0; i < PHYSICAL_BANKS; i++) { |