Skip to content

Commit 887aa83

Browse files
author
Rohit Grover
committed
rename CONFIG_HARDWARE... to have a prefix of DEVICE_STORAGE_
1 parent 14a14a0 commit 887aa83

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

hal/targets/hal/TARGET_Freescale/TARGET_KSDK2_MCUS/TARGET_K64F/storage_driver.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -174,16 +174,16 @@ struct mtd_k64f_data {
174174
static const ARM_STORAGE_BLOCK blockTable[] = {
175175
{
176176
/**< 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,
179179
#else
180180
.addr = BLOCK1_START_ADDR,
181181
#endif
182182

183183
/**< This is the size of the flash block, in units of bytes.
184184
* 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,
187187
#else
188188
.size = BLOCK1_SIZE,
189189
#endif
@@ -205,7 +205,7 @@ static const ARM_DRIVER_VERSION version = {
205205
};
206206

207207

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)
209209
#define ASYNC_OPS 1
210210
#else
211211
#define ASYNC_OPS 0
@@ -224,17 +224,17 @@ static const ARM_STORAGE_CAPABILITIES caps = {
224224
.asynchronous_ops = ASYNC_OPS,
225225

226226
/* 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)))
229229
.erase_all = 1, /**< Supports EraseChip operation. */
230230
#else
231231
.erase_all = 0, /**< Supports EraseChip operation. */
232232
#endif
233233
};
234234

235235
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. */
238238
#else
239239
.total_storage = BLOCK1_SIZE, /**< Total available storage, in units of octets. By default, BLOCK0 is reserved to hold program code. */
240240
#endif

0 commit comments

Comments
 (0)