From 5d422deed1fcd388a7314de6e1ecf5ab556586b8 Mon Sep 17 00:00:00 2001 From: Andrew Scheller Date: Wed, 4 May 2022 22:36:21 +0100 Subject: [PATCH] Add extra info about address_range defined values (#652) --- tools/elf2uf2/main.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/elf2uf2/main.cpp b/tools/elf2uf2/main.cpp index 2c0ddcd..a8de0fb 100644 --- a/tools/elf2uf2/main.cpp +++ b/tools/elf2uf2/main.cpp @@ -59,14 +59,16 @@ struct address_range { typedef std::vector address_ranges; -#define MAIN_RAM_START 0x20000000u -#define MAIN_RAM_END 0x20042000u -#define FLASH_START 0x10000000u +#define MAIN_RAM_START 0x20000000u // same as SRAM_BASE in addressmap.h +#define MAIN_RAM_END 0x20042000u // same as SRAM_END in addressmap.h +#define FLASH_START 0x10000000u // same as XIP_MAIN_BASE in addressmap.h #define FLASH_END 0x15000000u -#define XIP_SRAM_START 0x15000000u -#define XIP_SRAM_END 0x15004000u -#define MAIN_RAM_BANKED_START 0x21000000u +#define XIP_SRAM_START 0x15000000u // same as XIP_SRAM_BASE in addressmap.h +#define XIP_SRAM_END 0x15004000u // same as XIP_SRAM_END in addressmap.h +#define MAIN_RAM_BANKED_START 0x21000000u // same as SRAM0_BASE in addressmap.h #define MAIN_RAM_BANKED_END 0x21040000u +#define ROM_START 0x00000000u // same as ROM_BASE in addressmap.h +#define ROM_END 0x00004000u const address_ranges rp2040_address_ranges_flash { address_range(FLASH_START, FLASH_END, address_range::type::CONTENTS), @@ -77,7 +79,7 @@ const address_ranges rp2040_address_ranges_flash { const address_ranges rp2040_address_ranges_ram { address_range(MAIN_RAM_START, MAIN_RAM_END, address_range::type::CONTENTS), address_range(XIP_SRAM_START, XIP_SRAM_END, address_range::type::CONTENTS), - address_range(0x00000000u, 0x00004000u, address_range::type::IGNORE) // for now we ignore the bootrom if present + address_range(ROM_START, ROM_END, address_range::type::IGNORE) // for now we ignore the bootrom if present }; struct page_fragment {