Skip to content

Commit 16c9b74

Browse files
soburinashif
authored andcommitted
drivers: flash: rpi_pico: Rename to avoid conflicting with SDK
Some symbol names have been conflicted with introducing pico-sdk 2.0.0. Rename these. Signed-off-by: TOKITA Hiroshi <[email protected]>
1 parent 1400ee7 commit 16c9b74

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/flash/flash_rpi_pico.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,19 +171,19 @@ void __no_inline_not_in_flash_func(flash_write_partial)(uint32_t flash_offs, con
171171
{
172172
rom_connect_internal_flash_fn connect_internal_flash = (rom_connect_internal_flash_fn)
173173
rom_func_lookup_inline(ROM_FUNC_CONNECT_INTERNAL_FLASH);
174-
rom_flash_exit_xip_fn flash_exit_xip = (rom_flash_exit_xip_fn)
174+
rom_flash_exit_xip_fn exit_xip = (rom_flash_exit_xip_fn)
175175
rom_func_lookup_inline(ROM_FUNC_FLASH_EXIT_XIP);
176-
rom_flash_flush_cache_fn flash_flush_cache = (rom_flash_flush_cache_fn)
176+
rom_flash_flush_cache_fn flush_cache = (rom_flash_flush_cache_fn)
177177
rom_func_lookup_inline(ROM_FUNC_FLASH_FLUSH_CACHE);
178178

179179
flash_init_boot2_copyout();
180180

181181
__compiler_memory_barrier();
182182

183183
connect_internal_flash();
184-
flash_exit_xip();
184+
exit_xip();
185185
flash_write_partial_internal(flash_offs, data, count);
186-
flash_flush_cache();
186+
flush_cache();
187187
flash_enable_xip_via_boot2();
188188
}
189189

0 commit comments

Comments
 (0)