You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/05/01 02:43:54 UTC
[incubator-nuttx] branch master updated: arch/arm: Rename all
up_*.h files to arm_*.h
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 037c9ea arch/arm: Rename all up_*.h files to arm_*.h
037c9ea is described below
commit 037c9ea0a4b3ac3bf7e0511b7a163e127763b067
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Thu Apr 30 19:20:29 2020 -0600
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 | 4 +-
arch/arm/src/a1x/a1x_irq.c | 4 +-
arch/arm/src/a1x/a1x_lowputc.c | 4 +-
arch/arm/src/a1x/a1x_pio.c | 4 +-
arch/arm/src/a1x/a1x_serial.c | 4 +-
arch/arm/src/a1x/a1x_timerisr.c | 2 +-
arch/arm/src/am335x/am335x_boot.c | 4 +-
arch/arm/src/am335x/am335x_can.c | 2 +-
arch/arm/src/am335x/am335x_clockconfig.c | 2 +-
arch/arm/src/am335x/am335x_gpio.c | 2 +-
arch/arm/src/am335x/am335x_gpioirq.c | 2 +-
arch/arm/src/am335x/am335x_i2c.c | 2 +-
arch/arm/src/am335x/am335x_irq.c | 4 +-
arch/arm/src/am335x/am335x_lcdc.c | 2 +-
arch/arm/src/am335x/am335x_lowputc.c | 4 +-
arch/arm/src/am335x/am335x_pinmux.c | 2 +-
arch/arm/src/am335x/am335x_serial.c | 4 +-
arch/arm/src/am335x/am335x_sysclk.c | 2 +-
arch/arm/src/am335x/am335x_timerisr.c | 2 +-
arch/arm/src/am335x/am335x_wdog.c | 2 +-
arch/arm/src/am335x/am335x_wdog.h | 2 +-
arch/arm/src/arm/arm_allocpage.c | 2 +-
arch/arm/src/arm/arm_assert.c | 4 +-
arch/arm/src/arm/arm_blocktask.c | 2 +-
arch/arm/src/arm/arm_checkmapping.c | 2 +-
arch/arm/src/arm/arm_copyfullstate.c | 2 +-
arch/arm/src/arm/arm_dataabort.c | 2 +-
arch/arm/src/arm/arm_doirq.c | 4 +-
arch/arm/src/arm/arm_fullcontextrestore.S | 2 +-
arch/arm/src/arm/arm_initialstate.c | 4 +-
arch/arm/src/arm/arm_pginitialize.c | 2 +-
arch/arm/src/arm/arm_prefetchabort.c | 2 +-
arch/arm/src/arm/arm_releasepending.c | 2 +-
arch/arm/src/arm/arm_reprioritizertr.c | 2 +-
arch/arm/src/arm/arm_saveusercontext.S | 2 +-
arch/arm/src/arm/arm_schedulesigaction.c | 4 +-
arch/arm/src/arm/arm_sigdeliver.c | 4 +-
arch/arm/src/arm/arm_syscall.c | 4 +-
arch/arm/src/arm/arm_unblocktask.c | 2 +-
arch/arm/src/arm/arm_undefinedinsn.c | 2 +-
arch/arm/src/arm/arm_va2pte.c | 2 +-
arch/arm/src/arm/up_head.S | 4 +-
arch/arm/src/arm/up_nommuhead.S | 4 +-
arch/arm/src/arm/up_vectoraddrexcptn.S | 2 +-
arch/arm/src/arm/up_vectors.S | 2 +-
arch/arm/src/arm/vfork.S | 2 +-
arch/arm/src/armv6-m/arm_assert.c | 4 +-
arch/arm/src/armv6-m/arm_blocktask.c | 2 +-
arch/arm/src/armv6-m/arm_copyfullstate.c | 2 +-
arch/arm/src/armv6-m/arm_doirq.c | 4 +-
arch/arm/src/armv6-m/arm_dumpnvic.c | 2 +-
arch/arm/src/armv6-m/arm_hardfault.c | 4 +-
arch/arm/src/armv6-m/arm_initialstate.c | 4 +-
arch/arm/src/armv6-m/arm_releasepending.c | 2 +-
arch/arm/src/armv6-m/arm_reprioritizertr.c | 2 +-
arch/arm/src/armv6-m/arm_schedulesigaction.c | 4 +-
arch/arm/src/armv6-m/arm_sigdeliver.c | 4 +-
arch/arm/src/armv6-m/arm_signal_dispatch.c | 2 +-
arch/arm/src/armv6-m/arm_svcall.c | 2 +-
arch/arm/src/armv6-m/arm_systemreset.c | 2 +-
arch/arm/src/armv6-m/arm_unblocktask.c | 2 +-
arch/arm/src/armv6-m/arm_vectors.c | 2 +-
arch/arm/src/armv6-m/vfork.S | 2 +-
arch/arm/src/armv7-a/arm_allocpage.c | 2 +-
arch/arm/src/armv7-a/arm_assert.c | 4 +-
arch/arm/src/armv7-a/arm_blocktask.c | 2 +-
arch/arm/src/armv7-a/arm_checkmapping.c | 2 +-
arch/arm/src/armv7-a/arm_copyarmstate.c | 2 +-
arch/arm/src/armv7-a/arm_copyfullstate.c | 2 +-
arch/arm/src/armv7-a/arm_cpuhead.S | 2 +-
arch/arm/src/armv7-a/arm_cpuidlestack.c | 2 +-
arch/arm/src/armv7-a/arm_cpupause.c | 2 +-
arch/arm/src/armv7-a/arm_cpustart.c | 2 +-
arch/arm/src/armv7-a/arm_dataabort.c | 2 +-
arch/arm/src/armv7-a/arm_doirq.c | 4 +-
arch/arm/src/armv7-a/arm_fullcontextrestore.S | 2 +-
arch/arm/src/armv7-a/arm_gicv2.c | 4 +-
arch/arm/src/armv7-a/arm_gicv2_dump.c | 2 +-
arch/arm/src/armv7-a/arm_head.S | 2 +-
arch/arm/src/armv7-a/arm_initialstate.c | 4 +-
arch/arm/src/armv7-a/arm_l2cc_pl310.c | 2 +-
arch/arm/src/armv7-a/arm_pghead.S | 2 +-
arch/arm/src/armv7-a/arm_pginitialize.c | 2 +-
arch/arm/src/armv7-a/arm_prefetchabort.c | 2 +-
arch/arm/src/armv7-a/arm_releasepending.c | 2 +-
arch/arm/src/armv7-a/arm_reprioritizertr.c | 2 +-
arch/arm/src/armv7-a/arm_saveusercontext.S | 2 +-
arch/arm/src/armv7-a/arm_schedulesigaction.c | 4 +-
arch/arm/src/armv7-a/arm_scu.c | 2 +-
arch/arm/src/armv7-a/arm_sigdeliver.c | 4 +-
arch/arm/src/armv7-a/arm_signal_dispatch.c | 2 +-
arch/arm/src/armv7-a/arm_syscall.c | 2 +-
arch/arm/src/armv7-a/arm_unblocktask.c | 2 +-
arch/arm/src/armv7-a/arm_undefinedinsn.c | 2 +-
arch/arm/src/armv7-a/arm_va2pte.c | 2 +-
arch/arm/src/armv7-a/arm_vectoraddrexcptn.S | 2 +-
arch/arm/src/armv7-a/gic.h | 2 +-
arch/arm/src/armv7-a/l2cc.h | 2 +-
arch/arm/src/armv7-a/vfork.S | 2 +-
arch/arm/src/armv7-m/arm_assert.c | 4 +-
arch/arm/src/armv7-m/arm_blocktask.c | 2 +-
arch/arm/src/armv7-m/arm_cache.c | 2 +-
arch/arm/src/armv7-m/arm_copyarmstate.c | 2 +-
arch/arm/src/armv7-m/arm_copyfullstate.c | 2 +-
arch/arm/src/armv7-m/arm_doirq.c | 4 +-
arch/arm/src/armv7-m/arm_hardfault.c | 4 +-
arch/arm/src/armv7-m/arm_initialstate.c | 4 +-
arch/arm/src/armv7-m/arm_itm.c | 2 +-
arch/arm/src/armv7-m/arm_itm_syslog.c | 2 +-
arch/arm/src/armv7-m/arm_memfault.c | 4 +-
arch/arm/src/armv7-m/arm_mpu.c | 2 +-
arch/arm/src/armv7-m/arm_ramvec_initialize.c | 4 +-
arch/arm/src/armv7-m/arm_releasepending.c | 2 +-
arch/arm/src/armv7-m/arm_reprioritizertr.c | 2 +-
arch/arm/src/armv7-m/arm_schedulesigaction.c | 4 +-
arch/arm/src/armv7-m/arm_sigdeliver.c | 4 +-
arch/arm/src/armv7-m/arm_signal_dispatch.c | 2 +-
arch/arm/src/armv7-m/arm_stackcheck.c | 2 +-
arch/arm/src/armv7-m/arm_svcall.c | 2 +-
arch/arm/src/armv7-m/arm_systemreset.c | 2 +-
arch/arm/src/armv7-m/arm_systick.c | 2 +-
arch/arm/src/armv7-m/arm_trigger_irq.c | 2 +-
arch/arm/src/armv7-m/arm_unblocktask.c | 2 +-
arch/arm/src/armv7-m/arm_vectors.c | 2 +-
arch/arm/src/armv7-m/gnu/vfork.S | 2 +-
arch/arm/src/armv7-m/iar/vfork.S | 2 +-
arch/arm/src/armv7-m/mpu.h | 2 +-
arch/arm/src/armv7-m/ram_vectors.h | 2 +-
arch/arm/src/armv7-r/arm_assert.c | 4 +-
arch/arm/src/armv7-r/arm_blocktask.c | 2 +-
arch/arm/src/armv7-r/arm_copyarmstate.c | 2 +-
arch/arm/src/armv7-r/arm_copyfullstate.c | 2 +-
arch/arm/src/armv7-r/arm_dataabort.c | 2 +-
arch/arm/src/armv7-r/arm_doirq.c | 4 +-
arch/arm/src/armv7-r/arm_fullcontextrestore.S | 2 +-
arch/arm/src/armv7-r/arm_gicv2.c | 4 +-
arch/arm/src/armv7-r/arm_head.S | 4 +-
arch/arm/src/armv7-r/arm_initialstate.c | 4 +-
arch/arm/src/armv7-r/arm_l2cc_pl310.c | 2 +-
arch/arm/src/armv7-r/arm_mpu.c | 2 +-
arch/arm/src/armv7-r/arm_prefetchabort.c | 2 +-
arch/arm/src/armv7-r/arm_releasepending.c | 2 +-
arch/arm/src/armv7-r/arm_reprioritizertr.c | 2 +-
arch/arm/src/armv7-r/arm_saveusercontext.S | 2 +-
arch/arm/src/armv7-r/arm_schedulesigaction.c | 4 +-
arch/arm/src/armv7-r/arm_sigdeliver.c | 4 +-
arch/arm/src/armv7-r/arm_signal_dispatch.c | 2 +-
arch/arm/src/armv7-r/arm_syscall.c | 2 +-
arch/arm/src/armv7-r/arm_unblocktask.c | 2 +-
arch/arm/src/armv7-r/arm_undefinedinsn.c | 2 +-
arch/arm/src/armv7-r/arm_vectoraddrexcptn.S | 2 +-
arch/arm/src/armv7-r/l2cc.h | 2 +-
arch/arm/src/armv7-r/mpu.h | 2 +-
arch/arm/src/armv7-r/vfork.S | 2 +-
arch/arm/src/armv8-m/arm_assert.c | 4 +-
arch/arm/src/armv8-m/arm_blocktask.c | 2 +-
arch/arm/src/armv8-m/arm_cache.c | 2 +-
arch/arm/src/armv8-m/arm_copyarmstate.c | 2 +-
arch/arm/src/armv8-m/arm_copyfullstate.c | 2 +-
arch/arm/src/armv8-m/arm_doirq.c | 4 +-
arch/arm/src/armv8-m/arm_hardfault.c | 4 +-
arch/arm/src/armv8-m/arm_initialstate.c | 4 +-
arch/arm/src/armv8-m/arm_itm.c | 2 +-
arch/arm/src/armv8-m/arm_itm_syslog.c | 2 +-
arch/arm/src/armv8-m/arm_memfault.c | 4 +-
arch/arm/src/armv8-m/arm_mpu.c | 2 +-
arch/arm/src/armv8-m/arm_ramvec_initialize.c | 4 +-
arch/arm/src/armv8-m/arm_releasepending.c | 2 +-
arch/arm/src/armv8-m/arm_reprioritizertr.c | 2 +-
arch/arm/src/armv8-m/arm_schedulesigaction.c | 4 +-
arch/arm/src/armv8-m/arm_sigdeliver.c | 4 +-
arch/arm/src/armv8-m/arm_signal_dispatch.c | 2 +-
arch/arm/src/armv8-m/arm_stackcheck.c | 2 +-
arch/arm/src/armv8-m/arm_svcall.c | 2 +-
arch/arm/src/armv8-m/arm_systemreset.c | 2 +-
arch/arm/src/armv8-m/arm_systick.c | 2 +-
arch/arm/src/armv8-m/arm_trigger_irq.c | 2 +-
arch/arm/src/armv8-m/arm_unblocktask.c | 2 +-
arch/arm/src/armv8-m/arm_vectors.c | 2 +-
arch/arm/src/armv8-m/mpu.h | 2 +-
arch/arm/src/armv8-m/ram_vectors.h | 2 +-
arch/arm/src/armv8-m/vfork.S | 2 +-
arch/arm/src/c5471/c5471_ethernet.c | 4 +-
arch/arm/src/c5471/c5471_irq.c | 4 +-
arch/arm/src/c5471/c5471_lowputc.S | 4 +-
arch/arm/src/c5471/c5471_serial.c | 4 +-
arch/arm/src/c5471/c5471_timerisr.c | 4 +-
arch/arm/src/c5471/c5471_vectors.S | 2 +-
arch/arm/src/c5471/c5471_watchdog.c | 2 +-
arch/arm/src/common/arm_allocateheap.c | 4 +-
arch/arm/src/common/{up_arch.h => arm_arch.h} | 47 ++++--------
arch/arm/src/common/arm_checkstack.c | 2 +-
arch/arm/src/common/arm_createstack.c | 4 +-
arch/arm/src/common/arm_etherstub.c | 2 +-
arch/arm/src/common/arm_exit.c | 2 +-
arch/arm/src/common/arm_idle.c | 2 +-
arch/arm/src/common/arm_initialize.c | 4 +-
.../src/common/{up_internal.h => arm_internal.h} | 8 +-
arch/arm/src/common/arm_interruptcontext.c | 2 +-
arch/arm/src/common/arm_lowputs.c | 2 +-
arch/arm/src/common/arm_modifyreg16.c | 2 +-
arch/arm/src/common/arm_modifyreg32.c | 2 +-
arch/arm/src/common/arm_modifyreg8.c | 2 +-
arch/arm/src/common/arm_pthread_start.c | 2 +-
arch/arm/src/common/arm_puts.c | 2 +-
arch/arm/src/common/arm_releasestack.c | 2 +-
arch/arm/src/common/arm_semi_syslog.c | 2 +-
arch/arm/src/common/arm_stackframe.c | 2 +-
arch/arm/src/common/arm_task_start.c | 2 +-
arch/arm/src/common/arm_usestack.c | 2 +-
arch/arm/src/common/arm_vfork.c | 2 +-
.../{armv8-m/arm_memfault.c => common/arm_vfork.h} | 76 +++++++++----------
arch/arm/src/common/up_vfork.h | 88 ----------------------
arch/arm/src/cxd56xx/cxd56_adc.c | 2 +-
arch/arm/src/cxd56xx/cxd56_allocateheap.c | 4 +-
arch/arm/src/cxd56xx/cxd56_cisif.c | 2 +-
arch/arm/src/cxd56xx/cxd56_clock.c | 2 +-
arch/arm/src/cxd56xx/cxd56_cpufifo.c | 2 +-
arch/arm/src/cxd56xx/cxd56_cpuidlestack.c | 2 +-
arch/arm/src/cxd56xx/cxd56_cpuindex.c | 2 +-
arch/arm/src/cxd56xx/cxd56_cpupause.c | 4 +-
arch/arm/src/cxd56xx/cxd56_cpustart.c | 4 +-
arch/arm/src/cxd56xx/cxd56_emmc.c | 2 +-
arch/arm/src/cxd56xx/cxd56_farapi.c | 4 +-
arch/arm/src/cxd56xx/cxd56_ge2d.c | 2 +-
arch/arm/src/cxd56xx/cxd56_gpio.c | 2 +-
arch/arm/src/cxd56xx/cxd56_gpioint.c | 2 +-
arch/arm/src/cxd56xx/cxd56_i2c.c | 4 +-
arch/arm/src/cxd56xx/cxd56_icc.c | 2 +-
arch/arm/src/cxd56xx/cxd56_idle.c | 2 +-
arch/arm/src/cxd56xx/cxd56_irq.c | 4 +-
arch/arm/src/cxd56xx/cxd56_pinconfig.c | 2 +-
arch/arm/src/cxd56xx/cxd56_powermgr.c | 4 +-
arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c | 2 +-
arch/arm/src/cxd56xx/cxd56_pwm.c | 2 +-
arch/arm/src/cxd56xx/cxd56_rtc.c | 2 +-
arch/arm/src/cxd56xx/cxd56_scu.c | 2 +-
arch/arm/src/cxd56xx/cxd56_scufifo.c | 2 +-
arch/arm/src/cxd56xx/cxd56_sdhci.c | 2 +-
arch/arm/src/cxd56xx/cxd56_serial.c | 4 +-
arch/arm/src/cxd56xx/cxd56_sph.c | 2 +-
arch/arm/src/cxd56xx/cxd56_spi.c | 4 +-
arch/arm/src/cxd56xx/cxd56_start.c | 4 +-
arch/arm/src/cxd56xx/cxd56_timer.c | 2 +-
arch/arm/src/cxd56xx/cxd56_timerisr.c | 4 +-
arch/arm/src/cxd56xx/cxd56_uart.c | 4 +-
arch/arm/src/cxd56xx/cxd56_uart0.c | 2 +-
arch/arm/src/cxd56xx/cxd56_udmac.c | 2 +-
arch/arm/src/cxd56xx/cxd56_uid.c | 2 +-
arch/arm/src/cxd56xx/cxd56_usbdev.c | 4 +-
arch/arm/src/cxd56xx/cxd56_wdt.c | 2 +-
arch/arm/src/dm320/dm320_allocateheap.c | 4 +-
arch/arm/src/dm320/dm320_boot.c | 4 +-
arch/arm/src/dm320/dm320_decodeirq.c | 4 +-
arch/arm/src/dm320/dm320_framebuffer.c | 2 +-
arch/arm/src/dm320/dm320_gio.h | 2 +-
arch/arm/src/dm320/dm320_irq.c | 4 +-
arch/arm/src/dm320/dm320_lowputc.S | 4 +-
arch/arm/src/dm320/dm320_restart.S | 4 +-
arch/arm/src/dm320/dm320_serial.c | 4 +-
arch/arm/src/dm320/dm320_timerisr.c | 4 +-
arch/arm/src/dm320/dm320_usbdev.c | 4 +-
arch/arm/src/efm32/efm32_adc.c | 4 +-
arch/arm/src/efm32/efm32_clockconfig.c | 2 +-
arch/arm/src/efm32/efm32_dma.c | 2 +-
arch/arm/src/efm32/efm32_flash.c | 4 +-
arch/arm/src/efm32/efm32_gpio.c | 2 +-
arch/arm/src/efm32/efm32_gpioirq.c | 2 +-
arch/arm/src/efm32/efm32_i2c.c | 2 +-
arch/arm/src/efm32/efm32_idle.c | 2 +-
arch/arm/src/efm32/efm32_irq.c | 4 +-
arch/arm/src/efm32/efm32_leserial.c | 4 +-
arch/arm/src/efm32/efm32_lowputc.c | 2 +-
arch/arm/src/efm32/efm32_pm.h | 2 +-
arch/arm/src/efm32/efm32_pwm.c | 4 +-
arch/arm/src/efm32/efm32_rmu.c | 2 +-
arch/arm/src/efm32/efm32_rtc_burtc.c | 2 +-
arch/arm/src/efm32/efm32_serial.c | 4 +-
arch/arm/src/efm32/efm32_spi.c | 4 +-
arch/arm/src/efm32/efm32_start.c | 4 +-
arch/arm/src/efm32/efm32_timer.c | 4 +-
arch/arm/src/efm32/efm32_timerisr.c | 4 +-
arch/arm/src/efm32/efm32_usbdev.c | 4 +-
arch/arm/src/efm32/efm32_usbhost.c | 4 +-
arch/arm/src/imx1/imx_allocateheap.c | 4 +-
arch/arm/src/imx1/imx_boot.c | 4 +-
arch/arm/src/imx1/imx_decodeirq.c | 4 +-
arch/arm/src/imx1/imx_gpio.c | 2 +-
arch/arm/src/imx1/imx_gpio.h | 6 +-
arch/arm/src/imx1/imx_irq.c | 4 +-
arch/arm/src/imx1/imx_lowputc.S | 4 +-
arch/arm/src/imx1/imx_serial.c | 4 +-
arch/arm/src/imx1/imx_spi.c | 4 +-
arch/arm/src/imx1/imx_timerisr.c | 4 +-
arch/arm/src/imx6/imx_boot.c | 4 +-
arch/arm/src/imx6/imx_boot.h | 2 +-
arch/arm/src/imx6/imx_clockconfig.c | 2 +-
arch/arm/src/imx6/imx_cpuboot.c | 4 +-
arch/arm/src/imx6/imx_ecspi.c | 4 +-
arch/arm/src/imx6/imx_gpio.c | 2 +-
arch/arm/src/imx6/imx_idle.c | 2 +-
arch/arm/src/imx6/imx_iomuxc.c | 2 +-
arch/arm/src/imx6/imx_irq.c | 2 +-
arch/arm/src/imx6/imx_lowputc.c | 4 +-
arch/arm/src/imx6/imx_lowputc.h | 2 +-
arch/arm/src/imx6/imx_serial.c | 4 +-
arch/arm/src/imx6/imx_serial.h | 2 +-
arch/arm/src/imx6/imx_timerisr.c | 2 +-
arch/arm/src/imxrt/imxrt_allocateheap.c | 4 +-
arch/arm/src/imxrt/imxrt_clockconfig.c | 2 +-
arch/arm/src/imxrt/imxrt_clrpend.c | 2 +-
arch/arm/src/imxrt/imxrt_daisy.c | 2 +-
arch/arm/src/imxrt/imxrt_edma.c | 4 +-
arch/arm/src/imxrt/imxrt_ehci.c | 2 +-
arch/arm/src/imxrt/imxrt_enc.c | 2 +-
arch/arm/src/imxrt/imxrt_enet.c | 2 +-
arch/arm/src/imxrt/imxrt_enet.h | 2 +-
arch/arm/src/imxrt/imxrt_gpio.c | 2 +-
arch/arm/src/imxrt/imxrt_gpioirq.c | 2 +-
arch/arm/src/imxrt/imxrt_hprtc.c | 2 +-
arch/arm/src/imxrt/imxrt_idle.c | 2 +-
arch/arm/src/imxrt/imxrt_iomuxc.c | 2 +-
arch/arm/src/imxrt/imxrt_irq.c | 4 +-
arch/arm/src/imxrt/imxrt_lcd.c | 2 +-
arch/arm/src/imxrt/imxrt_lowputc.c | 4 +-
arch/arm/src/imxrt/imxrt_lowputc.h | 2 +-
arch/arm/src/imxrt/imxrt_lpi2c.c | 2 +-
arch/arm/src/imxrt/imxrt_lpspi.c | 4 +-
arch/arm/src/imxrt/imxrt_lpsrtc.c | 2 +-
arch/arm/src/imxrt/imxrt_ocotp.c | 2 +-
arch/arm/src/imxrt/imxrt_periphclks.c | 2 +-
arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c | 2 +-
arch/arm/src/imxrt/imxrt_serial.c | 4 +-
arch/arm/src/imxrt/imxrt_serial.h | 2 +-
arch/arm/src/imxrt/imxrt_start.c | 4 +-
arch/arm/src/imxrt/imxrt_start.h | 2 +-
arch/arm/src/imxrt/imxrt_timerisr.c | 4 +-
arch/arm/src/imxrt/imxrt_usbdev.c | 4 +-
arch/arm/src/imxrt/imxrt_usdhc.c | 2 +-
arch/arm/src/imxrt/imxrt_userspace.h | 2 +-
arch/arm/src/imxrt/imxrt_wdog.c | 2 +-
arch/arm/src/imxrt/imxrt_wdog.h | 2 +-
arch/arm/src/imxrt/imxrt_xbar.c | 2 +-
arch/arm/src/kinetis/kinetis.h | 2 +-
arch/arm/src/kinetis/kinetis_allocateheap.c | 4 +-
arch/arm/src/kinetis/kinetis_clockconfig.c | 2 +-
arch/arm/src/kinetis/kinetis_clrpend.c | 2 +-
arch/arm/src/kinetis/kinetis_dma.c | 4 +-
arch/arm/src/kinetis/kinetis_enet.c | 2 +-
arch/arm/src/kinetis/kinetis_i2c.c | 4 +-
arch/arm/src/kinetis/kinetis_idle.c | 2 +-
arch/arm/src/kinetis/kinetis_irq.c | 4 +-
arch/arm/src/kinetis/kinetis_lowputc.c | 4 +-
arch/arm/src/kinetis/kinetis_lpserial.c | 4 +-
arch/arm/src/kinetis/kinetis_pin.c | 4 +-
arch/arm/src/kinetis/kinetis_pindma.c | 4 +-
arch/arm/src/kinetis/kinetis_pindump.c | 2 +-
arch/arm/src/kinetis/kinetis_pingpio.c | 4 +-
arch/arm/src/kinetis/kinetis_pinirq.c | 4 +-
arch/arm/src/kinetis/kinetis_pwm.c | 4 +-
arch/arm/src/kinetis/kinetis_rtc.c | 2 +-
arch/arm/src/kinetis/kinetis_sdhc.c | 2 +-
arch/arm/src/kinetis/kinetis_serial.c | 4 +-
arch/arm/src/kinetis/kinetis_spi.c | 2 +-
arch/arm/src/kinetis/kinetis_start.c | 4 +-
arch/arm/src/kinetis/kinetis_timerisr.c | 4 +-
arch/arm/src/kinetis/kinetis_usbdev.c | 2 +-
arch/arm/src/kinetis/kinetis_wdog.c | 2 +-
arch/arm/src/kl/kl_clockconfig.c | 2 +-
arch/arm/src/kl/kl_dumpgpio.c | 2 +-
arch/arm/src/kl/kl_gpio.c | 4 +-
arch/arm/src/kl/kl_gpioirq.c | 2 +-
arch/arm/src/kl/kl_idle.c | 2 +-
arch/arm/src/kl/kl_irq.c | 4 +-
arch/arm/src/kl/kl_irqprio.c | 2 +-
arch/arm/src/kl/kl_lowputc.c | 4 +-
arch/arm/src/kl/kl_pwm.c | 4 +-
arch/arm/src/kl/kl_serial.c | 4 +-
arch/arm/src/kl/kl_spi.c | 2 +-
arch/arm/src/kl/kl_start.c | 4 +-
arch/arm/src/kl/kl_timerisr.c | 4 +-
arch/arm/src/lc823450/chip.h | 4 +-
arch/arm/src/lc823450/lc823450_adc.c | 2 +-
arch/arm/src/lc823450/lc823450_allocateheap2.c | 4 +-
arch/arm/src/lc823450/lc823450_clockconfig.c | 2 +-
arch/arm/src/lc823450/lc823450_cpuidlestack.c | 2 +-
arch/arm/src/lc823450/lc823450_cpuindex.c | 2 +-
arch/arm/src/lc823450/lc823450_cpupause.c | 4 +-
arch/arm/src/lc823450/lc823450_cpustart.c | 4 +-
arch/arm/src/lc823450/lc823450_dma.c | 2 +-
arch/arm/src/lc823450/lc823450_dvfs2.c | 2 +-
arch/arm/src/lc823450/lc823450_gpio.c | 2 +-
arch/arm/src/lc823450/lc823450_i2c.c | 2 +-
arch/arm/src/lc823450/lc823450_i2s.c | 2 +-
arch/arm/src/lc823450/lc823450_idle.c | 4 +-
arch/arm/src/lc823450/lc823450_ipl2.c | 4 +-
arch/arm/src/lc823450/lc823450_irq.c | 4 +-
arch/arm/src/lc823450/lc823450_lowputc.c | 4 +-
arch/arm/src/lc823450/lc823450_mpuinit2.c | 2 +-
arch/arm/src/lc823450/lc823450_rtc.c | 2 +-
arch/arm/src/lc823450/lc823450_sdc.c | 2 +-
arch/arm/src/lc823450/lc823450_sddrv_dep.c | 2 +-
arch/arm/src/lc823450/lc823450_serial.c | 4 +-
arch/arm/src/lc823450/lc823450_spi.c | 2 +-
arch/arm/src/lc823450/lc823450_spifi2.c | 2 +-
arch/arm/src/lc823450/lc823450_start.c | 4 +-
arch/arm/src/lc823450/lc823450_syscontrol.c | 4 +-
arch/arm/src/lc823450/lc823450_testset.c | 2 +-
arch/arm/src/lc823450/lc823450_timer.c | 4 +-
arch/arm/src/lc823450/lc823450_usbdev.c | 2 +-
arch/arm/src/lc823450/lc823450_wdt.c | 2 +-
arch/arm/src/lpc17xx_40xx/lpc176x_clockconfig.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc176x_gpio.c | 2 +-
arch/arm/src/lpc17xx_40xx/lpc176x_rtc.c | 4 +-
.../src/lpc17xx_40xx/lpc178x_40xx_clockconfig.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc178x_40xx_gpio.c | 2 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_can.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_clrpend.c | 2 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_emc.c | 2 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c | 2 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c | 6 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_gpiodbg.c | 2 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_gpioint.c | 2 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_idle.c | 2 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_lcd.c | 2 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_lowputc.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_mcpwm.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_pwm.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c | 2 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_start.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_timer.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_timerisr.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c | 4 +-
arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c | 4 +-
arch/arm/src/lpc214x/lpc214x_decodeirq.c | 4 +-
arch/arm/src/lpc214x/lpc214x_head.S | 4 +-
arch/arm/src/lpc214x/lpc214x_irq.c | 4 +-
arch/arm/src/lpc214x/lpc214x_lowputc.S | 4 +-
arch/arm/src/lpc214x/lpc214x_serial.c | 4 +-
arch/arm/src/lpc214x/lpc214x_timerisr.c | 4 +-
arch/arm/src/lpc214x/lpc214x_usbdev.c | 4 +-
arch/arm/src/lpc2378/lpc2378.h | 2 +-
arch/arm/src/lpc2378/lpc23xx_decodeirq.c | 2 +-
arch/arm/src/lpc2378/lpc23xx_head.S | 2 +-
arch/arm/src/lpc2378/lpc23xx_i2c.c | 4 +-
arch/arm/src/lpc2378/lpc23xx_io.c | 2 +-
arch/arm/src/lpc2378/lpc23xx_irq.c | 4 +-
arch/arm/src/lpc2378/lpc23xx_lowputc.S | 4 +-
arch/arm/src/lpc2378/lpc23xx_pllsetup.c | 2 +-
arch/arm/src/lpc2378/lpc23xx_serial.c | 2 +-
arch/arm/src/lpc2378/lpc23xx_spi.c | 4 +-
arch/arm/src/lpc2378/lpc23xx_timerisr.c | 2 +-
arch/arm/src/lpc31xx/lpc31.h | 4 +-
arch/arm/src/lpc31xx/lpc31_allocateheap.c | 4 +-
arch/arm/src/lpc31xx/lpc31_bcrndx.c | 2 +-
arch/arm/src/lpc31xx/lpc31_boot.c | 4 +-
arch/arm/src/lpc31xx/lpc31_cgudrvr.h | 2 +-
arch/arm/src/lpc31xx/lpc31_clkdomain.c | 2 +-
arch/arm/src/lpc31xx/lpc31_clkfreq.c | 2 +-
arch/arm/src/lpc31xx/lpc31_decodeirq.c | 4 +-
arch/arm/src/lpc31xx/lpc31_ehci.c | 2 +-
arch/arm/src/lpc31xx/lpc31_esrndx.c | 2 +-
arch/arm/src/lpc31xx/lpc31_fdcndx.c | 2 +-
arch/arm/src/lpc31xx/lpc31_i2c.c | 4 +-
arch/arm/src/lpc31xx/lpc31_irq.c | 4 +-
arch/arm/src/lpc31xx/lpc31_lowputc.c | 4 +-
arch/arm/src/lpc31xx/lpc31_serial.c | 4 +-
arch/arm/src/lpc31xx/lpc31_softreset.c | 2 +-
arch/arm/src/lpc31xx/lpc31_timerisr.c | 4 +-
arch/arm/src/lpc31xx/lpc31_usbdev.c | 4 +-
arch/arm/src/lpc43xx/lpc43_adc.c | 4 +-
arch/arm/src/lpc43xx/lpc43_aes.c | 4 +-
arch/arm/src/lpc43xx/lpc43_allocateheap.c | 4 +-
arch/arm/src/lpc43xx/lpc43_can.c | 4 +-
arch/arm/src/lpc43xx/lpc43_cgu.c | 2 +-
arch/arm/src/lpc43xx/lpc43_clrpend.c | 2 +-
arch/arm/src/lpc43xx/lpc43_dac.c | 4 +-
arch/arm/src/lpc43xx/lpc43_debug.c | 2 +-
arch/arm/src/lpc43xx/lpc43_ehci.c | 2 +-
arch/arm/src/lpc43xx/lpc43_emc.c | 4 +-
arch/arm/src/lpc43xx/lpc43_ethernet.c | 4 +-
arch/arm/src/lpc43xx/lpc43_gpdma.c | 6 +-
arch/arm/src/lpc43xx/lpc43_gpio.c | 2 +-
arch/arm/src/lpc43xx/lpc43_gpioint.c | 2 +-
arch/arm/src/lpc43xx/lpc43_i2c.c | 4 +-
arch/arm/src/lpc43xx/lpc43_idle.c | 2 +-
arch/arm/src/lpc43xx/lpc43_irq.c | 4 +-
arch/arm/src/lpc43xx/lpc43_pinconfig.c | 2 +-
arch/arm/src/lpc43xx/lpc43_rgu.c | 2 +-
arch/arm/src/lpc43xx/lpc43_rit.c | 2 +-
arch/arm/src/lpc43xx/lpc43_rtc.c | 4 +-
arch/arm/src/lpc43xx/lpc43_sdmmc.c | 2 +-
arch/arm/src/lpc43xx/lpc43_serial.c | 4 +-
arch/arm/src/lpc43xx/lpc43_spi.c | 4 +-
arch/arm/src/lpc43xx/lpc43_spifi.c | 2 +-
arch/arm/src/lpc43xx/lpc43_ssp.c | 4 +-
arch/arm/src/lpc43xx/lpc43_start.c | 4 +-
arch/arm/src/lpc43xx/lpc43_tickless_rit.c | 2 +-
arch/arm/src/lpc43xx/lpc43_timer.c | 2 +-
arch/arm/src/lpc43xx/lpc43_timerisr.c | 4 +-
arch/arm/src/lpc43xx/lpc43_uart.c | 4 +-
arch/arm/src/lpc43xx/lpc43_usb0dev.c | 4 +-
arch/arm/src/lpc43xx/lpc43_wwdt.c | 2 +-
arch/arm/src/lpc54xx/lpc546x_enableclk.h | 2 +-
arch/arm/src/lpc54xx/lpc546x_power.h | 2 +-
arch/arm/src/lpc54xx/lpc54_allocateheap.c | 4 +-
arch/arm/src/lpc54xx/lpc54_clockconfig.c | 4 +-
arch/arm/src/lpc54xx/lpc54_clrpend.c | 2 +-
arch/arm/src/lpc54xx/lpc54_dma.c | 6 +-
arch/arm/src/lpc54xx/lpc54_emc.c | 2 +-
arch/arm/src/lpc54xx/lpc54_ethernet.c | 2 +-
arch/arm/src/lpc54xx/lpc54_gpio.c | 2 +-
arch/arm/src/lpc54xx/lpc54_gpioirq.c | 2 +-
arch/arm/src/lpc54xx/lpc54_i2c_master.c | 4 +-
arch/arm/src/lpc54xx/lpc54_idle.c | 2 +-
arch/arm/src/lpc54xx/lpc54_irq.c | 4 +-
arch/arm/src/lpc54xx/lpc54_lcd.c | 2 +-
arch/arm/src/lpc54xx/lpc54_lowputc.c | 4 +-
arch/arm/src/lpc54xx/lpc54_reset.c | 2 +-
arch/arm/src/lpc54xx/lpc54_rtc.c | 2 +-
arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c | 2 +-
arch/arm/src/lpc54xx/lpc54_sdmmc.c | 2 +-
arch/arm/src/lpc54xx/lpc54_serial.c | 4 +-
arch/arm/src/lpc54xx/lpc54_spi_master.c | 4 +-
arch/arm/src/lpc54xx/lpc54_start.c | 4 +-
arch/arm/src/lpc54xx/lpc54_start.h | 2 +-
arch/arm/src/lpc54xx/lpc54_tickless.c | 2 +-
arch/arm/src/lpc54xx/lpc54_timerisr.c | 4 +-
arch/arm/src/lpc54xx/lpc54_usb0_ohci.c | 4 +-
arch/arm/src/lpc54xx/lpc54_wwdt.c | 2 +-
arch/arm/src/max326xx/common/max326_clrpend.c | 2 +-
arch/arm/src/max326xx/common/max326_icc.c | 2 +-
arch/arm/src/max326xx/common/max326_idle.c | 2 +-
arch/arm/src/max326xx/common/max326_irq.c | 4 +-
.../arm/src/max326xx/common/max326_rtc_lowerhalf.c | 2 +-
arch/arm/src/max326xx/common/max326_start.c | 4 +-
arch/arm/src/max326xx/common/max326_timerisr.c | 4 +-
.../src/max326xx/max32660/max32660_clockconfig.c | 2 +-
arch/arm/src/max326xx/max32660/max32660_dma.c | 2 +-
arch/arm/src/max326xx/max32660/max32660_gpio.c | 2 +-
arch/arm/src/max326xx/max32660/max32660_gpioirq.c | 2 +-
arch/arm/src/max326xx/max32660/max32660_lowputc.c | 4 +-
.../src/max326xx/max32660/max32660_periphclks.h | 2 +-
arch/arm/src/max326xx/max32660/max32660_rtc.c | 2 +-
arch/arm/src/max326xx/max32660/max32660_serial.c | 4 +-
arch/arm/src/max326xx/max32660/max32660_spim.c | 4 +-
arch/arm/src/max326xx/max32660/max32660_wdt.c | 4 +-
arch/arm/src/max326xx/max326_start.h | 2 +-
arch/arm/src/moxart/moxart_16550.c | 2 +-
arch/arm/src/moxart/moxart_idle.c | 2 +-
arch/arm/src/moxart/moxart_irq.c | 4 +-
arch/arm/src/moxart/moxart_lowputc.S | 4 +-
arch/arm/src/moxart/moxart_systemreset.c | 2 +-
arch/arm/src/moxart/moxart_timer.c | 2 +-
arch/arm/src/nrf52/nrf52832_errdata.c | 4 +-
arch/arm/src/nrf52/nrf52_allocateheap.c | 4 +-
arch/arm/src/nrf52/nrf52_clockconfig.c | 4 +-
arch/arm/src/nrf52/nrf52_flash.c | 2 +-
arch/arm/src/nrf52/nrf52_gpio.c | 2 +-
arch/arm/src/nrf52/nrf52_gpiote.c | 2 +-
arch/arm/src/nrf52/nrf52_i2c.c | 2 +-
arch/arm/src/nrf52/nrf52_idle.c | 2 +-
arch/arm/src/nrf52/nrf52_irq.c | 4 +-
arch/arm/src/nrf52/nrf52_lowputc.c | 4 +-
arch/arm/src/nrf52/nrf52_nvmc.c | 2 +-
arch/arm/src/nrf52/nrf52_radio.c | 2 +-
arch/arm/src/nrf52/nrf52_rng.c | 4 +-
arch/arm/src/nrf52/nrf52_serial.c | 4 +-
arch/arm/src/nrf52/nrf52_spi.c | 2 +-
arch/arm/src/nrf52/nrf52_start.c | 4 +-
arch/arm/src/nrf52/nrf52_start.h | 2 +-
arch/arm/src/nrf52/nrf52_timerisr.c | 4 +-
arch/arm/src/nrf52/nrf52_utils.c | 2 +-
arch/arm/src/nrf52/nrf52_wdt.c | 4 +-
arch/arm/src/nuc1xx/nuc_clockconfig.c | 2 +-
arch/arm/src/nuc1xx/nuc_dumpgpio.c | 2 +-
arch/arm/src/nuc1xx/nuc_gpio.c | 2 +-
arch/arm/src/nuc1xx/nuc_idle.c | 2 +-
arch/arm/src/nuc1xx/nuc_irq.c | 4 +-
arch/arm/src/nuc1xx/nuc_lowputc.c | 2 +-
arch/arm/src/nuc1xx/nuc_serial.c | 4 +-
arch/arm/src/nuc1xx/nuc_start.c | 4 +-
arch/arm/src/nuc1xx/nuc_timerisr.c | 4 +-
arch/arm/src/s32k1xx/s32k11x/s32k11x_irq.c | 4 +-
arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c | 4 +-
arch/arm/src/s32k1xx/s32k14x/s32k14x_clrpend.c | 2 +-
arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c | 4 +-
arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c | 4 +-
arch/arm/src/s32k1xx/s32k1xx_clockconfig.c | 4 +-
arch/arm/src/s32k1xx/s32k1xx_edma.c | 4 +-
arch/arm/src/s32k1xx/s32k1xx_enet.c | 2 +-
arch/arm/src/s32k1xx/s32k1xx_enet.h | 2 +-
arch/arm/src/s32k1xx/s32k1xx_lowputc.c | 4 +-
arch/arm/src/s32k1xx/s32k1xx_lowputc.h | 2 +-
arch/arm/src/s32k1xx/s32k1xx_lpi2c.c | 2 +-
arch/arm/src/s32k1xx/s32k1xx_lpspi.c | 4 +-
arch/arm/src/s32k1xx/s32k1xx_periphclocks.c | 2 +-
arch/arm/src/s32k1xx/s32k1xx_periphclocks.h | 4 +-
arch/arm/src/s32k1xx/s32k1xx_pin.c | 4 +-
arch/arm/src/s32k1xx/s32k1xx_pin.h | 2 +-
arch/arm/src/s32k1xx/s32k1xx_pindma.c | 4 +-
arch/arm/src/s32k1xx/s32k1xx_pindump.c | 2 +-
arch/arm/src/s32k1xx/s32k1xx_pingpio.c | 2 +-
arch/arm/src/s32k1xx/s32k1xx_pinirq.c | 4 +-
arch/arm/src/s32k1xx/s32k1xx_rtc.c | 2 +-
arch/arm/src/s32k1xx/s32k1xx_serial.c | 4 +-
arch/arm/src/s32k1xx/s32k1xx_serial.h | 2 +-
arch/arm/src/s32k1xx/s32k1xx_start.c | 4 +-
arch/arm/src/s32k1xx/s32k1xx_start.h | 2 +-
arch/arm/src/s32k1xx/s32k1xx_wdog.h | 2 +-
arch/arm/src/sam34/sam4cm_cpuidlestack.c | 2 +-
arch/arm/src/sam34/sam4cm_cpupause.c | 4 +-
arch/arm/src/sam34/sam4cm_cpustart.c | 4 +-
arch/arm/src/sam34/sam4cm_idle.c | 2 +-
arch/arm/src/sam34/sam4cm_supc.c | 4 +-
arch/arm/src/sam34/sam4cm_tc.c | 2 +-
arch/arm/src/sam34/sam4l_clockconfig.c | 4 +-
arch/arm/src/sam34/sam4l_gpio.c | 4 +-
arch/arm/src/sam34/sam4l_periphclks.c | 4 +-
arch/arm/src/sam34/sam_aes.c | 4 +-
arch/arm/src/sam34/sam_allocateheap.c | 4 +-
arch/arm/src/sam34/sam_clockconfig.c | 4 +-
arch/arm/src/sam34/sam_cmcc.c | 2 +-
arch/arm/src/sam34/sam_dmac.c | 4 +-
arch/arm/src/sam34/sam_emac.c | 4 +-
arch/arm/src/sam34/sam_emac.h | 2 +-
arch/arm/src/sam34/sam_gpio.c | 4 +-
arch/arm/src/sam34/sam_gpioirq.c | 4 +-
arch/arm/src/sam34/sam_hsmci.c | 2 +-
arch/arm/src/sam34/sam_irq.c | 4 +-
arch/arm/src/sam34/sam_lowputc.c | 4 +-
arch/arm/src/sam34/sam_lowputc.h | 2 +-
arch/arm/src/sam34/sam_rtc.c | 2 +-
arch/arm/src/sam34/sam_rtt.c | 2 +-
arch/arm/src/sam34/sam_serial.c | 4 +-
arch/arm/src/sam34/sam_spi.c | 4 +-
arch/arm/src/sam34/sam_start.c | 4 +-
arch/arm/src/sam34/sam_tc.c | 2 +-
arch/arm/src/sam34/sam_timerisr.c | 4 +-
arch/arm/src/sam34/sam_twi.c | 2 +-
arch/arm/src/sam34/sam_udp.c | 4 +-
arch/arm/src/sam34/sam_userspace.h | 2 +-
arch/arm/src/sam34/sam_wdt.c | 2 +-
arch/arm/src/sama5/sam_adc.c | 4 +-
arch/arm/src/sama5/sam_allocateheap.c | 4 +-
arch/arm/src/sama5/sam_boot.c | 4 +-
arch/arm/src/sama5/sam_can.c | 4 +-
arch/arm/src/sama5/sam_clockconfig.c | 4 +-
arch/arm/src/sama5/sam_clockconfig.h | 2 +-
arch/arm/src/sama5/sam_dbgu.c | 4 +-
arch/arm/src/sama5/sam_dbgu.h | 2 +-
arch/arm/src/sama5/sam_dmac.c | 4 +-
arch/arm/src/sama5/sam_ehci.c | 2 +-
arch/arm/src/sama5/sam_emaca.c | 4 +-
arch/arm/src/sama5/sam_emacb.c | 4 +-
arch/arm/src/sama5/sam_flexcom_serial.c | 4 +-
arch/arm/src/sama5/sam_gmac.c | 4 +-
arch/arm/src/sama5/sam_hsmci.c | 2 +-
arch/arm/src/sama5/sam_irq.c | 4 +-
arch/arm/src/sama5/sam_lcd.c | 2 +-
arch/arm/src/sama5/sam_lowputc.c | 4 +-
arch/arm/src/sama5/sam_lowputc.h | 2 +-
arch/arm/src/sama5/sam_nand.c | 2 +-
arch/arm/src/sama5/sam_nand.h | 2 +-
arch/arm/src/sama5/sam_ohci.c | 4 +-
arch/arm/src/sama5/sam_pck.c | 2 +-
arch/arm/src/sama5/sam_pioirq.c | 4 +-
arch/arm/src/sama5/sam_pmc.c | 2 +-
arch/arm/src/sama5/sam_pwm.c | 4 +-
arch/arm/src/sama5/sam_rtc.c | 2 +-
arch/arm/src/sama5/sam_sckc.c | 2 +-
arch/arm/src/sama5/sam_serial.c | 4 +-
arch/arm/src/sama5/sam_serial.h | 2 +-
arch/arm/src/sama5/sam_spi.c | 4 +-
arch/arm/src/sama5/sam_ssc.c | 4 +-
arch/arm/src/sama5/sam_tc.c | 2 +-
arch/arm/src/sama5/sam_timerisr.c | 2 +-
arch/arm/src/sama5/sam_trng.c | 4 +-
arch/arm/src/sama5/sam_tsd.c | 2 +-
arch/arm/src/sama5/sam_twi.c | 2 +-
arch/arm/src/sama5/sam_udphs.c | 4 +-
arch/arm/src/sama5/sam_wdt.c | 2 +-
arch/arm/src/sama5/sam_xdmac.c | 4 +-
arch/arm/src/sama5/sama5d2x_pio.c | 4 +-
arch/arm/src/sama5/sama5d3x4x_pio.c | 4 +-
arch/arm/src/samd2l2/sam_ac.c | 2 +-
arch/arm/src/samd2l2/sam_adc.c | 2 +-
arch/arm/src/samd2l2/sam_dmac.c | 4 +-
arch/arm/src/samd2l2/sam_eic.c | 2 +-
arch/arm/src/samd2l2/sam_i2c_master.c | 4 +-
arch/arm/src/samd2l2/sam_idle.c | 2 +-
arch/arm/src/samd2l2/sam_irq.c | 4 +-
arch/arm/src/samd2l2/sam_irqprio.c | 2 +-
arch/arm/src/samd2l2/sam_lowputc.c | 2 +-
arch/arm/src/samd2l2/sam_port.c | 4 +-
arch/arm/src/samd2l2/sam_sercom.c | 2 +-
arch/arm/src/samd2l2/sam_sercom.h | 2 +-
arch/arm/src/samd2l2/sam_serial.c | 4 +-
arch/arm/src/samd2l2/sam_spi.c | 4 +-
arch/arm/src/samd2l2/sam_start.c | 4 +-
arch/arm/src/samd2l2/sam_timerisr.c | 4 +-
arch/arm/src/samd2l2/sam_usart.h | 2 +-
arch/arm/src/samd2l2/sam_usb.c | 4 +-
arch/arm/src/samd2l2/samd_clockconfig.c | 2 +-
arch/arm/src/samd2l2/samd_gclk.c | 2 +-
arch/arm/src/samd2l2/saml_clockconfig.c | 2 +-
arch/arm/src/samd2l2/saml_gclk.c | 2 +-
arch/arm/src/samd5e5/sam_clockconfig.c | 2 +-
arch/arm/src/samd5e5/sam_cmcc.c | 2 +-
arch/arm/src/samd5e5/sam_dmac.c | 4 +-
arch/arm/src/samd5e5/sam_eic.c | 2 +-
arch/arm/src/samd5e5/sam_gclk.c | 2 +-
arch/arm/src/samd5e5/sam_gclk.h | 2 +-
arch/arm/src/samd5e5/sam_gmac.c | 4 +-
arch/arm/src/samd5e5/sam_i2c_master.c | 4 +-
arch/arm/src/samd5e5/sam_idle.c | 2 +-
arch/arm/src/samd5e5/sam_irq.c | 4 +-
arch/arm/src/samd5e5/sam_lowputc.c | 2 +-
arch/arm/src/samd5e5/sam_port.c | 4 +-
arch/arm/src/samd5e5/sam_sercom.c | 2 +-
arch/arm/src/samd5e5/sam_sercom.h | 2 +-
arch/arm/src/samd5e5/sam_serial.c | 4 +-
arch/arm/src/samd5e5/sam_spi.c | 4 +-
arch/arm/src/samd5e5/sam_start.c | 4 +-
arch/arm/src/samd5e5/sam_timerisr.c | 4 +-
arch/arm/src/samd5e5/sam_usart.h | 2 +-
arch/arm/src/samd5e5/sam_usb.c | 4 +-
arch/arm/src/samd5e5/sam_userspace.h | 2 +-
arch/arm/src/samv7/sam_allocateheap.c | 4 +-
arch/arm/src/samv7/sam_clockconfig.c | 4 +-
arch/arm/src/samv7/sam_dac.c | 4 +-
arch/arm/src/samv7/sam_eefc.h | 4 +-
arch/arm/src/samv7/sam_emac.c | 4 +-
arch/arm/src/samv7/sam_gpio.c | 4 +-
arch/arm/src/samv7/sam_gpioirq.c | 4 +-
arch/arm/src/samv7/sam_hsmci.c | 2 +-
arch/arm/src/samv7/sam_irq.c | 4 +-
arch/arm/src/samv7/sam_lowputc.c | 4 +-
arch/arm/src/samv7/sam_lowputc.h | 2 +-
arch/arm/src/samv7/sam_mcan.c | 4 +-
arch/arm/src/samv7/sam_pck.c | 2 +-
arch/arm/src/samv7/sam_progmem.c | 4 +-
arch/arm/src/samv7/sam_progmem.h | 2 +-
arch/arm/src/samv7/sam_qspi.c | 4 +-
arch/arm/src/samv7/sam_rswdt.c | 2 +-
arch/arm/src/samv7/sam_serial.c | 4 +-
arch/arm/src/samv7/sam_spi.c | 4 +-
arch/arm/src/samv7/sam_spi_slave.c | 2 +-
arch/arm/src/samv7/sam_ssc.c | 4 +-
arch/arm/src/samv7/sam_start.c | 4 +-
arch/arm/src/samv7/sam_start.h | 2 +-
arch/arm/src/samv7/sam_systemreset.c | 2 +-
arch/arm/src/samv7/sam_tc.c | 2 +-
arch/arm/src/samv7/sam_timerisr.c | 4 +-
arch/arm/src/samv7/sam_trng.c | 4 +-
arch/arm/src/samv7/sam_twihs.c | 2 +-
arch/arm/src/samv7/sam_usbdevhs.c | 4 +-
arch/arm/src/samv7/sam_userspace.h | 2 +-
arch/arm/src/samv7/sam_wdt.c | 2 +-
arch/arm/src/samv7/sam_xdmac.c | 4 +-
arch/arm/src/stm32/stm32.h | 2 +-
arch/arm/src/stm32/stm32_1wire.c | 2 +-
arch/arm/src/stm32/stm32_adc.c | 4 +-
arch/arm/src/stm32/stm32_aes.c | 4 +-
arch/arm/src/stm32/stm32_allocateheap.c | 4 +-
arch/arm/src/stm32/stm32_can.c | 4 +-
arch/arm/src/stm32/stm32_capture.c | 4 +-
arch/arm/src/stm32/stm32_dac.c | 4 +-
arch/arm/src/stm32/stm32_dma2d.c | 4 +-
arch/arm/src/stm32/stm32_dma_v1.c | 4 +-
arch/arm/src/stm32/stm32_dma_v2.c | 4 +-
arch/arm/src/stm32/stm32_dumpgpio.c | 2 +-
arch/arm/src/stm32/stm32_eth.c | 2 +-
arch/arm/src/stm32/stm32_exti_alarm.c | 2 +-
arch/arm/src/stm32/stm32_exti_gpio.c | 2 +-
arch/arm/src/stm32/stm32_exti_pwr.c | 2 +-
arch/arm/src/stm32/stm32_exti_wakeup.c | 2 +-
arch/arm/src/stm32/stm32_gpio.c | 2 +-
arch/arm/src/stm32/stm32_hciuart.c | 4 +-
arch/arm/src/stm32/stm32_i2c.c | 2 +-
arch/arm/src/stm32/stm32_i2c_alt.c | 2 +-
arch/arm/src/stm32/stm32_i2c_v2.c | 2 +-
arch/arm/src/stm32/stm32_i2s.c | 4 +-
arch/arm/src/stm32/stm32_idle.c | 2 +-
arch/arm/src/stm32/stm32_irq.c | 4 +-
arch/arm/src/stm32/stm32_iwdg.c | 2 +-
arch/arm/src/stm32/stm32_lowputc.c | 4 +-
arch/arm/src/stm32/stm32_lse.c | 2 +-
arch/arm/src/stm32/stm32_lsi.c | 2 +-
arch/arm/src/stm32/stm32_ltdc.c | 4 +-
arch/arm/src/stm32/stm32_otgfsdev.c | 4 +-
arch/arm/src/stm32/stm32_otgfshost.c | 4 +-
arch/arm/src/stm32/stm32_otghsdev.c | 4 +-
arch/arm/src/stm32/stm32_otghshost.c | 4 +-
arch/arm/src/stm32/stm32_pm.h | 2 +-
arch/arm/src/stm32/stm32_pminitialize.c | 2 +-
arch/arm/src/stm32/stm32_pmsleep.c | 2 +-
arch/arm/src/stm32/stm32_pmstandby.c | 2 +-
arch/arm/src/stm32/stm32_pmstop.c | 2 +-
arch/arm/src/stm32/stm32_pwm.c | 4 +-
arch/arm/src/stm32/stm32_pwr.c | 2 +-
arch/arm/src/stm32/stm32_qencoder.c | 4 +-
arch/arm/src/stm32/stm32_rcc.c | 4 +-
arch/arm/src/stm32/stm32_rcc.h | 2 +-
arch/arm/src/stm32/stm32_rng.c | 4 +-
arch/arm/src/stm32/stm32_rtc_lowerhalf.c | 2 +-
arch/arm/src/stm32/stm32_rtcc.c | 2 +-
arch/arm/src/stm32/stm32_rtcounter.c | 2 +-
arch/arm/src/stm32/stm32_sdadc.c | 4 +-
arch/arm/src/stm32/stm32_sdio.c | 2 +-
arch/arm/src/stm32/stm32_serial.c | 4 +-
arch/arm/src/stm32/stm32_spi.c | 4 +-
arch/arm/src/stm32/stm32_start.c | 4 +-
arch/arm/src/stm32/stm32_tickless.c | 2 +-
arch/arm/src/stm32/stm32_tim.c | 4 +-
arch/arm/src/stm32/stm32_timerisr.c | 4 +-
arch/arm/src/stm32/stm32_usbdev.c | 2 +-
arch/arm/src/stm32/stm32_wwdg.c | 2 +-
arch/arm/src/stm32/stm32f10xxf30xx_flash.c | 2 +-
arch/arm/src/stm32/stm32f20xxf40xx_flash.c | 2 +-
arch/arm/src/stm32/stm32f40xxx_i2c.c | 2 +-
arch/arm/src/stm32/stm32f40xxx_rtcc.c | 2 +-
arch/arm/src/stm32/stm32l15xx_flash.c | 2 +-
arch/arm/src/stm32/stm32l15xxx_rtcc.c | 2 +-
arch/arm/src/stm32f0l0g0/stm32.h | 2 +-
arch/arm/src/stm32f0l0g0/stm32_adc.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_aes.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_dma_v1.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_exti_gpio.c | 2 +-
arch/arm/src/stm32f0l0g0/stm32_gpio.c | 2 +-
arch/arm/src/stm32f0l0g0/stm32_hsi48.c | 2 +-
arch/arm/src/stm32f0l0g0/stm32_i2c.c | 2 +-
arch/arm/src/stm32f0l0g0/stm32_idle.c | 2 +-
arch/arm/src/stm32f0l0g0/stm32_irq.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_lowputc_v1.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_lowputc_v2.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_lse.c | 2 +-
arch/arm/src/stm32f0l0g0/stm32_pwm.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_rcc.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_rcc.h | 2 +-
arch/arm/src/stm32f0l0g0/stm32_rng.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_serial_v1.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_serial_v2.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_spi.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_start.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_tim.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_timerisr.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32_usbdev.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32f0_rcc.c | 4 +-
arch/arm/src/stm32f0l0g0/stm32f0l0_pwr.c | 2 +-
arch/arm/src/stm32f0l0g0/stm32g0_pwr.c | 2 +-
arch/arm/src/stm32f7/stm32_adc.c | 4 +-
arch/arm/src/stm32f7/stm32_allocateheap.c | 4 +-
arch/arm/src/stm32f7/stm32_can.c | 4 +-
arch/arm/src/stm32f7/stm32_capture.c | 4 +-
arch/arm/src/stm32f7/stm32_dma.c | 4 +-
arch/arm/src/stm32f7/stm32_dma2d.c | 4 +-
arch/arm/src/stm32f7/stm32_dumpgpio.c | 2 +-
arch/arm/src/stm32f7/stm32_ethernet.c | 2 +-
arch/arm/src/stm32f7/stm32_exti_alarm.c | 2 +-
arch/arm/src/stm32f7/stm32_exti_gpio.c | 2 +-
arch/arm/src/stm32f7/stm32_exti_pwr.c | 2 +-
arch/arm/src/stm32f7/stm32_exti_wakeup.c | 2 +-
arch/arm/src/stm32f7/stm32_flash.c | 2 +-
arch/arm/src/stm32f7/stm32_gpio.c | 2 +-
arch/arm/src/stm32f7/stm32_i2c.c | 2 +-
arch/arm/src/stm32f7/stm32_irq.c | 4 +-
arch/arm/src/stm32f7/stm32_lowputc.c | 4 +-
arch/arm/src/stm32f7/stm32_lse.c | 2 +-
arch/arm/src/stm32f7/stm32_lsi.c | 2 +-
arch/arm/src/stm32f7/stm32_ltdc.c | 4 +-
arch/arm/src/stm32f7/stm32_otgdev.c | 4 +-
arch/arm/src/stm32f7/stm32_otghost.c | 4 +-
arch/arm/src/stm32f7/stm32_pm.h | 2 +-
arch/arm/src/stm32f7/stm32_pminitialize.c | 2 +-
arch/arm/src/stm32f7/stm32_pmsleep.c | 2 +-
arch/arm/src/stm32f7/stm32_pmstandby.c | 2 +-
arch/arm/src/stm32f7/stm32_pmstop.c | 2 +-
arch/arm/src/stm32f7/stm32_pwm.c | 4 +-
arch/arm/src/stm32f7/stm32_pwr.c | 2 +-
arch/arm/src/stm32f7/stm32_qencoder.c | 4 +-
arch/arm/src/stm32f7/stm32_qspi.c | 4 +-
arch/arm/src/stm32f7/stm32_rcc.c | 4 +-
arch/arm/src/stm32f7/stm32_rcc.h | 2 +-
arch/arm/src/stm32f7/stm32_rng.c | 4 +-
arch/arm/src/stm32f7/stm32_rtc.c | 2 +-
arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c | 2 +-
arch/arm/src/stm32f7/stm32_sai.c | 2 +-
arch/arm/src/stm32f7/stm32_sdmmc.c | 2 +-
arch/arm/src/stm32f7/stm32_serial.c | 4 +-
arch/arm/src/stm32f7/stm32_spi.c | 4 +-
arch/arm/src/stm32f7/stm32_start.c | 4 +-
arch/arm/src/stm32f7/stm32_start.h | 2 +-
arch/arm/src/stm32f7/stm32_tickless.c | 2 +-
arch/arm/src/stm32f7/stm32_tim.c | 4 +-
arch/arm/src/stm32f7/stm32_timerisr.c | 4 +-
arch/arm/src/stm32f7/stm32_userspace.h | 2 +-
arch/arm/src/stm32h7/stm32.h | 2 +-
arch/arm/src/stm32h7/stm32_allocateheap.c | 4 +-
arch/arm/src/stm32h7/stm32_dma.c | 4 +-
arch/arm/src/stm32h7/stm32_ethernet.c | 2 +-
arch/arm/src/stm32h7/stm32_exti_alarm.c | 2 +-
arch/arm/src/stm32h7/stm32_exti_gpio.c | 2 +-
arch/arm/src/stm32h7/stm32_exti_wakeup.c | 2 +-
arch/arm/src/stm32h7/stm32_flash.c | 2 +-
arch/arm/src/stm32h7/stm32_gpio.c | 2 +-
arch/arm/src/stm32h7/stm32_i2c.c | 2 +-
arch/arm/src/stm32h7/stm32_irq.c | 4 +-
arch/arm/src/stm32h7/stm32_iwdg.c | 2 +-
arch/arm/src/stm32h7/stm32_lowputc.c | 4 +-
arch/arm/src/stm32h7/stm32_lse.c | 2 +-
arch/arm/src/stm32h7/stm32_lsi.c | 2 +-
arch/arm/src/stm32h7/stm32_otgdev.c | 4 +-
arch/arm/src/stm32h7/stm32_otghost.c | 4 +-
arch/arm/src/stm32h7/stm32_pm.h | 2 +-
arch/arm/src/stm32h7/stm32_pminitialize.c | 2 +-
arch/arm/src/stm32h7/stm32_pmsleep.c | 2 +-
arch/arm/src/stm32h7/stm32_pmstandby.c | 2 +-
arch/arm/src/stm32h7/stm32_pmstop.c | 2 +-
arch/arm/src/stm32h7/stm32_pwm.c | 4 +-
arch/arm/src/stm32h7/stm32_pwr.c | 2 +-
arch/arm/src/stm32h7/stm32_qencoder.c | 4 +-
arch/arm/src/stm32h7/stm32_qspi.c | 4 +-
arch/arm/src/stm32h7/stm32_rcc.c | 4 +-
arch/arm/src/stm32h7/stm32_rcc.h | 2 +-
arch/arm/src/stm32h7/stm32_rtc.c | 2 +-
arch/arm/src/stm32h7/stm32_rtc_lowerhalf.c | 2 +-
arch/arm/src/stm32h7/stm32_sdmmc.c | 2 +-
arch/arm/src/stm32h7/stm32_serial.c | 4 +-
arch/arm/src/stm32h7/stm32_spi.c | 4 +-
arch/arm/src/stm32h7/stm32_start.c | 4 +-
arch/arm/src/stm32h7/stm32_start.h | 2 +-
arch/arm/src/stm32h7/stm32_tim.c | 4 +-
arch/arm/src/stm32h7/stm32_timerisr.c | 4 +-
arch/arm/src/stm32h7/stm32_userspace.h | 2 +-
arch/arm/src/stm32h7/stm32_wwdg.c | 2 +-
arch/arm/src/stm32l4/stm32l4.h | 2 +-
arch/arm/src/stm32l4/stm32l4_1wire.c | 2 +-
arch/arm/src/stm32l4/stm32l4_allocateheap.c | 4 +-
arch/arm/src/stm32l4/stm32l4_can.c | 4 +-
arch/arm/src/stm32l4/stm32l4_comp.c | 2 +-
arch/arm/src/stm32l4/stm32l4_dac.c | 4 +-
arch/arm/src/stm32l4/stm32l4_dumpgpio.c | 2 +-
arch/arm/src/stm32l4/stm32l4_exti_alarm.c | 2 +-
arch/arm/src/stm32l4/stm32l4_exti_comp.c | 2 +-
arch/arm/src/stm32l4/stm32l4_exti_gpio.c | 2 +-
arch/arm/src/stm32l4/stm32l4_exti_pwr.c | 2 +-
arch/arm/src/stm32l4/stm32l4_exti_wakeup.c | 2 +-
arch/arm/src/stm32l4/stm32l4_firewall.c | 2 +-
arch/arm/src/stm32l4/stm32l4_flash.c | 2 +-
arch/arm/src/stm32l4/stm32l4_gpio.c | 2 +-
arch/arm/src/stm32l4/stm32l4_hsi48.c | 2 +-
arch/arm/src/stm32l4/stm32l4_i2c.c | 2 +-
arch/arm/src/stm32l4/stm32l4_idle.c | 2 +-
arch/arm/src/stm32l4/stm32l4_irq.c | 4 +-
arch/arm/src/stm32l4/stm32l4_iwdg.c | 2 +-
arch/arm/src/stm32l4/stm32l4_lowputc.c | 4 +-
arch/arm/src/stm32l4/stm32l4_lse.c | 2 +-
arch/arm/src/stm32l4/stm32l4_lsi.c | 2 +-
arch/arm/src/stm32l4/stm32l4_otgfsdev.c | 4 +-
arch/arm/src/stm32l4/stm32l4_otgfshost.c | 4 +-
arch/arm/src/stm32l4/stm32l4_pm.h | 2 +-
arch/arm/src/stm32l4/stm32l4_pminitialize.c | 2 +-
arch/arm/src/stm32l4/stm32l4_pmlpr.c | 2 +-
arch/arm/src/stm32l4/stm32l4_pmsleep.c | 2 +-
arch/arm/src/stm32l4/stm32l4_pmstandby.c | 2 +-
arch/arm/src/stm32l4/stm32l4_pmstop.c | 2 +-
arch/arm/src/stm32l4/stm32l4_pwm.c | 4 +-
arch/arm/src/stm32l4/stm32l4_pwr.c | 2 +-
arch/arm/src/stm32l4/stm32l4_qencoder.c | 4 +-
arch/arm/src/stm32l4/stm32l4_qspi.c | 4 +-
arch/arm/src/stm32l4/stm32l4_rcc.c | 4 +-
arch/arm/src/stm32l4/stm32l4_rcc.h | 2 +-
arch/arm/src/stm32l4/stm32l4_rng.c | 4 +-
arch/arm/src/stm32l4/stm32l4_rtc.c | 2 +-
arch/arm/src/stm32l4/stm32l4_sdmmc.c | 2 +-
arch/arm/src/stm32l4/stm32l4_serial.c | 4 +-
arch/arm/src/stm32l4/stm32l4_spi.c | 4 +-
arch/arm/src/stm32l4/stm32l4_start.c | 4 +-
arch/arm/src/stm32l4/stm32l4_tim.c | 4 +-
arch/arm/src/stm32l4/stm32l4_timerisr.c | 4 +-
arch/arm/src/stm32l4/stm32l4_usbdev.c | 2 +-
arch/arm/src/stm32l4/stm32l4x6xx_dma.c | 4 +-
arch/arm/src/stm32l4/stm32l4xrxx_dma.c | 4 +-
arch/arm/src/str71x/str71x_decodeirq.c | 4 +-
arch/arm/src/str71x/str71x_head.S | 4 +-
arch/arm/src/str71x/str71x_irq.c | 4 +-
arch/arm/src/str71x/str71x_lowputc.c | 4 +-
arch/arm/src/str71x/str71x_prccu.c | 2 +-
arch/arm/src/str71x/str71x_serial.c | 4 +-
arch/arm/src/str71x/str71x_timerisr.c | 4 +-
arch/arm/src/str71x/str71x_xti.c | 4 +-
arch/arm/src/tiva/cc13xx/cc13x0_rom.c | 2 +-
arch/arm/src/tiva/cc13xx/cc13x2_aux_sysif.c | 2 +-
arch/arm/src/tiva/cc13xx/cc13x2_cc26x2_v1_rom.c | 2 +-
arch/arm/src/tiva/cc13xx/cc13xx_gpio.c | 2 +-
arch/arm/src/tiva/cc13xx/cc13xx_gpioirq.c | 4 +-
arch/arm/src/tiva/cc13xx/cc13xx_prcm.c | 2 +-
arch/arm/src/tiva/cc13xx/cc13xx_prcm.h | 2 +-
arch/arm/src/tiva/cc13xx/cc13xx_start.c | 4 +-
arch/arm/src/tiva/common/lm4xx_tm3c_sysctrl.c | 4 +-
arch/arm/src/tiva/common/lmxx_tm4c_enableclks.h | 2 +-
arch/arm/src/tiva/common/lmxx_tm4c_enablepwr.h | 2 +-
arch/arm/src/tiva/common/lmxx_tm4c_gpioirq.c | 4 +-
arch/arm/src/tiva/common/lmxx_tm4c_start.c | 4 +-
arch/arm/src/tiva/common/tiva_adclib.c | 4 +-
arch/arm/src/tiva/common/tiva_adclow.c | 4 +-
arch/arm/src/tiva/common/tiva_allocateheap.c | 4 +-
arch/arm/src/tiva/common/tiva_dumpgpio.c | 2 +-
arch/arm/src/tiva/common/tiva_eeprom.c | 2 +-
arch/arm/src/tiva/common/tiva_flash.c | 2 +-
arch/arm/src/tiva/common/tiva_hciuart.c | 4 +-
arch/arm/src/tiva/common/tiva_i2c.c | 2 +-
arch/arm/src/tiva/common/tiva_irq.c | 4 +-
arch/arm/src/tiva/common/tiva_lowputc.c | 4 +-
arch/arm/src/tiva/common/tiva_pwm.c | 2 +-
arch/arm/src/tiva/common/tiva_qencoder.c | 2 +-
arch/arm/src/tiva/common/tiva_serial.c | 4 +-
arch/arm/src/tiva/common/tiva_ssi.c | 4 +-
arch/arm/src/tiva/common/tiva_timerisr.c | 4 +-
arch/arm/src/tiva/common/tiva_timerlib.c | 2 +-
arch/arm/src/tiva/lm/lm3s_ethernet.c | 2 +-
arch/arm/src/tiva/lm/lm3s_gpio.c | 2 +-
arch/arm/src/tiva/lm/lm4f_gpio.c | 2 +-
arch/arm/src/tiva/tiva_chipinfo.h | 2 +-
arch/arm/src/tiva/tiva_periphrdy.h | 2 +-
arch/arm/src/tiva/tiva_timer.h | 2 +-
arch/arm/src/tiva/tm4c/tm4c129_sysctrl.c | 4 +-
arch/arm/src/tiva/tm4c/tm4c_ethernet.c | 2 +-
arch/arm/src/tiva/tm4c/tm4c_gpio.c | 2 +-
arch/arm/src/tms570/tms570_boot.c | 4 +-
arch/arm/src/tms570/tms570_boot.h | 2 +-
arch/arm/src/tms570/tms570_clockconfig.c | 2 +-
arch/arm/src/tms570/tms570_esm.c | 4 +-
arch/arm/src/tms570/tms570_gio.c | 4 +-
arch/arm/src/tms570/tms570_gioirq.c | 4 +-
arch/arm/src/tms570/tms570_irq.c | 4 +-
arch/arm/src/tms570/tms570_lowputc.c | 4 +-
arch/arm/src/tms570/tms570_lowputc.h | 2 +-
arch/arm/src/tms570/tms570_selftest.c | 2 +-
arch/arm/src/tms570/tms570_serial.c | 4 +-
arch/arm/src/tms570/tms570_timerisr.c | 4 +-
arch/arm/src/xmc4/xmc4_allocateheap.c | 4 +-
arch/arm/src/xmc4/xmc4_clockconfig.c | 2 +-
arch/arm/src/xmc4/xmc4_clockutils.c | 2 +-
arch/arm/src/xmc4/xmc4_clrpend.c | 2 +-
arch/arm/src/xmc4/xmc4_gpio.c | 4 +-
arch/arm/src/xmc4/xmc4_idle.c | 2 +-
arch/arm/src/xmc4/xmc4_irq.c | 4 +-
arch/arm/src/xmc4/xmc4_lowputc.c | 4 +-
arch/arm/src/xmc4/xmc4_lowputc.h | 2 +-
arch/arm/src/xmc4/xmc4_serial.c | 4 +-
arch/arm/src/xmc4/xmc4_spi.c | 4 +-
arch/arm/src/xmc4/xmc4_start.c | 4 +-
arch/arm/src/xmc4/xmc4_timerisr.c | 4 +-
arch/arm/src/xmc4/xmc4_usic.c | 2 +-
boards/arm/a1x/pcduino-a10/src/a1x_leds.c | 4 +-
.../arm/am335x/beaglebone-black/src/am335x_leds.c | 4 +-
boards/arm/c5471/c5471evm/src/c5471_leds.c | 2 +-
boards/arm/cxd56xx/common/src/cxd56_audio.c | 2 +-
boards/arm/cxd56xx/common/src/cxd56_boot.c | 4 +-
boards/arm/cxd56xx/common/src/cxd56_crashdump.c | 4 +-
boards/arm/cxd56xx/common/src/cxd56_imageproc.c | 2 +-
boards/arm/cxd56xx/spresense/src/cxd56_ostest.c | 4 +-
boards/arm/cxd56xx/spresense/src/cxd56_power.c | 2 +-
boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c | 2 +-
boards/arm/cxd56xx/spresense/src/cxd56_spi.c | 2 +-
boards/arm/dm320/ntosd-dm320/src/dm320_leds.c | 2 +-
boards/arm/dm320/ntosd-dm320/src/dm320_network.c | 4 +-
.../arm/efm32/efm32-g8xx-stk/src/efm32_autoleds.c | 4 +-
.../arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c | 4 +-
boards/arm/imx6/sabre-6quad/src/imx_autoleds.c | 2 +-
boards/arm/imx6/sabre-6quad/src/imx_boardinit.c | 2 +-
boards/arm/imxrt/imxrt1020-evk/src/imxrt_bringup.c | 2 +-
boards/arm/imxrt/imxrt1020-evk/src/imxrt_buttons.c | 2 +-
boards/arm/imxrt/imxrt1020-evk/src/imxrt_spi.c | 2 +-
boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c | 2 +-
.../arm/imxrt/imxrt1050-evk/src/imxrt_mmcsd_spi.c | 2 +-
boards/arm/imxrt/imxrt1050-evk/src/imxrt_spi.c | 2 +-
boards/arm/imxrt/imxrt1060-evk/src/imxrt_boot.c | 2 +-
boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c | 2 +-
.../arm/imxrt/imxrt1060-evk/src/imxrt_mmcsd_spi.c | 2 +-
boards/arm/imxrt/imxrt1060-evk/src/imxrt_spi.c | 2 +-
boards/arm/kinetis/freedom-k28f/src/k28_i2c.c | 2 +-
boards/arm/kinetis/freedom-k28f/src/k28_pwm.c | 2 +-
boards/arm/kinetis/freedom-k28f/src/k28_spi.c | 2 +-
boards/arm/kinetis/freedom-k28f/src/k28_usbdev.c | 2 +-
boards/arm/kinetis/freedom-k64f/src/k64_boot.c | 2 +-
boards/arm/kinetis/freedom-k64f/src/k64_pwm.c | 2 +-
boards/arm/kinetis/freedom-k64f/src/k64_spi.c | 2 +-
boards/arm/kinetis/freedom-k64f/src/k64_usbdev.c | 2 +-
boards/arm/kinetis/freedom-k66f/src/k66_boot.c | 2 +-
boards/arm/kinetis/freedom-k66f/src/k66_pwm.c | 2 +-
boards/arm/kinetis/freedom-k66f/src/k66_spi.c | 2 +-
boards/arm/kinetis/freedom-k66f/src/k66_usbdev.c | 2 +-
boards/arm/kinetis/kwikstik-k40/src/k40_boot.c | 2 +-
boards/arm/kinetis/kwikstik-k40/src/k40_lcd.c | 2 +-
boards/arm/kinetis/kwikstik-k40/src/k40_spi.c | 2 +-
boards/arm/kinetis/kwikstik-k40/src/k40_usbdev.c | 2 +-
boards/arm/kinetis/teensy-3.x/src/k20_boot.c | 2 +-
boards/arm/kinetis/teensy-3.x/src/k20_i2c.c | 2 +-
boards/arm/kinetis/teensy-3.x/src/k20_pwm.c | 2 +-
boards/arm/kinetis/teensy-3.x/src/k20_spi.c | 2 +-
boards/arm/kinetis/teensy-3.x/src/k20_usbdev.c | 2 +-
boards/arm/kinetis/twr-k60n512/src/k60_boot.c | 2 +-
boards/arm/kinetis/twr-k60n512/src/k60_spi.c | 2 +-
boards/arm/kinetis/twr-k60n512/src/k60_usbdev.c | 2 +-
boards/arm/kinetis/twr-k64f120m/src/k64_boot.c | 2 +-
.../arm/kl/freedom-kl25z/src/kl_boardinitialize.c | 2 +-
boards/arm/kl/freedom-kl25z/src/kl_pwm.c | 2 +-
boards/arm/kl/freedom-kl25z/src/kl_tsi.c | 2 +-
.../arm/kl/freedom-kl26z/src/kl_boardinitialize.c | 2 +-
boards/arm/kl/freedom-kl26z/src/kl_pwm.c | 2 +-
boards/arm/kl/freedom-kl26z/src/kl_tsi.c | 2 +-
boards/arm/kl/teensy-lc/src/kl_boardinitialize.c | 2 +-
boards/arm/kl/teensy-lc/src/kl_pwm.c | 2 +-
.../arm/lc823450/lc823450-xgevk/src/lc823450_adc.c | 2 +-
.../lc823450-xgevk/src/lc823450_autoleds.c | 4 +-
.../arm/lc823450/lc823450-xgevk/src/lc823450_bt.c | 4 +-
.../arm/lc823450/lc823450-xgevk/src/lc823450_mux.c | 4 +-
.../lc823450/lc823450-xgevk/src/lc823450_st7565.c | 2 +-
.../lc823450/lc823450-xgevk/src/lc823450_wm8776.c | 2 +-
.../arm/lpc17xx_40xx/lincoln60/src/lpc17_40_boot.c | 4 +-
.../arm/lpc17xx_40xx/lincoln60/src/lpc17_40_leds.c | 4 +-
.../lpc4088-devkit/src/lpc17_40_autoleds.c | 4 +-
.../lpc4088-devkit/src/lpc17_40_boardinitialize.c | 4 +-
.../lpc4088-devkit/src/lpc17_40_nandinitialize.c | 4 +-
.../lpc4088-devkit/src/lpc17_40_norinitialize.c | 4 +-
.../lpc4088-devkit/src/lpc17_40_sdraminitialize.c | 4 +-
.../lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_ssp.c | 2 +-
.../lpc4088-devkit/src/lpc17_40_userleds.c | 4 +-
.../lpc4088-quickstart/src/lpc17_40_autoleds.c | 4 +-
.../src/lpc17_40_boardinitialize.c | 4 +-
.../src/lpc17_40_nandinitialize.c | 4 +-
.../src/lpc17_40_sdraminitialize.c | 4 +-
.../lpc4088-quickstart/src/lpc17_40_ssp.c | 2 +-
.../lpc4088-quickstart/src/lpc17_40_userleds.c | 4 +-
.../lpcxpresso-lpc1768/src/lpc17_40_adc.c | 2 +-
.../lpcxpresso-lpc1768/src/lpc17_40_boot.c | 4 +-
.../lpcxpresso-lpc1768/src/lpc17_40_dac.c | 4 +-
.../lpcxpresso-lpc1768/src/lpc17_40_leds.c | 4 +-
.../lpcxpresso-lpc1768/src/lpc17_40_pwm.c | 2 +-
.../lpcxpresso-lpc1768/src/lpc17_40_ssp.c | 2 +-
.../lpc17xx_40xx/lx_cpu/src/lpc17_40_autoleds.c | 4 +-
.../lx_cpu/src/lpc17_40_boardinitialize.c | 4 +-
boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_can.c | 2 +-
.../lx_cpu/src/lpc17_40_fpgainitialize.c | 4 +-
.../lx_cpu/src/lpc17_40_sdraminitialize.c | 4 +-
boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ssp.c | 2 +-
boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ulan.c | 4 +-
.../lpc17xx_40xx/lx_cpu/src/lpc17_40_userleds.c | 4 +-
boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_adc.c | 2 +-
boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_boot.c | 4 +-
boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_dac.c | 4 +-
boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_leds.c | 4 +-
boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_pwm.c | 2 +-
boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_adc.c | 2 +-
.../arm/lpc17xx_40xx/mcb1700/src/lpc17_40_boot.c | 4 +-
boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_dac.c | 4 +-
.../arm/lpc17xx_40xx/mcb1700/src/lpc17_40_leds.c | 4 +-
boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_pwm.c | 2 +-
.../olimex-lpc1766stk/src/lpc17_40_boot.c | 4 +-
.../olimex-lpc1766stk/src/lpc17_40_can.c | 2 +-
.../olimex-lpc1766stk/src/lpc17_40_leds.c | 4 +-
.../olimex-lpc1766stk/src/lpc17_40_ssp.c | 2 +-
.../lpc17xx_40xx/open1788/src/lpc17_40_autoleds.c | 4 +-
.../open1788/src/lpc17_40_boardinitialize.c | 4 +-
.../open1788/src/lpc17_40_nandinitialize.c | 4 +-
.../open1788/src/lpc17_40_norinitialize.c | 4 +-
.../open1788/src/lpc17_40_sdraminitialize.c | 4 +-
.../arm/lpc17xx_40xx/open1788/src/lpc17_40_ssp.c | 2 +-
.../lpc17xx_40xx/open1788/src/lpc17_40_userleds.c | 4 +-
.../arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_boot.c | 4 +-
.../arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_leds.c | 4 +-
.../arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_spi.c | 2 +-
.../lpc17xx_40xx/u-blox-c027/src/lpc17_40_adc.c | 2 +-
.../lpc17xx_40xx/u-blox-c027/src/lpc17_40_boot.c | 4 +-
.../lpc17xx_40xx/u-blox-c027/src/lpc17_40_dac.c | 4 +-
.../lpc17xx_40xx/u-blox-c027/src/lpc17_40_leds.c | 4 +-
.../lpc17xx_40xx/u-blox-c027/src/lpc17_40_pwm.c | 2 +-
.../lpc17xx_40xx/u-blox-c027/src/lpc17_40_ssp.c | 2 +-
.../lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_adc.c | 2 +-
.../lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_boot.c | 4 +-
.../zkit-arm-1769/src/lpc17_40_buttons.c | 4 +-
.../lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_can.c | 2 +-
.../lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_dac.c | 4 +-
.../lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_lcd.c | 4 +-
.../lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_leds.c | 4 +-
.../lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_spi.c | 2 +-
.../lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_ssp.c | 2 +-
.../arm/lpc214x/mcu123-lpc214x/src/lpc2148_leds.c | 4 +-
.../arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c | 4 +-
boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c | 4 +-
.../lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c | 2 +-
.../arm/lpc2378/olimex-lpc2378/src/lpc2378_leds.c | 4 +-
boards/arm/lpc31xx/ea3131/src/lpc31_boot.c | 4 +-
boards/arm/lpc31xx/ea3131/src/lpc31_leds.c | 4 +-
boards/arm/lpc31xx/ea3131/src/lpc31_mem.c | 2 +-
boards/arm/lpc31xx/ea3131/src/lpc31_spi.c | 2 +-
boards/arm/lpc31xx/ea3131/src/lpc31_usbhost.c | 2 +-
boards/arm/lpc31xx/ea3152/src/lpc31_boot.c | 4 +-
boards/arm/lpc31xx/ea3152/src/lpc31_leds.c | 4 +-
boards/arm/lpc31xx/ea3152/src/lpc31_mem.c | 2 +-
boards/arm/lpc31xx/ea3152/src/lpc31_spi.c | 2 +-
.../arm/lpc31xx/olimex-lpc-h3131/src/lpc31_boot.c | 4 +-
.../arm/lpc31xx/olimex-lpc-h3131/src/lpc31_leds.c | 4 +-
.../arm/lpc31xx/olimex-lpc-h3131/src/lpc31_mem.c | 2 +-
.../arm/lpc31xx/olimex-lpc-h3131/src/lpc31_spi.c | 2 +-
.../lpc31xx/olimex-lpc-h3131/src/lpc31_usbhost.c | 2 +-
.../arm/lpc43xx/bambino-200e/src/lpc43_autoleds.c | 4 +-
boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c | 4 +-
boards/arm/lpc43xx/bambino-200e/src/lpc43_ostest.c | 4 +-
.../arm/lpc43xx/bambino-200e/src/lpc43_userleds.c | 4 +-
.../lpc43xx/lpc4330-xplorer/src/lpc43_autoleds.c | 4 +-
.../arm/lpc43xx/lpc4330-xplorer/src/lpc43_boot.c | 4 +-
.../arm/lpc43xx/lpc4330-xplorer/src/lpc43_ostest.c | 4 +-
.../lpc43xx/lpc4330-xplorer/src/lpc43_userleds.c | 4 +-
boards/arm/lpc43xx/lpc4337-ws/src/lpc43_adc.c | 2 +-
boards/arm/lpc43xx/lpc4337-ws/src/lpc43_boot.c | 4 +-
.../arm/lpc43xx/lpc4357-evb/src/lpc43_autoleds.c | 4 +-
boards/arm/lpc43xx/lpc4357-evb/src/lpc43_boot.c | 4 +-
boards/arm/lpc43xx/lpc4357-evb/src/lpc43_ostest.c | 4 +-
.../arm/lpc43xx/lpc4357-evb/src/lpc43_userleds.c | 4 +-
boards/arm/lpc43xx/lpc4370-link2/src/lpc43_adc.c | 2 +-
.../arm/lpc43xx/lpc4370-link2/src/lpc43_autoleds.c | 4 +-
boards/arm/lpc43xx/lpc4370-link2/src/lpc43_boot.c | 4 +-
.../arm/lpc43xx/lpc4370-link2/src/lpc43_ostest.c | 4 +-
.../lpc4370-link2/src/lpc43_spifilib_init.c | 4 +-
.../arm/lpc43xx/lpc4370-link2/src/lpc43_userleds.c | 4 +-
.../arm/max326xx/max32660-evsys/src/max326_boot.c | 2 +-
.../arm/max326xx/max32660-evsys/src/max326_spi.c | 2 +-
.../arm/nrf52/nrf52-feather/src/nrf52_autoleds.c | 4 +-
boards/arm/nrf52/nrf52-feather/src/nrf52_boot.c | 4 +-
.../arm/nrf52/nrf52-feather/src/nrf52_userleds.c | 4 +-
boards/arm/nrf52/nrf52832-dk/src/nrf52_autoleds.c | 4 +-
boards/arm/nrf52/nrf52832-dk/src/nrf52_boot.c | 4 +-
boards/arm/nrf52/nrf52832-dk/src/nrf52_userleds.c | 4 +-
boards/arm/nrf52/nrf52840-dk/src/nrf52_autoleds.c | 4 +-
boards/arm/nrf52/nrf52840-dk/src/nrf52_boot.c | 4 +-
boards/arm/nrf52/nrf52840-dk/src/nrf52_spi.c | 2 +-
boards/arm/nrf52/nrf52840-dk/src/nrf52_userleds.c | 4 +-
.../arm/nrf52/nrf52840-dongle/src/nrf52_autoleds.c | 4 +-
boards/arm/nrf52/nrf52840-dongle/src/nrf52_boot.c | 4 +-
.../arm/nrf52/nrf52840-dongle/src/nrf52_userleds.c | 4 +-
.../nuc1xx/nutiny-nuc120/src/nuc_boardinitialize.c | 2 +-
.../rddrone-uavcan144/src/s32k1xx_autoleds.c | 4 +-
.../s32k1xx/rddrone-uavcan144/src/s32k1xx_spi.c | 2 +-
.../rddrone-uavcan144/src/s32k1xx_userleds.c | 4 +-
.../rddrone-uavcan146/src/s32k1xx_autoleds.c | 4 +-
.../s32k1xx/rddrone-uavcan146/src/s32k1xx_spi.c | 2 +-
.../rddrone-uavcan146/src/s32k1xx_userleds.c | 4 +-
.../arm/s32k1xx/s32k118evb/src/s32k1xx_autoleds.c | 4 +-
.../arm/s32k1xx/s32k118evb/src/s32k1xx_userleds.c | 4 +-
.../arm/s32k1xx/s32k144evb/src/s32k1xx_autoleds.c | 4 +-
boards/arm/s32k1xx/s32k144evb/src/s32k1xx_spi.c | 2 +-
.../arm/s32k1xx/s32k144evb/src/s32k1xx_userleds.c | 4 +-
.../arm/s32k1xx/s32k146evb/src/s32k1xx_autoleds.c | 4 +-
boards/arm/s32k1xx/s32k146evb/src/s32k1xx_spi.c | 2 +-
.../arm/s32k1xx/s32k146evb/src/s32k1xx_userleds.c | 4 +-
.../arm/s32k1xx/s32k148evb/src/s32k1xx_autoleds.c | 4 +-
.../arm/s32k1xx/s32k148evb/src/s32k1xx_userleds.c | 4 +-
boards/arm/sam34/arduino-due/src/sam_mmcsd.c | 2 +-
boards/arm/sam34/arduino-due/src/sam_touchscreen.c | 2 +-
boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c | 2 +-
boards/arm/sam34/sam3u-ek/src/sam_boot.c | 2 +-
boards/arm/sam34/sam3u-ek/src/sam_lcd.c | 2 +-
boards/arm/sam34/sam3u-ek/src/sam_leds.c | 4 +-
boards/arm/sam34/sam3u-ek/src/sam_spi.c | 2 +-
boards/arm/sam34/sam3u-ek/src/sam_usbdev.c | 2 +-
boards/arm/sam34/sam4e-ek/src/sam_boot.c | 2 +-
boards/arm/sam34/sam4e-ek/src/sam_ili9325.c | 2 +-
boards/arm/sam34/sam4e-ek/src/sam_ili9341.c | 2 +-
boards/arm/sam34/sam4e-ek/src/sam_leds.c | 4 +-
boards/arm/sam34/sam4e-ek/src/sam_spi.c | 2 +-
boards/arm/sam34/sam4e-ek/src/sam_udp.c | 2 +-
boards/arm/sam34/sam4l-xplained/src/sam_slcd.c | 2 +-
boards/arm/sam34/sam4s-xplained-pro/src/sam_udp.c | 2 +-
boards/arm/sam34/sam4s-xplained/src/sam_sram.c | 2 +-
boards/arm/sama5/sama5d2-xult/src/sam_can.c | 2 +-
boards/arm/sama5/sama5d2-xult/src/sam_nandflash.c | 2 +-
boards/arm/sama5/sama5d2-xult/src/sam_ostest.c | 4 +-
boards/arm/sama5/sama5d2-xult/src/sam_sdram.c | 2 +-
boards/arm/sama5/sama5d2-xult/src/sam_spi.c | 2 +-
boards/arm/sama5/sama5d2-xult/src/sam_usb.c | 2 +-
boards/arm/sama5/sama5d3-xplained/src/sam_can.c | 2 +-
.../arm/sama5/sama5d3-xplained/src/sam_nandflash.c | 2 +-
boards/arm/sama5/sama5d3-xplained/src/sam_ostest.c | 4 +-
boards/arm/sama5/sama5d3-xplained/src/sam_sdram.c | 2 +-
boards/arm/sama5/sama5d3-xplained/src/sam_spi.c | 2 +-
boards/arm/sama5/sama5d3-xplained/src/sam_usb.c | 2 +-
boards/arm/sama5/sama5d3x-ek/src/nor_main.c | 2 +-
boards/arm/sama5/sama5d3x-ek/src/sam_can.c | 2 +-
boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c | 2 +-
boards/arm/sama5/sama5d3x-ek/src/sam_norflash.c | 2 +-
boards/arm/sama5/sama5d3x-ek/src/sam_ostest.c | 4 +-
boards/arm/sama5/sama5d3x-ek/src/sam_ov2640.c | 2 +-
boards/arm/sama5/sama5d3x-ek/src/sam_sdram.c | 2 +-
boards/arm/sama5/sama5d3x-ek/src/sam_spi.c | 2 +-
boards/arm/sama5/sama5d3x-ek/src/sam_usb.c | 2 +-
boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c | 2 +-
boards/arm/sama5/sama5d4-ek/src/dram_main.c | 2 +-
boards/arm/sama5/sama5d4-ek/src/sam_maxtouch.c | 2 +-
boards/arm/sama5/sama5d4-ek/src/sam_nandflash.c | 2 +-
boards/arm/sama5/sama5d4-ek/src/sam_ostest.c | 4 +-
boards/arm/sama5/sama5d4-ek/src/sam_sdram.c | 2 +-
boards/arm/sama5/sama5d4-ek/src/sam_spi.c | 2 +-
boards/arm/sama5/sama5d4-ek/src/sam_usb.c | 2 +-
boards/arm/sama5/sama5d4-ek/src/sam_wm8904.c | 2 +-
boards/arm/samd5e5/metro-m4/src/sam_autoleds.c | 4 +-
boards/arm/samd5e5/metro-m4/src/sam_userleds.c | 2 +-
.../samd5e5/same54-xplained-pro/src/sam_autoleds.c | 4 +-
.../samd5e5/same54-xplained-pro/src/sam_userleds.c | 2 +-
boards/arm/samv7/same70-xplained/src/sam_boot.c | 2 +-
boards/arm/samv7/same70-xplained/src/sam_buttons.c | 2 +-
boards/arm/samv7/same70-xplained/src/sam_dac.c | 2 +-
boards/arm/samv7/same70-xplained/src/sam_sdram.c | 2 +-
boards/arm/samv7/same70-xplained/src/sam_spi.c | 2 +-
boards/arm/samv7/same70-xplained/src/sam_usbdev.c | 2 +-
boards/arm/samv7/samv71-xult/src/sam_boot.c | 2 +-
boards/arm/samv7/samv71-xult/src/sam_buttons.c | 2 +-
boards/arm/samv7/samv71-xult/src/sam_ili9488.c | 2 +-
boards/arm/samv7/samv71-xult/src/sam_maxtouch.c | 2 +-
boards/arm/samv7/samv71-xult/src/sam_sdram.c | 2 +-
boards/arm/samv7/samv71-xult/src/sam_spi.c | 2 +-
boards/arm/samv7/samv71-xult/src/sam_usbdev.c | 2 +-
boards/arm/samv7/samv71-xult/src/sam_wm8904.c | 2 +-
boards/arm/stm32/axoloti/src/stm32_boot.c | 2 +-
boards/arm/stm32/axoloti/src/stm32_extmem.c | 2 +-
boards/arm/stm32/axoloti/src/stm32_usbhost.c | 2 +-
boards/arm/stm32/axoloti/src/stm32_userleds.c | 4 +-
boards/arm/stm32/clicker2-stm32/src/stm32_spi.c | 2 +-
boards/arm/stm32/cloudctrl/src/stm32_adc.c | 2 +-
boards/arm/stm32/cloudctrl/src/stm32_autoleds.c | 4 +-
boards/arm/stm32/cloudctrl/src/stm32_boot.c | 2 +-
boards/arm/stm32/cloudctrl/src/stm32_chipid.c | 2 +-
boards/arm/stm32/cloudctrl/src/stm32_spi.c | 2 +-
boards/arm/stm32/cloudctrl/src/stm32_usb.c | 2 +-
boards/arm/stm32/cloudctrl/src/stm32_userleds.c | 4 +-
boards/arm/stm32/fire-stm32v2/src/stm32_autoleds.c | 4 +-
boards/arm/stm32/fire-stm32v2/src/stm32_boot.c | 2 +-
boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c | 4 +-
.../arm/stm32/fire-stm32v2/src/stm32_selectlcd.c | 2 +-
boards/arm/stm32/fire-stm32v2/src/stm32_spi.c | 2 +-
boards/arm/stm32/fire-stm32v2/src/stm32_usbdev.c | 2 +-
boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c | 4 +-
boards/arm/stm32/hymini-stm32v/src/stm32_boot.c | 2 +-
boards/arm/stm32/hymini-stm32v/src/stm32_leds.c | 4 +-
boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c | 2 +-
boards/arm/stm32/hymini-stm32v/src/stm32_spi.c | 2 +-
boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c | 2 +-
boards/arm/stm32/hymini-stm32v/src/stm32_usbdev.c | 2 +-
boards/arm/stm32/maple/src/stm32_boot.c | 2 +-
boards/arm/stm32/maple/src/stm32_lcd.c | 4 +-
boards/arm/stm32/maple/src/stm32_leds.c | 4 +-
boards/arm/stm32/maple/src/stm32_spi.c | 2 +-
boards/arm/stm32/maple/src/stm32_usbdev.c | 2 +-
boards/arm/stm32/mikroe-stm32f4/src/stm32_boot.c | 2 +-
.../stm32/mikroe-stm32f4/src/stm32_clockconfig.c | 2 +-
boards/arm/stm32/mikroe-stm32f4/src/stm32_extmem.c | 2 +-
boards/arm/stm32/mikroe-stm32f4/src/stm32_idle.c | 2 +-
.../arm/stm32/mikroe-stm32f4/src/stm32_mio283qt2.c | 2 +-
.../stm32/mikroe-stm32f4/src/stm32_mio283qt9a.c | 2 +-
boards/arm/stm32/mikroe-stm32f4/src/stm32_pm.c | 2 +-
boards/arm/stm32/mikroe-stm32f4/src/stm32_pwm.c | 2 +-
.../arm/stm32/mikroe-stm32f4/src/stm32_qencoder.c | 2 +-
boards/arm/stm32/mikroe-stm32f4/src/stm32_spi.c | 2 +-
.../stm32/mikroe-stm32f4/src/stm32_touchscreen.c | 4 +-
boards/arm/stm32/mikroe-stm32f4/src/stm32_usb.c | 2 +-
boards/arm/stm32/mikroe-stm32f4/src/stm32_vs1053.c | 2 +-
boards/arm/stm32/nucleo-f103rb/src/stm32_pwm.c | 2 +-
boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c | 2 +-
boards/arm/stm32/nucleo-f207zg/src/stm32_pwm.c | 2 +-
boards/arm/stm32/nucleo-f207zg/src/stm32_usb.c | 2 +-
boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c | 2 +-
boards/arm/stm32/nucleo-f302r8/src/stm32_pwm.c | 2 +-
boards/arm/stm32/nucleo-f303re/src/stm32_spi.c | 2 +-
boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c | 2 +-
boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c | 2 +-
boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c | 2 +-
boards/arm/stm32/nucleo-f410rb/src/stm32_adc.c | 2 +-
.../arm/stm32/nucleo-f410rb/src/stm32_autoleds.c | 4 +-
boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c | 2 +-
.../arm/stm32/nucleo-f410rb/src/stm32_userleds.c | 4 +-
boards/arm/stm32/nucleo-f429zi/src/stm32_bbsram.c | 2 +-
boards/arm/stm32/nucleo-f429zi/src/stm32_boot.c | 2 +-
boards/arm/stm32/nucleo-f429zi/src/stm32_pwm.c | 2 +-
boards/arm/stm32/nucleo-f429zi/src/stm32_spi.c | 2 +-
boards/arm/stm32/nucleo-f429zi/src/stm32_usb.c | 2 +-
boards/arm/stm32/nucleo-f446re/src/stm32_adc.c | 2 +-
.../arm/stm32/nucleo-f446re/src/stm32_autoleds.c | 4 +-
boards/arm/stm32/nucleo-f446re/src/stm32_boot.c | 2 +-
.../arm/stm32/nucleo-f446re/src/stm32_qencoder.c | 2 +-
boards/arm/stm32/nucleo-f446re/src/stm32_spi.c | 2 +-
.../arm/stm32/nucleo-f446re/src/stm32_userleds.c | 4 +-
boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c | 2 +-
.../arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c | 4 +-
boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c | 2 +-
.../arm/stm32/nucleo-f4x1re/src/stm32_qencoder.c | 2 +-
boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c | 2 +-
.../arm/stm32/nucleo-f4x1re/src/stm32_userleds.c | 4 +-
.../stm32/olimex-stm32-e407/src/stm32_autoleds.c | 4 +-
.../arm/stm32/olimex-stm32-e407/src/stm32_boot.c | 2 +-
boards/arm/stm32/olimex-stm32-e407/src/stm32_spi.c | 2 +-
boards/arm/stm32/olimex-stm32-e407/src/stm32_usb.c | 2 +-
.../stm32/olimex-stm32-e407/src/stm32_userleds.c | 4 +-
.../stm32/olimex-stm32-h407/src/stm32_autoleds.c | 4 +-
.../arm/stm32/olimex-stm32-h407/src/stm32_boot.c | 2 +-
boards/arm/stm32/olimex-stm32-h407/src/stm32_usb.c | 2 +-
.../stm32/olimex-stm32-h407/src/stm32_userleds.c | 4 +-
.../arm/stm32/olimex-stm32-p107/src/stm32_boot.c | 2 +-
boards/arm/stm32/olimex-stm32-p107/src/stm32_can.c | 2 +-
.../stm32/olimex-stm32-p107/src/stm32_encx24j600.c | 4 +-
boards/arm/stm32/olimex-stm32-p107/src/stm32_spi.c | 2 +-
.../arm/stm32/olimex-stm32-p407/src/stm32_sram.c | 2 +-
boards/arm/stm32/olimex-stm32-p407/src/stm32_usb.c | 2 +-
boards/arm/stm32/olimexino-stm32/src/stm32_can.c | 2 +-
boards/arm/stm32/omnibusf4/src/stm32_boot.c | 2 +-
boards/arm/stm32/omnibusf4/src/stm32_critmon.c | 2 +-
boards/arm/stm32/omnibusf4/src/stm32_idle.c | 2 +-
boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c | 2 +-
boards/arm/stm32/omnibusf4/src/stm32_ostest.c | 4 +-
boards/arm/stm32/omnibusf4/src/stm32_pm.c | 2 +-
boards/arm/stm32/omnibusf4/src/stm32_pwm.c | 2 +-
boards/arm/stm32/omnibusf4/src/stm32_spi.c | 2 +-
boards/arm/stm32/omnibusf4/src/stm32_usb.c | 2 +-
boards/arm/stm32/omnibusf4/src/stm32_userleds.c | 4 +-
boards/arm/stm32/photon/src/stm32_boot.c | 2 +-
boards/arm/stm32/photon/src/stm32_rgbled.c | 2 +-
boards/arm/stm32/photon/src/stm32_spi.c | 2 +-
boards/arm/stm32/shenzhou/src/stm32_adc.c | 2 +-
boards/arm/stm32/shenzhou/src/stm32_autoleds.c | 4 +-
boards/arm/stm32/shenzhou/src/stm32_boot.c | 2 +-
boards/arm/stm32/shenzhou/src/stm32_can.c | 2 +-
boards/arm/stm32/shenzhou/src/stm32_chipid.c | 2 +-
boards/arm/stm32/shenzhou/src/stm32_ili93xx.c | 2 +-
boards/arm/stm32/shenzhou/src/stm32_spi.c | 2 +-
boards/arm/stm32/shenzhou/src/stm32_ssd1289.c | 2 +-
boards/arm/stm32/shenzhou/src/stm32_usb.c | 2 +-
boards/arm/stm32/shenzhou/src/stm32_userleds.c | 4 +-
boards/arm/stm32/stm3210e-eval/src/stm32_adc.c | 2 +-
boards/arm/stm32/stm3210e-eval/src/stm32_boot.c | 2 +-
boards/arm/stm32/stm3210e-eval/src/stm32_can.c | 2 +-
.../stm32/stm3210e-eval/src/stm32_deselectlcd.c | 2 +-
.../stm32/stm3210e-eval/src/stm32_deselectnor.c | 2 +-
.../stm32/stm3210e-eval/src/stm32_deselectsram.c | 2 +-
.../arm/stm32/stm3210e-eval/src/stm32_extcontext.c | 2 +-
boards/arm/stm32/stm3210e-eval/src/stm32_extmem.c | 2 +-
boards/arm/stm32/stm3210e-eval/src/stm32_idle.c | 2 +-
boards/arm/stm32/stm3210e-eval/src/stm32_lcd.c | 2 +-
boards/arm/stm32/stm3210e-eval/src/stm32_leds.c | 4 +-
boards/arm/stm32/stm3210e-eval/src/stm32_pm.c | 2 +-
.../arm/stm32/stm3210e-eval/src/stm32_pmbuttons.c | 2 +-
.../arm/stm32/stm3210e-eval/src/stm32_selectlcd.c | 2 +-
.../arm/stm32/stm3210e-eval/src/stm32_selectnor.c | 2 +-
.../arm/stm32/stm3210e-eval/src/stm32_selectsram.c | 2 +-
boards/arm/stm32/stm3210e-eval/src/stm32_spi.c | 2 +-
boards/arm/stm32/stm3210e-eval/src/stm32_usbdev.c | 2 +-
boards/arm/stm32/stm3220g-eval/src/stm32_adc.c | 2 +-
.../arm/stm32/stm3220g-eval/src/stm32_autoleds.c | 4 +-
boards/arm/stm32/stm3220g-eval/src/stm32_boot.c | 2 +-
boards/arm/stm32/stm3220g-eval/src/stm32_can.c | 2 +-
.../stm32/stm3220g-eval/src/stm32_deselectlcd.c | 2 +-
.../stm32/stm3220g-eval/src/stm32_deselectsram.c | 2 +-
boards/arm/stm32/stm3220g-eval/src/stm32_extmem.c | 2 +-
boards/arm/stm32/stm3220g-eval/src/stm32_lcd.c | 2 +-
boards/arm/stm32/stm3220g-eval/src/stm32_pwm.c | 2 +-
.../arm/stm32/stm3220g-eval/src/stm32_selectlcd.c | 2 +-
.../arm/stm32/stm3220g-eval/src/stm32_selectsram.c | 2 +-
boards/arm/stm32/stm3220g-eval/src/stm32_spi.c | 2 +-
boards/arm/stm32/stm3220g-eval/src/stm32_usb.c | 2 +-
.../arm/stm32/stm3220g-eval/src/stm32_userleds.c | 4 +-
boards/arm/stm32/stm3240g-eval/src/stm32_adc.c | 2 +-
.../arm/stm32/stm3240g-eval/src/stm32_autoleds.c | 4 +-
boards/arm/stm32/stm3240g-eval/src/stm32_can.c | 2 +-
.../stm32/stm3240g-eval/src/stm32_deselectlcd.c | 2 +-
.../stm32/stm3240g-eval/src/stm32_deselectsram.c | 2 +-
boards/arm/stm32/stm3240g-eval/src/stm32_extmem.c | 2 +-
boards/arm/stm32/stm3240g-eval/src/stm32_lcd.c | 2 +-
boards/arm/stm32/stm3240g-eval/src/stm32_ostest.c | 4 +-
boards/arm/stm32/stm3240g-eval/src/stm32_pwm.c | 2 +-
.../arm/stm32/stm3240g-eval/src/stm32_selectlcd.c | 2 +-
.../arm/stm32/stm3240g-eval/src/stm32_selectsram.c | 2 +-
boards/arm/stm32/stm3240g-eval/src/stm32_spi.c | 2 +-
boards/arm/stm32/stm3240g-eval/src/stm32_usb.c | 2 +-
.../arm/stm32/stm3240g-eval/src/stm32_userleds.c | 4 +-
boards/arm/stm32/stm32_tiny/src/stm32_boot.c | 2 +-
boards/arm/stm32/stm32_tiny/src/stm32_leds.c | 4 +-
boards/arm/stm32/stm32_tiny/src/stm32_nrf24l01.c | 2 +-
boards/arm/stm32/stm32_tiny/src/stm32_pwm.c | 2 +-
boards/arm/stm32/stm32_tiny/src/stm32_spi.c | 2 +-
boards/arm/stm32/stm32_tiny/src/stm32_usbdev.c | 2 +-
.../stm32/stm32f103-minimum/src/stm32_autoleds.c | 4 +-
.../arm/stm32/stm32f103-minimum/src/stm32_boot.c | 2 +-
boards/arm/stm32/stm32f103-minimum/src/stm32_lcd.c | 4 +-
.../stm32/stm32f103-minimum/src/stm32_nrf24l01.c | 2 +-
boards/arm/stm32/stm32f103-minimum/src/stm32_pwm.c | 2 +-
.../stm32/stm32f103-minimum/src/stm32_qencoder.c | 2 +-
.../arm/stm32/stm32f103-minimum/src/stm32_rgbled.c | 2 +-
boards/arm/stm32/stm32f103-minimum/src/stm32_spi.c | 2 +-
.../arm/stm32/stm32f103-minimum/src/stm32_tone.c | 2 +-
.../arm/stm32/stm32f103-minimum/src/stm32_usbdev.c | 2 +-
boards/arm/stm32/stm32f334-disco/src/stm32_smps.c | 2 +-
boards/arm/stm32/stm32f3discovery/src/stm32_boot.c | 2 +-
boards/arm/stm32/stm32f3discovery/src/stm32_pwm.c | 2 +-
.../stm32/stm32f3discovery/src/stm32_qencoder.c | 2 +-
boards/arm/stm32/stm32f3discovery/src/stm32_spi.c | 2 +-
boards/arm/stm32/stm32f3discovery/src/stm32_usb.c | 2 +-
boards/arm/stm32/stm32f411e-disco/src/stm32_boot.c | 2 +-
boards/arm/stm32/stm32f411e-disco/src/stm32_usb.c | 2 +-
.../stm32/stm32f429i-disco/src/stm32_autoleds.c | 4 +-
boards/arm/stm32/stm32f429i-disco/src/stm32_boot.c | 2 +-
.../arm/stm32/stm32f429i-disco/src/stm32_extmem.c | 2 +-
.../arm/stm32/stm32f429i-disco/src/stm32_highpri.c | 2 +-
boards/arm/stm32/stm32f429i-disco/src/stm32_idle.c | 2 +-
boards/arm/stm32/stm32f429i-disco/src/stm32_lcd.c | 2 +-
.../arm/stm32/stm32f429i-disco/src/stm32_ostest.c | 4 +-
boards/arm/stm32/stm32f429i-disco/src/stm32_pwm.c | 2 +-
boards/arm/stm32/stm32f429i-disco/src/stm32_spi.c | 2 +-
boards/arm/stm32/stm32f429i-disco/src/stm32_usb.c | 2 +-
.../stm32/stm32f429i-disco/src/stm32_userleds.c | 4 +-
.../stm32/stm32f4discovery/src/stm32_autoleds.c | 4 +-
boards/arm/stm32/stm32f4discovery/src/stm32_boot.c | 2 +-
boards/arm/stm32/stm32f4discovery/src/stm32_can.c | 2 +-
.../arm/stm32/stm32f4discovery/src/stm32_critmon.c | 2 +-
.../stm32/stm32f4discovery/src/stm32_enc28j60.c | 4 +-
.../arm/stm32/stm32f4discovery/src/stm32_extmem.c | 2 +-
.../arm/stm32/stm32f4discovery/src/stm32_gs2200m.c | 2 +-
boards/arm/stm32/stm32f4discovery/src/stm32_idle.c | 2 +-
.../arm/stm32/stm32f4discovery/src/stm32_mmcsd.c | 2 +-
.../arm/stm32/stm32f4discovery/src/stm32_ostest.c | 4 +-
boards/arm/stm32/stm32f4discovery/src/stm32_pm.c | 2 +-
.../stm32/stm32f4discovery/src/stm32_pmbuttons.c | 2 +-
boards/arm/stm32/stm32f4discovery/src/stm32_pwm.c | 2 +-
.../stm32/stm32f4discovery/src/stm32_qencoder.c | 2 +-
.../arm/stm32/stm32f4discovery/src/stm32_rgbled.c | 2 +-
boards/arm/stm32/stm32f4discovery/src/stm32_spi.c | 2 +-
.../arm/stm32/stm32f4discovery/src/stm32_ssd1289.c | 2 +-
.../arm/stm32/stm32f4discovery/src/stm32_st7567.c | 4 +-
boards/arm/stm32/stm32f4discovery/src/stm32_usb.c | 2 +-
.../stm32/stm32f4discovery/src/stm32_userleds.c | 4 +-
boards/arm/stm32/stm32ldiscovery/src/stm32_boot.c | 2 +-
boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c | 2 +-
boards/arm/stm32/stm32ldiscovery/src/stm32_pwm.c | 2 +-
.../arm/stm32/stm32ldiscovery/src/stm32_qencoder.c | 2 +-
boards/arm/stm32/stm32ldiscovery/src/stm32_spi.c | 2 +-
boards/arm/stm32/stm32vldiscovery/src/stm32_boot.c | 2 +-
boards/arm/stm32/stm32vldiscovery/src/stm32_leds.c | 4 +-
.../stm32/viewtool-stm32f107/src/stm32_ads7843e.c | 2 +-
.../arm/stm32/viewtool-stm32f107/src/stm32_boot.c | 2 +-
.../arm/stm32/viewtool-stm32f107/src/stm32_can.c | 2 +-
.../arm/stm32/viewtool-stm32f107/src/stm32_ft80x.c | 2 +-
.../stm32/viewtool-stm32f107/src/stm32_highpri.c | 2 +-
.../stm32/viewtool-stm32f107/src/stm32_max3421e.c | 2 +-
.../arm/stm32/viewtool-stm32f107/src/stm32_spi.c | 2 +-
.../stm32/viewtool-stm32f107/src/stm32_ssd1289.c | 2 +-
.../arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_spi.c | 2 +-
.../stm32f0l0g0/nucleo-f072rb/src/stm32_autoleds.c | 4 +-
.../arm/stm32f0l0g0/nucleo-f072rb/src/stm32_boot.c | 2 +-
.../stm32f0l0g0/nucleo-f072rb/src/stm32_userleds.c | 4 +-
.../stm32f0l0g0/nucleo-f091rc/src/stm32_autoleds.c | 4 +-
.../arm/stm32f0l0g0/nucleo-f091rc/src/stm32_boot.c | 2 +-
.../arm/stm32f0l0g0/nucleo-f091rc/src/stm32_spi.c | 2 +-
.../stm32f0l0g0/nucleo-f091rc/src/stm32_userleds.c | 4 +-
.../stm32f0l0g0/nucleo-l073rz/src/stm32_nrf24l01.c | 2 +-
.../arm/stm32f0l0g0/nucleo-l073rz/src/stm32_spi.c | 2 +-
.../stm32f051-discovery/src/stm32_boot.c | 2 +-
.../stm32f072-discovery/src/stm32_boot.c | 2 +-
boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c | 2 +-
boards/arm/stm32f7/nucleo-144/src/stm32_boot.c | 2 +-
boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c | 2 +-
boards/arm/stm32f7/nucleo-144/src/stm32_spi.c | 2 +-
boards/arm/stm32f7/nucleo-144/src/stm32_usb.c | 2 +-
boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c | 2 +-
boards/arm/stm32f7/stm32f746-ws/src/stm32_spi.c | 2 +-
boards/arm/stm32f7/stm32f746-ws/src/stm32_usb.c | 2 +-
.../arm/stm32f7/stm32f746g-disco/src/stm32_boot.c | 2 +-
.../stm32f7/stm32f746g-disco/src/stm32_extmem.c | 2 +-
.../arm/stm32f7/stm32f746g-disco/src/stm32_lcd.c | 2 +-
.../stm32f7/stm32f746g-disco/src/stm32_ostest.c | 4 +-
.../arm/stm32f7/stm32f746g-disco/src/stm32_spi.c | 2 +-
.../arm/stm32f7/stm32f769i-disco/src/stm32_boot.c | 2 +-
.../stm32f7/stm32f769i-disco/src/stm32_ostest.c | 4 +-
.../arm/stm32f7/stm32f769i-disco/src/stm32_pwm.c | 2 +-
.../arm/stm32f7/stm32f769i-disco/src/stm32_spi.c | 2 +-
boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c | 2 +-
.../arm/stm32h7/nucleo-h743zi/src/stm32_nrf24l01.c | 2 +-
boards/arm/stm32h7/nucleo-h743zi/src/stm32_pwm.c | 2 +-
boards/arm/stm32h7/nucleo-h743zi/src/stm32_spi.c | 2 +-
boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c | 2 +-
.../arm/stm32h7/stm32h747i-disco/src/stm32_boot.c | 2 +-
.../arm/stm32h7/stm32h747i-disco/src/stm32_spi.c | 2 +-
.../arm/stm32h7/stm32h747i-disco/src/stm32_usb.c | 2 +-
boards/arm/stm32l4/b-l475e-iot01a/src/stm32_boot.c | 2 +-
boards/arm/stm32l4/nucleo-l432kc/src/stm32_adc.c | 2 +-
.../arm/stm32l4/nucleo-l432kc/src/stm32_autoleds.c | 4 +-
boards/arm/stm32l4/nucleo-l432kc/src/stm32_boot.c | 2 +-
boards/arm/stm32l4/nucleo-l432kc/src/stm32_pwm.c | 2 +-
.../arm/stm32l4/nucleo-l432kc/src/stm32_qencoder.c | 2 +-
boards/arm/stm32l4/nucleo-l432kc/src/stm32_spi.c | 2 +-
boards/arm/stm32l4/nucleo-l432kc/src/stm32_spwm.c | 2 +-
.../arm/stm32l4/nucleo-l432kc/src/stm32_userleds.c | 4 +-
.../arm/stm32l4/nucleo-l452re/src/stm32_autoleds.c | 4 +-
boards/arm/stm32l4/nucleo-l452re/src/stm32_boot.c | 2 +-
boards/arm/stm32l4/nucleo-l452re/src/stm32_spi.c | 2 +-
.../arm/stm32l4/nucleo-l452re/src/stm32_userleds.c | 4 +-
boards/arm/stm32l4/nucleo-l476rg/src/stm32_adc.c | 2 +-
.../arm/stm32l4/nucleo-l476rg/src/stm32_autoleds.c | 4 +-
boards/arm/stm32l4/nucleo-l476rg/src/stm32_boot.c | 2 +-
boards/arm/stm32l4/nucleo-l476rg/src/stm32_pwm.c | 2 +-
.../arm/stm32l4/nucleo-l476rg/src/stm32_qencoder.c | 2 +-
boards/arm/stm32l4/nucleo-l476rg/src/stm32_spi.c | 2 +-
.../arm/stm32l4/nucleo-l476rg/src/stm32_userleds.c | 4 +-
boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c | 2 +-
boards/arm/stm32l4/nucleo-l496zg/src/stm32_spi.c | 2 +-
boards/arm/stm32l4/nucleo-l496zg/src/stm32_usb.c | 2 +-
boards/arm/stm32l4/stm32l476-mdk/src/stm32_boot.c | 2 +-
.../stm32l4/stm32l476-mdk/src/stm32_clockconfig.c | 2 +-
boards/arm/stm32l4/stm32l476-mdk/src/stm32_spi.c | 2 +-
.../stm32l4/stm32l476vg-disco/src/stm32_autoleds.c | 4 +-
.../arm/stm32l4/stm32l476vg-disco/src/stm32_boot.c | 2 +-
.../stm32l476vg-disco/src/stm32_clockconfig.c | 2 +-
.../arm/stm32l4/stm32l476vg-disco/src/stm32_spi.c | 2 +-
.../arm/stm32l4/stm32l476vg-disco/src/stm32_usb.c | 2 +-
.../stm32l4/stm32l476vg-disco/src/stm32_userleds.c | 4 +-
.../stm32l4/stm32l4r9ai-disco/src/stm32_autoleds.c | 4 +-
.../arm/stm32l4/stm32l4r9ai-disco/src/stm32_boot.c | 2 +-
.../stm32l4r9ai-disco/src/stm32_clockconfig.c | 2 +-
.../arm/stm32l4/stm32l4r9ai-disco/src/stm32_spi.c | 2 +-
.../arm/stm32l4/stm32l4r9ai-disco/src/stm32_usb.c | 2 +-
.../stm32l4/stm32l4r9ai-disco/src/stm32_userleds.c | 4 +-
.../arm/str71x/olimex-strp711/src/str71_buttons.c | 4 +-
.../arm/str71x/olimex-strp711/src/str71_enc28j60.c | 4 +-
boards/arm/str71x/olimex-strp711/src/str71_leds.c | 4 +-
boards/arm/str71x/olimex-strp711/src/str71_spi.c | 4 +-
boards/arm/tiva/dk-tm4c129x/src/tm4c_boot.c | 4 +-
boards/arm/tiva/dk-tm4c129x/src/tm4c_ethernet.c | 2 +-
boards/arm/tiva/dk-tm4c129x/src/tm4c_ssi.c | 2 +-
boards/arm/tiva/eagle100/src/lm_boot.c | 2 +-
boards/arm/tiva/eagle100/src/lm_ethernet.c | 2 +-
boards/arm/tiva/eagle100/src/lm_leds.c | 4 +-
boards/arm/tiva/eagle100/src/lm_ssi.c | 2 +-
boards/arm/tiva/ekk-lm3s9b96/src/lm_boot.c | 4 +-
boards/arm/tiva/ekk-lm3s9b96/src/lm_ethernet.c | 2 +-
boards/arm/tiva/ekk-lm3s9b96/src/lm_leds.c | 4 +-
boards/arm/tiva/ekk-lm3s9b96/src/lm_ssi.c | 2 +-
boards/arm/tiva/launchxl-cc1310/src/cc1310_boot.c | 2 +-
boards/arm/tiva/launchxl-cc1310/src/cc1310_ssi.c | 2 +-
.../arm/tiva/launchxl-cc1312r1/src/cc1312_boot.c | 2 +-
boards/arm/tiva/launchxl-cc1312r1/src/cc1312_ssi.c | 2 +-
boards/arm/tiva/lm3s6432-s2e/src/lm_boot.c | 4 +-
boards/arm/tiva/lm3s6432-s2e/src/lm_ethernet.c | 2 +-
boards/arm/tiva/lm3s6432-s2e/src/lm_leds.c | 4 +-
boards/arm/tiva/lm3s6432-s2e/src/lm_ssi.c | 2 +-
boards/arm/tiva/lm3s6965-ek/src/lm_boot.c | 4 +-
boards/arm/tiva/lm3s6965-ek/src/lm_ethernet.c | 2 +-
boards/arm/tiva/lm3s6965-ek/src/lm_leds.c | 4 +-
boards/arm/tiva/lm3s6965-ek/src/lm_ssi.c | 2 +-
boards/arm/tiva/lm3s8962-ek/src/lm_boot.c | 4 +-
boards/arm/tiva/lm3s8962-ek/src/lm_ethernet.c | 2 +-
boards/arm/tiva/lm3s8962-ek/src/lm_leds.c | 4 +-
boards/arm/tiva/lm3s8962-ek/src/lm_ssi.c | 2 +-
.../arm/tiva/lm4f120-launchpad/src/lm4f_autoleds.c | 4 +-
boards/arm/tiva/lm4f120-launchpad/src/lm4f_boot.c | 4 +-
boards/arm/tiva/lm4f120-launchpad/src/lm4f_ssi.c | 2 +-
.../tiva/tm4c123g-launchpad/src/tm4c_autoleds.c | 4 +-
boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c | 4 +-
boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c | 2 +-
boards/arm/tiva/tm4c1294-launchpad/src/tm4c_boot.c | 4 +-
.../tiva/tm4c1294-launchpad/src/tm4c_ethernet.c | 2 +-
.../tms570/launchxl-tms57004/src/tms570_buttons.c | 2 +-
.../tms570ls31x-usb-kit/src/tms570_buttons.c | 2 +-
.../tms570/tms570ls31x-usb-kit/src/tms570_spi.c | 2 +-
boards/arm/xmc4/xmc4500-relax/src/xmc4_ostest.c | 4 +-
boards/arm/xmc4/xmc4700-relax/src/xmc4_ostest.c | 4 +-
1682 files changed, 2414 insertions(+), 2521 deletions(-)
diff --git a/arch/arm/src/a1x/a1x_boot.c b/arch/arm/src/a1x/a1x_boot.c
index 2c9163d..98de495 100644
--- a/arch/arm/src/a1x/a1x_boot.c
+++ b/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"
diff --git a/arch/arm/src/a1x/a1x_irq.c b/arch/arm/src/a1x/a1x_irq.c
index 6657fa7..10c2549 100644
--- a/arch/arm/src/a1x/a1x_irq.c
+++ b/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"
diff --git a/arch/arm/src/a1x/a1x_lowputc.c b/arch/arm/src/a1x/a1x_lowputc.c
index b5ad098..c69318c 100644
--- a/arch/arm/src/a1x/a1x_lowputc.c
+++ b/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"
diff --git a/arch/arm/src/a1x/a1x_pio.c b/arch/arm/src/a1x/a1x_pio.c
index 2ffcb7a..8f86e8a 100644
--- a/arch/arm/src/a1x/a1x_pio.c
+++ b/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"
diff --git a/arch/arm/src/a1x/a1x_serial.c b/arch/arm/src/a1x/a1x_serial.c
index f8bf68b..18f6ddb 100644
--- a/arch/arm/src/a1x/a1x_serial.c
+++ b/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"
diff --git a/arch/arm/src/a1x/a1x_timerisr.c b/arch/arm/src/a1x/a1x_timerisr.c
index 9382fa8..f8d47e5 100644
--- a/arch/arm/src/a1x/a1x_timerisr.c
+++ b/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"
/****************************************************************************
diff --git a/arch/arm/src/am335x/am335x_boot.c b/arch/arm/src/am335x/am335x_boot.c
index 14e5159..0ee70d4 100644
--- a/arch/arm/src/am335x/am335x_boot.c
+++ b/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"
diff --git a/arch/arm/src/am335x/am335x_can.c b/arch/arm/src/am335x/am335x_can.c
index 2af7c9e..fc35e6c 100644
--- a/arch/arm/src/am335x/am335x_can.c
+++ b/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"
diff --git a/arch/arm/src/am335x/am335x_clockconfig.c b/arch/arm/src/am335x/am335x_clockconfig.c
index 02fc9d7..486f3e4 100644
--- a/arch/arm/src/am335x/am335x_clockconfig.c
+++ b/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"
diff --git a/arch/arm/src/am335x/am335x_gpio.c b/arch/arm/src/am335x/am335x_gpio.c
index c63c45d..a6565cf 100644
--- a/arch/arm/src/am335x/am335x_gpio.c
+++ b/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"
diff --git a/arch/arm/src/am335x/am335x_gpioirq.c b/arch/arm/src/am335x/am335x_gpioirq.c
index b241c00..f8f0248 100644
--- a/arch/arm/src/am335x/am335x_gpioirq.c
+++ b/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"
diff --git a/arch/arm/src/am335x/am335x_i2c.c b/arch/arm/src/am335x/am335x_i2c.c
index ee71094..915af88 100644
--- a/arch/arm/src/am335x/am335x_i2c.c
+++ b/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"
diff --git a/arch/arm/src/am335x/am335x_irq.c b/arch/arm/src/am335x/am335x_irq.c
index d6f20b8..62bb926 100644
--- a/arch/arm/src/am335x/am335x_irq.c
+++ b/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"
diff --git a/arch/arm/src/am335x/am335x_lcdc.c b/arch/arm/src/am335x/am335x_lcdc.c
index 2420564..d4c1a30 100644
--- a/arch/arm/src/am335x/am335x_lcdc.c
+++ b/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"
diff --git a/arch/arm/src/am335x/am335x_lowputc.c b/arch/arm/src/am335x/am335x_lowputc.c
index 4c0f0f5..056c867 100644
--- a/arch/arm/src/am335x/am335x_lowputc.c
+++ b/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"
diff --git a/arch/arm/src/am335x/am335x_pinmux.c b/arch/arm/src/am335x/am335x_pinmux.c
index 841e0d6..77ce89c 100644
--- a/arch/arm/src/am335x/am335x_pinmux.c
+++ b/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"
/****************************************************************************
diff --git a/arch/arm/src/am335x/am335x_serial.c b/arch/arm/src/am335x/am335x_serial.c
index 4af56ac..bf353a5 100644
--- a/arch/arm/src/am335x/am335x_serial.c
+++ b/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"
diff --git a/arch/arm/src/am335x/am335x_sysclk.c b/arch/arm/src/am335x/am335x_sysclk.c
index a575ad0..d73d547 100644
--- a/arch/arm/src/am335x/am335x_sysclk.c
+++ b/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"
diff --git a/arch/arm/src/am335x/am335x_timerisr.c b/arch/arm/src/am335x/am335x_timerisr.c
index 47ac249..bba3df7 100644
--- a/arch/arm/src/am335x/am335x_timerisr.c
+++ b/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"
diff --git a/arch/arm/src/am335x/am335x_wdog.c b/arch/arm/src/am335x/am335x_wdog.c
index 4fd948e..c1daa96 100644
--- a/arch/arm/src/am335x/am335x_wdog.c
+++ b/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"
/****************************************************************************
diff --git a/arch/arm/src/am335x/am335x_wdog.h b/arch/arm/src/am335x/am335x_wdog.h
index 4ad8578..209ecc1 100644
--- a/arch/arm/src/am335x/am335x_wdog.h
+++ b/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"
diff --git a/arch/arm/src/arm/arm_allocpage.c b/arch/arm/src/arm/arm_allocpage.c
index 1777e35..2b8de0c 100644
--- a/arch/arm/src/arm/arm_allocpage.c
+++ b/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
diff --git a/arch/arm/src/arm/arm_assert.c b/arch/arm/src/arm/arm_assert.c
index 1f8181c..70379ee 100644
--- a/arch/arm/src/arm/arm_assert.c
+++ b/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
diff --git a/arch/arm/src/arm/arm_blocktask.c b/arch/arm/src/arm/arm_blocktask.c
index 3611885..23d8547 100644
--- a/arch/arm/src/arm/arm_blocktask.c
+++ b/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
diff --git a/arch/arm/src/arm/arm_checkmapping.c b/arch/arm/src/arm/arm_checkmapping.c
index 4eafbf4..f466c27 100644
--- a/arch/arm/src/arm/arm_checkmapping.c
+++ b/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
diff --git a/arch/arm/src/arm/arm_copyfullstate.c b/arch/arm/src/arm/arm_copyfullstate.c
index a3956ac..e4515d4 100644
--- a/arch/arm/src/arm/arm_copyfullstate.c
+++ b/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
diff --git a/arch/arm/src/arm/arm_dataabort.c b/arch/arm/src/arm/arm_dataabort.c
index ffd08a6..e8ac5ba 100644
--- a/arch/arm/src/arm/arm_dataabort.c
+++ b/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>
diff --git a/arch/arm/src/arm/arm_doirq.c b/arch/arm/src/arm/arm_doirq.c
index 2cdf1e0d..680dcd6 100644
--- a/arch/arm/src/arm/arm_doirq.c
+++ b/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"
diff --git a/arch/arm/src/arm/arm_fullcontextrestore.S b/arch/arm/src/arm/arm_fullcontextrestore.S
index ab45914..ca9d663 100644
--- a/arch/arm/src/arm/arm_fullcontextrestore.S
+++ b/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
diff --git a/arch/arm/src/arm/arm_initialstate.c b/arch/arm/src/arm/arm_initialstate.c
index ed0ba1b..d18aa6b 100644
--- a/arch/arm/src/arm/arm_initialstate.c
+++ b/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
diff --git a/arch/arm/src/arm/arm_pginitialize.c b/arch/arm/src/arm/arm_pginitialize.c
index cfe7979..1057e4b 100644
--- a/arch/arm/src/arm/arm_pginitialize.c
+++ b/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
diff --git a/arch/arm/src/arm/arm_prefetchabort.c b/arch/arm/src/arm/arm_prefetchabort.c
index 5e66d10..7d56ea8 100644
--- a/arch/arm/src/arm/arm_prefetchabort.c
+++ b/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
diff --git a/arch/arm/src/arm/arm_releasepending.c b/arch/arm/src/arm/arm_releasepending.c
index 22d560a..f8b33fc 100644
--- a/arch/arm/src/arm/arm_releasepending.c
+++ b/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
diff --git a/arch/arm/src/arm/arm_reprioritizertr.c b/arch/arm/src/arm/arm_reprioritizertr.c
index 5afa279..5846f53 100644
--- a/arch/arm/src/arm/arm_reprioritizertr.c
+++ b/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
diff --git a/arch/arm/src/arm/arm_saveusercontext.S b/arch/arm/src/arm/arm_saveusercontext.S
index f97e103..a1c9c05 100644
--- a/arch/arm/src/arm/arm_saveusercontext.S
+++ b/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
diff --git a/arch/arm/src/arm/arm_schedulesigaction.c b/arch/arm/src/arm/arm_schedulesigaction.c
index db9542a..02513ab 100644
--- a/arch/arm/src/arm/arm_schedulesigaction.c
+++ b/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
diff --git a/arch/arm/src/arm/arm_sigdeliver.c b/arch/arm/src/arm/arm_sigdeliver.c
index 1bcda93..2469e95 100644
--- a/arch/arm/src/arm/arm_sigdeliver.c
+++ b/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
diff --git a/arch/arm/src/arm/arm_syscall.c b/arch/arm/src/arm/arm_syscall.c
index 48c6e2d..4eaf5c4 100644
--- a/arch/arm/src/arm/arm_syscall.c
+++ b/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
diff --git a/arch/arm/src/arm/arm_unblocktask.c b/arch/arm/src/arm/arm_unblocktask.c
index 24979c8..da4e99f 100644
--- a/arch/arm/src/arm/arm_unblocktask.c
+++ b/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
diff --git a/arch/arm/src/arm/arm_undefinedinsn.c b/arch/arm/src/arm/arm_undefinedinsn.c
index 6ef9bae..dd84259 100644
--- a/arch/arm/src/arm/arm_undefinedinsn.c
+++ b/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
diff --git a/arch/arm/src/arm/arm_va2pte.c b/arch/arm/src/arm/arm_va2pte.c
index 20c5a36..760fe07 100644
--- a/arch/arm/src/arm/arm_va2pte.c
+++ b/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
diff --git a/arch/arm/src/arm/up_head.S b/arch/arm/src/arm/up_head.S
index f5fa95c..009d0e8 100644
--- a/arch/arm/src/arm/up_head.S
+++ b/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>
diff --git a/arch/arm/src/arm/up_nommuhead.S b/arch/arm/src/arm/up_nommuhead.S
index d56e0e1..d849210 100644
--- a/arch/arm/src/arm/up_nommuhead.S
+++ b/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
diff --git a/arch/arm/src/arm/up_vectoraddrexcptn.S b/arch/arm/src/arm/up_vectoraddrexcptn.S
index 6348cd6..5e4035a 100644
--- a/arch/arm/src/arm/up_vectoraddrexcptn.S
+++ b/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
diff --git a/arch/arm/src/arm/up_vectors.S b/arch/arm/src/arm/up_vectors.S
index c963a06..abe0607 100644
--- a/arch/arm/src/arm/up_vectors.S
+++ b/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
diff --git a/arch/arm/src/arm/vfork.S b/arch/arm/src/arm/vfork.S
index d8117f0..5e6eff5 100644
--- a/arch/arm/src/arm/vfork.S
+++ b/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
diff --git a/arch/arm/src/armv6-m/arm_assert.c b/arch/arm/src/armv6-m/arm_assert.c
index 0c4a2cb..e8aa30c 100644
--- a/arch/arm/src/armv6-m/arm_assert.c
+++ b/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
diff --git a/arch/arm/src/armv6-m/arm_blocktask.c b/arch/arm/src/armv6-m/arm_blocktask.c
index 4c5f24a..b69442d 100644
--- a/arch/arm/src/armv6-m/arm_blocktask.c
+++ b/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
diff --git a/arch/arm/src/armv6-m/arm_copyfullstate.c b/arch/arm/src/armv6-m/arm_copyfullstate.c
index 1df93f3..591b9c9 100644
--- a/arch/arm/src/armv6-m/arm_copyfullstate.c
+++ b/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
diff --git a/arch/arm/src/armv6-m/arm_doirq.c b/arch/arm/src/armv6-m/arm_doirq.c
index c9d0f0e..decaa08 100644
--- a/arch/arm/src/armv6-m/arm_doirq.c
+++ b/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
diff --git a/arch/arm/src/armv6-m/arm_dumpnvic.c b/arch/arm/src/armv6-m/arm_dumpnvic.c
index cd86562..6bdd83f 100644
--- a/arch/arm/src/armv6-m/arm_dumpnvic.c
+++ b/arch/arm/src/armv6-m/arm_dumpnvic.c
@@ -44,7 +44,7 @@
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nvic.h"
diff --git a/arch/arm/src/armv6-m/arm_hardfault.c b/arch/arm/src/armv6-m/arm_hardfault.c
index 4d1780e..4820ea1 100644
--- a/arch/arm/src/armv6-m/arm_hardfault.c
+++ b/arch/arm/src/armv6-m/arm_hardfault.c
@@ -46,9 +46,9 @@
#include <arch/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nvic.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/armv6-m/arm_initialstate.c b/arch/arm/src/armv6-m/arm_initialstate.c
index 31ad0df..263d502 100644
--- a/arch/arm/src/armv6-m/arm_initialstate.c
+++ b/arch/arm/src/armv6-m/arm_initialstate.c
@@ -45,8 +45,8 @@
#include <nuttx/arch.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "psr.h"
#include "exc_return.h"
diff --git a/arch/arm/src/armv6-m/arm_releasepending.c b/arch/arm/src/armv6-m/arm_releasepending.c
index 7395f8e..ff15b41 100644
--- a/arch/arm/src/armv6-m/arm_releasepending.c
+++ b/arch/arm/src/armv6-m/arm_releasepending.c
@@ -30,7 +30,7 @@
#include <nuttx/sched.h>
#include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv6-m/arm_reprioritizertr.c b/arch/arm/src/armv6-m/arm_reprioritizertr.c
index b3d43fa..031c0db 100644
--- a/arch/arm/src/armv6-m/arm_reprioritizertr.c
+++ b/arch/arm/src/armv6-m/arm_reprioritizertr.c
@@ -32,7 +32,7 @@
#include <nuttx/sched.h>
#include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv6-m/arm_schedulesigaction.c b/arch/arm/src/armv6-m/arm_schedulesigaction.c
index d25d793..e6ea0bf 100644
--- a/arch/arm/src/armv6-m/arm_schedulesigaction.c
+++ b/arch/arm/src/armv6-m/arm_schedulesigaction.c
@@ -49,8 +49,8 @@
#include "psr.h"
#include "exc_return.h"
#include "sched/sched.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv6-m/arm_sigdeliver.c b/arch/arm/src/armv6-m/arm_sigdeliver.c
index 52cdd8b..79a0b26 100644
--- a/arch/arm/src/armv6-m/arm_sigdeliver.c
+++ b/arch/arm/src/armv6-m/arm_sigdeliver.c
@@ -49,8 +49,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
diff --git a/arch/arm/src/armv6-m/arm_signal_dispatch.c b/arch/arm/src/armv6-m/arm_signal_dispatch.c
index 41c9b96..d728057 100644
--- a/arch/arm/src/armv6-m/arm_signal_dispatch.c
+++ b/arch/arm/src/armv6-m/arm_signal_dispatch.c
@@ -41,7 +41,7 @@
#include <nuttx/arch.h>
#include "svcall.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#if (defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \
defined(CONFIG_BUILD_KERNEL)
diff --git a/arch/arm/src/armv6-m/arm_svcall.c b/arch/arm/src/armv6-m/arm_svcall.c
index 21f7358..fb55be6 100644
--- a/arch/arm/src/armv6-m/arm_svcall.c
+++ b/arch/arm/src/armv6-m/arm_svcall.c
@@ -39,7 +39,7 @@
#include "signal/signal.h"
#include "svcall.h"
#include "exc_return.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Private Functions
diff --git a/arch/arm/src/armv6-m/arm_systemreset.c b/arch/arm/src/armv6-m/arm_systemreset.c
index 6c19c02..c5ea3dd 100644
--- a/arch/arm/src/armv6-m/arm_systemreset.c
+++ b/arch/arm/src/armv6-m/arm_systemreset.c
@@ -29,7 +29,7 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nvic.h"
/****************************************************************************
diff --git a/arch/arm/src/armv6-m/arm_unblocktask.c b/arch/arm/src/armv6-m/arm_unblocktask.c
index 53a9102..b2c65a2 100644
--- a/arch/arm/src/armv6-m/arm_unblocktask.c
+++ b/arch/arm/src/armv6-m/arm_unblocktask.c
@@ -31,7 +31,7 @@
#include "sched/sched.h"
#include "clock/clock.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv6-m/arm_vectors.c b/arch/arm/src/armv6-m/arm_vectors.c
index 24cbfb1..35d3b88 100644
--- a/arch/arm/src/armv6-m/arm_vectors.c
+++ b/arch/arm/src/armv6-m/arm_vectors.c
@@ -44,7 +44,7 @@
#include <nuttx/config.h>
#include "chip.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/armv6-m/vfork.S b/arch/arm/src/armv6-m/vfork.S
index 3614ee3..9d72aca 100644
--- a/arch/arm/src/armv6-m/vfork.S
+++ b/arch/arm/src/armv6-m/vfork.S
@@ -39,7 +39,7 @@
#include <nuttx/config.h>
-#include "up_vfork.h"
+#include "arm_vfork.h"
/************************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/armv7-a/arm_allocpage.c b/arch/arm/src/armv7-a/arm_allocpage.c
index a522b4e..da537e6 100644
--- a/arch/arm/src/armv7-a/arm_allocpage.c
+++ b/arch/arm/src/armv7-a/arm_allocpage.c
@@ -51,7 +51,7 @@
#include <nuttx/page.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Private Types
diff --git a/arch/arm/src/armv7-a/arm_assert.c b/arch/arm/src/armv7-a/arm_assert.c
index 9bb32fd..c90dd32 100644
--- a/arch/arm/src/armv7-a/arm_assert.c
+++ b/arch/arm/src/armv7-a/arm_assert.c
@@ -40,8 +40,8 @@
#include "sched/sched.h"
#include "irq/irq.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "chip.h"
/****************************************************************************
diff --git a/arch/arm/src/armv7-a/arm_blocktask.c b/arch/arm/src/armv7-a/arm_blocktask.c
index a38e4e8..74f300d 100644
--- a/arch/arm/src/armv7-a/arm_blocktask.c
+++ b/arch/arm/src/armv7-a/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
diff --git a/arch/arm/src/armv7-a/arm_checkmapping.c b/arch/arm/src/armv7-a/arm_checkmapping.c
index 5a7b251..7dc42af 100644
--- a/arch/arm/src/armv7-a/arm_checkmapping.c
+++ b/arch/arm/src/armv7-a/arm_checkmapping.c
@@ -47,7 +47,7 @@
#include <nuttx/sched.h>
#include <nuttx/page.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#ifdef CONFIG_PAGING
diff --git a/arch/arm/src/armv7-a/arm_copyarmstate.c b/arch/arm/src/armv7-a/arm_copyarmstate.c
index f610209..19fec25 100644
--- a/arch/arm/src/armv7-a/arm_copyarmstate.c
+++ b/arch/arm/src/armv7-a/arm_copyarmstate.c
@@ -43,7 +43,7 @@
#include <arch/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#ifdef CONFIG_ARCH_FPU
diff --git a/arch/arm/src/armv7-a/arm_copyfullstate.c b/arch/arm/src/armv7-a/arm_copyfullstate.c
index f5aee61..1646f6d 100644
--- a/arch/arm/src/armv7-a/arm_copyfullstate.c
+++ b/arch/arm/src/armv7-a/arm_copyfullstate.c
@@ -42,7 +42,7 @@
#include <stdint.h>
#include <arch/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-a/arm_cpuhead.S b/arch/arm/src/armv7-a/arm_cpuhead.S
index 69e1bc4..5edb150 100644
--- a/arch/arm/src/armv7-a/arm_cpuhead.S
+++ b/arch/arm/src/armv7-a/arm_cpuhead.S
@@ -48,7 +48,7 @@
#include "smp.h"
#include "chip.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#ifdef CONFIG_SMP
diff --git a/arch/arm/src/armv7-a/arm_cpuidlestack.c b/arch/arm/src/armv7-a/arm_cpuidlestack.c
index 1648de2..d389622 100644
--- a/arch/arm/src/armv7-a/arm_cpuidlestack.c
+++ b/arch/arm/src/armv7-a/arm_cpuidlestack.c
@@ -45,7 +45,7 @@
#include <nuttx/sched.h>
#include "smp.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#ifdef CONFIG_SMP
diff --git a/arch/arm/src/armv7-a/arm_cpupause.c b/arch/arm/src/armv7-a/arm_cpupause.c
index e54e864..ab58e93 100644
--- a/arch/arm/src/armv7-a/arm_cpupause.c
+++ b/arch/arm/src/armv7-a/arm_cpupause.c
@@ -46,7 +46,7 @@
#include <nuttx/spinlock.h>
#include <nuttx/sched_note.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "gic.h"
#include "sched/sched.h"
diff --git a/arch/arm/src/armv7-a/arm_cpustart.c b/arch/arm/src/armv7-a/arm_cpustart.c
index e868fd8..f1e63cf 100644
--- a/arch/arm/src/armv7-a/arm_cpustart.c
+++ b/arch/arm/src/armv7-a/arm_cpustart.c
@@ -45,7 +45,7 @@
#include <nuttx/sched.h>
#include <nuttx/sched_note.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "cp15_cacheops.h"
#include "gic.h"
#include "sched/sched.h"
diff --git a/arch/arm/src/armv7-a/arm_dataabort.c b/arch/arm/src/armv7-a/arm_dataabort.c
index 17073a9..85066b5 100644
--- a/arch/arm/src/armv7-a/arm_dataabort.c
+++ b/arch/arm/src/armv7-a/arm_dataabort.c
@@ -45,7 +45,7 @@
#include <nuttx/irq.h>
#include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#ifdef CONFIG_PAGING
# include <nuttx/page.h>
diff --git a/arch/arm/src/armv7-a/arm_doirq.c b/arch/arm/src/armv7-a/arm_doirq.c
index a5cd87d..43e9f06 100644
--- a/arch/arm/src/armv7-a/arm_doirq.c
+++ b/arch/arm/src/armv7-a/arm_doirq.c
@@ -47,8 +47,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"
#include "gic.h"
diff --git a/arch/arm/src/armv7-a/arm_fullcontextrestore.S b/arch/arm/src/armv7-a/arm_fullcontextrestore.S
index b87d9bf..6933183 100644
--- a/arch/arm/src/armv7-a/arm_fullcontextrestore.S
+++ b/arch/arm/src/armv7-a/arm_fullcontextrestore.S
@@ -39,7 +39,7 @@
#include <nuttx/config.h>
#include <nuttx/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "svcall.h"
#include "arm.h"
diff --git a/arch/arm/src/armv7-a/arm_gicv2.c b/arch/arm/src/armv7-a/arm_gicv2.c
index 1eae768..d0ff7c4 100644
--- a/arch/arm/src/armv7-a/arm_gicv2.c
+++ b/arch/arm/src/armv7-a/arm_gicv2.c
@@ -47,8 +47,8 @@
#include <nuttx/arch.h>
#include <arch/irq.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "gic.h"
#ifdef CONFIG_ARMV7A_HAVE_GICv2
diff --git a/arch/arm/src/armv7-a/arm_gicv2_dump.c b/arch/arm/src/armv7-a/arm_gicv2_dump.c
index 23e4373..92e572c 100644
--- a/arch/arm/src/armv7-a/arm_gicv2_dump.c
+++ b/arch/arm/src/armv7-a/arm_gicv2_dump.c
@@ -42,7 +42,7 @@
#include <stdint.h>
#include <debug.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "gic.h"
#if defined(CONFIG_ARMV7A_HAVE_GICv2) && defined(CONFIG_DEBUG_IRQ_INFO)
diff --git a/arch/arm/src/armv7-a/arm_head.S b/arch/arm/src/armv7-a/arm_head.S
index 0a92bc1..edf2dfd 100644
--- a/arch/arm/src/armv7-a/arm_head.S
+++ b/arch/arm/src/armv7-a/arm_head.S
@@ -46,7 +46,7 @@
#include "sctlr.h"
#include "mmu.h"
#include "chip.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#ifndef CONFIG_PAGING
diff --git a/arch/arm/src/armv7-a/arm_initialstate.c b/arch/arm/src/armv7-a/arm_initialstate.c
index dedd64a..97b3c0a 100644
--- a/arch/arm/src/armv7-a/arm_initialstate.c
+++ b/arch/arm/src/armv7-a/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"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-a/arm_l2cc_pl310.c b/arch/arm/src/armv7-a/arm_l2cc_pl310.c
index 5d96474..b0a72b8 100644
--- a/arch/arm/src/armv7-a/arm_l2cc_pl310.c
+++ b/arch/arm/src/armv7-a/arm_l2cc_pl310.c
@@ -50,7 +50,7 @@
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "l2cc.h"
#include "l2cc_pl310.h"
diff --git a/arch/arm/src/armv7-a/arm_pghead.S b/arch/arm/src/armv7-a/arm_pghead.S
index 5e523cc..76a4518 100644
--- a/arch/arm/src/armv7-a/arm_pghead.S
+++ b/arch/arm/src/armv7-a/arm_pghead.S
@@ -48,7 +48,7 @@
#include "mmu.h"
#include "chip.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#ifdef CONFIG_PAGING
diff --git a/arch/arm/src/armv7-a/arm_pginitialize.c b/arch/arm/src/armv7-a/arm_pginitialize.c
index ba431a8..89a3c4d 100644
--- a/arch/arm/src/armv7-a/arm_pginitialize.c
+++ b/arch/arm/src/armv7-a/arm_pginitialize.c
@@ -45,7 +45,7 @@
#include <nuttx/sched.h>
#include <nuttx/page.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#ifdef CONFIG_PAGING
diff --git a/arch/arm/src/armv7-a/arm_prefetchabort.c b/arch/arm/src/armv7-a/arm_prefetchabort.c
index a10f703..ad3fea5 100644
--- a/arch/arm/src/armv7-a/arm_prefetchabort.c
+++ b/arch/arm/src/armv7-a/arm_prefetchabort.c
@@ -48,7 +48,7 @@
#endif
#include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-a/arm_releasepending.c b/arch/arm/src/armv7-a/arm_releasepending.c
index e12e384..6dcf0fa 100644
--- a/arch/arm/src/armv7-a/arm_releasepending.c
+++ b/arch/arm/src/armv7-a/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
diff --git a/arch/arm/src/armv7-a/arm_reprioritizertr.c b/arch/arm/src/armv7-a/arm_reprioritizertr.c
index 7e5ff40..a5e5eb7 100644
--- a/arch/arm/src/armv7-a/arm_reprioritizertr.c
+++ b/arch/arm/src/armv7-a/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
diff --git a/arch/arm/src/armv7-a/arm_saveusercontext.S b/arch/arm/src/armv7-a/arm_saveusercontext.S
index ba7c6a3..d1cb64b 100644
--- a/arch/arm/src/armv7-a/arm_saveusercontext.S
+++ b/arch/arm/src/armv7-a/arm_saveusercontext.S
@@ -38,7 +38,7 @@
****************************************************************************/
#include <nuttx/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
.file "arm_saveusercontext.S"
diff --git a/arch/arm/src/armv7-a/arm_schedulesigaction.c b/arch/arm/src/armv7-a/arm_schedulesigaction.c
index 7a56536..26f99ed 100644
--- a/arch/arm/src/armv7-a/arm_schedulesigaction.c
+++ b/arch/arm/src/armv7-a/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"
#include "irq/irq.h"
diff --git a/arch/arm/src/armv7-a/arm_scu.c b/arch/arm/src/armv7-a/arm_scu.c
index 6ce2bdd..86955a1 100644
--- a/arch/arm/src/armv7-a/arm_scu.c
+++ b/arch/arm/src/armv7-a/arm_scu.c
@@ -41,7 +41,7 @@
#include <stdint.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "cp15_cacheops.h"
#include "barriers.h"
#include "sctlr.h"
diff --git a/arch/arm/src/armv7-a/arm_sigdeliver.c b/arch/arm/src/armv7-a/arm_sigdeliver.c
index a1b5dd8..092d642 100644
--- a/arch/arm/src/armv7-a/arm_sigdeliver.c
+++ b/arch/arm/src/armv7-a/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
diff --git a/arch/arm/src/armv7-a/arm_signal_dispatch.c b/arch/arm/src/armv7-a/arm_signal_dispatch.c
index 3ed15dd..10be736 100644
--- a/arch/arm/src/armv7-a/arm_signal_dispatch.c
+++ b/arch/arm/src/armv7-a/arm_signal_dispatch.c
@@ -42,7 +42,7 @@
#include "svcall.h"
#include "pgalloc.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#if (defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \
defined(CONFIG_BUILD_KERNEL)
diff --git a/arch/arm/src/armv7-a/arm_syscall.c b/arch/arm/src/armv7-a/arm_syscall.c
index 8eb9053..8ce7c66 100644
--- a/arch/arm/src/armv7-a/arm_syscall.c
+++ b/arch/arm/src/armv7-a/arm_syscall.c
@@ -38,7 +38,7 @@
#include "arm.h"
#include "svcall.h"
#include "addrenv.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Private Functions
diff --git a/arch/arm/src/armv7-a/arm_unblocktask.c b/arch/arm/src/armv7-a/arm_unblocktask.c
index 8d8986e..7cf723c 100644
--- a/arch/arm/src/armv7-a/arm_unblocktask.c
+++ b/arch/arm/src/armv7-a/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
diff --git a/arch/arm/src/armv7-a/arm_undefinedinsn.c b/arch/arm/src/armv7-a/arm_undefinedinsn.c
index 54dbcc2..b5c71c1 100644
--- a/arch/arm/src/armv7-a/arm_undefinedinsn.c
+++ b/arch/arm/src/armv7-a/arm_undefinedinsn.c
@@ -45,7 +45,7 @@
#include <arch/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-a/arm_va2pte.c b/arch/arm/src/armv7-a/arm_va2pte.c
index f4779b4..f72dc2f 100644
--- a/arch/arm/src/armv7-a/arm_va2pte.c
+++ b/arch/arm/src/armv7-a/arm_va2pte.c
@@ -47,7 +47,7 @@
#include <nuttx/page.h>
#include "chip.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#ifdef CONFIG_PAGING
diff --git a/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S b/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S
index 14a4290..856aabe 100644
--- a/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S
+++ b/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S
@@ -39,7 +39,7 @@
#include <nuttx/config.h>
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
.file "arm_vectoraddrexcptn.S"
diff --git a/arch/arm/src/armv7-a/gic.h b/arch/arm/src/armv7-a/gic.h
index ec142f3..1bd55c5 100644
--- a/arch/arm/src/armv7-a/gic.h
+++ b/arch/arm/src/armv7-a/gic.h
@@ -56,7 +56,7 @@
#endif
#include "mpcore.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#ifdef CONFIG_ARMV7A_HAVE_GICv2
diff --git a/arch/arm/src/armv7-a/l2cc.h b/arch/arm/src/armv7-a/l2cc.h
index 47b23ee..ea7b162 100644
--- a/arch/arm/src/armv7-a/l2cc.h
+++ b/arch/arm/src/armv7-a/l2cc.h
@@ -81,7 +81,7 @@ extern "C"
*
****************************************************************************/
-#if 0 /* Prototyped in up_internal.h */
+#if 0 /* Prototyped in arm_internal.h */
void up_l2ccinitialize(void);
#endif
diff --git a/arch/arm/src/armv7-a/vfork.S b/arch/arm/src/armv7-a/vfork.S
index ea69ade..c6a0024 100644
--- a/arch/arm/src/armv7-a/vfork.S
+++ b/arch/arm/src/armv7-a/vfork.S
@@ -24,7 +24,7 @@
#include <nuttx/config.h>
-#include "up_vfork.h"
+#include "arm_vfork.h"
.file "vfork.S"
diff --git a/arch/arm/src/armv7-m/arm_assert.c b/arch/arm/src/armv7-m/arm_assert.c
index 1ed0c0a..0214414 100644
--- a/arch/arm/src/armv7-m/arm_assert.c
+++ b/arch/arm/src/armv7-m/arm_assert.c
@@ -40,8 +40,8 @@
#include "sched/sched.h"
#include "irq/irq.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "chip.h"
/****************************************************************************
diff --git a/arch/arm/src/armv7-m/arm_blocktask.c b/arch/arm/src/armv7-m/arm_blocktask.c
index 3de7b1e..78ea2e9 100644
--- a/arch/arm/src/armv7-m/arm_blocktask.c
+++ b/arch/arm/src/armv7-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
diff --git a/arch/arm/src/armv7-m/arm_cache.c b/arch/arm/src/armv7-m/arm_cache.c
index 6f99bca..f1629bb 100644
--- a/arch/arm/src/armv7-m/arm_cache.c
+++ b/arch/arm/src/armv7-m/arm_cache.c
@@ -46,7 +46,7 @@
#include <nuttx/config.h>
#include <nuttx/cache.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "barriers.h"
#include "nvic.h"
diff --git a/arch/arm/src/armv7-m/arm_copyarmstate.c b/arch/arm/src/armv7-m/arm_copyarmstate.c
index edf6a83..c6544ae 100644
--- a/arch/arm/src/armv7-m/arm_copyarmstate.c
+++ b/arch/arm/src/armv7-m/arm_copyarmstate.c
@@ -28,7 +28,7 @@
#include <arch/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_ARMV7M_LAZYFPU)
diff --git a/arch/arm/src/armv7-m/arm_copyfullstate.c b/arch/arm/src/armv7-m/arm_copyfullstate.c
index bed29e2..c37c2ab 100644
--- a/arch/arm/src/armv7-m/arm_copyfullstate.c
+++ b/arch/arm/src/armv7-m/arm_copyfullstate.c
@@ -27,7 +27,7 @@
#include <stdint.h>
#include <arch/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-m/arm_doirq.c b/arch/arm/src/armv7-m/arm_doirq.c
index 70d10ec..1add272 100644
--- a/arch/arm/src/armv7-m/arm_doirq.c
+++ b/arch/arm/src/armv7-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"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-m/arm_hardfault.c b/arch/arm/src/armv7-m/arm_hardfault.c
index 06a4770..b19ce1f 100644
--- a/arch/arm/src/armv7-m/arm_hardfault.c
+++ b/arch/arm/src/armv7-m/arm_hardfault.c
@@ -32,9 +32,9 @@
#include <nuttx/userspace.h>
#include <arch/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nvic.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/armv7-m/arm_initialstate.c b/arch/arm/src/armv7-m/arm_initialstate.c
index 9276e15..b014b18 100644
--- a/arch/arm/src/armv7-m/arm_initialstate.c
+++ b/arch/arm/src/armv7-m/arm_initialstate.c
@@ -31,8 +31,8 @@
#include <nuttx/arch.h>
#include <arch/armv7-m/nvicpri.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "psr.h"
#include "exc_return.h"
diff --git a/arch/arm/src/armv7-m/arm_itm.c b/arch/arm/src/armv7-m/arm_itm.c
index 223f63f..2349aea 100644
--- a/arch/arm/src/armv7-m/arm_itm.c
+++ b/arch/arm/src/armv7-m/arm_itm.c
@@ -71,7 +71,7 @@
#include <stdint.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "itm.h"
/****************************************************************************
diff --git a/arch/arm/src/armv7-m/arm_itm_syslog.c b/arch/arm/src/armv7-m/arm_itm_syslog.c
index bb6916c..de6df18 100644
--- a/arch/arm/src/armv7-m/arm_itm_syslog.c
+++ b/arch/arm/src/armv7-m/arm_itm_syslog.c
@@ -49,7 +49,7 @@
#include "itm.h"
#include "tpi.h"
#include "dwt.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "itm_syslog.h"
#ifdef CONFIG_ARMV7M_ITMSYSLOG
diff --git a/arch/arm/src/armv7-m/arm_memfault.c b/arch/arm/src/armv7-m/arm_memfault.c
index 918aa7e..c2a6487 100644
--- a/arch/arm/src/armv7-m/arm_memfault.c
+++ b/arch/arm/src/armv7-m/arm_memfault.c
@@ -29,9 +29,9 @@
#include <arch/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nvic.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/armv7-m/arm_mpu.c b/arch/arm/src/armv7-m/arm_mpu.c
index 0585e47..171bbea 100644
--- a/arch/arm/src/armv7-m/arm_mpu.c
+++ b/arch/arm/src/armv7-m/arm_mpu.c
@@ -28,7 +28,7 @@
#include <assert.h>
#include "mpu.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/*****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/armv7-m/arm_ramvec_initialize.c b/arch/arm/src/armv7-m/arm_ramvec_initialize.c
index 2dd26e9..f9c6f17 100644
--- a/arch/arm/src/armv7-m/arm_ramvec_initialize.c
+++ b/arch/arm/src/armv7-m/arm_ramvec_initialize.c
@@ -33,8 +33,8 @@
#include "ram_vectors.h"
#include "chip.h" /* May redefine VECTAB fields */
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#ifdef CONFIG_ARCH_RAMVECTORS
diff --git a/arch/arm/src/armv7-m/arm_releasepending.c b/arch/arm/src/armv7-m/arm_releasepending.c
index 79f6245..984ba70 100644
--- a/arch/arm/src/armv7-m/arm_releasepending.c
+++ b/arch/arm/src/armv7-m/arm_releasepending.c
@@ -30,7 +30,7 @@
#include <nuttx/sched.h>
#include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-m/arm_reprioritizertr.c b/arch/arm/src/armv7-m/arm_reprioritizertr.c
index acf53d3..eae5198 100644
--- a/arch/arm/src/armv7-m/arm_reprioritizertr.c
+++ b/arch/arm/src/armv7-m/arm_reprioritizertr.c
@@ -32,7 +32,7 @@
#include <nuttx/sched.h>
#include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-m/arm_schedulesigaction.c b/arch/arm/src/armv7-m/arm_schedulesigaction.c
index 2ec8d23..9aab25d 100644
--- a/arch/arm/src/armv7-m/arm_schedulesigaction.c
+++ b/arch/arm/src/armv7-m/arm_schedulesigaction.c
@@ -35,8 +35,8 @@
#include "psr.h"
#include "exc_return.h"
#include "sched/sched.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "irq/irq.h"
diff --git a/arch/arm/src/armv7-m/arm_sigdeliver.c b/arch/arm/src/armv7-m/arm_sigdeliver.c
index f9f4a80..62752f7 100644
--- a/arch/arm/src/armv7-m/arm_sigdeliver.c
+++ b/arch/arm/src/armv7-m/arm_sigdeliver.c
@@ -34,8 +34,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
diff --git a/arch/arm/src/armv7-m/arm_signal_dispatch.c b/arch/arm/src/armv7-m/arm_signal_dispatch.c
index 01b4ea1..6b21c32 100644
--- a/arch/arm/src/armv7-m/arm_signal_dispatch.c
+++ b/arch/arm/src/armv7-m/arm_signal_dispatch.c
@@ -26,7 +26,7 @@
#include <nuttx/arch.h>
#include "svcall.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#if (defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \
defined(CONFIG_BUILD_KERNEL)
diff --git a/arch/arm/src/armv7-m/arm_stackcheck.c b/arch/arm/src/armv7-m/arm_stackcheck.c
index 9a904c6..419d551 100644
--- a/arch/arm/src/armv7-m/arm_stackcheck.c
+++ b/arch/arm/src/armv7-m/arm_stackcheck.c
@@ -48,7 +48,7 @@
#include <stdint.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nvic.h"
/****************************************************************************
diff --git a/arch/arm/src/armv7-m/arm_svcall.c b/arch/arm/src/armv7-m/arm_svcall.c
index 8dada8b..e66bc03 100644
--- a/arch/arm/src/armv7-m/arm_svcall.c
+++ b/arch/arm/src/armv7-m/arm_svcall.c
@@ -40,7 +40,7 @@
#include "signal/signal.h"
#include "svcall.h"
#include "exc_return.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Private Functions
diff --git a/arch/arm/src/armv7-m/arm_systemreset.c b/arch/arm/src/armv7-m/arm_systemreset.c
index 288420b..2228fcb 100644
--- a/arch/arm/src/armv7-m/arm_systemreset.c
+++ b/arch/arm/src/armv7-m/arm_systemreset.c
@@ -29,7 +29,7 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nvic.h"
/****************************************************************************
diff --git a/arch/arm/src/armv7-m/arm_systick.c b/arch/arm/src/armv7-m/arm_systick.c
index 709a5a8..e46297b 100644
--- a/arch/arm/src/armv7-m/arm_systick.c
+++ b/arch/arm/src/armv7-m/arm_systick.c
@@ -46,7 +46,7 @@
#include "nvic.h"
#include "systick.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#ifdef CONFIG_ARMV7M_SYSTICK
diff --git a/arch/arm/src/armv7-m/arm_trigger_irq.c b/arch/arm/src/armv7-m/arm_trigger_irq.c
index 6d306a0..4003010 100644
--- a/arch/arm/src/armv7-m/arm_trigger_irq.c
+++ b/arch/arm/src/armv7-m/arm_trigger_irq.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
#include <arch/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nvic.h"
/****************************************************************************
diff --git a/arch/arm/src/armv7-m/arm_unblocktask.c b/arch/arm/src/armv7-m/arm_unblocktask.c
index f6c0d0f..ae838d7 100644
--- a/arch/arm/src/armv7-m/arm_unblocktask.c
+++ b/arch/arm/src/armv7-m/arm_unblocktask.c
@@ -31,7 +31,7 @@
#include "sched/sched.h"
#include "clock/clock.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-m/arm_vectors.c b/arch/arm/src/armv7-m/arm_vectors.c
index 8044a10..13f5559 100644
--- a/arch/arm/src/armv7-m/arm_vectors.c
+++ b/arch/arm/src/armv7-m/arm_vectors.c
@@ -39,7 +39,7 @@
#include <nuttx/config.h>
#include "chip.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/armv7-m/gnu/vfork.S b/arch/arm/src/armv7-m/gnu/vfork.S
index ac02921..41fa584 100644
--- a/arch/arm/src/armv7-m/gnu/vfork.S
+++ b/arch/arm/src/armv7-m/gnu/vfork.S
@@ -24,7 +24,7 @@
#include <nuttx/config.h>
-#include "up_vfork.h"
+#include "arm_vfork.h"
/************************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/armv7-m/iar/vfork.S b/arch/arm/src/armv7-m/iar/vfork.S
index 773be4b..8dd14b3 100644
--- a/arch/arm/src/armv7-m/iar/vfork.S
+++ b/arch/arm/src/armv7-m/iar/vfork.S
@@ -24,7 +24,7 @@
#include <nuttx/config.h>
-#include "up_vfork.h"
+#include "arm_vfork.h"
MODULE vfork
SECTION .text:CODE:NOROOT(2)
diff --git a/arch/arm/src/armv7-m/mpu.h b/arch/arm/src/armv7-m/mpu.h
index 91c9a48..045d4a5 100644
--- a/arch/arm/src/armv7-m/mpu.h
+++ b/arch/arm/src/armv7-m/mpu.h
@@ -34,7 +34,7 @@
# include <assert.h>
# include <debug.h>
-# include "up_arch.h"
+# include "arm_arch.h"
#endif
/*********************************************************************************************
diff --git a/arch/arm/src/armv7-m/ram_vectors.h b/arch/arm/src/armv7-m/ram_vectors.h
index 0b5f996..b92edb1 100644
--- a/arch/arm/src/armv7-m/ram_vectors.h
+++ b/arch/arm/src/armv7-m/ram_vectors.h
@@ -28,7 +28,7 @@
#include <nuttx/config.h>
#include <arch/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "chip.h"
#ifdef CONFIG_ARCH_RAMVECTORS
diff --git a/arch/arm/src/armv7-r/arm_assert.c b/arch/arm/src/armv7-r/arm_assert.c
index 52ca71f..a8a65f1 100644
--- a/arch/arm/src/armv7-r/arm_assert.c
+++ b/arch/arm/src/armv7-r/arm_assert.c
@@ -37,9 +37,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
diff --git a/arch/arm/src/armv7-r/arm_blocktask.c b/arch/arm/src/armv7-r/arm_blocktask.c
index da7f20a..802f13c 100644
--- a/arch/arm/src/armv7-r/arm_blocktask.c
+++ b/arch/arm/src/armv7-r/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
diff --git a/arch/arm/src/armv7-r/arm_copyarmstate.c b/arch/arm/src/armv7-r/arm_copyarmstate.c
index f18f9e4..5b7a06e 100644
--- a/arch/arm/src/armv7-r/arm_copyarmstate.c
+++ b/arch/arm/src/armv7-r/arm_copyarmstate.c
@@ -28,7 +28,7 @@
#include <arch/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#ifdef CONFIG_ARCH_FPU
diff --git a/arch/arm/src/armv7-r/arm_copyfullstate.c b/arch/arm/src/armv7-r/arm_copyfullstate.c
index aa8eebc..805c02c 100644
--- a/arch/arm/src/armv7-r/arm_copyfullstate.c
+++ b/arch/arm/src/armv7-r/arm_copyfullstate.c
@@ -27,7 +27,7 @@
#include <stdint.h>
#include <arch/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-r/arm_dataabort.c b/arch/arm/src/armv7-r/arm_dataabort.c
index f5939f8..e08f6c8 100644
--- a/arch/arm/src/armv7-r/arm_dataabort.c
+++ b/arch/arm/src/armv7-r/arm_dataabort.c
@@ -45,7 +45,7 @@
#include <nuttx/irq.h>
#include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-r/arm_doirq.c b/arch/arm/src/armv7-r/arm_doirq.c
index 5d492f5..f0054bf 100644
--- a/arch/arm/src/armv7-r/arm_doirq.c
+++ b/arch/arm/src/armv7-r/arm_doirq.c
@@ -47,8 +47,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"
diff --git a/arch/arm/src/armv7-r/arm_fullcontextrestore.S b/arch/arm/src/armv7-r/arm_fullcontextrestore.S
index b346a17..008270b 100644
--- a/arch/arm/src/armv7-r/arm_fullcontextrestore.S
+++ b/arch/arm/src/armv7-r/arm_fullcontextrestore.S
@@ -39,7 +39,7 @@
#include <nuttx/config.h>
#include <nuttx/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "svcall.h"
.file "arm_fullcontextrestore.S"
diff --git a/arch/arm/src/armv7-r/arm_gicv2.c b/arch/arm/src/armv7-r/arm_gicv2.c
index 190924c..39f7c89 100644
--- a/arch/arm/src/armv7-r/arm_gicv2.c
+++ b/arch/arm/src/armv7-r/arm_gicv2.c
@@ -48,8 +48,8 @@
#include <arch/irq.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "gic.h"
#ifdef CONFIG_ARMV7R_HAVE_GICv2
diff --git a/arch/arm/src/armv7-r/arm_head.S b/arch/arm/src/armv7-r/arm_head.S
index 24d790b..3bfd4b5 100644
--- a/arch/arm/src/armv7-r/arm_head.S
+++ b/arch/arm/src/armv7-r/arm_head.S
@@ -43,8 +43,8 @@
#include "cp15.h"
#include "sctlr.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include <arch/board/board.h>
diff --git a/arch/arm/src/armv7-r/arm_initialstate.c b/arch/arm/src/armv7-r/arm_initialstate.c
index dcf9ee3..edd7c6d 100644
--- a/arch/arm/src/armv7-r/arm_initialstate.c
+++ b/arch/arm/src/armv7-r/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
diff --git a/arch/arm/src/armv7-r/arm_l2cc_pl310.c b/arch/arm/src/armv7-r/arm_l2cc_pl310.c
index ea4e8ea..89d35d4 100644
--- a/arch/arm/src/armv7-r/arm_l2cc_pl310.c
+++ b/arch/arm/src/armv7-r/arm_l2cc_pl310.c
@@ -50,7 +50,7 @@
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "l2cc.h"
#include "l2cc_pl310.h"
diff --git a/arch/arm/src/armv7-r/arm_mpu.c b/arch/arm/src/armv7-r/arm_mpu.c
index 93bda13..29a70dd 100644
--- a/arch/arm/src/armv7-r/arm_mpu.c
+++ b/arch/arm/src/armv7-r/arm_mpu.c
@@ -43,7 +43,7 @@
#include <assert.h>
#include "mpu.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/armv7-r/arm_prefetchabort.c b/arch/arm/src/armv7-r/arm_prefetchabort.c
index 7d5fd7c..4c3c074 100644
--- a/arch/arm/src/armv7-r/arm_prefetchabort.c
+++ b/arch/arm/src/armv7-r/arm_prefetchabort.c
@@ -45,7 +45,7 @@
#include <nuttx/irq.h>
#include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-r/arm_releasepending.c b/arch/arm/src/armv7-r/arm_releasepending.c
index 18fd7f4..efc1542 100644
--- a/arch/arm/src/armv7-r/arm_releasepending.c
+++ b/arch/arm/src/armv7-r/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
diff --git a/arch/arm/src/armv7-r/arm_reprioritizertr.c b/arch/arm/src/armv7-r/arm_reprioritizertr.c
index 1b1cbbe..5753c7a 100644
--- a/arch/arm/src/armv7-r/arm_reprioritizertr.c
+++ b/arch/arm/src/armv7-r/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
diff --git a/arch/arm/src/armv7-r/arm_saveusercontext.S b/arch/arm/src/armv7-r/arm_saveusercontext.S
index cda19e4..b837059 100644
--- a/arch/arm/src/armv7-r/arm_saveusercontext.S
+++ b/arch/arm/src/armv7-r/arm_saveusercontext.S
@@ -38,7 +38,7 @@
****************************************************************************/
#include <nuttx/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Symbols
diff --git a/arch/arm/src/armv7-r/arm_schedulesigaction.c b/arch/arm/src/armv7-r/arm_schedulesigaction.c
index f14901a..ac334b4 100644
--- a/arch/arm/src/armv7-r/arm_schedulesigaction.c
+++ b/arch/arm/src/armv7-r/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
diff --git a/arch/arm/src/armv7-r/arm_sigdeliver.c b/arch/arm/src/armv7-r/arm_sigdeliver.c
index 6ad7350..b4b929f 100644
--- a/arch/arm/src/armv7-r/arm_sigdeliver.c
+++ b/arch/arm/src/armv7-r/arm_sigdeliver.c
@@ -49,8 +49,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
diff --git a/arch/arm/src/armv7-r/arm_signal_dispatch.c b/arch/arm/src/armv7-r/arm_signal_dispatch.c
index 4f24c8a..6718795 100644
--- a/arch/arm/src/armv7-r/arm_signal_dispatch.c
+++ b/arch/arm/src/armv7-r/arm_signal_dispatch.c
@@ -42,7 +42,7 @@
#include "svcall.h"
#include "pgalloc.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#if (defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \
defined(CONFIG_BUILD_PROTECTED)
diff --git a/arch/arm/src/armv7-r/arm_syscall.c b/arch/arm/src/armv7-r/arm_syscall.c
index 8bc7b3b..6c6c295 100644
--- a/arch/arm/src/armv7-r/arm_syscall.c
+++ b/arch/arm/src/armv7-r/arm_syscall.c
@@ -36,7 +36,7 @@
#include "signal/signal.h"
#include "arm.h"
#include "svcall.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Private Functions
diff --git a/arch/arm/src/armv7-r/arm_unblocktask.c b/arch/arm/src/armv7-r/arm_unblocktask.c
index 809c854..3c560db 100644
--- a/arch/arm/src/armv7-r/arm_unblocktask.c
+++ b/arch/arm/src/armv7-r/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"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/armv7-r/arm_undefinedinsn.c b/arch/arm/src/armv7-r/arm_undefinedinsn.c
index 733fb06..41ac2ac 100644
--- a/arch/arm/src/armv7-r/arm_undefinedinsn.c
+++ b/arch/arm/src/armv7-r/arm_undefinedinsn.c
@@ -45,7 +45,7 @@
#include <arch/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S b/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S
index 42775bd..96c08cf 100644
--- a/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S
+++ b/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S
@@ -39,7 +39,7 @@
#include <nuttx/config.h>
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
.file "arm_vectoraddrexcptn.S"
diff --git a/arch/arm/src/armv7-r/l2cc.h b/arch/arm/src/armv7-r/l2cc.h
index 23fcf88..5d0e070 100644
--- a/arch/arm/src/armv7-r/l2cc.h
+++ b/arch/arm/src/armv7-r/l2cc.h
@@ -81,7 +81,7 @@ extern "C"
*
****************************************************************************/
-#if 0 /* Prototyped in up_internal.h */
+#if 0 /* Prototyped in arm_internal.h */
void up_l2ccinitialize(void);
#endif
diff --git a/arch/arm/src/armv7-r/mpu.h b/arch/arm/src/armv7-r/mpu.h
index 6181115..243f1d9 100644
--- a/arch/arm/src/armv7-r/mpu.h
+++ b/arch/arm/src/armv7-r/mpu.h
@@ -48,7 +48,7 @@
# include <stdbool.h>
# include <debug.h>
-# include "up_arch.h"
+# include "arm_arch.h"
# include "sctlr.h"
# include "cp15.h"
#endif
diff --git a/arch/arm/src/armv7-r/vfork.S b/arch/arm/src/armv7-r/vfork.S
index f49bfef..3734598 100644
--- a/arch/arm/src/armv7-r/vfork.S
+++ b/arch/arm/src/armv7-r/vfork.S
@@ -24,7 +24,7 @@
#include <nuttx/config.h>
-#include "up_vfork.h"
+#include "arm_vfork.h"
.file "vfork.S"
diff --git a/arch/arm/src/armv8-m/arm_assert.c b/arch/arm/src/armv8-m/arm_assert.c
index e60cfcc..2552aaa 100755
--- a/arch/arm/src/armv8-m/arm_assert.c
+++ b/arch/arm/src/armv8-m/arm_assert.c
@@ -40,8 +40,8 @@
#include "sched/sched.h"
#include "irq/irq.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "chip.h"
/****************************************************************************
diff --git a/arch/arm/src/armv8-m/arm_blocktask.c b/arch/arm/src/armv8-m/arm_blocktask.c
index 1e26f56..87cbd42 100755
--- a/arch/arm/src/armv8-m/arm_blocktask.c
+++ b/arch/arm/src/armv8-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
diff --git a/arch/arm/src/armv8-m/arm_cache.c b/arch/arm/src/armv8-m/arm_cache.c
index 23339a1..56b963e 100755
--- a/arch/arm/src/armv8-m/arm_cache.c
+++ b/arch/arm/src/armv8-m/arm_cache.c
@@ -46,7 +46,7 @@
#include <nuttx/config.h>
#include <nuttx/cache.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "barriers.h"
#include "nvic.h"
diff --git a/arch/arm/src/armv8-m/arm_copyarmstate.c b/arch/arm/src/armv8-m/arm_copyarmstate.c
index 36e7345..7639fee 100755
--- a/arch/arm/src/armv8-m/arm_copyarmstate.c
+++ b/arch/arm/src/armv8-m/arm_copyarmstate.c
@@ -28,7 +28,7 @@
#include <arch/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#if defined(CONFIG_ARCH_FPU) && defined(CONFIG_ARMV8M_LAZYFPU)
diff --git a/arch/arm/src/armv8-m/arm_copyfullstate.c b/arch/arm/src/armv8-m/arm_copyfullstate.c
index e889213..79fd368 100755
--- a/arch/arm/src/armv8-m/arm_copyfullstate.c
+++ b/arch/arm/src/armv8-m/arm_copyfullstate.c
@@ -27,7 +27,7 @@
#include <stdint.h>
#include <arch/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv8-m/arm_doirq.c b/arch/arm/src/armv8-m/arm_doirq.c
index e207a99..6a91c9b 100755
--- a/arch/arm/src/armv8-m/arm_doirq.c
+++ b/arch/arm/src/armv8-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"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv8-m/arm_hardfault.c b/arch/arm/src/armv8-m/arm_hardfault.c
index 8719d02..9e88bbe 100755
--- a/arch/arm/src/armv8-m/arm_hardfault.c
+++ b/arch/arm/src/armv8-m/arm_hardfault.c
@@ -32,9 +32,9 @@
#include <nuttx/userspace.h>
#include <arch/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nvic.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/armv8-m/arm_initialstate.c b/arch/arm/src/armv8-m/arm_initialstate.c
index afd6487..ad6751f 100755
--- a/arch/arm/src/armv8-m/arm_initialstate.c
+++ b/arch/arm/src/armv8-m/arm_initialstate.c
@@ -31,8 +31,8 @@
#include <nuttx/arch.h>
#include <arch/armv8-m/nvicpri.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "psr.h"
#include "exc_return.h"
diff --git a/arch/arm/src/armv8-m/arm_itm.c b/arch/arm/src/armv8-m/arm_itm.c
index f69233c..7049777 100755
--- a/arch/arm/src/armv8-m/arm_itm.c
+++ b/arch/arm/src/armv8-m/arm_itm.c
@@ -70,7 +70,7 @@
#include <stdint.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "itm.h"
/****************************************************************************
diff --git a/arch/arm/src/armv8-m/arm_itm_syslog.c b/arch/arm/src/armv8-m/arm_itm_syslog.c
index e0a9ee5..13dee7c 100755
--- a/arch/arm/src/armv8-m/arm_itm_syslog.c
+++ b/arch/arm/src/armv8-m/arm_itm_syslog.c
@@ -49,7 +49,7 @@
#include "itm.h"
#include "tpi.h"
#include "dwt.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "itm_syslog.h"
#ifdef CONFIG_ARMV8M_ITMSYSLOG
diff --git a/arch/arm/src/armv8-m/arm_memfault.c b/arch/arm/src/armv8-m/arm_memfault.c
index 45809c4..7c1c281 100755
--- a/arch/arm/src/armv8-m/arm_memfault.c
+++ b/arch/arm/src/armv8-m/arm_memfault.c
@@ -29,9 +29,9 @@
#include <arch/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nvic.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/armv8-m/arm_mpu.c b/arch/arm/src/armv8-m/arm_mpu.c
index 0b70fa5..9a1ed64 100755
--- a/arch/arm/src/armv8-m/arm_mpu.c
+++ b/arch/arm/src/armv8-m/arm_mpu.c
@@ -28,7 +28,7 @@
#include <assert.h>
#include "mpu.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/*****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/armv8-m/arm_ramvec_initialize.c b/arch/arm/src/armv8-m/arm_ramvec_initialize.c
index fd76500..b0b71e8 100755
--- a/arch/arm/src/armv8-m/arm_ramvec_initialize.c
+++ b/arch/arm/src/armv8-m/arm_ramvec_initialize.c
@@ -33,8 +33,8 @@
#include "ram_vectors.h"
#include "chip.h" /* May redefine VECTAB fields */
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#ifdef CONFIG_ARCH_RAMVECTORS
diff --git a/arch/arm/src/armv8-m/arm_releasepending.c b/arch/arm/src/armv8-m/arm_releasepending.c
index 7a11ee2..5257302 100755
--- a/arch/arm/src/armv8-m/arm_releasepending.c
+++ b/arch/arm/src/armv8-m/arm_releasepending.c
@@ -30,7 +30,7 @@
#include <nuttx/sched.h>
#include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv8-m/arm_reprioritizertr.c b/arch/arm/src/armv8-m/arm_reprioritizertr.c
index 83dc213..992203b 100755
--- a/arch/arm/src/armv8-m/arm_reprioritizertr.c
+++ b/arch/arm/src/armv8-m/arm_reprioritizertr.c
@@ -32,7 +32,7 @@
#include <nuttx/sched.h>
#include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv8-m/arm_schedulesigaction.c b/arch/arm/src/armv8-m/arm_schedulesigaction.c
index 415b8b9..da5e169 100755
--- a/arch/arm/src/armv8-m/arm_schedulesigaction.c
+++ b/arch/arm/src/armv8-m/arm_schedulesigaction.c
@@ -35,8 +35,8 @@
#include "psr.h"
#include "exc_return.h"
#include "sched/sched.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "irq/irq.h"
diff --git a/arch/arm/src/armv8-m/arm_sigdeliver.c b/arch/arm/src/armv8-m/arm_sigdeliver.c
index 7c7729b..0a9a1c7 100755
--- a/arch/arm/src/armv8-m/arm_sigdeliver.c
+++ b/arch/arm/src/armv8-m/arm_sigdeliver.c
@@ -34,8 +34,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
diff --git a/arch/arm/src/armv8-m/arm_signal_dispatch.c b/arch/arm/src/armv8-m/arm_signal_dispatch.c
index 4e55ca8..eef30d7 100755
--- a/arch/arm/src/armv8-m/arm_signal_dispatch.c
+++ b/arch/arm/src/armv8-m/arm_signal_dispatch.c
@@ -26,7 +26,7 @@
#include <nuttx/arch.h>
#include "svcall.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#if (defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \
defined(CONFIG_BUILD_KERNEL)
diff --git a/arch/arm/src/armv8-m/arm_stackcheck.c b/arch/arm/src/armv8-m/arm_stackcheck.c
index 624b150..00df634 100755
--- a/arch/arm/src/armv8-m/arm_stackcheck.c
+++ b/arch/arm/src/armv8-m/arm_stackcheck.c
@@ -48,7 +48,7 @@
#include <stdint.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nvic.h"
/****************************************************************************
diff --git a/arch/arm/src/armv8-m/arm_svcall.c b/arch/arm/src/armv8-m/arm_svcall.c
index 8f382d7..9aa6c2c 100755
--- a/arch/arm/src/armv8-m/arm_svcall.c
+++ b/arch/arm/src/armv8-m/arm_svcall.c
@@ -40,7 +40,7 @@
#include "signal/signal.h"
#include "svcall.h"
#include "exc_return.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Private Functions
diff --git a/arch/arm/src/armv8-m/arm_systemreset.c b/arch/arm/src/armv8-m/arm_systemreset.c
index 0a0784e..05969e1 100755
--- a/arch/arm/src/armv8-m/arm_systemreset.c
+++ b/arch/arm/src/armv8-m/arm_systemreset.c
@@ -29,7 +29,7 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nvic.h"
/****************************************************************************
diff --git a/arch/arm/src/armv8-m/arm_systick.c b/arch/arm/src/armv8-m/arm_systick.c
index f053224..4751984 100755
--- a/arch/arm/src/armv8-m/arm_systick.c
+++ b/arch/arm/src/armv8-m/arm_systick.c
@@ -31,7 +31,7 @@
#include "nvic.h"
#include "systick.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#ifdef CONFIG_ARMV8M_SYSTICK
diff --git a/arch/arm/src/armv8-m/arm_trigger_irq.c b/arch/arm/src/armv8-m/arm_trigger_irq.c
index 4be5477..4215e2f 100755
--- a/arch/arm/src/armv8-m/arm_trigger_irq.c
+++ b/arch/arm/src/armv8-m/arm_trigger_irq.c
@@ -30,7 +30,7 @@
#include <nuttx/arch.h>
#include <arch/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nvic.h"
/****************************************************************************
diff --git a/arch/arm/src/armv8-m/arm_unblocktask.c b/arch/arm/src/armv8-m/arm_unblocktask.c
index 289048f..3cf70af 100755
--- a/arch/arm/src/armv8-m/arm_unblocktask.c
+++ b/arch/arm/src/armv8-m/arm_unblocktask.c
@@ -31,7 +31,7 @@
#include "sched/sched.h"
#include "clock/clock.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/armv8-m/arm_vectors.c b/arch/arm/src/armv8-m/arm_vectors.c
index 620643d..3b1a077 100755
--- a/arch/arm/src/armv8-m/arm_vectors.c
+++ b/arch/arm/src/armv8-m/arm_vectors.c
@@ -39,7 +39,7 @@
#include <nuttx/config.h>
#include "chip.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/armv8-m/mpu.h b/arch/arm/src/armv8-m/mpu.h
index 30dfc19..f17b62e 100755
--- a/arch/arm/src/armv8-m/mpu.h
+++ b/arch/arm/src/armv8-m/mpu.h
@@ -34,7 +34,7 @@
# include <assert.h>
# include <debug.h>
-# include "up_arch.h"
+# include "arm_arch.h"
#endif
/*********************************************************************************************
diff --git a/arch/arm/src/armv8-m/ram_vectors.h b/arch/arm/src/armv8-m/ram_vectors.h
index 5a19b4b..b305638 100755
--- a/arch/arm/src/armv8-m/ram_vectors.h
+++ b/arch/arm/src/armv8-m/ram_vectors.h
@@ -28,7 +28,7 @@
#include <nuttx/config.h>
#include <arch/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "chip.h"
#ifdef CONFIG_ARCH_RAMVECTORS
diff --git a/arch/arm/src/armv8-m/vfork.S b/arch/arm/src/armv8-m/vfork.S
index 96d9899..0b72867 100755
--- a/arch/arm/src/armv8-m/vfork.S
+++ b/arch/arm/src/armv8-m/vfork.S
@@ -24,7 +24,7 @@
#include <nuttx/config.h>
-#include "up_vfork.h"
+#include "arm_vfork.h"
/************************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/c5471/c5471_ethernet.c b/arch/arm/src/c5471/c5471_ethernet.c
index 0630758..72ae393 100644
--- a/arch/arm/src/c5471/c5471_ethernet.c
+++ b/arch/arm/src/c5471/c5471_ethernet.c
@@ -69,8 +69,8 @@
#endif
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/c5471/c5471_irq.c b/arch/arm/src/c5471/c5471_irq.c
index 8156ae5..36d087e 100644
--- a/arch/arm/src/c5471/c5471_irq.c
+++ b/arch/arm/src/c5471/c5471_irq.c
@@ -44,8 +44,8 @@
#include "arm.h"
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/c5471/c5471_lowputc.S b/arch/arm/src/c5471/c5471_lowputc.S
index 88932c5..d95408c 100644
--- a/arch/arm/src/c5471/c5471_lowputc.S
+++ b/arch/arm/src/c5471/c5471_lowputc.S
@@ -40,8 +40,8 @@
#include <nuttx/config.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
/**************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/c5471/c5471_serial.c b/arch/arm/src/c5471/c5471_serial.c
index 4ad0a74..0bea6f7 100644
--- a/arch/arm/src/c5471/c5471_serial.c
+++ b/arch/arm/src/c5471/c5471_serial.c
@@ -53,8 +53,8 @@
#include <nuttx/serial/serial.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/c5471/c5471_timerisr.c b/arch/arm/src/c5471/c5471_timerisr.c
index 48a3b14..0b8c866 100644
--- a/arch/arm/src/c5471/c5471_timerisr.c
+++ b/arch/arm/src/c5471/c5471_timerisr.c
@@ -44,9 +44,9 @@
#include <nuttx/arch.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "clock/clock.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/c5471/c5471_vectors.S b/arch/arm/src/c5471/c5471_vectors.S
index 18e7f90..38dd03f 100644
--- a/arch/arm/src/c5471/c5471_vectors.S
+++ b/arch/arm/src/c5471/c5471_vectors.S
@@ -42,7 +42,7 @@
#include "arm.h"
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
/************************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/c5471/c5471_watchdog.c b/arch/arm/src/c5471/c5471_watchdog.c
index 5541954..63dbe4c 100644
--- a/arch/arm/src/c5471/c5471_watchdog.c
+++ b/arch/arm/src/c5471/c5471_watchdog.c
@@ -51,7 +51,7 @@
#include <nuttx/timers/watchdog.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/common/arm_allocateheap.c b/arch/arm/src/common/arm_allocateheap.c
index 6d00fb3..1ac550d 100644
--- a/arch/arm/src/common/arm_allocateheap.c
+++ b/arch/arm/src/common/arm_allocateheap.c
@@ -35,8 +35,8 @@
#include <arch/board/board.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/common/up_arch.h b/arch/arm/src/common/arm_arch.h
similarity index 52%
rename from arch/arm/src/common/up_arch.h
rename to arch/arm/src/common/arm_arch.h
index a3536ae..aeea016 100644
--- a/arch/arm/src/common/up_arch.h
+++ b/arch/arm/src/common/arm_arch.h
@@ -1,40 +1,25 @@
/****************************************************************************
- * arch/arm/src/common/up_arch.h
+ * arch/arm/src/common/arm_arch.h
*
- * Copyright (C) 2007-2009, 2017 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
*
****************************************************************************/
-#ifndef ___ARCH_ARM_SRC_COMMON_UP_ARCH_H
-#define ___ARCH_ARM_SRC_COMMON_UP_ARCH_H
+#ifndef ___ARCH_ARM_SRC_COMMON_ARM_ARCH_H
+#define ___ARCH_ARM_SRC_COMMON_ARM_ARCH_H
/****************************************************************************
* Included Files
@@ -89,4 +74,4 @@ void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* ___ARCH_ARM_SRC_COMMON_UP_ARCH_H */
+#endif /* ___ARCH_ARM_SRC_COMMON_ARM_ARCH_H */
diff --git a/arch/arm/src/common/arm_checkstack.c b/arch/arm/src/common/arm_checkstack.c
index 0d7569d..6ee453b 100644
--- a/arch/arm/src/common/arm_checkstack.c
+++ b/arch/arm/src/common/arm_checkstack.c
@@ -50,7 +50,7 @@
#include <nuttx/board.h>
#include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#include "chip.h"
#ifdef CONFIG_STACK_COLORATION
diff --git a/arch/arm/src/common/arm_createstack.c b/arch/arm/src/common/arm_createstack.c
index 6753bca..3ee27ec 100644
--- a/arch/arm/src/common/arm_createstack.c
+++ b/arch/arm/src/common/arm_createstack.c
@@ -37,8 +37,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 Macros
diff --git a/arch/arm/src/common/arm_etherstub.c b/arch/arm/src/common/arm_etherstub.c
index 0cb5e0c..556e7e5 100644
--- a/arch/arm/src/common/arm_etherstub.c
+++ b/arch/arm/src/common/arm_etherstub.c
@@ -39,7 +39,7 @@
#include <nuttx/config.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/common/arm_exit.c b/arch/arm/src/common/arm_exit.c
index 12df324..a4285d5 100644
--- a/arch/arm/src/common/arm_exit.c
+++ b/arch/arm/src/common/arm_exit.c
@@ -37,7 +37,7 @@
#include "sched/sched.h"
#include "group/group.h"
#include "irq/irq.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/common/arm_idle.c b/arch/arm/src/common/arm_idle.c
index a9bdfb2..d29fca0 100644
--- a/arch/arm/src/common/arm_idle.c
+++ b/arch/arm/src/common/arm_idle.c
@@ -40,7 +40,7 @@
#include <nuttx/config.h>
#include <nuttx/arch.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/common/arm_initialize.c b/arch/arm/src/common/arm_initialize.c
index 27f8ce4..2afa2eb 100644
--- a/arch/arm/src/common/arm_initialize.c
+++ b/arch/arm/src/common/arm_initialize.c
@@ -41,8 +41,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"
/****************************************************************************
diff --git a/arch/arm/src/common/up_internal.h b/arch/arm/src/common/arm_internal.h
similarity index 98%
rename from arch/arm/src/common/up_internal.h
rename to arch/arm/src/common/arm_internal.h
index 2824cf9..75e9fa3 100644
--- a/arch/arm/src/common/up_internal.h
+++ b/arch/arm/src/common/arm_internal.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * common/up_internal.h
+ * arch/arm/src/common/arm_internal.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,8 +18,8 @@
*
****************************************************************************/
-#ifndef __ARCH_ARM_SRC_COMMON_UP_INTERNAL_H
-#define __ARCH_ARM_SRC_COMMON_UP_INTERNAL_H
+#ifndef __ARCH_ARM_SRC_COMMON_ARM_INTERNAL_H
+#define __ARCH_ARM_SRC_COMMON_ARM_INTERNAL_H
/****************************************************************************
* Included Files
@@ -499,4 +499,4 @@ void up_stack_color(FAR void *stackbase, size_t nbytes);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_ARM_SRC_COMMON_UP_INTERNAL_H */
+#endif /* __ARCH_ARM_SRC_COMMON_ARM_INTERNAL_H */
diff --git a/arch/arm/src/common/arm_interruptcontext.c b/arch/arm/src/common/arm_interruptcontext.c
index d7bbd67..0738535 100644
--- a/arch/arm/src/common/arm_interruptcontext.c
+++ b/arch/arm/src/common/arm_interruptcontext.c
@@ -43,7 +43,7 @@
#include <nuttx/arch.h>
#include <nuttx/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/common/arm_lowputs.c b/arch/arm/src/common/arm_lowputs.c
index 9d25b1a..8a75b88 100644
--- a/arch/arm/src/common/arm_lowputs.c
+++ b/arch/arm/src/common/arm_lowputs.c
@@ -39,7 +39,7 @@
#include <nuttx/config.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/common/arm_modifyreg16.c b/arch/arm/src/common/arm_modifyreg16.c
index 6292cf2..b2ebe95 100644
--- a/arch/arm/src/common/arm_modifyreg16.c
+++ b/arch/arm/src/common/arm_modifyreg16.c
@@ -45,7 +45,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
-#include "up_arch.h"
+#include "arm_arch.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/common/arm_modifyreg32.c b/arch/arm/src/common/arm_modifyreg32.c
index 9e51e97..66ddd78 100644
--- a/arch/arm/src/common/arm_modifyreg32.c
+++ b/arch/arm/src/common/arm_modifyreg32.c
@@ -45,7 +45,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
-#include "up_arch.h"
+#include "arm_arch.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/common/arm_modifyreg8.c b/arch/arm/src/common/arm_modifyreg8.c
index 796b049..1e3db5d 100644
--- a/arch/arm/src/common/arm_modifyreg8.c
+++ b/arch/arm/src/common/arm_modifyreg8.c
@@ -45,7 +45,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
-#include "up_arch.h"
+#include "arm_arch.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/common/arm_pthread_start.c b/arch/arm/src/common/arm_pthread_start.c
index 5ca180d..9607c91 100644
--- a/arch/arm/src/common/arm_pthread_start.c
+++ b/arch/arm/src/common/arm_pthread_start.c
@@ -42,7 +42,7 @@
#include <nuttx/arch.h>
#include "svcall.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#if ((defined(CONFIG_BUILD_PROTECTED) && defined(__KERNEL__)) || \
defined(CONFIG_BUILD_KERNEL)) && !defined(CONFIG_DISABLE_PTHREAD)
diff --git a/arch/arm/src/common/arm_puts.c b/arch/arm/src/common/arm_puts.c
index 658980e..9f32ef4 100644
--- a/arch/arm/src/common/arm_puts.c
+++ b/arch/arm/src/common/arm_puts.c
@@ -40,7 +40,7 @@
#include <nuttx/config.h>
#include <nuttx/arch.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/common/arm_releasestack.c b/arch/arm/src/common/arm_releasestack.c
index ba620db..e7bc25a 100644
--- a/arch/arm/src/common/arm_releasestack.c
+++ b/arch/arm/src/common/arm_releasestack.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
#include <nuttx/kmalloc.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/common/arm_semi_syslog.c b/arch/arm/src/common/arm_semi_syslog.c
index 33261f6..659c491 100644
--- a/arch/arm/src/common/arm_semi_syslog.c
+++ b/arch/arm/src/common/arm_semi_syslog.c
@@ -42,7 +42,7 @@
#include <syscall.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#ifdef CONFIG_ARM_SEMIHOSTING_SYSLOG
diff --git a/arch/arm/src/common/arm_stackframe.c b/arch/arm/src/common/arm_stackframe.c
index 7f8fa91..a4285f8 100644
--- a/arch/arm/src/common/arm_stackframe.c
+++ b/arch/arm/src/common/arm_stackframe.c
@@ -47,7 +47,7 @@
#include <nuttx/arch.h>
#include <arch/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Macros
diff --git a/arch/arm/src/common/arm_task_start.c b/arch/arm/src/common/arm_task_start.c
index eeff19a..ce2a137 100644
--- a/arch/arm/src/common/arm_task_start.c
+++ b/arch/arm/src/common/arm_task_start.c
@@ -41,7 +41,7 @@
#include <nuttx/arch.h>
#include "svcall.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#if defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL)
diff --git a/arch/arm/src/common/arm_usestack.c b/arch/arm/src/common/arm_usestack.c
index c892ae0..06e81be 100644
--- a/arch/arm/src/common/arm_usestack.c
+++ b/arch/arm/src/common/arm_usestack.c
@@ -35,7 +35,7 @@
#include <nuttx/arch.h>
#include <nuttx/tls.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Macros
diff --git a/arch/arm/src/common/arm_vfork.c b/arch/arm/src/common/arm_vfork.c
index 9012d9c..c5555bc 100644
--- a/arch/arm/src/common/arm_vfork.c
+++ b/arch/arm/src/common/arm_vfork.c
@@ -34,7 +34,7 @@
#include <nuttx/arch.h>
#include <arch/irq.h>
-#include "up_vfork.h"
+#include "arm_vfork.h"
#include "sched/sched.h"
/****************************************************************************
diff --git a/arch/arm/src/armv8-m/arm_memfault.c b/arch/arm/src/common/arm_vfork.h
old mode 100755
new mode 100644
similarity index 52%
copy from arch/arm/src/armv8-m/arm_memfault.c
copy to arch/arm/src/common/arm_vfork.h
index 45809c4..2870460
--- a/arch/arm/src/armv8-m/arm_memfault.c
+++ b/arch/arm/src/common/arm_vfork.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/arm/src/armv8-m/arm_memfault.c
+ * arch/arm/src/common/arm_vfork.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,60 +18,56 @@
*
****************************************************************************/
+#ifndef __ARCH_ARM_SRC_COMMON_ARM_VFORK_H
+#define __ARCH_ARM_SRC_COMMON_ARM_VFORK_H
+
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
-#include <assert.h>
-#include <debug.h>
-
-#include <arch/irq.h>
-
-#include "up_arch.h"
-#include "nvic.h"
-#include "up_internal.h"
-
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
-#ifdef CONFIG_DEBUG_MEMFAULT
-# define mferr(format, ...) _alert(format, ##__VA_ARGS__)
-# define mfinfo(format, ...) _alert(format, ##__VA_ARGS__)
-#else
-# define mferr(x...)
-# define mfinfo(x...)
-#endif
+#define VFORK_R4_OFFSET (0*4) /* Volatile register r4 */
+#define VFORK_R5_OFFSET (1*4) /* Volatile register r5 */
+#define VFORK_R6_OFFSET (2*4) /* Volatile register r6 */
+#define VFORK_R7_OFFSET (3*4) /* Volatile register r7 */
+#define VFORK_R8_OFFSET (4*4) /* Volatile register r8 */
+#define VFORK_R9_OFFSET (5*4) /* Volatile register r9 */
+#define VFORK_R10_OFFSET (6*4) /* Volatile register r10 */
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
+#define VFORK_FP_OFFSET (7*4) /* Frame pointer */
+#define VFORK_SP_OFFSET (8*4) /* Stack pointer*/
+#define VFORK_LR_OFFSET (9*4) /* Return address*/
+
+#define VFORK_SIZEOF (10*4)
/****************************************************************************
- * Name: up_memfault
- *
- * Description:
- * This is Memory Management Fault exception handler. Normally we get
- * here when the Cortex M3 MPU is enabled and an MPU fault is detected.
- * However, I understand that there are other error conditions that can
- * also generate memory management faults.
- *
+ * Public Types
****************************************************************************/
-int up_memfault(int irq, FAR void *context, FAR void *arg)
+#ifndef __ASSEMBLY__
+struct vfork_s
{
- /* Dump some memory management fault info */
+ /* CPU registers */
- up_irq_save();
- _alert("PANIC!!! Memory Management Fault:\n");
- mfinfo(" IRQ: %d context: %p\n", irq, context);
- _alert(" CFAULTS: %08x MMFAR: %08x\n",
- getreg32(NVIC_CFAULTS), getreg32(NVIC_MEMMANAGE_ADDR));
- mfinfo(" BASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n",
- getbasepri(), getprimask(), getipsr(), getcontrol());
+ uint32_t r4; /* Volatile register r4 */
+ uint32_t r5; /* Volatile register r5 */
+ uint32_t r6; /* Volatile register r6 */
+ uint32_t r7; /* Volatile register r7 */
+ uint32_t r8; /* Volatile register r8 */
+ uint32_t r9; /* Volatile register r9 */
+ uint32_t r10; /* Volatile register r10 */
+
+ uint32_t fp; /* Frame pointer */
+ uint32_t sp; /* Stack pointer*/
+ uint32_t lr; /* Return address*/
+
+ /* Floating point registers (not yet) */
+};
+#endif
- PANIC();
- return OK; /* Won't get here */
-}
+#endif /* __ARCH_ARM_SRC_COMMON_ARM_VFORK_H */
diff --git a/arch/arm/src/common/up_vfork.h b/arch/arm/src/common/up_vfork.h
deleted file mode 100644
index 97edf9a..0000000
--- a/arch/arm/src/common/up_vfork.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/****************************************************************************
- * arch/arm/src/common/up_vfork.h
- *
- * Copyright (C) 2013 Gregory Nutt. All rights reserved.
- * Author: Gregory Nutt <gn...@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- * used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-#ifndef __ARCH_ARM_SRC_ARM_VFORK_H
-#define __ARCH_ARM_SRC_ARM_VFORK_H
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#define VFORK_R4_OFFSET (0*4) /* Volatile register r4 */
-#define VFORK_R5_OFFSET (1*4) /* Volatile register r5 */
-#define VFORK_R6_OFFSET (2*4) /* Volatile register r6 */
-#define VFORK_R7_OFFSET (3*4) /* Volatile register r7 */
-#define VFORK_R8_OFFSET (4*4) /* Volatile register r8 */
-#define VFORK_R9_OFFSET (5*4) /* Volatile register r9 */
-#define VFORK_R10_OFFSET (6*4) /* Volatile register r10 */
-
-#define VFORK_FP_OFFSET (7*4) /* Frame pointer */
-#define VFORK_SP_OFFSET (8*4) /* Stack pointer*/
-#define VFORK_LR_OFFSET (9*4) /* Return address*/
-
-#define VFORK_SIZEOF (10*4)
-
-/****************************************************************************
- * Public Types
- ****************************************************************************/
-
-#ifndef __ASSEMBLY__
-struct vfork_s
-{
- /* CPU registers */
-
- uint32_t r4; /* Volatile register r4 */
- uint32_t r5; /* Volatile register r5 */
- uint32_t r6; /* Volatile register r6 */
- uint32_t r7; /* Volatile register r7 */
- uint32_t r8; /* Volatile register r8 */
- uint32_t r9; /* Volatile register r9 */
- uint32_t r10; /* Volatile register r10 */
-
- uint32_t fp; /* Frame pointer */
- uint32_t sp; /* Stack pointer*/
- uint32_t lr; /* Return address*/
-
- /* Floating point registers (not yet) */
-};
-#endif
-
-#endif /* __ARCH_ARM_SRC_ARM_VFORK_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_adc.c b/arch/arm/src/cxd56xx/cxd56_adc.c
index d098a72..45a5298 100644
--- a/arch/arm/src/cxd56xx/cxd56_adc.c
+++ b/arch/arm/src/cxd56xx/cxd56_adc.c
@@ -54,7 +54,7 @@
#include <arch/chip/adc.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/cxd56_adc.h"
#include "hardware/cxd56_scuseq.h"
#include "cxd56_clock.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_allocateheap.c b/arch/arm/src/cxd56xx/cxd56_allocateheap.c
index e68f371..16d8789 100644
--- a/arch/arm/src/cxd56xx/cxd56_allocateheap.c
+++ b/arch/arm/src/cxd56xx/cxd56_allocateheap.c
@@ -52,8 +52,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Data
diff --git a/arch/arm/src/cxd56xx/cxd56_cisif.c b/arch/arm/src/cxd56xx/cxd56_cisif.c
index c5bdbbc..cb44a7a 100644
--- a/arch/arm/src/cxd56xx/cxd56_cisif.c
+++ b/arch/arm/src/cxd56xx/cxd56_cisif.c
@@ -52,7 +52,7 @@
#include <arch/chip/cisif.h>
#include <nuttx/video/video.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "cxd56_clock.h"
#include "hardware/cxd56_cisif.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_clock.c b/arch/arm/src/cxd56xx/cxd56_clock.c
index 0c057f1..c4edcad 100644
--- a/arch/arm/src/cxd56xx/cxd56_clock.c
+++ b/arch/arm/src/cxd56xx/cxd56_clock.c
@@ -49,7 +49,7 @@
#include <arch/chip/pm.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "hardware/cxd56_crg.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_cpufifo.c b/arch/arm/src/cxd56xx/cxd56_cpufifo.c
index 8d73978..d9dc0c0 100644
--- a/arch/arm/src/cxd56xx/cxd56_cpufifo.c
+++ b/arch/arm/src/cxd56xx/cxd56_cpufifo.c
@@ -44,7 +44,7 @@
#include <debug.h>
#include <errno.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "hardware/cxd56_cpufifo.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_cpuidlestack.c b/arch/arm/src/cxd56xx/cxd56_cpuidlestack.c
index 2f8f751..2c82015 100644
--- a/arch/arm/src/cxd56xx/cxd56_cpuidlestack.c
+++ b/arch/arm/src/cxd56xx/cxd56_cpuidlestack.c
@@ -44,7 +44,7 @@
#include <nuttx/arch.h>
#include <nuttx/sched.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#ifdef CONFIG_SMP
diff --git a/arch/arm/src/cxd56xx/cxd56_cpuindex.c b/arch/arm/src/cxd56xx/cxd56_cpuindex.c
index 8ddb11b..f850af0 100644
--- a/arch/arm/src/cxd56xx/cxd56_cpuindex.c
+++ b/arch/arm/src/cxd56xx/cxd56_cpuindex.c
@@ -41,7 +41,7 @@
#include <stdint.h>
#include <nuttx/arch.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#ifdef CONFIG_SMP
diff --git a/arch/arm/src/cxd56xx/cxd56_cpupause.c b/arch/arm/src/cxd56xx/cxd56_cpupause.c
index 795bef7..7dc704a 100644
--- a/arch/arm/src/cxd56xx/cxd56_cpupause.c
+++ b/arch/arm/src/cxd56xx/cxd56_cpupause.c
@@ -49,9 +49,9 @@
#include <nuttx/spinlock.h>
#include <nuttx/sched_note.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#include "hardware/cxd5602_memorymap.h"
#ifdef CONFIG_SMP
diff --git a/arch/arm/src/cxd56xx/cxd56_cpustart.c b/arch/arm/src/cxd56xx/cxd56_cpustart.c
index ff40222..0f75a99 100644
--- a/arch/arm/src/cxd56xx/cxd56_cpustart.c
+++ b/arch/arm/src/cxd56xx/cxd56_cpustart.c
@@ -51,10 +51,10 @@
#include <nuttx/sched_note.h>
#include "nvic.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "sched/sched.h"
#include "init/init.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#include "hardware/cxd56_crg.h"
#include "hardware/cxd5602_memorymap.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_emmc.c b/arch/arm/src/cxd56xx/cxd56_emmc.c
index 7bd93f9..4c4406e 100644
--- a/arch/arm/src/cxd56xx/cxd56_emmc.c
+++ b/arch/arm/src/cxd56xx/cxd56_emmc.c
@@ -53,7 +53,7 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "cxd56_clock.h"
#include "cxd56_emmc.h"
#include "hardware/cxd56_emmc.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_farapi.c b/arch/arm/src/cxd56xx/cxd56_farapi.c
index c5f793a..980dbfe 100644
--- a/arch/arm/src/cxd56xx/cxd56_farapi.c
+++ b/arch/arm/src/cxd56xx/cxd56_farapi.c
@@ -47,8 +47,8 @@
#include <arch/chip/pm.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "chip.h"
#include "cxd56_icc.h"
#include "cxd56_config.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_ge2d.c b/arch/arm/src/cxd56xx/cxd56_ge2d.c
index 512a56f..48cdb2d 100644
--- a/arch/arm/src/cxd56xx/cxd56_ge2d.c
+++ b/arch/arm/src/cxd56xx/cxd56_ge2d.c
@@ -51,7 +51,7 @@
#include <debug.h>
#include <errno.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "cxd56_clock.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_gpio.c b/arch/arm/src/cxd56xx/cxd56_gpio.c
index 74d35c6..bfb6a10 100644
--- a/arch/arm/src/cxd56xx/cxd56_gpio.c
+++ b/arch/arm/src/cxd56xx/cxd56_gpio.c
@@ -50,7 +50,7 @@
#include <debug.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "cxd56_pinconfig.h"
#include "cxd56_gpio.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_gpioint.c b/arch/arm/src/cxd56xx/cxd56_gpioint.c
index 669a131..8c00cc0 100644
--- a/arch/arm/src/cxd56xx/cxd56_gpioint.c
+++ b/arch/arm/src/cxd56xx/cxd56_gpioint.c
@@ -48,7 +48,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "cxd56_pinconfig.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_i2c.c b/arch/arm/src/cxd56xx/cxd56_i2c.c
index 1428ee7..24cbd30 100644
--- a/arch/arm/src/cxd56xx/cxd56_i2c.c
+++ b/arch/arm/src/cxd56xx/cxd56_i2c.c
@@ -55,8 +55,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "cxd56_clock.h"
#include "cxd56_i2c.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_icc.c b/arch/arm/src/cxd56xx/cxd56_icc.c
index aa6be14..d6d26fe 100644
--- a/arch/arm/src/cxd56xx/cxd56_icc.c
+++ b/arch/arm/src/cxd56xx/cxd56_icc.c
@@ -51,7 +51,7 @@
#include <debug.h>
#include <errno.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "cxd56_cpufifo.h"
#include "cxd56_icc.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_idle.c b/arch/arm/src/cxd56xx/cxd56_idle.c
index a73254f..ecec21c 100644
--- a/arch/arm/src/cxd56xx/cxd56_idle.c
+++ b/arch/arm/src/cxd56xx/cxd56_idle.c
@@ -48,7 +48,7 @@
#include <nuttx/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/cxd56xx/cxd56_irq.c b/arch/arm/src/cxd56xx/cxd56_irq.c
index c07c757..bd1fc5d 100644
--- a/arch/arm/src/cxd56xx/cxd56_irq.c
+++ b/arch/arm/src/cxd56xx/cxd56_irq.c
@@ -51,8 +51,8 @@
#include "chip.h"
#include "nvic.h"
#include "ram_vectors.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "cxd56_irq.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_pinconfig.c b/arch/arm/src/cxd56xx/cxd56_pinconfig.c
index 7b7d2e1..1e483a6 100644
--- a/arch/arm/src/cxd56xx/cxd56_pinconfig.c
+++ b/arch/arm/src/cxd56xx/cxd56_pinconfig.c
@@ -50,7 +50,7 @@
#include <debug.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "cxd56_pinconfig.h"
#include "hardware/cxd5602_topreg.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_powermgr.c b/arch/arm/src/cxd56xx/cxd56_powermgr.c
index f355666..2a57f04 100644
--- a/arch/arm/src/cxd56xx/cxd56_powermgr.c
+++ b/arch/arm/src/cxd56xx/cxd56_powermgr.c
@@ -52,8 +52,8 @@
#include <arch/chip/pm.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "cxd56_powermgr.h"
#include "cxd56_icc.h"
#include "cxd56_pmic.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c b/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c
index 8dbd304..3b85ee1 100644
--- a/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c
+++ b/arch/arm/src/cxd56xx/cxd56_powermgr_procfs.c
@@ -52,7 +52,7 @@
#include "cxd56_clock.h"
#include "cxd56_powermgr.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/cxd56_crg.h"
#include "hardware/cxd5602_topreg.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_pwm.c b/arch/arm/src/cxd56xx/cxd56_pwm.c
index 37dc059..4eb1a40 100644
--- a/arch/arm/src/cxd56xx/cxd56_pwm.c
+++ b/arch/arm/src/cxd56xx/cxd56_pwm.c
@@ -48,7 +48,7 @@
#include <debug.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "cxd56_pinconfig.h"
#include "cxd56_clock.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_rtc.c b/arch/arm/src/cxd56xx/cxd56_rtc.c
index 83e9753..8d624ac 100644
--- a/arch/arm/src/cxd56xx/cxd56_rtc.c
+++ b/arch/arm/src/cxd56xx/cxd56_rtc.c
@@ -52,7 +52,7 @@
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "cxd56_rtc.h"
#include "hardware/cxd5602_topreg.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_scu.c b/arch/arm/src/cxd56xx/cxd56_scu.c
index 67fe218..6040d19 100644
--- a/arch/arm/src/cxd56xx/cxd56_scu.c
+++ b/arch/arm/src/cxd56xx/cxd56_scu.c
@@ -52,7 +52,7 @@
#include <arch/chip/scu.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "cxd56_scufifo.h"
#include "cxd56_clock.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_scufifo.c b/arch/arm/src/cxd56xx/cxd56_scufifo.c
index 49e4064..6258cdb 100644
--- a/arch/arm/src/cxd56xx/cxd56_scufifo.c
+++ b/arch/arm/src/cxd56xx/cxd56_scufifo.c
@@ -47,7 +47,7 @@
#include <arch/chip/scu.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "cxd56_scufifo.h"
#include "hardware/cxd56_scufifo.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_sdhci.c b/arch/arm/src/cxd56xx/cxd56_sdhci.c
index 6c60c08..d6e556a 100644
--- a/arch/arm/src/cxd56xx/cxd56_sdhci.c
+++ b/arch/arm/src/cxd56xx/cxd56_sdhci.c
@@ -63,7 +63,7 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "cxd56_sdhci.h"
#include "cxd56_clock.h"
#include "cxd56_pinconfig.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_serial.c b/arch/arm/src/cxd56xx/cxd56_serial.c
index 9942d29..b69efcf 100644
--- a/arch/arm/src/cxd56xx/cxd56_serial.c
+++ b/arch/arm/src/cxd56xx/cxd56_serial.c
@@ -60,8 +60,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "cxd56_config.h"
#include "cxd56_serial.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_sph.c b/arch/arm/src/cxd56xx/cxd56_sph.c
index 83299f8..f7cf523 100644
--- a/arch/arm/src/cxd56xx/cxd56_sph.c
+++ b/arch/arm/src/cxd56xx/cxd56_sph.c
@@ -50,7 +50,7 @@
#include <debug.h>
#include <errno.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "hardware/cxd56_sph.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_spi.c b/arch/arm/src/cxd56xx/cxd56_spi.c
index 7190192..72caec9 100644
--- a/arch/arm/src/cxd56xx/cxd56_spi.c
+++ b/arch/arm/src/cxd56xx/cxd56_spi.c
@@ -53,8 +53,8 @@
#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_start.c b/arch/arm/src/cxd56xx/cxd56_start.c
index d0bbc49..1460a5b 100644
--- a/arch/arm/src/cxd56xx/cxd56_start.c
+++ b/arch/arm/src/cxd56xx/cxd56_start.c
@@ -74,8 +74,8 @@
#include <arch/irq.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "nvic.h"
#include "sched/sched.h"
#include "init/init.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_timer.c b/arch/arm/src/cxd56xx/cxd56_timer.c
index f1c866a..d518ce0 100644
--- a/arch/arm/src/cxd56xx/cxd56_timer.c
+++ b/arch/arm/src/cxd56xx/cxd56_timer.c
@@ -52,7 +52,7 @@
#include <arch/board/board.h>
#include <arch/chip/timer.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "cxd56_timer.h"
#include "hardware/cxd56_timer.h"
#include "cxd56_clock.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_timerisr.c b/arch/arm/src/cxd56xx/cxd56_timerisr.c
index 95a4d7c..59b8f5a 100644
--- a/arch/arm/src/cxd56xx/cxd56_timerisr.c
+++ b/arch/arm/src/cxd56xx/cxd56_timerisr.c
@@ -49,8 +49,8 @@
#include "nvic.h"
#include "clock/clock.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "cxd56_powermgr.h"
#include "cxd56_timerisr.h"
#include "cxd56_clock.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_uart.c b/arch/arm/src/cxd56xx/cxd56_uart.c
index 4744b2c..57629e9 100644
--- a/arch/arm/src/cxd56xx/cxd56_uart.c
+++ b/arch/arm/src/cxd56xx/cxd56_uart.c
@@ -47,8 +47,8 @@
#include <errno.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
#include "cxd56_config.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_uart0.c b/arch/arm/src/cxd56xx/cxd56_uart0.c
index c83d4b5..2282c66 100644
--- a/arch/arm/src/cxd56xx/cxd56_uart0.c
+++ b/arch/arm/src/cxd56xx/cxd56_uart0.c
@@ -51,7 +51,7 @@
#include <debug.h>
#include <errno.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "cxd56_pinconfig.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_udmac.c b/arch/arm/src/cxd56xx/cxd56_udmac.c
index 55e4649..e78b698 100644
--- a/arch/arm/src/cxd56xx/cxd56_udmac.c
+++ b/arch/arm/src/cxd56xx/cxd56_udmac.c
@@ -51,7 +51,7 @@
#include <nuttx/arch.h>
#include <nuttx/semaphore.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "cxd56_clock.h"
#include "hardware/cxd56_udmac.h"
#include "cxd56_udmac.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_uid.c b/arch/arm/src/cxd56xx/cxd56_uid.c
index e56190c..1891d5a 100644
--- a/arch/arm/src/cxd56xx/cxd56_uid.c
+++ b/arch/arm/src/cxd56xx/cxd56_uid.c
@@ -40,7 +40,7 @@
#include <nuttx/config.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "cxd56_uid.h"
#include "hardware/cxd5602_topreg.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_usbdev.c b/arch/arm/src/cxd56xx/cxd56_usbdev.c
index ccb3de8..fc1748b 100644
--- a/arch/arm/src/cxd56xx/cxd56_usbdev.c
+++ b/arch/arm/src/cxd56xx/cxd56_usbdev.c
@@ -67,8 +67,8 @@
#include <arch/chip/pm.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "cxd56_clock.h"
#include "cxd56_usbdev.h"
#include "hardware/cxd5602_topreg.h"
diff --git a/arch/arm/src/cxd56xx/cxd56_wdt.c b/arch/arm/src/cxd56xx/cxd56_wdt.c
index 614f5f5..ae78d49 100644
--- a/arch/arm/src/cxd56xx/cxd56_wdt.c
+++ b/arch/arm/src/cxd56xx/cxd56_wdt.c
@@ -50,7 +50,7 @@
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "cxd56_clock.h"
#include "cxd56_wdt.h"
#include "cxd56_powermgr.h"
diff --git a/arch/arm/src/dm320/dm320_allocateheap.c b/arch/arm/src/dm320/dm320_allocateheap.c
index d1a96f8..cfbdd76 100644
--- a/arch/arm/src/dm320/dm320_allocateheap.c
+++ b/arch/arm/src/dm320/dm320_allocateheap.c
@@ -46,8 +46,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/dm320/dm320_boot.c b/arch/arm/src/dm320/dm320_boot.c
index aba87ed..92f1ec3 100644
--- a/arch/arm/src/dm320/dm320_boot.c
+++ b/arch/arm/src/dm320/dm320_boot.c
@@ -42,8 +42,8 @@
#include "chip.h"
#include "arm.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include <nuttx/board.h>
diff --git a/arch/arm/src/dm320/dm320_decodeirq.c b/arch/arm/src/dm320/dm320_decodeirq.c
index c621cf9..a2d618b 100644
--- a/arch/arm/src/dm320/dm320_decodeirq.c
+++ b/arch/arm/src/dm320/dm320_decodeirq.c
@@ -46,8 +46,8 @@
#include <debug.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "group/group.h"
diff --git a/arch/arm/src/dm320/dm320_framebuffer.c b/arch/arm/src/dm320/dm320_framebuffer.c
index cd7b273..1e46746 100644
--- a/arch/arm/src/dm320/dm320_framebuffer.c
+++ b/arch/arm/src/dm320/dm320_framebuffer.c
@@ -50,7 +50,7 @@
#include <nuttx/video/fb.h>
#include <nuttx/nx/nxglib.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "dm320_memorymap.h"
#include "dm320_osd.h"
diff --git a/arch/arm/src/dm320/dm320_gio.h b/arch/arm/src/dm320/dm320_gio.h
index 10bbb94..73ee212 100644
--- a/arch/arm/src/dm320/dm320_gio.h
+++ b/arch/arm/src/dm320/dm320_gio.h
@@ -42,7 +42,7 @@
#ifndef __ASSEMBLY__
# include <stdint.h>
-# include "up_arch.h"
+# include "arm_arch.h"
#endif
/************************************************************************************
diff --git a/arch/arm/src/dm320/dm320_irq.c b/arch/arm/src/dm320/dm320_irq.c
index 6564fef..0c0fffe 100644
--- a/arch/arm/src/dm320/dm320_irq.c
+++ b/arch/arm/src/dm320/dm320_irq.c
@@ -45,8 +45,8 @@
#include "arm.h"
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/dm320/dm320_lowputc.S b/arch/arm/src/dm320/dm320_lowputc.S
index 5e1f03f..6934375 100644
--- a/arch/arm/src/dm320/dm320_lowputc.S
+++ b/arch/arm/src/dm320/dm320_lowputc.S
@@ -41,8 +41,8 @@
#include <nuttx/config.h>
#include "chip.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
/**************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/dm320/dm320_restart.S b/arch/arm/src/dm320/dm320_restart.S
index 4fef749..a8366c7 100644
--- a/arch/arm/src/dm320/dm320_restart.S
+++ b/arch/arm/src/dm320/dm320_restart.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"
/********************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/dm320/dm320_serial.c b/arch/arm/src/dm320/dm320_serial.c
index 15752ff..3dd2648 100644
--- a/arch/arm/src/dm320/dm320_serial.c
+++ b/arch/arm/src/dm320/dm320_serial.c
@@ -54,8 +54,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#ifdef USE_SERIALDRIVER
diff --git a/arch/arm/src/dm320/dm320_timerisr.c b/arch/arm/src/dm320/dm320_timerisr.c
index ca223e2..9de0fe7 100644
--- a/arch/arm/src/dm320/dm320_timerisr.c
+++ b/arch/arm/src/dm320/dm320_timerisr.c
@@ -45,9 +45,9 @@
#include <nuttx/arch.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "clock/clock.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/dm320/dm320_usbdev.c b/arch/arm/src/dm320/dm320_usbdev.c
index c21cc48..083b4fd 100644
--- a/arch/arm/src/dm320/dm320_usbdev.c
+++ b/arch/arm/src/dm320/dm320_usbdev.c
@@ -57,8 +57,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "dm320_usb.h"
/****************************************************************************
diff --git a/arch/arm/src/efm32/efm32_adc.c b/arch/arm/src/efm32/efm32_adc.c
index 4227389..c5bf988 100644
--- a/arch/arm/src/efm32/efm32_adc.c
+++ b/arch/arm/src/efm32/efm32_adc.c
@@ -57,8 +57,8 @@
#include <nuttx/arch.h>
#include <nuttx/analog/adc.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
#include "efm32.h"
diff --git a/arch/arm/src/efm32/efm32_clockconfig.c b/arch/arm/src/efm32/efm32_clockconfig.c
index 2d2bd90..fbf82f4 100644
--- a/arch/arm/src/efm32/efm32_clockconfig.c
+++ b/arch/arm/src/efm32/efm32_clockconfig.c
@@ -45,7 +45,7 @@
#include <stdbool.h>
#include <assert.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "itm_syslog.h"
diff --git a/arch/arm/src/efm32/efm32_dma.c b/arch/arm/src/efm32/efm32_dma.c
index a6d62bd..02267ff 100644
--- a/arch/arm/src/efm32/efm32_dma.c
+++ b/arch/arm/src/efm32/efm32_dma.c
@@ -49,7 +49,7 @@
#include <nuttx/arch.h>
#include <nuttx/semaphore.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/efm32_cmu.h"
#include "hardware/efm32_dma.h"
#include "efm32_dma.h"
diff --git a/arch/arm/src/efm32/efm32_flash.c b/arch/arm/src/efm32/efm32_flash.c
index 24d74ac..72a24cc 100644
--- a/arch/arm/src/efm32/efm32_flash.c
+++ b/arch/arm/src/efm32/efm32_flash.c
@@ -77,8 +77,8 @@
#include <arch/board/board.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "hardware/efm32_msc.h"
#include "hardware/efm32_devinfo.h"
diff --git a/arch/arm/src/efm32/efm32_gpio.c b/arch/arm/src/efm32/efm32_gpio.c
index 2366a26..7dfc26b 100644
--- a/arch/arm/src/efm32/efm32_gpio.c
+++ b/arch/arm/src/efm32/efm32_gpio.c
@@ -44,7 +44,7 @@
#include <stdbool.h>
#include <errno.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/efm32_gpio.h"
#include "efm32_gpio.h"
diff --git a/arch/arm/src/efm32/efm32_gpioirq.c b/arch/arm/src/efm32/efm32_gpioirq.c
index fe2ec8c..e027fb6 100644
--- a/arch/arm/src/efm32/efm32_gpioirq.c
+++ b/arch/arm/src/efm32/efm32_gpioirq.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/efm32_gpio.h"
#include "efm32_gpio.h"
#include "efm32_bitband.h"
diff --git a/arch/arm/src/efm32/efm32_i2c.c b/arch/arm/src/efm32/efm32_i2c.c
index 458e557..e52b8c2 100644
--- a/arch/arm/src/efm32/efm32_i2c.c
+++ b/arch/arm/src/efm32/efm32_i2c.c
@@ -76,7 +76,7 @@
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "efm32_gpio.h"
#include "hardware/efm32_cmu.h"
diff --git a/arch/arm/src/efm32/efm32_idle.c b/arch/arm/src/efm32/efm32_idle.c
index 4764a02..19f138a 100644
--- a/arch/arm/src/efm32/efm32_idle.c
+++ b/arch/arm/src/efm32/efm32_idle.c
@@ -49,7 +49,7 @@
#include <nuttx/irq.h>
#include "chip.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#include "efm32_pm.h"
/****************************************************************************
diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c
index f9d502e..1c45822 100644
--- a/arch/arm/src/efm32/efm32_irq.c
+++ b/arch/arm/src/efm32/efm32_irq.c
@@ -50,9 +50,9 @@
#include "nvic.h"
#include "ram_vectors.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#include "chip.h"
#include "efm32_gpio.h"
diff --git a/arch/arm/src/efm32/efm32_leserial.c b/arch/arm/src/efm32/efm32_leserial.c
index c8c41c8..9915e1e 100644
--- a/arch/arm/src/efm32/efm32_leserial.c
+++ b/arch/arm/src/efm32/efm32_leserial.c
@@ -53,8 +53,8 @@
#include <arch/board/board.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/efm32_leuart.h"
#include "efm32_config.h"
diff --git a/arch/arm/src/efm32/efm32_lowputc.c b/arch/arm/src/efm32/efm32_lowputc.c
index 466f7c9..e01caa6 100644
--- a/arch/arm/src/efm32/efm32_lowputc.c
+++ b/arch/arm/src/efm32/efm32_lowputc.c
@@ -45,7 +45,7 @@
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/efm32_memorymap.h"
#include "hardware/efm32_usart.h"
diff --git a/arch/arm/src/efm32/efm32_pm.h b/arch/arm/src/efm32/efm32_pm.h
index 413eda4..d024b26 100644
--- a/arch/arm/src/efm32/efm32_pm.h
+++ b/arch/arm/src/efm32/efm32_pm.h
@@ -45,7 +45,7 @@
#include <stdbool.h>
#include "chip.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/efm32/efm32_pwm.c b/arch/arm/src/efm32/efm32_pwm.c
index 251c144..8382fa6 100644
--- a/arch/arm/src/efm32/efm32_pwm.c
+++ b/arch/arm/src/efm32/efm32_pwm.c
@@ -50,8 +50,8 @@
#include <nuttx/timers/pwm.h>
#include <arch/board/board.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/efm32_cmu.h"
#include "hardware/efm32_timer.h"
diff --git a/arch/arm/src/efm32/efm32_rmu.c b/arch/arm/src/efm32/efm32_rmu.c
index 744fbd1..6413e9f 100644
--- a/arch/arm/src/efm32/efm32_rmu.c
+++ b/arch/arm/src/efm32/efm32_rmu.c
@@ -48,7 +48,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/efm32_emu.h"
#include "hardware/efm32_rmu.h"
diff --git a/arch/arm/src/efm32/efm32_rtc_burtc.c b/arch/arm/src/efm32/efm32_rtc_burtc.c
index 28d8f42..aee2b7f 100644
--- a/arch/arm/src/efm32/efm32_rtc_burtc.c
+++ b/arch/arm/src/efm32/efm32_rtc_burtc.c
@@ -50,7 +50,7 @@
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "hardware/efm32_burtc.h"
diff --git a/arch/arm/src/efm32/efm32_serial.c b/arch/arm/src/efm32/efm32_serial.c
index 286f498..7dfa55a 100644
--- a/arch/arm/src/efm32/efm32_serial.c
+++ b/arch/arm/src/efm32/efm32_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 "hardware/efm32_usart.h"
#include "efm32_config.h"
diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c
index f5cb57d..90533ed 100644
--- a/arch/arm/src/efm32/efm32_spi.c
+++ b/arch/arm/src/efm32/efm32_spi.c
@@ -57,8 +57,8 @@
#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 "hardware/efm32_usart.h"
diff --git a/arch/arm/src/efm32/efm32_start.c b/arch/arm/src/efm32/efm32_start.c
index d5b61d9..7363fd5 100644
--- a/arch/arm/src/efm32/efm32_start.c
+++ b/arch/arm/src/efm32/efm32_start.c
@@ -49,8 +49,8 @@
#include <arch/board/board.h>
#include <arch/efm32/chip.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "efm32_config.h"
#include "efm32_lowputc.h"
diff --git a/arch/arm/src/efm32/efm32_timer.c b/arch/arm/src/efm32/efm32_timer.c
index 63f7544..fd9b81d 100644
--- a/arch/arm/src/efm32/efm32_timer.c
+++ b/arch/arm/src/efm32/efm32_timer.c
@@ -48,8 +48,8 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/efm32_timer.h"
#include "efm32_config.h"
diff --git a/arch/arm/src/efm32/efm32_timerisr.c b/arch/arm/src/efm32/efm32_timerisr.c
index a28c769..547347e 100644
--- a/arch/arm/src/efm32/efm32_timerisr.c
+++ b/arch/arm/src/efm32/efm32_timerisr.c
@@ -48,8 +48,8 @@
#include <arch/board/board.h>
#include "nvic.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
diff --git a/arch/arm/src/efm32/efm32_usbdev.c b/arch/arm/src/efm32/efm32_usbdev.c
index 639759e..8c67205 100644
--- a/arch/arm/src/efm32/efm32_usbdev.c
+++ b/arch/arm/src/efm32/efm32_usbdev.c
@@ -57,8 +57,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/efm32_cmu.h"
diff --git a/arch/arm/src/efm32/efm32_usbhost.c b/arch/arm/src/efm32/efm32_usbhost.c
index c39fd98..abddc76 100644
--- a/arch/arm/src/efm32/efm32_usbhost.c
+++ b/arch/arm/src/efm32/efm32_usbhost.c
@@ -48,8 +48,8 @@
#include "chip.h" /* Includes default GPIO settings */
#include <arch/board/board.h> /* May redefine GPIO settings */
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "efm32_usb.h"
diff --git a/arch/arm/src/imx1/imx_allocateheap.c b/arch/arm/src/imx1/imx_allocateheap.c
index b2e05a0..7a09135 100644
--- a/arch/arm/src/imx1/imx_allocateheap.c
+++ b/arch/arm/src/imx1/imx_allocateheap.c
@@ -49,8 +49,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/imx1/imx_boot.c b/arch/arm/src/imx1/imx_boot.c
index 4ee0f36..3251006 100644
--- a/arch/arm/src/imx1/imx_boot.c
+++ b/arch/arm/src/imx1/imx_boot.c
@@ -41,8 +41,8 @@
#include <stdint.h>
#include "chip.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include <nuttx/board.h>
diff --git a/arch/arm/src/imx1/imx_decodeirq.c b/arch/arm/src/imx1/imx_decodeirq.c
index d41e349..30b0cb1 100644
--- a/arch/arm/src/imx1/imx_decodeirq.c
+++ b/arch/arm/src/imx1/imx_decodeirq.c
@@ -46,8 +46,8 @@
#include <debug.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "group/group.h"
diff --git a/arch/arm/src/imx1/imx_gpio.c b/arch/arm/src/imx1/imx_gpio.c
index 60514e0..9d43754 100644
--- a/arch/arm/src/imx1/imx_gpio.c
+++ b/arch/arm/src/imx1/imx_gpio.c
@@ -40,7 +40,7 @@
#include <nuttx/config.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "imx_gpio.h"
/****************************************************************************
diff --git a/arch/arm/src/imx1/imx_gpio.h b/arch/arm/src/imx1/imx_gpio.h
index 75e229a..6fe4b79 100644
--- a/arch/arm/src/imx1/imx_gpio.h
+++ b/arch/arm/src/imx1/imx_gpio.h
@@ -43,7 +43,7 @@
#ifndef __ASSEMBLY__
# include <stdint.h>
#endif
-#include "up_arch.h" /* getreg32(), putreg32() */
+#include "arm_arch.h" /* getreg32(), putreg32() */
/************************************************************************************
* Pre-processor Definitions
@@ -188,8 +188,8 @@
#ifndef __ASSEMBLY__
-/* Handler circular include... This file includes up_arch.h, but this file is
- * included by up_arch.h (via chip.h) BEFORE getreg32 is defined.
+/* Handler circular include... This file includes arm_arch.h, but this file is
+ * included by arm_arch.h (via chip.h) BEFORE getreg32 is defined.
*/
#if !defined(__ARCH_ARM_IMX_GPIOHELPERS_H) && defined(getreg32)
diff --git a/arch/arm/src/imx1/imx_irq.c b/arch/arm/src/imx1/imx_irq.c
index d1297bd..6fb8b58 100644
--- a/arch/arm/src/imx1/imx_irq.c
+++ b/arch/arm/src/imx1/imx_irq.c
@@ -44,8 +44,8 @@
#include <arch/irq.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/imx1/imx_lowputc.S b/arch/arm/src/imx1/imx_lowputc.S
index 2bb9c6c..98c5eb5 100644
--- a/arch/arm/src/imx1/imx_lowputc.S
+++ b/arch/arm/src/imx1/imx_lowputc.S
@@ -41,8 +41,8 @@
#include <nuttx/config.h>
#include "chip.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
/**************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/imx1/imx_serial.c b/arch/arm/src/imx1/imx_serial.c
index 84a9702..6472c7f 100644
--- a/arch/arm/src/imx1/imx_serial.c
+++ b/arch/arm/src/imx1/imx_serial.c
@@ -55,9 +55,9 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "imx_gpio.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#ifdef USE_SERIALDRIVER
diff --git a/arch/arm/src/imx1/imx_spi.c b/arch/arm/src/imx1/imx_spi.c
index a3c5895..b470b91 100644
--- a/arch/arm/src/imx1/imx_spi.c
+++ b/arch/arm/src/imx1/imx_spi.c
@@ -37,8 +37,8 @@
#include <nuttx/semaphore.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 "imx_gpio.h"
diff --git a/arch/arm/src/imx1/imx_timerisr.c b/arch/arm/src/imx1/imx_timerisr.c
index f8c3c78..f30397b 100644
--- a/arch/arm/src/imx1/imx_timerisr.c
+++ b/arch/arm/src/imx1/imx_timerisr.c
@@ -47,9 +47,9 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "clock/clock.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Private Functions
diff --git a/arch/arm/src/imx6/imx_boot.c b/arch/arm/src/imx6/imx_boot.c
index f423973..0a110fa 100644
--- a/arch/arm/src/imx6/imx_boot.c
+++ b/arch/arm/src/imx6/imx_boot.c
@@ -55,8 +55,8 @@
#include "mmu.h"
#include "scu.h"
#include "fpu.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "imx_config.h"
#include "imx_clockconfig.h"
diff --git a/arch/arm/src/imx6/imx_boot.h b/arch/arm/src/imx6/imx_boot.h
index 712197b..601fc31 100644
--- a/arch/arm/src/imx6/imx_boot.h
+++ b/arch/arm/src/imx6/imx_boot.h
@@ -47,7 +47,7 @@
#include <stdint.h>
#include <stdbool.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "chip.h"
/****************************************************************************
diff --git a/arch/arm/src/imx6/imx_clockconfig.c b/arch/arm/src/imx6/imx_clockconfig.c
index a0fdff1..9558f30 100644
--- a/arch/arm/src/imx6/imx_clockconfig.c
+++ b/arch/arm/src/imx6/imx_clockconfig.c
@@ -39,7 +39,7 @@
#include <nuttx/config.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/imx_ccm.h"
#include "imx_config.h"
#include "imx_clockconfig.h"
diff --git a/arch/arm/src/imx6/imx_cpuboot.c b/arch/arm/src/imx6/imx_cpuboot.c
index 396c18b..f667dd0 100644
--- a/arch/arm/src/imx6/imx_cpuboot.c
+++ b/arch/arm/src/imx6/imx_cpuboot.c
@@ -45,8 +45,8 @@
#include <nuttx/arch.h>
#include <arch/irq.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/imx_src.h"
#include "sctlr.h"
diff --git a/arch/arm/src/imx6/imx_ecspi.c b/arch/arm/src/imx6/imx_ecspi.c
index d767f18..2429e65 100644
--- a/arch/arm/src/imx6/imx_ecspi.c
+++ b/arch/arm/src/imx6/imx_ecspi.c
@@ -37,8 +37,8 @@
#include <nuttx/irq.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 "imx_gpio.h"
diff --git a/arch/arm/src/imx6/imx_gpio.c b/arch/arm/src/imx6/imx_gpio.c
index 22aef03..d1ab833 100644
--- a/arch/arm/src/imx6/imx_gpio.c
+++ b/arch/arm/src/imx6/imx_gpio.c
@@ -46,7 +46,7 @@
#include <nuttx/irq.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "imx_iomuxc.h"
#include "imx_gpio.h"
diff --git a/arch/arm/src/imx6/imx_idle.c b/arch/arm/src/imx6/imx_idle.c
index afdc1f5..10db633 100644
--- a/arch/arm/src/imx6/imx_idle.c
+++ b/arch/arm/src/imx6/imx_idle.c
@@ -25,7 +25,7 @@
#include <nuttx/config.h>
#include <nuttx/arch.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/imx6/imx_iomuxc.c b/arch/arm/src/imx6/imx_iomuxc.c
index ff5e9bc..23d4b43 100644
--- a/arch/arm/src/imx6/imx_iomuxc.c
+++ b/arch/arm/src/imx6/imx_iomuxc.c
@@ -44,7 +44,7 @@
#include <assert.h>
#include <errno.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "imx_iomuxc.h"
/****************************************************************************
diff --git a/arch/arm/src/imx6/imx_irq.c b/arch/arm/src/imx6/imx_irq.c
index 5006a1f..89a62ff 100644
--- a/arch/arm/src/imx6/imx_irq.c
+++ b/arch/arm/src/imx6/imx_irq.c
@@ -43,7 +43,7 @@
#include <nuttx/arch.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "sctlr.h"
#include "gic.h"
#include "imx_irq.h"
diff --git a/arch/arm/src/imx6/imx_lowputc.c b/arch/arm/src/imx6/imx_lowputc.c
index 1740e3b..0542c7a 100644
--- a/arch/arm/src/imx6/imx_lowputc.c
+++ b/arch/arm/src/imx6/imx_lowputc.c
@@ -43,7 +43,7 @@
#include <fixedmath.h>
#include <assert.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/imx_iomuxc.h"
#include "hardware/imx_ccm.h"
@@ -53,7 +53,7 @@
#include "imx_gpio.h"
#include "imx_lowputc.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#include "hardware/imx_pinmux.h"
#include <arch/board/board.h> /* Include last: has dependencies */
diff --git a/arch/arm/src/imx6/imx_lowputc.h b/arch/arm/src/imx6/imx_lowputc.h
index 081f366..68e8b17 100644
--- a/arch/arm/src/imx6/imx_lowputc.h
+++ b/arch/arm/src/imx6/imx_lowputc.h
@@ -47,7 +47,7 @@
#include <stdint.h>
#include <stdbool.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "chip.h"
/****************************************************************************
diff --git a/arch/arm/src/imx6/imx_serial.c b/arch/arm/src/imx6/imx_serial.c
index b09b5bb..05a34c5 100644
--- a/arch/arm/src/imx6/imx_serial.c
+++ b/arch/arm/src/imx6/imx_serial.c
@@ -55,8 +55,8 @@
#include <nuttx/serial/serial.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "gic.h"
#include "hardware/imx_uart.h"
diff --git a/arch/arm/src/imx6/imx_serial.h b/arch/arm/src/imx6/imx_serial.h
index 45093f2..a332dd9 100644
--- a/arch/arm/src/imx6/imx_serial.h
+++ b/arch/arm/src/imx6/imx_serial.h
@@ -42,7 +42,7 @@
#include <nuttx/config.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "imx_config.h"
/****************************************************************************
diff --git a/arch/arm/src/imx6/imx_timerisr.c b/arch/arm/src/imx6/imx_timerisr.c
index 00ea290..aec2243 100644
--- a/arch/arm/src/imx6/imx_timerisr.c
+++ b/arch/arm/src/imx6/imx_timerisr.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
#include <arch/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "gic.h"
#include "hardware/imx_ccm.h"
#include "hardware/imx_gpt.h"
diff --git a/arch/arm/src/imxrt/imxrt_allocateheap.c b/arch/arm/src/imxrt/imxrt_allocateheap.c
index b94428d..ffdfc11 100644
--- a/arch/arm/src/imxrt/imxrt_allocateheap.c
+++ b/arch/arm/src/imxrt/imxrt_allocateheap.c
@@ -51,8 +51,8 @@
#include <arch/imxrt/chip.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/imxrt_memorymap.h"
#include "imxrt_mpuinit.h"
diff --git a/arch/arm/src/imxrt/imxrt_clockconfig.c b/arch/arm/src/imxrt/imxrt_clockconfig.c
index 4a41f93..9bdc9b4 100644
--- a/arch/arm/src/imxrt/imxrt_clockconfig.c
+++ b/arch/arm/src/imxrt/imxrt_clockconfig.c
@@ -42,7 +42,7 @@
#include <nuttx/config.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include <arch/board/board.h>
#include "hardware/imxrt_ccm.h"
#include "hardware/imxrt_dcdc.h"
diff --git a/arch/arm/src/imxrt/imxrt_clrpend.c b/arch/arm/src/imxrt/imxrt_clrpend.c
index 3b50026..6806beb 100644
--- a/arch/arm/src/imxrt/imxrt_clrpend.c
+++ b/arch/arm/src/imxrt/imxrt_clrpend.c
@@ -42,7 +42,7 @@
#include <arch/irq.h>
#include "nvic.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "imxrt_irq.h"
diff --git a/arch/arm/src/imxrt/imxrt_daisy.c b/arch/arm/src/imxrt/imxrt_daisy.c
index d692c47..5f08079 100644
--- a/arch/arm/src/imxrt/imxrt_daisy.c
+++ b/arch/arm/src/imxrt/imxrt_daisy.c
@@ -41,7 +41,7 @@
#include <stdint.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/imxrt_daisy.h"
#include "imxrt_iomuxc.h"
diff --git a/arch/arm/src/imxrt/imxrt_edma.c b/arch/arm/src/imxrt/imxrt_edma.c
index 2b59999..fe909b1 100644
--- a/arch/arm/src/imxrt/imxrt_edma.c
+++ b/arch/arm/src/imxrt/imxrt_edma.c
@@ -57,8 +57,8 @@
#include <nuttx/arch.h>
#include <nuttx/semaphore.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "sched/sched.h"
#include "chip.h"
diff --git a/arch/arm/src/imxrt/imxrt_ehci.c b/arch/arm/src/imxrt/imxrt_ehci.c
index b3d379c..5f3edc2 100644
--- a/arch/arm/src/imxrt/imxrt_ehci.c
+++ b/arch/arm/src/imxrt/imxrt_ehci.c
@@ -60,7 +60,7 @@
#include <nuttx/usb/usbhost_devaddr.h>
#include <nuttx/usb/usbhost_trace.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "hardware/imxrt_usbotg.h"
#include "imxrt_periphclks.h"
diff --git a/arch/arm/src/imxrt/imxrt_enc.c b/arch/arm/src/imxrt/imxrt_enc.c
index 87fa227..a07d839 100644
--- a/arch/arm/src/imxrt/imxrt_enc.c
+++ b/arch/arm/src/imxrt/imxrt_enc.c
@@ -50,7 +50,7 @@
#include <nuttx/semaphore.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "imxrt_periphclks.h"
diff --git a/arch/arm/src/imxrt/imxrt_enet.c b/arch/arm/src/imxrt/imxrt_enet.c
index 099189b..101db42 100644
--- a/arch/arm/src/imxrt/imxrt_enet.c
+++ b/arch/arm/src/imxrt/imxrt_enet.c
@@ -63,7 +63,7 @@
# include <nuttx/net/pkt.h>
#endif
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "imxrt_config.h"
#include "hardware/imxrt_enet.h"
diff --git a/arch/arm/src/imxrt/imxrt_enet.h b/arch/arm/src/imxrt/imxrt_enet.h
index e566809..b519cf2 100644
--- a/arch/arm/src/imxrt/imxrt_enet.h
+++ b/arch/arm/src/imxrt/imxrt_enet.h
@@ -76,7 +76,7 @@ extern "C"
* Initialize the first network interface. If there are more than one
* interface in the chip, then board-specific logic will have to provide
* this function to determine which, if any, Ethernet controllers should
- * be initialized. Also prototyped in up_internal.h.
+ * be initialized. Also prototyped in arm_internal.h.
*
* Input Parameters:
* None
diff --git a/arch/arm/src/imxrt/imxrt_gpio.c b/arch/arm/src/imxrt/imxrt_gpio.c
index 99926b9..c5cd1b7 100644
--- a/arch/arm/src/imxrt/imxrt_gpio.c
+++ b/arch/arm/src/imxrt/imxrt_gpio.c
@@ -48,7 +48,7 @@
#include <nuttx/irq.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "imxrt_iomuxc.h"
#include "imxrt_gpio.h"
#include "hardware/imxrt_daisy.h"
diff --git a/arch/arm/src/imxrt/imxrt_gpioirq.c b/arch/arm/src/imxrt/imxrt_gpioirq.c
index 0b0461b..92d647b 100644
--- a/arch/arm/src/imxrt/imxrt_gpioirq.c
+++ b/arch/arm/src/imxrt/imxrt_gpioirq.c
@@ -47,7 +47,7 @@
#include <nuttx/arch.h>
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "imxrt_config.h"
#include "imxrt_irq.h"
diff --git a/arch/arm/src/imxrt/imxrt_hprtc.c b/arch/arm/src/imxrt/imxrt_hprtc.c
index 9d2488a..4d15986 100644
--- a/arch/arm/src/imxrt/imxrt_hprtc.c
+++ b/arch/arm/src/imxrt/imxrt_hprtc.c
@@ -52,7 +52,7 @@
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/imxrt_snvs.h"
#include "imxrt_periphclks.h"
diff --git a/arch/arm/src/imxrt/imxrt_idle.c b/arch/arm/src/imxrt/imxrt_idle.c
index 0028633..54eef24 100644
--- a/arch/arm/src/imxrt/imxrt_idle.c
+++ b/arch/arm/src/imxrt/imxrt_idle.c
@@ -47,7 +47,7 @@
#include <nuttx/irq.h>
#include "chip.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/imxrt/imxrt_iomuxc.c b/arch/arm/src/imxrt/imxrt_iomuxc.c
index 89deb0c..c759eae 100644
--- a/arch/arm/src/imxrt/imxrt_iomuxc.c
+++ b/arch/arm/src/imxrt/imxrt_iomuxc.c
@@ -47,7 +47,7 @@
#include <assert.h>
#include <errno.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/imxrt_ccm.h"
#include "imxrt_periphclks.h"
#include "imxrt_iomuxc.h"
diff --git a/arch/arm/src/imxrt/imxrt_irq.c b/arch/arm/src/imxrt/imxrt_irq.c
index f93c78a..c247634 100644
--- a/arch/arm/src/imxrt/imxrt_irq.c
+++ b/arch/arm/src/imxrt/imxrt_irq.c
@@ -50,8 +50,8 @@
#include "nvic.h"
#include "ram_vectors.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#ifdef CONFIG_IMXRT_GPIO_IRQ
# include "imxrt_gpio.h"
diff --git a/arch/arm/src/imxrt/imxrt_lcd.c b/arch/arm/src/imxrt/imxrt_lcd.c
index 52788c6..4477b7c 100644
--- a/arch/arm/src/imxrt/imxrt_lcd.c
+++ b/arch/arm/src/imxrt/imxrt_lcd.c
@@ -50,7 +50,7 @@
#include <nuttx/video/fb.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include <nuttx/board.h>
diff --git a/arch/arm/src/imxrt/imxrt_lowputc.c b/arch/arm/src/imxrt/imxrt_lowputc.c
index d3be6c1..ee826b8 100644
--- a/arch/arm/src/imxrt/imxrt_lowputc.c
+++ b/arch/arm/src/imxrt/imxrt_lowputc.c
@@ -43,7 +43,7 @@
#include <fixedmath.h>
#include <assert.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/imxrt_iomuxc.h"
#include "hardware/imxrt_pinmux.h"
@@ -55,7 +55,7 @@
#include "imxrt_gpio.h"
#include "imxrt_lowputc.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#include <arch/board/board.h> /* Include last: has dependencies */
diff --git a/arch/arm/src/imxrt/imxrt_lowputc.h b/arch/arm/src/imxrt/imxrt_lowputc.h
index b2f2adb..708b4c7 100644
--- a/arch/arm/src/imxrt/imxrt_lowputc.h
+++ b/arch/arm/src/imxrt/imxrt_lowputc.h
@@ -47,7 +47,7 @@
#include <stdint.h>
#include <stdbool.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "chip.h"
#include "imxrt_config.h"
diff --git a/arch/arm/src/imxrt/imxrt_lpi2c.c b/arch/arm/src/imxrt/imxrt_lpi2c.c
index cea3871..8cf8c9e 100644
--- a/arch/arm/src/imxrt/imxrt_lpi2c.c
+++ b/arch/arm/src/imxrt/imxrt_lpi2c.c
@@ -55,7 +55,7 @@
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "imxrt_lpi2c.h"
#include "imxrt_gpio.h"
diff --git a/arch/arm/src/imxrt/imxrt_lpspi.c b/arch/arm/src/imxrt/imxrt_lpspi.c
index 20a0a54..34a4491 100644
--- a/arch/arm/src/imxrt/imxrt_lpspi.c
+++ b/arch/arm/src/imxrt/imxrt_lpspi.c
@@ -79,8 +79,8 @@
#include <arch/board/board.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
diff --git a/arch/arm/src/imxrt/imxrt_lpsrtc.c b/arch/arm/src/imxrt/imxrt_lpsrtc.c
index 32f67bd..8e45967 100644
--- a/arch/arm/src/imxrt/imxrt_lpsrtc.c
+++ b/arch/arm/src/imxrt/imxrt_lpsrtc.c
@@ -52,7 +52,7 @@
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/imxrt_snvs.h"
#include "imxrt_periphclks.h"
diff --git a/arch/arm/src/imxrt/imxrt_ocotp.c b/arch/arm/src/imxrt/imxrt_ocotp.c
index 6d012ed..0b89698 100644
--- a/arch/arm/src/imxrt/imxrt_ocotp.c
+++ b/arch/arm/src/imxrt/imxrt_ocotp.c
@@ -47,7 +47,7 @@
#include <nuttx/clock.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "imxrt_periphclks.h"
#include "imxrt_ocotp.h"
diff --git a/arch/arm/src/imxrt/imxrt_periphclks.c b/arch/arm/src/imxrt/imxrt_periphclks.c
index 9b3706d..aaf66bf 100644
--- a/arch/arm/src/imxrt/imxrt_periphclks.c
+++ b/arch/arm/src/imxrt/imxrt_periphclks.c
@@ -41,7 +41,7 @@
#include <stdint.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "imxrt_periphclks.h"
/****************************************************************************
diff --git a/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c b/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c
index 5218951..af21545 100644
--- a/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c
+++ b/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c
@@ -48,7 +48,7 @@
#include <nuttx/arch.h>
#include <nuttx/timers/rtc.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "imxrt_lpsrtc.h"
diff --git a/arch/arm/src/imxrt/imxrt_serial.c b/arch/arm/src/imxrt/imxrt_serial.c
index 7d1e1bd..6a9b86f 100644
--- a/arch/arm/src/imxrt/imxrt_serial.c
+++ b/arch/arm/src/imxrt/imxrt_serial.c
@@ -61,8 +61,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/imxrt_lpuart.h"
#include "imxrt_gpio.h"
diff --git a/arch/arm/src/imxrt/imxrt_serial.h b/arch/arm/src/imxrt/imxrt_serial.h
index 8b19457..3bcc87d 100644
--- a/arch/arm/src/imxrt/imxrt_serial.h
+++ b/arch/arm/src/imxrt/imxrt_serial.h
@@ -42,7 +42,7 @@
#include <nuttx/config.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "imxrt_config.h"
/****************************************************************************
diff --git a/arch/arm/src/imxrt/imxrt_start.c b/arch/arm/src/imxrt/imxrt_start.c
index 319a281..5e2c181 100644
--- a/arch/arm/src/imxrt/imxrt_start.c
+++ b/arch/arm/src/imxrt/imxrt_start.c
@@ -47,8 +47,8 @@
#include <nuttx/init.h>
#include <arch/board/board.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "barriers.h"
#include "nvic.h"
diff --git a/arch/arm/src/imxrt/imxrt_start.h b/arch/arm/src/imxrt/imxrt_start.h
index 4945a41..b8e0b51 100644
--- a/arch/arm/src/imxrt/imxrt_start.h
+++ b/arch/arm/src/imxrt/imxrt_start.h
@@ -47,7 +47,7 @@
#include <stdint.h>
#include <stdbool.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "chip.h"
/************************************************************************************
diff --git a/arch/arm/src/imxrt/imxrt_timerisr.c b/arch/arm/src/imxrt/imxrt_timerisr.c
index b3d33b9..7750f48 100644
--- a/arch/arm/src/imxrt/imxrt_timerisr.c
+++ b/arch/arm/src/imxrt/imxrt_timerisr.c
@@ -50,8 +50,8 @@
#include "nvic.h"
#include "clock/clock.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
#include "hardware/imxrt_ccm.h"
diff --git a/arch/arm/src/imxrt/imxrt_usbdev.c b/arch/arm/src/imxrt/imxrt_usbdev.c
index 9d4903e..099c4f4 100644
--- a/arch/arm/src/imxrt/imxrt_usbdev.c
+++ b/arch/arm/src/imxrt/imxrt_usbdev.c
@@ -63,8 +63,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/imxrt_usbotg.h"
#include "hardware/imxrt_usbphy.h"
diff --git a/arch/arm/src/imxrt/imxrt_usdhc.c b/arch/arm/src/imxrt/imxrt_usdhc.c
index a799ef2..ba34488 100644
--- a/arch/arm/src/imxrt/imxrt_usdhc.c
+++ b/arch/arm/src/imxrt/imxrt_usdhc.c
@@ -60,7 +60,7 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "imxrt_config.h"
#include "imxrt_gpio.h"
diff --git a/arch/arm/src/imxrt/imxrt_userspace.h b/arch/arm/src/imxrt/imxrt_userspace.h
index 9aa4a8f..13ce47e 100644
--- a/arch/arm/src/imxrt/imxrt_userspace.h
+++ b/arch/arm/src/imxrt/imxrt_userspace.h
@@ -47,7 +47,7 @@
#include <stdint.h>
#include <stdbool.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "chip.h"
/************************************************************************************
diff --git a/arch/arm/src/imxrt/imxrt_wdog.c b/arch/arm/src/imxrt/imxrt_wdog.c
index c491e7b..a3dbb1b 100644
--- a/arch/arm/src/imxrt/imxrt_wdog.c
+++ b/arch/arm/src/imxrt/imxrt_wdog.c
@@ -43,7 +43,7 @@
#include <fixedmath.h>
#include <assert.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/imxrt_wdog.h"
#include "imxrt_config.h"
diff --git a/arch/arm/src/imxrt/imxrt_wdog.h b/arch/arm/src/imxrt/imxrt_wdog.h
index efed2de..6db8dad 100644
--- a/arch/arm/src/imxrt/imxrt_wdog.h
+++ b/arch/arm/src/imxrt/imxrt_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/imxrt_wdog.h"
diff --git a/arch/arm/src/imxrt/imxrt_xbar.c b/arch/arm/src/imxrt/imxrt_xbar.c
index 43ae264..a7e629f 100644
--- a/arch/arm/src/imxrt/imxrt_xbar.c
+++ b/arch/arm/src/imxrt/imxrt_xbar.c
@@ -43,7 +43,7 @@
#include <stdint.h>
#include <errno.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "imxrt_xbar.h"
/****************************************************************************
diff --git a/arch/arm/src/kinetis/kinetis.h b/arch/arm/src/kinetis/kinetis.h
index adb9b12..573a68c 100644
--- a/arch/arm/src/kinetis/kinetis.h
+++ b/arch/arm/src/kinetis/kinetis.h
@@ -50,7 +50,7 @@
#include <nuttx/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "kinetis_config.h"
#include "chip.h"
#include "hardware/kinetis_port.h"
diff --git a/arch/arm/src/kinetis/kinetis_allocateheap.c b/arch/arm/src/kinetis/kinetis_allocateheap.c
index 43e4772..ace22bf 100644
--- a/arch/arm/src/kinetis/kinetis_allocateheap.c
+++ b/arch/arm/src/kinetis/kinetis_allocateheap.c
@@ -49,8 +49,8 @@
#include <nuttx/userspace.h>
#include "mpu.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "kinetis_mpuinit.h"
#include <arch/board/board.h>
diff --git a/arch/arm/src/kinetis/kinetis_clockconfig.c b/arch/arm/src/kinetis/kinetis_clockconfig.c
index d1c5aca..0a0ae74 100644
--- a/arch/arm/src/kinetis/kinetis_clockconfig.c
+++ b/arch/arm/src/kinetis/kinetis_clockconfig.c
@@ -40,7 +40,7 @@
#include <nuttx/config.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "kinetis.h"
#include "hardware/kinetis_mcg.h"
diff --git a/arch/arm/src/kinetis/kinetis_clrpend.c b/arch/arm/src/kinetis/kinetis_clrpend.c
index aad182d..07ddf54 100644
--- a/arch/arm/src/kinetis/kinetis_clrpend.c
+++ b/arch/arm/src/kinetis/kinetis_clrpend.c
@@ -42,7 +42,7 @@
#include <arch/irq.h>
#include "nvic.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "kinetis.h"
/****************************************************************************
diff --git a/arch/arm/src/kinetis/kinetis_dma.c b/arch/arm/src/kinetis/kinetis_dma.c
index 254f2b72..327fd5e 100644
--- a/arch/arm/src/kinetis/kinetis_dma.c
+++ b/arch/arm/src/kinetis/kinetis_dma.c
@@ -52,8 +52,8 @@
#include <arch/board/board.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "kinetis_config.h"
#include "chip.h"
diff --git a/arch/arm/src/kinetis/kinetis_enet.c b/arch/arm/src/kinetis/kinetis_enet.c
index 1e4ca54..56c28b7 100644
--- a/arch/arm/src/kinetis/kinetis_enet.c
+++ b/arch/arm/src/kinetis/kinetis_enet.c
@@ -64,7 +64,7 @@
# include <nuttx/net/pkt.h>
#endif
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "kinetis.h"
#include "kinetis_config.h"
diff --git a/arch/arm/src/kinetis/kinetis_i2c.c b/arch/arm/src/kinetis/kinetis_i2c.c
index 36a0a94..154fc89 100644
--- a/arch/arm/src/kinetis/kinetis_i2c.c
+++ b/arch/arm/src/kinetis/kinetis_i2c.c
@@ -56,8 +56,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "kinetis_config.h"
#include "chip.h"
diff --git a/arch/arm/src/kinetis/kinetis_idle.c b/arch/arm/src/kinetis/kinetis_idle.c
index d8f40be..b78e26c 100644
--- a/arch/arm/src/kinetis/kinetis_idle.c
+++ b/arch/arm/src/kinetis/kinetis_idle.c
@@ -43,7 +43,7 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c
index f3dc475..26a2329 100644
--- a/arch/arm/src/kinetis/kinetis_irq.c
+++ b/arch/arm/src/kinetis/kinetis_irq.c
@@ -49,8 +49,8 @@
#include "nvic.h"
#include "ram_vectors.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "kinetis.h"
/****************************************************************************
diff --git a/arch/arm/src/kinetis/kinetis_lowputc.c b/arch/arm/src/kinetis/kinetis_lowputc.c
index 8661f95..405c80a 100644
--- a/arch/arm/src/kinetis/kinetis_lowputc.c
+++ b/arch/arm/src/kinetis/kinetis_lowputc.c
@@ -46,8 +46,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 "kinetis_config.h"
#include "kinetis.h"
diff --git a/arch/arm/src/kinetis/kinetis_lpserial.c b/arch/arm/src/kinetis/kinetis_lpserial.c
index 3b2cbcd..828de83 100644
--- a/arch/arm/src/kinetis/kinetis_lpserial.c
+++ b/arch/arm/src/kinetis/kinetis_lpserial.c
@@ -59,8 +59,8 @@
#include <arch/board/board.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "kinetis.h"
#include "hardware/kinetis_lpuart.h"
diff --git a/arch/arm/src/kinetis/kinetis_pin.c b/arch/arm/src/kinetis/kinetis_pin.c
index 7b23b35..8acc131 100644
--- a/arch/arm/src/kinetis/kinetis_pin.c
+++ b/arch/arm/src/kinetis/kinetis_pin.c
@@ -45,8 +45,8 @@
#include <nuttx/arch.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "kinetis.h"
#include "hardware/kinetis_port.h"
diff --git a/arch/arm/src/kinetis/kinetis_pindma.c b/arch/arm/src/kinetis/kinetis_pindma.c
index 654bf7a..96f50f5 100644
--- a/arch/arm/src/kinetis/kinetis_pindma.c
+++ b/arch/arm/src/kinetis/kinetis_pindma.c
@@ -48,8 +48,8 @@
#include <nuttx/arch.h>
#include <nuttx/arch.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "kinetis_config.h"
#include "chip.h"
diff --git a/arch/arm/src/kinetis/kinetis_pindump.c b/arch/arm/src/kinetis/kinetis_pindump.c
index c59d328..f63df1f 100644
--- a/arch/arm/src/kinetis/kinetis_pindump.c
+++ b/arch/arm/src/kinetis/kinetis_pindump.c
@@ -43,7 +43,7 @@
#include <debug.h>
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "kinetis.h"
#include "hardware/kinetis_gpio.h"
diff --git a/arch/arm/src/kinetis/kinetis_pingpio.c b/arch/arm/src/kinetis/kinetis_pingpio.c
index e26e4b8..493a310 100644
--- a/arch/arm/src/kinetis/kinetis_pingpio.c
+++ b/arch/arm/src/kinetis/kinetis_pingpio.c
@@ -45,8 +45,8 @@
#include <nuttx/arch.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "kinetis.h"
#include "hardware/kinetis_gpio.h"
diff --git a/arch/arm/src/kinetis/kinetis_pinirq.c b/arch/arm/src/kinetis/kinetis_pinirq.c
index e22840e..97a0899 100644
--- a/arch/arm/src/kinetis/kinetis_pinirq.c
+++ b/arch/arm/src/kinetis/kinetis_pinirq.c
@@ -47,8 +47,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 "kinetis.h"
#include "hardware/kinetis_port.h"
diff --git a/arch/arm/src/kinetis/kinetis_pwm.c b/arch/arm/src/kinetis/kinetis_pwm.c
index e1c3cc3..1b42e8e 100644
--- a/arch/arm/src/kinetis/kinetis_pwm.c
+++ b/arch/arm/src/kinetis/kinetis_pwm.c
@@ -53,8 +53,8 @@
#include <nuttx/timers/pwm.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"
diff --git a/arch/arm/src/kinetis/kinetis_rtc.c b/arch/arm/src/kinetis/kinetis_rtc.c
index e5a15f7..bcedea2 100644
--- a/arch/arm/src/kinetis/kinetis_rtc.c
+++ b/arch/arm/src/kinetis/kinetis_rtc.c
@@ -49,7 +49,7 @@
#include <stdio.h>
#include <errno.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "kinetis_config.h"
#include "chip.h"
diff --git a/arch/arm/src/kinetis/kinetis_sdhc.c b/arch/arm/src/kinetis/kinetis_sdhc.c
index 7bfec1a..38b1d3d 100644
--- a/arch/arm/src/kinetis/kinetis_sdhc.c
+++ b/arch/arm/src/kinetis/kinetis_sdhc.c
@@ -43,7 +43,7 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "kinetis.h"
#include "hardware/kinetis_pinmux.h"
diff --git a/arch/arm/src/kinetis/kinetis_serial.c b/arch/arm/src/kinetis/kinetis_serial.c
index 4d21d8f..691b6ee 100644
--- a/arch/arm/src/kinetis/kinetis_serial.c
+++ b/arch/arm/src/kinetis/kinetis_serial.c
@@ -60,8 +60,8 @@
#include <arch/board/board.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "kinetis_config.h"
#include "chip.h"
diff --git a/arch/arm/src/kinetis/kinetis_spi.c b/arch/arm/src/kinetis/kinetis_spi.c
index 4e8eb4b..12aa9d9 100644
--- a/arch/arm/src/kinetis/kinetis_spi.c
+++ b/arch/arm/src/kinetis/kinetis_spi.c
@@ -78,7 +78,7 @@
#include <arch/irq.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "kinetis.h"
#include "kinetis_spi.h"
diff --git a/arch/arm/src/kinetis/kinetis_start.c b/arch/arm/src/kinetis/kinetis_start.c
index 937bf95..c7d9c63 100644
--- a/arch/arm/src/kinetis/kinetis_start.c
+++ b/arch/arm/src/kinetis/kinetis_start.c
@@ -45,8 +45,8 @@
#include <nuttx/init.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "kinetis.h"
#include "hardware/kinetis_smc.h"
diff --git a/arch/arm/src/kinetis/kinetis_timerisr.c b/arch/arm/src/kinetis/kinetis_timerisr.c
index cf4f5e4..2c65f70 100644
--- a/arch/arm/src/kinetis/kinetis_timerisr.c
+++ b/arch/arm/src/kinetis/kinetis_timerisr.c
@@ -48,8 +48,8 @@
#include "nvic.h"
#include "clock/clock.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
#include "kinetis.h"
diff --git a/arch/arm/src/kinetis/kinetis_usbdev.c b/arch/arm/src/kinetis/kinetis_usbdev.c
index 85e3eb7..4d5ae7d 100644
--- a/arch/arm/src/kinetis/kinetis_usbdev.c
+++ b/arch/arm/src/kinetis/kinetis_usbdev.c
@@ -68,7 +68,7 @@
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "kinetis.h"
#include "kinetis_usbotg.h"
#include "hardware/kinetis_sim.h"
diff --git a/arch/arm/src/kinetis/kinetis_wdog.c b/arch/arm/src/kinetis/kinetis_wdog.c
index 463150b..bd85704 100644
--- a/arch/arm/src/kinetis/kinetis_wdog.c
+++ b/arch/arm/src/kinetis/kinetis_wdog.c
@@ -41,7 +41,7 @@
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "kinetis.h"
#include "hardware/kinetis_wdog.h"
diff --git a/arch/arm/src/kl/kl_clockconfig.c b/arch/arm/src/kl/kl_clockconfig.c
index 1a5ac14..3318a06 100644
--- a/arch/arm/src/kl/kl_clockconfig.c
+++ b/arch/arm/src/kl/kl_clockconfig.c
@@ -43,7 +43,7 @@
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "kl_gpio.h"
diff --git a/arch/arm/src/kl/kl_dumpgpio.c b/arch/arm/src/kl/kl_dumpgpio.c
index 0e6dadf..8526653 100644
--- a/arch/arm/src/kl/kl_dumpgpio.c
+++ b/arch/arm/src/kl/kl_dumpgpio.c
@@ -48,7 +48,7 @@
#include <debug.h>
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "kl_gpio.h"
diff --git a/arch/arm/src/kl/kl_gpio.c b/arch/arm/src/kl/kl_gpio.c
index bb06336..f8c107a 100644
--- a/arch/arm/src/kl/kl_gpio.c
+++ b/arch/arm/src/kl/kl_gpio.c
@@ -45,8 +45,8 @@
#include <nuttx/arch.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "kl_gpio.h"
diff --git a/arch/arm/src/kl/kl_gpioirq.c b/arch/arm/src/kl/kl_gpioirq.c
index 38b105a..daa027c 100644
--- a/arch/arm/src/kl/kl_gpioirq.c
+++ b/arch/arm/src/kl/kl_gpioirq.c
@@ -46,7 +46,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/kl_port.h"
#include "kl_gpio.h"
diff --git a/arch/arm/src/kl/kl_idle.c b/arch/arm/src/kl/kl_idle.c
index 01d2171..23b0045 100644
--- a/arch/arm/src/kl/kl_idle.c
+++ b/arch/arm/src/kl/kl_idle.c
@@ -47,7 +47,7 @@
#include <nuttx/irq.h>
#include "chip.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/kl/kl_irq.c b/arch/arm/src/kl/kl_irq.c
index 6a45c18..f827e9f 100644
--- a/arch/arm/src/kl/kl_irq.c
+++ b/arch/arm/src/kl/kl_irq.c
@@ -47,8 +47,8 @@
#include <arch/irq.h>
#include "nvic.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "kl_irq.h"
diff --git a/arch/arm/src/kl/kl_irqprio.c b/arch/arm/src/kl/kl_irqprio.c
index b2dfe31..ccc18b1 100644
--- a/arch/arm/src/kl/kl_irqprio.c
+++ b/arch/arm/src/kl/kl_irqprio.c
@@ -44,7 +44,7 @@
#include <arch/irq.h>
#include "nvic.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "kl_irq.h"
diff --git a/arch/arm/src/kl/kl_lowputc.c b/arch/arm/src/kl/kl_lowputc.c
index 7016ddc..7571368 100644
--- a/arch/arm/src/kl/kl_lowputc.c
+++ b/arch/arm/src/kl/kl_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 "kl_config.h"
#include "kl_lowputc.h"
diff --git a/arch/arm/src/kl/kl_pwm.c b/arch/arm/src/kl/kl_pwm.c
index 92d5ace..1c29355 100644
--- a/arch/arm/src/kl/kl_pwm.c
+++ b/arch/arm/src/kl/kl_pwm.c
@@ -51,8 +51,8 @@
#include <nuttx/timers/pwm.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 "kl_pwm.h"
diff --git a/arch/arm/src/kl/kl_serial.c b/arch/arm/src/kl/kl_serial.c
index aa55567..87b7cb8 100644
--- a/arch/arm/src/kl/kl_serial.c
+++ b/arch/arm/src/kl/kl_serial.c
@@ -53,8 +53,8 @@
#include <arch/board/board.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "kl_config.h"
#include "kl_lowputc.h"
diff --git a/arch/arm/src/kl/kl_spi.c b/arch/arm/src/kl/kl_spi.c
index f60d409..4aef68c 100644
--- a/arch/arm/src/kl/kl_spi.c
+++ b/arch/arm/src/kl/kl_spi.c
@@ -50,7 +50,7 @@
#include <arch/irq.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "kl_spi.h"
#include "kl_gpio.h"
#include "hardware/kl_memorymap.h"
diff --git a/arch/arm/src/kl/kl_start.c b/arch/arm/src/kl/kl_start.c
index c9314a6..cfac200 100644
--- a/arch/arm/src/kl/kl_start.c
+++ b/arch/arm/src/kl/kl_start.c
@@ -45,8 +45,8 @@
#include <nuttx/init.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/kl_sim.h"
diff --git a/arch/arm/src/kl/kl_timerisr.c b/arch/arm/src/kl/kl_timerisr.c
index d5f06d8..fdebe3c 100644
--- a/arch/arm/src/kl/kl_timerisr.c
+++ b/arch/arm/src/kl/kl_timerisr.c
@@ -47,8 +47,8 @@
#include "nvic.h"
#include "clock/clock.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
diff --git a/arch/arm/src/lc823450/chip.h b/arch/arm/src/lc823450/chip.h
index cff9ad5..1c77d43 100644
--- a/arch/arm/src/lc823450/chip.h
+++ b/arch/arm/src/lc823450/chip.h
@@ -45,9 +45,9 @@
# include <sys/types.h>
# include <arch/lc823450/chip.h>
# include <arch/lc823450/irq.h>
-# include "up_arch.h"
+# include "arm_arch.h"
# include "lc823450_irq.h"
-# include "up_arch.h"
+# include "arm_arch.h"
#endif
/****************************************************************************
diff --git a/arch/arm/src/lc823450/lc823450_adc.c b/arch/arm/src/lc823450/lc823450_adc.c
index 97fb5db..4bc836a 100644
--- a/arch/arm/src/lc823450/lc823450_adc.c
+++ b/arch/arm/src/lc823450/lc823450_adc.c
@@ -62,7 +62,7 @@
#include <nuttx/analog/ioctl.h>
#include <nuttx/semaphore.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lc823450_adc.h"
#include "lc823450_syscontrol.h"
#include "lc823450_clockconfig.h"
diff --git a/arch/arm/src/lc823450/lc823450_allocateheap2.c b/arch/arm/src/lc823450/lc823450_allocateheap2.c
index 8a8134b..a736dea 100644
--- a/arch/arm/src/lc823450/lc823450_allocateheap2.c
+++ b/arch/arm/src/lc823450/lc823450_allocateheap2.c
@@ -56,8 +56,8 @@
#include "chip.h"
#include "mpu.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lc823450_mpuinit2.h"
/****************************************************************************
diff --git a/arch/arm/src/lc823450/lc823450_clockconfig.c b/arch/arm/src/lc823450/lc823450_clockconfig.c
index e882b0b..68c8b28 100644
--- a/arch/arm/src/lc823450/lc823450_clockconfig.c
+++ b/arch/arm/src/lc823450/lc823450_clockconfig.c
@@ -48,7 +48,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lc823450_clockconfig.h"
#include "lc823450_syscontrol.h"
diff --git a/arch/arm/src/lc823450/lc823450_cpuidlestack.c b/arch/arm/src/lc823450/lc823450_cpuidlestack.c
index a75eb04..4275bf5 100644
--- a/arch/arm/src/lc823450/lc823450_cpuidlestack.c
+++ b/arch/arm/src/lc823450/lc823450_cpuidlestack.c
@@ -43,7 +43,7 @@
#include <nuttx/arch.h>
#include <nuttx/sched.h>
-#include "up_arch.h"
+#include "arm_arch.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/lc823450/lc823450_cpuindex.c b/arch/arm/src/lc823450/lc823450_cpuindex.c
index 22a18bd..d37f853 100644
--- a/arch/arm/src/lc823450/lc823450_cpuindex.c
+++ b/arch/arm/src/lc823450/lc823450_cpuindex.c
@@ -42,7 +42,7 @@
#include <stdint.h>
#include <nuttx/arch.h>
-#include "up_arch.h"
+#include "arm_arch.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/lc823450/lc823450_cpupause.c b/arch/arm/src/lc823450/lc823450_cpupause.c
index 2dcb223..821e3bc 100644
--- a/arch/arm/src/lc823450/lc823450_cpupause.c
+++ b/arch/arm/src/lc823450/lc823450_cpupause.c
@@ -50,9 +50,9 @@
#include <nuttx/spinlock.h>
#include <nuttx/sched_note.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "sched/sched.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#include "lc823450_intc.h"
/****************************************************************************
diff --git a/arch/arm/src/lc823450/lc823450_cpustart.c b/arch/arm/src/lc823450/lc823450_cpustart.c
index 1636039..fb34af2 100644
--- a/arch/arm/src/lc823450/lc823450_cpustart.c
+++ b/arch/arm/src/lc823450/lc823450_cpustart.c
@@ -52,11 +52,11 @@
#include <nuttx/spinlock.h>
#include <nuttx/sched_note.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nvic.h"
#include "sched/sched.h"
#include "init/init.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#include "lc823450_syscontrol.h"
diff --git a/arch/arm/src/lc823450/lc823450_dma.c b/arch/arm/src/lc823450/lc823450_dma.c
index bb52228..1616e24 100644
--- a/arch/arm/src/lc823450/lc823450_dma.c
+++ b/arch/arm/src/lc823450/lc823450_dma.c
@@ -51,7 +51,7 @@
#include <nuttx/arch.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lc823450_dma.h"
#include "lc823450_syscontrol.h"
#include <arch/chip/clk.h>
diff --git a/arch/arm/src/lc823450/lc823450_dvfs2.c b/arch/arm/src/lc823450/lc823450_dvfs2.c
index b6e3688..10dc92f 100644
--- a/arch/arm/src/lc823450/lc823450_dvfs2.c
+++ b/arch/arm/src/lc823450/lc823450_dvfs2.c
@@ -45,7 +45,7 @@
#include <arch/board/board.h>
#include <string.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lc823450_clockconfig.h"
#include "lc823450_syscontrol.h"
diff --git a/arch/arm/src/lc823450/lc823450_gpio.c b/arch/arm/src/lc823450/lc823450_gpio.c
index d9524db..fe325d8 100644
--- a/arch/arm/src/lc823450/lc823450_gpio.c
+++ b/arch/arm/src/lc823450/lc823450_gpio.c
@@ -46,7 +46,7 @@
#include <errno.h>
#include <debug.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lc823450_gpio.h"
#include "lc823450_syscontrol.h"
diff --git a/arch/arm/src/lc823450/lc823450_i2c.c b/arch/arm/src/lc823450/lc823450_i2c.c
index 009ef95..e534516 100644
--- a/arch/arm/src/lc823450/lc823450_i2c.c
+++ b/arch/arm/src/lc823450/lc823450_i2c.c
@@ -61,7 +61,7 @@
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lc823450_syscontrol.h"
#include "lc823450_clockconfig.h"
diff --git a/arch/arm/src/lc823450/lc823450_i2s.c b/arch/arm/src/lc823450/lc823450_i2s.c
index f9ada62..d14bb14 100644
--- a/arch/arm/src/lc823450/lc823450_i2s.c
+++ b/arch/arm/src/lc823450/lc823450_i2s.c
@@ -51,7 +51,7 @@
#include <nuttx/audio/audio.h>
#include <nuttx/audio/i2s.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lc823450_dma.h"
#include "lc823450_i2s.h"
#include "lc823450_syscontrol.h"
diff --git a/arch/arm/src/lc823450/lc823450_idle.c b/arch/arm/src/lc823450/lc823450_idle.c
index bfbbf91..dba96d7 100644
--- a/arch/arm/src/lc823450/lc823450_idle.c
+++ b/arch/arm/src/lc823450/lc823450_idle.c
@@ -46,8 +46,8 @@
#include <arch/board/board.h>
#include "nvic.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#ifdef CONFIG_DVFS
# include "lc823450_dvfs2.h"
diff --git a/arch/arm/src/lc823450/lc823450_ipl2.c b/arch/arm/src/lc823450/lc823450_ipl2.c
index bb1455a..d5fca01 100644
--- a/arch/arm/src/lc823450/lc823450_ipl2.c
+++ b/arch/arm/src/lc823450/lc823450_ipl2.c
@@ -76,8 +76,8 @@
#include <libgen.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#ifdef CONFIG_ADC
# include "lc823450_adc.h"
diff --git a/arch/arm/src/lc823450/lc823450_irq.c b/arch/arm/src/lc823450/lc823450_irq.c
index ed4c1a4..e362a4c 100644
--- a/arch/arm/src/lc823450/lc823450_irq.c
+++ b/arch/arm/src/lc823450/lc823450_irq.c
@@ -53,8 +53,8 @@
#include "nvic.h"
#include "ram_vectors.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "chip.h"
#include "lc823450_intc.h"
diff --git a/arch/arm/src/lc823450/lc823450_lowputc.c b/arch/arm/src/lc823450/lc823450_lowputc.c
index 5e69606..ab7d8d9 100644
--- a/arch/arm/src/lc823450/lc823450_lowputc.c
+++ b/arch/arm/src/lc823450/lc823450_lowputc.c
@@ -42,8 +42,8 @@
#include <stdint.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
diff --git a/arch/arm/src/lc823450/lc823450_mpuinit2.c b/arch/arm/src/lc823450/lc823450_mpuinit2.c
index b61ac7b..1de5bad 100644
--- a/arch/arm/src/lc823450/lc823450_mpuinit2.c
+++ b/arch/arm/src/lc823450/lc823450_mpuinit2.c
@@ -46,7 +46,7 @@
#include <nuttx/userspace.h>
#include "mpu.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#include "lc823450_mpuinit2.h"
#ifdef CONFIG_ARM_MPU
diff --git a/arch/arm/src/lc823450/lc823450_rtc.c b/arch/arm/src/lc823450/lc823450_rtc.c
index 1ad62e9..916ba27 100644
--- a/arch/arm/src/lc823450/lc823450_rtc.c
+++ b/arch/arm/src/lc823450/lc823450_rtc.c
@@ -56,7 +56,7 @@
#include <string.h>
#include "lc823450_syscontrol.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "clock/clock.h"
/****************************************************************************
diff --git a/arch/arm/src/lc823450/lc823450_sdc.c b/arch/arm/src/lc823450/lc823450_sdc.c
index cd2984c..5f47694 100644
--- a/arch/arm/src/lc823450/lc823450_sdc.c
+++ b/arch/arm/src/lc823450/lc823450_sdc.c
@@ -53,7 +53,7 @@
#include <string.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lc823450_sddrv_if.h"
#include "lc823450_sdc.h"
diff --git a/arch/arm/src/lc823450/lc823450_sddrv_dep.c b/arch/arm/src/lc823450/lc823450_sddrv_dep.c
index 6f534ce..e0f033d 100644
--- a/arch/arm/src/lc823450/lc823450_sddrv_dep.c
+++ b/arch/arm/src/lc823450/lc823450_sddrv_dep.c
@@ -53,7 +53,7 @@
#include <nuttx/semaphore.h>
#include <nuttx/signal.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lc823450_sddrv_type.h"
#include "lc823450_sddrv_if.h"
#include "lc823450_dma.h"
diff --git a/arch/arm/src/lc823450/lc823450_serial.c b/arch/arm/src/lc823450/lc823450_serial.c
index 7ca44f7..b3f5654 100644
--- a/arch/arm/src/lc823450/lc823450_serial.c
+++ b/arch/arm/src/lc823450/lc823450_serial.c
@@ -58,8 +58,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lc823450_dma.h"
#include "lc823450_serial.h"
diff --git a/arch/arm/src/lc823450/lc823450_spi.c b/arch/arm/src/lc823450/lc823450_spi.c
index 10806d0..a5760de 100644
--- a/arch/arm/src/lc823450/lc823450_spi.c
+++ b/arch/arm/src/lc823450/lc823450_spi.c
@@ -52,7 +52,7 @@
#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "lc823450_syscontrol.h"
diff --git a/arch/arm/src/lc823450/lc823450_spifi2.c b/arch/arm/src/lc823450/lc823450_spifi2.c
index 7d18451..961fca9 100644
--- a/arch/arm/src/lc823450/lc823450_spifi2.c
+++ b/arch/arm/src/lc823450/lc823450_spifi2.c
@@ -40,7 +40,7 @@
#include <errno.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lc823450_syscontrol.h"
#include "lc823450_spifi2.h"
diff --git a/arch/arm/src/lc823450/lc823450_start.c b/arch/arm/src/lc823450/lc823450_start.c
index aaa7eda..fcbd7c1 100644
--- a/arch/arm/src/lc823450/lc823450_start.c
+++ b/arch/arm/src/lc823450/lc823450_start.c
@@ -55,8 +55,8 @@
# include <nuttx/lastkmsg.h>
#endif /* CONFIG_LASTKMSG */
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "nvic.h"
#include <arch/board/board.h>
diff --git a/arch/arm/src/lc823450/lc823450_syscontrol.c b/arch/arm/src/lc823450/lc823450_syscontrol.c
index 34258cb..f673fe8 100644
--- a/arch/arm/src/lc823450/lc823450_syscontrol.c
+++ b/arch/arm/src/lc823450/lc823450_syscontrol.c
@@ -48,8 +48,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lc823450_gpio.h"
#include "lc823450_syscontrol.h"
diff --git a/arch/arm/src/lc823450/lc823450_testset.c b/arch/arm/src/lc823450/lc823450_testset.c
index 12934c2..432212c 100644
--- a/arch/arm/src/lc823450/lc823450_testset.c
+++ b/arch/arm/src/lc823450/lc823450_testset.c
@@ -43,7 +43,7 @@
#include <nuttx/arch.h>
#include <nuttx/spinlock.h>
-#include "up_arch.h"
+#include "arm_arch.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/lc823450/lc823450_timer.c b/arch/arm/src/lc823450/lc823450_timer.c
index 3e11837..d112978 100644
--- a/arch/arm/src/lc823450/lc823450_timer.c
+++ b/arch/arm/src/lc823450/lc823450_timer.c
@@ -50,8 +50,8 @@
#include "nvic.h"
#include "clock/clock.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
#include "lc823450_gpio.h"
diff --git a/arch/arm/src/lc823450/lc823450_usbdev.c b/arch/arm/src/lc823450/lc823450_usbdev.c
index efdde1b..dc07f51 100644
--- a/arch/arm/src/lc823450/lc823450_usbdev.c
+++ b/arch/arm/src/lc823450/lc823450_usbdev.c
@@ -75,7 +75,7 @@
#include <arch/irq.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lc823450_usbdev.h"
#include "lc823450_dma.h"
diff --git a/arch/arm/src/lc823450/lc823450_wdt.c b/arch/arm/src/lc823450/lc823450_wdt.c
index d1da809..d65f3a1 100644
--- a/arch/arm/src/lc823450/lc823450_wdt.c
+++ b/arch/arm/src/lc823450/lc823450_wdt.c
@@ -56,7 +56,7 @@
#include <nuttx/clock.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "lc823450_syscontrol.h"
#include "lc823450_wdt.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc176x_clockconfig.c b/arch/arm/src/lpc17xx_40xx/lpc176x_clockconfig.c
index c857e8a..218333a 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc176x_clockconfig.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc176x_clockconfig.c
@@ -46,8 +46,8 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc17_40_clockconfig.h"
#include "hardware/lpc17_40_syscon.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc176x_gpio.c b/arch/arm/src/lpc17xx_40xx/lpc176x_gpio.c
index f614f51..1de4d26 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc176x_gpio.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc176x_gpio.c
@@ -47,7 +47,7 @@
#include <arch/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "lpc17_40_gpio.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc176x_rtc.c b/arch/arm/src/lpc17xx_40xx/lpc176x_rtc.c
index 6a7282e..460dc78 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc176x_rtc.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc176x_rtc.c
@@ -48,8 +48,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/lpc17_40_syscon.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_clockconfig.c b/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_clockconfig.c
index 44007fb..f527275 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_clockconfig.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_clockconfig.c
@@ -46,8 +46,8 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc17_40_clockconfig.h"
#include "hardware/lpc17_40_syscon.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_gpio.c b/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_gpio.c
index 600b6f7..460c248 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_gpio.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc178x_40xx_gpio.c
@@ -48,7 +48,7 @@
#include <arch/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "lpc17_40_gpio.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c
index 34bf55a..cdce0a3 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_adc.c
@@ -58,8 +58,8 @@
#include <nuttx/arch.h>
#include <nuttx/analog/adc.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
#include "hardware/lpc17_40_syscon.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c
index 1775ab2..b0e0f7d 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_allocateheap.c
@@ -49,8 +49,8 @@
#include "chip.h"
#include "mpu.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/lpc17_40_memorymap.h"
#include "lpc17_40_emacram.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c
index b3aa0a7..c44d1fb 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_can.c
@@ -58,8 +58,8 @@
#include <nuttx/arch.h>
#include <nuttx/can/can.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
#include "hardware/lpc17_40_syscon.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_clrpend.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_clrpend.c
index 55546b6..0e50db5 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_clrpend.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_clrpend.c
@@ -43,7 +43,7 @@
#include <arch/irq.h>
#include "nvic.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc17_40_clrpend.h"
/****************************************************************************
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c
index e9f2069..8df2261 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_dac.c
@@ -56,8 +56,8 @@
#include <nuttx/arch.h>
#include <nuttx/analog/dac.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_emc.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_emc.c
index c12898c..37f86af 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_emc.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_emc.c
@@ -43,7 +43,7 @@
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/lpc17_40_syscon.h"
#include "lpc17_40_gpio.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c
index 9e4dfe1..b90aeb0 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_ethernet.c
@@ -64,7 +64,7 @@
# include <nuttx/net/pkt.h>
#endif
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "hardware/lpc17_40_syscon.h"
#include "lpc17_40_gpio.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c
index 77cfef3..2590e93 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpdma.c
@@ -50,8 +50,8 @@
#include <nuttx/arch.h>
#include <nuttx/semaphore.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
@@ -275,7 +275,7 @@ static int gpdma_interrupt(int irq, FAR void *context, FAR void *arg)
*
* Description:
* Initialize the GPDMA subsystem. Called from up_initialize() early in
- * the boot-up sequence. Prototyped in up_internal.h.
+ * the boot-up sequence. Prototyped in arm_internal.h.
*
* Returned Value:
* None
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpiodbg.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpiodbg.c
index d3a4575..e97a263 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpiodbg.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpiodbg.c
@@ -50,7 +50,7 @@
#include <debug.h>
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "lpc17_40_gpio.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpioint.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpioint.c
index 2025f7e..54e33e5 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_gpioint.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_gpioint.c
@@ -47,7 +47,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "lpc17_40_gpio.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c
index 2052e7b..3a02289 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_i2c.c
@@ -66,8 +66,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "chip.h"
#include "hardware/lpc17_40_syscon.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_idle.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_idle.c
index a9e3d58..30626ba 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_idle.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_idle.c
@@ -43,7 +43,7 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "lpc17_40_gpdma.h"
/****************************************************************************
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c
index d493902..524f57e 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c
@@ -49,8 +49,8 @@
#include "nvic.h"
#include "ram_vectors.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc17_40_gpio.h"
#include "lpc17_40_clrpend.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_lcd.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_lcd.c
index 593df01..3f55b1d 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_lcd.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_lcd.c
@@ -47,7 +47,7 @@
#include <nuttx/video/fb.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/lpc17_40_syscon.h"
#include "lpc17_40_gpio.h"
#include "lpc17_40_lcd.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_lowputc.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_lowputc.c
index dc744c2..0e3e4ee 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_lowputc.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_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 "hardware/lpc17_40_syscon.h"
#include "hardware/lpc17_40_uart.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_mcpwm.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_mcpwm.c
index e2c142a..3c0b3d4 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_mcpwm.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_mcpwm.c
@@ -50,8 +50,8 @@
#include <nuttx/timers/pwm.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 "hardware/lpc17_40_syscon.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_pwm.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_pwm.c
index a554d0b..77b7997 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_pwm.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_pwm.c
@@ -50,8 +50,8 @@
#include <nuttx/timers/pwm.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 "hardware/lpc17_40_syscon.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c
index 9cff4e0..1791b6c 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_sdcard.c
@@ -58,7 +58,7 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc17_40_gpdma.h"
#include "lpc17_40_gpio.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c
index 6fc0899..210f29e 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_serial.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_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/lpc17_40_uart.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c
index fe3b30b..3514112 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_spi.c
@@ -52,8 +52,8 @@
#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
#include "hardware/lpc17_40_syscon.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c
index 8e091b2..1ac23cc 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_ssp.c
@@ -51,8 +51,8 @@
#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
#include "hardware/lpc17_40_syscon.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_start.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_start.c
index a985dd2..259764e 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_start.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_start.c
@@ -48,8 +48,8 @@
#include <arch/irq.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "nvic.h"
#include "lpc17_40_clockconfig.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_timer.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_timer.c
index 358d8de..5ab3ad3 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_timer.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_timer.c
@@ -50,8 +50,8 @@
#include <nuttx/timers/pwm.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 "hardware/lpc17_40_syscon.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_timerisr.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_timerisr.c
index 85faed2..d173acf 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_timerisr.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_timerisr.c
@@ -48,8 +48,8 @@
#include "nvic.h"
#include "clock/clock.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c
index a48b399..71e9f80 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbdev.c
@@ -56,8 +56,8 @@
#include <nuttx/irq.h>
#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/lpc17_40_usb.h"
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c
index 652f2b4..bf4f738 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_usbhost.c
@@ -61,8 +61,8 @@
#include <arch/board/board.h> /* May redefine GPIO settings */
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "chip.h"
#include "hardware/lpc17_40_usb.h"
diff --git a/arch/arm/src/lpc214x/lpc214x_decodeirq.c b/arch/arm/src/lpc214x/lpc214x_decodeirq.c
index 331fea5..88f62ec 100644
--- a/arch/arm/src/lpc214x/lpc214x_decodeirq.c
+++ b/arch/arm/src/lpc214x/lpc214x_decodeirq.c
@@ -46,8 +46,8 @@
#include <debug.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc214x_vic.h"
diff --git a/arch/arm/src/lpc214x/lpc214x_head.S b/arch/arm/src/lpc214x/lpc214x_head.S
index 3d14388..72db089 100644
--- a/arch/arm/src/lpc214x/lpc214x_head.S
+++ b/arch/arm/src/lpc214x/lpc214x_head.S
@@ -46,8 +46,8 @@
#include "lpc214x_pll.h"
#include "lpc214x_apb.h"
#include "lpc214x_pinsel.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
/*****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/lpc214x/lpc214x_irq.c b/arch/arm/src/lpc214x/lpc214x_irq.c
index a28854c..a836d1d 100644
--- a/arch/arm/src/lpc214x/lpc214x_irq.c
+++ b/arch/arm/src/lpc214x/lpc214x_irq.c
@@ -45,8 +45,8 @@
#include "arm.h"
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc214x_vic.h"
diff --git a/arch/arm/src/lpc214x/lpc214x_lowputc.S b/arch/arm/src/lpc214x/lpc214x_lowputc.S
index 9241f27..80de7cd 100644
--- a/arch/arm/src/lpc214x/lpc214x_lowputc.S
+++ b/arch/arm/src/lpc214x/lpc214x_lowputc.S
@@ -40,8 +40,8 @@
#include <nuttx/config.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc214x_pinsel.h"
#include "lpc214x_uart.h"
diff --git a/arch/arm/src/lpc214x/lpc214x_serial.c b/arch/arm/src/lpc214x/lpc214x_serial.c
index 270f684..4c8132b 100644
--- a/arch/arm/src/lpc214x/lpc214x_serial.c
+++ b/arch/arm/src/lpc214x/lpc214x_serial.c
@@ -52,8 +52,8 @@
#include <nuttx/serial/serial.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc214x_pinsel.h"
#include "lpc214x_uart.h"
diff --git a/arch/arm/src/lpc214x/lpc214x_timerisr.c b/arch/arm/src/lpc214x/lpc214x_timerisr.c
index 7abc497..99430e0 100644
--- a/arch/arm/src/lpc214x/lpc214x_timerisr.c
+++ b/arch/arm/src/lpc214x/lpc214x_timerisr.c
@@ -45,9 +45,9 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "clock/clock.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#include "lpc214x_timer.h"
#include "lpc214x_vic.h"
diff --git a/arch/arm/src/lpc214x/lpc214x_usbdev.c b/arch/arm/src/lpc214x/lpc214x_usbdev.c
index 8e18ff7..384a9b6 100644
--- a/arch/arm/src/lpc214x/lpc214x_usbdev.c
+++ b/arch/arm/src/lpc214x/lpc214x_usbdev.c
@@ -57,8 +57,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc214x_usbdev.h"
#include "lpc214x_pll.h"
diff --git a/arch/arm/src/lpc2378/lpc2378.h b/arch/arm/src/lpc2378/lpc2378.h
index 1e40b22..1f406f2 100644
--- a/arch/arm/src/lpc2378/lpc2378.h
+++ b/arch/arm/src/lpc2378/lpc2378.h
@@ -45,7 +45,7 @@
* Included Files
****************************************************************************************************/
-#include "up_internal.h"
+#include "arm_internal.h"
#include "chip.h"
/****************************************************************************************************
diff --git a/arch/arm/src/lpc2378/lpc23xx_decodeirq.c b/arch/arm/src/lpc2378/lpc23xx_decodeirq.c
index 9c0e0b5..970f74f 100644
--- a/arch/arm/src/lpc2378/lpc23xx_decodeirq.c
+++ b/arch/arm/src/lpc2378/lpc23xx_decodeirq.c
@@ -53,7 +53,7 @@
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc2378.h"
#include "lpc23xx_vic.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_head.S b/arch/arm/src/lpc2378/lpc23xx_head.S
index 071ed20..300a522 100644
--- a/arch/arm/src/lpc2378/lpc23xx_head.S
+++ b/arch/arm/src/lpc2378/lpc23xx_head.S
@@ -47,7 +47,7 @@
#include "arm.h"
#include "lpc2378.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc23xx_uart.h"
#include "lpc23xx_scb.h"
#include "lpc23xx_pinsel.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_i2c.c b/arch/arm/src/lpc2378/lpc23xx_i2c.c
index 82905c0..3dc29b5 100644
--- a/arch/arm/src/lpc2378/lpc23xx_i2c.c
+++ b/arch/arm/src/lpc2378/lpc23xx_i2c.c
@@ -71,8 +71,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc23xx_pinsel.h"
#include "lpc23xx_scb.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_io.c b/arch/arm/src/lpc2378/lpc23xx_io.c
index f871ce1..9f6afd0 100644
--- a/arch/arm/src/lpc2378/lpc23xx_io.c
+++ b/arch/arm/src/lpc2378/lpc23xx_io.c
@@ -41,7 +41,7 @@
* Included files
****************************************************************************/
-#include "up_arch.h"
+#include "arm_arch.h"
#include <sys/types.h>
#include "lpc23xx_scb.h"
#include "lpc23xx_pinsel.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_irq.c b/arch/arm/src/lpc2378/lpc23xx_irq.c
index a17d63d..bcad9d3 100644
--- a/arch/arm/src/lpc2378/lpc23xx_irq.c
+++ b/arch/arm/src/lpc2378/lpc23xx_irq.c
@@ -51,8 +51,8 @@
#include "arm.h"
#include "chip.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "lpc2378.h"
#include "lpc23xx_vic.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_lowputc.S b/arch/arm/src/lpc2378/lpc23xx_lowputc.S
index 7cdbcc0..1f4dad5 100644
--- a/arch/arm/src/lpc2378/lpc23xx_lowputc.S
+++ b/arch/arm/src/lpc2378/lpc23xx_lowputc.S
@@ -43,8 +43,8 @@
**************************************************************************/
#include <nuttx/config.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "lpc23xx_pinsel.h"
#include "lpc23xx_scb.h"
#include "lpc23xx_uart.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_pllsetup.c b/arch/arm/src/lpc2378/lpc23xx_pllsetup.c
index 77b4307..6b077d7 100644
--- a/arch/arm/src/lpc2378/lpc23xx_pllsetup.c
+++ b/arch/arm/src/lpc2378/lpc23xx_pllsetup.c
@@ -65,7 +65,7 @@
#include <sys/types.h>
#include "arm.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc2378.h"
#include "lpc23xx_pinsel.h"
#include "lpc23xx_scb.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_serial.c b/arch/arm/src/lpc2378/lpc23xx_serial.c
index ff62b9f..64f7cba 100644
--- a/arch/arm/src/lpc2378/lpc23xx_serial.c
+++ b/arch/arm/src/lpc2378/lpc23xx_serial.c
@@ -58,7 +58,7 @@
#include <nuttx/serial/serial.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc2378.h"
#include "lpc23xx_scb.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_spi.c b/arch/arm/src/lpc2378/lpc23xx_spi.c
index 2ee94bb..af8a042 100644
--- a/arch/arm/src/lpc2378/lpc23xx_spi.c
+++ b/arch/arm/src/lpc2378/lpc23xx_spi.c
@@ -56,8 +56,8 @@
#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
#include "lpc23xx_pinsel.h"
diff --git a/arch/arm/src/lpc2378/lpc23xx_timerisr.c b/arch/arm/src/lpc2378/lpc23xx_timerisr.c
index 8ba3d14..e13a19b 100644
--- a/arch/arm/src/lpc2378/lpc23xx_timerisr.c
+++ b/arch/arm/src/lpc2378/lpc23xx_timerisr.c
@@ -50,7 +50,7 @@
#include "clock/clock.h"
#include "lpc2378.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc23xx_scb.h"
#include "lpc23xx_vic.h"
diff --git a/arch/arm/src/lpc31xx/lpc31.h b/arch/arm/src/lpc31xx/lpc31.h
index f78c0da..ede261d 100644
--- a/arch/arm/src/lpc31xx/lpc31.h
+++ b/arch/arm/src/lpc31xx/lpc31.h
@@ -46,8 +46,8 @@
#include <stdint.h>
#include <stdbool.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
#include "lpc31_ioconfig.h"
diff --git a/arch/arm/src/lpc31xx/lpc31_allocateheap.c b/arch/arm/src/lpc31xx/lpc31_allocateheap.c
index 83ce8b6..e5beaae 100644
--- a/arch/arm/src/lpc31xx/lpc31_allocateheap.c
+++ b/arch/arm/src/lpc31xx/lpc31_allocateheap.c
@@ -49,8 +49,8 @@
#include "arm.h"
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc31_memorymap.h"
#ifdef CONFIG_PAGING
diff --git a/arch/arm/src/lpc31xx/lpc31_bcrndx.c b/arch/arm/src/lpc31xx/lpc31_bcrndx.c
index 078f2c9..1231e2a 100644
--- a/arch/arm/src/lpc31xx/lpc31_bcrndx.c
+++ b/arch/arm/src/lpc31xx/lpc31_bcrndx.c
@@ -44,7 +44,7 @@
#include <nuttx/config.h>
#include <stdint.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc31_cgudrvr.h"
/****************************************************************************
diff --git a/arch/arm/src/lpc31xx/lpc31_boot.c b/arch/arm/src/lpc31xx/lpc31_boot.c
index ee12add..9ca94e2 100644
--- a/arch/arm/src/lpc31xx/lpc31_boot.c
+++ b/arch/arm/src/lpc31xx/lpc31_boot.c
@@ -42,8 +42,8 @@
#include "chip.h"
#include "arm.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#ifdef CONFIG_PAGING
# include <nuttx/page.h>
diff --git a/arch/arm/src/lpc31xx/lpc31_cgudrvr.h b/arch/arm/src/lpc31xx/lpc31_cgudrvr.h
index 8fbe96b..0eaee48 100644
--- a/arch/arm/src/lpc31xx/lpc31_cgudrvr.h
+++ b/arch/arm/src/lpc31xx/lpc31_cgudrvr.h
@@ -49,7 +49,7 @@
#include <stdint.h>
#include <stdbool.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc31_cgu.h"
/**********************************************************************************************
diff --git a/arch/arm/src/lpc31xx/lpc31_clkdomain.c b/arch/arm/src/lpc31xx/lpc31_clkdomain.c
index cdb2fc9..547916f 100644
--- a/arch/arm/src/lpc31xx/lpc31_clkdomain.c
+++ b/arch/arm/src/lpc31xx/lpc31_clkdomain.c
@@ -44,7 +44,7 @@
#include <nuttx/config.h>
#include <stdint.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc31_cgudrvr.h"
/****************************************************************************
diff --git a/arch/arm/src/lpc31xx/lpc31_clkfreq.c b/arch/arm/src/lpc31xx/lpc31_clkfreq.c
index 0273bca..fe5d696 100644
--- a/arch/arm/src/lpc31xx/lpc31_clkfreq.c
+++ b/arch/arm/src/lpc31xx/lpc31_clkfreq.c
@@ -44,7 +44,7 @@
#include <nuttx/config.h>
#include <stdint.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc31_cgudrvr.h"
/****************************************************************************
diff --git a/arch/arm/src/lpc31xx/lpc31_decodeirq.c b/arch/arm/src/lpc31xx/lpc31_decodeirq.c
index 8464ffb..d0e2124 100644
--- a/arch/arm/src/lpc31xx/lpc31_decodeirq.c
+++ b/arch/arm/src/lpc31xx/lpc31_decodeirq.c
@@ -47,9 +47,9 @@
#include <nuttx/arch.h>
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
-#include "up_internal.h"
+#include "arm_internal.h"
#include "group/group.h"
#include "lpc31_intc.h"
diff --git a/arch/arm/src/lpc31xx/lpc31_ehci.c b/arch/arm/src/lpc31xx/lpc31_ehci.c
index bccc5c2..b5a4aa7 100644
--- a/arch/arm/src/lpc31xx/lpc31_ehci.c
+++ b/arch/arm/src/lpc31xx/lpc31_ehci.c
@@ -43,7 +43,7 @@
#include <nuttx/usb/usbhost_devaddr.h>
#include <nuttx/usb/usbhost_trace.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "lpc31.h"
#include "lpc31_cgudrvr.h"
diff --git a/arch/arm/src/lpc31xx/lpc31_esrndx.c b/arch/arm/src/lpc31xx/lpc31_esrndx.c
index 7b87ae8..6059d62 100644
--- a/arch/arm/src/lpc31xx/lpc31_esrndx.c
+++ b/arch/arm/src/lpc31xx/lpc31_esrndx.c
@@ -44,7 +44,7 @@
#include <nuttx/config.h>
#include <stdint.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc31_cgudrvr.h"
/****************************************************************************
diff --git a/arch/arm/src/lpc31xx/lpc31_fdcndx.c b/arch/arm/src/lpc31xx/lpc31_fdcndx.c
index 0bc9c3a..7123ee5 100644
--- a/arch/arm/src/lpc31xx/lpc31_fdcndx.c
+++ b/arch/arm/src/lpc31xx/lpc31_fdcndx.c
@@ -44,7 +44,7 @@
#include <nuttx/config.h>
#include <stdint.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc31_cgudrvr.h"
/****************************************************************************
diff --git a/arch/arm/src/lpc31xx/lpc31_i2c.c b/arch/arm/src/lpc31xx/lpc31_i2c.c
index 206ebfd..f02caca 100644
--- a/arch/arm/src/lpc31xx/lpc31_i2c.c
+++ b/arch/arm/src/lpc31xx/lpc31_i2c.c
@@ -58,8 +58,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc31_i2c.h"
#include "lpc31_evntrtr.h"
diff --git a/arch/arm/src/lpc31xx/lpc31_irq.c b/arch/arm/src/lpc31xx/lpc31_irq.c
index d62a4dc..ce4cdd8 100644
--- a/arch/arm/src/lpc31xx/lpc31_irq.c
+++ b/arch/arm/src/lpc31xx/lpc31_irq.c
@@ -48,8 +48,8 @@
#include <arch/irq.h>
#include "arm.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc31_intc.h"
#include "lpc31_cgudrvr.h"
diff --git a/arch/arm/src/lpc31xx/lpc31_lowputc.c b/arch/arm/src/lpc31xx/lpc31_lowputc.c
index 7d1335f..c9d2914 100644
--- a/arch/arm/src/lpc31xx/lpc31_lowputc.c
+++ b/arch/arm/src/lpc31xx/lpc31_lowputc.c
@@ -45,8 +45,8 @@
#include <nuttx/arch.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc31_cgudrvr.h"
#include "lpc31_uart.h"
diff --git a/arch/arm/src/lpc31xx/lpc31_serial.c b/arch/arm/src/lpc31xx/lpc31_serial.c
index e44898b..18753ec 100644
--- a/arch/arm/src/lpc31xx/lpc31_serial.c
+++ b/arch/arm/src/lpc31xx/lpc31_serial.c
@@ -52,8 +52,8 @@
#include <nuttx/fs/ioctl.h>
#include <nuttx/serial/serial.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc31_cgudrvr.h"
#include "lpc31_uart.h"
diff --git a/arch/arm/src/lpc31xx/lpc31_softreset.c b/arch/arm/src/lpc31xx/lpc31_softreset.c
index b3d32e5..ace791d 100644
--- a/arch/arm/src/lpc31xx/lpc31_softreset.c
+++ b/arch/arm/src/lpc31xx/lpc31_softreset.c
@@ -44,7 +44,7 @@
#include <nuttx/config.h>
#include <stdint.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc31_cgudrvr.h"
/****************************************************************************
diff --git a/arch/arm/src/lpc31xx/lpc31_timerisr.c b/arch/arm/src/lpc31xx/lpc31_timerisr.c
index 539e8b5..e56530e 100644
--- a/arch/arm/src/lpc31xx/lpc31_timerisr.c
+++ b/arch/arm/src/lpc31xx/lpc31_timerisr.c
@@ -47,8 +47,8 @@
#include <arch/board/board.h>
#include "clock/clock.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "lpc31_timer.h"
#include "lpc31.h"
diff --git a/arch/arm/src/lpc31xx/lpc31_usbdev.c b/arch/arm/src/lpc31xx/lpc31_usbdev.c
index 7cae79f..7e48ec7 100644
--- a/arch/arm/src/lpc31xx/lpc31_usbdev.c
+++ b/arch/arm/src/lpc31xx/lpc31_usbdev.c
@@ -62,8 +62,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc31_usbotg.h"
#include "lpc31_evntrtr.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_adc.c b/arch/arm/src/lpc43xx/lpc43_adc.c
index 52ae52b..322bc91 100644
--- a/arch/arm/src/lpc43xx/lpc43_adc.c
+++ b/arch/arm/src/lpc43xx/lpc43_adc.c
@@ -62,8 +62,8 @@
#include <nuttx/arch.h>
#include <nuttx/analog/adc.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_aes.c b/arch/arm/src/lpc43xx/lpc43_aes.c
index e231a99..27014ef 100644
--- a/arch/arm/src/lpc43xx/lpc43_aes.c
+++ b/arch/arm/src/lpc43xx/lpc43_aes.c
@@ -50,8 +50,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 <chip/lpc43_aes.h>
diff --git a/arch/arm/src/lpc43xx/lpc43_allocateheap.c b/arch/arm/src/lpc43xx/lpc43_allocateheap.c
index 50dd872..4d156b8 100644
--- a/arch/arm/src/lpc43xx/lpc43_allocateheap.c
+++ b/arch/arm/src/lpc43xx/lpc43_allocateheap.c
@@ -53,8 +53,8 @@
#include "mpu.h"
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc43_mpuinit.h"
#include "lpc43_emacram.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_can.c b/arch/arm/src/lpc43xx/lpc43_can.c
index 25e36cc..dbcd789 100644
--- a/arch/arm/src/lpc43xx/lpc43_can.c
+++ b/arch/arm/src/lpc43xx/lpc43_can.c
@@ -49,8 +49,8 @@
#include <nuttx/arch.h>
#include <nuttx/can/can.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
#include "lpc43_gpio.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_cgu.c b/arch/arm/src/lpc43xx/lpc43_cgu.c
index 0720350..fa7d86c 100644
--- a/arch/arm/src/lpc43xx/lpc43_cgu.c
+++ b/arch/arm/src/lpc43xx/lpc43_cgu.c
@@ -42,7 +42,7 @@
#include <nuttx/arch.h>
#include <errno.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc43_cgu.h"
#include <arch/board/board.h>
diff --git a/arch/arm/src/lpc43xx/lpc43_clrpend.c b/arch/arm/src/lpc43xx/lpc43_clrpend.c
index 4363923..47fc565 100644
--- a/arch/arm/src/lpc43xx/lpc43_clrpend.c
+++ b/arch/arm/src/lpc43xx/lpc43_clrpend.c
@@ -42,7 +42,7 @@
#include <arch/irq.h>
#include "nvic.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc43_irq.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_dac.c b/arch/arm/src/lpc43xx/lpc43_dac.c
index 4a19d89..2aacf63 100644
--- a/arch/arm/src/lpc43xx/lpc43_dac.c
+++ b/arch/arm/src/lpc43xx/lpc43_dac.c
@@ -61,8 +61,8 @@
#include <nuttx/arch.h>
#include <nuttx/analog/dac.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_debug.c b/arch/arm/src/lpc43xx/lpc43_debug.c
index 3b20bc6..63b11d9 100644
--- a/arch/arm/src/lpc43xx/lpc43_debug.c
+++ b/arch/arm/src/lpc43xx/lpc43_debug.c
@@ -43,7 +43,7 @@
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc43_pinconfig.h"
#include "lpc43_gpio.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_ehci.c b/arch/arm/src/lpc43xx/lpc43_ehci.c
index 8c90b3d..f75b962 100644
--- a/arch/arm/src/lpc43xx/lpc43_ehci.c
+++ b/arch/arm/src/lpc43xx/lpc43_ehci.c
@@ -47,7 +47,7 @@
#include "chip.h"
#include "hardware/lpc43_usb0.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc43_cgu.h"
#include "hardware/lpc43_creg.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_emc.c b/arch/arm/src/lpc43xx/lpc43_emc.c
index 17273a5..d5d91cf 100644
--- a/arch/arm/src/lpc43xx/lpc43_emc.c
+++ b/arch/arm/src/lpc43xx/lpc43_emc.c
@@ -25,7 +25,7 @@
#include <nuttx/irq.h>
#include <nuttx/wdog.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "chip.h"
#include "lpc43_pinconfig.h"
@@ -35,7 +35,7 @@
#include "hardware/lpc43_ccu.h"
#include "lpc43_rgu.h"
#include "lpc43_gpio.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include <arch/board/board.h>
diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c
index e4a317c..c561011 100644
--- a/arch/arm/src/lpc43xx/lpc43_ethernet.c
+++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c
@@ -61,7 +61,7 @@
# include <nuttx/net/pkt.h>
#endif
-#include "up_internal.h"
+#include "arm_internal.h"
#include "chip.h"
#include "lpc43_pinconfig.h"
@@ -71,7 +71,7 @@
#include "hardware/lpc43_ccu.h"
#include "lpc43_rgu.h"
#include "lpc43_gpio.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include <arch/board/board.h>
/****************************************************************************
diff --git a/arch/arm/src/lpc43xx/lpc43_gpdma.c b/arch/arm/src/lpc43xx/lpc43_gpdma.c
index 5ef6d00..518ea6f 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpdma.c
+++ b/arch/arm/src/lpc43xx/lpc43_gpdma.c
@@ -47,8 +47,8 @@
#include <nuttx/arch.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
@@ -273,7 +273,7 @@ static int gpdma_interrupt(int irq, FAR void *context, FAR void *arg)
*
* Description:
* Initialize the GPDMA subsystem. Called from up_initialize() early in
- * the boot-up sequence. Prototyped in up_internal.h.
+ * the boot-up sequence. Prototyped in arm_internal.h.
*
* Returned Value:
* None
diff --git a/arch/arm/src/lpc43xx/lpc43_gpio.c b/arch/arm/src/lpc43xx/lpc43_gpio.c
index 42b7ce7..bc0a6cb 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpio.c
+++ b/arch/arm/src/lpc43xx/lpc43_gpio.c
@@ -46,7 +46,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc43_gpio.h"
#ifdef CONFIG_LPC43_GPIO_IRQ
diff --git a/arch/arm/src/lpc43xx/lpc43_gpioint.c b/arch/arm/src/lpc43xx/lpc43_gpioint.c
index f7a9cbf..82cba88 100644
--- a/arch/arm/src/lpc43xx/lpc43_gpioint.c
+++ b/arch/arm/src/lpc43xx/lpc43_gpioint.c
@@ -64,7 +64,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "hardware/lpc43_scu.h"
#include "hardware/lpc43_gpio.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_i2c.c b/arch/arm/src/lpc43xx/lpc43_i2c.c
index ea0a50d..da1c32f 100644
--- a/arch/arm/src/lpc43xx/lpc43_i2c.c
+++ b/arch/arm/src/lpc43xx/lpc43_i2c.c
@@ -69,8 +69,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc43_i2c.h"
#include "lpc43_scu.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_idle.c b/arch/arm/src/lpc43xx/lpc43_idle.c
index 33803ce..df66331 100644
--- a/arch/arm/src/lpc43xx/lpc43_idle.c
+++ b/arch/arm/src/lpc43xx/lpc43_idle.c
@@ -46,7 +46,7 @@
#include <nuttx/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c
index 4c4b3c3..6bc88a6 100644
--- a/arch/arm/src/lpc43xx/lpc43_irq.c
+++ b/arch/arm/src/lpc43xx/lpc43_irq.c
@@ -50,8 +50,8 @@
#include "chip.h"
#include "nvic.h"
#include "ram_vectors.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc43_irq.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_pinconfig.c b/arch/arm/src/lpc43xx/lpc43_pinconfig.c
index 738b4b8..ef06cbd 100644
--- a/arch/arm/src/lpc43xx/lpc43_pinconfig.c
+++ b/arch/arm/src/lpc43xx/lpc43_pinconfig.c
@@ -43,7 +43,7 @@
#include <nuttx/arch.h>
#include <errno.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc43_pinconfig.h"
/****************************************************************************
diff --git a/arch/arm/src/lpc43xx/lpc43_rgu.c b/arch/arm/src/lpc43xx/lpc43_rgu.c
index 799e3c2..ed91793 100644
--- a/arch/arm/src/lpc43xx/lpc43_rgu.c
+++ b/arch/arm/src/lpc43xx/lpc43_rgu.c
@@ -44,7 +44,7 @@
#include <nuttx/arch.h>
#include "nvic.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "lpc43_rgu.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_rit.c b/arch/arm/src/lpc43xx/lpc43_rit.c
index ed17411..596a2b3 100644
--- a/arch/arm/src/lpc43xx/lpc43_rit.c
+++ b/arch/arm/src/lpc43xx/lpc43_rit.c
@@ -54,7 +54,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/lpc43_rit.h"
#include "lpc43_rit.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_rtc.c b/arch/arm/src/lpc43xx/lpc43_rtc.c
index 51a61e6..1f233f3 100644
--- a/arch/arm/src/lpc43xx/lpc43_rtc.c
+++ b/arch/arm/src/lpc43xx/lpc43_rtc.c
@@ -51,8 +51,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/lpc43_creg.h"
#include "hardware/lpc43_rtc.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_sdmmc.c b/arch/arm/src/lpc43xx/lpc43_sdmmc.c
index bb1c7ff..a2ce880 100644
--- a/arch/arm/src/lpc43xx/lpc43_sdmmc.c
+++ b/arch/arm/src/lpc43xx/lpc43_sdmmc.c
@@ -62,7 +62,7 @@
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/lpc43_pinconfig.h"
#include "lpc43_cgu.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_serial.c b/arch/arm/src/lpc43xx/lpc43_serial.c
index dc1684c..9143191 100644
--- a/arch/arm/src/lpc43xx/lpc43_serial.c
+++ b/arch/arm/src/lpc43xx/lpc43_serial.c
@@ -59,8 +59,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc43_config.h"
#include "lpc43_serial.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_spi.c b/arch/arm/src/lpc43xx/lpc43_spi.c
index 93ae70d..00e6fb9 100644
--- a/arch/arm/src/lpc43xx/lpc43_spi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spi.c
@@ -50,8 +50,8 @@
#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
#include "lpc43_pinconfig.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.c b/arch/arm/src/lpc43xx/lpc43_spifi.c
index ed2f01f..f56752a 100644
--- a/arch/arm/src/lpc43xx/lpc43_spifi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spifi.c
@@ -56,7 +56,7 @@
#include <nuttx/irq.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "lpc43_cgu.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_ssp.c b/arch/arm/src/lpc43xx/lpc43_ssp.c
index a5311f8..a003097 100644
--- a/arch/arm/src/lpc43xx/lpc43_ssp.c
+++ b/arch/arm/src/lpc43xx/lpc43_ssp.c
@@ -51,8 +51,8 @@
#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_start.c b/arch/arm/src/lpc43xx/lpc43_start.c
index 285da75..9abfab0 100644
--- a/arch/arm/src/lpc43xx/lpc43_start.c
+++ b/arch/arm/src/lpc43xx/lpc43_start.c
@@ -62,8 +62,8 @@
#include <nuttx/init.h>
#include <arch/irq.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "nvic.h"
#include "hardware/lpc43_creg.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_tickless_rit.c b/arch/arm/src/lpc43xx/lpc43_tickless_rit.c
index bf465ce..a568121 100644
--- a/arch/arm/src/lpc43xx/lpc43_tickless_rit.c
+++ b/arch/arm/src/lpc43xx/lpc43_tickless_rit.c
@@ -54,7 +54,7 @@
#include <nuttx/clock.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "hardware/lpc43_rit.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_timer.c b/arch/arm/src/lpc43xx/lpc43_timer.c
index 4f14336..de4633f 100644
--- a/arch/arm/src/lpc43xx/lpc43_timer.c
+++ b/arch/arm/src/lpc43xx/lpc43_timer.c
@@ -51,7 +51,7 @@
#include <nuttx/timers/timer.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc43_timer.h"
#if defined(CONFIG_TIMER) && (defined(CONFIG_LPC43_TMR0) || \
diff --git a/arch/arm/src/lpc43xx/lpc43_timerisr.c b/arch/arm/src/lpc43xx/lpc43_timerisr.c
index cb5aa7b..44dbd7a 100644
--- a/arch/arm/src/lpc43xx/lpc43_timerisr.c
+++ b/arch/arm/src/lpc43xx/lpc43_timerisr.c
@@ -48,8 +48,8 @@
#include "nvic.h"
#include "clock/clock.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_uart.c b/arch/arm/src/lpc43xx/lpc43_uart.c
index dd7e18d..0f034c1 100644
--- a/arch/arm/src/lpc43xx/lpc43_uart.c
+++ b/arch/arm/src/lpc43xx/lpc43_uart.c
@@ -44,8 +44,8 @@
#include <nuttx/irq.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 "lpc43_config.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.c b/arch/arm/src/lpc43xx/lpc43_usb0dev.c
index 09347df..2217150 100644
--- a/arch/arm/src/lpc43xx/lpc43_usb0dev.c
+++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.c
@@ -67,8 +67,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc43_usb0dev.h"
#include "lpc43_creg.h"
diff --git a/arch/arm/src/lpc43xx/lpc43_wwdt.c b/arch/arm/src/lpc43xx/lpc43_wwdt.c
index 54e93d5..6f804e5 100644
--- a/arch/arm/src/lpc43xx/lpc43_wwdt.c
+++ b/arch/arm/src/lpc43xx/lpc43_wwdt.c
@@ -48,7 +48,7 @@
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc43_wdt.h"
#include "hardware/lpc43_wwdt.h"
diff --git a/arch/arm/src/lpc54xx/lpc546x_enableclk.h b/arch/arm/src/lpc54xx/lpc546x_enableclk.h
index 8d95aed..fb11d5c 100644
--- a/arch/arm/src/lpc54xx/lpc546x_enableclk.h
+++ b/arch/arm/src/lpc54xx/lpc546x_enableclk.h
@@ -42,7 +42,7 @@
#include <nuttx/config.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/lpc54_syscon.h"
/****************************************************************************
diff --git a/arch/arm/src/lpc54xx/lpc546x_power.h b/arch/arm/src/lpc54xx/lpc546x_power.h
index c113095..8ac3450 100644
--- a/arch/arm/src/lpc54xx/lpc546x_power.h
+++ b/arch/arm/src/lpc54xx/lpc546x_power.h
@@ -42,7 +42,7 @@
#include <nuttx/config.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/lpc54_syscon.h"
/************************************************************************************
diff --git a/arch/arm/src/lpc54xx/lpc54_allocateheap.c b/arch/arm/src/lpc54xx/lpc54_allocateheap.c
index 0697754..b406901 100644
--- a/arch/arm/src/lpc54xx/lpc54_allocateheap.c
+++ b/arch/arm/src/lpc54xx/lpc54_allocateheap.c
@@ -49,8 +49,8 @@
#include <nuttx/kmalloc.h>
#include <nuttx/userspace.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/lpc54_memorymap.h"
#include "lpc54_mpuinit.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_clockconfig.c b/arch/arm/src/lpc54xx/lpc54_clockconfig.c
index 39e4b1c..38ff044 100644
--- a/arch/arm/src/lpc54xx/lpc54_clockconfig.c
+++ b/arch/arm/src/lpc54xx/lpc54_clockconfig.c
@@ -52,8 +52,8 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/lpc54_syscon.h"
#include "lpc54_power.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_clrpend.c b/arch/arm/src/lpc54xx/lpc54_clrpend.c
index a0cc93a..9cac7c0 100644
--- a/arch/arm/src/lpc54xx/lpc54_clrpend.c
+++ b/arch/arm/src/lpc54xx/lpc54_clrpend.c
@@ -42,7 +42,7 @@
#include <arch/irq.h>
#include "nvic.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc54_irq.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_dma.c b/arch/arm/src/lpc54xx/lpc54_dma.c
index 57f675e..7d48dd3 100644
--- a/arch/arm/src/lpc54xx/lpc54_dma.c
+++ b/arch/arm/src/lpc54xx/lpc54_dma.c
@@ -47,8 +47,8 @@
#include <nuttx/arch.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "hardware/lpc54_inputmux.h"
#include "hardware/lpc54_dma.h"
@@ -221,7 +221,7 @@ static int lpc54_dma_interrupt(int irq, FAR void *context, FAR void *arg)
*
* Description:
* Initialize the DMA subsystem. Called from up_initialize() early in the
- * boot-up sequence. Prototyped in up_internal.h.
+ * boot-up sequence. Prototyped in arm_internal.h.
*
* Returned Value:
* None
diff --git a/arch/arm/src/lpc54xx/lpc54_emc.c b/arch/arm/src/lpc54xx/lpc54_emc.c
index a85eb34..6fce5b9 100644
--- a/arch/arm/src/lpc54xx/lpc54_emc.c
+++ b/arch/arm/src/lpc54xx/lpc54_emc.c
@@ -50,7 +50,7 @@
#include <nuttx/clock.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/lpc54_syscon.h"
#include "hardware/lpc54_emc.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_ethernet.c b/arch/arm/src/lpc54xx/lpc54_ethernet.c
index d6879bd..52a1906 100644
--- a/arch/arm/src/lpc54xx/lpc54_ethernet.c
+++ b/arch/arm/src/lpc54xx/lpc54_ethernet.c
@@ -87,7 +87,7 @@
# include <nuttx/net/pkt.h>
#endif
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/lpc54_syscon.h"
#include "hardware/lpc54_pinmux.h"
#include "hardware/lpc54_ethernet.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_gpio.c b/arch/arm/src/lpc54xx/lpc54_gpio.c
index 2acc620..3cf91a8 100644
--- a/arch/arm/src/lpc54xx/lpc54_gpio.c
+++ b/arch/arm/src/lpc54xx/lpc54_gpio.c
@@ -47,7 +47,7 @@
#include <arch/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/lpc54_iocon.h"
#include "hardware/lpc54_gpio.h"
#include "lpc54_gpio.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_gpioirq.c b/arch/arm/src/lpc54xx/lpc54_gpioirq.c
index 3d915c7..e01cb7e 100644
--- a/arch/arm/src/lpc54xx/lpc54_gpioirq.c
+++ b/arch/arm/src/lpc54xx/lpc54_gpioirq.c
@@ -44,7 +44,7 @@
#include <nuttx/arch.h>
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/lpc54_syscon.h"
#include "hardware/lpc54_inputmux.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_i2c_master.c b/arch/arm/src/lpc54xx/lpc54_i2c_master.c
index 2c0deed..e766ae6 100644
--- a/arch/arm/src/lpc54xx/lpc54_i2c_master.c
+++ b/arch/arm/src/lpc54xx/lpc54_i2c_master.c
@@ -63,8 +63,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/lpc54_pinmux.h"
#include "hardware/lpc54_syscon.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_idle.c b/arch/arm/src/lpc54xx/lpc54_idle.c
index 56e8338..3e6e3d0 100644
--- a/arch/arm/src/lpc54xx/lpc54_idle.c
+++ b/arch/arm/src/lpc54xx/lpc54_idle.c
@@ -46,7 +46,7 @@
#include <nuttx/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/lpc54xx/lpc54_irq.c b/arch/arm/src/lpc54xx/lpc54_irq.c
index b4f97a8..7722073 100644
--- a/arch/arm/src/lpc54xx/lpc54_irq.c
+++ b/arch/arm/src/lpc54xx/lpc54_irq.c
@@ -50,8 +50,8 @@
#include "chip.h"
#include "nvic.h"
#include "ram_vectors.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "lpc54_gpio.h"
#include "lpc54_irq.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_lcd.c b/arch/arm/src/lpc54xx/lpc54_lcd.c
index 8cc9e1a..0351650 100644
--- a/arch/arm/src/lpc54xx/lpc54_lcd.c
+++ b/arch/arm/src/lpc54xx/lpc54_lcd.c
@@ -49,7 +49,7 @@
#include <nuttx/video/fb.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/lpc54_syscon.h"
#include "hardware/lpc54_pinmux.h"
#include "lpc54_config.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_lowputc.c b/arch/arm/src/lpc54xx/lpc54_lowputc.c
index d6c7012..3340dd8 100644
--- a/arch/arm/src/lpc54xx/lpc54_lowputc.c
+++ b/arch/arm/src/lpc54xx/lpc54_lowputc.c
@@ -48,8 +48,8 @@
#include <stdbool.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/lpc54_memorymap.h"
#include "hardware/lpc54_syscon.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_reset.c b/arch/arm/src/lpc54xx/lpc54_reset.c
index 621a39e..d68ea4d 100644
--- a/arch/arm/src/lpc54xx/lpc54_reset.c
+++ b/arch/arm/src/lpc54xx/lpc54_reset.c
@@ -39,7 +39,7 @@
#include <nuttx/config.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "lpc54_reset.h"
/****************************************************************************
diff --git a/arch/arm/src/lpc54xx/lpc54_rtc.c b/arch/arm/src/lpc54xx/lpc54_rtc.c
index e08c180..492ccff 100644
--- a/arch/arm/src/lpc54xx/lpc54_rtc.c
+++ b/arch/arm/src/lpc54xx/lpc54_rtc.c
@@ -52,7 +52,7 @@
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/lpc54_rtc.h"
#include "lpc54_enableclk.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c b/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c
index beef333..c5026f1 100644
--- a/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c
+++ b/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c
@@ -47,7 +47,7 @@
#include <nuttx/arch.h>
#include <nuttx/timers/rtc.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/lpc54_rtc.h"
#include "lpc54_rtc.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_sdmmc.c b/arch/arm/src/lpc54xx/lpc54_sdmmc.c
index a1eb178..7b1028c 100644
--- a/arch/arm/src/lpc54xx/lpc54_sdmmc.c
+++ b/arch/arm/src/lpc54xx/lpc54_sdmmc.c
@@ -67,7 +67,7 @@
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/lpc54_pinmux.h"
#include "hardware/lpc54_syscon.h"
#include "lpc54_enableclk.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_serial.c b/arch/arm/src/lpc54xx/lpc54_serial.c
index eea04e8..8b15239 100644
--- a/arch/arm/src/lpc54xx/lpc54_serial.c
+++ b/arch/arm/src/lpc54xx/lpc54_serial.c
@@ -53,8 +53,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 "lpc54_config.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_spi_master.c b/arch/arm/src/lpc54xx/lpc54_spi_master.c
index 3e96a7d..77ae0e7 100644
--- a/arch/arm/src/lpc54xx/lpc54_spi_master.c
+++ b/arch/arm/src/lpc54xx/lpc54_spi_master.c
@@ -60,8 +60,8 @@
#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "hardware/lpc54_pinmux.h"
#include "hardware/lpc54_syscon.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_start.c b/arch/arm/src/lpc54xx/lpc54_start.c
index 0506c71..5d8a15c 100644
--- a/arch/arm/src/lpc54xx/lpc54_start.c
+++ b/arch/arm/src/lpc54xx/lpc54_start.c
@@ -43,8 +43,8 @@
#include <arch/board/board.h>
#include <arch/irq.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "nvic.h"
#include "hardware/lpc54_syscon.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_start.h b/arch/arm/src/lpc54xx/lpc54_start.h
index 8378c6e..00e0cfa 100644
--- a/arch/arm/src/lpc54xx/lpc54_start.h
+++ b/arch/arm/src/lpc54xx/lpc54_start.h
@@ -47,7 +47,7 @@
#include <stdint.h>
#include <stdbool.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "chip.h"
/************************************************************************************
diff --git a/arch/arm/src/lpc54xx/lpc54_tickless.c b/arch/arm/src/lpc54xx/lpc54_tickless.c
index d7963b1..ad0a9d8 100644
--- a/arch/arm/src/lpc54xx/lpc54_tickless.c
+++ b/arch/arm/src/lpc54xx/lpc54_tickless.c
@@ -49,7 +49,7 @@
#include <nuttx/clock.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "hardware/lpc54_rit.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_timerisr.c b/arch/arm/src/lpc54xx/lpc54_timerisr.c
index feeb070..a49ec2c 100644
--- a/arch/arm/src/lpc54xx/lpc54_timerisr.c
+++ b/arch/arm/src/lpc54xx/lpc54_timerisr.c
@@ -48,8 +48,8 @@
#include "nvic.h"
#include "clock/clock.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "hardware/lpc54_syscon.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c b/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c
index 161298a..ef4fa07 100644
--- a/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c
+++ b/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c
@@ -45,8 +45,8 @@
#include <arch/board/board.h> /* May redefine GPIO settings */
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "chip.h"
#include "hardware/lpc54_usb.h"
diff --git a/arch/arm/src/lpc54xx/lpc54_wwdt.c b/arch/arm/src/lpc54xx/lpc54_wwdt.c
index 019e788..3cd9816 100644
--- a/arch/arm/src/lpc54xx/lpc54_wwdt.c
+++ b/arch/arm/src/lpc54xx/lpc54_wwdt.c
@@ -48,7 +48,7 @@
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/lpc54_wwdt.h"
#include "lpc54_power.h"
#include "lpc54_wdt.h"
diff --git a/arch/arm/src/max326xx/common/max326_clrpend.c b/arch/arm/src/max326xx/common/max326_clrpend.c
index 97583e9..601a68c 100644
--- a/arch/arm/src/max326xx/common/max326_clrpend.c
+++ b/arch/arm/src/max326xx/common/max326_clrpend.c
@@ -42,7 +42,7 @@
#include <arch/irq.h>
#include "nvic.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "max326_irq.h"
diff --git a/arch/arm/src/max326xx/common/max326_icc.c b/arch/arm/src/max326xx/common/max326_icc.c
index 7f2ef00..6ded946 100644
--- a/arch/arm/src/max326xx/common/max326_icc.c
+++ b/arch/arm/src/max326xx/common/max326_icc.c
@@ -43,7 +43,7 @@
#include <stdbool.h>
#include <assert.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/max326_icc.h"
#include "max326_periphclks.h"
#include "max326_icc.h"
diff --git a/arch/arm/src/max326xx/common/max326_idle.c b/arch/arm/src/max326xx/common/max326_idle.c
index 50c50f0..ad9e1e0 100644
--- a/arch/arm/src/max326xx/common/max326_idle.c
+++ b/arch/arm/src/max326xx/common/max326_idle.c
@@ -46,7 +46,7 @@
#include <nuttx/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/max326xx/common/max326_irq.c b/arch/arm/src/max326xx/common/max326_irq.c
index 949a103..9a427f4 100644
--- a/arch/arm/src/max326xx/common/max326_irq.c
+++ b/arch/arm/src/max326xx/common/max326_irq.c
@@ -50,8 +50,8 @@
#include "chip.h"
#include "nvic.h"
#include "ram_vectors.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "max326_gpio.h"
#include "max326_irq.h"
diff --git a/arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c b/arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c
index f7078bb..f6d7f1e 100644
--- a/arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c
+++ b/arch/arm/src/max326xx/common/max326_rtc_lowerhalf.c
@@ -47,7 +47,7 @@
#include <nuttx/arch.h>
#include <nuttx/timers/rtc.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "max326_rtc.h"
diff --git a/arch/arm/src/max326xx/common/max326_start.c b/arch/arm/src/max326xx/common/max326_start.c
index f8321c1..822a9e4 100644
--- a/arch/arm/src/max326xx/common/max326_start.c
+++ b/arch/arm/src/max326xx/common/max326_start.c
@@ -43,8 +43,8 @@
#include <arch/board/board.h>
#include <arch/irq.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "nvic.h"
#include "max326_clockconfig.h"
diff --git a/arch/arm/src/max326xx/common/max326_timerisr.c b/arch/arm/src/max326xx/common/max326_timerisr.c
index d97fcf3..f9c70fb 100644
--- a/arch/arm/src/max326xx/common/max326_timerisr.c
+++ b/arch/arm/src/max326xx/common/max326_timerisr.c
@@ -48,8 +48,8 @@
#include "nvic.h"
#include "clock/clock.h"
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "max326_clockconfig.h"
/****************************************************************************
diff --git a/arch/arm/src/max326xx/max32660/max32660_clockconfig.c b/arch/arm/src/max326xx/max32660/max32660_clockconfig.c
index 3b00f2c..499e82e 100644
--- a/arch/arm/src/max326xx/max32660/max32660_clockconfig.c
+++ b/arch/arm/src/max326xx/max32660/max32660_clockconfig.c
@@ -43,7 +43,7 @@
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/max326_gcr.h"
#include "hardware/max326_pwrseq.h"
diff --git a/arch/arm/src/max326xx/max32660/max32660_dma.c b/arch/arm/src/max326xx/max32660/max32660_dma.c
index 86824ed..e3d67f0 100644
--- a/arch/arm/src/max326xx/max32660/max32660_dma.c
+++ b/arch/arm/src/max326xx/max32660/max32660_dma.c
@@ -45,7 +45,7 @@
#include <nuttx/arch.h>
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/max326_dma.h"
#include "max326_periphclks.h"
diff --git a/arch/arm/src/max326xx/max32660/max32660_gpio.c b/arch/arm/src/max326xx/max32660/max32660_gpio.c
index 63bc620..015314b 100644
--- a/arch/arm/src/max326xx/max32660/max32660_gpio.c
+++ b/arch/arm/src/max326xx/max32660/max32660_gpio.c
@@ -45,7 +45,7 @@
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "max326_gpio.h"
diff --git a/arch/arm/src/max326xx/max32660/max32660_gpioirq.c b/arch/arm/src/max326xx/max32660/max32660_gpioirq.c
index fe2ced5..7368704 100644
--- a/arch/arm/src/max326xx/max32660/max32660_gpioirq.c
+++ b/arch/arm/src/max326xx/max32660/max32660_gpioirq.c
@@ -44,7 +44,7 @@
#include <nuttx/arch.h>
#include <nuttx/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "max326_gpio.h"
diff --git a/arch/arm/src/max326xx/max32660/max32660_lowputc.c b/arch/arm/src/max326xx/max32660/max32660_lowputc.c
index db1c551..109772e 100644
--- a/arch/arm/src/max326xx/max32660/max32660_lowputc.c
+++ b/arch/arm/src/max326xx/max32660/max32660_lowputc.c
@@ -42,8 +42,8 @@
#include <stdbool.h>
#include <fixedmath.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/max326_memorymap.h"
#include "hardware/max326_pinmux.h"
diff --git a/arch/arm/src/max326xx/max32660/max32660_periphclks.h b/arch/arm/src/max326xx/max32660/max32660_periphclks.h
index 25d87d2..08b4355 100644
--- a/arch/arm/src/max326xx/max32660/max32660_periphclks.h
+++ b/arch/arm/src/max326xx/max32660/max32660_periphclks.h
@@ -45,7 +45,7 @@
#include <stdint.h>
#include <stdbool.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/max326_gcr.h"
/************************************************************************************
diff --git a/arch/arm/src/max326xx/max32660/max32660_rtc.c b/arch/arm/src/max326xx/max32660/max32660_rtc.c
index 22e617a..d611007 100644
--- a/arch/arm/src/max326xx/max32660/max32660_rtc.c
+++ b/arch/arm/src/max326xx/max32660/max32660_rtc.c
@@ -51,7 +51,7 @@
#include <nuttx/clock.h>
#include <nuttx/timers/rtc.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/max326_rtc.h"
#include "max326_rtc.h"
diff --git a/arch/arm/src/max326xx/max32660/max32660_serial.c b/arch/arm/src/max326xx/max32660/max32660_serial.c
index e951bc2..5583505 100644
--- a/arch/arm/src/max326xx/max32660/max32660_serial.c
+++ b/arch/arm/src/max326xx/max32660/max32660_serial.c
@@ -53,8 +53,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 "max326_config.h"
diff --git a/arch/arm/src/max326xx/max32660/max32660_spim.c b/arch/arm/src/max326xx/max32660/max32660_spim.c
index 6bf05dc..6e16189 100644
--- a/arch/arm/src/max326xx/max32660/max32660_spim.c
+++ b/arch/arm/src/max326xx/max32660/max32660_spim.c
@@ -74,8 +74,8 @@
#include <nuttx/semaphore.h>
#include <nuttx/spi/spi.h>
-#include "up_internal.h"
-#include "up_arch.h"
+#include "arm_internal.h"
+#include "arm_arch.h"
#include "chip.h"
#include "hardware/max326_pinmux.h"
diff --git a/arch/arm/src/max326xx/max32660/max32660_wdt.c b/arch/arm/src/max326xx/max32660/max32660_wdt.c
index bb394d5..44ee571 100644
--- a/arch/arm/src/max326xx/max32660/max32660_wdt.c
+++ b/arch/arm/src/max326xx/max32660/max32660_wdt.c
@@ -50,8 +50,8 @@
#include <arch/board/board.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/max326_wdt.h"
#include "max326_clockconfig.h"
diff --git a/arch/arm/src/max326xx/max326_start.h b/arch/arm/src/max326xx/max326_start.h
index 09d07a8..feb0be7 100644
--- a/arch/arm/src/max326xx/max326_start.h
+++ b/arch/arm/src/max326xx/max326_start.h
@@ -47,7 +47,7 @@
#include <stdint.h>
#include <stdbool.h>
-#include "up_internal.h"
+#include "arm_internal.h"
#include "chip.h"
/************************************************************************************
diff --git a/arch/arm/src/moxart/moxart_16550.c b/arch/arm/src/moxart/moxart_16550.c
index 561165b..e882941 100644
--- a/arch/arm/src/moxart/moxart_16550.c
+++ b/arch/arm/src/moxart/moxart_16550.c
@@ -52,7 +52,7 @@
#include <nuttx/serial/mxser.h>
#include "arm.h"
-#include "up_arch.h"
+#include "arm_arch.h"
/****************************************************************************
* Public Functions
diff --git a/arch/arm/src/moxart/moxart_idle.c b/arch/arm/src/moxart/moxart_idle.c
index a7191e3..751404e 100644
--- a/arch/arm/src/moxart/moxart_idle.c
+++ b/arch/arm/src/moxart/moxart_idle.c
@@ -40,7 +40,7 @@
#include <nuttx/config.h>
#include <nuttx/arch.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/moxart/moxart_irq.c b/arch/arm/src/moxart/moxart_irq.c
index b81baea..2911421 100644
--- a/arch/arm/src/moxart/moxart_irq.c
+++ b/arch/arm/src/moxart/moxart_irq.c
@@ -48,8 +48,8 @@
#include <arch/board/board.h>
#include "arm.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/moxart/moxart_lowputc.S b/arch/arm/src/moxart/moxart_lowputc.S
index dff1683..c9dad21 100644
--- a/arch/arm/src/moxart/moxart_lowputc.S
+++ b/arch/arm/src/moxart/moxart_lowputc.S
@@ -40,8 +40,8 @@
#include <nuttx/config.h>
#include "chip.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
/**************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/moxart/moxart_systemreset.c b/arch/arm/src/moxart/moxart_systemreset.c
index f6e770e..607048c 100644
--- a/arch/arm/src/moxart/moxart_systemreset.c
+++ b/arch/arm/src/moxart/moxart_systemreset.c
@@ -44,7 +44,7 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/moxart/moxart_timer.c b/arch/arm/src/moxart/moxart_timer.c
index 1606bf9..a6f3e25 100644
--- a/arch/arm/src/moxart/moxart_timer.c
+++ b/arch/arm/src/moxart/moxart_timer.c
@@ -41,7 +41,7 @@
#include <arch/board/board.h>
#include "arm.h"
-#include "up_arch.h"
+#include "arm_arch.h"
/****************************************************************************
* {re-processor Definitions
diff --git a/arch/arm/src/nrf52/nrf52832_errdata.c b/arch/arm/src/nrf52/nrf52832_errdata.c
index a17f1c1..2667c6f 100644
--- a/arch/arm/src/nrf52/nrf52832_errdata.c
+++ b/arch/arm/src/nrf52/nrf52832_errdata.c
@@ -50,11 +50,11 @@
#include <nuttx/fs/ioctl.h>
#include <nuttx/drivers/drivers.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "chip.h"
#include "hardware/nrf52_utils.h"
#include "hardware/nrf52_rng.h"
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Private Functions
diff --git a/arch/arm/src/nrf52/nrf52_allocateheap.c b/arch/arm/src/nrf52/nrf52_allocateheap.c
index dedf174..4cc5730 100644
--- a/arch/arm/src/nrf52/nrf52_allocateheap.c
+++ b/arch/arm/src/nrf52/nrf52_allocateheap.c
@@ -49,8 +49,8 @@
#include <nuttx/kmalloc.h>
#include <nuttx/userspace.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/nrf52_memorymap.h"
diff --git a/arch/arm/src/nrf52/nrf52_clockconfig.c b/arch/arm/src/nrf52/nrf52_clockconfig.c
index 7a4730d..13f70a3 100644
--- a/arch/arm/src/nrf52/nrf52_clockconfig.c
+++ b/arch/arm/src/nrf52/nrf52_clockconfig.c
@@ -45,8 +45,8 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "nrf52_clockconfig.h"
diff --git a/arch/arm/src/nrf52/nrf52_flash.c b/arch/arm/src/nrf52/nrf52_flash.c
index 746d09f..2a2032a 100644
--- a/arch/arm/src/nrf52/nrf52_flash.c
+++ b/arch/arm/src/nrf52/nrf52_flash.c
@@ -52,7 +52,7 @@
#include "chip.h"
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/nrf52_ficr.h"
#include "hardware/nrf52_nvmc.h"
diff --git a/arch/arm/src/nrf52/nrf52_gpio.c b/arch/arm/src/nrf52/nrf52_gpio.c
index 278524e..3b63113 100644
--- a/arch/arm/src/nrf52/nrf52_gpio.c
+++ b/arch/arm/src/nrf52/nrf52_gpio.c
@@ -47,7 +47,7 @@
#include <arch/irq.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "hardware/nrf52_gpio.h"
#include "nrf52_gpio.h"
diff --git a/arch/arm/src/nrf52/nrf52_gpiote.c b/arch/arm/src/nrf52/nrf52_gpiote.c
index 3481711..91286e6 100644
--- a/arch/arm/src/nrf52/nrf52_gpiote.c
+++ b/arch/arm/src/nrf52/nrf52_gpiote.c
@@ -49,7 +49,7 @@
#include <arch/irq.h>
#include <nuttx/arch.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nrf52_gpio.h"
#include "nrf52_gpiote.h"
diff --git a/arch/arm/src/nrf52/nrf52_i2c.c b/arch/arm/src/nrf52/nrf52_i2c.c
index bae704a..1ee0221 100644
--- a/arch/arm/src/nrf52/nrf52_i2c.c
+++ b/arch/arm/src/nrf52/nrf52_i2c.c
@@ -47,7 +47,7 @@
#include <nuttx/semaphore.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nrf52_gpio.h"
#include "nrf52_i2c.h"
diff --git a/arch/arm/src/nrf52/nrf52_idle.c b/arch/arm/src/nrf52/nrf52_idle.c
index fc94f40..5733845 100644
--- a/arch/arm/src/nrf52/nrf52_idle.c
+++ b/arch/arm/src/nrf52/nrf52_idle.c
@@ -46,7 +46,7 @@
#include <nuttx/irq.h>
-#include "up_internal.h"
+#include "arm_internal.h"
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/nrf52/nrf52_irq.c b/arch/arm/src/nrf52/nrf52_irq.c
index a5f7599..113a516 100644
--- a/arch/arm/src/nrf52/nrf52_irq.c
+++ b/arch/arm/src/nrf52/nrf52_irq.c
@@ -50,8 +50,8 @@
#include "chip.h"
#include "nvic.h"
#include "ram_vectors.h"
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "nrf52_irq.h"
#ifdef CONFIG_NRF52_GPIOTE
diff --git a/arch/arm/src/nrf52/nrf52_lowputc.c b/arch/arm/src/nrf52/nrf52_lowputc.c
index fe9e4ec..10dbf05 100644
--- a/arch/arm/src/nrf52/nrf52_lowputc.c
+++ b/arch/arm/src/nrf52/nrf52_lowputc.c
@@ -41,8 +41,8 @@
#include <stdbool.h>
-#include "up_arch.h"
-#include "up_internal.h"
+#include "arm_arch.h"
+#include "arm_internal.h"
#include "hardware/nrf52_memorymap.h"
#include "hardware/nrf52_uarte.h"
diff --git a/arch/arm/src/nrf52/nrf52_nvmc.c b/arch/arm/src/nrf52/nrf52_nvmc.c
index 82beb1f..308ce06 100644
--- a/arch/arm/src/nrf52/nrf52_nvmc.c
+++ b/arch/arm/src/nrf52/nrf52_nvmc.c
@@ -45,7 +45,7 @@
#include <nuttx/config.h>
#include <stdbool.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "barriers.h"
#include "hardware/nrf52_ficr.h"
diff --git a/arch/arm/src/nrf52/nrf52_radio.c b/arch/arm/src/nrf52/nrf52_radio.c
index 5431c70..0853a99 100644
--- a/arch/arm/src/nrf52/nrf52_radio.c
+++ b/arch/arm/src/nrf52/nrf52_radio.c
@@ -33,7 +33,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
-#include "up_arch.h"
+#include "arm_arch.h"
#include "nrf52_gpio.h"
#include "nrf52_radio.h"
diff --git a/arch/arm/src/nrf52/nrf52_rng.c b/arch/arm/src/nrf52/nrf52_rng.c
index fccddf9..d90f2fb 100644
--- a/arch/arm/src/nrf52/nrf52_rng.c
+++ b/arch/arm/src/nrf52/nrf52_rng.c
@@ -51,11 +51,11 @@
#include <nuttx/fs/ioctl.h>
#include <nuttx/drivers/drivers.h>
... 15303 lines suppressed ...