diff options
Diffstat (limited to 'src/flash/nor')
| -rw-r--r-- | src/flash/nor/aduc702x.c | 2 | ||||
| -rw-r--r-- | src/flash/nor/cfi.c | 4 | ||||
| -rw-r--r-- | src/flash/nor/ecos.c | 2 | ||||
| -rw-r--r-- | src/flash/nor/lpc2000.c | 2 | ||||
| -rw-r--r-- | src/flash/nor/lpc2900.c | 2 | ||||
| -rw-r--r-- | src/flash/nor/str7x.c | 2 | ||||
| -rw-r--r-- | src/flash/nor/str9x.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/src/flash/nor/aduc702x.c b/src/flash/nor/aduc702x.c index 1b9f5c08..c223ec47 100644 --- a/src/flash/nor/aduc702x.c +++ b/src/flash/nor/aduc702x.c @@ -243,7 +243,7 @@ static int aduc702x_write_block(struct flash_bank *bank, uint8_t *buffer, uint32 armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC; armv4_5_info.core_mode = ARMV4_5_MODE_SVC; - armv4_5_info.core_state = ARMV4_5_STATE_ARM; + armv4_5_info.core_state = ARM_STATE_ARM; init_reg_param(®_params[0], "r0", 32, PARAM_OUT); init_reg_param(®_params[1], "r1", 32, PARAM_OUT); diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c index c00d65f1..991110b8 100644 --- a/src/flash/nor/cfi.c +++ b/src/flash/nor/cfi.c @@ -1087,7 +1087,7 @@ static int cfi_intel_write_block(struct flash_bank *bank, uint8_t *buffer, uint3 armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC; armv4_5_info.core_mode = ARMV4_5_MODE_SVC; - armv4_5_info.core_state = ARMV4_5_STATE_ARM; + armv4_5_info.core_state = ARM_STATE_ARM; /* If we are setting up the write_algorith, we need target_code_src */ /* if not we only need target_code_size. */ @@ -1410,7 +1410,7 @@ static int cfi_spansion_write_block(struct flash_bank *bank, uint8_t *buffer, ui armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC; armv4_5_info.core_mode = ARMV4_5_MODE_SVC; - armv4_5_info.core_state = ARMV4_5_STATE_ARM; + armv4_5_info.core_state = ARM_STATE_ARM; int target_code_size; const uint32_t *target_code_src; diff --git a/src/flash/nor/ecos.c b/src/flash/nor/ecos.c index 799015ef..41b06b3c 100644 --- a/src/flash/nor/ecos.c +++ b/src/flash/nor/ecos.c @@ -212,7 +212,7 @@ static int runCode(struct ecosflash_flash_bank *info, struct armv4_5_algorithm armv4_5_info; armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC; armv4_5_info.core_mode = ARMV4_5_MODE_SVC; - armv4_5_info.core_state = ARMV4_5_STATE_ARM; + armv4_5_info.core_state = ARM_STATE_ARM; init_reg_param(®_params[0], "r0", 32, PARAM_IN_OUT); init_reg_param(®_params[1], "r1", 32, PARAM_OUT); diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c index d824c37a..2b1e6717 100644 --- a/src/flash/nor/lpc2000.c +++ b/src/flash/nor/lpc2000.c @@ -294,7 +294,7 @@ static int lpc2000_iap_call(struct flash_bank *bank, int code, uint32_t param_ta case lpc2000_v2: armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC; armv4_5_info.core_mode = ARMV4_5_MODE_SVC; - armv4_5_info.core_state = ARMV4_5_STATE_ARM; + armv4_5_info.core_state = ARM_STATE_ARM; iap_entry_point = 0x7ffffff1; break; default: diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c index 0b42d48c..8dc06d1c 100644 --- a/src/flash/nor/lpc2900.c +++ b/src/flash/nor/lpc2900.c @@ -1425,7 +1425,7 @@ static int lpc2900_write(struct flash_bank *bank, uint8_t *buffer, /* Execute algorithm, assume breakpoint for last instruction */ armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC; armv4_5_info.core_mode = ARMV4_5_MODE_SVC; - armv4_5_info.core_state = ARMV4_5_STATE_ARM; + armv4_5_info.core_state = ARM_STATE_ARM; retval = target_run_algorithm(target, 0, NULL, 5, reg_params, (warea->address) + buffer_size, diff --git a/src/flash/nor/str7x.c b/src/flash/nor/str7x.c index 4f93ec9a..ea584a50 100644 --- a/src/flash/nor/str7x.c +++ b/src/flash/nor/str7x.c @@ -373,7 +373,7 @@ static int str7x_write_block(struct flash_bank *bank, uint8_t *buffer, uint32_t armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC; armv4_5_info.core_mode = ARMV4_5_MODE_SVC; - armv4_5_info.core_state = ARMV4_5_STATE_ARM; + armv4_5_info.core_state = ARM_STATE_ARM; init_reg_param(®_params[0], "r0", 32, PARAM_OUT); init_reg_param(®_params[1], "r1", 32, PARAM_OUT); diff --git a/src/flash/nor/str9x.c b/src/flash/nor/str9x.c index 36096ff5..21760f33 100644 --- a/src/flash/nor/str9x.c +++ b/src/flash/nor/str9x.c @@ -410,7 +410,7 @@ static int str9x_write_block(struct flash_bank *bank, armv4_5_info.common_magic = ARMV4_5_COMMON_MAGIC; armv4_5_info.core_mode = ARMV4_5_MODE_SVC; - armv4_5_info.core_state = ARMV4_5_STATE_ARM; + armv4_5_info.core_state = ARM_STATE_ARM; init_reg_param(®_params[0], "r0", 32, PARAM_OUT); init_reg_param(®_params[1], "r1", 32, PARAM_OUT); |