Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix spiFlash type mismatch warning during init #2809

Merged
merged 2 commits into from
Jun 18, 2024
Merged

Fix spiFlash type mismatch warning during init #2809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58e0371
Enable use of debug_x for host during init/exit
Jun 12, 2024
cff0e1c
Fix missing device entry in Rp2040, Host hardware config
mikee47 Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Sming/Arch/Host/Components/hostlib/startup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,8 @@ int main(int argc, char* argv[])
}
}

m_setPuts(&host_nputs);

host_debug_i("\nWelcome to the Sming Host emulator\n\n");

auto i = get_first_non_option();
Expand Down Expand Up @@ -309,7 +311,7 @@ int main(int argc, char* argv[])
pause(config.exitpause);

// Avoid issues with debug statements whilst running exit handlers
m_setPuts(nullptr);
m_setPuts(&host_nputs);

return exitCode;
}
7 changes: 6 additions & 1 deletion Sming/Arch/Host/standard.hw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
"arch": "Host",
"bootloader_size": "0x2000",
"partition_table_offset": "0x2000",
"options": ["4m"],
"devices": {
"spiFlash": {
"type": "flash",
"size": "4M"
}
},
"partitions": {
"rom0": {
"address": "0x008000",
Expand Down
9 changes: 6 additions & 3 deletions Sming/Arch/Rp2040/standard.hw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
"arch": "Rp2040",
"bootloader_size": 0,
"partition_table_offset": "self.devices[0].size - 0x1000",
"options": [
"2m"
],
"devices": {
"spiFlash": {
"type": "flash",
"size": "2M"
}
},
"partitions": {
"rom0": {
"address": 0,
Expand Down
Loading