@@ -174,16 +174,16 @@ struct mtd_k64f_data {
174
174
static const ARM_STORAGE_BLOCK blockTable [] = {
175
175
{
176
176
/**< This is the start address of the flash block. */
177
- #ifdef CONFIG_HARDWARE_MTD_START_ADDR
178
- .addr = CONFIG_HARDWARE_MTD_START_ADDR ,
177
+ #ifdef DEVICE_STORAGE_CONFIG_HARDWARE_MTD_START_ADDR
178
+ .addr = DEVICE_STORAGE_CONFIG_HARDWARE_MTD_START_ADDR ,
179
179
#else
180
180
.addr = BLOCK1_START_ADDR ,
181
181
#endif
182
182
183
183
/**< This is the size of the flash block, in units of bytes.
184
184
* Together with addr, it describes a range [addr, addr+size). */
185
- #ifdef CONFIG_HARDWARE_MTD_SIZE
186
- .size = CONFIG_HARDWARE_MTD_SIZE ,
185
+ #ifdef DEVICE_STORAGE_CONFIG_HARDWARE_MTD_SIZE
186
+ .size = DEVICE_STORAGE_CONFIG_HARDWARE_MTD_SIZE ,
187
187
#else
188
188
.size = BLOCK1_SIZE ,
189
189
#endif
@@ -205,7 +205,7 @@ static const ARM_DRIVER_VERSION version = {
205
205
};
206
206
207
207
208
- #if (!defined(CONFIG_HARDWARE_MTD_ASYNC_OPS ) || CONFIG_HARDWARE_MTD_ASYNC_OPS )
208
+ #if (!defined(DEVICE_STORAGE_CONFIG_HARDWARE_MTD_ASYNC_OPS ) || DEVICE_STORAGE_CONFIG_HARDWARE_MTD_ASYNC_OPS )
209
209
#define ASYNC_OPS 1
210
210
#else
211
211
#define ASYNC_OPS 0
@@ -224,17 +224,17 @@ static const ARM_STORAGE_CAPABILITIES caps = {
224
224
.asynchronous_ops = ASYNC_OPS ,
225
225
226
226
/* Enable chip-erase functionality if we own all of block-1. */
227
- #if ((!defined (CONFIG_HARDWARE_MTD_START_ADDR ) || (CONFIG_HARDWARE_MTD_START_ADDR == BLOCK1_START_ADDR )) && \
228
- (!defined (CONFIG_HARDWARE_MTD_SIZE ) || (CONFIG_HARDWARE_MTD_SIZE == BLOCK1_SIZE )))
227
+ #if ((!defined (DEVICE_STORAGE_CONFIG_HARDWARE_MTD_START_ADDR ) || (DEVICE_STORAGE_CONFIG_HARDWARE_MTD_START_ADDR == BLOCK1_START_ADDR )) && \
228
+ (!defined (DEVICE_STORAGE_CONFIG_HARDWARE_MTD_SIZE ) || (DEVICE_STORAGE_CONFIG_HARDWARE_MTD_SIZE == BLOCK1_SIZE )))
229
229
.erase_all = 1 , /**< Supports EraseChip operation. */
230
230
#else
231
231
.erase_all = 0 , /**< Supports EraseChip operation. */
232
232
#endif
233
233
};
234
234
235
235
static const ARM_STORAGE_INFO info = {
236
- #ifdef CONFIG_HARDWARE_MTD_SIZE
237
- .total_storage = CONFIG_HARDWARE_MTD_SIZE , /**< Total available storage, in units of octets. */
236
+ #ifdef DEVICE_STORAGE_CONFIG_HARDWARE_MTD_SIZE
237
+ .total_storage = DEVICE_STORAGE_CONFIG_HARDWARE_MTD_SIZE , /**< Total available storage, in units of octets. */
238
238
#else
239
239
.total_storage = BLOCK1_SIZE , /**< Total available storage, in units of octets. By default, BLOCK0 is reserved to hold program code. */
240
240
#endif
0 commit comments