fixup elf2uf2 to allow blocked_ram (flash) binaries (#294)

This commit is contained in:
Graham Sanderson 2021-04-01 15:03:04 -05:00 committed by GitHub
parent 859d1d27b8
commit 260128a725
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 7 deletions

View File

@ -14,12 +14,19 @@ pico_add_subdirectory(pico_stdlib)
pico_add_doxygen(${CMAKE_CURRENT_LIST_DIR}) pico_add_doxygen(${CMAKE_CURRENT_LIST_DIR})
macro(pico_set_float_implementation TARGET IMPL) macro(pico_set_float_implementation TARGET IMPL)
# ignore
endmacro() endmacro()
macro(pico_set_double_implementation TARGET IMPL) macro(pico_set_double_implementation TARGET IMPL)
# ignore
endmacro()
macro(pico_set_binary_type TARGET IMPL)
# ignore
endmacro() endmacro()
macro(pico_set_boot_stage2 TARGET IMPL) macro(pico_set_boot_stage2 TARGET IMPL)
# ignore
endmacro() endmacro()
set(PICO_HOST_DIR "${CMAKE_CURRENT_LIST_DIR}" CACHE INTERNAL "") set(PICO_HOST_DIR "${CMAKE_CURRENT_LIST_DIR}" CACHE INTERNAL "")

View File

@ -59,16 +59,19 @@ struct address_range {
typedef std::vector<address_range> address_ranges; typedef std::vector<address_range> address_ranges;
#define MAIN_RAM_START 0x20000000u #define MAIN_RAM_START 0x20000000u
#define MAIN_RAM_END 0x20042000u #define MAIN_RAM_END 0x20042000u
#define FLASH_START 0x10000000u #define FLASH_START 0x10000000u
#define FLASH_END 0x15000000u #define FLASH_END 0x15000000u
#define XIP_SRAM_START 0x15000000u #define XIP_SRAM_START 0x15000000u
#define XIP_SRAM_END 0x15004000u #define XIP_SRAM_END 0x15004000u
#define MAIN_RAM_BANKED_START 0x21000000u
#define MAIN_RAM_BANKED_END 0x21040000u
const address_ranges rp2040_address_ranges_flash { const address_ranges rp2040_address_ranges_flash {
address_range(FLASH_START, FLASH_END, address_range::type::CONTENTS), address_range(FLASH_START, FLASH_END, address_range::type::CONTENTS),
address_range(MAIN_RAM_START, MAIN_RAM_END, address_range::type::NO_CONTENTS) address_range(MAIN_RAM_START, MAIN_RAM_END, address_range::type::NO_CONTENTS),
address_range(MAIN_RAM_BANKED_START, MAIN_RAM_BANKED_END, address_range::type::NO_CONTENTS)
}; };
const address_ranges rp2040_address_ranges_ram { const address_ranges rp2040_address_ranges_ram {