OrgZephyr/zephyr
OrgZephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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 <tokita.hiroshi@gmail.com>
This commit is contained in:
TOKITA Hiroshi 2024-08-11 04:45:07 +09:00 committed by Anas Nashif
parent 1400ee713a
commit 16c9b74e3a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/flash/flash_rpi_pico.c
View File

@ -171,9 +171,9 @@ void __no_inline_not_in_flash_func(flash_write_partial)(uint32_t flash_offs, con
{ {
rom_connect_internal_flash_fn connect_internal_flash = (rom_connect_internal_flash_fn) rom_connect_internal_flash_fn connect_internal_flash = (rom_connect_internal_flash_fn)
rom_func_lookup_inline(ROM_FUNC_CONNECT_INTERNAL_FLASH); rom_func_lookup_inline(ROM_FUNC_CONNECT_INTERNAL_FLASH);
rom_flash_exit_xip_fn flash_exit_xip = (rom_flash_exit_xip_fn) rom_flash_exit_xip_fn exit_xip = (rom_flash_exit_xip_fn)
rom_func_lookup_inline(ROM_FUNC_FLASH_EXIT_XIP); rom_func_lookup_inline(ROM_FUNC_FLASH_EXIT_XIP);
rom_flash_flush_cache_fn flash_flush_cache = (rom_flash_flush_cache_fn) rom_flash_flush_cache_fn flush_cache = (rom_flash_flush_cache_fn)
rom_func_lookup_inline(ROM_FUNC_FLASH_FLUSH_CACHE); rom_func_lookup_inline(ROM_FUNC_FLASH_FLUSH_CACHE);
flash_init_boot2_copyout(); flash_init_boot2_copyout();
@ -181,9 +181,9 @@ void __no_inline_not_in_flash_func(flash_write_partial)(uint32_t flash_offs, con
__compiler_memory_barrier(); __compiler_memory_barrier();
connect_internal_flash(); connect_internal_flash();
flash_exit_xip(); exit_xip();
flash_write_partial_internal(flash_offs, data, count); flash_write_partial_internal(flash_offs, data, count);
flash_flush_cache(); flush_cache();
flash_enable_xip_via_boot2(); flash_enable_xip_via_boot2();
} }