diff --git a/src/flash/nor/avrf.c b/src/flash/nor/avrf.c index 1dc5f07e1c1124e7b6860b4e87e57144839f3d7e..d436ea9c1b7da183a00f923d2648e93d8080c388 100644 --- a/src/flash/nor/avrf.c +++ b/src/flash/nor/avrf.c @@ -479,7 +479,7 @@ struct flash_driver avr_flash = { .read = default_flash_read, .probe = avrf_probe, .auto_probe = avrf_auto_probe, - .erase_check = default_flash_mem_blank_check, + .erase_check = default_flash_blank_check, .protect_check = avrf_protect_check, .info = avrf_info, }; diff --git a/src/flash/nor/core.c b/src/flash/nor/core.c index b2bbeb7dfa2700a51abea047f39a4b54ae0bfdd9..14aa9755158a59efcfa6ffa793ac1db3b01d9b6b 100644 --- a/src/flash/nor/core.c +++ b/src/flash/nor/core.c @@ -253,7 +253,7 @@ int get_flash_bank_by_addr(struct target *target, return ERROR_OK; } -int default_flash_mem_blank_check(struct flash_bank *bank) +static int default_flash_mem_blank_check(struct flash_bank *bank) { struct target *target = bank->target; const int buffer_size = 1024; diff --git a/src/flash/nor/core.h b/src/flash/nor/core.h index 90f4e61431a805c479be1169f3a638d309276fbd..3b6b2b5f512230e16bfa16361b6f816fc878ab3c 100644 --- a/src/flash/nor/core.h +++ b/src/flash/nor/core.h @@ -152,13 +152,6 @@ int default_flash_read(struct flash_bank *bank, * @returns ERROR_OK if successful; otherwise, an error code. */ int default_flash_blank_check(struct flash_bank *bank); -/** - * Provides a default blank flash memory check. Ensures the contents - * of the given bank have truly been erased. - * @param bank The flash bank. - * @returns ERROR_OK if successful; otherwise, an error code. - */ -int default_flash_mem_blank_check(struct flash_bank *bank); /** * Returns the flash bank specified by @a name, which matches the diff --git a/src/flash/nor/em357.c b/src/flash/nor/em357.c index 7c697f13efa53e33ecfedf7b41d358915d0b1298..412c9def2e39080bbf77e4298c57175f0248dca8 100644 --- a/src/flash/nor/em357.c +++ b/src/flash/nor/em357.c @@ -914,7 +914,7 @@ struct flash_driver em357_flash = { .read = default_flash_read, .probe = em357_probe, .auto_probe = em357_auto_probe, - .erase_check = default_flash_mem_blank_check, + .erase_check = default_flash_blank_check, .protect_check = em357_protect_check, .info = get_em357_info, }; diff --git a/src/flash/nor/fm3.c b/src/flash/nor/fm3.c index 583ba22c4ec1fb7db80710e48cbc50ebd6eccfd1..0c6301d4fcceaf5eb8d379020b2e4903337a6a2c 100644 --- a/src/flash/nor/fm3.c +++ b/src/flash/nor/fm3.c @@ -822,6 +822,6 @@ struct flash_driver fm3_flash = { .write = fm3_write_block, .probe = fm3_probe, .auto_probe = fm3_auto_probe, - .erase_check = default_flash_mem_blank_check, + .erase_check = default_flash_blank_check, .info = fm3_info, }; diff --git a/src/flash/nor/pic32mx.c b/src/flash/nor/pic32mx.c index 8cd0fe656ddf03c99740f6332223bcc3a21b7cc0..788a3b919346d9a828c4361be23aef3f6bab19d6 100644 --- a/src/flash/nor/pic32mx.c +++ b/src/flash/nor/pic32mx.c @@ -892,7 +892,7 @@ struct flash_driver pic32mx_flash = { .read = default_flash_read, .probe = pic32mx_probe, .auto_probe = pic32mx_auto_probe, - .erase_check = default_flash_mem_blank_check, + .erase_check = default_flash_blank_check, .protect_check = pic32mx_protect_check, .info = pic32mx_info, }; diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c index b167fb78c5f35f18e71b14308346c61dda6444d5..0bb93693af8c3825edbf861454d04324c3ccd5d4 100644 --- a/src/flash/nor/stellaris.c +++ b/src/flash/nor/stellaris.c @@ -1398,7 +1398,7 @@ struct flash_driver stellaris_flash = { .read = default_flash_read, .probe = stellaris_probe, .auto_probe = stellaris_probe, - .erase_check = default_flash_mem_blank_check, + .erase_check = default_flash_blank_check, .protect_check = stellaris_protect_check, .info = get_stellaris_info, }; diff --git a/src/flash/nor/stm32f1x.c b/src/flash/nor/stm32f1x.c index 91f7f1ffeb586c76ad0d5390a0a17ee39999758f..f05a4aaa3f8a4d4df3d2edbd594bc5ccebaa1b6b 100644 --- a/src/flash/nor/stm32f1x.c +++ b/src/flash/nor/stm32f1x.c @@ -1569,7 +1569,7 @@ struct flash_driver stm32f1x_flash = { .read = default_flash_read, .probe = stm32x_probe, .auto_probe = stm32x_auto_probe, - .erase_check = default_flash_mem_blank_check, + .erase_check = default_flash_blank_check, .protect_check = stm32x_protect_check, .info = get_stm32x_info, }; diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c index daa254651e869868c60294be0518204bd5b214b9..c7e050d0d7cf25abdac8dd22609d47e500de9607 100644 --- a/src/flash/nor/stm32f2x.c +++ b/src/flash/nor/stm32f2x.c @@ -826,7 +826,7 @@ struct flash_driver stm32f2x_flash = { .read = default_flash_read, .probe = stm32x_probe, .auto_probe = stm32x_auto_probe, - .erase_check = default_flash_mem_blank_check, + .erase_check = default_flash_blank_check, .protect_check = stm32x_protect_check, .info = get_stm32x_info, };