arch/arm: Rename all up_*.h files to arm_*.h

Summary

The naming standard at https://cwiki.apache.org/confluence/display/NUTTX/Naming+FAQ requires that all MCU-private files begin with the name of the architecture, not up_.

This PR addresses only these name changes for the up_*.h files.  There are only three, but almost 1680 files that include them:

    up_arch.h
    up_internal.h
    up_vfork.h

The only change to the files is from including up_arch.h to arm_arch.h (for example).

The entire job required to be compatible with that Naming Convention will also require changing the naming of the up_() functions that are used only within arch/arm and board/arm.

Impact

There should be not impact of this change (other that one step toward more consistent naming).

Testing

stm32f4discovery:netnsh

arch/arm/src/a1x/a1x_boot.c

@@ -50,8 +50,8 @@
 #include "arm.h"
 #include "mmu.h"
 #include "fpu.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
 
 #include "a1x_lowputc.h"
 #include "a1x_boot.h"

arch/arm/src/a1x/a1x_irq.c

@@ -46,8 +46,8 @@
 #include <nuttx/irq.h>
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sctlr.h"
 
 #include "a1x_pio.h"

arch/arm/src/a1x/a1x_lowputc.c

@@ -44,8 +44,8 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
 
 #include "a1x_config.h"
 #include "hardware/a1x_uart.h"

arch/arm/src/a1x/a1x_pio.c

@@ -48,8 +48,8 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
 
 #include "chip.h"
 #include "a1x_pio.h"

arch/arm/src/a1x/a1x_serial.c

@@ -57,8 +57,8 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "chip.h"
 #include "hardware/a1x_uart.h"

arch/arm/src/a1x/a1x_timerisr.c

@@ -48,7 +48,7 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
+#include "arm_arch.h"
 #include "hardware/a1x_timer.h"
 
 /****************************************************************************

arch/arm/src/am335x/am335x_boot.c

@@ -54,8 +54,8 @@
 #include "arm.h"
 #include "mmu.h"
 #include "fpu.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
 
 #include "am335x_clockconfig.h"
 #include "am335x_wdog.h"

arch/arm/src/am335x/am335x_can.c

@@ -45,7 +45,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/can/can.h>
 
-#include "up_arch.h"
+#include "arm_arch.h"
 #include "hardware/am335x_pinmux.h"
 #include "hardware/am335x_prcm.h"
 #include "hardware/am335x_dcan.h"

arch/arm/src/am335x/am335x_clockconfig.c

@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include "up_arch.h"
+#include "arm_arch.h"
 #include "hardware/am335x_prcm.h"
 #include "am335x_config.h"
 #include "am335x_clockconfig.h"

arch/arm/src/am335x/am335x_gpio.c

@@ -46,7 +46,7 @@
 #include <nuttx/irq.h>
 
 #include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
 #include "am335x_pinmux.h"
 #include "am335x_gpio.h"
 

arch/arm/src/am335x/am335x_gpioirq.c

@@ -46,7 +46,7 @@
 #include <nuttx/irq.h>
 
 #include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
 
 #include "am335x_gpio.h"
 

arch/arm/src/am335x/am335x_i2c.c

@@ -58,7 +58,7 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
+#include "arm_arch.h"
 #include "hardware/am335x_pinmux.h"
 #include "hardware/am335x_prcm.h"
 #include "hardware/am335x_i2c.h"

arch/arm/src/am335x/am335x_irq.c

@@ -43,8 +43,8 @@
 
 #include <nuttx/arch.h>
 
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
 #include "sctlr.h"
 
 #include "am335x_gpio.h"

arch/arm/src/am335x/am335x_lcdc.c

@@ -55,7 +55,7 @@
 #include <nuttx/semaphore.h>
 #include <nuttx/video/fb.h>
 
-#include "up_arch.h"
+#include "arm_arch.h"
 #include "hardware/am335x_prcm.h"
 #include "am335x_pinmux.h"
 #include "am335x_config.h"

arch/arm/src/am335x/am335x_lowputc.c

@@ -44,8 +44,8 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
 
 #include "am335x_config.h"
 #include "am335x_gpio.h"

arch/arm/src/am335x/am335x_pinmux.c

@@ -44,7 +44,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "up_arch.h"
+#include "arm_arch.h"
 #include "am335x_pinmux.h"
 
 /****************************************************************************

arch/arm/src/am335x/am335x_serial.c

@@ -57,8 +57,8 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "chip.h"
 #include "hardware/am335x_uart.h"

arch/arm/src/am335x/am335x_sysclk.c

@@ -42,7 +42,7 @@
 #include <stdint.h>
 #include <errno.h>
 
-#include "up_arch.h"
+#include "arm_arch.h"
 #include "hardware/am335x_scm.h"
 #include "am335x_sysclk.h"
 

arch/arm/src/am335x/am335x_timerisr.c

@@ -48,7 +48,7 @@
 #include <arch/irq.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
+#include "arm_arch.h"
 #include "hardware/am335x_timer.h"
 
 #include "am335x_sysclk.h"

arch/arm/src/am335x/am335x_wdog.c

@@ -41,7 +41,7 @@
 
 #include <nuttx/irq.h>
 
-#include "up_arch.h"
+#include "arm_arch.h"
 #include "hardware/am335x_wdog.h"
 
 /****************************************************************************

arch/arm/src/am335x/am335x_wdog.h

@@ -47,7 +47,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "up_internal.h"
+#include "arm_internal.h"
 #include "chip.h"
 #include "hardware/am335x_wdog.h"
 

arch/arm/src/arm/arm_allocpage.c

@@ -52,7 +52,7 @@
 #include <nuttx/page.h>
 
 #include "pg_macros.h"
-#include "up_internal.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/arm/arm_assert.c

@@ -54,9 +54,9 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
+#include "arm_arch.h"
 #include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/arm/arm_blocktask.c

@@ -48,7 +48,7 @@
 
 #include "sched/sched.h"
 #include "group/group.h"
-#include "up_internal.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Public Functions

arch/arm/src/arm/arm_checkmapping.c

@@ -32,7 +32,7 @@
 #include <nuttx/sched.h>
 #include <nuttx/page.h>
 
-#include "up_internal.h"
+#include "arm_internal.h"
 
 #ifdef CONFIG_PAGING
 

arch/arm/src/arm/arm_copyfullstate.c

@@ -42,7 +42,7 @@
 #include <stdint.h>
 #include <arch/irq.h>
 
-#include "up_internal.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/arm/arm_dataabort.c

@@ -30,7 +30,7 @@
 #include <nuttx/irq.h>
 
 #include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
 
 #ifdef CONFIG_PAGING
 #  include <nuttx/page.h>

arch/arm/src/arm/arm_doirq.c

@@ -32,8 +32,8 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
 
 #include "group/group.h"
 

arch/arm/src/arm/arm_fullcontextrestore.S

@@ -38,7 +38,7 @@
  **************************************************************************/
 
 #include <nuttx/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
 
 /**************************************************************************
  * Pre-processor Definitions

arch/arm/src/arm/arm_initialstate.c

@@ -45,8 +45,8 @@
 #include <nuttx/arch.h>
 
 #include "arm.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/arm/arm_pginitialize.c

@@ -30,7 +30,7 @@
 #include <nuttx/sched.h>
 #include <nuttx/page.h>
 
-#include "up_internal.h"
+#include "arm_internal.h"
 
 #ifdef CONFIG_PAGING
 

arch/arm/src/arm/arm_prefetchabort.c

@@ -33,7 +33,7 @@
 #endif
 
 #include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/arm/arm_releasepending.c

@@ -31,7 +31,7 @@
 
 #include "sched/sched.h"
 #include "group/group.h"
-#include "up_internal.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Public Functions

arch/arm/src/arm/arm_reprioritizertr.c

@@ -33,7 +33,7 @@
 
 #include "sched/sched.h"
 #include "group/group.h"
-#include "up_internal.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Public Functions

arch/arm/src/arm/arm_saveusercontext.S

@@ -38,7 +38,7 @@
  **************************************************************************/
 
 #include <nuttx/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
 
 /**************************************************************************
  * Pre-processor Definitions

arch/arm/src/arm/arm_schedulesigaction.c

@@ -48,8 +48,8 @@
 
 #include "arm.h"
 #include "sched/sched.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
 
 /****************************************************************************
  * Public Functions

arch/arm/src/arm/arm_sigdeliver.c

@@ -50,8 +50,8 @@
 #include <arch/board/board.h>
 
 #include "sched/sched.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
 
 /****************************************************************************
  * Public Functions

arch/arm/src/arm/arm_syscall.c

@@ -44,8 +44,8 @@
 
 #include <arch/irq.h>
 
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Public Functions

arch/arm/src/arm/arm_unblocktask.c

@@ -32,7 +32,7 @@
 #include "sched/sched.h"
 #include "group/group.h"
 #include "clock/clock.h"
-#include "up_internal.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Public Functions

arch/arm/src/arm/arm_undefinedinsn.c

@@ -45,7 +45,7 @@
 
 #include <arch/irq.h>
 
-#include "up_internal.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Public Functions

arch/arm/src/arm/arm_va2pte.c

@@ -48,7 +48,7 @@
 
 #include "chip.h"
 #include "pg_macros.h"
-#include "up_internal.h"
+#include "arm_internal.h"
 
 #ifdef CONFIG_PAGING
 

arch/arm/src/arm/up_head.S

@@ -41,8 +41,8 @@
 
 #include "arm.h"
 #include "chip.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
 
 #ifdef CONFIG_PAGING
 #  include <nuttx/page.h>

arch/arm/src/arm/up_nommuhead.S

@@ -40,8 +40,8 @@
 #include <nuttx/config.h>
 
 #include "arm.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
 
 /****************************************************************************
  * Macros

arch/arm/src/arm/up_vectoraddrexcptn.S

@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 #include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
 
 /************************************************************************************
  * Pre-processor Definitions

arch/arm/src/arm/up_vectors.S

@@ -41,7 +41,7 @@
 #include <nuttx/irq.h>
 
 #include "arm.h"
-#include "up_arch.h"
+#include "arm_arch.h"
 
 /************************************************************************************
  * Pre-processor Definitions

arch/arm/src/arm/vfork.S

@@ -39,7 +39,7 @@
 
 #include <nuttx/config.h>
 
-#include "up_vfork.h"
+#include "arm_vfork.h"
 
 /************************************************************************************
  * Pre-processor Definitions

arch/arm/src/armv6-m/arm_assert.c

@@ -52,9 +52,9 @@
 
 #include <arch/board/board.h>
 
-#include "up_arch.h"
+#include "arm_arch.h"
 #include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/armv6-m/arm_blocktask.c

@@ -32,7 +32,7 @@
 #include <nuttx/sched.h>
 
 #include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Public Functions

arch/arm/src/armv6-m/arm_copyfullstate.c

@@ -42,7 +42,7 @@
 #include <stdint.h>
 #include <arch/irq.h>
 
-#include "up_internal.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/arm/src/armv6-m/arm_doirq.c

@@ -32,8 +32,8 @@
 #include <nuttx/board.h>
 #include <arch/board/board.h>
 
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions