diff options
| -rw-r--r-- | board/cr50/board.h | 12 | ||||
| -rw-r--r-- | chip/g/config_chip.h | 2 | ||||
| -rw-r--r-- | fuzz/fuzz_config.h | 14 | ||||
| -rw-r--r-- | include/config.h | 4 |
4 files changed, 9 insertions, 23 deletions
diff --git a/board/cr50/board.h b/board/cr50/board.h index 130ac2320a..ebca03b0ee 100644 --- a/board/cr50/board.h +++ b/board/cr50/board.h @@ -49,17 +49,11 @@ #define CONFIG_CRC8 -/* Non-volatile counter storage for U2F (deprecated) */ -#define CONFIG_FLASH_NVCTR_SIZE CONFIG_FLASH_BANK_SIZE -#define CONFIG_FLASH_NVCTR_BASE_A (CONFIG_PROGRAM_MEMORY_BASE + \ - CFG_TOP_A_OFF) -#define CONFIG_FLASH_NVCTR_BASE_B (CONFIG_PROGRAM_MEMORY_BASE + \ - CFG_TOP_B_OFF) /* We're using TOP_A for partition 0, TOP_B for partition 1 */ #define CONFIG_FLASH_NVMEM /* Offset to start of NvMem area from base of flash */ -#define CONFIG_FLASH_NVMEM_OFFSET_A (CFG_TOP_A_OFF + CONFIG_FLASH_NVCTR_SIZE) -#define CONFIG_FLASH_NVMEM_OFFSET_B (CFG_TOP_B_OFF + CONFIG_FLASH_NVCTR_SIZE) +#define CONFIG_FLASH_NVMEM_OFFSET_A (CFG_TOP_A_OFF) +#define CONFIG_FLASH_NVMEM_OFFSET_B (CFG_TOP_B_OFF) /* Address of start of Nvmem area */ #define CONFIG_FLASH_NVMEM_BASE_A \ (CONFIG_PROGRAM_MEMORY_BASE + CONFIG_FLASH_NVMEM_OFFSET_A) @@ -71,7 +65,7 @@ (CONFIG_FLASH_NVMEM_BASE_B + CONFIG_FLASH_BANK_SIZE) /* Size partition in NvMem */ -#define NVMEM_PARTITION_SIZE (CFG_TOP_SIZE - CONFIG_FLASH_NVCTR_SIZE) +#define NVMEM_PARTITION_SIZE (CFG_TOP_SIZE) #define NEW_NVMEM_PARTITION_SIZE (NVMEM_PARTITION_SIZE - CONFIG_FLASH_BANK_SIZE) #define NEW_NVMEM_TOTAL_PAGES \ (2 * NEW_NVMEM_PARTITION_SIZE / CONFIG_FLASH_BANK_SIZE) diff --git a/chip/g/config_chip.h b/chip/g/config_chip.h index 493cb0eb0f..f7ef934c0d 100644 --- a/chip/g/config_chip.h +++ b/chip/g/config_chip.h @@ -102,7 +102,7 @@ * use these two areas for the same thing, it's just more convenient to make * them the same size. */ -#define CFG_TOP_SIZE 0x3800 +#define CFG_TOP_SIZE 0x3000 #define CFG_TOP_A_OFF (CFG_FLASH_HALF - CFG_TOP_SIZE) #define CFG_TOP_B_OFF (CONFIG_FLASH_SIZE - CFG_TOP_SIZE) diff --git a/fuzz/fuzz_config.h b/fuzz/fuzz_config.h index ba4d9c8458..eb7fbc8401 100644 --- a/fuzz/fuzz_config.h +++ b/fuzz/fuzz_config.h @@ -23,7 +23,7 @@ /* From chip/g/config_chip.h */ #define CFG_FLASH_HALF (CONFIG_FLASH_SIZE >> 1) -#define CFG_TOP_SIZE 0x3800 +#define CFG_TOP_SIZE 0x3000 #define CFG_TOP_A_OFF (CFG_FLASH_HALF - CFG_TOP_SIZE) #define CFG_TOP_B_OFF (CONFIG_FLASH_SIZE - CFG_TOP_SIZE) @@ -35,16 +35,12 @@ #define CONFIG_FLASH_LOG #define CONFIG_FLASH_LOG_BASE CONFIG_PROGRAM_MEMORY_BASE #define CONFIG_FLASH_LOG_SPACE 0x800 -#define CONFIG_FLASH_NVCTR_SIZE CONFIG_FLASH_BANK_SIZE -#define CONFIG_FLASH_NVCTR_BASE_A (CONFIG_PROGRAM_MEMORY_BASE + \ - CFG_TOP_A_OFF) -#define CONFIG_FLASH_NVCTR_BASE_B (CONFIG_PROGRAM_MEMORY_BASE + \ - CFG_TOP_B_OFF) + /* We're using TOP_A for partition 0, TOP_B for partition 1 */ #define CONFIG_FLASH_NVMEM /* Offset to start of NvMem area from base of flash */ -#define CONFIG_FLASH_NVMEM_OFFSET_A (CFG_TOP_A_OFF + CONFIG_FLASH_NVCTR_SIZE) -#define CONFIG_FLASH_NVMEM_OFFSET_B (CFG_TOP_B_OFF + CONFIG_FLASH_NVCTR_SIZE) +#define CONFIG_FLASH_NVMEM_OFFSET_A (CFG_TOP_A_OFF) +#define CONFIG_FLASH_NVMEM_OFFSET_B (CFG_TOP_B_OFF) /* Address of start of Nvmem area */ #define CONFIG_FLASH_NVMEM_BASE_A \ (CONFIG_PROGRAM_MEMORY_BASE + CONFIG_FLASH_NVMEM_OFFSET_A) @@ -55,7 +51,7 @@ #define CONFIG_FLASH_NEW_NVMEM_BASE_B \ (CONFIG_FLASH_NVMEM_BASE_B + CONFIG_FLASH_BANK_SIZE) /* Size partition in NvMem */ -#define NVMEM_PARTITION_SIZE (CFG_TOP_SIZE - CONFIG_FLASH_NVCTR_SIZE) +#define NVMEM_PARTITION_SIZE (CFG_TOP_SIZE) /* Size in bytes of NvMem area */ #define CONFIG_FLASH_NVMEM_SIZE (NVMEM_PARTITION_SIZE * NVMEM_NUM_PARTITIONS) diff --git a/include/config.h b/include/config.h index e09a13bf39..2b071ce8d9 100644 --- a/include/config.h +++ b/include/config.h @@ -1781,10 +1781,6 @@ #undef CONFIG_EC_WRITABLE_STORAGE_OFF #undef CONFIG_EC_WRITABLE_STORAGE_SIZE -/* Address of start of the NVcounter flash page */ -#undef CONFIG_FLASH_NVCTR_BASE_A -#undef CONFIG_FLASH_NVCTR_BASE_B - /*****************************************************************************/ /* Fingerprint Sensor Configuration */ #undef CONFIG_FP_SENSOR_FPC1025 |