scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-09 00:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: Remove superfluous #defines

Browse Source 
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>
This commit is contained in:
Bill Richardson
2015-09-25 13:28:51 -07:00
committed by chrome-bot
parent bd1cb857c4
commit e9000b22cb
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/flash.c
View File

@@ -139,7 +139,7 @@ static uint32_t flash_read_pstate(void)
{
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 @@ static int flash_write_pstate(uint32_t flags)
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 @@ static int flash_write_pstate(uint32_t flags)
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);
}

6
include/flash.h
View File

@@ -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