pw_boot_armv7m: rename INTERRUPT_VECTOR_TABLE
Renames occurrences of PW_BOOT_INTERRUPT_VECTOR_TABLE_* to
PW_BOOT_VECTOR_TABLE_* for consistency in naming and to match ARMv7-M
documentation.
Change-Id: Ic34c8b56ee6e87955fe5dd076344f4b648974767
diff --git a/pw_boot_armv7m/basic_armv7m.ld b/pw_boot_armv7m/basic_armv7m.ld
index 3f38aeb..b799cb1 100644
--- a/pw_boot_armv7m/basic_armv7m.ld
+++ b/pw_boot_armv7m/basic_armv7m.ld
@@ -22,13 +22,13 @@
*/
/* Provide useful error messages when required configurations are not set. */
-#ifndef PW_BOOT_INTERRUPT_VECTOR_TABLE_BEGIN
-#error "PW_BOOT_INTERRUPT_VECTOR_TABLE_BEGIN is not defined, and is required to use pw_boot_armv7m"
-#endif // PW_BOOT_INTERRUPT_VECTOR_TABLE_BEGIN
+#ifndef PW_BOOT_VECTOR_TABLE_BEGIN
+#error "PW_BOOT_VECTOR_TABLE_BEGIN is not defined, and is required to use pw_boot_armv7m"
+#endif // PW_BOOT_VECTOR_TABLE_BEGIN
-#ifndef PW_BOOT_INTERRUPT_VECTOR_TABLE_SIZE
-#error "PW_BOOT_INTERRUPT_VECTOR_TABLE_SIZE is not defined, and is required to use pw_boot_armv7m"
-#endif // PW_BOOT_INTERRUPT_VECTOR_TABLE_SIZE
+#ifndef PW_BOOT_VECTOR_TABLE_SIZE
+#error "PW_BOOT_VECTOR_TABLE_SIZE is not defined, and is required to use pw_boot_armv7m"
+#endif // PW_BOOT_VECTOR_TABLE_SIZE
#ifndef PW_BOOT_FLASH_BEGIN
#error "PW_BOOT_FLASH_BEGIN is not defined, and is required to use pw_boot_armv7m"
@@ -69,9 +69,9 @@
*/
/* Vector Table (typically in flash) */
- INTERRUPT_VECTOR_TABLE(rx) : \
- ORIGIN = PW_BOOT_INTERRUPT_VECTOR_TABLE_BEGIN, \
- LENGTH = PW_BOOT_INTERRUPT_VECTOR_TABLE_SIZE
+ VECTOR_TABLE(rx) : \
+ ORIGIN = PW_BOOT_VECTOR_TABLE_BEGIN, \
+ LENGTH = PW_BOOT_VECTOR_TABLE_SIZE
/* Internal Flash */
FLASH(rx) : \
ORIGIN = PW_BOOT_FLASH_BEGIN, \
@@ -94,7 +94,7 @@
{
pw_vector_table_addr = .;
KEEP(*(.vector_table))
- } >INTERRUPT_VECTOR_TABLE
+ } >VECTOR_TABLE
/* Main executable code. */
.code : ALIGN(8)
diff --git a/pw_boot_armv7m/docs.rst b/pw_boot_armv7m/docs.rst
index c9b3fff..9428934 100644
--- a/pw_boot_armv7m/docs.rst
+++ b/pw_boot_armv7m/docs.rst
@@ -55,7 +55,7 @@
Targets using pw_boot_armv7m will need to provide an ARMv7-M interrupt vector
table (ARMv7-M Architecture Reference Manual DDI 0403E.b section B1.5.2 and
B1.5.3). This is done by storing an array into the ``.vector_table`` section,
-and properly configuring ``PW_BOOT_INTERRUPT_VECTOR_TABLE_*`` preprocessor
+and properly configuring ``PW_BOOT_VECTOR_TABLE_*`` preprocessor
defines to cover the address region your SoC expects the vector table to be
located at (often the beginning of the flash region). If using a bootloader,
ensure VTOR (Vector Table Offset Register) is configured to point to the vector
@@ -122,7 +122,7 @@
**PW_BOOT_FLASH_BEGIN** (required):
The start address of the MCU's flash region. This region must NOT include the
-vector table. (i.e. if the INTERRUPT_VECTOR_TABLE is in flash, the flash region
+vector table. (i.e. if the VECTOR_TABLE is in flash, the flash region
should begin *after* the vtable)
**PW_BOOT_FLASH_SIZE** (required):
@@ -134,13 +134,13 @@
**PW_BOOT_RAM_SIZE** (required):
Size of the RAM region in bytes.
-**PW_BOOT_INTERRUPT_VECTOR_TABLE_BEGIN** (required):
+**PW_BOOT_VECTOR_TABLE_BEGIN** (required):
Address the target MCU expects the link-time vector table to be located at. This
is typically the beginning of the flash region. While the vector table may be
changed later in the boot process, a minimal vector table MUST be present for
the MCU to operate as expected.
-**PW_BOOT_INTERRUPT_VECTOR_TABLE_SIZE** (required):
+**PW_BOOT_VECTOR_TABLE_SIZE** (required):
Number of bytes to reserve for the ARMv7-M vector table.
Dependencies
diff --git a/targets/stm32f429i-disc1/target_config.gni b/targets/stm32f429i-disc1/target_config.gni
index 276770b..a50d77f 100644
--- a/targets/stm32f429i-disc1/target_config.gni
+++ b/targets/stm32f429i-disc1/target_config.gni
@@ -70,6 +70,6 @@
"PW_BOOT_MIN_STACK_SIZE=1K",
"PW_BOOT_RAM_BEGIN=0x20000000",
"PW_BOOT_RAM_SIZE=192K",
- "PW_BOOT_INTERRUPT_VECTOR_TABLE_BEGIN=0x08000000",
- "PW_BOOT_INTERRUPT_VECTOR_TABLE_SIZE=512",
+ "PW_BOOT_VECTOR_TABLE_BEGIN=0x08000000",
+ "PW_BOOT_VECTOR_TABLE_SIZE=512",
]
