diff --git a/arch/arm/src/tms570/chip/tms570ls04x03x_memorymap.h b/arch/arm/src/tms570/chip/tms570ls04x03x_memorymap.h
index ed6c0626362..07e73f4a3e0 100644
--- a/arch/arm/src/tms570/chip/tms570ls04x03x_memorymap.h
+++ b/arch/arm/src/tms570/chip/tms570ls04x03x_memorymap.h
@@ -114,7 +114,7 @@
 #define TMS570_FWRAP_BASE         0xfff87000 /* 0xfff87000-0xfff87fff: Flash Wrapper */
 #define TMS570_EFFC_BASE          0xfff8c000 /* 0xfff8c000-0xfff8cfff: eFuse Farm Controller */
 #define TMS570_PCR_BASE           0xffffe000 /* 0xffffe000-0xffffe0ff: PCR registers */
-#define TMS570_SMF2_BASE          0xffffe100 /* 0xffffe100-0xffffe1ff: System Module - Frame 2 */
+#define TMS570_SYS2_BASE          0xffffe100 /* 0xffffe100-0xffffe1ff: System Module - Frame 2 */
 #define TMS570_PBIST_BASE         0xffffe400 /* 0xffffe400-0xffffe5ff: PBIST */
 #define TMS570_STC_BASE           0xffffe600 /* 0xffffe600-0xffffe6ff: STC */
 #define TMS570_IOMM_BASE          0xffffea00 /* 0xffffea00-0xffffeBff: IOMM Multiplexing */
@@ -126,6 +126,6 @@
 #define TMS570_RTIDWWD_BASE       0xfffffc00 /* 0xfffffc00-0xfffffcff: RTI + DWWD */
 #define TMS570_VIMPAR_BASE        0xfffffd00 /* 0xfffffd00-0xfffffdff: VIM Parity */
 #define TMS570_VIM_BASE           0xfffffe00 /* 0xfffffe00-0xfffffeff: VIM */
-#define TMS570_SMF1_BASE          0xffffff00 /* 0xffffff00-0xffffffff: System Module - Frame 1 */
+#define TMS570_SYS_BASE           0xffffff00 /* 0xffffff00-0xffffffff: System Module - Frame 1 */
 
 #endif /* __ARCH_ARM_SRC_TMS570_CHIP_TMS570LS04X03X_MEMORYMAP_H */
diff --git a/arch/arm/src/tms570/tms570_boot.c b/arch/arm/src/tms570/tms570_boot.c
index 129e53aa9ce..c0b795a9f0f 100644
--- a/arch/arm/src/tms570/tms570_boot.c
+++ b/arch/arm/src/tms570/tms570_boot.c
@@ -265,6 +265,14 @@ void arm_boot(void)
 
   ASSERT(getreg32(TMS570_ESM_SR3) == 0);
 
+  /* Disable the watchdog timer */
+
+  tms570_wdtdisable();
+
+  /* Initialize clocking to settings provided by board-specific logic */
+
+  tms570_clockconfig();
+
 #ifdef CONFIG_ARCH_RAMFUNCS
   /* Copy any necessary code sections from FLASH to RAM.  The correct
    * destination in SRAM is given by _sramfuncs and _eramfuncs.  The
@@ -290,14 +298,6 @@ void arm_boot(void)
 
   tms570_copyvectorblock();
 
-  /* Disable the watchdog timer */
-
-  tms570_wdtdisable();
-
-  /* Initialize clocking to settings provided by board-specific logic */
-
-  tms570_clockconfig();
-
 #ifdef CONFIG_ARCH_FPU
   /* Initialize the FPU */
 
diff --git a/arch/arm/src/tms570/tms570_clockconfig.h b/arch/arm/src/tms570/tms570_clockconfig.h
index 281c8671a1b..b7c1c664f50 100644
--- a/arch/arm/src/tms570/tms570_clockconfig.h
+++ b/arch/arm/src/tms570/tms570_clockconfig.h
@@ -77,9 +77,9 @@ extern "C"
  * Name: tms570_clockconfig
  *
  * Description:
- *   Called to initialize the SAMV7.  This does whatever setup is needed to put the
- *   SoC in a usable state.  This includes the initialization of clocking using the
- *   settings in board.h.
+ *   Called to initialize TMS570 clocking.  This does whatever setup is needed to
+ *   put the SoC in a usable state.  This includes, but is not limited to, the
+ *   initialization of clocking using the settings in the board.h header file.
  *
  ************************************************************************************/