From 5a6108c172a87b7b1df3560ebc8f4a93880bed7f Mon Sep 17 00:00:00 2001
From: ligd <liguiding@pinecone.net>
Date: Sat, 26 Jan 2019 07:32:14 -0600
Subject: [PATCH] arch/xxx/src/common/up_initialize.c:  Move up_pminitialize()
 after timer_initialize()

---
 arch/arm/src/common/up_initialize.c        | 14 +++++++-------
 arch/avr/src/common/up_initialize.c        | 12 ++++++------
 arch/hc/src/common/up_initialize.c         | 12 ++++++------
 arch/mips/src/common/up_initialize.c       | 12 ++++++------
 arch/or1k/src/common/up_initialize.c       | 14 +++++++-------
 arch/renesas/src/common/up_initialize.c    | 12 ++++++------
 arch/x86/src/common/up_initialize.c        | 12 ++++++------
 arch/xtensa/src/common/xtensa_initialize.c | 12 ++++++------
 arch/z16/src/common/up_initialize.c        | 12 ++++++------
 arch/z80/src/common/up_initialize.c        | 12 ++++++------
 10 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c
index 7e058656117..8ffe5519b05 100644
--- a/arch/arm/src/common/up_initialize.c
+++ b/arch/arm/src/common/up_initialize.c
@@ -130,6 +130,13 @@ void up_initialize(void)
 
   up_irqinitialize();
 
+  /* Initialize the system timer interrupt */
+
+#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) && \
+    !defined(CONFIG_SYSTEMTICK_EXTCLK)
+  arm_timer_initialize();
+#endif
+
 #ifdef CONFIG_PM
   /* Initialize the power management subsystem.  This MCU-specific function
    * must be called *very* early in the initialization sequence *before* any
@@ -153,13 +160,6 @@ void up_initialize(void)
     }
 #endif
 
-  /* Initialize the system timer interrupt */
-
-#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) && \
-    !defined(CONFIG_SYSTEMTICK_EXTCLK)
-  arm_timer_initialize();
-#endif
-
 #ifdef CONFIG_MM_IOB
   /* Initialize IO buffering */
 
diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c
index e9918cac8ef..f9b68bd1e4f 100644
--- a/arch/avr/src/common/up_initialize.c
+++ b/arch/avr/src/common/up_initialize.c
@@ -172,6 +172,12 @@ void up_initialize(void)
 
   up_irqinitialize();
 
+  /* Initialize the system timer interrupt */
+
+#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
+  avr_timer_initialize();
+#endif
+
 #ifdef CONFIG_PM
   /* Initialize the power management subsystem.  This MCU-specific function
    * must be called *very* early in the initialization sequence *before* any
@@ -195,12 +201,6 @@ void up_initialize(void)
     }
 #endif
 
-  /* Initialize the system timer interrupt */
-
-#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
-  avr_timer_initialize();
-#endif
-
 #ifdef CONFIG_MM_IOB
   /* Initialize IO buffering */
 
diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c
index b58aec2f44e..d1cebe3926b 100644
--- a/arch/hc/src/common/up_initialize.c
+++ b/arch/hc/src/common/up_initialize.c
@@ -94,6 +94,12 @@ void up_initialize(void)
 
   up_irqinitialize();
 
+  /* Initialize the system timer interrupt */
+
+#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
+  hc_timer_initialize();
+#endif
+
 #ifdef CONFIG_PM
   /* Initialize the power management subsystem.  This MCU-specific function
    * must be called *very* early in the initialization sequence *before* any
@@ -117,12 +123,6 @@ void up_initialize(void)
     }
 #endif
 
-  /* Initialize the system timer interrupt */
-
-#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
-  hc_timer_initialize();
-#endif
-
 #ifdef CONFIG_MM_IOB
   /* Initialize IO buffering */
 
diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c
index e7fade040f9..f5594980e84 100644
--- a/arch/mips/src/common/up_initialize.c
+++ b/arch/mips/src/common/up_initialize.c
@@ -96,6 +96,12 @@ void up_initialize(void)
 
   up_irqinitialize();
 
+  /* Initialize the system timer interrupt */
+
+#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
+  mips_timer_initialize();
+#endif
+
 #ifdef CONFIG_PM
   /* Initialize the power management subsystem.  This MCU-specific function
    * must be called *very* early in the initialization sequence *before* any
@@ -119,12 +125,6 @@ void up_initialize(void)
     }
 #endif
 
-  /* Initialize the system timer interrupt */
-
-#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
-  mips_timer_initialize();
-#endif
-
 #ifdef CONFIG_MM_IOB
   /* Initialize IO buffering */
 
diff --git a/arch/or1k/src/common/up_initialize.c b/arch/or1k/src/common/up_initialize.c
index 6c8780c2104..97a1a006ea9 100644
--- a/arch/or1k/src/common/up_initialize.c
+++ b/arch/or1k/src/common/up_initialize.c
@@ -189,6 +189,13 @@ void up_initialize(void)
 
   up_irqinitialize();
 
+  /* Initialize the system timer interrupt */
+
+#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) && \
+    !defined(CONFIG_SYSTEMTICK_EXTCLK)
+  or1k_timer_initialize();
+#endif
+
 #ifdef CONFIG_PM
   /* Initialize the power management subsystem.  This MCU-specific function
    * must be called *very* early in the initialization sequence *before* any
@@ -212,13 +219,6 @@ void up_initialize(void)
     }
 #endif
 
-  /* Initialize the system timer interrupt */
-
-#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS) && \
-    !defined(CONFIG_SYSTEMTICK_EXTCLK)
-  or1k_timer_initialize();
-#endif
-
 #ifdef CONFIG_MM_IOB
   /* Initialize IO buffering */
 
diff --git a/arch/renesas/src/common/up_initialize.c b/arch/renesas/src/common/up_initialize.c
index c4db00a92b2..fcfd33dd159 100644
--- a/arch/renesas/src/common/up_initialize.c
+++ b/arch/renesas/src/common/up_initialize.c
@@ -90,6 +90,12 @@ void up_initialize(void)
 
   up_irqinitialize();
 
+#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
+  /* Initialize the system timer interrupt */
+
+  renesas_timer_initialize();
+#endif
+
 #ifdef CONFIG_PM
   /* Initialize the power management subsystem.  This MCU-specific function
    * must be called *very* early in the initialization sequence *before* any
@@ -100,12 +106,6 @@ void up_initialize(void)
   up_pminitialize();
 #endif
 
-#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
-  /* Initialize the system timer interrupt */
-
-  renesas_timer_initialize();
-#endif
-
 #ifdef CONFIG_MM_IOB
   /* Initialize IO buffering */
 
diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c
index 15a979e6004..790a315207e 100644
--- a/arch/x86/src/common/up_initialize.c
+++ b/arch/x86/src/common/up_initialize.c
@@ -96,6 +96,12 @@ void up_initialize(void)
 
   up_irqinitialize();
 
+  /* Initialize the system timer interrupt */
+
+#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
+  x86_timer_initialize();
+#endif
+
 #ifdef CONFIG_PM
   /* Initialize the power management subsystem.  This MCU-specific function
    * must be called *very* early in the initialization sequence *before* any
@@ -119,12 +125,6 @@ void up_initialize(void)
     }
 #endif
 
-  /* Initialize the system timer interrupt */
-
-#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
-  x86_timer_initialize();
-#endif
-
 #ifdef CONFIG_MM_IOB
   /* Initialize IO buffering */
 
diff --git a/arch/xtensa/src/common/xtensa_initialize.c b/arch/xtensa/src/common/xtensa_initialize.c
index 97db241fcd1..9721e86962e 100644
--- a/arch/xtensa/src/common/xtensa_initialize.c
+++ b/arch/xtensa/src/common/xtensa_initialize.c
@@ -104,6 +104,12 @@ void up_initialize(void)
 
   xtensa_irq_initialize();
 
+#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
+  /* Initialize the system timer interrupt */
+
+  xtensa_timer_initialize();
+#endif
+
 #ifdef CONFIG_PM
   /* Initialize the power management subsystem.  This MCU-specific function
    * must be called *very* early in the initialization sequence *before* any
@@ -127,12 +133,6 @@ void up_initialize(void)
     }
 #endif
 
-#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
-  /* Initialize the system timer interrupt */
-
-  xtensa_timer_initialize();
-#endif
-
 #ifdef CONFIG_MM_IOB
   /* Initialize IO buffering */
 
diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c
index b7d9da772da..ea5653c99f2 100644
--- a/arch/z16/src/common/up_initialize.c
+++ b/arch/z16/src/common/up_initialize.c
@@ -109,6 +109,12 @@ void up_initialize(void)
 
   up_irqinitialize();
 
+#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
+  /* Initialize the system timer interrupt */
+
+  z16_timer_initialize();
+#endif
+
 #ifdef CONFIG_PM
   /* Initialize the power management subsystem.  This MCU-specific function
    * must be called *very* early in the initialization sequence *before* any
@@ -119,12 +125,6 @@ void up_initialize(void)
   up_pminitialize();
 #endif
 
-#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
-  /* Initialize the system timer interrupt */
-
-  z16_timer_initialize();
-#endif
-
 #ifdef CONFIG_MM_IOB
   /* Initialize IO buffering */
 
diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c
index 6bb0d56c57f..25210078fe2 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@@ -98,6 +98,12 @@ void up_initialize(void)
 
   up_irqinitialize();
 
+#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
+  /* Initialize the system timer interrupt */
+
+  z80_timer_initialize();
+#endif
+
 #ifdef CONFIG_PM
   /* Initialize the power management subsystem.  This MCU-specific function
    * must be called *very* early in the initialization sequence *before* any
@@ -108,12 +114,6 @@ void up_initialize(void)
   up_pminitialize();
 #endif
 
-#if !defined(CONFIG_SUPPRESS_INTERRUPTS) && !defined(CONFIG_SUPPRESS_TIMER_INTS)
-  /* Initialize the system timer interrupt */
-
-  z80_timer_initialize();
-#endif
-
   /* Initialize the CPU for those that use it (only for the Z180).  This
    * needs to be done before any tasks are created).
    */