abawo/pico-sdk
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elf2uf2: fix breakage for no_flash builds; removep 0xFFFFFFFF constantds and error messsage

Browse Source
This commit is contained in:
graham sanderson 2021-02-19 14:06:54 -06:00 committed by Graham Sanderson
parent eae2006f79
commit e3925f5864
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/elf2uf2/main.cpp
View File

@ -255,18 +255,18 @@ int elf2uf2(FILE *in, FILE *out) {
} }
uint page_num = 0; uint page_num = 0;
if (ram_style) { if (ram_style) {
uint32_t expected_ep_main_ram = 0xFFFFFFFF; uint32_t expected_ep_main_ram = UINT32_MAX;
uint32_t expected_ep_xip_sram = 0xFFFFFFFF; uint32_t expected_ep_xip_sram = UINT32_MAX;
for(auto& page_entry : pages) { for(auto& page_entry : pages) {
if ( ((page_entry.first >= MAIN_RAM_START) && (page_entry.first < (MAIN_RAM_START + MAIN_RAM_END))) && (page_entry.first < expected_ep_main_ram) ) { if ( ((page_entry.first >= MAIN_RAM_START) && (page_entry.first < (MAIN_RAM_START + MAIN_RAM_END))) && (page_entry.first < expected_ep_main_ram) ) {
expected_ep_main_ram = page_entry.first | 0x1; expected_ep_main_ram = page_entry.first | 0x1;
} else if ( ((page_entry.first >= XIP_SRAM_START) && (page_entry.first < (XIP_SRAM_START + XIP_SRAM_END))) && (page_entry.first < expected_ep_xip_sram) ) { } else if ( ((page_entry.first >= XIP_SRAM_START) && (page_entry.first < (XIP_SRAM_START + XIP_SRAM_END))) && (page_entry.first < expected_ep_xip_sram) ) {
expected_ep_xip_sram = pages.begin()->first | 0x1; expected_ep_xip_sram = page_entry.first | 0x1;
} }
} }
uint32_t expected_ep = (0xFFFFFFFF != expected_ep_main_ram) ? expected_ep_main_ram : expected_ep_xip_sram; uint32_t expected_ep = (UINT32_MAX != expected_ep_main_ram) ? expected_ep_main_ram : expected_ep_xip_sram;
if (eh.entry == expected_ep_xip_sram) { if (eh.entry == expected_ep_xip_sram) {
return fail(ERROR_INCOMPATIBLE, "B0/B1 Boot RAM errata prevents entry into XIP_SRAM\n"); return fail(ERROR_INCOMPATIBLE, "B0/B1 Boot ROM does not support direct entry into XIP_SRAM\n");
} else if (eh.entry != expected_ep) { } else if (eh.entry != expected_ep) {
return fail(ERROR_INCOMPATIBLE, "A RAM binary should have an entry point at the beginning: %08x (not %08x)\n", expected_ep, eh.entry); return fail(ERROR_INCOMPATIBLE, "A RAM binary should have an entry point at the beginning: %08x (not %08x)\n", expected_ep, eh.entry);
} }