cleanup: Remove superfluous #defines
This just removes a couple places where a perfectly good CONFIG
macro is simply renamed to something else.
BUG=none
BRANCH=none
TEST=make buildall
Change-Id: I97a4abe95736504fe97c468336426d0ecc48d62c
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/302597
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
diff --git a/common/flash.c b/common/flash.c
index ca07800..7cd977d 100644
--- a/common/flash.c
+++ b/common/flash.c
@@ -139,7 +139,7 @@
{
const struct persist_state *pstate =
(const struct persist_state *)
- flash_physical_dataptr(PSTATE_OFFSET);
+ flash_physical_dataptr(CONFIG_FW_PSTATE_OFF);
if ((pstate->version == PERSIST_STATE_VERSION) &&
(pstate->flags & PERSIST_FLAG_PROTECT_RO)) {
@@ -173,7 +173,8 @@
return EC_SUCCESS;
/* Erase pstate */
- rv = flash_physical_erase(PSTATE_OFFSET, PSTATE_SIZE);
+ rv = flash_physical_erase(CONFIG_FW_PSTATE_OFF,
+ CONFIG_FW_PSTATE_SIZE);
if (rv)
return rv;
@@ -188,7 +189,7 @@
pstate.version = PERSIST_STATE_VERSION;
if (flags & EC_FLASH_PROTECT_RO_AT_BOOT)
pstate.flags |= PERSIST_FLAG_PROTECT_RO;
- return flash_physical_write(PSTATE_OFFSET, sizeof(pstate),
+ return flash_physical_write(CONFIG_FW_PSTATE_OFF, sizeof(pstate),
(const char *)&pstate);
}
diff --git a/include/flash.h b/include/flash.h
index 8d5d1b1..b065e7b 100644
--- a/include/flash.h
+++ b/include/flash.h
@@ -20,10 +20,8 @@
/* Persistent protection state flash offset / size / bank */
#if defined(CONFIG_FLASH_PSTATE) && defined(CONFIG_FLASH_PSTATE_BANK)
-#define PSTATE_OFFSET CONFIG_FW_PSTATE_OFF
-#define PSTATE_SIZE CONFIG_FW_PSTATE_SIZE
-#define PSTATE_BANK (PSTATE_OFFSET / CONFIG_FLASH_BANK_SIZE)
-#define PSTATE_BANK_COUNT (PSTATE_SIZE / CONFIG_FLASH_BANK_SIZE)
+#define PSTATE_BANK (CONFIG_FW_PSTATE_OFF / CONFIG_FLASH_BANK_SIZE)
+#define PSTATE_BANK_COUNT (CONFIG_FW_PSTATE_SIZE / CONFIG_FLASH_BANK_SIZE)
#else
#define PSTATE_BANK_COUNT 0
#endif
