diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/config.h | 2 | ||||
-rw-r--r-- | include/config_std_internal_flash.h | 4 | ||||
-rw-r--r-- | include/flash.h | 2 | ||||
-rw-r--r-- | include/rwsig.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/config.h b/include/config.h index 289d15e44c..10e520e5f7 100644 --- a/include/config.h +++ b/include/config.h @@ -1825,7 +1825,7 @@ #undef CONFIG_FLASH_REGION_TYPE_COUNT /* Total size of writable flash */ -#undef CONFIG_FLASH_SIZE +#undef CONFIG_FLASH_SIZE_BYTES /* Minimum flash write size (in bytes) */ #undef CONFIG_FLASH_WRITE_SIZE diff --git a/include/config_std_internal_flash.h b/include/config_std_internal_flash.h index 4b722f86d9..d272f5136c 100644 --- a/include/config_std_internal_flash.h +++ b/include/config_std_internal_flash.h @@ -37,7 +37,7 @@ * This is NOT a globally defined config, and is only used in this file * for convenience. */ -#define _IMAGE_SIZE ((CONFIG_FLASH_SIZE - \ +#define _IMAGE_SIZE ((CONFIG_FLASH_SIZE_BYTES - \ CONFIG_SHAREDLIB_SIZE) / 2) /* @@ -69,7 +69,7 @@ #define CONFIG_EC_PROTECTED_STORAGE_OFF 0 #define CONFIG_EC_PROTECTED_STORAGE_SIZE CONFIG_RW_MEM_OFF #define CONFIG_EC_WRITABLE_STORAGE_OFF CONFIG_RW_MEM_OFF -#define CONFIG_EC_WRITABLE_STORAGE_SIZE (CONFIG_FLASH_SIZE - \ +#define CONFIG_EC_WRITABLE_STORAGE_SIZE (CONFIG_FLASH_SIZE_BYTES - \ CONFIG_EC_WRITABLE_STORAGE_OFF) #define CONFIG_WP_STORAGE_OFF CONFIG_EC_PROTECTED_STORAGE_OFF diff --git a/include/flash.h b/include/flash.h index 7dfb309122..5fc6ae1055 100644 --- a/include/flash.h +++ b/include/flash.h @@ -61,7 +61,7 @@ int flash_bank_erase_size(int bank); #else /* CONFIG_FLASH_MULTIPLE_REGION */ /* Number of physical flash banks */ #ifndef PHYSICAL_BANKS -#define PHYSICAL_BANKS (CONFIG_FLASH_SIZE / CONFIG_FLASH_BANK_SIZE) +#define PHYSICAL_BANKS (CONFIG_FLASH_SIZE_BYTES / CONFIG_FLASH_BANK_SIZE) #endif /* WP region offset and size in units of flash banks */ diff --git a/include/rwsig.h b/include/rwsig.h index c43932b173..425618490b 100644 --- a/include/rwsig.h +++ b/include/rwsig.h @@ -91,7 +91,7 @@ void rwsig_jump_now(void); * which might actually be in the PSTATE region. */ #define CONFIG_RO_PUBKEY_ADDR (CONFIG_PROGRAM_MEMORY_BASE \ - + (CONFIG_FLASH_SIZE / 2) \ + + (CONFIG_FLASH_SIZE_BYTES / 2) \ - CONFIG_RO_PUBKEY_SIZE) #endif #endif /* CONFIG_RO_PUBKEY_ADDR */ |