diff --git a/arch/arm/src/a1x/a1x_boot.c b/arch/arm/src/a1x/a1x_boot.c index 2c9163db786..98de4956175 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 6657fa7f284..10c25493164 100644 --- a/arch/arm/src/a1x/a1x_irq.c +++ b/arch/arm/src/a1x/a1x_irq.c @@ -46,8 +46,8 @@ #include #include -#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 b5ad0982ec2..c69318c4dc2 100644 --- a/arch/arm/src/a1x/a1x_lowputc.c +++ b/arch/arm/src/a1x/a1x_lowputc.c @@ -44,8 +44,8 @@ #include #include -#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 2ffcb7a0ee2..8f86e8a920d 100644 --- a/arch/arm/src/a1x/a1x_pio.c +++ b/arch/arm/src/a1x/a1x_pio.c @@ -48,8 +48,8 @@ #include #include -#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 f8bf68b1862..18f6ddbffa2 100644 --- a/arch/arm/src/a1x/a1x_serial.c +++ b/arch/arm/src/a1x/a1x_serial.c @@ -57,8 +57,8 @@ #include -#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 9382fa89d3b..f8d47e5bb6d 100644 --- a/arch/arm/src/a1x/a1x_timerisr.c +++ b/arch/arm/src/a1x/a1x_timerisr.c @@ -48,7 +48,7 @@ #include #include -#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 14e5159b37e..0ee70d4381e 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 2af7c9e41c8..fc35e6ce8d4 100644 --- a/arch/arm/src/am335x/am335x_can.c +++ b/arch/arm/src/am335x/am335x_can.c @@ -45,7 +45,7 @@ #include #include -#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 02fc9d7669a..486f3e4bb89 100644 --- a/arch/arm/src/am335x/am335x_clockconfig.c +++ b/arch/arm/src/am335x/am335x_clockconfig.c @@ -39,7 +39,7 @@ #include -#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 c63c45d1a00..a6565cfd6ef 100644 --- a/arch/arm/src/am335x/am335x_gpio.c +++ b/arch/arm/src/am335x/am335x_gpio.c @@ -46,7 +46,7 @@ #include #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 b241c006c94..f8f0248d6b6 100644 --- a/arch/arm/src/am335x/am335x_gpioirq.c +++ b/arch/arm/src/am335x/am335x_gpioirq.c @@ -46,7 +46,7 @@ #include #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 ee71094b31f..915af8805c7 100644 --- a/arch/arm/src/am335x/am335x_i2c.c +++ b/arch/arm/src/am335x/am335x_i2c.c @@ -58,7 +58,7 @@ #include -#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 d6f20b89a03..62bb9267891 100644 --- a/arch/arm/src/am335x/am335x_irq.c +++ b/arch/arm/src/am335x/am335x_irq.c @@ -43,8 +43,8 @@ #include -#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 24205646423..d4c1a309b4b 100644 --- a/arch/arm/src/am335x/am335x_lcdc.c +++ b/arch/arm/src/am335x/am335x_lcdc.c @@ -55,7 +55,7 @@ #include #include -#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 4c0f0f58f78..056c8671040 100644 --- a/arch/arm/src/am335x/am335x_lowputc.c +++ b/arch/arm/src/am335x/am335x_lowputc.c @@ -44,8 +44,8 @@ #include #include -#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 841e0d68acf..77ce89c0540 100644 --- a/arch/arm/src/am335x/am335x_pinmux.c +++ b/arch/arm/src/am335x/am335x_pinmux.c @@ -44,7 +44,7 @@ #include #include -#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 4af56ac967c..bf353a568b0 100644 --- a/arch/arm/src/am335x/am335x_serial.c +++ b/arch/arm/src/am335x/am335x_serial.c @@ -57,8 +57,8 @@ #include -#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 a575ad04b62..d73d5479ecc 100644 --- a/arch/arm/src/am335x/am335x_sysclk.c +++ b/arch/arm/src/am335x/am335x_sysclk.c @@ -42,7 +42,7 @@ #include #include -#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 47ac2493766..bba3df7202c 100644 --- a/arch/arm/src/am335x/am335x_timerisr.c +++ b/arch/arm/src/am335x/am335x_timerisr.c @@ -48,7 +48,7 @@ #include #include -#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 4fd948eeac3..c1daa965d4e 100644 --- a/arch/arm/src/am335x/am335x_wdog.c +++ b/arch/arm/src/am335x/am335x_wdog.c @@ -41,7 +41,7 @@ #include -#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 4ad85784d57..209ecc142c1 100644 --- a/arch/arm/src/am335x/am335x_wdog.h +++ b/arch/arm/src/am335x/am335x_wdog.h @@ -47,7 +47,7 @@ #include #include -#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 1777e35454e..2b8de0c769e 100644 --- a/arch/arm/src/arm/arm_allocpage.c +++ b/arch/arm/src/arm/arm_allocpage.c @@ -52,7 +52,7 @@ #include #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 1f8181c239b..70379ee88d0 100644 --- a/arch/arm/src/arm/arm_assert.c +++ b/arch/arm/src/arm/arm_assert.c @@ -54,9 +54,9 @@ #include -#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 36118856614..23d85476c5e 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 4eafbf41da8..f466c27c54a 100644 --- a/arch/arm/src/arm/arm_checkmapping.c +++ b/arch/arm/src/arm/arm_checkmapping.c @@ -32,7 +32,7 @@ #include #include -#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 a3956ac273d..e4515d4b6f4 100644 --- a/arch/arm/src/arm/arm_copyfullstate.c +++ b/arch/arm/src/arm/arm_copyfullstate.c @@ -42,7 +42,7 @@ #include #include -#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 ffd08a6737a..e8ac5baffc8 100644 --- a/arch/arm/src/arm/arm_dataabort.c +++ b/arch/arm/src/arm/arm_dataabort.c @@ -30,7 +30,7 @@ #include #include "sched/sched.h" -#include "up_internal.h" +#include "arm_internal.h" #ifdef CONFIG_PAGING # include diff --git a/arch/arm/src/arm/arm_doirq.c b/arch/arm/src/arm/arm_doirq.c index 2cdf1e0dea3..680dcd68fd8 100644 --- a/arch/arm/src/arm/arm_doirq.c +++ b/arch/arm/src/arm/arm_doirq.c @@ -32,8 +32,8 @@ #include #include -#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 ab4591429eb..ca9d6631018 100644 --- a/arch/arm/src/arm/arm_fullcontextrestore.S +++ b/arch/arm/src/arm/arm_fullcontextrestore.S @@ -38,7 +38,7 @@ **************************************************************************/ #include -#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 ed0ba1bb0f4..d18aa6bf506 100644 --- a/arch/arm/src/arm/arm_initialstate.c +++ b/arch/arm/src/arm/arm_initialstate.c @@ -45,8 +45,8 @@ #include #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 cfe79791e1e..1057e4b062e 100644 --- a/arch/arm/src/arm/arm_pginitialize.c +++ b/arch/arm/src/arm/arm_pginitialize.c @@ -30,7 +30,7 @@ #include #include -#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 5e66d102e4e..7d56ea81c93 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 22d560ac565..f8b33fce07f 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 5afa279ae40..5846f536ce7 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 f97e103097d..a1c9c052a30 100644 --- a/arch/arm/src/arm/arm_saveusercontext.S +++ b/arch/arm/src/arm/arm_saveusercontext.S @@ -38,7 +38,7 @@ **************************************************************************/ #include -#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 db9542a1f04..02513ab5834 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 1bcda938a49..2469e950e78 100644 --- a/arch/arm/src/arm/arm_sigdeliver.c +++ b/arch/arm/src/arm/arm_sigdeliver.c @@ -50,8 +50,8 @@ #include #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 48c6e2d62a7..4eaf5c49ec4 100644 --- a/arch/arm/src/arm/arm_syscall.c +++ b/arch/arm/src/arm/arm_syscall.c @@ -44,8 +44,8 @@ #include -#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 24979c8ca3a..da4e99faca9 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 6ef9bae8bd0..dd84259dc16 100644 --- a/arch/arm/src/arm/arm_undefinedinsn.c +++ b/arch/arm/src/arm/arm_undefinedinsn.c @@ -45,7 +45,7 @@ #include -#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 20c5a361e37..760fe078f9b 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 f5fa95c759a..009d0e8bad0 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 diff --git a/arch/arm/src/arm/up_nommuhead.S b/arch/arm/src/arm/up_nommuhead.S index d56e0e16f08..d8492108e06 100644 --- a/arch/arm/src/arm/up_nommuhead.S +++ b/arch/arm/src/arm/up_nommuhead.S @@ -40,8 +40,8 @@ #include #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 6348cd626df..5e4035a6a08 100644 --- a/arch/arm/src/arm/up_vectoraddrexcptn.S +++ b/arch/arm/src/arm/up_vectoraddrexcptn.S @@ -39,7 +39,7 @@ #include #include -#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 c963a064279..abe06079354 100644 --- a/arch/arm/src/arm/up_vectors.S +++ b/arch/arm/src/arm/up_vectors.S @@ -41,7 +41,7 @@ #include #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 d8117f0a287..5e6eff58cb2 100644 --- a/arch/arm/src/arm/vfork.S +++ b/arch/arm/src/arm/vfork.S @@ -39,7 +39,7 @@ #include -#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 0c4a2cbfd61..e8aa30cb7fb 100644 --- a/arch/arm/src/armv6-m/arm_assert.c +++ b/arch/arm/src/armv6-m/arm_assert.c @@ -52,9 +52,9 @@ #include -#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 4c5f24afe6d..b69442d1637 100644 --- a/arch/arm/src/armv6-m/arm_blocktask.c +++ b/arch/arm/src/armv6-m/arm_blocktask.c @@ -32,7 +32,7 @@ #include #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 1df93f31497..591b9c9a95e 100644 --- a/arch/arm/src/armv6-m/arm_copyfullstate.c +++ b/arch/arm/src/armv6-m/arm_copyfullstate.c @@ -42,7 +42,7 @@ #include #include -#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 c9d0f0ecb5a..decaa086024 100644 --- a/arch/arm/src/armv6-m/arm_doirq.c +++ b/arch/arm/src/armv6-m/arm_doirq.c @@ -32,8 +32,8 @@ #include #include -#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 cd86562fcf1..6bdd83fe590 100644 --- a/arch/arm/src/armv6-m/arm_dumpnvic.c +++ b/arch/arm/src/armv6-m/arm_dumpnvic.c @@ -44,7 +44,7 @@ #include -#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 4d1780e24bc..4820ea14588 100644 --- a/arch/arm/src/armv6-m/arm_hardfault.c +++ b/arch/arm/src/armv6-m/arm_hardfault.c @@ -46,9 +46,9 @@ #include -#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 31ad0dfa7ab..263d502933f 100644 --- a/arch/arm/src/armv6-m/arm_initialstate.c +++ b/arch/arm/src/armv6-m/arm_initialstate.c @@ -45,8 +45,8 @@ #include -#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 7395f8eb125..ff15b41fe1f 100644 --- a/arch/arm/src/armv6-m/arm_releasepending.c +++ b/arch/arm/src/armv6-m/arm_releasepending.c @@ -30,7 +30,7 @@ #include #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 b3d43fa2faa..031c0db95a6 100644 --- a/arch/arm/src/armv6-m/arm_reprioritizertr.c +++ b/arch/arm/src/armv6-m/arm_reprioritizertr.c @@ -32,7 +32,7 @@ #include #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 d25d7939409..e6ea0bff8e1 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 52cdd8b4008..79a0b2656cc 100644 --- a/arch/arm/src/armv6-m/arm_sigdeliver.c +++ b/arch/arm/src/armv6-m/arm_sigdeliver.c @@ -49,8 +49,8 @@ #include #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 41c9b960136..d7280572a17 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 #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 21f735841db..fb55be61a36 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 6c19c0221fe..c5ea3dd19ee 100644 --- a/arch/arm/src/armv6-m/arm_systemreset.c +++ b/arch/arm/src/armv6-m/arm_systemreset.c @@ -29,7 +29,7 @@ #include #include -#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 53a91029238..b2c65a245d3 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 24cbfb1e0a0..35d3b88974e 100644 --- a/arch/arm/src/armv6-m/arm_vectors.c +++ b/arch/arm/src/armv6-m/arm_vectors.c @@ -44,7 +44,7 @@ #include #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 3614ee30e5e..9d72aca9cdd 100644 --- a/arch/arm/src/armv6-m/vfork.S +++ b/arch/arm/src/armv6-m/vfork.S @@ -39,7 +39,7 @@ #include -#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 a522b4ed3f5..da537e68d24 100644 --- a/arch/arm/src/armv7-a/arm_allocpage.c +++ b/arch/arm/src/armv7-a/arm_allocpage.c @@ -51,7 +51,7 @@ #include -#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 9bb32fd332e..c90dd329e57 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 a38e4e8ebaa..74f300d071d 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 5a7b2518ef5..7dc42af66c5 100644 --- a/arch/arm/src/armv7-a/arm_checkmapping.c +++ b/arch/arm/src/armv7-a/arm_checkmapping.c @@ -47,7 +47,7 @@ #include #include -#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 f61020914a3..19fec251a32 100644 --- a/arch/arm/src/armv7-a/arm_copyarmstate.c +++ b/arch/arm/src/armv7-a/arm_copyarmstate.c @@ -43,7 +43,7 @@ #include -#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 f5aee61a8e8..1646f6d4526 100644 --- a/arch/arm/src/armv7-a/arm_copyfullstate.c +++ b/arch/arm/src/armv7-a/arm_copyfullstate.c @@ -42,7 +42,7 @@ #include #include -#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 69e1bc47e69..5edb150aed0 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 1648de2fdb8..d389622d63c 100644 --- a/arch/arm/src/armv7-a/arm_cpuidlestack.c +++ b/arch/arm/src/armv7-a/arm_cpuidlestack.c @@ -45,7 +45,7 @@ #include #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 e54e864609c..ab58e9360eb 100644 --- a/arch/arm/src/armv7-a/arm_cpupause.c +++ b/arch/arm/src/armv7-a/arm_cpupause.c @@ -46,7 +46,7 @@ #include #include -#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 e868fd84dcb..f1e63cf3ad7 100644 --- a/arch/arm/src/armv7-a/arm_cpustart.c +++ b/arch/arm/src/armv7-a/arm_cpustart.c @@ -45,7 +45,7 @@ #include #include -#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 17073a925e0..85066b5f99a 100644 --- a/arch/arm/src/armv7-a/arm_dataabort.c +++ b/arch/arm/src/armv7-a/arm_dataabort.c @@ -45,7 +45,7 @@ #include #include "sched/sched.h" -#include "up_internal.h" +#include "arm_internal.h" #ifdef CONFIG_PAGING # include diff --git a/arch/arm/src/armv7-a/arm_doirq.c b/arch/arm/src/armv7-a/arm_doirq.c index a5cd87d117a..43e9f065030 100644 --- a/arch/arm/src/armv7-a/arm_doirq.c +++ b/arch/arm/src/armv7-a/arm_doirq.c @@ -47,8 +47,8 @@ #include #include -#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 b87d9bfc3b1..69331839db3 100644 --- a/arch/arm/src/armv7-a/arm_fullcontextrestore.S +++ b/arch/arm/src/armv7-a/arm_fullcontextrestore.S @@ -39,7 +39,7 @@ #include #include -#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 1eae7687e66..d0ff7c4832e 100644 --- a/arch/arm/src/armv7-a/arm_gicv2.c +++ b/arch/arm/src/armv7-a/arm_gicv2.c @@ -47,8 +47,8 @@ #include #include -#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 23e43738da2..92e572c69d5 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 #include -#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 0a92bc1853d..edf2dfdf9e4 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 dedd64ab79a..97b3c0a0ec1 100644 --- a/arch/arm/src/armv7-a/arm_initialstate.c +++ b/arch/arm/src/armv7-a/arm_initialstate.c @@ -45,8 +45,8 @@ #include #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 5d96474683c..b0a72b8f822 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 -#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 5e523cca710..76a4518aac9 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 ba431a8c603..89a3c4d0e1a 100644 --- a/arch/arm/src/armv7-a/arm_pginitialize.c +++ b/arch/arm/src/armv7-a/arm_pginitialize.c @@ -45,7 +45,7 @@ #include #include -#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 a10f703287c..ad3fea5dfd0 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 e12e38428d7..6dcf0fa8058 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 7e5ff405af3..a5e5eb72bd6 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 ba7c6a3b378..d1cb64be456 100644 --- a/arch/arm/src/armv7-a/arm_saveusercontext.S +++ b/arch/arm/src/armv7-a/arm_saveusercontext.S @@ -38,7 +38,7 @@ ****************************************************************************/ #include -#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 7a565365bfb..26f99ed4d6d 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 6ce2bdd4cbc..86955a17073 100644 --- a/arch/arm/src/armv7-a/arm_scu.c +++ b/arch/arm/src/armv7-a/arm_scu.c @@ -41,7 +41,7 @@ #include -#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 a1b5dd8bc70..092d642175c 100644 --- a/arch/arm/src/armv7-a/arm_sigdeliver.c +++ b/arch/arm/src/armv7-a/arm_sigdeliver.c @@ -50,8 +50,8 @@ #include #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 3ed15ddae5f..10be7363671 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 8eb9053b2a8..8ce7c66e3f1 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 8d8986eacfd..7cf723c81ed 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 54dbcc25b8a..b5c71c1d131 100644 --- a/arch/arm/src/armv7-a/arm_undefinedinsn.c +++ b/arch/arm/src/armv7-a/arm_undefinedinsn.c @@ -45,7 +45,7 @@ #include -#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 f4779b46ab3..f72dc2fd6b1 100644 --- a/arch/arm/src/armv7-a/arm_va2pte.c +++ b/arch/arm/src/armv7-a/arm_va2pte.c @@ -47,7 +47,7 @@ #include #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 14a42908192..856aabea515 100644 --- a/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S +++ b/arch/arm/src/armv7-a/arm_vectoraddrexcptn.S @@ -39,7 +39,7 @@ #include #include -#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 ec142f32ca8..1bd55c51ae8 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 47b23ee3a5f..ea7b162b179 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 ea69adef6f2..c6a002457f2 100644 --- a/arch/arm/src/armv7-a/vfork.S +++ b/arch/arm/src/armv7-a/vfork.S @@ -24,7 +24,7 @@ #include -#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 1ed0c0aedb4..0214414db7c 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 3de7b1e1965..78ea2e96ede 100644 --- a/arch/arm/src/armv7-m/arm_blocktask.c +++ b/arch/arm/src/armv7-m/arm_blocktask.c @@ -32,7 +32,7 @@ #include #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 6f99bcab927..f1629bbc7b4 100644 --- a/arch/arm/src/armv7-m/arm_cache.c +++ b/arch/arm/src/armv7-m/arm_cache.c @@ -46,7 +46,7 @@ #include #include -#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 edf6a832bfc..c6544aef1b8 100644 --- a/arch/arm/src/armv7-m/arm_copyarmstate.c +++ b/arch/arm/src/armv7-m/arm_copyarmstate.c @@ -28,7 +28,7 @@ #include -#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 bed29e219c3..c37c2ab3277 100644 --- a/arch/arm/src/armv7-m/arm_copyfullstate.c +++ b/arch/arm/src/armv7-m/arm_copyfullstate.c @@ -27,7 +27,7 @@ #include #include -#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 70d10ec66e8..1add2725167 100644 --- a/arch/arm/src/armv7-m/arm_doirq.c +++ b/arch/arm/src/armv7-m/arm_doirq.c @@ -32,8 +32,8 @@ #include #include -#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 06a4770f193..b19ce1f13d7 100644 --- a/arch/arm/src/armv7-m/arm_hardfault.c +++ b/arch/arm/src/armv7-m/arm_hardfault.c @@ -32,9 +32,9 @@ #include #include -#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 9276e1549ee..b014b18beb2 100644 --- a/arch/arm/src/armv7-m/arm_initialstate.c +++ b/arch/arm/src/armv7-m/arm_initialstate.c @@ -31,8 +31,8 @@ #include #include -#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 223f63fe8be..2349aea762d 100644 --- a/arch/arm/src/armv7-m/arm_itm.c +++ b/arch/arm/src/armv7-m/arm_itm.c @@ -71,7 +71,7 @@ #include -#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 bb6916c399e..de6df18e416 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 918aa7e16ac..c2a6487e994 100644 --- a/arch/arm/src/armv7-m/arm_memfault.c +++ b/arch/arm/src/armv7-m/arm_memfault.c @@ -29,9 +29,9 @@ #include -#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 0585e47e0e6..171bbea628e 100644 --- a/arch/arm/src/armv7-m/arm_mpu.c +++ b/arch/arm/src/armv7-m/arm_mpu.c @@ -28,7 +28,7 @@ #include #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 2dd26e98551..f9c6f172b85 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 79f6245e26b..984ba709cab 100644 --- a/arch/arm/src/armv7-m/arm_releasepending.c +++ b/arch/arm/src/armv7-m/arm_releasepending.c @@ -30,7 +30,7 @@ #include #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 acf53d34867..eae5198f9de 100644 --- a/arch/arm/src/armv7-m/arm_reprioritizertr.c +++ b/arch/arm/src/armv7-m/arm_reprioritizertr.c @@ -32,7 +32,7 @@ #include #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 2ec8d239446..9aab25dfd54 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 f9f4a800c1f..62752f70847 100644 --- a/arch/arm/src/armv7-m/arm_sigdeliver.c +++ b/arch/arm/src/armv7-m/arm_sigdeliver.c @@ -34,8 +34,8 @@ #include #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 01b4ea1dd4d..6b21c320acf 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 #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 9a904c699bf..419d551d657 100644 --- a/arch/arm/src/armv7-m/arm_stackcheck.c +++ b/arch/arm/src/armv7-m/arm_stackcheck.c @@ -48,7 +48,7 @@ #include -#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 8dada8b83ce..e66bc036812 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 288420b7ec4..2228fcbf6d9 100644 --- a/arch/arm/src/armv7-m/arm_systemreset.c +++ b/arch/arm/src/armv7-m/arm_systemreset.c @@ -29,7 +29,7 @@ #include #include -#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 709a5a84418..e46297bd0fc 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 6d306a06d55..400301034a9 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 #include -#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 f6c0d0f84f5..ae838d7e82d 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 8044a10612f..13f5559e776 100644 --- a/arch/arm/src/armv7-m/arm_vectors.c +++ b/arch/arm/src/armv7-m/arm_vectors.c @@ -39,7 +39,7 @@ #include #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 ac02921b4b2..41fa584bcee 100644 --- a/arch/arm/src/armv7-m/gnu/vfork.S +++ b/arch/arm/src/armv7-m/gnu/vfork.S @@ -24,7 +24,7 @@ #include -#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 773be4be490..8dd14b3345b 100644 --- a/arch/arm/src/armv7-m/iar/vfork.S +++ b/arch/arm/src/armv7-m/iar/vfork.S @@ -24,7 +24,7 @@ #include -#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 91c9a4850b1..045d4a56847 100644 --- a/arch/arm/src/armv7-m/mpu.h +++ b/arch/arm/src/armv7-m/mpu.h @@ -34,7 +34,7 @@ # include # include -# 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 0b5f9961739..b92edb12ac4 100644 --- a/arch/arm/src/armv7-m/ram_vectors.h +++ b/arch/arm/src/armv7-m/ram_vectors.h @@ -28,7 +28,7 @@ #include #include -#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 52ca71f9076..a8a65f14d0a 100644 --- a/arch/arm/src/armv7-r/arm_assert.c +++ b/arch/arm/src/armv7-r/arm_assert.c @@ -37,9 +37,9 @@ #include -#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 da7f20a9eca..802f13c9c0e 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 f18f9e46478..5b7a06edc5e 100644 --- a/arch/arm/src/armv7-r/arm_copyarmstate.c +++ b/arch/arm/src/armv7-r/arm_copyarmstate.c @@ -28,7 +28,7 @@ #include -#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 aa8eebc8a2e..805c02c15f0 100644 --- a/arch/arm/src/armv7-r/arm_copyfullstate.c +++ b/arch/arm/src/armv7-r/arm_copyfullstate.c @@ -27,7 +27,7 @@ #include #include -#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 f5939f80e5f..e08f6c84a50 100644 --- a/arch/arm/src/armv7-r/arm_dataabort.c +++ b/arch/arm/src/armv7-r/arm_dataabort.c @@ -45,7 +45,7 @@ #include #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 5d492f5ddc7..f0054bf7e84 100644 --- a/arch/arm/src/armv7-r/arm_doirq.c +++ b/arch/arm/src/armv7-r/arm_doirq.c @@ -47,8 +47,8 @@ #include #include -#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 b346a1742df..008270b89c5 100644 --- a/arch/arm/src/armv7-r/arm_fullcontextrestore.S +++ b/arch/arm/src/armv7-r/arm_fullcontextrestore.S @@ -39,7 +39,7 @@ #include #include -#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 190924cc0f6..39f7c89194d 100644 --- a/arch/arm/src/armv7-r/arm_gicv2.c +++ b/arch/arm/src/armv7-r/arm_gicv2.c @@ -48,8 +48,8 @@ #include -#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 24d790b9e09..3bfd4b5cfd6 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 diff --git a/arch/arm/src/armv7-r/arm_initialstate.c b/arch/arm/src/armv7-r/arm_initialstate.c index dcf9ee3b51c..edd7c6da3df 100644 --- a/arch/arm/src/armv7-r/arm_initialstate.c +++ b/arch/arm/src/armv7-r/arm_initialstate.c @@ -45,8 +45,8 @@ #include #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 ea4e8eae407..89d35d46ed0 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 -#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 93bda133850..29a70ddf2b4 100644 --- a/arch/arm/src/armv7-r/arm_mpu.c +++ b/arch/arm/src/armv7-r/arm_mpu.c @@ -43,7 +43,7 @@ #include #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 7d5fd7cd86a..4c3c074c8c5 100644 --- a/arch/arm/src/armv7-r/arm_prefetchabort.c +++ b/arch/arm/src/armv7-r/arm_prefetchabort.c @@ -45,7 +45,7 @@ #include #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 18fd7f41a6d..efc15423167 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 1b1cbbec2da..5753c7afe29 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 cda19e49dc3..b837059456f 100644 --- a/arch/arm/src/armv7-r/arm_saveusercontext.S +++ b/arch/arm/src/armv7-r/arm_saveusercontext.S @@ -38,7 +38,7 @@ ****************************************************************************/ #include -#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 f14901adcda..ac334b4322d 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 6ad7350b423..b4b929f06f3 100644 --- a/arch/arm/src/armv7-r/arm_sigdeliver.c +++ b/arch/arm/src/armv7-r/arm_sigdeliver.c @@ -49,8 +49,8 @@ #include #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 4f24c8a6e91..6718795c037 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 8bc7b3ba17d..6c6c29559bb 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 809c854ff4a..3c560db6527 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 733fb06cb2b..41ac2ac9a87 100644 --- a/arch/arm/src/armv7-r/arm_undefinedinsn.c +++ b/arch/arm/src/armv7-r/arm_undefinedinsn.c @@ -45,7 +45,7 @@ #include -#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 42775bd3b57..96c08cf80e8 100644 --- a/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S +++ b/arch/arm/src/armv7-r/arm_vectoraddrexcptn.S @@ -39,7 +39,7 @@ #include #include -#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 23fcf887a28..5d0e0705b89 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 6181115dab5..243f1d9011f 100644 --- a/arch/arm/src/armv7-r/mpu.h +++ b/arch/arm/src/armv7-r/mpu.h @@ -48,7 +48,7 @@ # include # include -# 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 f49bfefffef..37345987801 100644 --- a/arch/arm/src/armv7-r/vfork.S +++ b/arch/arm/src/armv7-r/vfork.S @@ -24,7 +24,7 @@ #include -#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 e60cfcca53f..2552aaa5675 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 1e26f569c48..87cbd427618 100755 --- a/arch/arm/src/armv8-m/arm_blocktask.c +++ b/arch/arm/src/armv8-m/arm_blocktask.c @@ -32,7 +32,7 @@ #include #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 23339a1be2f..56b963ef0fd 100755 --- a/arch/arm/src/armv8-m/arm_cache.c +++ b/arch/arm/src/armv8-m/arm_cache.c @@ -46,7 +46,7 @@ #include #include -#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 36e73455eef..7639feea4cb 100755 --- a/arch/arm/src/armv8-m/arm_copyarmstate.c +++ b/arch/arm/src/armv8-m/arm_copyarmstate.c @@ -28,7 +28,7 @@ #include -#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 e889213040b..79fd3688df7 100755 --- a/arch/arm/src/armv8-m/arm_copyfullstate.c +++ b/arch/arm/src/armv8-m/arm_copyfullstate.c @@ -27,7 +27,7 @@ #include #include -#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 e207a99c21f..6a91c9bb3bd 100755 --- a/arch/arm/src/armv8-m/arm_doirq.c +++ b/arch/arm/src/armv8-m/arm_doirq.c @@ -32,8 +32,8 @@ #include #include -#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 8719d02ca35..9e88bbe2f28 100755 --- a/arch/arm/src/armv8-m/arm_hardfault.c +++ b/arch/arm/src/armv8-m/arm_hardfault.c @@ -32,9 +32,9 @@ #include #include -#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 afd6487028f..ad6751ff02d 100755 --- a/arch/arm/src/armv8-m/arm_initialstate.c +++ b/arch/arm/src/armv8-m/arm_initialstate.c @@ -31,8 +31,8 @@ #include #include -#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 f69233c1ece..70497777459 100755 --- a/arch/arm/src/armv8-m/arm_itm.c +++ b/arch/arm/src/armv8-m/arm_itm.c @@ -70,7 +70,7 @@ #include -#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 e0a9ee5555b..13dee7cc4d1 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 45809c4b29c..7c1c2812d01 100755 --- a/arch/arm/src/armv8-m/arm_memfault.c +++ b/arch/arm/src/armv8-m/arm_memfault.c @@ -29,9 +29,9 @@ #include -#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 0b70fa59375..9a1ed64654e 100755 --- a/arch/arm/src/armv8-m/arm_mpu.c +++ b/arch/arm/src/armv8-m/arm_mpu.c @@ -28,7 +28,7 @@ #include #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 fd76500a468..b0b71e868ec 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 7a11ee299c9..5257302568a 100755 --- a/arch/arm/src/armv8-m/arm_releasepending.c +++ b/arch/arm/src/armv8-m/arm_releasepending.c @@ -30,7 +30,7 @@ #include #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 83dc2139748..992203bd5a8 100755 --- a/arch/arm/src/armv8-m/arm_reprioritizertr.c +++ b/arch/arm/src/armv8-m/arm_reprioritizertr.c @@ -32,7 +32,7 @@ #include #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 415b8b9cc3f..da5e1698a1f 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 7c7729b6234..0a9a1c78248 100755 --- a/arch/arm/src/armv8-m/arm_sigdeliver.c +++ b/arch/arm/src/armv8-m/arm_sigdeliver.c @@ -34,8 +34,8 @@ #include #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 4e55ca89ddb..eef30d74c52 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 #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 624b15008af..00df6344337 100755 --- a/arch/arm/src/armv8-m/arm_stackcheck.c +++ b/arch/arm/src/armv8-m/arm_stackcheck.c @@ -48,7 +48,7 @@ #include -#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 8f382d7da84..9aa6c2c1835 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 0a0784ec00b..05969e1ce90 100755 --- a/arch/arm/src/armv8-m/arm_systemreset.c +++ b/arch/arm/src/armv8-m/arm_systemreset.c @@ -29,7 +29,7 @@ #include #include -#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 f0532243846..4751984c5af 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 4be5477d4ad..4215e2fd978 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 #include -#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 289048fe2b1..3cf70af657a 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 620643dedc9..3b1a0777daf 100755 --- a/arch/arm/src/armv8-m/arm_vectors.c +++ b/arch/arm/src/armv8-m/arm_vectors.c @@ -39,7 +39,7 @@ #include #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 30dfc195437..f17b62e2f85 100755 --- a/arch/arm/src/armv8-m/mpu.h +++ b/arch/arm/src/armv8-m/mpu.h @@ -34,7 +34,7 @@ # include # include -# 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 5a19b4b0f5e..b305638790b 100755 --- a/arch/arm/src/armv8-m/ram_vectors.h +++ b/arch/arm/src/armv8-m/ram_vectors.h @@ -28,7 +28,7 @@ #include #include -#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 96d98996e2a..0b728673296 100755 --- a/arch/arm/src/armv8-m/vfork.S +++ b/arch/arm/src/armv8-m/vfork.S @@ -24,7 +24,7 @@ #include -#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 06307582ff6..72ae393b18a 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 8156ae5269e..36d087e31c5 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 88932c5bcd8..d95408c0b5c 100644 --- a/arch/arm/src/c5471/c5471_lowputc.S +++ b/arch/arm/src/c5471/c5471_lowputc.S @@ -40,8 +40,8 @@ #include #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 4ad0a741a09..0bea6f732e0 100644 --- a/arch/arm/src/c5471/c5471_serial.c +++ b/arch/arm/src/c5471/c5471_serial.c @@ -53,8 +53,8 @@ #include #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 48a3b14e75c..0b8c866e430 100644 --- a/arch/arm/src/c5471/c5471_timerisr.c +++ b/arch/arm/src/c5471/c5471_timerisr.c @@ -44,9 +44,9 @@ #include #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 18e7f90d0b8..38dd03fd335 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 5541954fddd..63dbe4cdace 100644 --- a/arch/arm/src/c5471/c5471_watchdog.c +++ b/arch/arm/src/c5471/c5471_watchdog.c @@ -51,7 +51,7 @@ #include #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 6d00fb3382a..1ac550d89a8 100644 --- a/arch/arm/src/common/arm_allocateheap.c +++ b/arch/arm/src/common/arm_allocateheap.c @@ -35,8 +35,8 @@ #include -#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 a3536aee380..aeea0167222 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 + * 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 0d7569da5ce..6ee453bd6b5 100644 --- a/arch/arm/src/common/arm_checkstack.c +++ b/arch/arm/src/common/arm_checkstack.c @@ -50,7 +50,7 @@ #include #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 6753bca2d5c..3ee27ec0888 100644 --- a/arch/arm/src/common/arm_createstack.c +++ b/arch/arm/src/common/arm_createstack.c @@ -37,8 +37,8 @@ #include #include -#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 0cb5e0ca692..556e7e5c226 100644 --- a/arch/arm/src/common/arm_etherstub.c +++ b/arch/arm/src/common/arm_etherstub.c @@ -39,7 +39,7 @@ #include -#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 12df3246692..a4285d5efa6 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 a9bdfb21cd0..d29fca0d36d 100644 --- a/arch/arm/src/common/arm_idle.c +++ b/arch/arm/src/common/arm_idle.c @@ -40,7 +40,7 @@ #include #include -#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 27f8ce4e678..2afa2eb5b08 100644 --- a/arch/arm/src/common/arm_initialize.c +++ b/arch/arm/src/common/arm_initialize.c @@ -41,8 +41,8 @@ #include -#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 2824cf985ea..75e9fa323b9 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 d7bbd67192f..07385351269 100644 --- a/arch/arm/src/common/arm_interruptcontext.c +++ b/arch/arm/src/common/arm_interruptcontext.c @@ -43,7 +43,7 @@ #include #include -#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 9d25b1a9ac9..8a75b88eeca 100644 --- a/arch/arm/src/common/arm_lowputs.c +++ b/arch/arm/src/common/arm_lowputs.c @@ -39,7 +39,7 @@ #include -#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 6292cf282fd..b2ebe95251b 100644 --- a/arch/arm/src/common/arm_modifyreg16.c +++ b/arch/arm/src/common/arm_modifyreg16.c @@ -45,7 +45,7 @@ #include #include -#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 9e51e9732ef..66ddd780efb 100644 --- a/arch/arm/src/common/arm_modifyreg32.c +++ b/arch/arm/src/common/arm_modifyreg32.c @@ -45,7 +45,7 @@ #include #include -#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 796b04940a9..1e3db5dd827 100644 --- a/arch/arm/src/common/arm_modifyreg8.c +++ b/arch/arm/src/common/arm_modifyreg8.c @@ -45,7 +45,7 @@ #include #include -#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 5ca180d4c6f..9607c9180dc 100644 --- a/arch/arm/src/common/arm_pthread_start.c +++ b/arch/arm/src/common/arm_pthread_start.c @@ -42,7 +42,7 @@ #include #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 658980e0afc..9f32ef4d4eb 100644 --- a/arch/arm/src/common/arm_puts.c +++ b/arch/arm/src/common/arm_puts.c @@ -40,7 +40,7 @@ #include #include -#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 ba620dbdbe5..e7bc25a57e2 100644 --- a/arch/arm/src/common/arm_releasestack.c +++ b/arch/arm/src/common/arm_releasestack.c @@ -45,7 +45,7 @@ #include #include -#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 33261f6474a..659c491cb2e 100644 --- a/arch/arm/src/common/arm_semi_syslog.c +++ b/arch/arm/src/common/arm_semi_syslog.c @@ -42,7 +42,7 @@ #include -#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 7f8fa91b1e7..a4285f8eb82 100644 --- a/arch/arm/src/common/arm_stackframe.c +++ b/arch/arm/src/common/arm_stackframe.c @@ -47,7 +47,7 @@ #include #include -#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 eeff19aa084..ce2a137e636 100644 --- a/arch/arm/src/common/arm_task_start.c +++ b/arch/arm/src/common/arm_task_start.c @@ -41,7 +41,7 @@ #include #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 c892ae08d09..06e81be9a0a 100644 --- a/arch/arm/src/common/arm_usestack.c +++ b/arch/arm/src/common/arm_usestack.c @@ -35,7 +35,7 @@ #include #include -#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 9012d9c74c8..c5555bc0874 100644 --- a/arch/arm/src/common/arm_vfork.c +++ b/arch/arm/src/common/arm_vfork.c @@ -34,7 +34,7 @@ #include #include -#include "up_vfork.h" +#include "arm_vfork.h" #include "sched/sched.h" /**************************************************************************** diff --git a/arch/arm/src/common/up_vfork.h b/arch/arm/src/common/arm_vfork.h similarity index 51% rename from arch/arm/src/common/up_vfork.h rename to arch/arm/src/common/arm_vfork.h index 97edf9aaa5c..2870460d390 100644 --- a/arch/arm/src/common/up_vfork.h +++ b/arch/arm/src/common/arm_vfork.h @@ -1,40 +1,25 @@ /**************************************************************************** - * arch/arm/src/common/up_vfork.h + * arch/arm/src/common/arm_vfork.h * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * 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_ARM_VFORK_H -#define __ARCH_ARM_SRC_ARM_VFORK_H +#ifndef __ARCH_ARM_SRC_COMMON_ARM_VFORK_H +#define __ARCH_ARM_SRC_COMMON_ARM_VFORK_H /**************************************************************************** * Included Files @@ -85,4 +70,4 @@ struct vfork_s }; #endif -#endif /* __ARCH_ARM_SRC_ARM_VFORK_H */ +#endif /* __ARCH_ARM_SRC_COMMON_ARM_VFORK_H */ diff --git a/arch/arm/src/cxd56xx/cxd56_adc.c b/arch/arm/src/cxd56xx/cxd56_adc.c index d098a72e875..45a52985d42 100644 --- a/arch/arm/src/cxd56xx/cxd56_adc.c +++ b/arch/arm/src/cxd56xx/cxd56_adc.c @@ -54,7 +54,7 @@ #include #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 e68f371a0a4..16d87896247 100644 --- a/arch/arm/src/cxd56xx/cxd56_allocateheap.c +++ b/arch/arm/src/cxd56xx/cxd56_allocateheap.c @@ -52,8 +52,8 @@ #include #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 c5bdbbc253b..cb44a7af36d 100644 --- a/arch/arm/src/cxd56xx/cxd56_cisif.c +++ b/arch/arm/src/cxd56xx/cxd56_cisif.c @@ -52,7 +52,7 @@ #include #include -#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 0c057f1d051..c4edcadf851 100644 --- a/arch/arm/src/cxd56xx/cxd56_clock.c +++ b/arch/arm/src/cxd56xx/cxd56_clock.c @@ -49,7 +49,7 @@ #include -#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 8d739780a5b..d9dc0c0452c 100644 --- a/arch/arm/src/cxd56xx/cxd56_cpufifo.c +++ b/arch/arm/src/cxd56xx/cxd56_cpufifo.c @@ -44,7 +44,7 @@ #include #include -#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 2f8f7511d2c..2c8201553eb 100644 --- a/arch/arm/src/cxd56xx/cxd56_cpuidlestack.c +++ b/arch/arm/src/cxd56xx/cxd56_cpuidlestack.c @@ -44,7 +44,7 @@ #include #include -#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 8ddb11b4e43..f850af0e8e4 100644 --- a/arch/arm/src/cxd56xx/cxd56_cpuindex.c +++ b/arch/arm/src/cxd56xx/cxd56_cpuindex.c @@ -41,7 +41,7 @@ #include #include -#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 795bef710cd..7dc704a6bf7 100644 --- a/arch/arm/src/cxd56xx/cxd56_cpupause.c +++ b/arch/arm/src/cxd56xx/cxd56_cpupause.c @@ -49,9 +49,9 @@ #include #include -#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 ff4022298a8..0f75a990a89 100644 --- a/arch/arm/src/cxd56xx/cxd56_cpustart.c +++ b/arch/arm/src/cxd56xx/cxd56_cpustart.c @@ -51,10 +51,10 @@ #include #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 7bd93f9fcec..4c4406e9d84 100644 --- a/arch/arm/src/cxd56xx/cxd56_emmc.c +++ b/arch/arm/src/cxd56xx/cxd56_emmc.c @@ -53,7 +53,7 @@ #include #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 c5f793a9e12..980dbfe835e 100644 --- a/arch/arm/src/cxd56xx/cxd56_farapi.c +++ b/arch/arm/src/cxd56xx/cxd56_farapi.c @@ -47,8 +47,8 @@ #include -#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 512a56fdde6..48cdb2da98c 100644 --- a/arch/arm/src/cxd56xx/cxd56_ge2d.c +++ b/arch/arm/src/cxd56xx/cxd56_ge2d.c @@ -51,7 +51,7 @@ #include #include -#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 74d35c68e5e..bfb6a10d01e 100644 --- a/arch/arm/src/cxd56xx/cxd56_gpio.c +++ b/arch/arm/src/cxd56xx/cxd56_gpio.c @@ -50,7 +50,7 @@ #include #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 669a1316ff5..8c00cc0b8a2 100644 --- a/arch/arm/src/cxd56xx/cxd56_gpioint.c +++ b/arch/arm/src/cxd56xx/cxd56_gpioint.c @@ -48,7 +48,7 @@ #include #include -#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 1428ee75d3d..24cbd309e71 100644 --- a/arch/arm/src/cxd56xx/cxd56_i2c.c +++ b/arch/arm/src/cxd56xx/cxd56_i2c.c @@ -55,8 +55,8 @@ #include #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 aa6be14a5c1..d6d26fe37d1 100644 --- a/arch/arm/src/cxd56xx/cxd56_icc.c +++ b/arch/arm/src/cxd56xx/cxd56_icc.c @@ -51,7 +51,7 @@ #include #include -#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 a73254f3600..ecec21ca746 100644 --- a/arch/arm/src/cxd56xx/cxd56_idle.c +++ b/arch/arm/src/cxd56xx/cxd56_idle.c @@ -48,7 +48,7 @@ #include -#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 c07c757d857..bd1fc5d6938 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 7b7d2e18405..1e483a622cf 100644 --- a/arch/arm/src/cxd56xx/cxd56_pinconfig.c +++ b/arch/arm/src/cxd56xx/cxd56_pinconfig.c @@ -50,7 +50,7 @@ #include #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 f35566648f7..2a57f04fb8a 100644 --- a/arch/arm/src/cxd56xx/cxd56_powermgr.c +++ b/arch/arm/src/cxd56xx/cxd56_powermgr.c @@ -52,8 +52,8 @@ #include -#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 8dbd3040692..3b85ee143c1 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 37dc0593066..4eb1a409355 100644 --- a/arch/arm/src/cxd56xx/cxd56_pwm.c +++ b/arch/arm/src/cxd56xx/cxd56_pwm.c @@ -48,7 +48,7 @@ #include #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 83e97531933..8d624ac458f 100644 --- a/arch/arm/src/cxd56xx/cxd56_rtc.c +++ b/arch/arm/src/cxd56xx/cxd56_rtc.c @@ -52,7 +52,7 @@ #include -#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 67fe21849f0..6040d195ebc 100644 --- a/arch/arm/src/cxd56xx/cxd56_scu.c +++ b/arch/arm/src/cxd56xx/cxd56_scu.c @@ -52,7 +52,7 @@ #include #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 49e406406f2..6258cdb63d1 100644 --- a/arch/arm/src/cxd56xx/cxd56_scufifo.c +++ b/arch/arm/src/cxd56xx/cxd56_scufifo.c @@ -47,7 +47,7 @@ #include #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 6c60c08f61f..d6e556aa3f6 100644 --- a/arch/arm/src/cxd56xx/cxd56_sdhci.c +++ b/arch/arm/src/cxd56xx/cxd56_sdhci.c @@ -63,7 +63,7 @@ #include #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 9942d29340c..b69efcf7f49 100644 --- a/arch/arm/src/cxd56xx/cxd56_serial.c +++ b/arch/arm/src/cxd56xx/cxd56_serial.c @@ -60,8 +60,8 @@ #include #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 83299f8ce29..f7cf5238669 100644 --- a/arch/arm/src/cxd56xx/cxd56_sph.c +++ b/arch/arm/src/cxd56xx/cxd56_sph.c @@ -50,7 +50,7 @@ #include #include -#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 7190192deee..72caec9feb8 100644 --- a/arch/arm/src/cxd56xx/cxd56_spi.c +++ b/arch/arm/src/cxd56xx/cxd56_spi.c @@ -53,8 +53,8 @@ #include #include -#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 d0bbc497ad5..1460a5bf746 100644 --- a/arch/arm/src/cxd56xx/cxd56_start.c +++ b/arch/arm/src/cxd56xx/cxd56_start.c @@ -74,8 +74,8 @@ #include #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 f1c866a1863..d518ce0acaa 100644 --- a/arch/arm/src/cxd56xx/cxd56_timer.c +++ b/arch/arm/src/cxd56xx/cxd56_timer.c @@ -52,7 +52,7 @@ #include #include -#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 95a4d7cad1f..59b8f5aceeb 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 4744b2cf743..57629e984ed 100644 --- a/arch/arm/src/cxd56xx/cxd56_uart.c +++ b/arch/arm/src/cxd56xx/cxd56_uart.c @@ -47,8 +47,8 @@ #include -#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 c83d4b5daa1..2282c6680af 100644 --- a/arch/arm/src/cxd56xx/cxd56_uart0.c +++ b/arch/arm/src/cxd56xx/cxd56_uart0.c @@ -51,7 +51,7 @@ #include #include -#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 55e4649101a..e78b6985dbc 100644 --- a/arch/arm/src/cxd56xx/cxd56_udmac.c +++ b/arch/arm/src/cxd56xx/cxd56_udmac.c @@ -51,7 +51,7 @@ #include #include -#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 e56190cc4a1..1891d5ad020 100644 --- a/arch/arm/src/cxd56xx/cxd56_uid.c +++ b/arch/arm/src/cxd56xx/cxd56_uid.c @@ -40,7 +40,7 @@ #include #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 ccb3de858c2..fc1748b5281 100644 --- a/arch/arm/src/cxd56xx/cxd56_usbdev.c +++ b/arch/arm/src/cxd56xx/cxd56_usbdev.c @@ -67,8 +67,8 @@ #include #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 614f5f52d5c..ae78d4910d1 100644 --- a/arch/arm/src/cxd56xx/cxd56_wdt.c +++ b/arch/arm/src/cxd56xx/cxd56_wdt.c @@ -50,7 +50,7 @@ #include #include -#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 d1a96f8020a..cfbdd76c2b1 100644 --- a/arch/arm/src/dm320/dm320_allocateheap.c +++ b/arch/arm/src/dm320/dm320_allocateheap.c @@ -46,8 +46,8 @@ #include #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 aba87ed2400..92f1ec3d21a 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 diff --git a/arch/arm/src/dm320/dm320_decodeirq.c b/arch/arm/src/dm320/dm320_decodeirq.c index c621cf96f03..a2d618b9957 100644 --- a/arch/arm/src/dm320/dm320_decodeirq.c +++ b/arch/arm/src/dm320/dm320_decodeirq.c @@ -46,8 +46,8 @@ #include #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 cd7b273f0f8..1e46746532c 100644 --- a/arch/arm/src/dm320/dm320_framebuffer.c +++ b/arch/arm/src/dm320/dm320_framebuffer.c @@ -50,7 +50,7 @@ #include #include -#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 10bbb947aec..73ee212d103 100644 --- a/arch/arm/src/dm320/dm320_gio.h +++ b/arch/arm/src/dm320/dm320_gio.h @@ -42,7 +42,7 @@ #ifndef __ASSEMBLY__ # include -# 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 6564fef0704..0c0fffe9b8e 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 5e1f03f5d04..6934375bc23 100644 --- a/arch/arm/src/dm320/dm320_lowputc.S +++ b/arch/arm/src/dm320/dm320_lowputc.S @@ -41,8 +41,8 @@ #include #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 4fef7491abf..a8366c721da 100644 --- a/arch/arm/src/dm320/dm320_restart.S +++ b/arch/arm/src/dm320/dm320_restart.S @@ -40,8 +40,8 @@ #include #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 15752ff6d5d..3dd26486913 100644 --- a/arch/arm/src/dm320/dm320_serial.c +++ b/arch/arm/src/dm320/dm320_serial.c @@ -54,8 +54,8 @@ #include #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 ca223e2b0b2..9de0fe7e13d 100644 --- a/arch/arm/src/dm320/dm320_timerisr.c +++ b/arch/arm/src/dm320/dm320_timerisr.c @@ -45,9 +45,9 @@ #include #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 c21cc4821ae..083b4fd4cbf 100644 --- a/arch/arm/src/dm320/dm320_usbdev.c +++ b/arch/arm/src/dm320/dm320_usbdev.c @@ -57,8 +57,8 @@ #include #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 4227389ee75..c5bf988fb24 100644 --- a/arch/arm/src/efm32/efm32_adc.c +++ b/arch/arm/src/efm32/efm32_adc.c @@ -57,8 +57,8 @@ #include #include -#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 2d2bd907b40..fbf82f4bb8a 100644 --- a/arch/arm/src/efm32/efm32_clockconfig.c +++ b/arch/arm/src/efm32/efm32_clockconfig.c @@ -45,7 +45,7 @@ #include #include -#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 a6d62bd0a0c..02267ff141f 100644 --- a/arch/arm/src/efm32/efm32_dma.c +++ b/arch/arm/src/efm32/efm32_dma.c @@ -49,7 +49,7 @@ #include #include -#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 24d74aca8a5..72a24cc6417 100644 --- a/arch/arm/src/efm32/efm32_flash.c +++ b/arch/arm/src/efm32/efm32_flash.c @@ -77,8 +77,8 @@ #include -#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 2366a26c212..7dfc26b380d 100644 --- a/arch/arm/src/efm32/efm32_gpio.c +++ b/arch/arm/src/efm32/efm32_gpio.c @@ -44,7 +44,7 @@ #include #include -#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 fe2ec8c9a91..e027fb67a63 100644 --- a/arch/arm/src/efm32/efm32_gpioirq.c +++ b/arch/arm/src/efm32/efm32_gpioirq.c @@ -46,7 +46,7 @@ #include #include -#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 458e5575080..e52b8c2d4e6 100644 --- a/arch/arm/src/efm32/efm32_i2c.c +++ b/arch/arm/src/efm32/efm32_i2c.c @@ -76,7 +76,7 @@ #include -#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 4764a024c77..19f138a7858 100644 --- a/arch/arm/src/efm32/efm32_idle.c +++ b/arch/arm/src/efm32/efm32_idle.c @@ -49,7 +49,7 @@ #include #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 f9d502eeb2f..1c45822912a 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 c8c41c8c9f9..9915e1e18de 100644 --- a/arch/arm/src/efm32/efm32_leserial.c +++ b/arch/arm/src/efm32/efm32_leserial.c @@ -53,8 +53,8 @@ #include -#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 466f7c93f21..e01caa655f1 100644 --- a/arch/arm/src/efm32/efm32_lowputc.c +++ b/arch/arm/src/efm32/efm32_lowputc.c @@ -45,7 +45,7 @@ #include -#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 413eda45c1d..d024b2666bd 100644 --- a/arch/arm/src/efm32/efm32_pm.h +++ b/arch/arm/src/efm32/efm32_pm.h @@ -45,7 +45,7 @@ #include #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 251c1443e51..8382fa6b9b4 100644 --- a/arch/arm/src/efm32/efm32_pwm.c +++ b/arch/arm/src/efm32/efm32_pwm.c @@ -50,8 +50,8 @@ #include #include -#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 744fbd17275..6413e9f0df3 100644 --- a/arch/arm/src/efm32/efm32_rmu.c +++ b/arch/arm/src/efm32/efm32_rmu.c @@ -48,7 +48,7 @@ #include #include -#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 28d8f42d8a1..aee2b7f7284 100644 --- a/arch/arm/src/efm32/efm32_rtc_burtc.c +++ b/arch/arm/src/efm32/efm32_rtc_burtc.c @@ -50,7 +50,7 @@ #include -#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 286f498abb8..7dfa55a9c1d 100644 --- a/arch/arm/src/efm32/efm32_serial.c +++ b/arch/arm/src/efm32/efm32_serial.c @@ -57,8 +57,8 @@ #include -#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 f5cb57d8fe5..90533ed19ac 100644 --- a/arch/arm/src/efm32/efm32_spi.c +++ b/arch/arm/src/efm32/efm32_spi.c @@ -57,8 +57,8 @@ #include -#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 d5b61d91a0c..7363fd57236 100644 --- a/arch/arm/src/efm32/efm32_start.c +++ b/arch/arm/src/efm32/efm32_start.c @@ -49,8 +49,8 @@ #include #include -#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 63f75444947..fd9b81dcec4 100644 --- a/arch/arm/src/efm32/efm32_timer.c +++ b/arch/arm/src/efm32/efm32_timer.c @@ -48,8 +48,8 @@ #include #include -#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 a28c769fdec..547347e85bf 100644 --- a/arch/arm/src/efm32/efm32_timerisr.c +++ b/arch/arm/src/efm32/efm32_timerisr.c @@ -48,8 +48,8 @@ #include #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 639759e9445..8c67205ca5b 100644 --- a/arch/arm/src/efm32/efm32_usbdev.c +++ b/arch/arm/src/efm32/efm32_usbdev.c @@ -57,8 +57,8 @@ #include #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 c39fd987ce1..abddc7697de 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 /* 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 b2e05a0d1fe..7a091354b97 100644 --- a/arch/arm/src/imx1/imx_allocateheap.c +++ b/arch/arm/src/imx1/imx_allocateheap.c @@ -49,8 +49,8 @@ #include #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 4ee0f36b24f..3251006102b 100644 --- a/arch/arm/src/imx1/imx_boot.c +++ b/arch/arm/src/imx1/imx_boot.c @@ -41,8 +41,8 @@ #include #include "chip.h" -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include diff --git a/arch/arm/src/imx1/imx_decodeirq.c b/arch/arm/src/imx1/imx_decodeirq.c index d41e34947e9..30b0cb1e9c8 100644 --- a/arch/arm/src/imx1/imx_decodeirq.c +++ b/arch/arm/src/imx1/imx_decodeirq.c @@ -46,8 +46,8 @@ #include #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 60514e038aa..9d43754b887 100644 --- a/arch/arm/src/imx1/imx_gpio.c +++ b/arch/arm/src/imx1/imx_gpio.c @@ -40,7 +40,7 @@ #include #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 75e229ab692..6fe4b79f0cd 100644 --- a/arch/arm/src/imx1/imx_gpio.h +++ b/arch/arm/src/imx1/imx_gpio.h @@ -43,7 +43,7 @@ #ifndef __ASSEMBLY__ # include #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 d1297bdcf22..6fb8b583afb 100644 --- a/arch/arm/src/imx1/imx_irq.c +++ b/arch/arm/src/imx1/imx_irq.c @@ -44,8 +44,8 @@ #include #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 2bb9c6c4a26..98c5eb5c9b1 100644 --- a/arch/arm/src/imx1/imx_lowputc.S +++ b/arch/arm/src/imx1/imx_lowputc.S @@ -41,8 +41,8 @@ #include #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 84a97024225..6472c7f0ca1 100644 --- a/arch/arm/src/imx1/imx_serial.c +++ b/arch/arm/src/imx1/imx_serial.c @@ -55,9 +55,9 @@ #include #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 a3c589515df..b470b917124 100644 --- a/arch/arm/src/imx1/imx_spi.c +++ b/arch/arm/src/imx1/imx_spi.c @@ -37,8 +37,8 @@ #include #include -#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 f8c3c78fd97..f30397bdeec 100644 --- a/arch/arm/src/imx1/imx_timerisr.c +++ b/arch/arm/src/imx1/imx_timerisr.c @@ -47,9 +47,9 @@ #include #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 f4239736239..0a110fa165a 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 712197b0027..601fc31a108 100644 --- a/arch/arm/src/imx6/imx_boot.h +++ b/arch/arm/src/imx6/imx_boot.h @@ -47,7 +47,7 @@ #include #include -#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 a0fdff14458..9558f304a97 100644 --- a/arch/arm/src/imx6/imx_clockconfig.c +++ b/arch/arm/src/imx6/imx_clockconfig.c @@ -39,7 +39,7 @@ #include -#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 396c18b2699..f667dd08edc 100644 --- a/arch/arm/src/imx6/imx_cpuboot.c +++ b/arch/arm/src/imx6/imx_cpuboot.c @@ -45,8 +45,8 @@ #include #include -#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 d767f18903d..2429e655a4b 100644 --- a/arch/arm/src/imx6/imx_ecspi.c +++ b/arch/arm/src/imx6/imx_ecspi.c @@ -37,8 +37,8 @@ #include #include -#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 22aef032ed0..d1ab833103a 100644 --- a/arch/arm/src/imx6/imx_gpio.c +++ b/arch/arm/src/imx6/imx_gpio.c @@ -46,7 +46,7 @@ #include #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 afdc1f511a6..10db6335007 100644 --- a/arch/arm/src/imx6/imx_idle.c +++ b/arch/arm/src/imx6/imx_idle.c @@ -25,7 +25,7 @@ #include #include -#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 ff5e9bc3b7d..23d4b43a4a0 100644 --- a/arch/arm/src/imx6/imx_iomuxc.c +++ b/arch/arm/src/imx6/imx_iomuxc.c @@ -44,7 +44,7 @@ #include #include -#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 5006a1f0538..89a62ff99d2 100644 --- a/arch/arm/src/imx6/imx_irq.c +++ b/arch/arm/src/imx6/imx_irq.c @@ -43,7 +43,7 @@ #include -#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 1740e3b464e..0542c7aa213 100644 --- a/arch/arm/src/imx6/imx_lowputc.c +++ b/arch/arm/src/imx6/imx_lowputc.c @@ -43,7 +43,7 @@ #include #include -#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 /* Include last: has dependencies */ diff --git a/arch/arm/src/imx6/imx_lowputc.h b/arch/arm/src/imx6/imx_lowputc.h index 081f366ea7c..68e8b178aaa 100644 --- a/arch/arm/src/imx6/imx_lowputc.h +++ b/arch/arm/src/imx6/imx_lowputc.h @@ -47,7 +47,7 @@ #include #include -#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 b09b5bbb928..05a34c5fcaf 100644 --- a/arch/arm/src/imx6/imx_serial.c +++ b/arch/arm/src/imx6/imx_serial.c @@ -55,8 +55,8 @@ #include #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 45093f26046..a332dd939ea 100644 --- a/arch/arm/src/imx6/imx_serial.h +++ b/arch/arm/src/imx6/imx_serial.h @@ -42,7 +42,7 @@ #include -#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 00ea290a0b0..aec22433128 100644 --- a/arch/arm/src/imx6/imx_timerisr.c +++ b/arch/arm/src/imx6/imx_timerisr.c @@ -45,7 +45,7 @@ #include #include -#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 b94428d9a16..ffdfc113fcd 100644 --- a/arch/arm/src/imxrt/imxrt_allocateheap.c +++ b/arch/arm/src/imxrt/imxrt_allocateheap.c @@ -51,8 +51,8 @@ #include -#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 4a41f93ee81..9bdc9b470f6 100644 --- a/arch/arm/src/imxrt/imxrt_clockconfig.c +++ b/arch/arm/src/imxrt/imxrt_clockconfig.c @@ -42,7 +42,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include #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 3b500267646..6806bebe0df 100644 --- a/arch/arm/src/imxrt/imxrt_clrpend.c +++ b/arch/arm/src/imxrt/imxrt_clrpend.c @@ -42,7 +42,7 @@ #include #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 d692c472fed..5f08079986a 100644 --- a/arch/arm/src/imxrt/imxrt_daisy.c +++ b/arch/arm/src/imxrt/imxrt_daisy.c @@ -41,7 +41,7 @@ #include #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 2b59999838e..fe909b15e40 100644 --- a/arch/arm/src/imxrt/imxrt_edma.c +++ b/arch/arm/src/imxrt/imxrt_edma.c @@ -57,8 +57,8 @@ #include #include -#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 b3d379c4c70..5f3edc2435c 100644 --- a/arch/arm/src/imxrt/imxrt_ehci.c +++ b/arch/arm/src/imxrt/imxrt_ehci.c @@ -60,7 +60,7 @@ #include #include -#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 87fa2271d04..a07d8397760 100644 --- a/arch/arm/src/imxrt/imxrt_enc.c +++ b/arch/arm/src/imxrt/imxrt_enc.c @@ -50,7 +50,7 @@ #include #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 099189b4a3c..101db42263a 100644 --- a/arch/arm/src/imxrt/imxrt_enet.c +++ b/arch/arm/src/imxrt/imxrt_enet.c @@ -63,7 +63,7 @@ # include #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 e5668096f3a..b519cf266f9 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 99926b9a5ed..c5cd1b7a4a3 100644 --- a/arch/arm/src/imxrt/imxrt_gpio.c +++ b/arch/arm/src/imxrt/imxrt_gpio.c @@ -48,7 +48,7 @@ #include #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 0b0461b09d4..92d647bf4e3 100644 --- a/arch/arm/src/imxrt/imxrt_gpioirq.c +++ b/arch/arm/src/imxrt/imxrt_gpioirq.c @@ -47,7 +47,7 @@ #include #include -#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 9d2488a1e73..4d159869754 100644 --- a/arch/arm/src/imxrt/imxrt_hprtc.c +++ b/arch/arm/src/imxrt/imxrt_hprtc.c @@ -52,7 +52,7 @@ #include -#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 0028633f756..54eef24de56 100644 --- a/arch/arm/src/imxrt/imxrt_idle.c +++ b/arch/arm/src/imxrt/imxrt_idle.c @@ -47,7 +47,7 @@ #include #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 89deb0c5695..c759eae94eb 100644 --- a/arch/arm/src/imxrt/imxrt_iomuxc.c +++ b/arch/arm/src/imxrt/imxrt_iomuxc.c @@ -47,7 +47,7 @@ #include #include -#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 f93c78acb9b..c247634b76f 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 52788c67695..4477b7caab4 100644 --- a/arch/arm/src/imxrt/imxrt_lcd.c +++ b/arch/arm/src/imxrt/imxrt_lcd.c @@ -50,7 +50,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include diff --git a/arch/arm/src/imxrt/imxrt_lowputc.c b/arch/arm/src/imxrt/imxrt_lowputc.c index d3be6c1348b..ee826b8ab96 100644 --- a/arch/arm/src/imxrt/imxrt_lowputc.c +++ b/arch/arm/src/imxrt/imxrt_lowputc.c @@ -43,7 +43,7 @@ #include #include -#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 /* Include last: has dependencies */ diff --git a/arch/arm/src/imxrt/imxrt_lowputc.h b/arch/arm/src/imxrt/imxrt_lowputc.h index b2f2adb10b7..708b4c73138 100644 --- a/arch/arm/src/imxrt/imxrt_lowputc.h +++ b/arch/arm/src/imxrt/imxrt_lowputc.h @@ -47,7 +47,7 @@ #include #include -#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 cea3871ee84..8cf8c9ee439 100644 --- a/arch/arm/src/imxrt/imxrt_lpi2c.c +++ b/arch/arm/src/imxrt/imxrt_lpi2c.c @@ -55,7 +55,7 @@ #include -#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 20a0a54d5ae..34a449146c3 100644 --- a/arch/arm/src/imxrt/imxrt_lpspi.c +++ b/arch/arm/src/imxrt/imxrt_lpspi.c @@ -79,8 +79,8 @@ #include -#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 32f67bd9735..8e45967c9c7 100644 --- a/arch/arm/src/imxrt/imxrt_lpsrtc.c +++ b/arch/arm/src/imxrt/imxrt_lpsrtc.c @@ -52,7 +52,7 @@ #include -#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 6d012ed97b4..0b89698a308 100644 --- a/arch/arm/src/imxrt/imxrt_ocotp.c +++ b/arch/arm/src/imxrt/imxrt_ocotp.c @@ -47,7 +47,7 @@ #include #include -#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 9b3706d52ad..aaf66bf60be 100644 --- a/arch/arm/src/imxrt/imxrt_periphclks.c +++ b/arch/arm/src/imxrt/imxrt_periphclks.c @@ -41,7 +41,7 @@ #include -#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 52189515652..af215452ecd 100644 --- a/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c +++ b/arch/arm/src/imxrt/imxrt_rtc_lowerhalf.c @@ -48,7 +48,7 @@ #include #include -#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 7d1e1bd8d39..6a9b86ff629 100644 --- a/arch/arm/src/imxrt/imxrt_serial.c +++ b/arch/arm/src/imxrt/imxrt_serial.c @@ -61,8 +61,8 @@ #include #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 8b19457a3f2..3bcc87d1e36 100644 --- a/arch/arm/src/imxrt/imxrt_serial.h +++ b/arch/arm/src/imxrt/imxrt_serial.h @@ -42,7 +42,7 @@ #include -#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 319a2819068..5e2c181d440 100644 --- a/arch/arm/src/imxrt/imxrt_start.c +++ b/arch/arm/src/imxrt/imxrt_start.c @@ -47,8 +47,8 @@ #include #include -#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 4945a4111d4..b8e0b51c5f3 100644 --- a/arch/arm/src/imxrt/imxrt_start.h +++ b/arch/arm/src/imxrt/imxrt_start.h @@ -47,7 +47,7 @@ #include #include -#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 b3d33b933d2..7750f482c46 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 9d4903e831b..099c4f4ce9f 100644 --- a/arch/arm/src/imxrt/imxrt_usbdev.c +++ b/arch/arm/src/imxrt/imxrt_usbdev.c @@ -63,8 +63,8 @@ #include #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 a799ef2de2f..ba3448842b5 100644 --- a/arch/arm/src/imxrt/imxrt_usdhc.c +++ b/arch/arm/src/imxrt/imxrt_usdhc.c @@ -60,7 +60,7 @@ #include #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 9aa4a8ffdcc..13ce47efbce 100644 --- a/arch/arm/src/imxrt/imxrt_userspace.h +++ b/arch/arm/src/imxrt/imxrt_userspace.h @@ -47,7 +47,7 @@ #include #include -#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 c491e7b1311..a3dbb1b7724 100644 --- a/arch/arm/src/imxrt/imxrt_wdog.c +++ b/arch/arm/src/imxrt/imxrt_wdog.c @@ -43,7 +43,7 @@ #include #include -#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 efed2de0edf..6db8dad5012 100644 --- a/arch/arm/src/imxrt/imxrt_wdog.h +++ b/arch/arm/src/imxrt/imxrt_wdog.h @@ -47,7 +47,7 @@ #include #include -#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 43ae264d9e4..a7e629ff5fc 100644 --- a/arch/arm/src/imxrt/imxrt_xbar.c +++ b/arch/arm/src/imxrt/imxrt_xbar.c @@ -43,7 +43,7 @@ #include #include #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 adb9b129a85..573a68cfe13 100644 --- a/arch/arm/src/kinetis/kinetis.h +++ b/arch/arm/src/kinetis/kinetis.h @@ -50,7 +50,7 @@ #include -#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 43e47725b6a..ace22bf94eb 100644 --- a/arch/arm/src/kinetis/kinetis_allocateheap.c +++ b/arch/arm/src/kinetis/kinetis_allocateheap.c @@ -49,8 +49,8 @@ #include #include "mpu.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "kinetis_mpuinit.h" #include diff --git a/arch/arm/src/kinetis/kinetis_clockconfig.c b/arch/arm/src/kinetis/kinetis_clockconfig.c index d1c5acad004..0a0ae7439ed 100644 --- a/arch/arm/src/kinetis/kinetis_clockconfig.c +++ b/arch/arm/src/kinetis/kinetis_clockconfig.c @@ -40,7 +40,7 @@ #include -#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 aad182df369..07ddf54d215 100644 --- a/arch/arm/src/kinetis/kinetis_clrpend.c +++ b/arch/arm/src/kinetis/kinetis_clrpend.c @@ -42,7 +42,7 @@ #include #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 254f2b727e7..327fd5e54e9 100644 --- a/arch/arm/src/kinetis/kinetis_dma.c +++ b/arch/arm/src/kinetis/kinetis_dma.c @@ -52,8 +52,8 @@ #include -#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 1e4ca547221..56c28b79cfb 100644 --- a/arch/arm/src/kinetis/kinetis_enet.c +++ b/arch/arm/src/kinetis/kinetis_enet.c @@ -64,7 +64,7 @@ # include #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 36a0a943ec7..154fc89a252 100644 --- a/arch/arm/src/kinetis/kinetis_i2c.c +++ b/arch/arm/src/kinetis/kinetis_i2c.c @@ -56,8 +56,8 @@ #include #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 d8f40be5c8e..b78e26cac53 100644 --- a/arch/arm/src/kinetis/kinetis_idle.c +++ b/arch/arm/src/kinetis/kinetis_idle.c @@ -43,7 +43,7 @@ #include #include -#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 f3dc47571b1..26a232922b4 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 8661f952a7e..405c80a785c 100644 --- a/arch/arm/src/kinetis/kinetis_lowputc.c +++ b/arch/arm/src/kinetis/kinetis_lowputc.c @@ -46,8 +46,8 @@ #include #include -#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 3b2cbcd8902..828de830b76 100644 --- a/arch/arm/src/kinetis/kinetis_lpserial.c +++ b/arch/arm/src/kinetis/kinetis_lpserial.c @@ -59,8 +59,8 @@ #include -#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 7b23b354dd1..8acc1312ba7 100644 --- a/arch/arm/src/kinetis/kinetis_pin.c +++ b/arch/arm/src/kinetis/kinetis_pin.c @@ -45,8 +45,8 @@ #include -#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 654bf7aebc9..96f50f5c36e 100644 --- a/arch/arm/src/kinetis/kinetis_pindma.c +++ b/arch/arm/src/kinetis/kinetis_pindma.c @@ -48,8 +48,8 @@ #include #include -#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 c59d328321a..f63df1f66e8 100644 --- a/arch/arm/src/kinetis/kinetis_pindump.c +++ b/arch/arm/src/kinetis/kinetis_pindump.c @@ -43,7 +43,7 @@ #include #include -#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 e26e4b8f22c..493a310d71e 100644 --- a/arch/arm/src/kinetis/kinetis_pingpio.c +++ b/arch/arm/src/kinetis/kinetis_pingpio.c @@ -45,8 +45,8 @@ #include -#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 e22840e9d98..97a0899d623 100644 --- a/arch/arm/src/kinetis/kinetis_pinirq.c +++ b/arch/arm/src/kinetis/kinetis_pinirq.c @@ -47,8 +47,8 @@ #include #include -#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 e1c3cc3c085..1b42e8ef21f 100644 --- a/arch/arm/src/kinetis/kinetis_pwm.c +++ b/arch/arm/src/kinetis/kinetis_pwm.c @@ -53,8 +53,8 @@ #include #include -#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 e5a15f731d2..bcedea227a8 100644 --- a/arch/arm/src/kinetis/kinetis_rtc.c +++ b/arch/arm/src/kinetis/kinetis_rtc.c @@ -49,7 +49,7 @@ #include #include -#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 7bfec1a2ef1..38b1d3d0844 100644 --- a/arch/arm/src/kinetis/kinetis_sdhc.c +++ b/arch/arm/src/kinetis/kinetis_sdhc.c @@ -43,7 +43,7 @@ #include #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 4d21d8fd6ce..691b6ee8c9f 100644 --- a/arch/arm/src/kinetis/kinetis_serial.c +++ b/arch/arm/src/kinetis/kinetis_serial.c @@ -60,8 +60,8 @@ #include -#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 4e8eb4b124e..12aa9d9e6db 100644 --- a/arch/arm/src/kinetis/kinetis_spi.c +++ b/arch/arm/src/kinetis/kinetis_spi.c @@ -78,7 +78,7 @@ #include #include -#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 937bf95b878..c7d9c63eddc 100644 --- a/arch/arm/src/kinetis/kinetis_start.c +++ b/arch/arm/src/kinetis/kinetis_start.c @@ -45,8 +45,8 @@ #include -#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 cf4f5e4ac8e..2c65f709882 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 85e3eb73bf1..4d5ae7d166b 100644 --- a/arch/arm/src/kinetis/kinetis_usbdev.c +++ b/arch/arm/src/kinetis/kinetis_usbdev.c @@ -68,7 +68,7 @@ #include -#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 463150bc139..bd857048fd7 100644 --- a/arch/arm/src/kinetis/kinetis_wdog.c +++ b/arch/arm/src/kinetis/kinetis_wdog.c @@ -41,7 +41,7 @@ #include -#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 1a5ac1463a7..3318a06cff0 100644 --- a/arch/arm/src/kl/kl_clockconfig.c +++ b/arch/arm/src/kl/kl_clockconfig.c @@ -43,7 +43,7 @@ #include -#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 0e6dadfd8ef..8526653fb3b 100644 --- a/arch/arm/src/kl/kl_dumpgpio.c +++ b/arch/arm/src/kl/kl_dumpgpio.c @@ -48,7 +48,7 @@ #include #include -#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 bb063365f44..f8c107a7d3b 100644 --- a/arch/arm/src/kl/kl_gpio.c +++ b/arch/arm/src/kl/kl_gpio.c @@ -45,8 +45,8 @@ #include -#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 38b105a728a..daa027cc37f 100644 --- a/arch/arm/src/kl/kl_gpioirq.c +++ b/arch/arm/src/kl/kl_gpioirq.c @@ -46,7 +46,7 @@ #include #include -#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 01d21712e08..23b00457c4c 100644 --- a/arch/arm/src/kl/kl_idle.c +++ b/arch/arm/src/kl/kl_idle.c @@ -47,7 +47,7 @@ #include #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 6a45c18b020..f827e9fd35e 100644 --- a/arch/arm/src/kl/kl_irq.c +++ b/arch/arm/src/kl/kl_irq.c @@ -47,8 +47,8 @@ #include #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 b2dfe318f07..ccc18b1000e 100644 --- a/arch/arm/src/kl/kl_irqprio.c +++ b/arch/arm/src/kl/kl_irqprio.c @@ -44,7 +44,7 @@ #include #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 7016ddcc296..7571368668d 100644 --- a/arch/arm/src/kl/kl_lowputc.c +++ b/arch/arm/src/kl/kl_lowputc.c @@ -44,8 +44,8 @@ #include #include -#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 92d5ace32fd..1c29355992c 100644 --- a/arch/arm/src/kl/kl_pwm.c +++ b/arch/arm/src/kl/kl_pwm.c @@ -51,8 +51,8 @@ #include #include -#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 aa5556792be..87b7cb82598 100644 --- a/arch/arm/src/kl/kl_serial.c +++ b/arch/arm/src/kl/kl_serial.c @@ -53,8 +53,8 @@ #include -#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 f60d4095bc0..4aef68c1598 100644 --- a/arch/arm/src/kl/kl_spi.c +++ b/arch/arm/src/kl/kl_spi.c @@ -50,7 +50,7 @@ #include #include -#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 c9314a6afd9..cfac2007f54 100644 --- a/arch/arm/src/kl/kl_start.c +++ b/arch/arm/src/kl/kl_start.c @@ -45,8 +45,8 @@ #include -#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 d5f06d8d7b4..fdebe3c1ef8 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 cff9ad50102..1c77d430759 100644 --- a/arch/arm/src/lc823450/chip.h +++ b/arch/arm/src/lc823450/chip.h @@ -45,9 +45,9 @@ # include # include # include -# 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 97fb5dbe2ae..4bc836a89b8 100644 --- a/arch/arm/src/lc823450/lc823450_adc.c +++ b/arch/arm/src/lc823450/lc823450_adc.c @@ -62,7 +62,7 @@ #include #include -#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 8a8134bd142..a736dea1aa4 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 e882b0bd570..68c8b28f689 100644 --- a/arch/arm/src/lc823450/lc823450_clockconfig.c +++ b/arch/arm/src/lc823450/lc823450_clockconfig.c @@ -48,7 +48,7 @@ #include #include -#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 a75eb04819f..4275bf52e83 100644 --- a/arch/arm/src/lc823450/lc823450_cpuidlestack.c +++ b/arch/arm/src/lc823450/lc823450_cpuidlestack.c @@ -43,7 +43,7 @@ #include #include -#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 22a18bd3885..d37f8536dc6 100644 --- a/arch/arm/src/lc823450/lc823450_cpuindex.c +++ b/arch/arm/src/lc823450/lc823450_cpuindex.c @@ -42,7 +42,7 @@ #include #include -#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 2dcb22396d0..821e3bc6451 100644 --- a/arch/arm/src/lc823450/lc823450_cpupause.c +++ b/arch/arm/src/lc823450/lc823450_cpupause.c @@ -50,9 +50,9 @@ #include #include -#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 1636039c297..fb34af2c63f 100644 --- a/arch/arm/src/lc823450/lc823450_cpustart.c +++ b/arch/arm/src/lc823450/lc823450_cpustart.c @@ -52,11 +52,11 @@ #include #include -#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 bb5222852d2..1616e24449a 100644 --- a/arch/arm/src/lc823450/lc823450_dma.c +++ b/arch/arm/src/lc823450/lc823450_dma.c @@ -51,7 +51,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "lc823450_dma.h" #include "lc823450_syscontrol.h" #include diff --git a/arch/arm/src/lc823450/lc823450_dvfs2.c b/arch/arm/src/lc823450/lc823450_dvfs2.c index b6e3688f274..10dc92f4410 100644 --- a/arch/arm/src/lc823450/lc823450_dvfs2.c +++ b/arch/arm/src/lc823450/lc823450_dvfs2.c @@ -45,7 +45,7 @@ #include #include -#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 d9524dbfa0e..fe325d8e812 100644 --- a/arch/arm/src/lc823450/lc823450_gpio.c +++ b/arch/arm/src/lc823450/lc823450_gpio.c @@ -46,7 +46,7 @@ #include #include -#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 009ef951ff5..e534516fdef 100644 --- a/arch/arm/src/lc823450/lc823450_i2c.c +++ b/arch/arm/src/lc823450/lc823450_i2c.c @@ -61,7 +61,7 @@ #include -#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 f9ada6290e1..d14bb14049d 100644 --- a/arch/arm/src/lc823450/lc823450_i2s.c +++ b/arch/arm/src/lc823450/lc823450_i2s.c @@ -51,7 +51,7 @@ #include #include -#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 bfbbf91823a..dba96d73f98 100644 --- a/arch/arm/src/lc823450/lc823450_idle.c +++ b/arch/arm/src/lc823450/lc823450_idle.c @@ -46,8 +46,8 @@ #include #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 bb1455ac019..d5fca018c73 100644 --- a/arch/arm/src/lc823450/lc823450_ipl2.c +++ b/arch/arm/src/lc823450/lc823450_ipl2.c @@ -76,8 +76,8 @@ #include -#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 ed4c1a4549c..e362a4c06c6 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 5e69606636c..ab7d8d928da 100644 --- a/arch/arm/src/lc823450/lc823450_lowputc.c +++ b/arch/arm/src/lc823450/lc823450_lowputc.c @@ -42,8 +42,8 @@ #include -#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 b61ac7baa54..1de5bad6c0d 100644 --- a/arch/arm/src/lc823450/lc823450_mpuinit2.c +++ b/arch/arm/src/lc823450/lc823450_mpuinit2.c @@ -46,7 +46,7 @@ #include #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 1ad62e9bd9f..916ba275df5 100644 --- a/arch/arm/src/lc823450/lc823450_rtc.c +++ b/arch/arm/src/lc823450/lc823450_rtc.c @@ -56,7 +56,7 @@ #include #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 cd2984cb215..5f47694801d 100644 --- a/arch/arm/src/lc823450/lc823450_sdc.c +++ b/arch/arm/src/lc823450/lc823450_sdc.c @@ -53,7 +53,7 @@ #include #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 6f534ced296..e0f033da091 100644 --- a/arch/arm/src/lc823450/lc823450_sddrv_dep.c +++ b/arch/arm/src/lc823450/lc823450_sddrv_dep.c @@ -53,7 +53,7 @@ #include #include -#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 7ca44f77cbc..b3f565474b3 100644 --- a/arch/arm/src/lc823450/lc823450_serial.c +++ b/arch/arm/src/lc823450/lc823450_serial.c @@ -58,8 +58,8 @@ #include #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 10806d0a278..a5760de4db1 100644 --- a/arch/arm/src/lc823450/lc823450_spi.c +++ b/arch/arm/src/lc823450/lc823450_spi.c @@ -52,7 +52,7 @@ #include #include -#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 7d1845141a4..961fca9efc2 100644 --- a/arch/arm/src/lc823450/lc823450_spifi2.c +++ b/arch/arm/src/lc823450/lc823450_spifi2.c @@ -40,7 +40,7 @@ #include #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 aaa7edaa5a9..fcbd7c1649a 100644 --- a/arch/arm/src/lc823450/lc823450_start.c +++ b/arch/arm/src/lc823450/lc823450_start.c @@ -55,8 +55,8 @@ # include #endif /* CONFIG_LASTKMSG */ -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nvic.h" #include diff --git a/arch/arm/src/lc823450/lc823450_syscontrol.c b/arch/arm/src/lc823450/lc823450_syscontrol.c index 34258cbbcc2..f673fe84054 100644 --- a/arch/arm/src/lc823450/lc823450_syscontrol.c +++ b/arch/arm/src/lc823450/lc823450_syscontrol.c @@ -48,8 +48,8 @@ #include #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 12934c2aedb..432212cea08 100644 --- a/arch/arm/src/lc823450/lc823450_testset.c +++ b/arch/arm/src/lc823450/lc823450_testset.c @@ -43,7 +43,7 @@ #include #include -#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 3e11837fb03..d1129789950 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 efdde1b26d3..dc07f51c01f 100644 --- a/arch/arm/src/lc823450/lc823450_usbdev.c +++ b/arch/arm/src/lc823450/lc823450_usbdev.c @@ -75,7 +75,7 @@ #include #include -#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 d1da80932c7..d65f3a1cd8b 100644 --- a/arch/arm/src/lc823450/lc823450_wdt.c +++ b/arch/arm/src/lc823450/lc823450_wdt.c @@ -56,7 +56,7 @@ #include #include -#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 c857e8a27af..218333a5f47 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc176x_clockconfig.c +++ b/arch/arm/src/lpc17xx_40xx/lpc176x_clockconfig.c @@ -46,8 +46,8 @@ #include #include -#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 f614f519a3a..1de4d2690b3 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc176x_gpio.c +++ b/arch/arm/src/lpc17xx_40xx/lpc176x_gpio.c @@ -47,7 +47,7 @@ #include -#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 6a7282e768e..460dc78d16b 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc176x_rtc.c +++ b/arch/arm/src/lpc17xx_40xx/lpc176x_rtc.c @@ -48,8 +48,8 @@ #include -#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 44007fb0b45..f527275305a 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 #include -#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 600b6f7a759..460c2481c3f 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 -#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 34bf55aa934..cdce0a309f8 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 #include -#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 1775ab2b6a6..b0e0f7dfc97 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 b3aa0a751a3..c44d1fb2d19 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 #include -#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 55546b66465..0e50db5b57e 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 #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 e9f20697378..8df22617cff 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 #include -#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 c12898c35ef..37f86afdc49 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 -#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 9e4dfe19b1b..b90aeb09ba7 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 #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 77cfef37751..2590e93f03f 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 #include -#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 d3a4575f736..e97a2631fd7 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 #include -#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 2025f7e2a3b..54e33e59273 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 #include -#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 2052e7b40da..3a0228920ed 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 #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 a9e3d58787c..30626ba9aa3 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 #include -#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 d4939020c60..524f57e840c 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 593df01b6d4..3f55b1d10bf 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 #include -#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 dc744c23a44..0e3e4ee1d17 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 #include -#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 e2c142a42bc..3c0b3d4b081 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 #include -#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 a554d0b814c..77b7997c5a5 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 #include -#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 9cff4e01a54..1791b6c64c0 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 #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 6fc08996049..210f29e12f1 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 -#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 fe3b30be9a6..35141120d8f 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 #include -#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 8e091b25ef2..1ac23cc83f0 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 #include -#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 a985dd2c128..259764e128d 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 -#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 358d8de2364..5ab3ad3b5a5 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 #include -#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 85faed2a019..d173acf6e06 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 a48b399e605..71e9f8004a2 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 #include -#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 652f2b42926..bf4f738e145 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 /* 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 331fea560eb..88f62ec7361 100644 --- a/arch/arm/src/lpc214x/lpc214x_decodeirq.c +++ b/arch/arm/src/lpc214x/lpc214x_decodeirq.c @@ -46,8 +46,8 @@ #include #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 3d1438893f8..72db089a24f 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 a28854c1764..a836d1df765 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 9241f2751bc..80de7cd4fe6 100644 --- a/arch/arm/src/lpc214x/lpc214x_lowputc.S +++ b/arch/arm/src/lpc214x/lpc214x_lowputc.S @@ -40,8 +40,8 @@ #include #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 270f6844968..4c8132be777 100644 --- a/arch/arm/src/lpc214x/lpc214x_serial.c +++ b/arch/arm/src/lpc214x/lpc214x_serial.c @@ -52,8 +52,8 @@ #include #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 7abc49760e0..99430e071d6 100644 --- a/arch/arm/src/lpc214x/lpc214x_timerisr.c +++ b/arch/arm/src/lpc214x/lpc214x_timerisr.c @@ -45,9 +45,9 @@ #include #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 8e18ff7522d..384a9b62e92 100644 --- a/arch/arm/src/lpc214x/lpc214x_usbdev.c +++ b/arch/arm/src/lpc214x/lpc214x_usbdev.c @@ -57,8 +57,8 @@ #include #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 1e40b228d0d..1f406f24fb7 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 9c0e0b5b764..970f74fdb53 100644 --- a/arch/arm/src/lpc2378/lpc23xx_decodeirq.c +++ b/arch/arm/src/lpc2378/lpc23xx_decodeirq.c @@ -53,7 +53,7 @@ #include -#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 071ed2047f9..300a522c349 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 82905c04121..3dc29b5eb39 100644 --- a/arch/arm/src/lpc2378/lpc23xx_i2c.c +++ b/arch/arm/src/lpc2378/lpc23xx_i2c.c @@ -71,8 +71,8 @@ #include #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 f871ce17f80..9f6afd0dab9 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 #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 a17d63d691c..bcad9d39112 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 7cdbcc0d2ec..1f4dad51fdd 100644 --- a/arch/arm/src/lpc2378/lpc23xx_lowputc.S +++ b/arch/arm/src/lpc2378/lpc23xx_lowputc.S @@ -43,8 +43,8 @@ **************************************************************************/ #include -#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 77b43079615..6b077d74758 100644 --- a/arch/arm/src/lpc2378/lpc23xx_pllsetup.c +++ b/arch/arm/src/lpc2378/lpc23xx_pllsetup.c @@ -65,7 +65,7 @@ #include #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 ff62b9fa5bf..64f7cbae79d 100644 --- a/arch/arm/src/lpc2378/lpc23xx_serial.c +++ b/arch/arm/src/lpc2378/lpc23xx_serial.c @@ -58,7 +58,7 @@ #include #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 2ee94bb4b66..af8a0425374 100644 --- a/arch/arm/src/lpc2378/lpc23xx_spi.c +++ b/arch/arm/src/lpc2378/lpc23xx_spi.c @@ -56,8 +56,8 @@ #include #include -#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 8ba3d146cf7..e13a19bdef9 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 f78c0da7b38..ede261d2a3b 100644 --- a/arch/arm/src/lpc31xx/lpc31.h +++ b/arch/arm/src/lpc31xx/lpc31.h @@ -46,8 +46,8 @@ #include #include -#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 83ce8b65d56..e5beaae4e03 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 078f2c99f9b..1231e2af0e4 100644 --- a/arch/arm/src/lpc31xx/lpc31_bcrndx.c +++ b/arch/arm/src/lpc31xx/lpc31_bcrndx.c @@ -44,7 +44,7 @@ #include #include -#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 ee12add4f39..9ca94e21295 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 diff --git a/arch/arm/src/lpc31xx/lpc31_cgudrvr.h b/arch/arm/src/lpc31xx/lpc31_cgudrvr.h index 8fbe96b88bf..0eaee48e74e 100644 --- a/arch/arm/src/lpc31xx/lpc31_cgudrvr.h +++ b/arch/arm/src/lpc31xx/lpc31_cgudrvr.h @@ -49,7 +49,7 @@ #include #include -#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 cdb2fc9ca7d..547916f6561 100644 --- a/arch/arm/src/lpc31xx/lpc31_clkdomain.c +++ b/arch/arm/src/lpc31xx/lpc31_clkdomain.c @@ -44,7 +44,7 @@ #include #include -#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 0273bca72be..fe5d696778d 100644 --- a/arch/arm/src/lpc31xx/lpc31_clkfreq.c +++ b/arch/arm/src/lpc31xx/lpc31_clkfreq.c @@ -44,7 +44,7 @@ #include #include -#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 8464ffb4975..d0e2124296e 100644 --- a/arch/arm/src/lpc31xx/lpc31_decodeirq.c +++ b/arch/arm/src/lpc31xx/lpc31_decodeirq.c @@ -47,9 +47,9 @@ #include #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 bccc5c257fd..b5a4aa77ee8 100644 --- a/arch/arm/src/lpc31xx/lpc31_ehci.c +++ b/arch/arm/src/lpc31xx/lpc31_ehci.c @@ -43,7 +43,7 @@ #include #include -#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 7b87ae8d4fc..6059d620d54 100644 --- a/arch/arm/src/lpc31xx/lpc31_esrndx.c +++ b/arch/arm/src/lpc31xx/lpc31_esrndx.c @@ -44,7 +44,7 @@ #include #include -#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 0bc9c3a5560..7123ee5fdd8 100644 --- a/arch/arm/src/lpc31xx/lpc31_fdcndx.c +++ b/arch/arm/src/lpc31xx/lpc31_fdcndx.c @@ -44,7 +44,7 @@ #include #include -#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 206ebfd4d33..f02caca767d 100644 --- a/arch/arm/src/lpc31xx/lpc31_i2c.c +++ b/arch/arm/src/lpc31xx/lpc31_i2c.c @@ -58,8 +58,8 @@ #include #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 d62a4dc22e7..ce4cdd8759c 100644 --- a/arch/arm/src/lpc31xx/lpc31_irq.c +++ b/arch/arm/src/lpc31xx/lpc31_irq.c @@ -48,8 +48,8 @@ #include #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 7d1335fd5ad..c9d2914c1c6 100644 --- a/arch/arm/src/lpc31xx/lpc31_lowputc.c +++ b/arch/arm/src/lpc31xx/lpc31_lowputc.c @@ -45,8 +45,8 @@ #include -#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 e44898b417a..18753ec8010 100644 --- a/arch/arm/src/lpc31xx/lpc31_serial.c +++ b/arch/arm/src/lpc31xx/lpc31_serial.c @@ -52,8 +52,8 @@ #include #include -#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 b3d32e548b4..ace791d888c 100644 --- a/arch/arm/src/lpc31xx/lpc31_softreset.c +++ b/arch/arm/src/lpc31xx/lpc31_softreset.c @@ -44,7 +44,7 @@ #include #include -#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 539e8b58498..e56530ef18e 100644 --- a/arch/arm/src/lpc31xx/lpc31_timerisr.c +++ b/arch/arm/src/lpc31xx/lpc31_timerisr.c @@ -47,8 +47,8 @@ #include #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 7cae79fba9a..7e48ec7fb65 100644 --- a/arch/arm/src/lpc31xx/lpc31_usbdev.c +++ b/arch/arm/src/lpc31xx/lpc31_usbdev.c @@ -62,8 +62,8 @@ #include #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 52ae52b7643..322bc9142a6 100644 --- a/arch/arm/src/lpc43xx/lpc43_adc.c +++ b/arch/arm/src/lpc43xx/lpc43_adc.c @@ -62,8 +62,8 @@ #include #include -#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 e231a991768..27014ef262f 100644 --- a/arch/arm/src/lpc43xx/lpc43_aes.c +++ b/arch/arm/src/lpc43xx/lpc43_aes.c @@ -50,8 +50,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include diff --git a/arch/arm/src/lpc43xx/lpc43_allocateheap.c b/arch/arm/src/lpc43xx/lpc43_allocateheap.c index 50dd872158e..4d156b898a6 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 25e36ccfa2c..dbcd789983f 100644 --- a/arch/arm/src/lpc43xx/lpc43_can.c +++ b/arch/arm/src/lpc43xx/lpc43_can.c @@ -49,8 +49,8 @@ #include #include -#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 0720350f89f..fa7d86cbf17 100644 --- a/arch/arm/src/lpc43xx/lpc43_cgu.c +++ b/arch/arm/src/lpc43xx/lpc43_cgu.c @@ -42,7 +42,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "lpc43_cgu.h" #include diff --git a/arch/arm/src/lpc43xx/lpc43_clrpend.c b/arch/arm/src/lpc43xx/lpc43_clrpend.c index 4363923e77d..47fc565f8bd 100644 --- a/arch/arm/src/lpc43xx/lpc43_clrpend.c +++ b/arch/arm/src/lpc43xx/lpc43_clrpend.c @@ -42,7 +42,7 @@ #include #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 4a19d89cda0..2aacf63f708 100644 --- a/arch/arm/src/lpc43xx/lpc43_dac.c +++ b/arch/arm/src/lpc43xx/lpc43_dac.c @@ -61,8 +61,8 @@ #include #include -#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 3b20bc63e74..63b11d964f4 100644 --- a/arch/arm/src/lpc43xx/lpc43_debug.c +++ b/arch/arm/src/lpc43xx/lpc43_debug.c @@ -43,7 +43,7 @@ #include -#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 8c90b3d578f..f75b9627b9d 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 17273a5b5dc..d5d91cf3319 100644 --- a/arch/arm/src/lpc43xx/lpc43_emc.c +++ b/arch/arm/src/lpc43xx/lpc43_emc.c @@ -25,7 +25,7 @@ #include #include -#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 diff --git a/arch/arm/src/lpc43xx/lpc43_ethernet.c b/arch/arm/src/lpc43xx/lpc43_ethernet.c index e4a317c2999..c56101134a0 100644 --- a/arch/arm/src/lpc43xx/lpc43_ethernet.c +++ b/arch/arm/src/lpc43xx/lpc43_ethernet.c @@ -61,7 +61,7 @@ # include #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 /**************************************************************************** diff --git a/arch/arm/src/lpc43xx/lpc43_gpdma.c b/arch/arm/src/lpc43xx/lpc43_gpdma.c index 5ef6d006d25..518ea6f908d 100644 --- a/arch/arm/src/lpc43xx/lpc43_gpdma.c +++ b/arch/arm/src/lpc43xx/lpc43_gpdma.c @@ -47,8 +47,8 @@ #include -#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 42b7ce75e11..bc0a6cb72d3 100644 --- a/arch/arm/src/lpc43xx/lpc43_gpio.c +++ b/arch/arm/src/lpc43xx/lpc43_gpio.c @@ -46,7 +46,7 @@ #include #include -#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 f7a9cbf4178..82cba889121 100644 --- a/arch/arm/src/lpc43xx/lpc43_gpioint.c +++ b/arch/arm/src/lpc43xx/lpc43_gpioint.c @@ -64,7 +64,7 @@ #include #include -#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 ea0a50df454..da1c32fe02c 100644 --- a/arch/arm/src/lpc43xx/lpc43_i2c.c +++ b/arch/arm/src/lpc43xx/lpc43_i2c.c @@ -69,8 +69,8 @@ #include #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 33803ce90d1..df66331b91d 100644 --- a/arch/arm/src/lpc43xx/lpc43_idle.c +++ b/arch/arm/src/lpc43xx/lpc43_idle.c @@ -46,7 +46,7 @@ #include -#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 4c4b3c3a784..6bc88a68d29 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 738b4b8dafd..ef06cbda60f 100644 --- a/arch/arm/src/lpc43xx/lpc43_pinconfig.c +++ b/arch/arm/src/lpc43xx/lpc43_pinconfig.c @@ -43,7 +43,7 @@ #include #include -#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 799e3c21e65..ed91793bf33 100644 --- a/arch/arm/src/lpc43xx/lpc43_rgu.c +++ b/arch/arm/src/lpc43xx/lpc43_rgu.c @@ -44,7 +44,7 @@ #include #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 ed1741144be..596a2b3a006 100644 --- a/arch/arm/src/lpc43xx/lpc43_rit.c +++ b/arch/arm/src/lpc43xx/lpc43_rit.c @@ -54,7 +54,7 @@ #include #include -#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 51a61e610f8..1f233f32181 100644 --- a/arch/arm/src/lpc43xx/lpc43_rtc.c +++ b/arch/arm/src/lpc43xx/lpc43_rtc.c @@ -51,8 +51,8 @@ #include -#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 bb1c7fffc56..a2ce880892e 100644 --- a/arch/arm/src/lpc43xx/lpc43_sdmmc.c +++ b/arch/arm/src/lpc43xx/lpc43_sdmmc.c @@ -62,7 +62,7 @@ #include -#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 dc1684c1160..9143191082f 100644 --- a/arch/arm/src/lpc43xx/lpc43_serial.c +++ b/arch/arm/src/lpc43xx/lpc43_serial.c @@ -59,8 +59,8 @@ #include #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 93ae70d21c7..00e6fb9ad8a 100644 --- a/arch/arm/src/lpc43xx/lpc43_spi.c +++ b/arch/arm/src/lpc43xx/lpc43_spi.c @@ -50,8 +50,8 @@ #include #include -#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 ed2f01f2c90..f56752aae09 100644 --- a/arch/arm/src/lpc43xx/lpc43_spifi.c +++ b/arch/arm/src/lpc43xx/lpc43_spifi.c @@ -56,7 +56,7 @@ #include #include -#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 a5311f860e8..a003097ccaf 100644 --- a/arch/arm/src/lpc43xx/lpc43_ssp.c +++ b/arch/arm/src/lpc43xx/lpc43_ssp.c @@ -51,8 +51,8 @@ #include #include -#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 285da7538bf..9abfab012eb 100644 --- a/arch/arm/src/lpc43xx/lpc43_start.c +++ b/arch/arm/src/lpc43xx/lpc43_start.c @@ -62,8 +62,8 @@ #include #include -#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 bf465ce233c..a56812153be 100644 --- a/arch/arm/src/lpc43xx/lpc43_tickless_rit.c +++ b/arch/arm/src/lpc43xx/lpc43_tickless_rit.c @@ -54,7 +54,7 @@ #include #include -#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 4f14336812c..de4633f8163 100644 --- a/arch/arm/src/lpc43xx/lpc43_timer.c +++ b/arch/arm/src/lpc43xx/lpc43_timer.c @@ -51,7 +51,7 @@ #include #include -#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 cb5aa7ba92c..44dbd7a9795 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 dd7e18d327e..0f034c1107a 100644 --- a/arch/arm/src/lpc43xx/lpc43_uart.c +++ b/arch/arm/src/lpc43xx/lpc43_uart.c @@ -44,8 +44,8 @@ #include #include -#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 09347df9f6b..2217150380c 100644 --- a/arch/arm/src/lpc43xx/lpc43_usb0dev.c +++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.c @@ -67,8 +67,8 @@ #include #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 54e93d58406..6f804e53fc6 100644 --- a/arch/arm/src/lpc43xx/lpc43_wwdt.c +++ b/arch/arm/src/lpc43xx/lpc43_wwdt.c @@ -48,7 +48,7 @@ #include #include -#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 8d95aed5361..fb11d5c687f 100644 --- a/arch/arm/src/lpc54xx/lpc546x_enableclk.h +++ b/arch/arm/src/lpc54xx/lpc546x_enableclk.h @@ -42,7 +42,7 @@ #include -#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 c113095e254..8ac3450117f 100644 --- a/arch/arm/src/lpc54xx/lpc546x_power.h +++ b/arch/arm/src/lpc54xx/lpc546x_power.h @@ -42,7 +42,7 @@ #include -#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 069775483b4..b40690101f2 100644 --- a/arch/arm/src/lpc54xx/lpc54_allocateheap.c +++ b/arch/arm/src/lpc54xx/lpc54_allocateheap.c @@ -49,8 +49,8 @@ #include #include -#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 39e4b1c4f00..38ff044ee82 100644 --- a/arch/arm/src/lpc54xx/lpc54_clockconfig.c +++ b/arch/arm/src/lpc54xx/lpc54_clockconfig.c @@ -52,8 +52,8 @@ #include #include -#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 a0cc93a6008..9cac7c05134 100644 --- a/arch/arm/src/lpc54xx/lpc54_clrpend.c +++ b/arch/arm/src/lpc54xx/lpc54_clrpend.c @@ -42,7 +42,7 @@ #include #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 57f675e5016..7d48dd30169 100644 --- a/arch/arm/src/lpc54xx/lpc54_dma.c +++ b/arch/arm/src/lpc54xx/lpc54_dma.c @@ -47,8 +47,8 @@ #include -#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 a85eb346870..6fce5b9ae6a 100644 --- a/arch/arm/src/lpc54xx/lpc54_emc.c +++ b/arch/arm/src/lpc54xx/lpc54_emc.c @@ -50,7 +50,7 @@ #include -#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 d6879bd3572..52a190653bb 100644 --- a/arch/arm/src/lpc54xx/lpc54_ethernet.c +++ b/arch/arm/src/lpc54xx/lpc54_ethernet.c @@ -87,7 +87,7 @@ # include #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 2acc620b4d4..3cf91a8923c 100644 --- a/arch/arm/src/lpc54xx/lpc54_gpio.c +++ b/arch/arm/src/lpc54xx/lpc54_gpio.c @@ -47,7 +47,7 @@ #include -#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 3d915c7fcb7..e01cb7e4be3 100644 --- a/arch/arm/src/lpc54xx/lpc54_gpioirq.c +++ b/arch/arm/src/lpc54xx/lpc54_gpioirq.c @@ -44,7 +44,7 @@ #include #include -#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 2c0deeda2d7..e766ae61770 100644 --- a/arch/arm/src/lpc54xx/lpc54_i2c_master.c +++ b/arch/arm/src/lpc54xx/lpc54_i2c_master.c @@ -63,8 +63,8 @@ #include #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 56e8338d720..3e6e3d06c20 100644 --- a/arch/arm/src/lpc54xx/lpc54_idle.c +++ b/arch/arm/src/lpc54xx/lpc54_idle.c @@ -46,7 +46,7 @@ #include -#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 b4f97a88141..77220736963 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 8cc9e1adbb5..03516500483 100644 --- a/arch/arm/src/lpc54xx/lpc54_lcd.c +++ b/arch/arm/src/lpc54xx/lpc54_lcd.c @@ -49,7 +49,7 @@ #include -#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 d6c70127ae1..3340dd8ed39 100644 --- a/arch/arm/src/lpc54xx/lpc54_lowputc.c +++ b/arch/arm/src/lpc54xx/lpc54_lowputc.c @@ -48,8 +48,8 @@ #include -#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 621a39e60e4..d68ea4d5724 100644 --- a/arch/arm/src/lpc54xx/lpc54_reset.c +++ b/arch/arm/src/lpc54xx/lpc54_reset.c @@ -39,7 +39,7 @@ #include -#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 e08c180e9d4..492ccffb06a 100644 --- a/arch/arm/src/lpc54xx/lpc54_rtc.c +++ b/arch/arm/src/lpc54xx/lpc54_rtc.c @@ -52,7 +52,7 @@ #include -#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 beef333cd0d..c5026f18bc8 100644 --- a/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c +++ b/arch/arm/src/lpc54xx/lpc54_rtc_lowerhalf.c @@ -47,7 +47,7 @@ #include #include -#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 a1eb178a734..7b1028c90a8 100644 --- a/arch/arm/src/lpc54xx/lpc54_sdmmc.c +++ b/arch/arm/src/lpc54xx/lpc54_sdmmc.c @@ -67,7 +67,7 @@ #include -#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 eea04e8f990..8b152391a54 100644 --- a/arch/arm/src/lpc54xx/lpc54_serial.c +++ b/arch/arm/src/lpc54xx/lpc54_serial.c @@ -53,8 +53,8 @@ #include -#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 3e96a7d8233..77ae0e7aa18 100644 --- a/arch/arm/src/lpc54xx/lpc54_spi_master.c +++ b/arch/arm/src/lpc54xx/lpc54_spi_master.c @@ -60,8 +60,8 @@ #include #include -#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 0506c71d1e8..5d8a15cf77b 100644 --- a/arch/arm/src/lpc54xx/lpc54_start.c +++ b/arch/arm/src/lpc54xx/lpc54_start.c @@ -43,8 +43,8 @@ #include #include -#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 8378c6e7c7f..00e0cfac03d 100644 --- a/arch/arm/src/lpc54xx/lpc54_start.h +++ b/arch/arm/src/lpc54xx/lpc54_start.h @@ -47,7 +47,7 @@ #include #include -#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 d7963b12927..ad0a9d822d1 100644 --- a/arch/arm/src/lpc54xx/lpc54_tickless.c +++ b/arch/arm/src/lpc54xx/lpc54_tickless.c @@ -49,7 +49,7 @@ #include #include -#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 feeb0708f83..a49ec2cafc8 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 161298a237e..ef4fa079562 100644 --- a/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c +++ b/arch/arm/src/lpc54xx/lpc54_usb0_ohci.c @@ -45,8 +45,8 @@ #include /* 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 019e788081a..3cd9816f760 100644 --- a/arch/arm/src/lpc54xx/lpc54_wwdt.c +++ b/arch/arm/src/lpc54xx/lpc54_wwdt.c @@ -48,7 +48,7 @@ #include #include -#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 97583e9366f..601a68cfb6a 100644 --- a/arch/arm/src/max326xx/common/max326_clrpend.c +++ b/arch/arm/src/max326xx/common/max326_clrpend.c @@ -42,7 +42,7 @@ #include #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 7f2ef00877c..6ded9461515 100644 --- a/arch/arm/src/max326xx/common/max326_icc.c +++ b/arch/arm/src/max326xx/common/max326_icc.c @@ -43,7 +43,7 @@ #include #include -#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 50c50f08e73..ad9e1e075a5 100644 --- a/arch/arm/src/max326xx/common/max326_idle.c +++ b/arch/arm/src/max326xx/common/max326_idle.c @@ -46,7 +46,7 @@ #include -#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 949a10305f1..9a427f4b713 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 f7078bb409d..f6d7f1ed4e7 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 #include -#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 f8321c16e65..822a9e4a690 100644 --- a/arch/arm/src/max326xx/common/max326_start.c +++ b/arch/arm/src/max326xx/common/max326_start.c @@ -43,8 +43,8 @@ #include #include -#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 d97fcf3ec24..f9c70fb602b 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 3b00f2c2c7c..499e82e9f5c 100644 --- a/arch/arm/src/max326xx/max32660/max32660_clockconfig.c +++ b/arch/arm/src/max326xx/max32660/max32660_clockconfig.c @@ -43,7 +43,7 @@ #include -#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 86824ed2f60..e3d67f00185 100644 --- a/arch/arm/src/max326xx/max32660/max32660_dma.c +++ b/arch/arm/src/max326xx/max32660/max32660_dma.c @@ -45,7 +45,7 @@ #include #include -#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 63bc6203cba..015314bc78a 100644 --- a/arch/arm/src/max326xx/max32660/max32660_gpio.c +++ b/arch/arm/src/max326xx/max32660/max32660_gpio.c @@ -45,7 +45,7 @@ #include -#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 fe2ced52918..73687043429 100644 --- a/arch/arm/src/max326xx/max32660/max32660_gpioirq.c +++ b/arch/arm/src/max326xx/max32660/max32660_gpioirq.c @@ -44,7 +44,7 @@ #include #include -#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 db1c551a1f7..109772ebf97 100644 --- a/arch/arm/src/max326xx/max32660/max32660_lowputc.c +++ b/arch/arm/src/max326xx/max32660/max32660_lowputc.c @@ -42,8 +42,8 @@ #include #include -#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 25d87d21ac8..08b43555cb3 100644 --- a/arch/arm/src/max326xx/max32660/max32660_periphclks.h +++ b/arch/arm/src/max326xx/max32660/max32660_periphclks.h @@ -45,7 +45,7 @@ #include #include -#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 22e617aa7c8..d6110070f60 100644 --- a/arch/arm/src/max326xx/max32660/max32660_rtc.c +++ b/arch/arm/src/max326xx/max32660/max32660_rtc.c @@ -51,7 +51,7 @@ #include #include -#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 e951bc2b244..558350592fc 100644 --- a/arch/arm/src/max326xx/max32660/max32660_serial.c +++ b/arch/arm/src/max326xx/max32660/max32660_serial.c @@ -53,8 +53,8 @@ #include -#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 6bf05dcabfe..6e16189c24c 100644 --- a/arch/arm/src/max326xx/max32660/max32660_spim.c +++ b/arch/arm/src/max326xx/max32660/max32660_spim.c @@ -74,8 +74,8 @@ #include #include -#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 bb394d57ac9..44ee5710778 100644 --- a/arch/arm/src/max326xx/max32660/max32660_wdt.c +++ b/arch/arm/src/max326xx/max32660/max32660_wdt.c @@ -50,8 +50,8 @@ #include #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 09d07a81d77..feb0be78f23 100644 --- a/arch/arm/src/max326xx/max326_start.h +++ b/arch/arm/src/max326xx/max326_start.h @@ -47,7 +47,7 @@ #include #include -#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 561165bcc06..e882941e5b2 100644 --- a/arch/arm/src/moxart/moxart_16550.c +++ b/arch/arm/src/moxart/moxart_16550.c @@ -52,7 +52,7 @@ #include #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 a7191e3eb7d..751404e3fde 100644 --- a/arch/arm/src/moxart/moxart_idle.c +++ b/arch/arm/src/moxart/moxart_idle.c @@ -40,7 +40,7 @@ #include #include -#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 b81baeab21b..291142115e9 100644 --- a/arch/arm/src/moxart/moxart_irq.c +++ b/arch/arm/src/moxart/moxart_irq.c @@ -48,8 +48,8 @@ #include #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 dff1683ea74..c9dad21654f 100644 --- a/arch/arm/src/moxart/moxart_lowputc.S +++ b/arch/arm/src/moxart/moxart_lowputc.S @@ -40,8 +40,8 @@ #include #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 f6e770e6762..607048ce09c 100644 --- a/arch/arm/src/moxart/moxart_systemreset.c +++ b/arch/arm/src/moxart/moxart_systemreset.c @@ -44,7 +44,7 @@ #include #include -#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 1606bf93cbd..a6f3e2584c0 100644 --- a/arch/arm/src/moxart/moxart_timer.c +++ b/arch/arm/src/moxart/moxart_timer.c @@ -41,7 +41,7 @@ #include #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 a17f1c18ea6..2667c6fdade 100644 --- a/arch/arm/src/nrf52/nrf52832_errdata.c +++ b/arch/arm/src/nrf52/nrf52832_errdata.c @@ -50,11 +50,11 @@ #include #include -#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 dedf174cdd4..4cc57304d72 100644 --- a/arch/arm/src/nrf52/nrf52_allocateheap.c +++ b/arch/arm/src/nrf52/nrf52_allocateheap.c @@ -49,8 +49,8 @@ #include #include -#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 7a4730d9924..13f70a32278 100644 --- a/arch/arm/src/nrf52/nrf52_clockconfig.c +++ b/arch/arm/src/nrf52/nrf52_clockconfig.c @@ -45,8 +45,8 @@ #include #include -#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 746d09f9bac..2a2032a2d99 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 278524e57e7..3b6311361cb 100644 --- a/arch/arm/src/nrf52/nrf52_gpio.c +++ b/arch/arm/src/nrf52/nrf52_gpio.c @@ -47,7 +47,7 @@ #include -#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 34817111fd9..91286e641af 100644 --- a/arch/arm/src/nrf52/nrf52_gpiote.c +++ b/arch/arm/src/nrf52/nrf52_gpiote.c @@ -49,7 +49,7 @@ #include #include -#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 bae704a5a15..1ee0221f528 100644 --- a/arch/arm/src/nrf52/nrf52_i2c.c +++ b/arch/arm/src/nrf52/nrf52_i2c.c @@ -47,7 +47,7 @@ #include #include -#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 fc94f409b32..5733845d3aa 100644 --- a/arch/arm/src/nrf52/nrf52_idle.c +++ b/arch/arm/src/nrf52/nrf52_idle.c @@ -46,7 +46,7 @@ #include -#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 a5f75992ba8..113a516d582 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 fe9e4ecb627..10dbf055f6a 100644 --- a/arch/arm/src/nrf52/nrf52_lowputc.c +++ b/arch/arm/src/nrf52/nrf52_lowputc.c @@ -41,8 +41,8 @@ #include -#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 82beb1fa432..308ce06df9f 100644 --- a/arch/arm/src/nrf52/nrf52_nvmc.c +++ b/arch/arm/src/nrf52/nrf52_nvmc.c @@ -45,7 +45,7 @@ #include #include -#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 5431c707244..0853a99c04b 100644 --- a/arch/arm/src/nrf52/nrf52_radio.c +++ b/arch/arm/src/nrf52/nrf52_radio.c @@ -33,7 +33,7 @@ #include #include -#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 fccddf92a40..d90f2fbf421 100644 --- a/arch/arm/src/nrf52/nrf52_rng.c +++ b/arch/arm/src/nrf52/nrf52_rng.c @@ -51,11 +51,11 @@ #include #include -#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" #if defined(CONFIG_NRF52_RNG) #if defined(CONFIG_DEV_RANDOM) || defined(CONFIG_DEV_URANDOM_ARCH) diff --git a/arch/arm/src/nrf52/nrf52_serial.c b/arch/arm/src/nrf52/nrf52_serial.c index feddae4fee7..0dbdce73a96 100644 --- a/arch/arm/src/nrf52/nrf52_serial.c +++ b/arch/arm/src/nrf52/nrf52_serial.c @@ -53,8 +53,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "nrf52_config.h" diff --git a/arch/arm/src/nrf52/nrf52_spi.c b/arch/arm/src/nrf52/nrf52_spi.c index 6646e9ce491..20757096ee0 100644 --- a/arch/arm/src/nrf52/nrf52_spi.c +++ b/arch/arm/src/nrf52/nrf52_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "nrf52_gpio.h" #include "nrf52_spi.h" diff --git a/arch/arm/src/nrf52/nrf52_start.c b/arch/arm/src/nrf52/nrf52_start.c index db587f181f2..2ba60c12090 100644 --- a/arch/arm/src/nrf52/nrf52_start.c +++ b/arch/arm/src/nrf52/nrf52_start.c @@ -47,8 +47,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nvic.h" #include "nrf52_clockconfig.h" diff --git a/arch/arm/src/nrf52/nrf52_start.h b/arch/arm/src/nrf52/nrf52_start.h index e7639789716..4b26bdcb0dc 100644 --- a/arch/arm/src/nrf52/nrf52_start.h +++ b/arch/arm/src/nrf52/nrf52_start.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" /************************************************************************************ diff --git a/arch/arm/src/nrf52/nrf52_timerisr.c b/arch/arm/src/nrf52/nrf52_timerisr.c index d6e52e0f70a..07f652fa8ad 100644 --- a/arch/arm/src/nrf52/nrf52_timerisr.c +++ b/arch/arm/src/nrf52/nrf52_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" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/nrf52/nrf52_utils.c b/arch/arm/src/nrf52/nrf52_utils.c index 92bcb09a822..b3f19d1b575 100644 --- a/arch/arm/src/nrf52/nrf52_utils.c +++ b/arch/arm/src/nrf52/nrf52_utils.c @@ -42,7 +42,7 @@ #include #include "nvic.h" -#include "up_arch.h" +#include "arm_arch.h" #include "nrf52_irq.h" #include "hardware/nrf52_utils.h" diff --git a/arch/arm/src/nrf52/nrf52_wdt.c b/arch/arm/src/nrf52/nrf52_wdt.c index 6bcb2359db9..6f8b9e74004 100644 --- a/arch/arm/src/nrf52/nrf52_wdt.c +++ b/arch/arm/src/nrf52/nrf52_wdt.c @@ -51,8 +51,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/nrf52_wdt.h" #include "nrf52_wdt.h" diff --git a/arch/arm/src/nuc1xx/nuc_clockconfig.c b/arch/arm/src/nuc1xx/nuc_clockconfig.c index 9cf1844ac2f..9edcfe12fec 100644 --- a/arch/arm/src/nuc1xx/nuc_clockconfig.c +++ b/arch/arm/src/nuc1xx/nuc_clockconfig.c @@ -47,7 +47,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "hardware/nuc_gcr.h" diff --git a/arch/arm/src/nuc1xx/nuc_dumpgpio.c b/arch/arm/src/nuc1xx/nuc_dumpgpio.c index 82db651a69b..8e578bf45ce 100644 --- a/arch/arm/src/nuc1xx/nuc_dumpgpio.c +++ b/arch/arm/src/nuc1xx/nuc_dumpgpio.c @@ -44,7 +44,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "nuc_gpio.h" diff --git a/arch/arm/src/nuc1xx/nuc_gpio.c b/arch/arm/src/nuc1xx/nuc_gpio.c index 98d08a6f5bf..f248f43ec24 100644 --- a/arch/arm/src/nuc1xx/nuc_gpio.c +++ b/arch/arm/src/nuc1xx/nuc_gpio.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "hardware/nuc_gpio.h" diff --git a/arch/arm/src/nuc1xx/nuc_idle.c b/arch/arm/src/nuc1xx/nuc_idle.c index 54c2afc1015..60950d9333d 100644 --- a/arch/arm/src/nuc1xx/nuc_idle.c +++ b/arch/arm/src/nuc1xx/nuc_idle.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "arm_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/nuc1xx/nuc_irq.c b/arch/arm/src/nuc1xx/nuc_irq.c index e3dfc576f8e..7682d757235 100644 --- a/arch/arm/src/nuc1xx/nuc_irq.c +++ b/arch/arm/src/nuc1xx/nuc_irq.c @@ -47,8 +47,8 @@ #include #include "nvic.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nuc_irq.h" diff --git a/arch/arm/src/nuc1xx/nuc_lowputc.c b/arch/arm/src/nuc1xx/nuc_lowputc.c index dcf27628b49..f49555556ca 100644 --- a/arch/arm/src/nuc1xx/nuc_lowputc.c +++ b/arch/arm/src/nuc1xx/nuc_lowputc.c @@ -45,7 +45,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "nuc_config.h" diff --git a/arch/arm/src/nuc1xx/nuc_serial.c b/arch/arm/src/nuc1xx/nuc_serial.c index 8ec35b21068..85db3c1b8d2 100644 --- a/arch/arm/src/nuc1xx/nuc_serial.c +++ b/arch/arm/src/nuc1xx/nuc_serial.c @@ -58,8 +58,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "hardware/nuc_uart.h" diff --git a/arch/arm/src/nuc1xx/nuc_start.c b/arch/arm/src/nuc1xx/nuc_start.c index bf700a44522..875de6d5345 100644 --- a/arch/arm/src/nuc1xx/nuc_start.c +++ b/arch/arm/src/nuc1xx/nuc_start.c @@ -45,8 +45,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nuc_config.h" #include "nuc_lowputc.h" diff --git a/arch/arm/src/nuc1xx/nuc_timerisr.c b/arch/arm/src/nuc1xx/nuc_timerisr.c index f2000c67ca2..715299212fa 100644 --- a/arch/arm/src/nuc1xx/nuc_timerisr.c +++ b/arch/arm/src/nuc1xx/nuc_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" #include "hardware/nuc_clk.h" diff --git a/arch/arm/src/s32k1xx/s32k11x/s32k11x_irq.c b/arch/arm/src/s32k1xx/s32k11x/s32k11x_irq.c index 4fc61181116..9fb923aaac9 100644 --- a/arch/arm/src/s32k1xx/s32k11x/s32k11x_irq.c +++ b/arch/arm/src/s32k1xx/s32k11x/s32k11x_irq.c @@ -47,8 +47,8 @@ #include #include "nvic.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_pin.h" #include "s32k11x/s32k11x_irq.h" diff --git a/arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c b/arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c index c1a90f51cef..9b332493c5b 100644 --- a/arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c +++ b/arch/arm/src/s32k1xx/s32k11x/s32k11x_timerisr.c @@ -48,8 +48,8 @@ #include #include "nvic.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "clock/clock.h" #include "s32k1xx_clockconfig.h" diff --git a/arch/arm/src/s32k1xx/s32k14x/s32k14x_clrpend.c b/arch/arm/src/s32k1xx/s32k14x/s32k14x_clrpend.c index 6b74f014d91..bb9f8cb64f3 100644 --- a/arch/arm/src/s32k1xx/s32k14x/s32k14x_clrpend.c +++ b/arch/arm/src/s32k1xx/s32k14x/s32k14x_clrpend.c @@ -42,7 +42,7 @@ #include #include "nvic.h" -#include "up_arch.h" +#include "arm_arch.h" #include "s32k14x_irq.h" diff --git a/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c b/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c index 9d135554cc7..2d3511f29a9 100644 --- a/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c +++ b/arch/arm/src/s32k1xx/s32k14x/s32k14x_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 "s32k1xx_pin.h" #include "s32k14x/s32k14x_irq.h" diff --git a/arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c b/arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c index ea9815ffb19..d3cb0f13a96 100644 --- a/arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c +++ b/arch/arm/src/s32k1xx/s32k14x/s32k14x_timerisr.c @@ -48,8 +48,8 @@ #include #include "nvic.h" -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "clock/clock.h" #include "s32k1xx_clockconfig.h" diff --git a/arch/arm/src/s32k1xx/s32k1xx_clockconfig.c b/arch/arm/src/s32k1xx/s32k1xx_clockconfig.c index dfa3a538b24..00c7108be8f 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_clockconfig.c +++ b/arch/arm/src/s32k1xx/s32k1xx_clockconfig.c @@ -64,8 +64,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/s32k1xx_scg.h" #include "hardware/s32k1xx_smc.h" diff --git a/arch/arm/src/s32k1xx/s32k1xx_edma.c b/arch/arm/src/s32k1xx/s32k1xx_edma.c index 1472f40f584..0d906c78fe0 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_edma.c +++ b/arch/arm/src/s32k1xx/s32k1xx_edma.c @@ -58,8 +58,8 @@ #include #include -#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/s32k1xx/s32k1xx_enet.c b/arch/arm/src/s32k1xx/s32k1xx_enet.c index 8221c222fe3..4c1dc43dc03 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_enet.c +++ b/arch/arm/src/s32k1xx/s32k1xx_enet.c @@ -63,7 +63,7 @@ # include #endif -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "s32k1xx_config.h" #include "hardware/s32k1xx_enet.h" diff --git a/arch/arm/src/s32k1xx/s32k1xx_enet.h b/arch/arm/src/s32k1xx/s32k1xx_enet.h index 75250c72d67..d6d84fbef4f 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_enet.h +++ b/arch/arm/src/s32k1xx/s32k1xx_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/s32k1xx/s32k1xx_lowputc.c b/arch/arm/src/s32k1xx/s32k1xx_lowputc.c index c2f686a7b8c..0b157faecaf 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_lowputc.c +++ b/arch/arm/src/s32k1xx/s32k1xx_lowputc.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/s32k1xx_pinmux.h" #include "hardware/s32k1xx_lpuart.h" @@ -54,7 +54,7 @@ #include "s32k1xx_lowputc.h" #include "s32k1xx_periphclocks.h" -#include "up_internal.h" +#include "arm_internal.h" #include /* Include last: has dependencies */ diff --git a/arch/arm/src/s32k1xx/s32k1xx_lowputc.h b/arch/arm/src/s32k1xx/s32k1xx_lowputc.h index 94f834ec563..3c09ef61319 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_lowputc.h +++ b/arch/arm/src/s32k1xx/s32k1xx_lowputc.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "s32k1xx_config.h" /**************************************************************************** diff --git a/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c b/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c index 2dbb74ec6bf..a294fc9e098 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c +++ b/arch/arm/src/s32k1xx/s32k1xx_lpi2c.c @@ -55,7 +55,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "s32k1xx_pin.h" #include "hardware/s32k1xx_pinmux.h" diff --git a/arch/arm/src/s32k1xx/s32k1xx_lpspi.c b/arch/arm/src/s32k1xx/s32k1xx_lpspi.c index 281ee809934..b0cb406a933 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_lpspi.c +++ b/arch/arm/src/s32k1xx/s32k1xx_lpspi.c @@ -76,8 +76,8 @@ #include #include -#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/s32k1xx/s32k1xx_periphclocks.c b/arch/arm/src/s32k1xx/s32k1xx_periphclocks.c index 43ed3da1098..cfb623e84aa 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_periphclocks.c +++ b/arch/arm/src/s32k1xx/s32k1xx_periphclocks.c @@ -62,7 +62,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/s32k1xx_scg.h" #include "hardware/s32k1xx_pcc.h" #include "s32k1xx_clockconfig.h" diff --git a/arch/arm/src/s32k1xx/s32k1xx_periphclocks.h b/arch/arm/src/s32k1xx/s32k1xx_periphclocks.h index ff359872895..458ce5b8442 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_periphclocks.h +++ b/arch/arm/src/s32k1xx/s32k1xx_periphclocks.h @@ -67,8 +67,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_config.h" diff --git a/arch/arm/src/s32k1xx/s32k1xx_pin.c b/arch/arm/src/s32k1xx/s32k1xx_pin.c index 30f5f7b15d6..2e66bf137e1 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_pin.c +++ b/arch/arm/src/s32k1xx/s32k1xx_pin.c @@ -45,8 +45,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/s32k1xx_port.h" #include "hardware/s32k1xx_gpio.h" diff --git a/arch/arm/src/s32k1xx/s32k1xx_pin.h b/arch/arm/src/s32k1xx/s32k1xx_pin.h index 46c809138aa..ebe82afefd2 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_pin.h +++ b/arch/arm/src/s32k1xx/s32k1xx_pin.h @@ -49,7 +49,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "hardware/s32k1xx_port.h" /************************************************************************************ diff --git a/arch/arm/src/s32k1xx/s32k1xx_pindma.c b/arch/arm/src/s32k1xx/s32k1xx_pindma.c index 2632b4c6ebc..c682fffddf4 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_pindma.c +++ b/arch/arm/src/s32k1xx/s32k1xx_pindma.c @@ -46,8 +46,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_pin.h" diff --git a/arch/arm/src/s32k1xx/s32k1xx_pindump.c b/arch/arm/src/s32k1xx/s32k1xx_pindump.c index 13b1b67d440..612770aff77 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_pindump.c +++ b/arch/arm/src/s32k1xx/s32k1xx_pindump.c @@ -43,7 +43,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/s32k1xx_gpio.h" #include "hardware/s32k1xx_port.h" diff --git a/arch/arm/src/s32k1xx/s32k1xx_pingpio.c b/arch/arm/src/s32k1xx/s32k1xx_pingpio.c index 19506ec5a90..5661da57b6a 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_pingpio.c +++ b/arch/arm/src/s32k1xx/s32k1xx_pingpio.c @@ -42,7 +42,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/s32k1xx_gpio.h" #include "s32k1xx_pin.h" diff --git a/arch/arm/src/s32k1xx/s32k1xx_pinirq.c b/arch/arm/src/s32k1xx/s32k1xx_pinirq.c index 74b3ef754fd..dba8ee07526 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_pinirq.c +++ b/arch/arm/src/s32k1xx/s32k1xx_pinirq.c @@ -47,8 +47,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_pin.h" #include "hardware/s32k1xx_port.h" diff --git a/arch/arm/src/s32k1xx/s32k1xx_rtc.c b/arch/arm/src/s32k1xx/s32k1xx_rtc.c index 1bc1dc994b9..7c70b76da50 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_rtc.c +++ b/arch/arm/src/s32k1xx/s32k1xx_rtc.c @@ -52,7 +52,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/s32k1xx_rtc.h" #include "s32k1xx_periphclocks.h" diff --git a/arch/arm/src/s32k1xx/s32k1xx_serial.c b/arch/arm/src/s32k1xx/s32k1xx_serial.c index 041915f8740..44ae58af9fb 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_serial.c +++ b/arch/arm/src/s32k1xx/s32k1xx_serial.c @@ -61,8 +61,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/s32k1xx_lpuart.h" #include "hardware/s32k1xx_pinmux.h" diff --git a/arch/arm/src/s32k1xx/s32k1xx_serial.h b/arch/arm/src/s32k1xx/s32k1xx_serial.h index 0a42a6912f8..4af2ec4d5be 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_serial.h +++ b/arch/arm/src/s32k1xx/s32k1xx_serial.h @@ -42,7 +42,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "s32k1xx_config.h" /**************************************************************************** diff --git a/arch/arm/src/s32k1xx/s32k1xx_start.c b/arch/arm/src/s32k1xx/s32k1xx_start.c index 4ac072037c2..542e1525472 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_start.c +++ b/arch/arm/src/s32k1xx/s32k1xx_start.c @@ -47,8 +47,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nvic.h" #ifdef CONFIG_BUILD_PROTECTED diff --git a/arch/arm/src/s32k1xx/s32k1xx_start.h b/arch/arm/src/s32k1xx/s32k1xx_start.h index 746b07e4d19..cc708d76fd4 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_start.h +++ b/arch/arm/src/s32k1xx/s32k1xx_start.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" /************************************************************************************ diff --git a/arch/arm/src/s32k1xx/s32k1xx_wdog.h b/arch/arm/src/s32k1xx/s32k1xx_wdog.h index 47304e312cf..3ce6ec071b4 100644 --- a/arch/arm/src/s32k1xx/s32k1xx_wdog.h +++ b/arch/arm/src/s32k1xx/s32k1xx_wdog.h @@ -42,7 +42,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/s32k1xx_wdog.h" /**************************************************************************** diff --git a/arch/arm/src/sam34/sam4cm_cpuidlestack.c b/arch/arm/src/sam34/sam4cm_cpuidlestack.c index 88043a34673..53cc286cc8f 100644 --- a/arch/arm/src/sam34/sam4cm_cpuidlestack.c +++ b/arch/arm/src/sam34/sam4cm_cpuidlestack.c @@ -44,7 +44,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #ifdef CONFIG_SMP diff --git a/arch/arm/src/sam34/sam4cm_cpupause.c b/arch/arm/src/sam34/sam4cm_cpupause.c index dc14ba45fd7..55a4a00c7e1 100644 --- a/arch/arm/src/sam34/sam4cm_cpupause.c +++ b/arch/arm/src/sam34/sam4cm_cpupause.c @@ -49,9 +49,9 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sched/sched.h" -#include "up_internal.h" +#include "arm_internal.h" #include "hardware/sam4cm_ipc.h" #ifdef CONFIG_SMP diff --git a/arch/arm/src/sam34/sam4cm_cpustart.c b/arch/arm/src/sam34/sam4cm_cpustart.c index d55c0778d4e..32fc5d96cbb 100644 --- a/arch/arm/src/sam34/sam4cm_cpustart.c +++ b/arch/arm/src/sam34/sam4cm_cpustart.c @@ -51,10 +51,10 @@ #include #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/sam_pmc.h" #include "hardware/sam_rstc.h" #include "hardware/sam4cm_ipc.h" diff --git a/arch/arm/src/sam34/sam4cm_idle.c b/arch/arm/src/sam34/sam4cm_idle.c index 652be635a82..4692df75123 100644 --- a/arch/arm/src/sam34/sam4cm_idle.c +++ b/arch/arm/src/sam34/sam4cm_idle.c @@ -40,7 +40,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" /**************************************************************************** * Public Functions diff --git a/arch/arm/src/sam34/sam4cm_supc.c b/arch/arm/src/sam34/sam4cm_supc.c index 5cb86181503..28a998d3027 100644 --- a/arch/arm/src/sam34/sam4cm_supc.c +++ b/arch/arm/src/sam34/sam4cm_supc.c @@ -47,8 +47,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "hardware/sam_supc.h" diff --git a/arch/arm/src/sam34/sam4cm_tc.c b/arch/arm/src/sam34/sam4cm_tc.c index 8df6e7b2c2b..8052855a2b3 100644 --- a/arch/arm/src/sam34/sam4cm_tc.c +++ b/arch/arm/src/sam34/sam4cm_tc.c @@ -61,7 +61,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "hardware/sam_pinmap.h" #include "hardware/sam_pmc.h" diff --git a/arch/arm/src/sam34/sam4l_clockconfig.c b/arch/arm/src/sam34/sam4l_clockconfig.c index e24797abe0f..5c13f84f32b 100644 --- a/arch/arm/src/sam34/sam4l_clockconfig.c +++ b/arch/arm/src/sam34/sam4l_clockconfig.c @@ -47,9 +47,9 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" -#include "up_internal.h" +#include "arm_internal.h" #include "hardware/sam4l_pm.h" #include "hardware/sam4l_scif.h" #include "hardware/sam4l_bpm.h" diff --git a/arch/arm/src/sam34/sam4l_gpio.c b/arch/arm/src/sam34/sam4l_gpio.c index ef253ca54ec..168b37c28c4 100644 --- a/arch/arm/src/sam34/sam4l_gpio.c +++ b/arch/arm/src/sam34/sam4l_gpio.c @@ -48,8 +48,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "sam_gpio.h" diff --git a/arch/arm/src/sam34/sam4l_periphclks.c b/arch/arm/src/sam34/sam4l_periphclks.c index 2a9984b3d9a..33e9f926248 100644 --- a/arch/arm/src/sam34/sam4l_periphclks.c +++ b/arch/arm/src/sam34/sam4l_periphclks.c @@ -44,9 +44,9 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" -#include "up_internal.h" +#include "arm_internal.h" #include "hardware/sam4l_pm.h" #include "sam4l_periphclks.h" diff --git a/arch/arm/src/sam34/sam_aes.c b/arch/arm/src/sam34/sam_aes.c index cee3d833007..2147a9a7383 100644 --- a/arch/arm/src/sam34/sam_aes.c +++ b/arch/arm/src/sam34/sam_aes.c @@ -51,8 +51,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "sam_periphclks.h" diff --git a/arch/arm/src/sam34/sam_allocateheap.c b/arch/arm/src/sam34/sam_allocateheap.c index 3e1d5e6efe9..95c9a96f2d8 100644 --- a/arch/arm/src/sam34/sam_allocateheap.c +++ b/arch/arm/src/sam34/sam_allocateheap.c @@ -49,8 +49,8 @@ #include #include "mpu.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "sam_mpuinit.h" diff --git a/arch/arm/src/sam34/sam_clockconfig.c b/arch/arm/src/sam34/sam_clockconfig.c index 60889468f25..fc39a3a278b 100644 --- a/arch/arm/src/sam34/sam_clockconfig.c +++ b/arch/arm/src/sam34/sam_clockconfig.c @@ -45,8 +45,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_clockconfig.h" #include "hardware/sam_pmc.h" diff --git a/arch/arm/src/sam34/sam_cmcc.c b/arch/arm/src/sam34/sam_cmcc.c index 676dda4bb0d..3030a79b482 100644 --- a/arch/arm/src/sam34/sam_cmcc.c +++ b/arch/arm/src/sam34/sam_cmcc.c @@ -43,7 +43,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/sam_cmcc.h" #include "sam_cmcc.h" diff --git a/arch/arm/src/sam34/sam_dmac.c b/arch/arm/src/sam34/sam_dmac.c index cee2d4aa801..9fc9e4d1f8e 100644 --- a/arch/arm/src/sam34/sam_dmac.c +++ b/arch/arm/src/sam34/sam_dmac.c @@ -50,8 +50,8 @@ #include #include -#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/sam34/sam_emac.c b/arch/arm/src/sam34/sam_emac.c index f131daa6131..97e922e1cba 100644 --- a/arch/arm/src/sam34/sam_emac.c +++ b/arch/arm/src/sam34/sam_emac.c @@ -74,8 +74,8 @@ # include #endif -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "hardware/sam_pinmap.h" diff --git a/arch/arm/src/sam34/sam_emac.h b/arch/arm/src/sam34/sam_emac.h index b5b4db6f25b..8f729d60c9f 100644 --- a/arch/arm/src/sam34/sam_emac.h +++ b/arch/arm/src/sam34/sam_emac.h @@ -74,7 +74,7 @@ extern "C" * Function: up_netinitialize * * Description: - * Initialize the EMAC driver. Also prototyped in up_internal.h. + * Initialize the EMAC driver. Also prototyped in arm_internal.h. * * Input Parameters: * None diff --git a/arch/arm/src/sam34/sam_gpio.c b/arch/arm/src/sam34/sam_gpio.c index f8f6491cf66..04c1c7c518d 100644 --- a/arch/arm/src/sam34/sam_gpio.c +++ b/arch/arm/src/sam34/sam_gpio.c @@ -49,8 +49,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "sam_gpio.h" diff --git a/arch/arm/src/sam34/sam_gpioirq.c b/arch/arm/src/sam34/sam_gpioirq.c index ff3cd1b5b52..aca5e40ea13 100644 --- a/arch/arm/src/sam34/sam_gpioirq.c +++ b/arch/arm/src/sam34/sam_gpioirq.c @@ -50,8 +50,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_gpio.h" #include "sam_periphclks.h" diff --git a/arch/arm/src/sam34/sam_hsmci.c b/arch/arm/src/sam34/sam_hsmci.c index 411d6f02b2b..2c7e6d2ccd7 100644 --- a/arch/arm/src/sam34/sam_hsmci.c +++ b/arch/arm/src/sam34/sam_hsmci.c @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "sam_cmcc.h" diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c index 9ea43bdbf49..d475cd645a1 100644 --- a/arch/arm/src/sam34/sam_irq.c +++ b/arch/arm/src/sam34/sam_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" #ifdef CONFIG_SAM34_GPIO_IRQ # include "sam_gpio.h" diff --git a/arch/arm/src/sam34/sam_lowputc.c b/arch/arm/src/sam34/sam_lowputc.c index dd4c54a0ce4..375bfbb1cdf 100644 --- a/arch/arm/src/sam34/sam_lowputc.c +++ b/arch/arm/src/sam34/sam_lowputc.c @@ -43,8 +43,8 @@ #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "sam_periphclks.h" diff --git a/arch/arm/src/sam34/sam_lowputc.h b/arch/arm/src/sam34/sam_lowputc.h index c201b374b40..8cbc8d5b119 100644 --- a/arch/arm/src/sam34/sam_lowputc.h +++ b/arch/arm/src/sam34/sam_lowputc.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" /************************************************************************************ diff --git a/arch/arm/src/sam34/sam_rtc.c b/arch/arm/src/sam34/sam_rtc.c index 7180471948c..e69ab682e97 100644 --- a/arch/arm/src/sam34/sam_rtc.c +++ b/arch/arm/src/sam34/sam_rtc.c @@ -50,7 +50,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_rtc.h" #if defined(CONFIG_RTC_HIRES) && defined (CONFIG_SAM34_RTT) diff --git a/arch/arm/src/sam34/sam_rtt.c b/arch/arm/src/sam34/sam_rtt.c index 721c8cba6bf..8bf78c16afe 100644 --- a/arch/arm/src/sam34/sam_rtt.c +++ b/arch/arm/src/sam34/sam_rtt.c @@ -51,7 +51,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_rtt.h" #include "sam_periphclks.h" diff --git a/arch/arm/src/sam34/sam_serial.c b/arch/arm/src/sam34/sam_serial.c index ea09d9aac7d..f10bfc90212 100644 --- a/arch/arm/src/sam34/sam_serial.c +++ b/arch/arm/src/sam34/sam_serial.c @@ -58,8 +58,8 @@ #include -#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/sam34/sam_spi.c b/arch/arm/src/sam34/sam_spi.c index f062d324c76..b999420c5e8 100644 --- a/arch/arm/src/sam34/sam_spi.c +++ b/arch/arm/src/sam34/sam_spi.c @@ -59,8 +59,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "sam_gpio.h" diff --git a/arch/arm/src/sam34/sam_start.c b/arch/arm/src/sam34/sam_start.c index c10d63e7ec5..dedecd25b9e 100644 --- a/arch/arm/src/sam34/sam_start.c +++ b/arch/arm/src/sam34/sam_start.c @@ -46,8 +46,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nvic.h" #include "sam_clockconfig.h" diff --git a/arch/arm/src/sam34/sam_tc.c b/arch/arm/src/sam34/sam_tc.c index e3376bec4ca..e6626477b97 100644 --- a/arch/arm/src/sam34/sam_tc.c +++ b/arch/arm/src/sam34/sam_tc.c @@ -51,7 +51,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_tc.h" #include "sam_periphclks.h" diff --git a/arch/arm/src/sam34/sam_timerisr.c b/arch/arm/src/sam34/sam_timerisr.c index a8477884421..efc389efbb6 100644 --- a/arch/arm/src/sam34/sam_timerisr.c +++ b/arch/arm/src/sam34/sam_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/sam34/sam_twi.c b/arch/arm/src/sam34/sam_twi.c index fced91c3f65..50a424b89e0 100644 --- a/arch/arm/src/sam34/sam_twi.c +++ b/arch/arm/src/sam34/sam_twi.c @@ -62,7 +62,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/sam_pmc.h" #include "hardware/sam_pinmap.h" diff --git a/arch/arm/src/sam34/sam_udp.c b/arch/arm/src/sam34/sam_udp.c index 3e2fd5ff627..c01bcea4e65 100644 --- a/arch/arm/src/sam34/sam_udp.c +++ b/arch/arm/src/sam34/sam_udp.c @@ -68,8 +68,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_periphclks.h" #include "hardware/sam_udp.h" diff --git a/arch/arm/src/sam34/sam_userspace.h b/arch/arm/src/sam34/sam_userspace.h index 86d235cf14b..6704215c093 100644 --- a/arch/arm/src/sam34/sam_userspace.h +++ b/arch/arm/src/sam34/sam_userspace.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" /************************************************************************************ diff --git a/arch/arm/src/sam34/sam_wdt.c b/arch/arm/src/sam34/sam_wdt.c index 9de791efac1..ebe428bc269 100644 --- a/arch/arm/src/sam34/sam_wdt.c +++ b/arch/arm/src/sam34/sam_wdt.c @@ -51,7 +51,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_wdt.h" #if defined(CONFIG_WATCHDOG) && defined(CONFIG_SAM34_WDT) diff --git a/arch/arm/src/sama5/sam_adc.c b/arch/arm/src/sama5/sam_adc.c index 07a190e703e..d25cb590035 100644 --- a/arch/arm/src/sama5/sam_adc.c +++ b/arch/arm/src/sama5/sam_adc.c @@ -67,8 +67,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "hardware/sam_adc.h" diff --git a/arch/arm/src/sama5/sam_allocateheap.c b/arch/arm/src/sama5/sam_allocateheap.c index be71204ff8b..14e2f10a3ea 100644 --- a/arch/arm/src/sama5/sam_allocateheap.c +++ b/arch/arm/src/sama5/sam_allocateheap.c @@ -51,8 +51,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "mmu.h" /**************************************************************************** diff --git a/arch/arm/src/sama5/sam_boot.c b/arch/arm/src/sama5/sam_boot.c index 7b2da4e801d..529b7884b20 100644 --- a/arch/arm/src/sama5/sam_boot.c +++ b/arch/arm/src/sama5/sam_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 "hardware/sam_wdt.h" #include "hardware/sam_aximx.h" diff --git a/arch/arm/src/sama5/sam_can.c b/arch/arm/src/sama5/sam_can.c index aa24ef2c974..a2de85cffca 100644 --- a/arch/arm/src/sama5/sam_can.c +++ b/arch/arm/src/sama5/sam_can.c @@ -62,8 +62,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "hardware/sam_pinmap.h" #include "sam_periphclks.h" diff --git a/arch/arm/src/sama5/sam_clockconfig.c b/arch/arm/src/sama5/sam_clockconfig.c index 92b5bcb254a..fa2d98eeb06 100644 --- a/arch/arm/src/sama5/sam_clockconfig.c +++ b/arch/arm/src/sama5/sam_clockconfig.c @@ -46,8 +46,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_periphclks.h" #include "sam_clockconfig.h" diff --git a/arch/arm/src/sama5/sam_clockconfig.h b/arch/arm/src/sama5/sam_clockconfig.h index 424d806cc70..d853cbb1559 100644 --- a/arch/arm/src/sama5/sam_clockconfig.h +++ b/arch/arm/src/sama5/sam_clockconfig.h @@ -41,7 +41,7 @@ ****************************************************************************/ #include -#include "up_internal.h" +#include "arm_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/sama5/sam_dbgu.c b/arch/arm/src/sama5/sam_dbgu.c index ce0dca13b20..1116a43ef75 100644 --- a/arch/arm/src/sama5/sam_dbgu.c +++ b/arch/arm/src/sama5/sam_dbgu.c @@ -54,8 +54,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "hardware/sam_dbgu.h" diff --git a/arch/arm/src/sama5/sam_dbgu.h b/arch/arm/src/sama5/sam_dbgu.h index 3f5cc1f35ef..aa06e6243f0 100644 --- a/arch/arm/src/sama5/sam_dbgu.h +++ b/arch/arm/src/sama5/sam_dbgu.h @@ -42,7 +42,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #ifdef CONFIG_SAMA5_DBGU diff --git a/arch/arm/src/sama5/sam_dmac.c b/arch/arm/src/sama5/sam_dmac.c index 59b3b6dcaf0..d1aae251295 100644 --- a/arch/arm/src/sama5/sam_dmac.c +++ b/arch/arm/src/sama5/sam_dmac.c @@ -49,8 +49,8 @@ #include #include -#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/sama5/sam_ehci.c b/arch/arm/src/sama5/sam_ehci.c index 73f795aa6d3..df8cf3499e4 100644 --- a/arch/arm/src/sama5/sam_ehci.c +++ b/arch/arm/src/sama5/sam_ehci.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "sam_periphclks.h" #include "sam_memories.h" diff --git a/arch/arm/src/sama5/sam_emaca.c b/arch/arm/src/sama5/sam_emaca.c index a4ef1ef0fcb..6e9a6e4162e 100644 --- a/arch/arm/src/sama5/sam_emaca.c +++ b/arch/arm/src/sama5/sam_emaca.c @@ -75,8 +75,8 @@ # include #endif -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "hardware/sam_pinmap.h" diff --git a/arch/arm/src/sama5/sam_emacb.c b/arch/arm/src/sama5/sam_emacb.c index 631ec41b279..cddf3b5d820 100644 --- a/arch/arm/src/sama5/sam_emacb.c +++ b/arch/arm/src/sama5/sam_emacb.c @@ -89,8 +89,8 @@ # include #endif -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "hardware/sam_pinmap.h" diff --git a/arch/arm/src/sama5/sam_flexcom_serial.c b/arch/arm/src/sama5/sam_flexcom_serial.c index 4a17ca85ca9..b2d026074aa 100644 --- a/arch/arm/src/sama5/sam_flexcom_serial.c +++ b/arch/arm/src/sama5/sam_flexcom_serial.c @@ -58,8 +58,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "hardware/sam_flexcom.h" diff --git a/arch/arm/src/sama5/sam_gmac.c b/arch/arm/src/sama5/sam_gmac.c index 3cddc324266..4e74192f511 100644 --- a/arch/arm/src/sama5/sam_gmac.c +++ b/arch/arm/src/sama5/sam_gmac.c @@ -72,8 +72,8 @@ # include #endif -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "hardware/sam_pinmap.h" diff --git a/arch/arm/src/sama5/sam_hsmci.c b/arch/arm/src/sama5/sam_hsmci.c index 42d356a7ff0..f295a171048 100644 --- a/arch/arm/src/sama5/sam_hsmci.c +++ b/arch/arm/src/sama5/sam_hsmci.c @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "sam_pio.h" #include "sam_dmac.h" diff --git a/arch/arm/src/sama5/sam_irq.c b/arch/arm/src/sama5/sam_irq.c index 862edddd26d..b28d4b5d2ea 100644 --- a/arch/arm/src/sama5/sam_irq.c +++ b/arch/arm/src/sama5/sam_irq.c @@ -46,8 +46,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #ifdef CONFIG_SAMA5_PIO_IRQ # include "sam_pio.h" diff --git a/arch/arm/src/sama5/sam_lcd.c b/arch/arm/src/sama5/sam_lcd.c index 8b4e517f2fd..db9b41f4a6e 100644 --- a/arch/arm/src/sama5/sam_lcd.c +++ b/arch/arm/src/sama5/sam_lcd.c @@ -58,7 +58,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/sam_lcdc.h" #include "hardware/sam_pinmap.h" #include "sam_pio.h" diff --git a/arch/arm/src/sama5/sam_lowputc.c b/arch/arm/src/sama5/sam_lowputc.c index 89e0c86fb50..555ca7bf512 100644 --- a/arch/arm/src/sama5/sam_lowputc.c +++ b/arch/arm/src/sama5/sam_lowputc.c @@ -43,8 +43,8 @@ #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "sam_pio.h" #include "sam_periphclks.h" diff --git a/arch/arm/src/sama5/sam_lowputc.h b/arch/arm/src/sama5/sam_lowputc.h index a7e193062eb..ddd25960da8 100644 --- a/arch/arm/src/sama5/sam_lowputc.h +++ b/arch/arm/src/sama5/sam_lowputc.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" /**************************************************************************** diff --git a/arch/arm/src/sama5/sam_nand.c b/arch/arm/src/sama5/sam_nand.c index c8d93b1a8b5..dbe54cacbfc 100644 --- a/arch/arm/src/sama5/sam_nand.c +++ b/arch/arm/src/sama5/sam_nand.c @@ -66,7 +66,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_memories.h" #include "sam_dmac.h" diff --git a/arch/arm/src/sama5/sam_nand.h b/arch/arm/src/sama5/sam_nand.h index 2f6c70a7336..24f8018fe33 100644 --- a/arch/arm/src/sama5/sam_nand.h +++ b/arch/arm/src/sama5/sam_nand.h @@ -50,7 +50,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "hardware/sam_hsmc.h" diff --git a/arch/arm/src/sama5/sam_ohci.c b/arch/arm/src/sama5/sam_ohci.c index 275614a9811..1043726a76b 100644 --- a/arch/arm/src/sama5/sam_ohci.c +++ b/arch/arm/src/sama5/sam_ohci.c @@ -46,8 +46,8 @@ #include /* May redefine PIO settings */ -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "sam_periphclks.h" diff --git a/arch/arm/src/sama5/sam_pck.c b/arch/arm/src/sama5/sam_pck.c index 19d64d2baea..d074f3eaf5a 100644 --- a/arch/arm/src/sama5/sam_pck.c +++ b/arch/arm/src/sama5/sam_pck.c @@ -47,7 +47,7 @@ #include "hardware/sam_pinmap.h" -#include "up_arch.h" +#include "arm_arch.h" #include "sam_pio.h" #include "sam_isi.h" diff --git a/arch/arm/src/sama5/sam_pioirq.c b/arch/arm/src/sama5/sam_pioirq.c index b653db7d663..59689b37699 100644 --- a/arch/arm/src/sama5/sam_pioirq.c +++ b/arch/arm/src/sama5/sam_pioirq.c @@ -50,8 +50,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/sam_pio.h" #include "hardware/sam_pmc.h" diff --git a/arch/arm/src/sama5/sam_pmc.c b/arch/arm/src/sama5/sam_pmc.c index 1c6596a7b1e..9a2a3d305dd 100644 --- a/arch/arm/src/sama5/sam_pmc.c +++ b/arch/arm/src/sama5/sam_pmc.c @@ -47,7 +47,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" diff --git a/arch/arm/src/sama5/sam_pwm.c b/arch/arm/src/sama5/sam_pwm.c index b58fe932eb1..d897bb6d4c9 100644 --- a/arch/arm/src/sama5/sam_pwm.c +++ b/arch/arm/src/sama5/sam_pwm.c @@ -52,8 +52,8 @@ #include "hardware/sam_pinmap.h" #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "sam_pio.h" diff --git a/arch/arm/src/sama5/sam_rtc.c b/arch/arm/src/sama5/sam_rtc.c index f32daad4167..7b5da6dc9ea 100644 --- a/arch/arm/src/sama5/sam_rtc.c +++ b/arch/arm/src/sama5/sam_rtc.c @@ -52,7 +52,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_rtc.h" #ifdef CONFIG_RTC diff --git a/arch/arm/src/sama5/sam_sckc.c b/arch/arm/src/sama5/sam_sckc.c index e416aebd8db..21280b657c4 100644 --- a/arch/arm/src/sama5/sam_sckc.c +++ b/arch/arm/src/sama5/sam_sckc.c @@ -46,7 +46,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_sckc.h" /**************************************************************************** diff --git a/arch/arm/src/sama5/sam_serial.c b/arch/arm/src/sama5/sam_serial.c index 9fc55333bf5..caad7b8e579 100644 --- a/arch/arm/src/sama5/sam_serial.c +++ b/arch/arm/src/sama5/sam_serial.c @@ -59,8 +59,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "hardware/sam_uart.h" diff --git a/arch/arm/src/sama5/sam_serial.h b/arch/arm/src/sama5/sam_serial.h index bf39c73d170..c64ff761f30 100644 --- a/arch/arm/src/sama5/sam_serial.h +++ b/arch/arm/src/sama5/sam_serial.h @@ -42,7 +42,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "sam_config.h" /**************************************************************************** diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c index 13942a68052..6617439e1b7 100644 --- a/arch/arm/src/sama5/sam_spi.c +++ b/arch/arm/src/sama5/sam_spi.c @@ -62,8 +62,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "sam_pio.h" diff --git a/arch/arm/src/sama5/sam_ssc.c b/arch/arm/src/sama5/sam_ssc.c index 756898038f3..f16e1822f54 100644 --- a/arch/arm/src/sama5/sam_ssc.c +++ b/arch/arm/src/sama5/sam_ssc.c @@ -45,8 +45,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "sam_pio.h" diff --git a/arch/arm/src/sama5/sam_tc.c b/arch/arm/src/sama5/sam_tc.c index 525544a8d08..3842596f38d 100644 --- a/arch/arm/src/sama5/sam_tc.c +++ b/arch/arm/src/sama5/sam_tc.c @@ -61,7 +61,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "hardware/sam_pinmap.h" #include "hardware/sam_pmc.h" diff --git a/arch/arm/src/sama5/sam_timerisr.c b/arch/arm/src/sama5/sam_timerisr.c index 62dee48491f..ceb22cc4d3f 100644 --- a/arch/arm/src/sama5/sam_timerisr.c +++ b/arch/arm/src/sama5/sam_timerisr.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "hardware/sam_pit.h" diff --git a/arch/arm/src/sama5/sam_trng.c b/arch/arm/src/sama5/sam_trng.c index aa746b2b599..92bdfe5fb0c 100644 --- a/arch/arm/src/sama5/sam_trng.c +++ b/arch/arm/src/sama5/sam_trng.c @@ -56,8 +56,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_periphclks.h" #include "sam_trng.h" diff --git a/arch/arm/src/sama5/sam_tsd.c b/arch/arm/src/sama5/sam_tsd.c index b0128983173..1c852dfe96d 100644 --- a/arch/arm/src/sama5/sam_tsd.c +++ b/arch/arm/src/sama5/sam_tsd.c @@ -70,7 +70,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/sam_adc.h" #include "sam_adc.h" #include "sam_tsd.h" diff --git a/arch/arm/src/sama5/sam_twi.c b/arch/arm/src/sama5/sam_twi.c index 0e16e3915de..26bbdaaf1a1 100644 --- a/arch/arm/src/sama5/sam_twi.c +++ b/arch/arm/src/sama5/sam_twi.c @@ -63,7 +63,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/sam_pmc.h" #include "hardware/sam_pinmap.h" diff --git a/arch/arm/src/sama5/sam_udphs.c b/arch/arm/src/sama5/sam_udphs.c index da391876391..24ffc5a1f0e 100644 --- a/arch/arm/src/sama5/sam_udphs.c +++ b/arch/arm/src/sama5/sam_udphs.c @@ -64,8 +64,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_periphclks.h" #include "sam_memories.h" diff --git a/arch/arm/src/sama5/sam_wdt.c b/arch/arm/src/sama5/sam_wdt.c index e8bf848fa2b..f3585a464c1 100644 --- a/arch/arm/src/sama5/sam_wdt.c +++ b/arch/arm/src/sama5/sam_wdt.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_wdt.h" #if defined(CONFIG_WATCHDOG) && defined(CONFIG_SAMA5_WDT) diff --git a/arch/arm/src/sama5/sam_xdmac.c b/arch/arm/src/sama5/sam_xdmac.c index eeff5a312a1..d748dba45cd 100644 --- a/arch/arm/src/sama5/sam_xdmac.c +++ b/arch/arm/src/sama5/sam_xdmac.c @@ -49,8 +49,8 @@ #include #include -#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/sama5/sama5d2x_pio.c b/arch/arm/src/sama5/sama5d2x_pio.c index fa1ee82dca1..4b65659b0eb 100644 --- a/arch/arm/src/sama5/sama5d2x_pio.c +++ b/arch/arm/src/sama5/sama5d2x_pio.c @@ -49,8 +49,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "hardware/_sama5d2x_pio.h" diff --git a/arch/arm/src/sama5/sama5d3x4x_pio.c b/arch/arm/src/sama5/sama5d3x4x_pio.c index 0e9b53a3492..7dcf174477f 100644 --- a/arch/arm/src/sama5/sama5d3x4x_pio.c +++ b/arch/arm/src/sama5/sama5d3x4x_pio.c @@ -49,8 +49,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "hardware/_sama5d3x4x_pio.h" diff --git a/arch/arm/src/samd2l2/sam_ac.c b/arch/arm/src/samd2l2/sam_ac.c index 3ec4185f4b3..018e47cfa6f 100644 --- a/arch/arm/src/samd2l2/sam_ac.c +++ b/arch/arm/src/samd2l2/sam_ac.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_config.h" diff --git a/arch/arm/src/samd2l2/sam_adc.c b/arch/arm/src/samd2l2/sam_adc.c index 9467c00de90..0070708f87e 100644 --- a/arch/arm/src/samd2l2/sam_adc.c +++ b/arch/arm/src/samd2l2/sam_adc.c @@ -57,7 +57,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_adc.h" #include "sam_pinmap.h" #include "sam_gclk.h" diff --git a/arch/arm/src/samd2l2/sam_dmac.c b/arch/arm/src/samd2l2/sam_dmac.c index 5ce8a87d06b..1970f8133fa 100644 --- a/arch/arm/src/samd2l2/sam_dmac.c +++ b/arch/arm/src/samd2l2/sam_dmac.c @@ -49,8 +49,8 @@ #include #include -#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/samd2l2/sam_eic.c b/arch/arm/src/samd2l2/sam_eic.c index a46b6143170..8fe99d8d5a7 100644 --- a/arch/arm/src/samd2l2/sam_eic.c +++ b/arch/arm/src/samd2l2/sam_eic.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_config.h" diff --git a/arch/arm/src/samd2l2/sam_i2c_master.c b/arch/arm/src/samd2l2/sam_i2c_master.c index 868d525971b..0874a667163 100644 --- a/arch/arm/src/samd2l2/sam_i2c_master.c +++ b/arch/arm/src/samd2l2/sam_i2c_master.c @@ -66,8 +66,8 @@ #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "sam_pinmap.h" diff --git a/arch/arm/src/samd2l2/sam_idle.c b/arch/arm/src/samd2l2/sam_idle.c index c3d1b0717fc..3e6ac5c068a 100644 --- a/arch/arm/src/samd2l2/sam_idle.c +++ b/arch/arm/src/samd2l2/sam_idle.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "arm_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/samd2l2/sam_irq.c b/arch/arm/src/samd2l2/sam_irq.c index 1c02b3e789c..a4d49846dec 100644 --- a/arch/arm/src/samd2l2/sam_irq.c +++ b/arch/arm/src/samd2l2/sam_irq.c @@ -47,8 +47,8 @@ #include #include "nvic.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_irq.h" diff --git a/arch/arm/src/samd2l2/sam_irqprio.c b/arch/arm/src/samd2l2/sam_irqprio.c index 7f201cebcb0..bfaae524932 100644 --- a/arch/arm/src/samd2l2/sam_irqprio.c +++ b/arch/arm/src/samd2l2/sam_irqprio.c @@ -44,7 +44,7 @@ #include #include "nvic.h" -#include "up_arch.h" +#include "arm_arch.h" #include "sam_irq.h" diff --git a/arch/arm/src/samd2l2/sam_lowputc.c b/arch/arm/src/samd2l2/sam_lowputc.c index 67d70b370c0..36f2b30c1aa 100644 --- a/arch/arm/src/samd2l2/sam_lowputc.c +++ b/arch/arm/src/samd2l2/sam_lowputc.c @@ -54,7 +54,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_config.h" #include "sam_gclk.h" #include "sam_pm.h" diff --git a/arch/arm/src/samd2l2/sam_port.c b/arch/arm/src/samd2l2/sam_port.c index dd514e3bb62..3162a1f6cd4 100644 --- a/arch/arm/src/samd2l2/sam_port.c +++ b/arch/arm/src/samd2l2/sam_port.c @@ -52,8 +52,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "sam_port.h" diff --git a/arch/arm/src/samd2l2/sam_sercom.c b/arch/arm/src/samd2l2/sam_sercom.c index fc9d5054212..381bcb93515 100644 --- a/arch/arm/src/samd2l2/sam_sercom.c +++ b/arch/arm/src/samd2l2/sam_sercom.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_config.h" diff --git a/arch/arm/src/samd2l2/sam_sercom.h b/arch/arm/src/samd2l2/sam_sercom.h index 01ae4d94ba7..64b3e2600ae 100644 --- a/arch/arm/src/samd2l2/sam_sercom.h +++ b/arch/arm/src/samd2l2/sam_sercom.h @@ -44,7 +44,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_config.h" #include "sam_periphclks.h" diff --git a/arch/arm/src/samd2l2/sam_serial.c b/arch/arm/src/samd2l2/sam_serial.c index 18a117e7286..80dd3caf999 100644 --- a/arch/arm/src/samd2l2/sam_serial.c +++ b/arch/arm/src/samd2l2/sam_serial.c @@ -54,8 +54,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "sam_config.h" diff --git a/arch/arm/src/samd2l2/sam_spi.c b/arch/arm/src/samd2l2/sam_spi.c index c9185013e26..e76e5ff5b5f 100644 --- a/arch/arm/src/samd2l2/sam_spi.c +++ b/arch/arm/src/samd2l2/sam_spi.c @@ -45,8 +45,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "sam_pinmap.h" diff --git a/arch/arm/src/samd2l2/sam_start.c b/arch/arm/src/samd2l2/sam_start.c index 07c016ae0b3..0777027fa5a 100644 --- a/arch/arm/src/samd2l2/sam_start.c +++ b/arch/arm/src/samd2l2/sam_start.c @@ -45,8 +45,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_config.h" #include "sam_lowputc.h" diff --git a/arch/arm/src/samd2l2/sam_timerisr.c b/arch/arm/src/samd2l2/sam_timerisr.c index 0a359a37587..13b9a7097bc 100644 --- a/arch/arm/src/samd2l2/sam_timerisr.c +++ b/arch/arm/src/samd2l2/sam_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/samd2l2/sam_usart.h b/arch/arm/src/samd2l2/sam_usart.h index ebabab88ba8..6348767caeb 100644 --- a/arch/arm/src/samd2l2/sam_usart.h +++ b/arch/arm/src/samd2l2/sam_usart.h @@ -47,7 +47,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) # include "hardware/samd_usart.h" diff --git a/arch/arm/src/samd2l2/sam_usb.c b/arch/arm/src/samd2l2/sam_usb.c index 479f08bba7e..51737cd2d58 100644 --- a/arch/arm/src/samd2l2/sam_usb.c +++ b/arch/arm/src/samd2l2/sam_usb.c @@ -103,8 +103,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_gclk.h" #include "chip.h" diff --git a/arch/arm/src/samd2l2/samd_clockconfig.c b/arch/arm/src/samd2l2/samd_clockconfig.c index 3056334f7e3..3763914ee8d 100644 --- a/arch/arm/src/samd2l2/samd_clockconfig.c +++ b/arch/arm/src/samd2l2/samd_clockconfig.c @@ -54,7 +54,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/samd_pm.h" #include "hardware/samd_sysctrl.h" diff --git a/arch/arm/src/samd2l2/samd_gclk.c b/arch/arm/src/samd2l2/samd_gclk.c index 7ebba440204..75ebc527961 100644 --- a/arch/arm/src/samd2l2/samd_gclk.c +++ b/arch/arm/src/samd2l2/samd_gclk.c @@ -44,7 +44,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gclk.h" #if defined(CONFIG_ARCH_FAMILY_SAMD20) || defined(CONFIG_ARCH_FAMILY_SAMD21) diff --git a/arch/arm/src/samd2l2/saml_clockconfig.c b/arch/arm/src/samd2l2/saml_clockconfig.c index 2d26c7c53c9..410ebf60d78 100644 --- a/arch/arm/src/samd2l2/saml_clockconfig.c +++ b/arch/arm/src/samd2l2/saml_clockconfig.c @@ -54,7 +54,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/saml_pm.h" #include "hardware/saml_supc.h" diff --git a/arch/arm/src/samd2l2/saml_gclk.c b/arch/arm/src/samd2l2/saml_gclk.c index 9a8d6ec3a6c..7b7765826ad 100644 --- a/arch/arm/src/samd2l2/saml_gclk.c +++ b/arch/arm/src/samd2l2/saml_gclk.c @@ -44,7 +44,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gclk.h" #ifdef CONFIG_ARCH_FAMILY_SAML21 diff --git a/arch/arm/src/samd5e5/sam_clockconfig.c b/arch/arm/src/samd5e5/sam_clockconfig.c index 1ea76634bf3..c7955270c90 100644 --- a/arch/arm/src/samd5e5/sam_clockconfig.c +++ b/arch/arm/src/samd5e5/sam_clockconfig.c @@ -43,7 +43,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/sam_pm.h" #include "hardware/sam_supc.h" diff --git a/arch/arm/src/samd5e5/sam_cmcc.c b/arch/arm/src/samd5e5/sam_cmcc.c index 747c0d0bdde..e83641db589 100644 --- a/arch/arm/src/samd5e5/sam_cmcc.c +++ b/arch/arm/src/samd5e5/sam_cmcc.c @@ -43,7 +43,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/sam_cmcc.h" #include "sam_cmcc.h" diff --git a/arch/arm/src/samd5e5/sam_dmac.c b/arch/arm/src/samd5e5/sam_dmac.c index d02cc6ac0cc..d8452760031 100644 --- a/arch/arm/src/samd5e5/sam_dmac.c +++ b/arch/arm/src/samd5e5/sam_dmac.c @@ -50,8 +50,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sched/sched.h" #include "sam_dmac.h" diff --git a/arch/arm/src/samd5e5/sam_eic.c b/arch/arm/src/samd5e5/sam_eic.c index 4e13298956d..bdd0049d4a1 100644 --- a/arch/arm/src/samd5e5/sam_eic.c +++ b/arch/arm/src/samd5e5/sam_eic.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gclk.h" #include "sam_periphclks.h" #include "sam_port.h" diff --git a/arch/arm/src/samd5e5/sam_gclk.c b/arch/arm/src/samd5e5/sam_gclk.c index 344660575cf..f9ac89475e5 100644 --- a/arch/arm/src/samd5e5/sam_gclk.c +++ b/arch/arm/src/samd5e5/sam_gclk.c @@ -44,7 +44,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gclk.h" /**************************************************************************** diff --git a/arch/arm/src/samd5e5/sam_gclk.h b/arch/arm/src/samd5e5/sam_gclk.h index dbfa61692a1..18da4a3d2c0 100644 --- a/arch/arm/src/samd5e5/sam_gclk.h +++ b/arch/arm/src/samd5e5/sam_gclk.h @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_config.h" #include "hardware/sam_gclk.h" diff --git a/arch/arm/src/samd5e5/sam_gmac.c b/arch/arm/src/samd5e5/sam_gmac.c index 9fc9def9510..b829ed2ece9 100644 --- a/arch/arm/src/samd5e5/sam_gmac.c +++ b/arch/arm/src/samd5e5/sam_gmac.c @@ -72,8 +72,8 @@ # include #endif -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "hardware/sam_pinmap.h" diff --git a/arch/arm/src/samd5e5/sam_i2c_master.c b/arch/arm/src/samd5e5/sam_i2c_master.c index d0a5589531e..2c33e87325a 100644 --- a/arch/arm/src/samd5e5/sam_i2c_master.c +++ b/arch/arm/src/samd5e5/sam_i2c_master.c @@ -57,8 +57,8 @@ #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "hardware/sam_i2c_master.h" #include "hardware/sam_pinmap.h" diff --git a/arch/arm/src/samd5e5/sam_idle.c b/arch/arm/src/samd5e5/sam_idle.c index 099213f8824..df7ed3e2ac0 100644 --- a/arch/arm/src/samd5e5/sam_idle.c +++ b/arch/arm/src/samd5e5/sam_idle.c @@ -46,7 +46,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/samd5e5/sam_irq.c b/arch/arm/src/samd5e5/sam_irq.c index cc606e8205c..774fe8bab8c 100644 --- a/arch/arm/src/samd5e5/sam_irq.c +++ b/arch/arm/src/samd5e5/sam_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" #ifdef CONFIG_SAMD5E5_EIC # include "sam_eic.h" diff --git a/arch/arm/src/samd5e5/sam_lowputc.c b/arch/arm/src/samd5e5/sam_lowputc.c index b6e3424cb93..c76dfa9bedd 100644 --- a/arch/arm/src/samd5e5/sam_lowputc.c +++ b/arch/arm/src/samd5e5/sam_lowputc.c @@ -45,7 +45,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/sam_pm.h" #include "sam_config.h" #include "sam_gclk.h" diff --git a/arch/arm/src/samd5e5/sam_port.c b/arch/arm/src/samd5e5/sam_port.c index 0d345ab35f8..0d406b093d8 100644 --- a/arch/arm/src/samd5e5/sam_port.c +++ b/arch/arm/src/samd5e5/sam_port.c @@ -48,8 +48,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "sam_port.h" #include "sam_eic.h" diff --git a/arch/arm/src/samd5e5/sam_sercom.c b/arch/arm/src/samd5e5/sam_sercom.c index 584ebe5844e..472e0dd3560 100644 --- a/arch/arm/src/samd5e5/sam_sercom.c +++ b/arch/arm/src/samd5e5/sam_sercom.c @@ -43,7 +43,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_config.h" diff --git a/arch/arm/src/samd5e5/sam_sercom.h b/arch/arm/src/samd5e5/sam_sercom.h index 60c51317703..64991fa7183 100644 --- a/arch/arm/src/samd5e5/sam_sercom.h +++ b/arch/arm/src/samd5e5/sam_sercom.h @@ -44,7 +44,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_config.h" #include "sam_periphclks.h" diff --git a/arch/arm/src/samd5e5/sam_serial.c b/arch/arm/src/samd5e5/sam_serial.c index 71edda71ef2..2a8ce730cfc 100644 --- a/arch/arm/src/samd5e5/sam_serial.c +++ b/arch/arm/src/samd5e5/sam_serial.c @@ -54,8 +54,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_config.h" #include "sam_usart.h" diff --git a/arch/arm/src/samd5e5/sam_spi.c b/arch/arm/src/samd5e5/sam_spi.c index e75ad2245e1..09d37eee58a 100644 --- a/arch/arm/src/samd5e5/sam_spi.c +++ b/arch/arm/src/samd5e5/sam_spi.c @@ -40,8 +40,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "hardware/sam_pinmap.h" #include "sam_gclk.h" diff --git a/arch/arm/src/samd5e5/sam_start.c b/arch/arm/src/samd5e5/sam_start.c index c991e7c37ad..dbc6116d764 100644 --- a/arch/arm/src/samd5e5/sam_start.c +++ b/arch/arm/src/samd5e5/sam_start.c @@ -45,8 +45,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nvic.h" #include /* Depends on other definitions */ diff --git a/arch/arm/src/samd5e5/sam_timerisr.c b/arch/arm/src/samd5e5/sam_timerisr.c index cceebcf4a28..51413d7a963 100644 --- a/arch/arm/src/samd5e5/sam_timerisr.c +++ b/arch/arm/src/samd5e5/sam_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 diff --git a/arch/arm/src/samd5e5/sam_usart.h b/arch/arm/src/samd5e5/sam_usart.h index b88f6f8ad1f..506572d58c4 100644 --- a/arch/arm/src/samd5e5/sam_usart.h +++ b/arch/arm/src/samd5e5/sam_usart.h @@ -47,7 +47,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/sam_usart.h" #include "sam_config.h" diff --git a/arch/arm/src/samd5e5/sam_usb.c b/arch/arm/src/samd5e5/sam_usb.c index f40af299d75..128534550c5 100644 --- a/arch/arm/src/samd5e5/sam_usb.c +++ b/arch/arm/src/samd5e5/sam_usb.c @@ -102,8 +102,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "hardware/sam_pinmap.h" diff --git a/arch/arm/src/samd5e5/sam_userspace.h b/arch/arm/src/samd5e5/sam_userspace.h index 77b42cfee8f..5a882883143 100644 --- a/arch/arm/src/samd5e5/sam_userspace.h +++ b/arch/arm/src/samd5e5/sam_userspace.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/samv7/sam_allocateheap.c b/arch/arm/src/samv7/sam_allocateheap.c index 18f3ce59e25..a5ec12d8a66 100644 --- a/arch/arm/src/samv7/sam_allocateheap.c +++ b/arch/arm/src/samv7/sam_allocateheap.c @@ -50,8 +50,8 @@ #include #include "mpu.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_mpuinit.h" #include "sam_periphclks.h" diff --git a/arch/arm/src/samv7/sam_clockconfig.c b/arch/arm/src/samv7/sam_clockconfig.c index 9557928b1cc..c8c912a86c0 100644 --- a/arch/arm/src/samv7/sam_clockconfig.c +++ b/arch/arm/src/samv7/sam_clockconfig.c @@ -45,8 +45,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_clockconfig.h" #include "hardware/sam_pmc.h" diff --git a/arch/arm/src/samv7/sam_dac.c b/arch/arm/src/samv7/sam_dac.c index 6c61c75a414..259d96387f5 100644 --- a/arch/arm/src/samv7/sam_dac.c +++ b/arch/arm/src/samv7/sam_dac.c @@ -51,8 +51,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "hardware/sam_dacc.h" #include "hardware/sam_pmc.h" diff --git a/arch/arm/src/samv7/sam_eefc.h b/arch/arm/src/samv7/sam_eefc.h index 3af229908c2..65beaa933be 100755 --- a/arch/arm/src/samv7/sam_eefc.h +++ b/arch/arm/src/samv7/sam_eefc.h @@ -27,8 +27,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/sam_eefc.h" #include diff --git a/arch/arm/src/samv7/sam_emac.c b/arch/arm/src/samv7/sam_emac.c index 9999a9d1a7f..0dab03ab9b8 100644 --- a/arch/arm/src/samv7/sam_emac.c +++ b/arch/arm/src/samv7/sam_emac.c @@ -81,8 +81,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/sam_pinmap.h" #include "hardware/sam_chipid.h" diff --git a/arch/arm/src/samv7/sam_gpio.c b/arch/arm/src/samv7/sam_gpio.c index b8a0ffaaafa..a856af592fc 100644 --- a/arch/arm/src/samv7/sam_gpio.c +++ b/arch/arm/src/samv7/sam_gpio.c @@ -49,8 +49,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "hardware/sam_pio.h" diff --git a/arch/arm/src/samv7/sam_gpioirq.c b/arch/arm/src/samv7/sam_gpioirq.c index 72f099b826f..062a7863892 100644 --- a/arch/arm/src/samv7/sam_gpioirq.c +++ b/arch/arm/src/samv7/sam_gpioirq.c @@ -50,8 +50,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_gpio.h" #include "sam_periphclks.h" diff --git a/arch/arm/src/samv7/sam_hsmci.c b/arch/arm/src/samv7/sam_hsmci.c index efdfbb5943d..e5f80773881 100644 --- a/arch/arm/src/samv7/sam_hsmci.c +++ b/arch/arm/src/samv7/sam_hsmci.c @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "sam_xdmac.h" diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c index 73f5e55bacb..508ff2f9594 100644 --- a/arch/arm/src/samv7/sam_irq.c +++ b/arch/arm/src/samv7/sam_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" #ifdef CONFIG_SAMV7_GPIO_IRQ # include "sam_gpio.h" diff --git a/arch/arm/src/samv7/sam_lowputc.c b/arch/arm/src/samv7/sam_lowputc.c index b65d0340e3d..09c70104c88 100644 --- a/arch/arm/src/samv7/sam_lowputc.c +++ b/arch/arm/src/samv7/sam_lowputc.c @@ -44,8 +44,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "sam_config.h" #include "sam_gpio.h" diff --git a/arch/arm/src/samv7/sam_lowputc.h b/arch/arm/src/samv7/sam_lowputc.h index 1b0c5f379af..26c723d4d0a 100644 --- a/arch/arm/src/samv7/sam_lowputc.h +++ b/arch/arm/src/samv7/sam_lowputc.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" /************************************************************************************ diff --git a/arch/arm/src/samv7/sam_mcan.c b/arch/arm/src/samv7/sam_mcan.c index adb189dfa5f..3cc50c9bb15 100644 --- a/arch/arm/src/samv7/sam_mcan.c +++ b/arch/arm/src/samv7/sam_mcan.c @@ -43,8 +43,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "hardware/sam_matrix.h" #include "hardware/sam_pinmap.h" diff --git a/arch/arm/src/samv7/sam_pck.c b/arch/arm/src/samv7/sam_pck.c index fe3d78629b5..dcbadd1d27c 100644 --- a/arch/arm/src/samv7/sam_pck.c +++ b/arch/arm/src/samv7/sam_pck.c @@ -47,7 +47,7 @@ #include "hardware/sam_pinmap.h" -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "sam_pck.h" diff --git a/arch/arm/src/samv7/sam_progmem.c b/arch/arm/src/samv7/sam_progmem.c index 719f1ef4d5e..a1af5e95fd1 100644 --- a/arch/arm/src/samv7/sam_progmem.c +++ b/arch/arm/src/samv7/sam_progmem.c @@ -46,8 +46,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "barriers.h" #include "hardware/sam_memorymap.h" diff --git a/arch/arm/src/samv7/sam_progmem.h b/arch/arm/src/samv7/sam_progmem.h index 0f8e26097e6..17753ae89d6 100644 --- a/arch/arm/src/samv7/sam_progmem.h +++ b/arch/arm/src/samv7/sam_progmem.h @@ -42,7 +42,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/sam_eefc.h" #include diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c index 4f10c527c0d..20f8e040d90 100644 --- a/arch/arm/src/samv7/sam_qspi.c +++ b/arch/arm/src/samv7/sam_qspi.c @@ -57,8 +57,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "barriers.h" #include "sam_gpio.h" diff --git a/arch/arm/src/samv7/sam_rswdt.c b/arch/arm/src/samv7/sam_rswdt.c index f104635922c..49c87b9fc0e 100644 --- a/arch/arm/src/samv7/sam_rswdt.c +++ b/arch/arm/src/samv7/sam_rswdt.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_wdt.h" #if defined(CONFIG_WATCHDOG) && defined(CONFIG_SAMV7_RSWDT) diff --git a/arch/arm/src/samv7/sam_serial.c b/arch/arm/src/samv7/sam_serial.c index 887447492e1..f731f4d7f10 100644 --- a/arch/arm/src/samv7/sam_serial.c +++ b/arch/arm/src/samv7/sam_serial.c @@ -58,8 +58,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_config.h" #include "hardware/sam_uart.h" diff --git a/arch/arm/src/samv7/sam_spi.c b/arch/arm/src/samv7/sam_spi.c index 606f397d574..21b3e8bf78b 100644 --- a/arch/arm/src/samv7/sam_spi.c +++ b/arch/arm/src/samv7/sam_spi.c @@ -58,8 +58,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "sam_xdmac.h" diff --git a/arch/arm/src/samv7/sam_spi_slave.c b/arch/arm/src/samv7/sam_spi_slave.c index 9f708c42b9d..9845ce83f59 100644 --- a/arch/arm/src/samv7/sam_spi_slave.c +++ b/arch/arm/src/samv7/sam_spi_slave.c @@ -37,7 +37,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_config.h" #include "sam_gpio.h" diff --git a/arch/arm/src/samv7/sam_ssc.c b/arch/arm/src/samv7/sam_ssc.c index 4bf99478db0..caa15e11ef0 100644 --- a/arch/arm/src/samv7/sam_ssc.c +++ b/arch/arm/src/samv7/sam_ssc.c @@ -45,8 +45,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "sam_xdmac.h" diff --git a/arch/arm/src/samv7/sam_start.c b/arch/arm/src/samv7/sam_start.c index 71f240a5e1e..bbdba519921 100644 --- a/arch/arm/src/samv7/sam_start.c +++ b/arch/arm/src/samv7/sam_start.c @@ -47,8 +47,8 @@ #include #include -#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/samv7/sam_start.h b/arch/arm/src/samv7/sam_start.h index 5374db9e90e..2ca8804ea3b 100644 --- a/arch/arm/src/samv7/sam_start.h +++ b/arch/arm/src/samv7/sam_start.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" /************************************************************************************ diff --git a/arch/arm/src/samv7/sam_systemreset.c b/arch/arm/src/samv7/sam_systemreset.c index 19ae8df8d5e..55a5d354e19 100644 --- a/arch/arm/src/samv7/sam_systemreset.c +++ b/arch/arm/src/samv7/sam_systemreset.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/sam_rstc.h" #ifdef CONFIG_SAMV7_SYSTEMRESET diff --git a/arch/arm/src/samv7/sam_tc.c b/arch/arm/src/samv7/sam_tc.c index d638fa1fc8d..87f4ce39ee7 100644 --- a/arch/arm/src/samv7/sam_tc.c +++ b/arch/arm/src/samv7/sam_tc.c @@ -62,7 +62,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "hardware/sam_pinmap.h" #include "hardware/sam_pmc.h" diff --git a/arch/arm/src/samv7/sam_timerisr.c b/arch/arm/src/samv7/sam_timerisr.c index abbdece5906..09fa768ba4f 100644 --- a/arch/arm/src/samv7/sam_timerisr.c +++ b/arch/arm/src/samv7/sam_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/samv7/sam_trng.c b/arch/arm/src/samv7/sam_trng.c index 246332a8f75..73907050c70 100644 --- a/arch/arm/src/samv7/sam_trng.c +++ b/arch/arm/src/samv7/sam_trng.c @@ -57,8 +57,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_periphclks.h" #include "sam_trng.h" diff --git a/arch/arm/src/samv7/sam_twihs.c b/arch/arm/src/samv7/sam_twihs.c index ef084b6f623..7751dda37db 100644 --- a/arch/arm/src/samv7/sam_twihs.c +++ b/arch/arm/src/samv7/sam_twihs.c @@ -63,7 +63,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/sam_pmc.h" #include "hardware/sam_pinmap.h" diff --git a/arch/arm/src/samv7/sam_usbdevhs.c b/arch/arm/src/samv7/sam_usbdevhs.c index d25c5086ede..f9f355f7771 100644 --- a/arch/arm/src/samv7/sam_usbdevhs.c +++ b/arch/arm/src/samv7/sam_usbdevhs.c @@ -68,8 +68,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "barriers.h" #include "chip.h" diff --git a/arch/arm/src/samv7/sam_userspace.h b/arch/arm/src/samv7/sam_userspace.h index f290bb07aa6..b2bb1c26769 100644 --- a/arch/arm/src/samv7/sam_userspace.h +++ b/arch/arm/src/samv7/sam_userspace.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" /************************************************************************************ diff --git a/arch/arm/src/samv7/sam_wdt.c b/arch/arm/src/samv7/sam_wdt.c index 842005967f1..16e32fbf5ca 100644 --- a/arch/arm/src/samv7/sam_wdt.c +++ b/arch/arm/src/samv7/sam_wdt.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_wdt.h" #if defined(CONFIG_WATCHDOG) && defined(CONFIG_SAMV7_WDT) diff --git a/arch/arm/src/samv7/sam_xdmac.c b/arch/arm/src/samv7/sam_xdmac.c index d1082df46e4..b7d9afe010b 100644 --- a/arch/arm/src/samv7/sam_xdmac.c +++ b/arch/arm/src/samv7/sam_xdmac.c @@ -50,8 +50,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sched/sched.h" #include "sam_xdmac.h" diff --git a/arch/arm/src/stm32/stm32.h b/arch/arm/src/stm32/stm32.h index ba3fcb14731..7df53d8c1a8 100644 --- a/arch/arm/src/stm32/stm32.h +++ b/arch/arm/src/stm32/stm32.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/stm32/stm32_1wire.c b/arch/arm/src/stm32/stm32_1wire.c index e6691d30da5..5bf97c2b2c4 100644 --- a/arch/arm/src/stm32/stm32_1wire.c +++ b/arch/arm/src/stm32/stm32_1wire.c @@ -60,7 +60,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_1wire.h" diff --git a/arch/arm/src/stm32/stm32_adc.c b/arch/arm/src/stm32/stm32_adc.c index d3172d649dd..220748bb760 100644 --- a/arch/arm/src/stm32/stm32_adc.c +++ b/arch/arm/src/stm32/stm32_adc.c @@ -61,8 +61,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/arch/arm/src/stm32/stm32_aes.c b/arch/arm/src/stm32/stm32_aes.c index d37c41342fd..70a258afaf5 100644 --- a/arch/arm/src/stm32/stm32_aes.c +++ b/arch/arm/src/stm32/stm32_aes.c @@ -52,8 +52,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_rcc.h" diff --git a/arch/arm/src/stm32/stm32_allocateheap.c b/arch/arm/src/stm32/stm32_allocateheap.c index 3a6174d0de1..1fe112ff729 100644 --- a/arch/arm/src/stm32/stm32_allocateheap.c +++ b/arch/arm/src/stm32/stm32_allocateheap.c @@ -55,8 +55,8 @@ #include "chip.h" #include "mpu.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_mpuinit.h" diff --git a/arch/arm/src/stm32/stm32_can.c b/arch/arm/src/stm32/stm32_can.c index 6d287c1ebc9..2cdeecc07d3 100644 --- a/arch/arm/src/stm32/stm32_can.c +++ b/arch/arm/src/stm32/stm32_can.c @@ -54,8 +54,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/arch/arm/src/stm32/stm32_capture.c b/arch/arm/src/stm32/stm32_capture.c index f2077e684d4..d31a3554aa8 100644 --- a/arch/arm/src/stm32/stm32_capture.c +++ b/arch/arm/src/stm32/stm32_capture.c @@ -50,8 +50,8 @@ #include #include "chip.h" -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32/stm32_dac.c b/arch/arm/src/stm32/stm32_dac.c index 5dc976d87f2..5f9a4ea724c 100644 --- a/arch/arm/src/stm32/stm32_dac.c +++ b/arch/arm/src/stm32/stm32_dac.c @@ -53,8 +53,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/arch/arm/src/stm32/stm32_dma2d.c b/arch/arm/src/stm32/stm32_dma2d.c index 52da0181b2b..03b1c9cca12 100644 --- a/arch/arm/src/stm32/stm32_dma2d.c +++ b/arch/arm/src/stm32/stm32_dma2d.c @@ -54,8 +54,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "hardware/stm32_ltdc.h" #include "hardware/stm32_dma2d.h" diff --git a/arch/arm/src/stm32/stm32_dma_v1.c b/arch/arm/src/stm32/stm32_dma_v1.c index 25fa5fcd7ba..2892dfd05d6 100644 --- a/arch/arm/src/stm32/stm32_dma_v1.c +++ b/arch/arm/src/stm32/stm32_dma_v1.c @@ -49,8 +49,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sched/sched.h" #include "chip.h" #include "stm32_dma.h" diff --git a/arch/arm/src/stm32/stm32_dma_v2.c b/arch/arm/src/stm32/stm32_dma_v2.c index 14c82d31584..34c24bd59e2 100644 --- a/arch/arm/src/stm32/stm32_dma_v2.c +++ b/arch/arm/src/stm32/stm32_dma_v2.c @@ -48,8 +48,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sched/sched.h" #include "chip.h" #include "stm32_dma.h" diff --git a/arch/arm/src/stm32/stm32_dumpgpio.c b/arch/arm/src/stm32/stm32_dumpgpio.c index da1fbd00278..31f84a2e589 100644 --- a/arch/arm/src/stm32/stm32_dumpgpio.c +++ b/arch/arm/src/stm32/stm32_dumpgpio.c @@ -49,7 +49,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_rcc.h" diff --git a/arch/arm/src/stm32/stm32_eth.c b/arch/arm/src/stm32/stm32_eth.c index 2f0a336ee9e..d3fde3ebf5c 100644 --- a/arch/arm/src/stm32/stm32_eth.c +++ b/arch/arm/src/stm32/stm32_eth.c @@ -64,7 +64,7 @@ # include #endif -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32/stm32_exti_alarm.c b/arch/arm/src/stm32/stm32_exti_alarm.c index 9d5939d6e76..c228736ab03 100644 --- a/arch/arm/src/stm32/stm32_exti_alarm.c +++ b/arch/arm/src/stm32/stm32_exti_alarm.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_exti.h" diff --git a/arch/arm/src/stm32/stm32_exti_gpio.c b/arch/arm/src/stm32/stm32_exti_gpio.c index 663c0416b85..5d14abdf4b5 100644 --- a/arch/arm/src/stm32/stm32_exti_gpio.c +++ b/arch/arm/src/stm32/stm32_exti_gpio.c @@ -50,7 +50,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_exti.h" diff --git a/arch/arm/src/stm32/stm32_exti_pwr.c b/arch/arm/src/stm32/stm32_exti_pwr.c index ad71f4e3893..9d49473428f 100644 --- a/arch/arm/src/stm32/stm32_exti_pwr.c +++ b/arch/arm/src/stm32/stm32_exti_pwr.c @@ -49,7 +49,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_exti.h" diff --git a/arch/arm/src/stm32/stm32_exti_wakeup.c b/arch/arm/src/stm32/stm32_exti_wakeup.c index 1c71112bc67..9deef84e167 100644 --- a/arch/arm/src/stm32/stm32_exti_wakeup.c +++ b/arch/arm/src/stm32/stm32_exti_wakeup.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_exti.h" diff --git a/arch/arm/src/stm32/stm32_gpio.c b/arch/arm/src/stm32/stm32_gpio.c index 822f081ef44..449b6a14c45 100644 --- a/arch/arm/src/stm32/stm32_gpio.c +++ b/arch/arm/src/stm32/stm32_gpio.c @@ -49,7 +49,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_syscfg.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32/stm32_hciuart.c b/arch/arm/src/stm32/stm32_hciuart.c index 55f1946b71a..5ff068b6961 100644 --- a/arch/arm/src/stm32/stm32_hciuart.c +++ b/arch/arm/src/stm32/stm32_hciuart.c @@ -38,8 +38,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_uart.h" diff --git a/arch/arm/src/stm32/stm32_i2c.c b/arch/arm/src/stm32/stm32_i2c.c index a82f6eb5f89..467b9820f24 100644 --- a/arch/arm/src/stm32/stm32_i2c.c +++ b/arch/arm/src/stm32/stm32_i2c.c @@ -89,7 +89,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_i2c.h" diff --git a/arch/arm/src/stm32/stm32_i2c_alt.c b/arch/arm/src/stm32/stm32_i2c_alt.c index 239d79d0cea..e5792d79937 100644 --- a/arch/arm/src/stm32/stm32_i2c_alt.c +++ b/arch/arm/src/stm32/stm32_i2c_alt.c @@ -96,7 +96,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_i2c.h" diff --git a/arch/arm/src/stm32/stm32_i2c_v2.c b/arch/arm/src/stm32/stm32_i2c_v2.c index 77bec0402f0..77a2c47e9cb 100644 --- a/arch/arm/src/stm32/stm32_i2c_v2.c +++ b/arch/arm/src/stm32/stm32_i2c_v2.c @@ -234,7 +234,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_i2c.h" diff --git a/arch/arm/src/stm32/stm32_i2s.c b/arch/arm/src/stm32/stm32_i2s.c index ec0adc5f349..3de56192016 100644 --- a/arch/arm/src/stm32/stm32_i2s.c +++ b/arch/arm/src/stm32/stm32_i2s.c @@ -83,8 +83,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "stm32_dma.h" #include "stm32_spi.h" diff --git a/arch/arm/src/stm32/stm32_idle.c b/arch/arm/src/stm32/stm32_idle.c index 6ca9c56c211..0775ebfc80a 100644 --- a/arch/arm/src/stm32/stm32_idle.c +++ b/arch/arm/src/stm32/stm32_idle.c @@ -49,7 +49,7 @@ #include "chip.h" #include "stm32_pm.h" -#include "up_internal.h" +#include "arm_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/stm32/stm32_irq.c b/arch/arm/src/stm32/stm32_irq.c index c0d5d2e6b3f..b292713c50a 100644 --- a/arch/arm/src/stm32/stm32_irq.c +++ b/arch/arm/src/stm32/stm32_irq.c @@ -51,8 +51,8 @@ #ifdef CONFIG_ARCH_RAMVECTORS # include "ram_vectors.h" #endif -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" /**************************************************************************** diff --git a/arch/arm/src/stm32/stm32_iwdg.c b/arch/arm/src/stm32/stm32_iwdg.c index 795221f1e14..beb77dd588f 100644 --- a/arch/arm/src/stm32/stm32_iwdg.c +++ b/arch/arm/src/stm32/stm32_iwdg.c @@ -49,7 +49,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "hardware/stm32_dbgmcu.h" #include "stm32_wdg.h" diff --git a/arch/arm/src/stm32/stm32_lowputc.c b/arch/arm/src/stm32/stm32_lowputc.c index 61f3c92e34f..ee9668234db 100644 --- a/arch/arm/src/stm32/stm32_lowputc.c +++ b/arch/arm/src/stm32/stm32_lowputc.c @@ -43,8 +43,8 @@ #include -#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/stm32/stm32_lse.c b/arch/arm/src/stm32/stm32_lse.c index 64e697976ea..36df76cdb0c 100644 --- a/arch/arm/src/stm32/stm32_lse.c +++ b/arch/arm/src/stm32/stm32_lse.c @@ -39,7 +39,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwr.h" #include "stm32_rcc.h" diff --git a/arch/arm/src/stm32/stm32_lsi.c b/arch/arm/src/stm32/stm32_lsi.c index 1518cd14961..a6e7ddc3829 100644 --- a/arch/arm/src/stm32/stm32_lsi.c +++ b/arch/arm/src/stm32/stm32_lsi.c @@ -39,7 +39,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" diff --git a/arch/arm/src/stm32/stm32_ltdc.c b/arch/arm/src/stm32/stm32_ltdc.c index 3c405977a8f..7d7d5a6a4c7 100644 --- a/arch/arm/src/stm32/stm32_ltdc.c +++ b/arch/arm/src/stm32/stm32_ltdc.c @@ -55,8 +55,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "hardware/stm32_ltdc.h" #include "hardware/stm32_dma2d.h" diff --git a/arch/arm/src/stm32/stm32_otgfsdev.c b/arch/arm/src/stm32/stm32_otgfsdev.c index cb2a5573066..f1e04c81696 100644 --- a/arch/arm/src/stm32/stm32_otgfsdev.c +++ b/arch/arm/src/stm32/stm32_otgfsdev.c @@ -58,8 +58,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_otgfs.h" diff --git a/arch/arm/src/stm32/stm32_otgfshost.c b/arch/arm/src/stm32/stm32_otgfshost.c index 3b70866cc9b..181a3cc4d02 100644 --- a/arch/arm/src/stm32/stm32_otgfshost.c +++ b/arch/arm/src/stm32/stm32_otgfshost.c @@ -48,8 +48,8 @@ #include "chip.h" /* Includes default GPIO settings */ #include /* May redefine GPIO settings */ -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_gpio.h" #include "stm32_usbhost.h" diff --git a/arch/arm/src/stm32/stm32_otghsdev.c b/arch/arm/src/stm32/stm32_otghsdev.c index 913eb9e3bdd..7ef39610a39 100644 --- a/arch/arm/src/stm32/stm32_otghsdev.c +++ b/arch/arm/src/stm32/stm32_otghsdev.c @@ -57,8 +57,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_otghs.h" diff --git a/arch/arm/src/stm32/stm32_otghshost.c b/arch/arm/src/stm32/stm32_otghshost.c index e2134167af1..306ce6ea14e 100644 --- a/arch/arm/src/stm32/stm32_otghshost.c +++ b/arch/arm/src/stm32/stm32_otghshost.c @@ -48,8 +48,8 @@ #include "chip.h" /* Includes default GPIO settings */ #include /* May redefine GPIO settings */ -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_gpio.h" #include "stm32_usbhost.h" diff --git a/arch/arm/src/stm32/stm32_pm.h b/arch/arm/src/stm32/stm32_pm.h index 7292c04f441..e8d43aa1650 100644 --- a/arch/arm/src/stm32/stm32_pm.h +++ b/arch/arm/src/stm32/stm32_pm.h @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "arm_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/stm32/stm32_pminitialize.c b/arch/arm/src/stm32/stm32_pminitialize.c index adf30f3a472..153f8469d16 100644 --- a/arch/arm/src/stm32/stm32_pminitialize.c +++ b/arch/arm/src/stm32/stm32_pminitialize.c @@ -41,7 +41,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "stm32_pm.h" #ifdef CONFIG_PM diff --git a/arch/arm/src/stm32/stm32_pmsleep.c b/arch/arm/src/stm32/stm32_pmsleep.c index 05d767a0812..3ea454f0605 100644 --- a/arch/arm/src/stm32/stm32_pmsleep.c +++ b/arch/arm/src/stm32/stm32_pmsleep.c @@ -43,7 +43,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "stm32_pwr.h" #include "stm32_pm.h" diff --git a/arch/arm/src/stm32/stm32_pmstandby.c b/arch/arm/src/stm32/stm32_pmstandby.c index 952e14317fc..bce280e8ce6 100644 --- a/arch/arm/src/stm32/stm32_pmstandby.c +++ b/arch/arm/src/stm32/stm32_pmstandby.c @@ -41,7 +41,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "stm32_pwr.h" #include "stm32_pm.h" diff --git a/arch/arm/src/stm32/stm32_pmstop.c b/arch/arm/src/stm32/stm32_pmstop.c index d1c68712bd1..23597cb31a8 100644 --- a/arch/arm/src/stm32/stm32_pmstop.c +++ b/arch/arm/src/stm32/stm32_pmstop.c @@ -41,7 +41,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "stm32_pwr.h" #include "stm32_pm.h" diff --git a/arch/arm/src/stm32/stm32_pwm.c b/arch/arm/src/stm32/stm32_pwm.c index a36d5e914e9..3231dd6fa5c 100644 --- a/arch/arm/src/stm32/stm32_pwm.c +++ b/arch/arm/src/stm32/stm32_pwm.c @@ -51,8 +51,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_pwm.h" diff --git a/arch/arm/src/stm32/stm32_pwr.c b/arch/arm/src/stm32/stm32_pwr.c index 1b3ecec3ad1..5b707d6a9e6 100644 --- a/arch/arm/src/stm32/stm32_pwr.c +++ b/arch/arm/src/stm32/stm32_pwr.c @@ -49,7 +49,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwr.h" #if defined(CONFIG_STM32_PWR) diff --git a/arch/arm/src/stm32/stm32_qencoder.c b/arch/arm/src/stm32/stm32_qencoder.c index 46ba1c83c11..63a24ec4822 100644 --- a/arch/arm/src/stm32/stm32_qencoder.c +++ b/arch/arm/src/stm32/stm32_qencoder.c @@ -52,8 +52,8 @@ #include #include "chip.h" -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32/stm32_rcc.c b/arch/arm/src/stm32/stm32_rcc.c index f5e69be7d4d..d5a334b0ae2 100644 --- a/arch/arm/src/stm32/stm32_rcc.c +++ b/arch/arm/src/stm32/stm32_rcc.c @@ -47,8 +47,8 @@ #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32/stm32_rcc.h b/arch/arm/src/stm32/stm32_rcc.h index 3248d211fcf..c3fc7685dad 100644 --- a/arch/arm/src/stm32/stm32_rcc.h +++ b/arch/arm/src/stm32/stm32_rcc.h @@ -42,7 +42,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #if defined(CONFIG_STM32_STM32L15XX) diff --git a/arch/arm/src/stm32/stm32_rng.c b/arch/arm/src/stm32/stm32_rng.c index 77dc6e40683..a09f940ab46 100644 --- a/arch/arm/src/stm32/stm32_rng.c +++ b/arch/arm/src/stm32/stm32_rng.c @@ -50,9 +50,9 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/stm32_rng.h" -#include "up_internal.h" +#include "arm_internal.h" #if defined(CONFIG_STM32_RNG) #if defined(CONFIG_DEV_RANDOM) || defined(CONFIG_DEV_URANDOM_ARCH) diff --git a/arch/arm/src/stm32/stm32_rtc_lowerhalf.c b/arch/arm/src/stm32/stm32_rtc_lowerhalf.c index 27519560dca..868a08005d6 100644 --- a/arch/arm/src/stm32/stm32_rtc_lowerhalf.c +++ b/arch/arm/src/stm32/stm32_rtc_lowerhalf.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_rtc.h" diff --git a/arch/arm/src/stm32/stm32_rtcc.c b/arch/arm/src/stm32/stm32_rtcc.c index 595bfcf7fe1..94e7e16f889 100644 --- a/arch/arm/src/stm32/stm32_rtcc.c +++ b/arch/arm/src/stm32/stm32_rtcc.c @@ -50,7 +50,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_pwr.h" diff --git a/arch/arm/src/stm32/stm32_rtcounter.c b/arch/arm/src/stm32/stm32_rtcounter.c index 62d3899a2a3..f849da9ee46 100644 --- a/arch/arm/src/stm32/stm32_rtcounter.c +++ b/arch/arm/src/stm32/stm32_rtcounter.c @@ -70,7 +70,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwr.h" #include "stm32_rcc.h" diff --git a/arch/arm/src/stm32/stm32_sdadc.c b/arch/arm/src/stm32/stm32_sdadc.c index 2090a8971df..9e59e3fd46c 100644 --- a/arch/arm/src/stm32/stm32_sdadc.c +++ b/arch/arm/src/stm32/stm32_sdadc.c @@ -60,8 +60,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/arch/arm/src/stm32/stm32_sdio.c b/arch/arm/src/stm32/stm32_sdio.c index f25df1da6cd..3d2a8c67dcb 100644 --- a/arch/arm/src/stm32/stm32_sdio.c +++ b/arch/arm/src/stm32/stm32_sdio.c @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_dma.h" diff --git a/arch/arm/src/stm32/stm32_serial.c b/arch/arm/src/stm32/stm32_serial.c index 48c35a79fc9..62ada542359 100644 --- a/arch/arm/src/stm32/stm32_serial.c +++ b/arch/arm/src/stm32/stm32_serial.c @@ -64,8 +64,8 @@ #include "stm32_uart.h" #include "stm32_dma.h" #include "stm32_rcc.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/stm32/stm32_spi.c b/arch/arm/src/stm32/stm32_spi.c index e6d3f736c67..362ff8a196a 100644 --- a/arch/arm/src/stm32/stm32_spi.c +++ b/arch/arm/src/stm32/stm32_spi.c @@ -60,8 +60,8 @@ #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/arch/arm/src/stm32/stm32_start.c b/arch/arm/src/stm32/stm32_start.c index 05a23c7f280..71ac5205171 100644 --- a/arch/arm/src/stm32/stm32_start.c +++ b/arch/arm/src/stm32/stm32_start.c @@ -45,8 +45,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nvic.h" #include "stm32.h" diff --git a/arch/arm/src/stm32/stm32_tickless.c b/arch/arm/src/stm32/stm32_tickless.c index f3f9f5dcf80..f131a9db897 100644 --- a/arch/arm/src/stm32/stm32_tickless.c +++ b/arch/arm/src/stm32/stm32_tickless.c @@ -87,7 +87,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_tim.h" diff --git a/arch/arm/src/stm32/stm32_tim.c b/arch/arm/src/stm32/stm32_tim.c index 91944cbe377..52db0764b76 100644 --- a/arch/arm/src/stm32/stm32_tim.c +++ b/arch/arm/src/stm32/stm32_tim.c @@ -55,8 +55,8 @@ #include #include "chip.h" -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32/stm32_timerisr.c b/arch/arm/src/stm32/stm32_timerisr.c index 143d6b74291..f70202d17c1 100644 --- a/arch/arm/src/stm32/stm32_timerisr.c +++ b/arch/arm/src/stm32/stm32_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" #include "stm32.h" diff --git a/arch/arm/src/stm32/stm32_usbdev.c b/arch/arm/src/stm32/stm32_usbdev.c index 6e81c600c59..54a3d58798a 100644 --- a/arch/arm/src/stm32/stm32_usbdev.c +++ b/arch/arm/src/stm32/stm32_usbdev.c @@ -59,7 +59,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_syscfg.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32/stm32_wwdg.c b/arch/arm/src/stm32/stm32_wwdg.c index 72c281c805e..832f1dd8794 100644 --- a/arch/arm/src/stm32/stm32_wwdg.c +++ b/arch/arm/src/stm32/stm32_wwdg.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/stm32_dbgmcu.h" #include "stm32_wdg.h" diff --git a/arch/arm/src/stm32/stm32f10xxf30xx_flash.c b/arch/arm/src/stm32/stm32f10xxf30xx_flash.c index c2e86819941..ad49f266c77 100644 --- a/arch/arm/src/stm32/stm32f10xxf30xx_flash.c +++ b/arch/arm/src/stm32/stm32f10xxf30xx_flash.c @@ -57,7 +57,7 @@ #include "stm32_rcc.h" #include "stm32_waste.h" -#include "up_arch.h" +#include "arm_arch.h" /* Only for the STM32F[1|3]0xx family. */ diff --git a/arch/arm/src/stm32/stm32f20xxf40xx_flash.c b/arch/arm/src/stm32/stm32f20xxf40xx_flash.c index eafb023bb4b..01345170ac4 100644 --- a/arch/arm/src/stm32/stm32f20xxf40xx_flash.c +++ b/arch/arm/src/stm32/stm32f20xxf40xx_flash.c @@ -57,7 +57,7 @@ #include "stm32_rcc.h" #include "stm32_waste.h" -#include "up_arch.h" +#include "arm_arch.h" /* Only for the STM32F[2|4]0xx family. */ diff --git a/arch/arm/src/stm32/stm32f40xxx_i2c.c b/arch/arm/src/stm32/stm32f40xxx_i2c.c index 302124b621a..0697b06346b 100644 --- a/arch/arm/src/stm32/stm32f40xxx_i2c.c +++ b/arch/arm/src/stm32/stm32f40xxx_i2c.c @@ -88,7 +88,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_i2c.h" diff --git a/arch/arm/src/stm32/stm32f40xxx_rtcc.c b/arch/arm/src/stm32/stm32f40xxx_rtcc.c index 128d64ba1ea..43bd5277ca8 100644 --- a/arch/arm/src/stm32/stm32f40xxx_rtcc.c +++ b/arch/arm/src/stm32/stm32f40xxx_rtcc.c @@ -50,7 +50,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_pwr.h" diff --git a/arch/arm/src/stm32/stm32l15xx_flash.c b/arch/arm/src/stm32/stm32l15xx_flash.c index e62fea0730c..be00a2195bd 100644 --- a/arch/arm/src/stm32/stm32l15xx_flash.c +++ b/arch/arm/src/stm32/stm32l15xx_flash.c @@ -60,7 +60,7 @@ #include "stm32_rcc.h" #include "stm32_waste.h" -#include "up_arch.h" +#include "arm_arch.h" /* Only for the STM32L15xx family. */ diff --git a/arch/arm/src/stm32/stm32l15xxx_rtcc.c b/arch/arm/src/stm32/stm32l15xxx_rtcc.c index 60e9a0c1b97..1c50d074626 100644 --- a/arch/arm/src/stm32/stm32l15xxx_rtcc.c +++ b/arch/arm/src/stm32/stm32l15xxx_rtcc.c @@ -52,7 +52,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_pwr.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32.h b/arch/arm/src/stm32f0l0g0/stm32.h index 13a0a2d666f..e176d82b32e 100644 --- a/arch/arm/src/stm32f0l0g0/stm32.h +++ b/arch/arm/src/stm32f0l0g0/stm32.h @@ -45,7 +45,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/stm32f0l0g0/stm32_adc.c b/arch/arm/src/stm32f0l0g0/stm32_adc.c index 5cbc8bc4bee..cc310e55f65 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_adc.c +++ b/arch/arm/src/stm32f0l0g0/stm32_adc.c @@ -57,8 +57,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_aes.c b/arch/arm/src/stm32f0l0g0/stm32_aes.c index 73bffb7d24a..95e689291a3 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_aes.c +++ b/arch/arm/src/stm32f0l0g0/stm32_aes.c @@ -52,8 +52,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_rcc.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c b/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c index e48fc2b342c..4e7f81e5bd0 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c +++ b/arch/arm/src/stm32f0l0g0/stm32_dma_v1.c @@ -51,8 +51,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sched/sched.h" #include "chip.h" #include "stm32_dma.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_exti_gpio.c b/arch/arm/src/stm32f0l0g0/stm32_exti_gpio.c index e841faef4c2..e091a693adf 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_exti_gpio.c +++ b/arch/arm/src/stm32f0l0g0/stm32_exti_gpio.c @@ -50,7 +50,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_exti.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_gpio.c b/arch/arm/src/stm32f0l0g0/stm32_gpio.c index 725ba4c5452..afaad839252 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_gpio.c +++ b/arch/arm/src/stm32f0l0g0/stm32_gpio.c @@ -49,7 +49,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_hsi48.c b/arch/arm/src/stm32f0l0g0/stm32_hsi48.c index 6f1fc8929d5..c61ec74dd71 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_hsi48.c +++ b/arch/arm/src/stm32f0l0g0/stm32_hsi48.c @@ -39,7 +39,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "hardware/stm32_rcc.h" #include "hardware/stm32_crs.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_i2c.c b/arch/arm/src/stm32f0l0g0/stm32_i2c.c index 31e9ae51de6..185fb313df9 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_i2c.c +++ b/arch/arm/src/stm32f0l0g0/stm32_i2c.c @@ -237,7 +237,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_i2c.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_idle.c b/arch/arm/src/stm32f0l0g0/stm32_idle.c index c56ad593ad5..d4fb4724de2 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_idle.c +++ b/arch/arm/src/stm32f0l0g0/stm32_idle.c @@ -43,7 +43,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/stm32f0l0g0/stm32_irq.c b/arch/arm/src/stm32f0l0g0/stm32_irq.c index 652ee1102d5..54ee970f48e 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_irq.c +++ b/arch/arm/src/stm32f0l0g0/stm32_irq.c @@ -48,8 +48,8 @@ #include #include "nvic.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" //#include "stm32_irq.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_lowputc_v1.c b/arch/arm/src/stm32f0l0g0/stm32_lowputc_v1.c index 9b789f7e4c1..f3f64270c48 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_lowputc_v1.c +++ b/arch/arm/src/stm32f0l0g0/stm32_lowputc_v1.c @@ -44,8 +44,8 @@ #include -#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/stm32f0l0g0/stm32_lowputc_v2.c b/arch/arm/src/stm32f0l0g0/stm32_lowputc_v2.c index 34bf2248d95..cb47203fa44 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_lowputc_v2.c +++ b/arch/arm/src/stm32f0l0g0/stm32_lowputc_v2.c @@ -41,8 +41,8 @@ #include -#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/stm32f0l0g0/stm32_lse.c b/arch/arm/src/stm32f0l0g0/stm32_lse.c index 7116af278b2..155068fc1f9 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_lse.c +++ b/arch/arm/src/stm32f0l0g0/stm32_lse.c @@ -39,7 +39,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwr.h" #include "stm32_rcc.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_pwm.c b/arch/arm/src/stm32f0l0g0/stm32_pwm.c index 7a60502f594..63b1cd11095 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_pwm.c +++ b/arch/arm/src/stm32f0l0g0/stm32_pwm.c @@ -54,8 +54,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_rcc.c b/arch/arm/src/stm32f0l0g0/stm32_rcc.c index 02c64f58fc0..eabd8197250 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_rcc.c +++ b/arch/arm/src/stm32f0l0g0/stm32_rcc.c @@ -46,8 +46,8 @@ #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "hardware/stm32_flash.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_rcc.h b/arch/arm/src/stm32f0l0g0/stm32_rcc.h index e9919e2efc5..f53d3e7cc07 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_rcc.h +++ b/arch/arm/src/stm32f0l0g0/stm32_rcc.h @@ -43,7 +43,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "hardware/stm32_rcc.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_rng.c b/arch/arm/src/stm32f0l0g0/stm32_rng.c index 7e9ac761184..7c4d5065f45 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_rng.c +++ b/arch/arm/src/stm32f0l0g0/stm32_rng.c @@ -50,9 +50,9 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/stm32_rng.h" -#include "up_internal.h" +#include "arm_internal.h" #if defined(CONFIG_STM32F0L0G0_RNG) #if defined(CONFIG_DEV_RANDOM) || defined(CONFIG_DEV_URANDOM_ARCH) diff --git a/arch/arm/src/stm32f0l0g0/stm32_serial_v1.c b/arch/arm/src/stm32f0l0g0/stm32_serial_v1.c index d59d4f49495..296fd1a76fb 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_serial_v1.c +++ b/arch/arm/src/stm32f0l0g0/stm32_serial_v1.c @@ -58,8 +58,8 @@ # include #endif -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_uart.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_serial_v2.c b/arch/arm/src/stm32f0l0g0/stm32_serial_v2.c index db90e59592a..21ca09a8351 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_serial_v2.c +++ b/arch/arm/src/stm32f0l0g0/stm32_serial_v2.c @@ -58,8 +58,8 @@ # include #endif -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_spi.c b/arch/arm/src/stm32f0l0g0/stm32_spi.c index d7a11d46b70..478c44d1e28 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_spi.c +++ b/arch/arm/src/stm32f0l0g0/stm32_spi.c @@ -68,8 +68,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_start.c b/arch/arm/src/stm32f0l0g0/stm32_start.c index 457defaa5a0..30c35e877ae 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_start.c +++ b/arch/arm/src/stm32f0l0g0/stm32_start.c @@ -47,8 +47,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_rcc.h" #include "stm32_lowputc.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_tim.c b/arch/arm/src/stm32f0l0g0/stm32_tim.c index ed0821cbfc8..e070eeeaf52 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_tim.c +++ b/arch/arm/src/stm32f0l0g0/stm32_tim.c @@ -50,8 +50,8 @@ #include #include "chip.h" -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32_timerisr.c b/arch/arm/src/stm32f0l0g0/stm32_timerisr.c index d630fb1a9bb..c3e8997fbd3 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_timerisr.c +++ b/arch/arm/src/stm32f0l0g0/stm32_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/stm32f0l0g0/stm32_usbdev.c b/arch/arm/src/stm32f0l0g0/stm32_usbdev.c index 5b92e4e84fb..ba97c510df5 100644 --- a/arch/arm/src/stm32f0l0g0/stm32_usbdev.c +++ b/arch/arm/src/stm32f0l0g0/stm32_usbdev.c @@ -59,8 +59,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/stm32_rcc.h" #include "hardware/stm32_usbdev.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32f0_rcc.c b/arch/arm/src/stm32f0l0g0/stm32f0_rcc.c index 21dba67ee36..b1aeea3d34d 100644 --- a/arch/arm/src/stm32f0l0g0/stm32f0_rcc.c +++ b/arch/arm/src/stm32f0l0g0/stm32f0_rcc.c @@ -46,8 +46,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_rcc.h" #include "hardware/stm32_syscfg.h" #include "hardware/stm32_flash.h" diff --git a/arch/arm/src/stm32f0l0g0/stm32f0l0_pwr.c b/arch/arm/src/stm32f0l0g0/stm32f0l0_pwr.c index 9d39a606680..884aaec0246 100644 --- a/arch/arm/src/stm32f0l0g0/stm32f0l0_pwr.c +++ b/arch/arm/src/stm32f0l0g0/stm32f0l0_pwr.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwr.h" #if defined(CONFIG_STM32F0L0G0_PWR) diff --git a/arch/arm/src/stm32f0l0g0/stm32g0_pwr.c b/arch/arm/src/stm32f0l0g0/stm32g0_pwr.c index cb1e61a4f74..7b0a4098d4e 100644 --- a/arch/arm/src/stm32f0l0g0/stm32g0_pwr.c +++ b/arch/arm/src/stm32f0l0g0/stm32g0_pwr.c @@ -49,7 +49,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwr.h" #if defined(CONFIG_STM32F0L0G0_PWR) diff --git a/arch/arm/src/stm32f7/stm32_adc.c b/arch/arm/src/stm32f7/stm32_adc.c index 45c366e6f25..2b5eb3c4ecc 100644 --- a/arch/arm/src/stm32f7/stm32_adc.c +++ b/arch/arm/src/stm32f7/stm32_adc.c @@ -65,8 +65,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_rcc.h" diff --git a/arch/arm/src/stm32f7/stm32_allocateheap.c b/arch/arm/src/stm32f7/stm32_allocateheap.c index 913946183d6..7ea8b4c735c 100644 --- a/arch/arm/src/stm32f7/stm32_allocateheap.c +++ b/arch/arm/src/stm32f7/stm32_allocateheap.c @@ -54,8 +54,8 @@ #include #include "mpu.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/stm32_memorymap.h" #include "stm32_mpuinit.h" diff --git a/arch/arm/src/stm32f7/stm32_can.c b/arch/arm/src/stm32f7/stm32_can.c index edc67f824fc..d68c4ab9343 100644 --- a/arch/arm/src/stm32f7/stm32_can.c +++ b/arch/arm/src/stm32f7/stm32_can.c @@ -54,8 +54,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_can.h" diff --git a/arch/arm/src/stm32f7/stm32_capture.c b/arch/arm/src/stm32f7/stm32_capture.c index 3f8cead6077..37942e4e50d 100644 --- a/arch/arm/src/stm32f7/stm32_capture.c +++ b/arch/arm/src/stm32f7/stm32_capture.c @@ -50,8 +50,8 @@ #include #include "chip.h" -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "stm32_gpio.h" #include "stm32_capture.h" diff --git a/arch/arm/src/stm32f7/stm32_dma.c b/arch/arm/src/stm32f7/stm32_dma.c index 63b1994a37c..4e5a6e82332 100644 --- a/arch/arm/src/stm32f7/stm32_dma.c +++ b/arch/arm/src/stm32f7/stm32_dma.c @@ -50,9 +50,9 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" -#include "up_internal.h" +#include "arm_internal.h" #include "sched/sched.h" #include "stm32_dma.h" diff --git a/arch/arm/src/stm32f7/stm32_dma2d.c b/arch/arm/src/stm32f7/stm32_dma2d.c index fc05cbca8ad..65546bb3f28 100644 --- a/arch/arm/src/stm32f7/stm32_dma2d.c +++ b/arch/arm/src/stm32f7/stm32_dma2d.c @@ -54,8 +54,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/stm32_ltdc.h" #include "hardware/stm32_dma2d.h" #include "hardware/stm32_dtcm.h" diff --git a/arch/arm/src/stm32f7/stm32_dumpgpio.c b/arch/arm/src/stm32f7/stm32_dumpgpio.c index 12f716316bb..bb9c66fc6c0 100644 --- a/arch/arm/src/stm32f7/stm32_dumpgpio.c +++ b/arch/arm/src/stm32f7/stm32_dumpgpio.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32f7/stm32_ethernet.c b/arch/arm/src/stm32f7/stm32_ethernet.c index d19e7deefee..a4ee7b013d5 100644 --- a/arch/arm/src/stm32f7/stm32_ethernet.c +++ b/arch/arm/src/stm32f7/stm32_ethernet.c @@ -63,7 +63,7 @@ # include #endif -#include "up_internal.h" +#include "arm_internal.h" #include "barriers.h" #include "hardware/stm32_syscfg.h" diff --git a/arch/arm/src/stm32f7/stm32_exti_alarm.c b/arch/arm/src/stm32f7/stm32_exti_alarm.c index d832a63a472..c957a01e684 100644 --- a/arch/arm/src/stm32f7/stm32_exti_alarm.c +++ b/arch/arm/src/stm32f7/stm32_exti_alarm.c @@ -53,7 +53,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_gpio.h" #include "stm32_exti.h" diff --git a/arch/arm/src/stm32f7/stm32_exti_gpio.c b/arch/arm/src/stm32f7/stm32_exti_gpio.c index e5c67e6f7d1..83eb7d846ff 100644 --- a/arch/arm/src/stm32f7/stm32_exti_gpio.c +++ b/arch/arm/src/stm32f7/stm32_exti_gpio.c @@ -57,7 +57,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_exti.h" diff --git a/arch/arm/src/stm32f7/stm32_exti_pwr.c b/arch/arm/src/stm32f7/stm32_exti_pwr.c index aad2bcfda16..95545a12f5e 100644 --- a/arch/arm/src/stm32f7/stm32_exti_pwr.c +++ b/arch/arm/src/stm32f7/stm32_exti_pwr.c @@ -54,7 +54,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_exti.h" diff --git a/arch/arm/src/stm32f7/stm32_exti_wakeup.c b/arch/arm/src/stm32f7/stm32_exti_wakeup.c index b02f2b2bf72..0f12fb54ba2 100644 --- a/arch/arm/src/stm32f7/stm32_exti_wakeup.c +++ b/arch/arm/src/stm32f7/stm32_exti_wakeup.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_exti.h" diff --git a/arch/arm/src/stm32f7/stm32_flash.c b/arch/arm/src/stm32f7/stm32_flash.c index 2b8fdbc8c02..9bf93707b9e 100644 --- a/arch/arm/src/stm32f7/stm32_flash.c +++ b/arch/arm/src/stm32f7/stm32_flash.c @@ -61,7 +61,7 @@ #include "barriers.h" #include "hardware/stm32_flash.h" -#include "up_arch.h" +#include "arm_arch.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/stm32f7/stm32_gpio.c b/arch/arm/src/stm32f7/stm32_gpio.c index 306d8cc8072..9d61e0a1ce4 100644 --- a/arch/arm/src/stm32f7/stm32_gpio.c +++ b/arch/arm/src/stm32f7/stm32_gpio.c @@ -49,7 +49,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/stm32_syscfg.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32f7/stm32_i2c.c b/arch/arm/src/stm32f7/stm32_i2c.c index c7316be28b0..63d1a483732 100644 --- a/arch/arm/src/stm32f7/stm32_i2c.c +++ b/arch/arm/src/stm32f7/stm32_i2c.c @@ -248,7 +248,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_i2c.h" diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c index dde890fdf10..4df25de4208 100644 --- a/arch/arm/src/stm32f7/stm32_irq.c +++ b/arch/arm/src/stm32f7/stm32_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_STM32F7_GPIO_IRQ # include "stm32_gpio.h" diff --git a/arch/arm/src/stm32f7/stm32_lowputc.c b/arch/arm/src/stm32f7/stm32_lowputc.c index ad6b62e7538..b2131a87358 100644 --- a/arch/arm/src/stm32f7/stm32_lowputc.c +++ b/arch/arm/src/stm32f7/stm32_lowputc.c @@ -41,8 +41,8 @@ #include -#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/stm32f7/stm32_lse.c b/arch/arm/src/stm32f7/stm32_lse.c index 8496b467519..ee5cb9519cd 100644 --- a/arch/arm/src/stm32f7/stm32_lse.c +++ b/arch/arm/src/stm32f7/stm32_lse.c @@ -40,7 +40,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_pwr.h" diff --git a/arch/arm/src/stm32f7/stm32_lsi.c b/arch/arm/src/stm32f7/stm32_lsi.c index 636662721b5..0ab9dfbe7d9 100644 --- a/arch/arm/src/stm32f7/stm32_lsi.c +++ b/arch/arm/src/stm32f7/stm32_lsi.c @@ -40,7 +40,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" diff --git a/arch/arm/src/stm32f7/stm32_ltdc.c b/arch/arm/src/stm32f7/stm32_ltdc.c index 1782edff284..73dd43aab41 100644 --- a/arch/arm/src/stm32f7/stm32_ltdc.c +++ b/arch/arm/src/stm32f7/stm32_ltdc.c @@ -55,8 +55,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/stm32_ltdc.h" #include "hardware/stm32_dma2d.h" #include "stm32_rcc.h" diff --git a/arch/arm/src/stm32f7/stm32_otgdev.c b/arch/arm/src/stm32f7/stm32_otgdev.c index b123773f666..b43656f0916 100644 --- a/arch/arm/src/stm32f7/stm32_otgdev.c +++ b/arch/arm/src/stm32f7/stm32_otgdev.c @@ -60,8 +60,8 @@ #include "chip.h" #include "stm32_gpio.h" #include "stm32_otg.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #if defined(CONFIG_USBDEV) && (defined(CONFIG_STM32F7_OTGFS) || \ defined(CONFIG_STM32F7_OTGFSHS)) diff --git a/arch/arm/src/stm32f7/stm32_otghost.c b/arch/arm/src/stm32f7/stm32_otghost.c index 0450d8caf3d..7b30e6c6a45 100644 --- a/arch/arm/src/stm32f7/stm32_otghost.c +++ b/arch/arm/src/stm32f7/stm32_otghost.c @@ -64,8 +64,8 @@ #include "chip.h" /* Includes default GPIO settings */ #include /* May redefine GPIO settings */ -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_otg.h" #include "stm32_usbhost.h" diff --git a/arch/arm/src/stm32f7/stm32_pm.h b/arch/arm/src/stm32f7/stm32_pm.h index 60d29721882..6fccc7199f3 100644 --- a/arch/arm/src/stm32f7/stm32_pm.h +++ b/arch/arm/src/stm32f7/stm32_pm.h @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "arm_internal.h" /**************************************************************************** * Public Function Prototypes diff --git a/arch/arm/src/stm32f7/stm32_pminitialize.c b/arch/arm/src/stm32f7/stm32_pminitialize.c index d7955200d9f..fc5d984354b 100644 --- a/arch/arm/src/stm32f7/stm32_pminitialize.c +++ b/arch/arm/src/stm32f7/stm32_pminitialize.c @@ -41,7 +41,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "stm32_pm.h" #ifdef CONFIG_PM diff --git a/arch/arm/src/stm32f7/stm32_pmsleep.c b/arch/arm/src/stm32f7/stm32_pmsleep.c index 64bd4d6a8e4..286fd0d7757 100644 --- a/arch/arm/src/stm32f7/stm32_pmsleep.c +++ b/arch/arm/src/stm32f7/stm32_pmsleep.c @@ -42,7 +42,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "stm32_pwr.h" #include "stm32_pm.h" diff --git a/arch/arm/src/stm32f7/stm32_pmstandby.c b/arch/arm/src/stm32f7/stm32_pmstandby.c index aa1125ddb5d..dc87ca9f87c 100644 --- a/arch/arm/src/stm32f7/stm32_pmstandby.c +++ b/arch/arm/src/stm32f7/stm32_pmstandby.c @@ -41,7 +41,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "stm32_rcc.h" #include "stm32_pwr.h" diff --git a/arch/arm/src/stm32f7/stm32_pmstop.c b/arch/arm/src/stm32f7/stm32_pmstop.c index c6ec37ce915..f8267f0b29b 100644 --- a/arch/arm/src/stm32f7/stm32_pmstop.c +++ b/arch/arm/src/stm32f7/stm32_pmstop.c @@ -41,7 +41,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "stm32_pwr.h" #include "stm32_pm.h" diff --git a/arch/arm/src/stm32f7/stm32_pwm.c b/arch/arm/src/stm32f7/stm32_pwm.c index aae9bb44aaa..ae274aa8733 100644 --- a/arch/arm/src/stm32f7/stm32_pwm.c +++ b/arch/arm/src/stm32f7/stm32_pwm.c @@ -51,8 +51,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_pwm.h" diff --git a/arch/arm/src/stm32f7/stm32_pwr.c b/arch/arm/src/stm32f7/stm32_pwr.c index 2b42172decc..12de8bb8add 100644 --- a/arch/arm/src/stm32f7/stm32_pwr.c +++ b/arch/arm/src/stm32f7/stm32_pwr.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwr.h" #if defined(CONFIG_STM32F7_PWR) diff --git a/arch/arm/src/stm32f7/stm32_qencoder.c b/arch/arm/src/stm32f7/stm32_qencoder.c index 29f40803313..c1bcfd8f020 100644 --- a/arch/arm/src/stm32f7/stm32_qencoder.c +++ b/arch/arm/src/stm32f7/stm32_qencoder.c @@ -52,8 +52,8 @@ #include #include "chip.h" -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "stm32_gpio.h" #include "stm32_tim.h" diff --git a/arch/arm/src/stm32f7/stm32_qspi.c b/arch/arm/src/stm32f7/stm32_qspi.c index 2994c3d7b9c..dfaeea93247 100644 --- a/arch/arm/src/stm32f7/stm32_qspi.c +++ b/arch/arm/src/stm32f7/stm32_qspi.c @@ -60,8 +60,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "barriers.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32f7/stm32_rcc.c b/arch/arm/src/stm32f7/stm32_rcc.c index 809e2d16c78..77ce227548a 100644 --- a/arch/arm/src/stm32f7/stm32_rcc.c +++ b/arch/arm/src/stm32f7/stm32_rcc.c @@ -47,8 +47,8 @@ #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "hardware/stm32_flash.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32f7/stm32_rcc.h b/arch/arm/src/stm32f7/stm32_rcc.h index b1c704afa3e..7aff6e03430 100644 --- a/arch/arm/src/stm32f7/stm32_rcc.h +++ b/arch/arm/src/stm32f7/stm32_rcc.h @@ -42,7 +42,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/stm32_rcc.h" diff --git a/arch/arm/src/stm32f7/stm32_rng.c b/arch/arm/src/stm32f7/stm32_rng.c index 9a59736882f..31ccec23268 100644 --- a/arch/arm/src/stm32f7/stm32_rng.c +++ b/arch/arm/src/stm32f7/stm32_rng.c @@ -51,9 +51,9 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/stm32_rng.h" -#include "up_internal.h" +#include "arm_internal.h" #if defined(CONFIG_STM32F7_RNG) #if defined(CONFIG_DEV_RANDOM) || defined(CONFIG_DEV_URANDOM_ARCH) diff --git a/arch/arm/src/stm32f7/stm32_rtc.c b/arch/arm/src/stm32f7/stm32_rtc.c index efd615aa95a..953dd0bd61e 100644 --- a/arch/arm/src/stm32f7/stm32_rtc.c +++ b/arch/arm/src/stm32f7/stm32_rtc.c @@ -49,7 +49,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_pwr.h" diff --git a/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c b/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c index 36d210ad194..5a2962cc1ae 100644 --- a/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c +++ b/arch/arm/src/stm32f7/stm32_rtc_lowerhalf.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_rtc.h" diff --git a/arch/arm/src/stm32f7/stm32_sai.c b/arch/arm/src/stm32f7/stm32_sai.c index eec9f25d7a8..acfeb215174 100644 --- a/arch/arm/src/stm32f7/stm32_sai.c +++ b/arch/arm/src/stm32f7/stm32_sai.c @@ -58,7 +58,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_dma.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32f7/stm32_sdmmc.c b/arch/arm/src/stm32f7/stm32_sdmmc.c index 42afca7c2d8..324fa8c4d5e 100644 --- a/arch/arm/src/stm32f7/stm32_sdmmc.c +++ b/arch/arm/src/stm32f7/stm32_sdmmc.c @@ -60,7 +60,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_dtcm.h" #include "stm32_dma.h" diff --git a/arch/arm/src/stm32f7/stm32_serial.c b/arch/arm/src/stm32f7/stm32_serial.c index 3c7505fc7fb..fe046ab0c14 100644 --- a/arch/arm/src/stm32f7/stm32_serial.c +++ b/arch/arm/src/stm32f7/stm32_serial.c @@ -58,8 +58,8 @@ # include #endif -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32f7/stm32_spi.c b/arch/arm/src/stm32f7/stm32_spi.c index ebd6da70a28..11c85bccb33 100644 --- a/arch/arm/src/stm32f7/stm32_spi.c +++ b/arch/arm/src/stm32f7/stm32_spi.c @@ -63,8 +63,8 @@ #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32f7/stm32_start.c b/arch/arm/src/stm32f7/stm32_start.c index 75e2e6b215d..bed9ffd6f7b 100644 --- a/arch/arm/src/stm32f7/stm32_start.c +++ b/arch/arm/src/stm32f7/stm32_start.c @@ -47,8 +47,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nvic.h" #include "barriers.h" diff --git a/arch/arm/src/stm32f7/stm32_start.h b/arch/arm/src/stm32f7/stm32_start.h index fb401968387..df85f59840c 100644 --- a/arch/arm/src/stm32f7/stm32_start.h +++ b/arch/arm/src/stm32f7/stm32_start.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" /************************************************************************************ diff --git a/arch/arm/src/stm32f7/stm32_tickless.c b/arch/arm/src/stm32f7/stm32_tickless.c index 6e9e6eefd7a..977410abb8c 100644 --- a/arch/arm/src/stm32f7/stm32_tickless.c +++ b/arch/arm/src/stm32f7/stm32_tickless.c @@ -88,7 +88,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_tim.h" #include "stm32_dbgmcu.h" diff --git a/arch/arm/src/stm32f7/stm32_tim.c b/arch/arm/src/stm32f7/stm32_tim.c index 9ef7323046d..2a140041aff 100644 --- a/arch/arm/src/stm32f7/stm32_tim.c +++ b/arch/arm/src/stm32f7/stm32_tim.c @@ -56,8 +56,8 @@ #include #include "chip.h" -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "stm32_gpio.h" #include "stm32_tim.h" diff --git a/arch/arm/src/stm32f7/stm32_timerisr.c b/arch/arm/src/stm32f7/stm32_timerisr.c index c3401514eca..1808f974e2d 100644 --- a/arch/arm/src/stm32f7/stm32_timerisr.c +++ b/arch/arm/src/stm32f7/stm32_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/stm32f7/stm32_userspace.h b/arch/arm/src/stm32f7/stm32_userspace.h index c331a408ed5..90ec1e018da 100644 --- a/arch/arm/src/stm32f7/stm32_userspace.h +++ b/arch/arm/src/stm32f7/stm32_userspace.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" /************************************************************************************ diff --git a/arch/arm/src/stm32h7/stm32.h b/arch/arm/src/stm32h7/stm32.h index e17ad45770c..74a34096f28 100644 --- a/arch/arm/src/stm32h7/stm32.h +++ b/arch/arm/src/stm32h7/stm32.h @@ -45,7 +45,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/stm32h7/stm32_allocateheap.c b/arch/arm/src/stm32h7/stm32_allocateheap.c index cc56ae8a5ec..855b30e9b30 100644 --- a/arch/arm/src/stm32h7/stm32_allocateheap.c +++ b/arch/arm/src/stm32h7/stm32_allocateheap.c @@ -54,8 +54,8 @@ #include #include "mpu.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/stm32_memorymap.h" #include "stm32_mpuinit.h" diff --git a/arch/arm/src/stm32h7/stm32_dma.c b/arch/arm/src/stm32h7/stm32_dma.c index 9cdb554d308..227c959f9d9 100644 --- a/arch/arm/src/stm32h7/stm32_dma.c +++ b/arch/arm/src/stm32h7/stm32_dma.c @@ -48,9 +48,9 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" -#include "up_internal.h" +#include "arm_internal.h" #include "sched/sched.h" #include "stm32_dma.h" #include "hardware/stm32_bdma.h" diff --git a/arch/arm/src/stm32h7/stm32_ethernet.c b/arch/arm/src/stm32h7/stm32_ethernet.c index 55152ef804c..8353de1d2db 100644 --- a/arch/arm/src/stm32h7/stm32_ethernet.c +++ b/arch/arm/src/stm32h7/stm32_ethernet.c @@ -47,7 +47,7 @@ #endif #include -#include "up_internal.h" +#include "arm_internal.h" #include "barriers.h" #include "hardware/stm32_syscfg.h" diff --git a/arch/arm/src/stm32h7/stm32_exti_alarm.c b/arch/arm/src/stm32h7/stm32_exti_alarm.c index 2d79eb37155..32ce108d918 100644 --- a/arch/arm/src/stm32h7/stm32_exti_alarm.c +++ b/arch/arm/src/stm32h7/stm32_exti_alarm.c @@ -54,7 +54,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_gpio.h" #include "stm32_exti.h" diff --git a/arch/arm/src/stm32h7/stm32_exti_gpio.c b/arch/arm/src/stm32h7/stm32_exti_gpio.c index 6811d33b49d..35ba2425986 100644 --- a/arch/arm/src/stm32h7/stm32_exti_gpio.c +++ b/arch/arm/src/stm32h7/stm32_exti_gpio.c @@ -57,7 +57,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_exti.h" diff --git a/arch/arm/src/stm32h7/stm32_exti_wakeup.c b/arch/arm/src/stm32h7/stm32_exti_wakeup.c index 50f11aeb041..12e15108278 100644 --- a/arch/arm/src/stm32h7/stm32_exti_wakeup.c +++ b/arch/arm/src/stm32h7/stm32_exti_wakeup.c @@ -49,7 +49,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_exti.h" diff --git a/arch/arm/src/stm32h7/stm32_flash.c b/arch/arm/src/stm32h7/stm32_flash.c index ad600ac9e0c..85f44988e5e 100644 --- a/arch/arm/src/stm32h7/stm32_flash.c +++ b/arch/arm/src/stm32h7/stm32_flash.c @@ -67,7 +67,7 @@ #include "barriers.h" #include "hardware/stm32_flash.h" -#include "up_arch.h" +#include "arm_arch.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/stm32h7/stm32_gpio.c b/arch/arm/src/stm32h7/stm32_gpio.c index 0db84636be9..3e49cc97cdc 100644 --- a/arch/arm/src/stm32h7/stm32_gpio.c +++ b/arch/arm/src/stm32h7/stm32_gpio.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/stm32_syscfg.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32h7/stm32_i2c.c b/arch/arm/src/stm32h7/stm32_i2c.c index 5fc7155a899..28f51796d7e 100644 --- a/arch/arm/src/stm32h7/stm32_i2c.c +++ b/arch/arm/src/stm32h7/stm32_i2c.c @@ -218,7 +218,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_i2c.h" diff --git a/arch/arm/src/stm32h7/stm32_irq.c b/arch/arm/src/stm32h7/stm32_irq.c index dce7911154c..ed7e7692c4b 100644 --- a/arch/arm/src/stm32h7/stm32_irq.c +++ b/arch/arm/src/stm32h7/stm32_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_STM32H7_GPIO_IRQ # include "stm32_gpio.h" diff --git a/arch/arm/src/stm32h7/stm32_iwdg.c b/arch/arm/src/stm32h7/stm32_iwdg.c index 12d95d46c79..db91c0ec76b 100644 --- a/arch/arm/src/stm32h7/stm32_iwdg.c +++ b/arch/arm/src/stm32h7/stm32_iwdg.c @@ -49,7 +49,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_wdg.h" diff --git a/arch/arm/src/stm32h7/stm32_lowputc.c b/arch/arm/src/stm32h7/stm32_lowputc.c index fe7041f2229..60b3aade4d5 100644 --- a/arch/arm/src/stm32h7/stm32_lowputc.c +++ b/arch/arm/src/stm32h7/stm32_lowputc.c @@ -41,8 +41,8 @@ #include -#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/stm32h7/stm32_lse.c b/arch/arm/src/stm32h7/stm32_lse.c index 0fd15c94436..6952d3597c7 100644 --- a/arch/arm/src/stm32h7/stm32_lse.c +++ b/arch/arm/src/stm32h7/stm32_lse.c @@ -40,7 +40,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_pwr.h" diff --git a/arch/arm/src/stm32h7/stm32_lsi.c b/arch/arm/src/stm32h7/stm32_lsi.c index 28a3068a0f2..d7801e413b6 100644 --- a/arch/arm/src/stm32h7/stm32_lsi.c +++ b/arch/arm/src/stm32h7/stm32_lsi.c @@ -40,7 +40,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" diff --git a/arch/arm/src/stm32h7/stm32_otgdev.c b/arch/arm/src/stm32h7/stm32_otgdev.c index 912be55e190..b9a5141f663 100644 --- a/arch/arm/src/stm32h7/stm32_otgdev.c +++ b/arch/arm/src/stm32h7/stm32_otgdev.c @@ -63,8 +63,8 @@ #include "stm32_rcc.h" #include "stm32_gpio.h" #include "stm32_otg.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #if defined(CONFIG_USBDEV) && (defined(CONFIG_STM32H7_OTGFS) || \ defined(CONFIG_STM32H7_OTGHS)) diff --git a/arch/arm/src/stm32h7/stm32_otghost.c b/arch/arm/src/stm32h7/stm32_otghost.c index 5d990c3b47a..49b7de27eec 100644 --- a/arch/arm/src/stm32h7/stm32_otghost.c +++ b/arch/arm/src/stm32h7/stm32_otghost.c @@ -65,8 +65,8 @@ #include "chip.h" /* Includes default GPIO settings */ #include /* May redefine GPIO settings */ -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/stm32_pwr.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32h7/stm32_pm.h b/arch/arm/src/stm32h7/stm32_pm.h index bcbc899649d..2571b34e817 100644 --- a/arch/arm/src/stm32h7/stm32_pm.h +++ b/arch/arm/src/stm32h7/stm32_pm.h @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "arm_internal.h" /**************************************************************************** * Public Function Prototypes diff --git a/arch/arm/src/stm32h7/stm32_pminitialize.c b/arch/arm/src/stm32h7/stm32_pminitialize.c index 14914b41394..4bd6ff815b7 100644 --- a/arch/arm/src/stm32h7/stm32_pminitialize.c +++ b/arch/arm/src/stm32h7/stm32_pminitialize.c @@ -41,7 +41,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "stm32_pm.h" #ifdef CONFIG_PM diff --git a/arch/arm/src/stm32h7/stm32_pmsleep.c b/arch/arm/src/stm32h7/stm32_pmsleep.c index d77da012e64..fbe07ff798b 100644 --- a/arch/arm/src/stm32h7/stm32_pmsleep.c +++ b/arch/arm/src/stm32h7/stm32_pmsleep.c @@ -42,7 +42,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "stm32_pwr.h" #include "stm32_pm.h" diff --git a/arch/arm/src/stm32h7/stm32_pmstandby.c b/arch/arm/src/stm32h7/stm32_pmstandby.c index bddcfc1e649..350efeed004 100644 --- a/arch/arm/src/stm32h7/stm32_pmstandby.c +++ b/arch/arm/src/stm32h7/stm32_pmstandby.c @@ -41,7 +41,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "stm32_rcc.h" #include "stm32_pwr.h" diff --git a/arch/arm/src/stm32h7/stm32_pmstop.c b/arch/arm/src/stm32h7/stm32_pmstop.c index 5c6f0054ff0..e26aae9bf3d 100644 --- a/arch/arm/src/stm32h7/stm32_pmstop.c +++ b/arch/arm/src/stm32h7/stm32_pmstop.c @@ -41,7 +41,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "stm32_pwr.h" #include "stm32_pm.h" diff --git a/arch/arm/src/stm32h7/stm32_pwm.c b/arch/arm/src/stm32h7/stm32_pwm.c index c1ff19a16a6..55796652425 100644 --- a/arch/arm/src/stm32h7/stm32_pwm.c +++ b/arch/arm/src/stm32h7/stm32_pwm.c @@ -51,8 +51,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_pwm.h" diff --git a/arch/arm/src/stm32h7/stm32_pwr.c b/arch/arm/src/stm32h7/stm32_pwr.c index e087b4f29bf..ca497b2b160 100644 --- a/arch/arm/src/stm32h7/stm32_pwr.c +++ b/arch/arm/src/stm32h7/stm32_pwr.c @@ -48,7 +48,7 @@ #include #include "barriers.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwr.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32h7/stm32_qencoder.c b/arch/arm/src/stm32h7/stm32_qencoder.c index 63bb43f3a16..0c10d1dd0ef 100644 --- a/arch/arm/src/stm32h7/stm32_qencoder.c +++ b/arch/arm/src/stm32h7/stm32_qencoder.c @@ -51,8 +51,8 @@ #include #include "chip.h" -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "stm32_gpio.h" #include "stm32_tim.h" diff --git a/arch/arm/src/stm32h7/stm32_qspi.c b/arch/arm/src/stm32h7/stm32_qspi.c index da6cd649b68..33398955b3d 100644 --- a/arch/arm/src/stm32h7/stm32_qspi.c +++ b/arch/arm/src/stm32h7/stm32_qspi.c @@ -60,8 +60,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "barriers.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32h7/stm32_rcc.c b/arch/arm/src/stm32h7/stm32_rcc.c index 0751c11da9b..5f0f41e7d7d 100644 --- a/arch/arm/src/stm32h7/stm32_rcc.c +++ b/arch/arm/src/stm32h7/stm32_rcc.c @@ -47,8 +47,8 @@ #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "hardware/stm32_flash.h" #include "stm32_rcc.h" diff --git a/arch/arm/src/stm32h7/stm32_rcc.h b/arch/arm/src/stm32h7/stm32_rcc.h index 498bea3a551..d2f04eee9b4 100644 --- a/arch/arm/src/stm32h7/stm32_rcc.h +++ b/arch/arm/src/stm32h7/stm32_rcc.h @@ -27,7 +27,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/stm32_rcc.h" diff --git a/arch/arm/src/stm32h7/stm32_rtc.c b/arch/arm/src/stm32h7/stm32_rtc.c index 3f34a066af0..dbe661c2f19 100644 --- a/arch/arm/src/stm32h7/stm32_rtc.c +++ b/arch/arm/src/stm32h7/stm32_rtc.c @@ -49,7 +49,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_pwr.h" diff --git a/arch/arm/src/stm32h7/stm32_rtc_lowerhalf.c b/arch/arm/src/stm32h7/stm32_rtc_lowerhalf.c index 2b5a2b5f0d4..2328f94da41 100644 --- a/arch/arm/src/stm32h7/stm32_rtc_lowerhalf.c +++ b/arch/arm/src/stm32h7/stm32_rtc_lowerhalf.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_rtc.h" diff --git a/arch/arm/src/stm32h7/stm32_sdmmc.c b/arch/arm/src/stm32h7/stm32_sdmmc.c index 65a24f7fca0..26f16d7925f 100644 --- a/arch/arm/src/stm32h7/stm32_sdmmc.c +++ b/arch/arm/src/stm32h7/stm32_sdmmc.c @@ -62,7 +62,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_dtcm.h" #include "stm32_dma.h" diff --git a/arch/arm/src/stm32h7/stm32_serial.c b/arch/arm/src/stm32h7/stm32_serial.c index ecc3f320de9..a78b658de5e 100644 --- a/arch/arm/src/stm32h7/stm32_serial.c +++ b/arch/arm/src/stm32h7/stm32_serial.c @@ -58,8 +58,8 @@ # include #endif -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32h7/stm32_spi.c b/arch/arm/src/stm32h7/stm32_spi.c index 33875323ccc..49eb890c84a 100644 --- a/arch/arm/src/stm32h7/stm32_spi.c +++ b/arch/arm/src/stm32h7/stm32_spi.c @@ -63,8 +63,8 @@ #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_rcc.h" diff --git a/arch/arm/src/stm32h7/stm32_start.c b/arch/arm/src/stm32h7/stm32_start.c index ea8bb77db97..1a8304257c5 100644 --- a/arch/arm/src/stm32h7/stm32_start.c +++ b/arch/arm/src/stm32h7/stm32_start.c @@ -47,8 +47,8 @@ #include #include -#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/stm32h7/stm32_start.h b/arch/arm/src/stm32h7/stm32_start.h index 27ef242b516..afae133d550 100644 --- a/arch/arm/src/stm32h7/stm32_start.h +++ b/arch/arm/src/stm32h7/stm32_start.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" /************************************************************************************ diff --git a/arch/arm/src/stm32h7/stm32_tim.c b/arch/arm/src/stm32h7/stm32_tim.c index 464d1f6c43c..d59001f8544 100644 --- a/arch/arm/src/stm32h7/stm32_tim.c +++ b/arch/arm/src/stm32h7/stm32_tim.c @@ -57,8 +57,8 @@ #include #include "chip.h" -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "stm32_rcc.h" #include "stm32_gpio.h" diff --git a/arch/arm/src/stm32h7/stm32_timerisr.c b/arch/arm/src/stm32h7/stm32_timerisr.c index 6c6c0199384..99c142fc4a9 100644 --- a/arch/arm/src/stm32h7/stm32_timerisr.c +++ b/arch/arm/src/stm32h7/stm32_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/stm32h7/stm32_userspace.h b/arch/arm/src/stm32h7/stm32_userspace.h index 2e8091f5024..d809d0924a2 100644 --- a/arch/arm/src/stm32h7/stm32_userspace.h +++ b/arch/arm/src/stm32h7/stm32_userspace.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" /************************************************************************************ diff --git a/arch/arm/src/stm32h7/stm32_wwdg.c b/arch/arm/src/stm32h7/stm32_wwdg.c index 23a91018c19..21ba6ecdfa4 100644 --- a/arch/arm/src/stm32h7/stm32_wwdg.c +++ b/arch/arm/src/stm32h7/stm32_wwdg.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_wdg.h" #if defined(CONFIG_WATCHDOG) && defined(CONFIG_STM32H7_WWDG) diff --git a/arch/arm/src/stm32l4/stm32l4.h b/arch/arm/src/stm32l4/stm32l4.h index 66d27ba7b25..20bd9b89891 100644 --- a/arch/arm/src/stm32l4/stm32l4.h +++ b/arch/arm/src/stm32l4/stm32l4.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" /************************************************************************************ * Pre-processor Definitions diff --git a/arch/arm/src/stm32l4/stm32l4_1wire.c b/arch/arm/src/stm32l4/stm32l4_1wire.c index 4a477988743..76a733a6e4b 100644 --- a/arch/arm/src/stm32l4/stm32l4_1wire.c +++ b/arch/arm/src/stm32l4/stm32l4_1wire.c @@ -62,7 +62,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4_rcc.h" #include "stm32l4_gpio.h" diff --git a/arch/arm/src/stm32l4/stm32l4_allocateheap.c b/arch/arm/src/stm32l4/stm32l4_allocateheap.c index ee64cebd221..e18c60507b3 100644 --- a/arch/arm/src/stm32l4/stm32l4_allocateheap.c +++ b/arch/arm/src/stm32l4/stm32l4_allocateheap.c @@ -53,8 +53,8 @@ #include "chip.h" #include "mpu.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32l4_mpuinit.h" /**************************************************************************** diff --git a/arch/arm/src/stm32l4/stm32l4_can.c b/arch/arm/src/stm32l4/stm32l4_can.c index c40d8c0487c..81cc833ab78 100644 --- a/arch/arm/src/stm32l4/stm32l4_can.c +++ b/arch/arm/src/stm32l4/stm32l4_can.c @@ -58,8 +58,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32l4.h" diff --git a/arch/arm/src/stm32l4/stm32l4_comp.c b/arch/arm/src/stm32l4/stm32l4_comp.c index d1c876ae4a9..34741bd2537 100644 --- a/arch/arm/src/stm32l4/stm32l4_comp.c +++ b/arch/arm/src/stm32l4/stm32l4_comp.c @@ -50,7 +50,7 @@ #include "stm32l4_comp.h" #include "stm32l4_exti.h" #include "stm32l4_gpio.h" -#include "up_arch.h" +#include "arm_arch.h" #include diff --git a/arch/arm/src/stm32l4/stm32l4_dac.c b/arch/arm/src/stm32l4/stm32l4_dac.c index bd0fa5b8237..3741bde9a71 100644 --- a/arch/arm/src/stm32l4/stm32l4_dac.c +++ b/arch/arm/src/stm32l4/stm32l4_dac.c @@ -51,8 +51,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32l4.h" diff --git a/arch/arm/src/stm32l4/stm32l4_dumpgpio.c b/arch/arm/src/stm32l4/stm32l4_dumpgpio.c index ce6f5052eec..dd424468507 100644 --- a/arch/arm/src/stm32l4/stm32l4_dumpgpio.c +++ b/arch/arm/src/stm32l4/stm32l4_dumpgpio.c @@ -49,7 +49,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32l4_gpio.h" #include "stm32l4_rcc.h" diff --git a/arch/arm/src/stm32l4/stm32l4_exti_alarm.c b/arch/arm/src/stm32l4/stm32l4_exti_alarm.c index 8a2eaae1ad8..c4a4295b50b 100644 --- a/arch/arm/src/stm32l4/stm32l4_exti_alarm.c +++ b/arch/arm/src/stm32l4/stm32l4_exti_alarm.c @@ -49,7 +49,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32l4_gpio.h" #include "stm32l4_exti.h" diff --git a/arch/arm/src/stm32l4/stm32l4_exti_comp.c b/arch/arm/src/stm32l4/stm32l4_exti_comp.c index 7e047073323..a09f4e3b640 100644 --- a/arch/arm/src/stm32l4/stm32l4_exti_comp.c +++ b/arch/arm/src/stm32l4/stm32l4_exti_comp.c @@ -42,7 +42,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4_comp.h" #include "stm32l4_exti.h" #include "hardware/stm32l4_exti.h" diff --git a/arch/arm/src/stm32l4/stm32l4_exti_gpio.c b/arch/arm/src/stm32l4/stm32l4_exti_gpio.c index da7eb4e19aa..e750a427781 100644 --- a/arch/arm/src/stm32l4/stm32l4_exti_gpio.c +++ b/arch/arm/src/stm32l4/stm32l4_exti_gpio.c @@ -50,7 +50,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32l4_gpio.h" #include "stm32l4_exti.h" diff --git a/arch/arm/src/stm32l4/stm32l4_exti_pwr.c b/arch/arm/src/stm32l4/stm32l4_exti_pwr.c index 0add57a2369..6ab4537a937 100644 --- a/arch/arm/src/stm32l4/stm32l4_exti_pwr.c +++ b/arch/arm/src/stm32l4/stm32l4_exti_pwr.c @@ -49,7 +49,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32l4_gpio.h" #include "stm32l4_exti.h" diff --git a/arch/arm/src/stm32l4/stm32l4_exti_wakeup.c b/arch/arm/src/stm32l4/stm32l4_exti_wakeup.c index aa44a9322a1..43ed0adc7b0 100644 --- a/arch/arm/src/stm32l4/stm32l4_exti_wakeup.c +++ b/arch/arm/src/stm32l4/stm32l4_exti_wakeup.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32l4_gpio.h" #include "stm32l4_exti.h" diff --git a/arch/arm/src/stm32l4/stm32l4_firewall.c b/arch/arm/src/stm32l4/stm32l4_firewall.c index 392d6f13540..a48378b6801 100644 --- a/arch/arm/src/stm32l4/stm32l4_firewall.c +++ b/arch/arm/src/stm32l4/stm32l4_firewall.c @@ -43,7 +43,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/stm32l4_syscfg.h" #include "stm32l4_firewall.h" diff --git a/arch/arm/src/stm32l4/stm32l4_flash.c b/arch/arm/src/stm32l4/stm32l4_flash.c index 805fbc7d457..db30dd39124 100644 --- a/arch/arm/src/stm32l4/stm32l4_flash.c +++ b/arch/arm/src/stm32l4/stm32l4_flash.c @@ -61,7 +61,7 @@ #include "stm32l4_waste.h" #include "stm32l4_flash.h" -#include "up_arch.h" +#include "arm_arch.h" #if !(defined(CONFIG_STM32L4_STM32L4X3) || defined(CONFIG_STM32L4_STM32L4X5) || \ defined(CONFIG_STM32L4_STM32L4X6) || defined(CONFIG_STM32L4_STM32L4XR)) diff --git a/arch/arm/src/stm32l4/stm32l4_gpio.c b/arch/arm/src/stm32l4/stm32l4_gpio.c index 61145f33774..d6b654e605e 100644 --- a/arch/arm/src/stm32l4/stm32l4_gpio.c +++ b/arch/arm/src/stm32l4/stm32l4_gpio.c @@ -50,7 +50,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32l4_gpio.h" diff --git a/arch/arm/src/stm32l4/stm32l4_hsi48.c b/arch/arm/src/stm32l4/stm32l4_hsi48.c index 11234c1fd47..9a17e0d88a5 100644 --- a/arch/arm/src/stm32l4/stm32l4_hsi48.c +++ b/arch/arm/src/stm32l4/stm32l4_hsi48.c @@ -39,7 +39,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32l4_rcc.h" #include "hardware/stm32l4_crs.h" diff --git a/arch/arm/src/stm32l4/stm32l4_i2c.c b/arch/arm/src/stm32l4/stm32l4_i2c.c index c0d215964ec..37973bc4291 100644 --- a/arch/arm/src/stm32l4/stm32l4_i2c.c +++ b/arch/arm/src/stm32l4/stm32l4_i2c.c @@ -274,7 +274,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4_gpio.h" #include "stm32l4_rcc.h" diff --git a/arch/arm/src/stm32l4/stm32l4_idle.c b/arch/arm/src/stm32l4/stm32l4_idle.c index 8f55d5f84e9..ffb568ba786 100644 --- a/arch/arm/src/stm32l4/stm32l4_idle.c +++ b/arch/arm/src/stm32l4/stm32l4_idle.c @@ -49,7 +49,7 @@ #include "chip.h" #include "stm32l4_pm.h" #include "stm32l4_rcc.h" -#include "up_internal.h" +#include "arm_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/stm32l4/stm32l4_irq.c b/arch/arm/src/stm32l4/stm32l4_irq.c index 2aea791da7a..36fd53d3b00 100644 --- a/arch/arm/src/stm32l4/stm32l4_irq.c +++ b/arch/arm/src/stm32l4/stm32l4_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 "stm32l4.h" /**************************************************************************** diff --git a/arch/arm/src/stm32l4/stm32l4_iwdg.c b/arch/arm/src/stm32l4/stm32l4_iwdg.c index 9eace2016ae..0f4f449803d 100644 --- a/arch/arm/src/stm32l4/stm32l4_iwdg.c +++ b/arch/arm/src/stm32l4/stm32l4_iwdg.c @@ -50,7 +50,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4_rcc.h" #include "stm32l4_dbgmcu.h" #include "stm32l4_wdg.h" diff --git a/arch/arm/src/stm32l4/stm32l4_lowputc.c b/arch/arm/src/stm32l4/stm32l4_lowputc.c index 14003eec421..b905b477e92 100644 --- a/arch/arm/src/stm32l4/stm32l4_lowputc.c +++ b/arch/arm/src/stm32l4/stm32l4_lowputc.c @@ -43,8 +43,8 @@ #include -#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/stm32l4/stm32l4_lse.c b/arch/arm/src/stm32l4/stm32l4_lse.c index 983bfe5c551..ef68a56f971 100644 --- a/arch/arm/src/stm32l4/stm32l4_lse.c +++ b/arch/arm/src/stm32l4/stm32l4_lse.c @@ -39,7 +39,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4_pwr.h" #include "stm32l4_rcc.h" diff --git a/arch/arm/src/stm32l4/stm32l4_lsi.c b/arch/arm/src/stm32l4/stm32l4_lsi.c index cc0a8d64bf1..aa9905b17c0 100644 --- a/arch/arm/src/stm32l4/stm32l4_lsi.c +++ b/arch/arm/src/stm32l4/stm32l4_lsi.c @@ -39,7 +39,7 @@ ****************************************************************************/ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4_rcc.h" /**************************************************************************** diff --git a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c index 8a2d5fd2728..15200eb3961 100644 --- a/arch/arm/src/stm32l4/stm32l4_otgfsdev.c +++ b/arch/arm/src/stm32l4/stm32l4_otgfsdev.c @@ -58,8 +58,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32l4_otgfs.h" #include "stm32l4_pwr.h" diff --git a/arch/arm/src/stm32l4/stm32l4_otgfshost.c b/arch/arm/src/stm32l4/stm32l4_otgfshost.c index 56457bcc0d3..1e2a342ad86 100644 --- a/arch/arm/src/stm32l4/stm32l4_otgfshost.c +++ b/arch/arm/src/stm32l4/stm32l4_otgfshost.c @@ -64,8 +64,8 @@ #include "chip.h" /* Includes default GPIO settings */ #include /* May redefine GPIO settings */ -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32l4_usbhost.h" diff --git a/arch/arm/src/stm32l4/stm32l4_pm.h b/arch/arm/src/stm32l4/stm32l4_pm.h index b12f523a889..ecbf1ee3a49 100644 --- a/arch/arm/src/stm32l4/stm32l4_pm.h +++ b/arch/arm/src/stm32l4/stm32l4_pm.h @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "up_internal.h" +#include "arm_internal.h" /**************************************************************************** * Public Function Prototypes diff --git a/arch/arm/src/stm32l4/stm32l4_pminitialize.c b/arch/arm/src/stm32l4/stm32l4_pminitialize.c index f2f9a31f8f7..3695b735df5 100644 --- a/arch/arm/src/stm32l4/stm32l4_pminitialize.c +++ b/arch/arm/src/stm32l4/stm32l4_pminitialize.c @@ -41,7 +41,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "stm32l4_pm.h" #ifdef CONFIG_PM diff --git a/arch/arm/src/stm32l4/stm32l4_pmlpr.c b/arch/arm/src/stm32l4/stm32l4_pmlpr.c index faebe8215dd..aba9cfdb933 100644 --- a/arch/arm/src/stm32l4/stm32l4_pmlpr.c +++ b/arch/arm/src/stm32l4/stm32l4_pmlpr.c @@ -42,7 +42,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "stm32l4_pwr.h" #include "stm32l4_pm.h" diff --git a/arch/arm/src/stm32l4/stm32l4_pmsleep.c b/arch/arm/src/stm32l4/stm32l4_pmsleep.c index 15dd2d9db44..b91b56aab70 100644 --- a/arch/arm/src/stm32l4/stm32l4_pmsleep.c +++ b/arch/arm/src/stm32l4/stm32l4_pmsleep.c @@ -42,7 +42,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "stm32l4_pwr.h" #include "stm32l4_pm.h" diff --git a/arch/arm/src/stm32l4/stm32l4_pmstandby.c b/arch/arm/src/stm32l4/stm32l4_pmstandby.c index 331d8446f32..b348f155423 100644 --- a/arch/arm/src/stm32l4/stm32l4_pmstandby.c +++ b/arch/arm/src/stm32l4/stm32l4_pmstandby.c @@ -42,7 +42,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "stm32l4_pwr.h" #include "stm32l4_pm.h" diff --git a/arch/arm/src/stm32l4/stm32l4_pmstop.c b/arch/arm/src/stm32l4/stm32l4_pmstop.c index 3a3446847ef..88ec465cc37 100644 --- a/arch/arm/src/stm32l4/stm32l4_pmstop.c +++ b/arch/arm/src/stm32l4/stm32l4_pmstop.c @@ -42,7 +42,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "stm32l4_pwr.h" #include "stm32l4_pm.h" diff --git a/arch/arm/src/stm32l4/stm32l4_pwm.c b/arch/arm/src/stm32l4/stm32l4_pwm.c index 2c39b7db970..e3c78b8c164 100644 --- a/arch/arm/src/stm32l4/stm32l4_pwm.c +++ b/arch/arm/src/stm32l4/stm32l4_pwm.c @@ -51,8 +51,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32l4_pwm.h" diff --git a/arch/arm/src/stm32l4/stm32l4_pwr.c b/arch/arm/src/stm32l4/stm32l4_pwr.c index 45338780fdd..46ff34ece47 100644 --- a/arch/arm/src/stm32l4/stm32l4_pwr.c +++ b/arch/arm/src/stm32l4/stm32l4_pwr.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4_pwr.h" #include "stm32l4_rcc.h" diff --git a/arch/arm/src/stm32l4/stm32l4_qencoder.c b/arch/arm/src/stm32l4/stm32l4_qencoder.c index a03bc28f519..01c56547855 100644 --- a/arch/arm/src/stm32l4/stm32l4_qencoder.c +++ b/arch/arm/src/stm32l4/stm32l4_qencoder.c @@ -52,8 +52,8 @@ #include #include "chip.h" -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "stm32l4.h" #include "stm32l4_gpio.h" diff --git a/arch/arm/src/stm32l4/stm32l4_qspi.c b/arch/arm/src/stm32l4/stm32l4_qspi.c index 168c97c1bb6..48a1b3dab27 100644 --- a/arch/arm/src/stm32l4/stm32l4_qspi.c +++ b/arch/arm/src/stm32l4/stm32l4_qspi.c @@ -57,8 +57,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "barriers.h" #include "stm32l4_gpio.h" diff --git a/arch/arm/src/stm32l4/stm32l4_rcc.c b/arch/arm/src/stm32l4/stm32l4_rcc.c index 7086e79722e..4ae36724e41 100644 --- a/arch/arm/src/stm32l4/stm32l4_rcc.c +++ b/arch/arm/src/stm32l4/stm32l4_rcc.c @@ -48,8 +48,8 @@ #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32l4_rcc.h" diff --git a/arch/arm/src/stm32l4/stm32l4_rcc.h b/arch/arm/src/stm32l4/stm32l4_rcc.h index 2ae25eea28c..e2e2280613a 100644 --- a/arch/arm/src/stm32l4/stm32l4_rcc.h +++ b/arch/arm/src/stm32l4/stm32l4_rcc.h @@ -42,7 +42,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #if defined(CONFIG_STM32L4_STM32L4X3) diff --git a/arch/arm/src/stm32l4/stm32l4_rng.c b/arch/arm/src/stm32l4/stm32l4_rng.c index ea06855386e..f20395cc647 100644 --- a/arch/arm/src/stm32l4/stm32l4_rng.c +++ b/arch/arm/src/stm32l4/stm32l4_rng.c @@ -51,9 +51,9 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/stm32l4_rng.h" -#include "up_internal.h" +#include "arm_internal.h" #if defined(CONFIG_STM32L4_RNG) #if defined(CONFIG_DEV_RANDOM) || defined(CONFIG_DEV_URANDOM_ARCH) diff --git a/arch/arm/src/stm32l4/stm32l4_rtc.c b/arch/arm/src/stm32l4/stm32l4_rtc.c index f99783dbca2..28c16f30757 100644 --- a/arch/arm/src/stm32l4/stm32l4_rtc.c +++ b/arch/arm/src/stm32l4/stm32l4_rtc.c @@ -53,7 +53,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4_rcc.h" #include "stm32l4_pwr.h" diff --git a/arch/arm/src/stm32l4/stm32l4_sdmmc.c b/arch/arm/src/stm32l4/stm32l4_sdmmc.c index ada401e9f4d..d4ca23ccef1 100644 --- a/arch/arm/src/stm32l4/stm32l4_sdmmc.c +++ b/arch/arm/src/stm32l4/stm32l4_sdmmc.c @@ -60,7 +60,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4_dma.h" #include "stm32l4_gpio.h" diff --git a/arch/arm/src/stm32l4/stm32l4_serial.c b/arch/arm/src/stm32l4/stm32l4_serial.c index e6fefdd10e6..7b13c3b06e6 100644 --- a/arch/arm/src/stm32l4/stm32l4_serial.c +++ b/arch/arm/src/stm32l4/stm32l4_serial.c @@ -65,8 +65,8 @@ #include "stm32l4_uart.h" #include "stm32l4_dma.h" #include "stm32l4_rcc.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/stm32l4/stm32l4_spi.c b/arch/arm/src/stm32l4/stm32l4_spi.c index 2ba05f45081..afa1078c373 100644 --- a/arch/arm/src/stm32l4/stm32l4_spi.c +++ b/arch/arm/src/stm32l4/stm32l4_spi.c @@ -67,8 +67,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "stm32l4.h" diff --git a/arch/arm/src/stm32l4/stm32l4_start.c b/arch/arm/src/stm32l4/stm32l4_start.c index 05badb5a7ef..192f137f514 100644 --- a/arch/arm/src/stm32l4/stm32l4_start.c +++ b/arch/arm/src/stm32l4/stm32l4_start.c @@ -46,8 +46,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nvic.h" #include "stm32l4.h" diff --git a/arch/arm/src/stm32l4/stm32l4_tim.c b/arch/arm/src/stm32l4/stm32l4_tim.c index 8b2315cd661..bd570c19f1f 100644 --- a/arch/arm/src/stm32l4/stm32l4_tim.c +++ b/arch/arm/src/stm32l4/stm32l4_tim.c @@ -56,8 +56,8 @@ #include #include "chip.h" -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "stm32l4.h" #include "stm32l4_gpio.h" diff --git a/arch/arm/src/stm32l4/stm32l4_timerisr.c b/arch/arm/src/stm32l4/stm32l4_timerisr.c index 1115a4fb72c..f497147773d 100644 --- a/arch/arm/src/stm32l4/stm32l4_timerisr.c +++ b/arch/arm/src/stm32l4/stm32l4_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" #include "stm32l4.h" diff --git a/arch/arm/src/stm32l4/stm32l4_usbdev.c b/arch/arm/src/stm32l4/stm32l4_usbdev.c index 9d42ef087a7..20445b335a4 100644 --- a/arch/arm/src/stm32l4/stm32l4_usbdev.c +++ b/arch/arm/src/stm32l4/stm32l4_usbdev.c @@ -55,7 +55,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4.h" #include "stm32l4_gpio.h" #include "stm32l4_usbdev.h" diff --git a/arch/arm/src/stm32l4/stm32l4x6xx_dma.c b/arch/arm/src/stm32l4/stm32l4x6xx_dma.c index bdcd197aa96..97d5275dc25 100644 --- a/arch/arm/src/stm32l4/stm32l4x6xx_dma.c +++ b/arch/arm/src/stm32l4/stm32l4x6xx_dma.c @@ -51,8 +51,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sched/sched.h" #include "chip.h" #include "stm32l4_dma.h" diff --git a/arch/arm/src/stm32l4/stm32l4xrxx_dma.c b/arch/arm/src/stm32l4/stm32l4xrxx_dma.c index c943ba12ce7..f1ab6e8e94f 100644 --- a/arch/arm/src/stm32l4/stm32l4xrxx_dma.c +++ b/arch/arm/src/stm32l4/stm32l4xrxx_dma.c @@ -56,9 +56,9 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" -#include "up_internal.h" +#include "arm_internal.h" #include "sched/sched.h" #include "stm32l4_dma.h" diff --git a/arch/arm/src/str71x/str71x_decodeirq.c b/arch/arm/src/str71x/str71x_decodeirq.c index 402539e33c3..be4834214b5 100644 --- a/arch/arm/src/str71x/str71x_decodeirq.c +++ b/arch/arm/src/str71x/str71x_decodeirq.c @@ -49,8 +49,8 @@ #include #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/str71x/str71x_head.S b/arch/arm/src/str71x/str71x_head.S index 45f8cf34ab6..11c9adcf0bc 100644 --- a/arch/arm/src/str71x/str71x_head.S +++ b/arch/arm/src/str71x/str71x_head.S @@ -42,8 +42,8 @@ #include "arm.h" /* ARM-specific settings */ #include "chip.h" /* Chip-specific settings */ -#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/str71x/str71x_irq.c b/arch/arm/src/str71x/str71x_irq.c index 5edad6a9078..69d1b3e9a97 100644 --- a/arch/arm/src/str71x/str71x_irq.c +++ b/arch/arm/src/str71x/str71x_irq.c @@ -48,8 +48,8 @@ #include "arm.h" #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "str71x.h" /**************************************************************************** diff --git a/arch/arm/src/str71x/str71x_lowputc.c b/arch/arm/src/str71x/str71x_lowputc.c index b45c38808bb..57041e45166 100644 --- a/arch/arm/src/str71x/str71x_lowputc.c +++ b/arch/arm/src/str71x/str71x_lowputc.c @@ -41,8 +41,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "str71x.h" diff --git a/arch/arm/src/str71x/str71x_prccu.c b/arch/arm/src/str71x/str71x_prccu.c index d8840ac9b00..afe1c5494f7 100644 --- a/arch/arm/src/str71x/str71x_prccu.c +++ b/arch/arm/src/str71x/str71x_prccu.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "str71x.h" /******************************************************************************** diff --git a/arch/arm/src/str71x/str71x_serial.c b/arch/arm/src/str71x/str71x_serial.c index 035b7158ecb..cb4721d8695 100644 --- a/arch/arm/src/str71x/str71x_serial.c +++ b/arch/arm/src/str71x/str71x_serial.c @@ -52,8 +52,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "str71x.h" diff --git a/arch/arm/src/str71x/str71x_timerisr.c b/arch/arm/src/str71x/str71x_timerisr.c index f27200169a3..303f0978be2 100644 --- a/arch/arm/src/str71x/str71x_timerisr.c +++ b/arch/arm/src/str71x/str71x_timerisr.c @@ -48,9 +48,9 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "clock/clock.h" -#include "up_internal.h" +#include "arm_internal.h" #include "str71x.h" diff --git a/arch/arm/src/str71x/str71x_xti.c b/arch/arm/src/str71x/str71x_xti.c index b0edd339431..a3f396a4e44 100644 --- a/arch/arm/src/str71x/str71x_xti.c +++ b/arch/arm/src/str71x/str71x_xti.c @@ -49,8 +49,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "str71x.h" #ifdef CONFIG_STR71X_XTI diff --git a/arch/arm/src/tiva/cc13xx/cc13x0_rom.c b/arch/arm/src/tiva/cc13xx/cc13x0_rom.c index 1319084a268..f0d0ae034e4 100644 --- a/arch/arm/src/tiva/cc13xx/cc13x0_rom.c +++ b/arch/arm/src/tiva/cc13xx/cc13x0_rom.c @@ -44,7 +44,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/tiva_adi2_refsys.h" #include "hardware/tiva_adi3_refsys.h" diff --git a/arch/arm/src/tiva/cc13xx/cc13x2_aux_sysif.c b/arch/arm/src/tiva/cc13xx/cc13x2_aux_sysif.c index 7636aec5e7d..24384b7eac3 100644 --- a/arch/arm/src/tiva/cc13xx/cc13x2_aux_sysif.c +++ b/arch/arm/src/tiva/cc13xx/cc13x2_aux_sysif.c @@ -45,7 +45,7 @@ *****************************************************************************/ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/tiva_aux_sysif.h" #include "cc13xx/cc13x2_aux_sysif.h" diff --git a/arch/arm/src/tiva/cc13xx/cc13x2_cc26x2_v1_rom.c b/arch/arm/src/tiva/cc13xx/cc13x2_cc26x2_v1_rom.c index 0bd3228ead2..44ecd884dd7 100644 --- a/arch/arm/src/tiva/cc13xx/cc13x2_cc26x2_v1_rom.c +++ b/arch/arm/src/tiva/cc13xx/cc13x2_cc26x2_v1_rom.c @@ -45,7 +45,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/tiva_adi2_refsys.h" #include "hardware/tiva_adi3_refsys.h" diff --git a/arch/arm/src/tiva/cc13xx/cc13xx_gpio.c b/arch/arm/src/tiva/cc13xx/cc13xx_gpio.c index 00579e285ca..0e3e1d836d7 100644 --- a/arch/arm/src/tiva/cc13xx/cc13xx_gpio.c +++ b/arch/arm/src/tiva/cc13xx/cc13xx_gpio.c @@ -47,7 +47,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "tiva_gpio.h" /**************************************************************************** diff --git a/arch/arm/src/tiva/cc13xx/cc13xx_gpioirq.c b/arch/arm/src/tiva/cc13xx/cc13xx_gpioirq.c index 2a23b44d8b2..a9d5238d168 100644 --- a/arch/arm/src/tiva/cc13xx/cc13xx_gpioirq.c +++ b/arch/arm/src/tiva/cc13xx/cc13xx_gpioirq.c @@ -50,8 +50,8 @@ #include "chip.h" -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "irq/irq.h" #include "tiva_gpio.h" diff --git a/arch/arm/src/tiva/cc13xx/cc13xx_prcm.c b/arch/arm/src/tiva/cc13xx/cc13xx_prcm.c index 1ab65507209..224074c8d84 100644 --- a/arch/arm/src/tiva/cc13xx/cc13xx_prcm.c +++ b/arch/arm/src/tiva/cc13xx/cc13xx_prcm.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/tiva_prcm.h" #include "cc13xx/cc13xx_prcm.h" diff --git a/arch/arm/src/tiva/cc13xx/cc13xx_prcm.h b/arch/arm/src/tiva/cc13xx/cc13xx_prcm.h index 707d3b1d94c..1c0a25823a5 100644 --- a/arch/arm/src/tiva/cc13xx/cc13xx_prcm.h +++ b/arch/arm/src/tiva/cc13xx/cc13xx_prcm.h @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/tiva_prcm.h" /**************************************************************************** diff --git a/arch/arm/src/tiva/cc13xx/cc13xx_start.c b/arch/arm/src/tiva/cc13xx/cc13xx_start.c index cecc72d10c3..3b7a6566d5d 100644 --- a/arch/arm/src/tiva/cc13xx/cc13xx_start.c +++ b/arch/arm/src/tiva/cc13xx/cc13xx_start.c @@ -47,8 +47,8 @@ #include #include "nvic.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "tiva_enablepwr.h" #include "tiva_enableclks.h" diff --git a/arch/arm/src/tiva/common/lm4xx_tm3c_sysctrl.c b/arch/arm/src/tiva/common/lm4xx_tm3c_sysctrl.c index fcfc4c02fa3..82c17d4ea7b 100644 --- a/arch/arm/src/tiva/common/lm4xx_tm3c_sysctrl.c +++ b/arch/arm/src/tiva/common/lm4xx_tm3c_sysctrl.c @@ -46,8 +46,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "tiva_sysctrl.h" diff --git a/arch/arm/src/tiva/common/lmxx_tm4c_enableclks.h b/arch/arm/src/tiva/common/lmxx_tm4c_enableclks.h index 1b999a20c82..17e3e314961 100644 --- a/arch/arm/src/tiva/common/lmxx_tm4c_enableclks.h +++ b/arch/arm/src/tiva/common/lmxx_tm4c_enableclks.h @@ -42,7 +42,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "hardware/tiva_sysctrl.h" diff --git a/arch/arm/src/tiva/common/lmxx_tm4c_enablepwr.h b/arch/arm/src/tiva/common/lmxx_tm4c_enablepwr.h index a21dddf9cba..a70b77e7fbc 100644 --- a/arch/arm/src/tiva/common/lmxx_tm4c_enablepwr.h +++ b/arch/arm/src/tiva/common/lmxx_tm4c_enablepwr.h @@ -43,7 +43,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "hardware/tiva_sysctrl.h" diff --git a/arch/arm/src/tiva/common/lmxx_tm4c_gpioirq.c b/arch/arm/src/tiva/common/lmxx_tm4c_gpioirq.c index acc0d04fe9d..a193407fa21 100644 --- a/arch/arm/src/tiva/common/lmxx_tm4c_gpioirq.c +++ b/arch/arm/src/tiva/common/lmxx_tm4c_gpioirq.c @@ -51,8 +51,8 @@ #include "chip.h" -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "irq/irq.h" #include "tiva_gpio.h" diff --git a/arch/arm/src/tiva/common/lmxx_tm4c_start.c b/arch/arm/src/tiva/common/lmxx_tm4c_start.c index 14514d27c3f..f5bd991910c 100644 --- a/arch/arm/src/tiva/common/lmxx_tm4c_start.c +++ b/arch/arm/src/tiva/common/lmxx_tm4c_start.c @@ -47,8 +47,8 @@ #include #include "nvic.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "tiva_lowputc.h" #include "tiva_sysctrl.h" diff --git a/arch/arm/src/tiva/common/tiva_adclib.c b/arch/arm/src/tiva/common/tiva_adclib.c index f8b9b4acb5f..76a974e52b9 100644 --- a/arch/arm/src/tiva/common/tiva_adclib.c +++ b/arch/arm/src/tiva/common/tiva_adclib.c @@ -67,8 +67,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "tiva_gpio.h" #include "tiva_adc.h" #include "hardware/tiva_adc.h" diff --git a/arch/arm/src/tiva/common/tiva_adclow.c b/arch/arm/src/tiva/common/tiva_adclow.c index 8e6cf8f7ea0..8ec1d0a5458 100644 --- a/arch/arm/src/tiva/common/tiva_adclow.c +++ b/arch/arm/src/tiva/common/tiva_adclow.c @@ -79,8 +79,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "tiva_gpio.h" #include "tiva_adc.h" #include "hardware/tiva_adc.h" diff --git a/arch/arm/src/tiva/common/tiva_allocateheap.c b/arch/arm/src/tiva/common/tiva_allocateheap.c index 8d0e23be16a..a74d87efb28 100644 --- a/arch/arm/src/tiva/common/tiva_allocateheap.c +++ b/arch/arm/src/tiva/common/tiva_allocateheap.c @@ -51,8 +51,8 @@ #include #include "mpu.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "tiva_mpuinit.h" /**************************************************************************** diff --git a/arch/arm/src/tiva/common/tiva_dumpgpio.c b/arch/arm/src/tiva/common/tiva_dumpgpio.c index 2ba8dab0149..fe9c9a2993b 100644 --- a/arch/arm/src/tiva/common/tiva_dumpgpio.c +++ b/arch/arm/src/tiva/common/tiva_dumpgpio.c @@ -51,7 +51,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_gpio.h" diff --git a/arch/arm/src/tiva/common/tiva_eeprom.c b/arch/arm/src/tiva/common/tiva_eeprom.c index 9dd6b68a038..e00f174119c 100644 --- a/arch/arm/src/tiva/common/tiva_eeprom.c +++ b/arch/arm/src/tiva/common/tiva_eeprom.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "hardware/tiva_sysctrl.h" #include "tiva_eeprom.h" diff --git a/arch/arm/src/tiva/common/tiva_flash.c b/arch/arm/src/tiva/common/tiva_flash.c index d88c5533d3a..6ac538450bf 100644 --- a/arch/arm/src/tiva/common/tiva_flash.c +++ b/arch/arm/src/tiva/common/tiva_flash.c @@ -54,7 +54,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_flash.h" diff --git a/arch/arm/src/tiva/common/tiva_hciuart.c b/arch/arm/src/tiva/common/tiva_hciuart.c index 4f3d6593a06..f9136d318f3 100644 --- a/arch/arm/src/tiva/common/tiva_hciuart.c +++ b/arch/arm/src/tiva/common/tiva_hciuart.c @@ -38,8 +38,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "tiva_hciuart.h" diff --git a/arch/arm/src/tiva/common/tiva_i2c.c b/arch/arm/src/tiva/common/tiva_i2c.c index bda90d5c4c1..2f9e184edd0 100644 --- a/arch/arm/src/tiva/common/tiva_i2c.c +++ b/arch/arm/src/tiva/common/tiva_i2c.c @@ -62,7 +62,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "tiva_enablepwr.h" #include "tiva_enableclks.h" diff --git a/arch/arm/src/tiva/common/tiva_irq.c b/arch/arm/src/tiva/common/tiva_irq.c index d38efa7d326..fdfe9765ea8 100644 --- a/arch/arm/src/tiva/common/tiva_irq.c +++ b/arch/arm/src/tiva/common/tiva_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" #include "chip.h" #include "tiva_gpio.h" diff --git a/arch/arm/src/tiva/common/tiva_lowputc.c b/arch/arm/src/tiva/common/tiva_lowputc.c index 39518cbeba2..96002b5668d 100644 --- a/arch/arm/src/tiva/common/tiva_lowputc.c +++ b/arch/arm/src/tiva/common/tiva_lowputc.c @@ -43,8 +43,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "tiva_enablepwr.h" #include "tiva_enableclks.h" diff --git a/arch/arm/src/tiva/common/tiva_pwm.c b/arch/arm/src/tiva/common/tiva_pwm.c index 99a203187cb..25f69d6b618 100644 --- a/arch/arm/src/tiva/common/tiva_pwm.c +++ b/arch/arm/src/tiva/common/tiva_pwm.c @@ -51,7 +51,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "tiva_gpio.h" #include "tiva_pwm.h" #include "tiva_enablepwr.h" diff --git a/arch/arm/src/tiva/common/tiva_qencoder.c b/arch/arm/src/tiva/common/tiva_qencoder.c index 478f5d5542e..b74c138afb2 100644 --- a/arch/arm/src/tiva/common/tiva_qencoder.c +++ b/arch/arm/src/tiva/common/tiva_qencoder.c @@ -50,7 +50,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "tiva_gpio.h" #include "tiva_qencoder.h" #include "tiva_enablepwr.h" diff --git a/arch/arm/src/tiva/common/tiva_serial.c b/arch/arm/src/tiva/common/tiva_serial.c index 976846be835..c024d34dc8f 100644 --- a/arch/arm/src/tiva/common/tiva_serial.c +++ b/arch/arm/src/tiva/common/tiva_serial.c @@ -56,8 +56,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "tiva_lowputc.h" diff --git a/arch/arm/src/tiva/common/tiva_ssi.c b/arch/arm/src/tiva/common/tiva_ssi.c index 3eab257c52c..10ec6a43848 100644 --- a/arch/arm/src/tiva/common/tiva_ssi.c +++ b/arch/arm/src/tiva/common/tiva_ssi.c @@ -37,8 +37,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_enablepwr.h" diff --git a/arch/arm/src/tiva/common/tiva_timerisr.c b/arch/arm/src/tiva/common/tiva_timerisr.c index 748ecc0a447..fc3898780b7 100644 --- a/arch/arm/src/tiva/common/tiva_timerisr.c +++ b/arch/arm/src/tiva/common/tiva_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/tiva/common/tiva_timerlib.c b/arch/arm/src/tiva/common/tiva_timerlib.c index 0373cc41c4d..8c03fd84dd0 100644 --- a/arch/arm/src/tiva/common/tiva_timerlib.c +++ b/arch/arm/src/tiva/common/tiva_timerlib.c @@ -50,7 +50,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/tiva_sysctrl.h" #include "hardware/tiva_timer.h" diff --git a/arch/arm/src/tiva/lm/lm3s_ethernet.c b/arch/arm/src/tiva/lm/lm3s_ethernet.c index 4c7d07e9b64..2bd69063316 100644 --- a/arch/arm/src/tiva/lm/lm3s_ethernet.c +++ b/arch/arm/src/tiva/lm/lm3s_ethernet.c @@ -64,7 +64,7 @@ #endif #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "tiva_gpio.h" #include "tiva_ethernet.h" diff --git a/arch/arm/src/tiva/lm/lm3s_gpio.c b/arch/arm/src/tiva/lm/lm3s_gpio.c index 89b71dd5b67..6ba3f111c84 100644 --- a/arch/arm/src/tiva/lm/lm3s_gpio.c +++ b/arch/arm/src/tiva/lm/lm3s_gpio.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "tiva_enablepwr.h" #include "tiva_enableclks.h" #include "tiva_gpio.h" diff --git a/arch/arm/src/tiva/lm/lm4f_gpio.c b/arch/arm/src/tiva/lm/lm4f_gpio.c index 69950f6476a..ef9a35fd782 100644 --- a/arch/arm/src/tiva/lm/lm4f_gpio.c +++ b/arch/arm/src/tiva/lm/lm4f_gpio.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "tiva_enablepwr.h" #include "tiva_enableclks.h" #include "tiva_gpio.h" diff --git a/arch/arm/src/tiva/tiva_chipinfo.h b/arch/arm/src/tiva/tiva_chipinfo.h index 282396f3721..2b87e459d65 100644 --- a/arch/arm/src/tiva/tiva_chipinfo.h +++ b/arch/arm/src/tiva/tiva_chipinfo.h @@ -49,7 +49,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/tiva_fcfg1.h" /* Currently only applies to the CC13x0 and CC13x2 families */ diff --git a/arch/arm/src/tiva/tiva_periphrdy.h b/arch/arm/src/tiva/tiva_periphrdy.h index 9d27b105d4e..be94c767dec 100644 --- a/arch/arm/src/tiva/tiva_periphrdy.h +++ b/arch/arm/src/tiva/tiva_periphrdy.h @@ -42,7 +42,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "hardware/tiva_sysctrl.h" diff --git a/arch/arm/src/tiva/tiva_timer.h b/arch/arm/src/tiva/tiva_timer.h index 942c76f4ddf..c96642a33db 100644 --- a/arch/arm/src/tiva/tiva_timer.h +++ b/arch/arm/src/tiva/tiva_timer.h @@ -47,7 +47,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "hardware/tiva_timer.h" diff --git a/arch/arm/src/tiva/tm4c/tm4c129_sysctrl.c b/arch/arm/src/tiva/tm4c/tm4c129_sysctrl.c index 3c94added0f..8dbb3052693 100644 --- a/arch/arm/src/tiva/tm4c/tm4c129_sysctrl.c +++ b/arch/arm/src/tiva/tm4c/tm4c129_sysctrl.c @@ -46,8 +46,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "tiva_sysctrl.h" diff --git a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c index b965d06b91b..8eb8c5994e1 100644 --- a/arch/arm/src/tiva/tm4c/tm4c_ethernet.c +++ b/arch/arm/src/tiva/tm4c/tm4c_ethernet.c @@ -51,7 +51,7 @@ # include #endif -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" #include "tiva_gpio.h" diff --git a/arch/arm/src/tiva/tm4c/tm4c_gpio.c b/arch/arm/src/tiva/tm4c/tm4c_gpio.c index 89629048565..90c2faa3f3f 100644 --- a/arch/arm/src/tiva/tm4c/tm4c_gpio.c +++ b/arch/arm/src/tiva/tm4c/tm4c_gpio.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "tiva_enablepwr.h" #include "tiva_enableclks.h" #include "tiva_gpio.h" diff --git a/arch/arm/src/tms570/tms570_boot.c b/arch/arm/src/tms570/tms570_boot.c index f57d7754142..f83f6803538 100644 --- a/arch/arm/src/tms570/tms570_boot.c +++ b/arch/arm/src/tms570/tms570_boot.c @@ -56,8 +56,8 @@ #include "arm.h" #include "fpu.h" #include "sctlr.h" -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include diff --git a/arch/arm/src/tms570/tms570_boot.h b/arch/arm/src/tms570/tms570_boot.h index ae3611144ee..83ead3dc4c9 100644 --- a/arch/arm/src/tms570/tms570_boot.h +++ b/arch/arm/src/tms570/tms570_boot.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" /************************************************************************************ diff --git a/arch/arm/src/tms570/tms570_clockconfig.c b/arch/arm/src/tms570/tms570_clockconfig.c index d2f53de44b2..0b19f14c8c5 100644 --- a/arch/arm/src/tms570/tms570_clockconfig.c +++ b/arch/arm/src/tms570/tms570_clockconfig.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/tms570_esm.h" #include "hardware/tms570_sys.h" diff --git a/arch/arm/src/tms570/tms570_esm.c b/arch/arm/src/tms570/tms570_esm.c index da72b0d3601..76a8c81e7b2 100644 --- a/arch/arm/src/tms570/tms570_esm.c +++ b/arch/arm/src/tms570/tms570_esm.c @@ -52,8 +52,8 @@ #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "hardware/tms570_esm.h" #include "tms570_esm.h" diff --git a/arch/arm/src/tms570/tms570_gio.c b/arch/arm/src/tms570/tms570_gio.c index 089fd67bfb4..b70577e71f7 100644 --- a/arch/arm/src/tms570/tms570_gio.c +++ b/arch/arm/src/tms570/tms570_gio.c @@ -48,8 +48,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "hardware/tms570_gio.h" #include "tms570_gio.h" diff --git a/arch/arm/src/tms570/tms570_gioirq.c b/arch/arm/src/tms570/tms570_gioirq.c index 4c7d1c03386..f2b01030af2 100644 --- a/arch/arm/src/tms570/tms570_gioirq.c +++ b/arch/arm/src/tms570/tms570_gioirq.c @@ -50,8 +50,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "tms570_gio.h" #include "hardware/tms570_gio.h" diff --git a/arch/arm/src/tms570/tms570_irq.c b/arch/arm/src/tms570/tms570_irq.c index 2b1901c868d..ebba759f337 100644 --- a/arch/arm/src/tms570/tms570_irq.c +++ b/arch/arm/src/tms570/tms570_irq.c @@ -48,8 +48,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/tms570_vim.h" #include "tms570_gio.h" diff --git a/arch/arm/src/tms570/tms570_lowputc.c b/arch/arm/src/tms570/tms570_lowputc.c index b2631aeb98b..68ca3eba36b 100644 --- a/arch/arm/src/tms570/tms570_lowputc.c +++ b/arch/arm/src/tms570/tms570_lowputc.c @@ -51,8 +51,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "hardware/tms570_sci.h" #include "hardware/tms570_iomm.h" diff --git a/arch/arm/src/tms570/tms570_lowputc.h b/arch/arm/src/tms570/tms570_lowputc.h index 061f976fc87..e656c112b5e 100644 --- a/arch/arm/src/tms570/tms570_lowputc.h +++ b/arch/arm/src/tms570/tms570_lowputc.h @@ -47,7 +47,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" /************************************************************************************ diff --git a/arch/arm/src/tms570/tms570_selftest.c b/arch/arm/src/tms570/tms570_selftest.c index cec286046d3..357ade07194 100644 --- a/arch/arm/src/tms570/tms570_selftest.c +++ b/arch/arm/src/tms570/tms570_selftest.c @@ -50,7 +50,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/tms570_sys.h" #include "hardware/tms570_pbist.h" diff --git a/arch/arm/src/tms570/tms570_serial.c b/arch/arm/src/tms570/tms570_serial.c index d1a08123fa1..0b0ba763253 100644 --- a/arch/arm/src/tms570/tms570_serial.c +++ b/arch/arm/src/tms570/tms570_serial.c @@ -58,8 +58,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/tms570_sci.h" #include "tms570_lowputc.h" diff --git a/arch/arm/src/tms570/tms570_timerisr.c b/arch/arm/src/tms570/tms570_timerisr.c index cb994723e07..c76bbd0027d 100644 --- a/arch/arm/src/tms570/tms570_timerisr.c +++ b/arch/arm/src/tms570/tms570_timerisr.c @@ -43,8 +43,8 @@ #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "hardware/tms570_rti.h" diff --git a/arch/arm/src/xmc4/xmc4_allocateheap.c b/arch/arm/src/xmc4/xmc4_allocateheap.c index 37ae505466a..aeab296bfca 100644 --- a/arch/arm/src/xmc4/xmc4_allocateheap.c +++ b/arch/arm/src/xmc4/xmc4_allocateheap.c @@ -51,8 +51,8 @@ #include #include "mpu.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "xmc4_mpuinit.h" /**************************************************************************** diff --git a/arch/arm/src/xmc4/xmc4_clockconfig.c b/arch/arm/src/xmc4/xmc4_clockconfig.c index 9aa78bd752f..c7be76c48c1 100644 --- a/arch/arm/src/xmc4/xmc4_clockconfig.c +++ b/arch/arm/src/xmc4/xmc4_clockconfig.c @@ -55,7 +55,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/xmc4_scu.h" #include "xmc4_clockconfig.h" #include "hardware/xmc4_ports.h" diff --git a/arch/arm/src/xmc4/xmc4_clockutils.c b/arch/arm/src/xmc4/xmc4_clockutils.c index 9e4b3f775ae..49a4437f27c 100644 --- a/arch/arm/src/xmc4/xmc4_clockutils.c +++ b/arch/arm/src/xmc4/xmc4_clockutils.c @@ -55,7 +55,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/xmc4_scu.h" #include "xmc4_clockconfig.h" diff --git a/arch/arm/src/xmc4/xmc4_clrpend.c b/arch/arm/src/xmc4/xmc4_clrpend.c index 860b82d7745..afacce0bf54 100644 --- a/arch/arm/src/xmc4/xmc4_clrpend.c +++ b/arch/arm/src/xmc4/xmc4_clrpend.c @@ -42,7 +42,7 @@ #include #include "nvic.h" -#include "up_arch.h" +#include "arm_arch.h" /**************************************************************************** * Public Functions diff --git a/arch/arm/src/xmc4/xmc4_gpio.c b/arch/arm/src/xmc4/xmc4_gpio.c index 415d4da3177..0a1984500db 100644 --- a/arch/arm/src/xmc4/xmc4_gpio.c +++ b/arch/arm/src/xmc4/xmc4_gpio.c @@ -46,8 +46,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/xmc4_ports.h" #include "xmc4_gpio.h" diff --git a/arch/arm/src/xmc4/xmc4_idle.c b/arch/arm/src/xmc4/xmc4_idle.c index fbe34fcd9ff..dbc0edee1d5 100644 --- a/arch/arm/src/xmc4/xmc4_idle.c +++ b/arch/arm/src/xmc4/xmc4_idle.c @@ -43,7 +43,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/xmc4/xmc4_irq.c b/arch/arm/src/xmc4/xmc4_irq.c index e8ead74d13a..9c9f0bfdaf0 100644 --- a/arch/arm/src/xmc4/xmc4_irq.c +++ b/arch/arm/src/xmc4/xmc4_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" /**************************************************************************** * Pre-processor Definitions diff --git a/arch/arm/src/xmc4/xmc4_lowputc.c b/arch/arm/src/xmc4/xmc4_lowputc.c index ab97d367047..b7cc0738985 100644 --- a/arch/arm/src/xmc4/xmc4_lowputc.c +++ b/arch/arm/src/xmc4/xmc4_lowputc.c @@ -45,8 +45,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include #include "xmc4_config.h" diff --git a/arch/arm/src/xmc4/xmc4_lowputc.h b/arch/arm/src/xmc4/xmc4_lowputc.h index 61d850f7ba7..f5e0bac7014 100644 --- a/arch/arm/src/xmc4/xmc4_lowputc.h +++ b/arch/arm/src/xmc4/xmc4_lowputc.h @@ -44,7 +44,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "xmc4_config.h" #include "xmc4_usic.h" diff --git a/arch/arm/src/xmc4/xmc4_serial.c b/arch/arm/src/xmc4/xmc4_serial.c index ee2be448ca9..ced3fb1ec2e 100644 --- a/arch/arm/src/xmc4/xmc4_serial.c +++ b/arch/arm/src/xmc4/xmc4_serial.c @@ -53,8 +53,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "chip.h" #include "xmc4_config.h" diff --git a/arch/arm/src/xmc4/xmc4_spi.c b/arch/arm/src/xmc4/xmc4_spi.c index 95b5cbaa5ac..7cb082263ca 100644 --- a/arch/arm/src/xmc4/xmc4_spi.c +++ b/arch/arm/src/xmc4/xmc4_spi.c @@ -58,8 +58,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "xmc4_gpio.h" diff --git a/arch/arm/src/xmc4/xmc4_start.c b/arch/arm/src/xmc4/xmc4_start.c index 63369d87dd4..4324220e7f3 100644 --- a/arch/arm/src/xmc4/xmc4_start.c +++ b/arch/arm/src/xmc4/xmc4_start.c @@ -47,8 +47,8 @@ #include #include "nvic.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/xmc4_flash.h" #include "xmc4_clockconfig.h" diff --git a/arch/arm/src/xmc4/xmc4_timerisr.c b/arch/arm/src/xmc4/xmc4_timerisr.c index 6a5053ca7c2..db661ec2d39 100644 --- a/arch/arm/src/xmc4/xmc4_timerisr.c +++ b/arch/arm/src/xmc4/xmc4_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/xmc4/xmc4_usic.c b/arch/arm/src/xmc4/xmc4_usic.c index 3f8c1365fdb..18920d4d406 100644 --- a/arch/arm/src/xmc4/xmc4_usic.c +++ b/arch/arm/src/xmc4/xmc4_usic.c @@ -60,7 +60,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/xmc4_usic.h" #include "hardware/xmc4_scu.h" #include "xmc4_clockconfig.h" diff --git a/boards/arm/a1x/pcduino-a10/src/a1x_leds.c b/boards/arm/a1x/pcduino-a10/src/a1x_leds.c index 57c75b8818c..6f3c1a645d6 100644 --- a/boards/arm/a1x/pcduino-a10/src/a1x_leds.c +++ b/boards/arm/a1x/pcduino-a10/src/a1x_leds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "pcduino_a10.h" diff --git a/boards/arm/am335x/beaglebone-black/src/am335x_leds.c b/boards/arm/am335x/beaglebone-black/src/am335x_leds.c index a91733a09af..f8aab78cb49 100644 --- a/boards/arm/am335x/beaglebone-black/src/am335x_leds.c +++ b/boards/arm/am335x/beaglebone-black/src/am335x_leds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "beaglebone-black.h" diff --git a/boards/arm/c5471/c5471evm/src/c5471_leds.c b/boards/arm/c5471/c5471evm/src/c5471_leds.c index b66e2299218..bfa20aa7e92 100644 --- a/boards/arm/c5471/c5471evm/src/c5471_leds.c +++ b/boards/arm/c5471/c5471evm/src/c5471_leds.c @@ -42,7 +42,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/boards/arm/cxd56xx/common/src/cxd56_audio.c b/boards/arm/cxd56xx/common/src/cxd56_audio.c index 0b909459a78..c6d22853f9e 100644 --- a/boards/arm/cxd56xx/common/src/cxd56_audio.c +++ b/boards/arm/cxd56xx/common/src/cxd56_audio.c @@ -54,7 +54,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include #include "cxd56_pmic.h" diff --git a/boards/arm/cxd56xx/common/src/cxd56_boot.c b/boards/arm/cxd56xx/common/src/cxd56_boot.c index e58220bf379..fe9cd7314da 100644 --- a/boards/arm/cxd56xx/common/src/cxd56_boot.c +++ b/boards/arm/cxd56xx/common/src/cxd56_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/boards/arm/cxd56xx/common/src/cxd56_crashdump.c b/boards/arm/cxd56xx/common/src/cxd56_crashdump.c index 9ce0b8f4d0c..8aba8a6e3e7 100644 --- a/boards/arm/cxd56xx/common/src/cxd56_crashdump.c +++ b/boards/arm/cxd56xx/common/src/cxd56_crashdump.c @@ -51,8 +51,8 @@ #include #include "cxd56_wdt.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" /**************************************************************************** * Private Functions diff --git a/boards/arm/cxd56xx/common/src/cxd56_imageproc.c b/boards/arm/cxd56xx/common/src/cxd56_imageproc.c index 9123adc73c6..a1b4ef4da57 100644 --- a/boards/arm/cxd56xx/common/src/cxd56_imageproc.c +++ b/boards/arm/cxd56xx/common/src/cxd56_imageproc.c @@ -55,7 +55,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" /**************************************************************************** * Pre-processor Definitions diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c b/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c index 256008938a2..6f43b7f2dac 100644 --- a/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c +++ b/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c @@ -47,8 +47,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_power.c b/boards/arm/cxd56xx/spresense/src/cxd56_power.c index b4dcbc5f744..cae375da386 100644 --- a/boards/arm/cxd56xx/spresense/src/cxd56_power.c +++ b/boards/arm/cxd56xx/spresense/src/cxd56_power.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include #include diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c b/boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c index fb6eafae394..a2d5a63bc98 100644 --- a/boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c +++ b/boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c @@ -54,7 +54,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include #include diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_spi.c b/boards/arm/cxd56xx/spresense/src/cxd56_spi.c index 9e4cb15ea02..2c8d86008ba 100644 --- a/boards/arm/cxd56xx/spresense/src/cxd56_spi.c +++ b/boards/arm/cxd56xx/spresense/src/cxd56_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "hardware/cxd56_spi.h" #include "cxd56_clock.h" diff --git a/boards/arm/dm320/ntosd-dm320/src/dm320_leds.c b/boards/arm/dm320/ntosd-dm320/src/dm320_leds.c index 71a7692fd5c..9a212001a24 100644 --- a/boards/arm/dm320/ntosd-dm320/src/dm320_leds.c +++ b/boards/arm/dm320/ntosd-dm320/src/dm320_leds.c @@ -40,7 +40,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "chip.h" /**************************************************************************** diff --git a/boards/arm/dm320/ntosd-dm320/src/dm320_network.c b/boards/arm/dm320/ntosd-dm320/src/dm320_network.c index ba922ea7927..068c40da7cb 100644 --- a/boards/arm/dm320/ntosd-dm320/src/dm320_network.c +++ b/boards/arm/dm320/ntosd-dm320/src/dm320_network.c @@ -43,8 +43,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "dm320_memorymap.h" #include "dm320_emif.h" diff --git a/boards/arm/efm32/efm32-g8xx-stk/src/efm32_autoleds.c b/boards/arm/efm32/efm32-g8xx-stk/src/efm32_autoleds.c index 95dc1c68228..e2fda54dba3 100644 --- a/boards/arm/efm32/efm32-g8xx-stk/src/efm32_autoleds.c +++ b/boards/arm/efm32/efm32-g8xx-stk/src/efm32_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "efm32_gpio.h" #include "efm32-g8xx-stk.h" diff --git a/boards/arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c b/boards/arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c index 2b98636c9d6..e04da6bfe38 100644 --- a/boards/arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c +++ b/boards/arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "efm32_gpio.h" #include "efm32-g8xx-stk.h" diff --git a/boards/arm/imx6/sabre-6quad/src/imx_autoleds.c b/boards/arm/imx6/sabre-6quad/src/imx_autoleds.c index a3d268278fd..9d592372d79 100644 --- a/boards/arm/imx6/sabre-6quad/src/imx_autoleds.c +++ b/boards/arm/imx6/sabre-6quad/src/imx_autoleds.c @@ -72,7 +72,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "imx_gpio.h" #include "sabre-6quad.h" diff --git a/boards/arm/imx6/sabre-6quad/src/imx_boardinit.c b/boards/arm/imx6/sabre-6quad/src/imx_boardinit.c index d107ade7d1f..5e3c9f87b79 100644 --- a/boards/arm/imx6/sabre-6quad/src/imx_boardinit.c +++ b/boards/arm/imx6/sabre-6quad/src/imx_boardinit.c @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "imx_boot.h" #include "sabre-6quad.h" diff --git a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_bringup.c b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_bringup.c index b96a9d50e51..058336e514a 100644 --- a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_bringup.c +++ b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_bringup.c @@ -164,7 +164,7 @@ int imxrt_bringup(void) * capabilities. */ -#include "up_arch.h" +#include "arm_arch.h" #include "hardware/imxrt_pinmux.h" #include "hardware/imxrt_ccm.h" #include "imxrt_periphclks.h" diff --git a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_buttons.c b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_buttons.c index 82c22948678..b0ceacd0c76 100644 --- a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_buttons.c +++ b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_buttons.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "imxrt_config.h" #include "imxrt_irq.h" diff --git a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_spi.c b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_spi.c index 9c40569fab7..df4a02ae1fd 100644 --- a/boards/arm/imxrt/imxrt1020-evk/src/imxrt_spi.c +++ b/boards/arm/imxrt/imxrt1020-evk/src/imxrt_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "imxrt_config.h" #include "imxrt_lpspi.h" diff --git a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c index c107f2f1661..2ac4c036087 100644 --- a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "imxrt_config.h" #include "imxrt_irq.h" diff --git a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_mmcsd_spi.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_mmcsd_spi.c index 576f1e69de4..fbe553806b3 100644 --- a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_mmcsd_spi.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_mmcsd_spi.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "imxrt_lpspi.h" diff --git a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_spi.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_spi.c index 769da4821af..59c1b78de53 100644 --- a/boards/arm/imxrt/imxrt1050-evk/src/imxrt_spi.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "imxrt_config.h" #include "imxrt_lpspi.h" diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_boot.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_boot.c index a3cbbce3884..83bc19e859c 100644 --- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_boot.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_boot.c @@ -45,7 +45,7 @@ #include "imxrt_start.h" #include "imxrt1060-evk.h" -#include "up_arch.h" +#include "arm_arch.h" #include "imxrt_flexspi_nor_boot.h" /**************************************************************************** diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c index 81585ece8c5..816d77bf076 100644 --- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "imxrt_config.h" #include "imxrt_irq.h" diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_mmcsd_spi.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_mmcsd_spi.c index a5e5838d055..769ded8a5f1 100644 --- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_mmcsd_spi.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_mmcsd_spi.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "imxrt_lpspi.h" diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_spi.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_spi.c index 5433dfe35d7..93ae6c71800 100644 --- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_spi.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_spi.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "imxrt_config.h" #include "imxrt_lpspi.h" diff --git a/boards/arm/kinetis/freedom-k28f/src/k28_i2c.c b/boards/arm/kinetis/freedom-k28f/src/k28_i2c.c index 20019823957..eac5ec7d081 100644 --- a/boards/arm/kinetis/freedom-k28f/src/k28_i2c.c +++ b/boards/arm/kinetis/freedom-k28f/src/k28_i2c.c @@ -45,7 +45,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "kinetis.h" #include "kinetis_i2c.h" diff --git a/boards/arm/kinetis/freedom-k28f/src/k28_pwm.c b/boards/arm/kinetis/freedom-k28f/src/k28_pwm.c index 817d4629a15..f7a1e8e67ce 100644 --- a/boards/arm/kinetis/freedom-k28f/src/k28_pwm.c +++ b/boards/arm/kinetis/freedom-k28f/src/k28_pwm.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "kinetis_pwm.h" #include diff --git a/boards/arm/kinetis/freedom-k28f/src/k28_spi.c b/boards/arm/kinetis/freedom-k28f/src/k28_spi.c index 5fe8467a222..e8b5d95b9c9 100644 --- a/boards/arm/kinetis/freedom-k28f/src/k28_spi.c +++ b/boards/arm/kinetis/freedom-k28f/src/k28_spi.c @@ -45,7 +45,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "kinetis.h" #include "freedom-k28f.h" diff --git a/boards/arm/kinetis/freedom-k28f/src/k28_usbdev.c b/boards/arm/kinetis/freedom-k28f/src/k28_usbdev.c index 712cbb05eeb..545ab4b86f9 100644 --- a/boards/arm/kinetis/freedom-k28f/src/k28_usbdev.c +++ b/boards/arm/kinetis/freedom-k28f/src/k28_usbdev.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "kinetis.h" #include "kinetis_usbotg.h" #include "hardware/kinetis_sim.h" diff --git a/boards/arm/kinetis/freedom-k64f/src/k64_boot.c b/boards/arm/kinetis/freedom-k64f/src/k64_boot.c index f42b6160c8a..ca2db16b027 100644 --- a/boards/arm/kinetis/freedom-k64f/src/k64_boot.c +++ b/boards/arm/kinetis/freedom-k64f/src/k64_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "freedom-k64f.h" /**************************************************************************** diff --git a/boards/arm/kinetis/freedom-k64f/src/k64_pwm.c b/boards/arm/kinetis/freedom-k64f/src/k64_pwm.c index 465c4bf0b71..f8f01ecf32b 100644 --- a/boards/arm/kinetis/freedom-k64f/src/k64_pwm.c +++ b/boards/arm/kinetis/freedom-k64f/src/k64_pwm.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "kinetis_pwm.h" #ifdef CONFIG_PWM diff --git a/boards/arm/kinetis/freedom-k64f/src/k64_spi.c b/boards/arm/kinetis/freedom-k64f/src/k64_spi.c index fe5305edec6..951e239a362 100644 --- a/boards/arm/kinetis/freedom-k64f/src/k64_spi.c +++ b/boards/arm/kinetis/freedom-k64f/src/k64_spi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "kinetis.h" #include "freedom-k64f.h" diff --git a/boards/arm/kinetis/freedom-k64f/src/k64_usbdev.c b/boards/arm/kinetis/freedom-k64f/src/k64_usbdev.c index 4dcf5165b55..b03d27f02cd 100644 --- a/boards/arm/kinetis/freedom-k64f/src/k64_usbdev.c +++ b/boards/arm/kinetis/freedom-k64f/src/k64_usbdev.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "kinetis.h" #include "freedom-k64f.h" diff --git a/boards/arm/kinetis/freedom-k66f/src/k66_boot.c b/boards/arm/kinetis/freedom-k66f/src/k66_boot.c index 12de54d7b6e..d7c5b94861c 100644 --- a/boards/arm/kinetis/freedom-k66f/src/k66_boot.c +++ b/boards/arm/kinetis/freedom-k66f/src/k66_boot.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "freedom-k66f.h" /**************************************************************************** diff --git a/boards/arm/kinetis/freedom-k66f/src/k66_pwm.c b/boards/arm/kinetis/freedom-k66f/src/k66_pwm.c index 3f08d79ad21..e040a6afca2 100644 --- a/boards/arm/kinetis/freedom-k66f/src/k66_pwm.c +++ b/boards/arm/kinetis/freedom-k66f/src/k66_pwm.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "kinetis_pwm.h" #ifdef CONFIG_PWM diff --git a/boards/arm/kinetis/freedom-k66f/src/k66_spi.c b/boards/arm/kinetis/freedom-k66f/src/k66_spi.c index 9b9cc92d1d6..c7cba265918 100644 --- a/boards/arm/kinetis/freedom-k66f/src/k66_spi.c +++ b/boards/arm/kinetis/freedom-k66f/src/k66_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "kinetis.h" #include "freedom-k66f.h" diff --git a/boards/arm/kinetis/freedom-k66f/src/k66_usbdev.c b/boards/arm/kinetis/freedom-k66f/src/k66_usbdev.c index 61583762437..629a01daef4 100644 --- a/boards/arm/kinetis/freedom-k66f/src/k66_usbdev.c +++ b/boards/arm/kinetis/freedom-k66f/src/k66_usbdev.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "kinetis.h" #include "freedom-k66f.h" diff --git a/boards/arm/kinetis/kwikstik-k40/src/k40_boot.c b/boards/arm/kinetis/kwikstik-k40/src/k40_boot.c index a5f56f6612d..21f4dc206cc 100644 --- a/boards/arm/kinetis/kwikstik-k40/src/k40_boot.c +++ b/boards/arm/kinetis/kwikstik-k40/src/k40_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "kwikstik-k40.h" /**************************************************************************** diff --git a/boards/arm/kinetis/kwikstik-k40/src/k40_lcd.c b/boards/arm/kinetis/kwikstik-k40/src/k40_lcd.c index 575b5545ee6..5d19e437df5 100644 --- a/boards/arm/kinetis/kwikstik-k40/src/k40_lcd.c +++ b/boards/arm/kinetis/kwikstik-k40/src/k40_lcd.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "kwikstik-k40.h" /**************************************************************************** diff --git a/boards/arm/kinetis/kwikstik-k40/src/k40_spi.c b/boards/arm/kinetis/kwikstik-k40/src/k40_spi.c index 6678e4cd02e..23086a3ada3 100644 --- a/boards/arm/kinetis/kwikstik-k40/src/k40_spi.c +++ b/boards/arm/kinetis/kwikstik-k40/src/k40_spi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "kinetis.h" #include "kwikstik-k40.h" diff --git a/boards/arm/kinetis/kwikstik-k40/src/k40_usbdev.c b/boards/arm/kinetis/kwikstik-k40/src/k40_usbdev.c index 5c342f68ed6..dfbbcc05841 100644 --- a/boards/arm/kinetis/kwikstik-k40/src/k40_usbdev.c +++ b/boards/arm/kinetis/kwikstik-k40/src/k40_usbdev.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "kinetis.h" #include "kwikstik-k40.h" diff --git a/boards/arm/kinetis/teensy-3.x/src/k20_boot.c b/boards/arm/kinetis/teensy-3.x/src/k20_boot.c index 1ab3804c61c..18bcf38847b 100644 --- a/boards/arm/kinetis/teensy-3.x/src/k20_boot.c +++ b/boards/arm/kinetis/teensy-3.x/src/k20_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "teensy-3x.h" /**************************************************************************** diff --git a/boards/arm/kinetis/teensy-3.x/src/k20_i2c.c b/boards/arm/kinetis/teensy-3.x/src/k20_i2c.c index 7d633f039f0..1fc288d0c6b 100644 --- a/boards/arm/kinetis/teensy-3.x/src/k20_i2c.c +++ b/boards/arm/kinetis/teensy-3.x/src/k20_i2c.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "kinetis.h" #include "kinetis_i2c.h" diff --git a/boards/arm/kinetis/teensy-3.x/src/k20_pwm.c b/boards/arm/kinetis/teensy-3.x/src/k20_pwm.c index 998da99e0b8..a66b8e7f9a2 100644 --- a/boards/arm/kinetis/teensy-3.x/src/k20_pwm.c +++ b/boards/arm/kinetis/teensy-3.x/src/k20_pwm.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "kinetis_pwm.h" /**************************************************************************** diff --git a/boards/arm/kinetis/teensy-3.x/src/k20_spi.c b/boards/arm/kinetis/teensy-3.x/src/k20_spi.c index 69b18039c32..f06dc3f9936 100644 --- a/boards/arm/kinetis/teensy-3.x/src/k20_spi.c +++ b/boards/arm/kinetis/teensy-3.x/src/k20_spi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "kinetis.h" #include "teensy-3x.h" diff --git a/boards/arm/kinetis/teensy-3.x/src/k20_usbdev.c b/boards/arm/kinetis/teensy-3.x/src/k20_usbdev.c index 3f73ee4f023..e26834c6e56 100644 --- a/boards/arm/kinetis/teensy-3.x/src/k20_usbdev.c +++ b/boards/arm/kinetis/teensy-3.x/src/k20_usbdev.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "kinetis.h" #include "kinetis_usbotg.h" #include "hardware/kinetis_sim.h" diff --git a/boards/arm/kinetis/twr-k60n512/src/k60_boot.c b/boards/arm/kinetis/twr-k60n512/src/k60_boot.c index a9dcd27b7d8..8dfb6b0ac75 100644 --- a/boards/arm/kinetis/twr-k60n512/src/k60_boot.c +++ b/boards/arm/kinetis/twr-k60n512/src/k60_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "twr-k60n512.h" /**************************************************************************** diff --git a/boards/arm/kinetis/twr-k60n512/src/k60_spi.c b/boards/arm/kinetis/twr-k60n512/src/k60_spi.c index 8a071e00fcf..4d2c7d19564 100644 --- a/boards/arm/kinetis/twr-k60n512/src/k60_spi.c +++ b/boards/arm/kinetis/twr-k60n512/src/k60_spi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "kinetis.h" #include "twr-k60n512.h" diff --git a/boards/arm/kinetis/twr-k60n512/src/k60_usbdev.c b/boards/arm/kinetis/twr-k60n512/src/k60_usbdev.c index 025fda0fda9..447fd368d5e 100644 --- a/boards/arm/kinetis/twr-k60n512/src/k60_usbdev.c +++ b/boards/arm/kinetis/twr-k60n512/src/k60_usbdev.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "kinetis.h" #include "twr-k60n512.h" diff --git a/boards/arm/kinetis/twr-k64f120m/src/k64_boot.c b/boards/arm/kinetis/twr-k64f120m/src/k64_boot.c index 52078b19fb8..bdb14e675b8 100644 --- a/boards/arm/kinetis/twr-k64f120m/src/k64_boot.c +++ b/boards/arm/kinetis/twr-k64f120m/src/k64_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "twrk64.h" /**************************************************************************** diff --git a/boards/arm/kl/freedom-kl25z/src/kl_boardinitialize.c b/boards/arm/kl/freedom-kl25z/src/kl_boardinitialize.c index 44ac5e64ad7..d4967ad30aa 100644 --- a/boards/arm/kl/freedom-kl25z/src/kl_boardinitialize.c +++ b/boards/arm/kl/freedom-kl25z/src/kl_boardinitialize.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "freedom-kl25z.h" /**************************************************************************** diff --git a/boards/arm/kl/freedom-kl25z/src/kl_pwm.c b/boards/arm/kl/freedom-kl25z/src/kl_pwm.c index 3e74bdd6ae2..cd54198a594 100644 --- a/boards/arm/kl/freedom-kl25z/src/kl_pwm.c +++ b/boards/arm/kl/freedom-kl25z/src/kl_pwm.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "kl_pwm.h" /**************************************************************************** diff --git a/boards/arm/kl/freedom-kl25z/src/kl_tsi.c b/boards/arm/kl/freedom-kl25z/src/kl_tsi.c index c707d86ba0c..63fabeeae57 100644 --- a/boards/arm/kl/freedom-kl25z/src/kl_tsi.c +++ b/boards/arm/kl/freedom-kl25z/src/kl_tsi.c @@ -51,7 +51,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "kl_gpio.h" #include "hardware/kl_tsi.h" #include "hardware/kl_pinmux.h" diff --git a/boards/arm/kl/freedom-kl26z/src/kl_boardinitialize.c b/boards/arm/kl/freedom-kl26z/src/kl_boardinitialize.c index 8113567080c..38c6f29d80f 100644 --- a/boards/arm/kl/freedom-kl26z/src/kl_boardinitialize.c +++ b/boards/arm/kl/freedom-kl26z/src/kl_boardinitialize.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "freedom-kl26z.h" /**************************************************************************** diff --git a/boards/arm/kl/freedom-kl26z/src/kl_pwm.c b/boards/arm/kl/freedom-kl26z/src/kl_pwm.c index 6a65c501338..bd0a8459c6d 100644 --- a/boards/arm/kl/freedom-kl26z/src/kl_pwm.c +++ b/boards/arm/kl/freedom-kl26z/src/kl_pwm.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "kl_pwm.h" /**************************************************************************** diff --git a/boards/arm/kl/freedom-kl26z/src/kl_tsi.c b/boards/arm/kl/freedom-kl26z/src/kl_tsi.c index 514df82a555..96a0ee896a7 100644 --- a/boards/arm/kl/freedom-kl26z/src/kl_tsi.c +++ b/boards/arm/kl/freedom-kl26z/src/kl_tsi.c @@ -51,7 +51,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "kl_gpio.h" #include "hardware/kl_tsi.h" #include "hardware/kl_pinmux.h" diff --git a/boards/arm/kl/teensy-lc/src/kl_boardinitialize.c b/boards/arm/kl/teensy-lc/src/kl_boardinitialize.c index 6ce537c7427..187a6f3ca39 100644 --- a/boards/arm/kl/teensy-lc/src/kl_boardinitialize.c +++ b/boards/arm/kl/teensy-lc/src/kl_boardinitialize.c @@ -47,7 +47,7 @@ #include "kl_gpio.h" #include "hardware/kl_pinmux.h" -#include "up_arch.h" +#include "arm_arch.h" #include "teensy-lc.h" /**************************************************************************** diff --git a/boards/arm/kl/teensy-lc/src/kl_pwm.c b/boards/arm/kl/teensy-lc/src/kl_pwm.c index 831579887cf..b06b07167df 100644 --- a/boards/arm/kl/teensy-lc/src/kl_pwm.c +++ b/boards/arm/kl/teensy-lc/src/kl_pwm.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "kl_pwm.h" /**************************************************************************** diff --git a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_adc.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_adc.c index 121c1329353..5de32970720 100644 --- a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_adc.c +++ b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_adc.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lc823450-xgevk.h" #include "lc823450_adc.h" diff --git a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_autoleds.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_autoleds.c index f2a42b7edca..f52efdb6da9 100644 --- a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_autoleds.c +++ b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_autoleds.c @@ -47,8 +47,8 @@ #include #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-xgevk.h" diff --git a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_bt.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_bt.c index 4109475b73d..136842c8bda 100644 --- a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_bt.c +++ b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_bt.c @@ -46,8 +46,8 @@ #include #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-xgevk.h" diff --git a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_mux.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_mux.c index 1c121ef2908..f693888b906 100644 --- a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_mux.c +++ b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_mux.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lc823450_syscontrol.h" #include "lc823450-xgevk_mux.h" diff --git a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_st7565.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_st7565.c index 22bed3ff69b..a6e1bae1a99 100644 --- a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_st7565.c +++ b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_st7565.c @@ -51,7 +51,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "lc823450_gpio.h" #include "lc823450_spi.h" #include "lc823450-xgevk.h" diff --git a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_wm8776.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_wm8776.c index d9402abb798..913d99a7348 100644 --- a/boards/arm/lc823450/lc823450-xgevk/src/lc823450_wm8776.c +++ b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_wm8776.c @@ -51,7 +51,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "lc823450_i2c.h" #include "lc823450_i2s.h" #include "lc823450-xgevk.h" diff --git a/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_boot.c index b0ed312d6fd..13126071410 100644 --- a/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_boot.c +++ b/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lincoln60.h" diff --git a/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_leds.c index 217c7429779..1ab5a6af101 100644 --- a/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_leds.c +++ b/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_leds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_autoleds.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_autoleds.c index 1748577fd6f..ac8759a3bab 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_autoleds.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" #include "lpc4088-devkit.h" diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_boardinitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_boardinitialize.c index 85b1ffc46fc..044fed02e6f 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_boardinitialize.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_boardinitialize.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_emc.h" diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_nandinitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_nandinitialize.c index f7aecc1887b..5f1ff68c311 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_nandinitialize.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_nandinitialize.c @@ -44,8 +44,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc4088-devkit.h" diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_norinitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_norinitialize.c index 518985d2057..b7a8f1fe0d4 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_norinitialize.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_norinitialize.c @@ -44,8 +44,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc4088-devkit.h" diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_sdraminitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_sdraminitialize.c index 5f6af1b85a5..cf1c2fa7ed9 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_sdraminitialize.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_sdraminitialize.c @@ -45,8 +45,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/lpc17_40_syscon.h" #include "lpc17_40_emc.h" diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_ssp.c index 01d4ea9551e..94fac1ad4fd 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_ssp.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_ssp.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "lpc17_40_gpio.h" #include "lpc17_40_ssp.h" diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_userleds.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_userleds.c index c22925952b5..302d97d07c2 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_userleds.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_userleds.c @@ -48,8 +48,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" #include "lpc4088-devkit.h" diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_autoleds.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_autoleds.c index cbe11e99843..cd8a2622541 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_autoleds.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" #include "lpc4088-quickstart.h" diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_boardinitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_boardinitialize.c index 2cbac613df0..1a8396f8491 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_boardinitialize.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_boardinitialize.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_emc.h" diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_nandinitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_nandinitialize.c index 7a40083ad08..29580a82ae8 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_nandinitialize.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_nandinitialize.c @@ -44,8 +44,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc4088-quickstart.h" diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c index ecd387adda4..033574cf295 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/lpc17_40_syscon.h" #include "lpc17_40_emc.h" diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_ssp.c index 062ae79cc59..ed822b6e54e 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_ssp.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_ssp.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "lpc17_40_gpio.h" #include "lpc17_40_ssp.h" diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_userleds.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_userleds.c index 58dbd8153fe..0d4dd25f648 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_userleds.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_userleds.c @@ -48,8 +48,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" #include "lpc4088-quickstart.h" diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_adc.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_adc.c index ce49532f477..9dafb23762e 100644 --- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_adc.c +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_adc.c @@ -52,7 +52,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc17_40_adc.h" #include "lpcxpresso-lpc1768.h" diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_boot.c index 9fa2e7328ca..ab87d97f5ee 100644 --- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_boot.c +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_ssp.h" #include "lpcxpresso-lpc1768.h" diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_dac.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_dac.c index e409279619a..94857076cba 100644 --- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_dac.c +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_dac.c @@ -50,8 +50,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_dac.h" diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_leds.c index 77c2d071769..cca18b3335c 100644 --- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_leds.c +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_leds.c @@ -44,8 +44,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" #include "lpcxpresso-lpc1768.h" diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_pwm.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_pwm.c index 044803890f8..60e717ddc71 100644 --- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_pwm.c +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_pwm.c @@ -49,7 +49,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc17_40_pwm.h" #include "lpc17_40_timer.h" #include "lpcxpresso-lpc1768.h" diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_ssp.c index 4f2a4fc76d3..0b81235218e 100644 --- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_ssp.c +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_ssp.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "lpc17_40_gpio.h" #include "lpc17_40_ssp.h" diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_autoleds.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_autoleds.c index 0ab82f7dfc1..eee194a6feb 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_autoleds.c +++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" #include "lx_cpu.h" diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_boardinitialize.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_boardinitialize.c index 4277646c74f..dc6bbf2c5d6 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_boardinitialize.c +++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_boardinitialize.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_emc.h" diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_can.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_can.c index 009d685225a..31a18941cf7 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_can.c +++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_can.c @@ -51,7 +51,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc17_40_can.h" #include "lx_cpu.h" diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_fpgainitialize.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_fpgainitialize.c index a7ee0fc2c70..80633815b1e 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_fpgainitialize.c +++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_fpgainitialize.c @@ -45,9 +45,9 @@ #include #include "nuttx/signal.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc17_40_gpio.h" -#include "up_internal.h" +#include "arm_internal.h" #include "hardware/lpc17_40_syscon.h" #include "lpc17_40_emc.h" diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_sdraminitialize.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_sdraminitialize.c index 59b66d7cfbd..bb4d1014d4d 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_sdraminitialize.c +++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_sdraminitialize.c @@ -45,8 +45,8 @@ #include #include "nuttx/signal.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/lpc17_40_syscon.h" #include "lpc17_40_emc.h" diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ssp.c index 80bed94b970..0b7d2f169c1 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ssp.c +++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ssp.c @@ -47,7 +47,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "lpc17_40_gpio.h" #include "lpc17_40_ssp.h" diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ulan.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ulan.c index 9acb020d302..f097b9f0ce9 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ulan.c +++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_ulan.c @@ -49,8 +49,8 @@ #include "hardware/lpc17_40_pinconfig.h" #include "hardware/lpc17_40_syscon.h" #include "lpc17_40_gpio.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_userleds.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_userleds.c index 7816a5f6070..8b1c692a295 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_userleds.c +++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_userleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" #include "lx_cpu.h" diff --git a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_adc.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_adc.c index 21d954efd4a..05cc043acbb 100644 --- a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_adc.c +++ b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_adc.c @@ -54,7 +54,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc17_40_adc.h" #include "mbed.h" diff --git a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_boot.c index d9ee1003487..2b6b3b5444d 100644 --- a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_boot.c +++ b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "mbed.h" diff --git a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_dac.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_dac.c index 2c748927b17..138a8e74a93 100644 --- a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_dac.c +++ b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_dac.c @@ -52,8 +52,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_dac.h" diff --git a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_leds.c index 4c763cdeb09..cf3320f3733 100644 --- a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_leds.c +++ b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_leds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" diff --git a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_pwm.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_pwm.c index e22c29c7bdb..cfac01af539 100644 --- a/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_pwm.c +++ b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_pwm.c @@ -51,7 +51,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc17_40_pwm.h" #include "lpc17_40_timer.h" #include "mbed.h" diff --git a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_adc.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_adc.c index 544c9dac067..c1858514e7b 100644 --- a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_adc.c +++ b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_adc.c @@ -54,7 +54,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc17_40_adc.h" #include "mcb1700.h" diff --git a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_boot.c index 8fd32568bcd..9b93f7d13ce 100644 --- a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_boot.c +++ b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "mcb1700.h" diff --git a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_dac.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_dac.c index a054befb793..c4522093e31 100644 --- a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_dac.c +++ b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_dac.c @@ -52,8 +52,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_dac.h" diff --git a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_leds.c index 6f1712f2043..a17c0e4050c 100644 --- a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_leds.c +++ b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_leds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" diff --git a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_pwm.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_pwm.c index bf6239cf836..8efb318fff1 100644 --- a/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_pwm.c +++ b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_pwm.c @@ -51,7 +51,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc17_40_pwm.h" #include "lpc17_40_timer.h" #include "mcb1700.h" diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_boot.c index 43843805b5a..d06dcb97a74 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_boot.c +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_ssp.h" #include "lpc1766stk.h" diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_can.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_can.c index 1d25902f786..a44e1674dd4 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_can.c +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_can.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc17_40_can.h" #include "lpc1766stk.h" diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_leds.c index 889487983da..d695b2b7de8 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_leds.c +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_leds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_ssp.c index a5e1291b31a..16fdaba1914 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_ssp.c +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_ssp.c @@ -51,7 +51,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "lpc17_40_gpio.h" #include "lpc17_40_ssp.h" diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_autoleds.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_autoleds.c index 7f7046eb34b..336870b6a39 100644 --- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_autoleds.c +++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" #include "open1788.h" diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_boardinitialize.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_boardinitialize.c index e781e4302ce..bba2d0379ab 100644 --- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_boardinitialize.c +++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_boardinitialize.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_emc.h" diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_nandinitialize.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_nandinitialize.c index 5e65a14ee15..81521ed1476 100644 --- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_nandinitialize.c +++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_nandinitialize.c @@ -44,8 +44,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "open1788.h" diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_norinitialize.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_norinitialize.c index d1a8a76d265..be3759ca9c9 100644 --- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_norinitialize.c +++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_norinitialize.c @@ -44,8 +44,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "open1788.h" diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_sdraminitialize.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_sdraminitialize.c index bc42da31be6..a5946b2b433 100644 --- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_sdraminitialize.c +++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_sdraminitialize.c @@ -45,8 +45,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "hardware/lpc17_40_syscon.h" #include "lpc17_40_emc.h" diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_ssp.c index 4b6ddbfb123..1eb5fb37ecd 100644 --- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_ssp.c +++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_ssp.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "lpc17_40_gpio.h" #include "lpc17_40_ssp.h" diff --git a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_userleds.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_userleds.c index 99d18a4de9d..18500f6f4ce 100644 --- a/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_userleds.c +++ b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_userleds.c @@ -48,8 +48,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" #include "open1788.h" diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_boot.c index 94e7f68ceac..ee809589228 100644 --- a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_boot.c +++ b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "pnev5180b.h" diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_leds.c index 8d795da2bd1..0932c62b584 100644 --- a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_leds.c +++ b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_leds.c @@ -46,8 +46,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" #include "pnev5180b.h" diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_spi.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_spi.c index aa727329885..22b395ffb1a 100644 --- a/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_spi.c +++ b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "lpc17_40_spi.h" #include "lpc17_40_gpio.h" diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_adc.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_adc.c index 9d07daf8fbf..23ddd6a277c 100644 --- a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_adc.c +++ b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_adc.c @@ -54,7 +54,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc17_40_adc.h" #include "u-blox-c027.h" diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_boot.c index 383d45847e2..1691285344b 100644 --- a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_boot.c +++ b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" #include "lpc17_40_ssp.h" diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_dac.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_dac.c index 20e00282618..53c06a2ad7a 100644 --- a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_dac.c +++ b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_dac.c @@ -52,8 +52,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_dac.h" diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_leds.c index 2a7d77b772c..b3350d5c60d 100644 --- a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_leds.c +++ b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_leds.c @@ -44,8 +44,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" #include "u-blox-c027.h" diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_pwm.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_pwm.c index fcbbbc529f8..2fcce01d8e7 100644 --- a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_pwm.c +++ b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_pwm.c @@ -49,7 +49,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc17_40_pwm.h" #include "lpc17_40_timer.h" #include "u-blox-c027.h" diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_ssp.c index 2f4a626311b..a75a1398fb2 100644 --- a/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_ssp.c +++ b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_ssp.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "lpc17_40_gpio.h" #include "lpc17_40_ssp.h" diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_adc.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_adc.c index e0c4996598c..cfa12ba243a 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_adc.c +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_adc.c @@ -52,7 +52,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc17_40_adc.h" #include "zkit-arm-1769.h" diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_boot.c index 20dc93accd3..eca40cdecbe 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_boot.c +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_boot.c @@ -49,8 +49,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "zkit-arm-1769.h" diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c index 402ae7d55d0..572e2b885fe 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c @@ -53,8 +53,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" #include "zkit-arm-1769.h" diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_can.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_can.c index 9372c19d9d7..0a45578ff84 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_can.c +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_can.c @@ -51,7 +51,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc17_40_can.h" #include "zkit-arm-1769.h" diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_dac.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_dac.c index e0deee43de6..829d513a3ec 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_dac.c +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_dac.c @@ -50,8 +50,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "zkit-arm-1769.h" #include "lpc17_40_dac.h" diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_lcd.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_lcd.c index 6a89b98e5f2..8e703ca2dc4 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_lcd.c +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_lcd.c @@ -55,8 +55,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" #include "lpc17_40_ssp.h" diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_leds.c index 2a90a26fb82..07cdc9a3d0f 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_leds.c +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_leds.c @@ -50,8 +50,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc17_40_gpio.h" #include "zkit-arm-1769.h" diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_spi.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_spi.c index f0297f75915..cfced039b48 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_spi.c +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_spi.c @@ -51,7 +51,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "lpc17_40_spi.h" #include "lpc17_40_gpio.h" diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_ssp.c index 1361995792d..339e7b10a1c 100644 --- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_ssp.c +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_ssp.c @@ -51,7 +51,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "lpc17_40_ssp.h" #include "lpc17_40_gpio.h" diff --git a/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_leds.c b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_leds.c index 696f2f4eb0b..b163b1a0a38 100644 --- a/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_leds.c +++ b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_leds.c @@ -41,8 +41,8 @@ #include #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/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c index 24f4f08f112..736b012d5b3 100644 --- a/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c +++ b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c @@ -75,8 +75,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "lpc214x_power.h" diff --git a/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c b/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c index fda5547dad1..e31722b1611 100644 --- a/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c +++ b/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c @@ -76,8 +76,8 @@ #include #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "lpc214x_power.h" diff --git a/boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c b/boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c index aa66eb89e75..da6707b985d 100644 --- a/boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c +++ b/boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "lpc214x_pinsel.h" #include "lpc214x_spi.h" diff --git a/boards/arm/lpc2378/olimex-lpc2378/src/lpc2378_leds.c b/boards/arm/lpc2378/olimex-lpc2378/src/lpc2378_leds.c index 650083b6afb..9ac28156a69 100644 --- a/boards/arm/lpc2378/olimex-lpc2378/src/lpc2378_leds.c +++ b/boards/arm/lpc2378/olimex-lpc2378/src/lpc2378_leds.c @@ -48,8 +48,8 @@ #include #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/boards/arm/lpc31xx/ea3131/src/lpc31_boot.c b/boards/arm/lpc31xx/ea3131/src/lpc31_boot.c index f19f76fbc64..b117b24100c 100644 --- a/boards/arm/lpc31xx/ea3131/src/lpc31_boot.c +++ b/boards/arm/lpc31xx/ea3131/src/lpc31_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc31.h" #include "ea3131.h" diff --git a/boards/arm/lpc31xx/ea3131/src/lpc31_leds.c b/boards/arm/lpc31xx/ea3131/src/lpc31_leds.c index 9545a7b992e..35dbd0cc3b7 100644 --- a/boards/arm/lpc31xx/ea3131/src/lpc31_leds.c +++ b/boards/arm/lpc31xx/ea3131/src/lpc31_leds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc31.h" /**************************************************************************** diff --git a/boards/arm/lpc31xx/ea3131/src/lpc31_mem.c b/boards/arm/lpc31xx/ea3131/src/lpc31_mem.c index f117e4934a0..72e05315da9 100644 --- a/boards/arm/lpc31xx/ea3131/src/lpc31_mem.c +++ b/boards/arm/lpc31xx/ea3131/src/lpc31_mem.c @@ -51,7 +51,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc31_syscreg.h" #include "lpc31_cgudrvr.h" diff --git a/boards/arm/lpc31xx/ea3131/src/lpc31_spi.c b/boards/arm/lpc31xx/ea3131/src/lpc31_spi.c index b52e681b610..8b23fcc6ab9 100644 --- a/boards/arm/lpc31xx/ea3131/src/lpc31_spi.c +++ b/boards/arm/lpc31xx/ea3131/src/lpc31_spi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "lpc31.h" #include "ea3131.h" diff --git a/boards/arm/lpc31xx/ea3131/src/lpc31_usbhost.c b/boards/arm/lpc31xx/ea3131/src/lpc31_usbhost.c index e5238536cc8..66b3d83d618 100644 --- a/boards/arm/lpc31xx/ea3131/src/lpc31_usbhost.c +++ b/boards/arm/lpc31xx/ea3131/src/lpc31_usbhost.c @@ -53,7 +53,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "lpc31.h" #include "ea3131.h" diff --git a/boards/arm/lpc31xx/ea3152/src/lpc31_boot.c b/boards/arm/lpc31xx/ea3152/src/lpc31_boot.c index 74632eb0257..1feb22fd807 100644 --- a/boards/arm/lpc31xx/ea3152/src/lpc31_boot.c +++ b/boards/arm/lpc31xx/ea3152/src/lpc31_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc31.h" #include "ea3152.h" diff --git a/boards/arm/lpc31xx/ea3152/src/lpc31_leds.c b/boards/arm/lpc31xx/ea3152/src/lpc31_leds.c index b717f77a30d..9f8af8885c1 100644 --- a/boards/arm/lpc31xx/ea3152/src/lpc31_leds.c +++ b/boards/arm/lpc31xx/ea3152/src/lpc31_leds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc31.h" /**************************************************************************** diff --git a/boards/arm/lpc31xx/ea3152/src/lpc31_mem.c b/boards/arm/lpc31xx/ea3152/src/lpc31_mem.c index 653dc8e39fa..94792b8fca5 100644 --- a/boards/arm/lpc31xx/ea3152/src/lpc31_mem.c +++ b/boards/arm/lpc31xx/ea3152/src/lpc31_mem.c @@ -51,7 +51,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc31_syscreg.h" #include "lpc31_cgudrvr.h" diff --git a/boards/arm/lpc31xx/ea3152/src/lpc31_spi.c b/boards/arm/lpc31xx/ea3152/src/lpc31_spi.c index bdfa8e48724..5188003610d 100644 --- a/boards/arm/lpc31xx/ea3152/src/lpc31_spi.c +++ b/boards/arm/lpc31xx/ea3152/src/lpc31_spi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "lpc31.h" #include "ea3152.h" diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_boot.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_boot.c index 91407c00f61..89b9a19b03b 100644 --- a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_boot.c +++ b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc31.h" #include "lpc_h3131.h" diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_leds.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_leds.c index 14de97076ae..6a1c4ebe123 100644 --- a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_leds.c +++ b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_leds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc31.h" #include "lpc_h3131.h" diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_mem.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_mem.c index 8bfa13d7365..35120e5eff8 100644 --- a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_mem.c +++ b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_mem.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc31_syscreg.h" #include "lpc31_cgudrvr.h" diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_spi.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_spi.c index 3f719221ea5..c65dbd1ff5f 100644 --- a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_spi.c +++ b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_spi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "lpc31.h" #include "lpc_h3131.h" diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_usbhost.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_usbhost.c index e3cc917c42a..8aabd0694bd 100644 --- a/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_usbhost.c +++ b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_usbhost.c @@ -53,7 +53,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "lpc31.h" #include "lpc_h3131.h" diff --git a/boards/arm/lpc43xx/bambino-200e/src/lpc43_autoleds.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_autoleds.c index 037cd0275eb..378eb706e4b 100644 --- a/boards/arm/lpc43xx/bambino-200e/src/lpc43_autoleds.c +++ b/boards/arm/lpc43xx/bambino-200e/src/lpc43_autoleds.c @@ -48,8 +48,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "bambino-200e.h" diff --git a/boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c index d6aa9fd1b16..af27300b1f3 100644 --- a/boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c +++ b/boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c @@ -45,8 +45,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "bambino-200e.h" diff --git a/boards/arm/lpc43xx/bambino-200e/src/lpc43_ostest.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_ostest.c index 06c2b353c03..6fadff4f575 100644 --- a/boards/arm/lpc43xx/bambino-200e/src/lpc43_ostest.c +++ b/boards/arm/lpc43xx/bambino-200e/src/lpc43_ostest.c @@ -48,8 +48,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "bambino-200e.h" /**************************************************************************** diff --git a/boards/arm/lpc43xx/bambino-200e/src/lpc43_userleds.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_userleds.c index c3bcf12fd1c..bdd394d4a4b 100644 --- a/boards/arm/lpc43xx/bambino-200e/src/lpc43_userleds.c +++ b/boards/arm/lpc43xx/bambino-200e/src/lpc43_userleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "bambino-200e.h" diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_autoleds.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_autoleds.c index ae618002802..ef1d2ad4067 100644 --- a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_autoleds.c +++ b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc4330-xplorer.h" diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_boot.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_boot.c index e2522eb0941..5a862a58e4a 100644 --- a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_boot.c +++ b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc4330-xplorer.h" diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_ostest.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_ostest.c index 65ba032d9e6..ea9a0405a3a 100644 --- a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_ostest.c +++ b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_ostest.c @@ -47,8 +47,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc4330-xplorer.h" /**************************************************************************** diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_userleds.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_userleds.c index 3496fe1063d..400d6808dcc 100644 --- a/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_userleds.c +++ b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_userleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc4330-xplorer.h" diff --git a/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_adc.c b/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_adc.c index 47e94b1f045..5573216d370 100644 --- a/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_adc.c +++ b/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_adc.c @@ -52,7 +52,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc43_adc.h" diff --git a/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_boot.c b/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_boot.c index 47ad340a88d..ab47dfec78c 100644 --- a/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_boot.c +++ b/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc4337-ws.h" diff --git a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_autoleds.c b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_autoleds.c index 76971d091c9..af0a0539042 100644 --- a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_autoleds.c +++ b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc4357-evb.h" diff --git a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_boot.c b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_boot.c index eeabd9ce9e3..a1766aa3ee6 100644 --- a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_boot.c +++ b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc4357-evb.h" diff --git a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_ostest.c b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_ostest.c index 5a73088f5ff..aee5f9a8f13 100644 --- a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_ostest.c +++ b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_ostest.c @@ -47,8 +47,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc4357-evb.h" /**************************************************************************** diff --git a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_userleds.c b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_userleds.c index 1bedf688cb9..8346ae35c67 100644 --- a/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_userleds.c +++ b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_userleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc4357-evb.h" diff --git a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_adc.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_adc.c index 823a5cb4435..78c9dd7e4f7 100644 --- a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_adc.c +++ b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_adc.c @@ -52,7 +52,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "lpc43_adc.h" diff --git a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_autoleds.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_autoleds.c index 3f764952018..18b898aa613 100644 --- a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_autoleds.c +++ b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc4370-link2.h" diff --git a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_boot.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_boot.c index e1d963b419c..6a935347d14 100644 --- a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_boot.c +++ b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc4370-link2.h" diff --git a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_ostest.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_ostest.c index 252345ac465..3388996d45c 100644 --- a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_ostest.c +++ b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_ostest.c @@ -47,8 +47,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc4370-link2.h" /**************************************************************************** diff --git a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_spifilib_init.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_spifilib_init.c index 0f68b353d75..982a0504fd4 100644 --- a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_spifilib_init.c +++ b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_spifilib_init.c @@ -48,8 +48,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc43_spifi.h" #include "lpc43_cgu.h" diff --git a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_userleds.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_userleds.c index ceb01f079a6..2f3417379b6 100644 --- a/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_userleds.c +++ b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_userleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lpc4370-link2.h" diff --git a/boards/arm/max326xx/max32660-evsys/src/max326_boot.c b/boards/arm/max326xx/max32660-evsys/src/max326_boot.c index 68ed91b089a..21d11f98e71 100644 --- a/boards/arm/max326xx/max32660-evsys/src/max326_boot.c +++ b/boards/arm/max326xx/max32660-evsys/src/max326_boot.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "max326_start.h" #include "max32660-evsys.h" diff --git a/boards/arm/max326xx/max32660-evsys/src/max326_spi.c b/boards/arm/max326xx/max32660-evsys/src/max326_spi.c index f382eec7844..7b56fe1ab45 100644 --- a/boards/arm/max326xx/max32660-evsys/src/max326_spi.c +++ b/boards/arm/max326xx/max32660-evsys/src/max326_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "max326_spim.h" #include "max32660-evsys.h" diff --git a/boards/arm/nrf52/nrf52-feather/src/nrf52_autoleds.c b/boards/arm/nrf52/nrf52-feather/src/nrf52_autoleds.c index 59d88f6f016..12ff77b2608 100644 --- a/boards/arm/nrf52/nrf52-feather/src/nrf52_autoleds.c +++ b/boards/arm/nrf52/nrf52-feather/src/nrf52_autoleds.c @@ -56,8 +56,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nrf52-feather.h" diff --git a/boards/arm/nrf52/nrf52-feather/src/nrf52_boot.c b/boards/arm/nrf52/nrf52-feather/src/nrf52_boot.c index bf4572678df..f9ee45956e2 100644 --- a/boards/arm/nrf52/nrf52-feather/src/nrf52_boot.c +++ b/boards/arm/nrf52/nrf52-feather/src/nrf52_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nrf52-feather.h" diff --git a/boards/arm/nrf52/nrf52-feather/src/nrf52_userleds.c b/boards/arm/nrf52/nrf52-feather/src/nrf52_userleds.c index 5d8c86f9734..fd20514c4c7 100644 --- a/boards/arm/nrf52/nrf52-feather/src/nrf52_userleds.c +++ b/boards/arm/nrf52/nrf52-feather/src/nrf52_userleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nrf52-feather.h" diff --git a/boards/arm/nrf52/nrf52832-dk/src/nrf52_autoleds.c b/boards/arm/nrf52/nrf52832-dk/src/nrf52_autoleds.c index 51b42b03253..49fbd325221 100644 --- a/boards/arm/nrf52/nrf52832-dk/src/nrf52_autoleds.c +++ b/boards/arm/nrf52/nrf52832-dk/src/nrf52_autoleds.c @@ -58,8 +58,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nrf52832-dk.h" diff --git a/boards/arm/nrf52/nrf52832-dk/src/nrf52_boot.c b/boards/arm/nrf52/nrf52832-dk/src/nrf52_boot.c index ac4059415f1..d8a8f986d07 100644 --- a/boards/arm/nrf52/nrf52832-dk/src/nrf52_boot.c +++ b/boards/arm/nrf52/nrf52832-dk/src/nrf52_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nrf52832-dk.h" diff --git a/boards/arm/nrf52/nrf52832-dk/src/nrf52_userleds.c b/boards/arm/nrf52/nrf52832-dk/src/nrf52_userleds.c index 283fe2ba10d..8ec3564a5af 100644 --- a/boards/arm/nrf52/nrf52832-dk/src/nrf52_userleds.c +++ b/boards/arm/nrf52/nrf52832-dk/src/nrf52_userleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nrf52832-dk.h" diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_autoleds.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_autoleds.c index b2966fba51c..890391f8d00 100644 --- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_autoleds.c +++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nrf52840-dk.h" diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_boot.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_boot.c index df0d51cf888..f45cfdc75b8 100644 --- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_boot.c +++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nrf52840-dk.h" diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_spi.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_spi.c index 94377ecf1b9..410eb82352b 100644 --- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_spi.c +++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_spi.c @@ -46,7 +46,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "nrf52_gpio.h" #include "nrf52_spi.h" diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_userleds.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_userleds.c index 8002211e44b..e3a7d866fb6 100644 --- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_userleds.c +++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_userleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nrf52840-dk.h" diff --git a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_autoleds.c b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_autoleds.c index 381e4d50fba..53c159473c0 100644 --- a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_autoleds.c +++ b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nrf52840-dongle.h" diff --git a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_boot.c b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_boot.c index e795bdefbf2..e03714d3e69 100644 --- a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_boot.c +++ b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nrf52840-dongle.h" diff --git a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_userleds.c b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_userleds.c index cba180846b1..457a96ca104 100644 --- a/boards/arm/nrf52/nrf52840-dongle/src/nrf52_userleds.c +++ b/boards/arm/nrf52/nrf52840-dongle/src/nrf52_userleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "nrf52840-dongle.h" diff --git a/boards/arm/nuc1xx/nutiny-nuc120/src/nuc_boardinitialize.c b/boards/arm/nuc1xx/nutiny-nuc120/src/nuc_boardinitialize.c index 33c9083b4e0..9f837daf971 100644 --- a/boards/arm/nuc1xx/nutiny-nuc120/src/nuc_boardinitialize.c +++ b/boards/arm/nuc1xx/nutiny-nuc120/src/nuc_boardinitialize.c @@ -43,7 +43,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nutiny-nuc120.h" /**************************************************************************** diff --git a/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_autoleds.c b/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_autoleds.c index 6a63a9b1678..f0d422ea39e 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_autoleds.c +++ b/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_autoleds.c @@ -72,8 +72,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_pin.h" #include "rddrone-uavcan144.h" diff --git a/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_spi.c b/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_spi.c index 1c0588c2209..4441e13db05 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_spi.c +++ b/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_spi.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "s32k1xx_config.h" #include "s32k1xx_lpspi.h" diff --git a/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_userleds.c b/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_userleds.c index de3e419b9b2..a866a0afdd4 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_userleds.c +++ b/boards/arm/s32k1xx/rddrone-uavcan144/src/s32k1xx_userleds.c @@ -45,8 +45,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_pin.h" #include "rddrone-uavcan144.h" diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_autoleds.c b/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_autoleds.c index a766850b3d0..dd415060bc7 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_autoleds.c +++ b/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_autoleds.c @@ -72,8 +72,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_pin.h" #include "rddrone-uavcan146.h" diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_spi.c b/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_spi.c index d9ca69a677e..15f9a0451ef 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_spi.c +++ b/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_spi.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "s32k1xx_config.h" #include "s32k1xx_lpspi.h" diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_userleds.c b/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_userleds.c index 3b66e0dd73d..1f0a425ab3e 100644 --- a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_userleds.c +++ b/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_userleds.c @@ -45,8 +45,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_pin.h" #include "rddrone-uavcan146.h" diff --git a/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_autoleds.c b/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_autoleds.c index 5c9cee4f0c2..f86e700228d 100644 --- a/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_autoleds.c +++ b/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_autoleds.c @@ -72,8 +72,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_pin.h" #include "s32k118evb.h" diff --git a/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_userleds.c b/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_userleds.c index 5091c46e688..ee4b752e462 100644 --- a/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_userleds.c +++ b/boards/arm/s32k1xx/s32k118evb/src/s32k1xx_userleds.c @@ -45,8 +45,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_pin.h" #include "s32k118evb.h" diff --git a/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_autoleds.c b/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_autoleds.c index 6d41b8ac40c..5be23f84885 100644 --- a/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_autoleds.c +++ b/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_autoleds.c @@ -72,8 +72,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_pin.h" #include "s32k144evb.h" diff --git a/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_spi.c b/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_spi.c index 8e01e931b7b..814f70c8a21 100644 --- a/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_spi.c +++ b/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_spi.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "s32k1xx_config.h" #include "s32k1xx_lpspi.h" diff --git a/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_userleds.c b/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_userleds.c index da6c1c43166..a0b630015bd 100644 --- a/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_userleds.c +++ b/boards/arm/s32k1xx/s32k144evb/src/s32k1xx_userleds.c @@ -45,8 +45,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_pin.h" #include "s32k144evb.h" diff --git a/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_autoleds.c b/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_autoleds.c index 99e1aa5d5d7..bfa469ecdcc 100644 --- a/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_autoleds.c +++ b/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_autoleds.c @@ -72,8 +72,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_pin.h" #include "s32k146evb.h" diff --git a/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_spi.c b/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_spi.c index 424b44c0328..e002aec66b8 100644 --- a/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_spi.c +++ b/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_spi.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "s32k1xx_config.h" #include "s32k1xx_lpspi.h" diff --git a/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_userleds.c b/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_userleds.c index 0586a1d861f..ea853a27411 100644 --- a/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_userleds.c +++ b/boards/arm/s32k1xx/s32k146evb/src/s32k1xx_userleds.c @@ -45,8 +45,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_pin.h" #include "s32k146evb.h" diff --git a/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_autoleds.c b/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_autoleds.c index c2a6cbfb88c..1f4ad1e670f 100644 --- a/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_autoleds.c +++ b/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_autoleds.c @@ -72,8 +72,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_pin.h" #include "s32k148evb.h" diff --git a/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_userleds.c b/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_userleds.c index b0fdb3dabcc..2bc0101e1a2 100644 --- a/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_userleds.c +++ b/boards/arm/s32k1xx/s32k148evb/src/s32k1xx_userleds.c @@ -45,8 +45,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "s32k1xx_pin.h" #include "s32k148evb.h" diff --git a/boards/arm/sam34/arduino-due/src/sam_mmcsd.c b/boards/arm/sam34/arduino-due/src/sam_mmcsd.c index d4b9dd22d7b..9f5954c2480 100644 --- a/boards/arm/sam34/arduino-due/src/sam_mmcsd.c +++ b/boards/arm/sam34/arduino-due/src/sam_mmcsd.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "hardware/sam3u_pio.h" diff --git a/boards/arm/sam34/arduino-due/src/sam_touchscreen.c b/boards/arm/sam34/arduino-due/src/sam_touchscreen.c index 5c1f101235a..8a86eaa8962 100644 --- a/boards/arm/sam34/arduino-due/src/sam_touchscreen.c +++ b/boards/arm/sam34/arduino-due/src/sam_touchscreen.c @@ -51,7 +51,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "hardware/sam3u_pio.h" diff --git a/boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c b/boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c index 48f9da51c50..c12145ef817 100644 --- a/boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c +++ b/boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "sam_gpio.h" #include "sam_spi.h" diff --git a/boards/arm/sam34/sam3u-ek/src/sam_boot.c b/boards/arm/sam34/sam3u-ek/src/sam_boot.c index cbbbf4f7285..cb96007a122 100644 --- a/boards/arm/sam34/sam3u-ek/src/sam_boot.c +++ b/boards/arm/sam34/sam3u-ek/src/sam_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam3u-ek.h" /**************************************************************************** diff --git a/boards/arm/sam34/sam3u-ek/src/sam_lcd.c b/boards/arm/sam34/sam3u-ek/src/sam_lcd.c index f657bdbcdb4..5c557c013a3 100644 --- a/boards/arm/sam34/sam3u-ek/src/sam_lcd.c +++ b/boards/arm/sam34/sam3u-ek/src/sam_lcd.c @@ -126,7 +126,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "hardware/sam_pmc.h" #include "hardware/sam_smc.h" diff --git a/boards/arm/sam34/sam3u-ek/src/sam_leds.c b/boards/arm/sam34/sam3u-ek/src/sam_leds.c index f3572be0321..c95a86e6b6f 100644 --- a/boards/arm/sam34/sam3u-ek/src/sam_leds.c +++ b/boards/arm/sam34/sam3u-ek/src/sam_leds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_gpio.h" #include "sam3u-ek.h" diff --git a/boards/arm/sam34/sam3u-ek/src/sam_spi.c b/boards/arm/sam34/sam3u-ek/src/sam_spi.c index b58afa0fd21..9762d89a805 100644 --- a/boards/arm/sam34/sam3u-ek/src/sam_spi.c +++ b/boards/arm/sam34/sam3u-ek/src/sam_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "sam_gpio.h" #include "sam_spi.h" diff --git a/boards/arm/sam34/sam3u-ek/src/sam_usbdev.c b/boards/arm/sam34/sam3u-ek/src/sam_usbdev.c index f40b1195678..31dd9741fb2 100644 --- a/boards/arm/sam34/sam3u-ek/src/sam_usbdev.c +++ b/boards/arm/sam34/sam3u-ek/src/sam_usbdev.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam3u-ek.h" /**************************************************************************** diff --git a/boards/arm/sam34/sam4e-ek/src/sam_boot.c b/boards/arm/sam34/sam4e-ek/src/sam_boot.c index c7fa7901c5d..567d9f30bf8 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_boot.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam4e-ek.h" /**************************************************************************** diff --git a/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c b/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c index 467be124844..53913890926 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c @@ -139,7 +139,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "sam_periphclks.h" #include "hardware/sam_pmc.h" diff --git a/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c b/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c index ac816849840..3cab6fcf20d 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c @@ -138,7 +138,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "sam_periphclks.h" #include "hardware/sam_pmc.h" diff --git a/boards/arm/sam34/sam4e-ek/src/sam_leds.c b/boards/arm/sam34/sam4e-ek/src/sam_leds.c index 840eab4e796..a642980527b 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_leds.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_leds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_gpio.h" #include "sam4e-ek.h" diff --git a/boards/arm/sam34/sam4e-ek/src/sam_spi.c b/boards/arm/sam34/sam4e-ek/src/sam_spi.c index 95a5cd350b1..f885a5c4477 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_spi.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "sam_gpio.h" #include "sam_spi.h" diff --git a/boards/arm/sam34/sam4e-ek/src/sam_udp.c b/boards/arm/sam34/sam4e-ek/src/sam_udp.c index 1a07ea10608..238615c08b2 100644 --- a/boards/arm/sam34/sam4e-ek/src/sam_udp.c +++ b/boards/arm/sam34/sam4e-ek/src/sam_udp.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam4e-ek.h" /**************************************************************************** diff --git a/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c b/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c index f9ed444d29d..30ad97e265a 100644 --- a/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c +++ b/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c @@ -58,7 +58,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "sam4l_periphclks.h" #include "hardware/sam4l_lcdca.h" diff --git a/boards/arm/sam34/sam4s-xplained-pro/src/sam_udp.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_udp.c index 8367f4c8461..eee3b91fce1 100644 --- a/boards/arm/sam34/sam4s-xplained-pro/src/sam_udp.c +++ b/boards/arm/sam34/sam4s-xplained-pro/src/sam_udp.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam4s-xplained-pro.h" /**************************************************************************** diff --git a/boards/arm/sam34/sam4s-xplained/src/sam_sram.c b/boards/arm/sam34/sam4s-xplained/src/sam_sram.c index 139aafd1c11..128e10bd392 100644 --- a/boards/arm/sam34/sam4s-xplained/src/sam_sram.c +++ b/boards/arm/sam34/sam4s-xplained/src/sam_sram.c @@ -41,7 +41,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam4s_periphclks.h" #include "hardware/sam_smc.h" #include "sam4s-xplained.h" diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_can.c b/boards/arm/sama5/sama5d2-xult/src/sam_can.c index c0ea545ac9d..a1e3c826603 100644 --- a/boards/arm/sama5/sama5d2-xult/src/sam_can.c +++ b/boards/arm/sama5/sama5d2-xult/src/sam_can.c @@ -31,7 +31,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "sam_can.h" #include "sama5d2-xult.h" diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_nandflash.c b/boards/arm/sama5/sama5d2-xult/src/sam_nandflash.c index c5dceaae81c..81e64b4abcb 100644 --- a/boards/arm/sama5/sama5d2-xult/src/sam_nandflash.c +++ b/boards/arm/sama5/sama5d2-xult/src/sam_nandflash.c @@ -33,7 +33,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "sam_pio.h" #include "sam_nand.h" diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_ostest.c b/boards/arm/sama5/sama5d2-xult/src/sam_ostest.c index 92b7f511a33..6562d1e0bb5 100644 --- a/boards/arm/sama5/sama5d2-xult/src/sam_ostest.c +++ b/boards/arm/sama5/sama5d2-xult/src/sam_ostest.c @@ -32,8 +32,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sama5d2-xult.h" /**************************************************************************** diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_sdram.c b/boards/arm/sama5/sama5d2-xult/src/sam_sdram.c index 9dcb1c6df2d..e365e78c69f 100644 --- a/boards/arm/sama5/sama5d2-xult/src/sam_sdram.c +++ b/boards/arm/sama5/sama5d2-xult/src/sam_sdram.c @@ -26,7 +26,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "hardware/sam_memorymap.h" diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_spi.c b/boards/arm/sama5/sama5d2-xult/src/sam_spi.c index 88bf7f64c09..19cd48b1ac6 100644 --- a/boards/arm/sama5/sama5d2-xult/src/sam_spi.c +++ b/boards/arm/sama5/sama5d2-xult/src/sam_spi.c @@ -32,7 +32,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "sam_pio.h" #include "sam_spi.h" diff --git a/boards/arm/sama5/sama5d2-xult/src/sam_usb.c b/boards/arm/sama5/sama5d2-xult/src/sam_usb.c index 9434fb1424c..3d1ff93ea30 100644 --- a/boards/arm/sama5/sama5d2-xult/src/sam_usb.c +++ b/boards/arm/sama5/sama5d2-xult/src/sam_usb.c @@ -38,7 +38,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_pio.h" #include "sam_usbhost.h" #include "hardware/sam_ohci.h" diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_can.c b/boards/arm/sama5/sama5d3-xplained/src/sam_can.c index 29f36be2d56..7e7335b4618 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_can.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_can.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "sam_can.h" #include "sama5d3-xplained.h" diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_nandflash.c b/boards/arm/sama5/sama5d3-xplained/src/sam_nandflash.c index c4d56336ae1..1ab6a0e4314 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_nandflash.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_nandflash.c @@ -55,7 +55,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "sam_pio.h" #include "sam_nand.h" diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_ostest.c b/boards/arm/sama5/sama5d3-xplained/src/sam_ostest.c index 2f14d6c7841..c289c8fa3bc 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_ostest.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_ostest.c @@ -47,8 +47,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sama5d3-xplained.h" /**************************************************************************** diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_sdram.c b/boards/arm/sama5/sama5d3-xplained/src/sam_sdram.c index 0aced382521..fb975dc1c6b 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_sdram.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_sdram.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "hardware/sam_memorymap.h" diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_spi.c b/boards/arm/sama5/sama5d3-xplained/src/sam_spi.c index 9167aa05a3f..4b994a91a88 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_spi.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "sam_pio.h" #include "sam_spi.h" diff --git a/boards/arm/sama5/sama5d3-xplained/src/sam_usb.c b/boards/arm/sama5/sama5d3-xplained/src/sam_usb.c index 50dfff4ff3a..89f195e79a9 100644 --- a/boards/arm/sama5/sama5d3-xplained/src/sam_usb.c +++ b/boards/arm/sama5/sama5d3-xplained/src/sam_usb.c @@ -53,7 +53,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_pio.h" #include "sam_usbhost.h" #include "hardware/sam_ohci.h" diff --git a/boards/arm/sama5/sama5d3x-ek/src/nor_main.c b/boards/arm/sama5/sama5d3x-ek/src/nor_main.c index f132505ed6e..940bdfde5d3 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/nor_main.c +++ b/boards/arm/sama5/sama5d3x-ek/src/nor_main.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "mmu.h" #include "cp15_cacheops.h" diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_can.c b/boards/arm/sama5/sama5d3x-ek/src/sam_can.c index 92481e44c30..d22ee24a475 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_can.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_can.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "sam_can.h" #include "sama5d3x-ek.h" diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c b/boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c index 4a7d4e1b668..a02732a3dfd 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c @@ -55,7 +55,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "sam_pio.h" #include "sam_nand.h" diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_norflash.c b/boards/arm/sama5/sama5d3x-ek/src/sam_norflash.c index 6c425367bdf..b9e8b20d33f 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_norflash.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_norflash.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "hardware/sam_hsmc.h" diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_ostest.c b/boards/arm/sama5/sama5d3x-ek/src/sam_ostest.c index 99d8d64b90e..74d273f9f20 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_ostest.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_ostest.c @@ -32,8 +32,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sama5d3x-ek.h" /**************************************************************************** diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_ov2640.c b/boards/arm/sama5/sama5d3x-ek/src/sam_ov2640.c index 71203e4ef2d..c5f3b6799d2 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_ov2640.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_ov2640.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "sam_lcd.h" diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_sdram.c b/boards/arm/sama5/sama5d3x-ek/src/sam_sdram.c index a0020151a2c..fa2acdceadb 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_sdram.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_sdram.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "hardware/sam_memorymap.h" diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_spi.c b/boards/arm/sama5/sama5d3x-ek/src/sam_spi.c index ea8f0f35aa8..3840106a2ab 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_spi.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "sam_pio.h" #include "sam_spi.h" diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_usb.c b/boards/arm/sama5/sama5d3x-ek/src/sam_usb.c index 84176e50c6b..34def167026 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_usb.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_usb.c @@ -53,7 +53,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_pio.h" #include "sam_usbhost.h" #include "hardware/sam_ohci.h" diff --git a/boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c b/boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c index 5557abf15db..bff1750dbee 100644 --- a/boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c +++ b/boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c @@ -53,7 +53,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_pio.h" #include "sam_twi.h" #include "sam_ssc.h" diff --git a/boards/arm/sama5/sama5d4-ek/src/dram_main.c b/boards/arm/sama5/sama5d4-ek/src/dram_main.c index 619b93369f8..60000193a44 100644 --- a/boards/arm/sama5/sama5d4-ek/src/dram_main.c +++ b/boards/arm/sama5/sama5d4-ek/src/dram_main.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "mmu.h" #include "cp15_cacheops.h" diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_maxtouch.c b/boards/arm/sama5/sama5d4-ek/src/sam_maxtouch.c index 68d1a18411a..8748c03dc38 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_maxtouch.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_maxtouch.c @@ -50,7 +50,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_pio.h" #include "sam_twi.h" diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_nandflash.c b/boards/arm/sama5/sama5d4-ek/src/sam_nandflash.c index 30d9750366e..5e644d107b6 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_nandflash.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_nandflash.c @@ -55,7 +55,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "sam_pio.h" #include "sam_nand.h" diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_ostest.c b/boards/arm/sama5/sama5d4-ek/src/sam_ostest.c index a4c85e692cf..a9e84644805 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_ostest.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_ostest.c @@ -47,8 +47,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sama5d4-ek.h" /**************************************************************************** diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_sdram.c b/boards/arm/sama5/sama5d4-ek/src/sam_sdram.c index 49585a23e02..70e9cd25bdd 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_sdram.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_sdram.c @@ -144,7 +144,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "hardware/sam_memorymap.h" diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_spi.c b/boards/arm/sama5/sama5d4-ek/src/sam_spi.c index 1a33a302577..13419582246 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_spi.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "sam_pio.h" #include "sam_spi.h" diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_usb.c b/boards/arm/sama5/sama5d4-ek/src/sam_usb.c index f0a9ec3e561..15f77996f54 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_usb.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_usb.c @@ -53,7 +53,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_pio.h" #include "sam_usbhost.h" #include "hardware/sam_ohci.h" diff --git a/boards/arm/sama5/sama5d4-ek/src/sam_wm8904.c b/boards/arm/sama5/sama5d4-ek/src/sam_wm8904.c index 8b5843ee83b..5df596b5dff 100644 --- a/boards/arm/sama5/sama5d4-ek/src/sam_wm8904.c +++ b/boards/arm/sama5/sama5d4-ek/src/sam_wm8904.c @@ -53,7 +53,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_pio.h" #include "sam_twi.h" #include "sam_ssc.h" diff --git a/boards/arm/samd5e5/metro-m4/src/sam_autoleds.c b/boards/arm/samd5e5/metro-m4/src/sam_autoleds.c index 69529e049ab..3139d45fb73 100644 --- a/boards/arm/samd5e5/metro-m4/src/sam_autoleds.c +++ b/boards/arm/samd5e5/metro-m4/src/sam_autoleds.c @@ -79,8 +79,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_port.h" #include "metro-m4.h" diff --git a/boards/arm/samd5e5/metro-m4/src/sam_userleds.c b/boards/arm/samd5e5/metro-m4/src/sam_userleds.c index 34582d71575..96050ca0d0a 100644 --- a/boards/arm/samd5e5/metro-m4/src/sam_userleds.c +++ b/boards/arm/samd5e5/metro-m4/src/sam_userleds.c @@ -60,7 +60,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_port.h" #include "metro-m4.h" diff --git a/boards/arm/samd5e5/same54-xplained-pro/src/sam_autoleds.c b/boards/arm/samd5e5/same54-xplained-pro/src/sam_autoleds.c index 5ebec70d68b..a850e2b150f 100644 --- a/boards/arm/samd5e5/same54-xplained-pro/src/sam_autoleds.c +++ b/boards/arm/samd5e5/same54-xplained-pro/src/sam_autoleds.c @@ -75,8 +75,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "sam_port.h" #include "same54-xplained-pro.h" diff --git a/boards/arm/samd5e5/same54-xplained-pro/src/sam_userleds.c b/boards/arm/samd5e5/same54-xplained-pro/src/sam_userleds.c index 36d3c20950e..3b956b6d1d5 100644 --- a/boards/arm/samd5e5/same54-xplained-pro/src/sam_userleds.c +++ b/boards/arm/samd5e5/same54-xplained-pro/src/sam_userleds.c @@ -57,7 +57,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_port.h" #include "same54-xplained-pro.h" diff --git a/boards/arm/samv7/same70-xplained/src/sam_boot.c b/boards/arm/samv7/same70-xplained/src/sam_boot.c index 9837a9e07a8..8ca7aa20903 100644 --- a/boards/arm/samv7/same70-xplained/src/sam_boot.c +++ b/boards/arm/samv7/same70-xplained/src/sam_boot.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_start.h" #include "sam_pck.h" #include "same70-xplained.h" diff --git a/boards/arm/samv7/same70-xplained/src/sam_buttons.c b/boards/arm/samv7/same70-xplained/src/sam_buttons.c index bc46c0b4b55..9da506592ab 100644 --- a/boards/arm/samv7/same70-xplained/src/sam_buttons.c +++ b/boards/arm/samv7/same70-xplained/src/sam_buttons.c @@ -49,7 +49,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "hardware/sam_matrix.h" #include "same70-xplained.h" diff --git a/boards/arm/samv7/same70-xplained/src/sam_dac.c b/boards/arm/samv7/same70-xplained/src/sam_dac.c index e16dd8efd56..dbc484f3ab0 100644 --- a/boards/arm/samv7/same70-xplained/src/sam_dac.c +++ b/boards/arm/samv7/same70-xplained/src/sam_dac.c @@ -46,7 +46,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "sam_dac.h" #include "same70-xplained.h" diff --git a/boards/arm/samv7/same70-xplained/src/sam_sdram.c b/boards/arm/samv7/same70-xplained/src/sam_sdram.c index 871b6047d63..3d3453d5749 100644 --- a/boards/arm/samv7/same70-xplained/src/sam_sdram.c +++ b/boards/arm/samv7/same70-xplained/src/sam_sdram.c @@ -51,7 +51,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "hardware/sam_memorymap.h" diff --git a/boards/arm/samv7/same70-xplained/src/sam_spi.c b/boards/arm/samv7/same70-xplained/src/sam_spi.c index aa08fb89d4d..0edcf904620 100644 --- a/boards/arm/samv7/same70-xplained/src/sam_spi.c +++ b/boards/arm/samv7/same70-xplained/src/sam_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "sam_gpio.h" #include "sam_spi.h" diff --git a/boards/arm/samv7/same70-xplained/src/sam_usbdev.c b/boards/arm/samv7/same70-xplained/src/sam_usbdev.c index 73450540c67..4f0c048bcc0 100644 --- a/boards/arm/samv7/same70-xplained/src/sam_usbdev.c +++ b/boards/arm/samv7/same70-xplained/src/sam_usbdev.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "same70-xplained.h" diff --git a/boards/arm/samv7/samv71-xult/src/sam_boot.c b/boards/arm/samv7/samv71-xult/src/sam_boot.c index 125a8350cc0..3207e4a8958 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_boot.c +++ b/boards/arm/samv7/samv71-xult/src/sam_boot.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_start.h" #include "sam_pck.h" #include "samv71-xult.h" diff --git a/boards/arm/samv7/samv71-xult/src/sam_buttons.c b/boards/arm/samv7/samv71-xult/src/sam_buttons.c index 353605bdbab..b47239d42d9 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_buttons.c +++ b/boards/arm/samv7/samv71-xult/src/sam_buttons.c @@ -49,7 +49,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "hardware/sam_matrix.h" #include "samv71-xult.h" diff --git a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c index fb14b9fd635..020b59b5c44 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c +++ b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c @@ -140,7 +140,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "sam_periphclks.h" #include "sam_xdmac.h" diff --git a/boards/arm/samv7/samv71-xult/src/sam_maxtouch.c b/boards/arm/samv7/samv71-xult/src/sam_maxtouch.c index a87afcbe876..673f2ee729b 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_maxtouch.c +++ b/boards/arm/samv7/samv71-xult/src/sam_maxtouch.c @@ -50,7 +50,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "sam_twihs.h" diff --git a/boards/arm/samv7/samv71-xult/src/sam_sdram.c b/boards/arm/samv7/samv71-xult/src/sam_sdram.c index f3d82d2bbfd..55e76283f98 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_sdram.c +++ b/boards/arm/samv7/samv71-xult/src/sam_sdram.c @@ -51,7 +51,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_periphclks.h" #include "hardware/sam_memorymap.h" diff --git a/boards/arm/samv7/samv71-xult/src/sam_spi.c b/boards/arm/samv7/samv71-xult/src/sam_spi.c index 31d69afc285..df77e292a4a 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_spi.c +++ b/boards/arm/samv7/samv71-xult/src/sam_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "sam_gpio.h" #include "sam_spi.h" diff --git a/boards/arm/samv7/samv71-xult/src/sam_usbdev.c b/boards/arm/samv7/samv71-xult/src/sam_usbdev.c index 4eae7629142..a51c63982b1 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_usbdev.c +++ b/boards/arm/samv7/samv71-xult/src/sam_usbdev.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "samv71-xult.h" diff --git a/boards/arm/samv7/samv71-xult/src/sam_wm8904.c b/boards/arm/samv7/samv71-xult/src/sam_wm8904.c index 2ec90a4c1ae..051c1727434 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_wm8904.c +++ b/boards/arm/samv7/samv71-xult/src/sam_wm8904.c @@ -53,7 +53,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "sam_gpio.h" #include "sam_twihs.h" #include "sam_ssc.h" diff --git a/boards/arm/stm32/axoloti/src/stm32_boot.c b/boards/arm/stm32/axoloti/src/stm32_boot.c index 45fef1f1c10..9dbc67d32ea 100644 --- a/boards/arm/stm32/axoloti/src/stm32_boot.c +++ b/boards/arm/stm32/axoloti/src/stm32_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "itm.h" diff --git a/boards/arm/stm32/axoloti/src/stm32_extmem.c b/boards/arm/stm32/axoloti/src/stm32_extmem.c index 518d9d2fedf..08b885dd696 100644 --- a/boards/arm/stm32/axoloti/src/stm32_extmem.c +++ b/boards/arm/stm32/axoloti/src/stm32_extmem.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "axoloti.h" diff --git a/boards/arm/stm32/axoloti/src/stm32_usbhost.c b/boards/arm/stm32/axoloti/src/stm32_usbhost.c index 2ff87200366..8490c0e2b28 100644 --- a/boards/arm/stm32/axoloti/src/stm32_usbhost.c +++ b/boards/arm/stm32/axoloti/src/stm32_usbhost.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_otghs.h" #include "axoloti.h" diff --git a/boards/arm/stm32/axoloti/src/stm32_userleds.c b/boards/arm/stm32/axoloti/src/stm32_userleds.c index c6a97870c0b..c27d5617834 100644 --- a/boards/arm/stm32/axoloti/src/stm32_userleds.c +++ b/boards/arm/stm32/axoloti/src/stm32_userleds.c @@ -48,8 +48,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "axoloti.h" diff --git a/boards/arm/stm32/clicker2-stm32/src/stm32_spi.c b/boards/arm/stm32/clicker2-stm32/src/stm32_spi.c index ee37bc651eb..7889a7150f9 100644 --- a/boards/arm/stm32/clicker2-stm32/src/stm32_spi.c +++ b/boards/arm/stm32/clicker2-stm32/src/stm32_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/boards/arm/stm32/cloudctrl/src/stm32_adc.c b/boards/arm/stm32/cloudctrl/src/stm32_adc.c index 38aa3c94b31..8791f855527 100644 --- a/boards/arm/stm32/cloudctrl/src/stm32_adc.c +++ b/boards/arm/stm32/cloudctrl/src/stm32_adc.c @@ -48,7 +48,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "cloudctrl.h" diff --git a/boards/arm/stm32/cloudctrl/src/stm32_autoleds.c b/boards/arm/stm32/cloudctrl/src/stm32_autoleds.c index 063914dd8d4..4618f7694a9 100644 --- a/boards/arm/stm32/cloudctrl/src/stm32_autoleds.c +++ b/boards/arm/stm32/cloudctrl/src/stm32_autoleds.c @@ -49,8 +49,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "cloudctrl.h" diff --git a/boards/arm/stm32/cloudctrl/src/stm32_boot.c b/boards/arm/stm32/cloudctrl/src/stm32_boot.c index 67cf9bf0365..bdd008b7799 100644 --- a/boards/arm/stm32/cloudctrl/src/stm32_boot.c +++ b/boards/arm/stm32/cloudctrl/src/stm32_boot.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "cloudctrl.h" /**************************************************************************** diff --git a/boards/arm/stm32/cloudctrl/src/stm32_chipid.c b/boards/arm/stm32/cloudctrl/src/stm32_chipid.c index 6744c796c5b..9c3702e5560 100644 --- a/boards/arm/stm32/cloudctrl/src/stm32_chipid.c +++ b/boards/arm/stm32/cloudctrl/src/stm32_chipid.c @@ -44,7 +44,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" /**************************************************************************** * Pre-processor Definitions diff --git a/boards/arm/stm32/cloudctrl/src/stm32_spi.c b/boards/arm/stm32/cloudctrl/src/stm32_spi.c index 125df988de3..0096a82d9c2 100644 --- a/boards/arm/stm32/cloudctrl/src/stm32_spi.c +++ b/boards/arm/stm32/cloudctrl/src/stm32_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "cloudctrl.h" diff --git a/boards/arm/stm32/cloudctrl/src/stm32_usb.c b/boards/arm/stm32/cloudctrl/src/stm32_usb.c index c581a5a8498..28b8c3e3dab 100644 --- a/boards/arm/stm32/cloudctrl/src/stm32_usb.c +++ b/boards/arm/stm32/cloudctrl/src/stm32_usb.c @@ -53,7 +53,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_otgfs.h" #include "cloudctrl.h" diff --git a/boards/arm/stm32/cloudctrl/src/stm32_userleds.c b/boards/arm/stm32/cloudctrl/src/stm32_userleds.c index ee8c8128f2d..881c86c966c 100644 --- a/boards/arm/stm32/cloudctrl/src/stm32_userleds.c +++ b/boards/arm/stm32/cloudctrl/src/stm32_userleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "cloudctrl.h" diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_autoleds.c b/boards/arm/stm32/fire-stm32v2/src/stm32_autoleds.c index 9109f13f0bb..5543f00f131 100644 --- a/boards/arm/stm32/fire-stm32v2/src/stm32_autoleds.c +++ b/boards/arm/stm32/fire-stm32v2/src/stm32_autoleds.c @@ -48,8 +48,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "fire-stm32v2.h" diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_boot.c b/boards/arm/stm32/fire-stm32v2/src/stm32_boot.c index 00a184d6d72..0a9cfb26c56 100644 --- a/boards/arm/stm32/fire-stm32v2/src/stm32_boot.c +++ b/boards/arm/stm32/fire-stm32v2/src/stm32_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "fire-stm32v2.h" /**************************************************************************** diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c b/boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c index 86de6d3b60a..da3915ada25 100644 --- a/boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c +++ b/boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c @@ -61,8 +61,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_spi.h" #include "fire-stm32v2.h" diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_selectlcd.c b/boards/arm/stm32/fire-stm32v2/src/stm32_selectlcd.c index 71228db14e7..6160e7f95d3 100644 --- a/boards/arm/stm32/fire-stm32v2/src/stm32_selectlcd.c +++ b/boards/arm/stm32/fire-stm32v2/src/stm32_selectlcd.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_gpio.h" #include "stm32.h" diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_spi.c b/boards/arm/stm32/fire-stm32v2/src/stm32_spi.c index 3f85c0665d6..458c789c212 100644 --- a/boards/arm/stm32/fire-stm32v2/src/stm32_spi.c +++ b/boards/arm/stm32/fire-stm32v2/src/stm32_spi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "fire-stm32v2.h" diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_usbdev.c b/boards/arm/stm32/fire-stm32v2/src/stm32_usbdev.c index f969a5604ea..5309d2a5e2f 100644 --- a/boards/arm/stm32/fire-stm32v2/src/stm32_usbdev.c +++ b/boards/arm/stm32/fire-stm32v2/src/stm32_usbdev.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "fire-stm32v2.h" diff --git a/boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c b/boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c index e2b26c36d08..dc71267c765 100644 --- a/boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c +++ b/boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "fire-stm32v2.h" diff --git a/boards/arm/stm32/hymini-stm32v/src/stm32_boot.c b/boards/arm/stm32/hymini-stm32v/src/stm32_boot.c index 8d07ad11be2..6e6dd2ac0a9 100644 --- a/boards/arm/stm32/hymini-stm32v/src/stm32_boot.c +++ b/boards/arm/stm32/hymini-stm32v/src/stm32_boot.c @@ -44,7 +44,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "hymini-stm32v.h" #include /* Should always be included last due to dependencies */ diff --git a/boards/arm/stm32/hymini-stm32v/src/stm32_leds.c b/boards/arm/stm32/hymini-stm32v/src/stm32_leds.c index e22269f34d9..83365571e31 100644 --- a/boards/arm/stm32/hymini-stm32v/src/stm32_leds.c +++ b/boards/arm/stm32/hymini-stm32v/src/stm32_leds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "hymini-stm32v.h" diff --git a/boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c b/boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c index 4e4607e4ed2..efa3cf50854 100644 --- a/boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c +++ b/boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c @@ -54,7 +54,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "hymini-stm32v.h" diff --git a/boards/arm/stm32/hymini-stm32v/src/stm32_spi.c b/boards/arm/stm32/hymini-stm32v/src/stm32_spi.c index 158f0a0e158..7d4680119a9 100644 --- a/boards/arm/stm32/hymini-stm32v/src/stm32_spi.c +++ b/boards/arm/stm32/hymini-stm32v/src/stm32_spi.c @@ -46,7 +46,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "hymini-stm32v.h" diff --git a/boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c b/boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c index 880210089ca..354e9dd2f81 100644 --- a/boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c +++ b/boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "hymini-stm32v.h" diff --git a/boards/arm/stm32/hymini-stm32v/src/stm32_usbdev.c b/boards/arm/stm32/hymini-stm32v/src/stm32_usbdev.c index 651f0f13da1..11380fa214f 100644 --- a/boards/arm/stm32/hymini-stm32v/src/stm32_usbdev.c +++ b/boards/arm/stm32/hymini-stm32v/src/stm32_usbdev.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "hymini-stm32v.h" diff --git a/boards/arm/stm32/maple/src/stm32_boot.c b/boards/arm/stm32/maple/src/stm32_boot.c index b223267291e..1c60dd87c10 100644 --- a/boards/arm/stm32/maple/src/stm32_boot.c +++ b/boards/arm/stm32/maple/src/stm32_boot.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "maple.h" /**************************************************************************** diff --git a/boards/arm/stm32/maple/src/stm32_lcd.c b/boards/arm/stm32/maple/src/stm32_lcd.c index c4015ccdc12..09c66083894 100644 --- a/boards/arm/stm32/maple/src/stm32_lcd.c +++ b/boards/arm/stm32/maple/src/stm32_lcd.c @@ -54,8 +54,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "maple.h" diff --git a/boards/arm/stm32/maple/src/stm32_leds.c b/boards/arm/stm32/maple/src/stm32_leds.c index aeb7006d987..f91d590f96a 100644 --- a/boards/arm/stm32/maple/src/stm32_leds.c +++ b/boards/arm/stm32/maple/src/stm32_leds.c @@ -48,8 +48,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "maple.h" diff --git a/boards/arm/stm32/maple/src/stm32_spi.c b/boards/arm/stm32/maple/src/stm32_spi.c index a3c8eabe050..d24a361039d 100644 --- a/boards/arm/stm32/maple/src/stm32_spi.c +++ b/boards/arm/stm32/maple/src/stm32_spi.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "maple.h" diff --git a/boards/arm/stm32/maple/src/stm32_usbdev.c b/boards/arm/stm32/maple/src/stm32_usbdev.c index bbf926865c1..a3e3d0f9331 100644 --- a/boards/arm/stm32/maple/src/stm32_usbdev.c +++ b/boards/arm/stm32/maple/src/stm32_usbdev.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "maple.h" diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_boot.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_boot.c index 7e0967e7188..3844b139e68 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_boot.c +++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_boot.c @@ -43,7 +43,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "mikroe-stm32f4.h" /**************************************************************************** diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_clockconfig.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_clockconfig.c index 85395e8358f..f1eb23f5482 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_clockconfig.c +++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_clockconfig.c @@ -43,7 +43,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "mikroe-stm32f4.h" /**************************************************************************** diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_extmem.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_extmem.c index b8e8910c9e3..864c34ffaf5 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_extmem.c +++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_extmem.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_gpio.h" #include "stm32.h" diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_idle.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_idle.c index 983aee78178..272784cfa09 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_idle.c +++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_idle.c @@ -51,7 +51,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "stm32_pm.h" #include "stm32_rcc.h" #include "stm32_exti.h" diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt2.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt2.c index 6da0277a2d0..28e09dd0e96 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt2.c +++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt2.c @@ -57,7 +57,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_gpio.h" #include "mikroe-stm32f4.h" diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt9a.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt9a.c index e770e7a74b7..469de4d6ae3 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt9a.c +++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt9a.c @@ -58,7 +58,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_gpio.h" #include "mikroe-stm32f4.h" diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_pm.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_pm.c index c5eb21bc9a5..cc7bf9dbafd 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_pm.c +++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_pm.c @@ -42,7 +42,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "stm32_pm.h" #include "mikroe-stm32f4.h" diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_pwm.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_pwm.c index 91cd9f85875..2623bd52eb9 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_pwm.c +++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_pwm.c @@ -48,7 +48,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "mikroe-stm32f4.h" diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_qencoder.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_qencoder.c index a34a69aa0ec..654be4b249e 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_qencoder.c +++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_qencoder.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_qencoder.h" #include "mikroe-stm32f4.h" diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_spi.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_spi.c index db4e960a66d..bff71d490c9 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_spi.c +++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_spi.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "mikroe-stm32f4.h" diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c index edd209bfd21..926bcdae7e6 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c +++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c @@ -58,8 +58,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_adc.h" #include "stm32_gpio.h" diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_usb.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_usb.c index 16fd33f5949..f7ad77025f9 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_usb.c +++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_usb.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_otgfs.h" #include "mikroe-stm32f4.h" diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_vs1053.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_vs1053.c index 4ae7fd5e9e6..10bb4471362 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_vs1053.c +++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_vs1053.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "mikroe-stm32f4.h" #ifdef CONFIG_AUDIO_VS1053 diff --git a/boards/arm/stm32/nucleo-f103rb/src/stm32_pwm.c b/boards/arm/stm32/nucleo-f103rb/src/stm32_pwm.c index e7810b245cf..9ac9e477d90 100644 --- a/boards/arm/stm32/nucleo-f103rb/src/stm32_pwm.c +++ b/boards/arm/stm32/nucleo-f103rb/src/stm32_pwm.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "nucleo-f103rb.h" diff --git a/boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c index 27efc4ae16e..f4b666480c8 100644 --- a/boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c +++ b/boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_start.h" #include "nucleo-f207zg.h" diff --git a/boards/arm/stm32/nucleo-f207zg/src/stm32_pwm.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_pwm.c index 4d95e20c91f..01dd52a2ecb 100644 --- a/boards/arm/stm32/nucleo-f207zg/src/stm32_pwm.c +++ b/boards/arm/stm32/nucleo-f207zg/src/stm32_pwm.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "nucleo-f207zg.h" diff --git a/boards/arm/stm32/nucleo-f207zg/src/stm32_usb.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_usb.c index fa6f7dfb6f5..02c4415ea00 100644 --- a/boards/arm/stm32/nucleo-f207zg/src/stm32_usb.c +++ b/boards/arm/stm32/nucleo-f207zg/src/stm32_usb.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_otgfs.h" diff --git a/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c index 84c62bf0c6f..65aca97c90b 100644 --- a/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c +++ b/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c @@ -53,7 +53,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "ram_vectors.h" #include "stm32_pwm.h" diff --git a/boards/arm/stm32/nucleo-f302r8/src/stm32_pwm.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_pwm.c index ff5f284e5ff..f8fcefd5d2c 100644 --- a/boards/arm/stm32/nucleo-f302r8/src/stm32_pwm.c +++ b/boards/arm/stm32/nucleo-f302r8/src/stm32_pwm.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "nucleo-f302r8.h" diff --git a/boards/arm/stm32/nucleo-f303re/src/stm32_spi.c b/boards/arm/stm32/nucleo-f303re/src/stm32_spi.c index 3d76a8d4ef6..4763d1bc5e0 100644 --- a/boards/arm/stm32/nucleo-f303re/src/stm32_spi.c +++ b/boards/arm/stm32/nucleo-f303re/src/stm32_spi.c @@ -49,7 +49,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "nucleo-f303re.h" diff --git a/boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c b/boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c index 285f224c5ac..0575254f2f4 100644 --- a/boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c +++ b/boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_start.h" #include "nucleo-f303ze.h" diff --git a/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c index 1d6bbfa273a..3e3c8be9731 100644 --- a/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c +++ b/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c @@ -53,7 +53,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "ram_vectors.h" #include "stm32_hrtim.h" diff --git a/boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c index fb5d88a0868..931da669729 100644 --- a/boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c +++ b/boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c @@ -52,7 +52,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "ram_vectors.h" #include "stm32_hrtim.h" diff --git a/boards/arm/stm32/nucleo-f410rb/src/stm32_adc.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_adc.c index 31aa0f12be6..fe9fd5ea880 100644 --- a/boards/arm/stm32/nucleo-f410rb/src/stm32_adc.c +++ b/boards/arm/stm32/nucleo-f410rb/src/stm32_adc.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "nucleo-f410rb.h" diff --git a/boards/arm/stm32/nucleo-f410rb/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_autoleds.c index d93d60bd65f..c99d19d7047 100644 --- a/boards/arm/stm32/nucleo-f410rb/src/stm32_autoleds.c +++ b/boards/arm/stm32/nucleo-f410rb/src/stm32_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "nucleo-f410rb.h" diff --git a/boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c index 523cfbe1602..626e0d16443 100644 --- a/boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c +++ b/boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "nucleo-f410rb.h" /**************************************************************************** diff --git a/boards/arm/stm32/nucleo-f410rb/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_userleds.c index 78aa8e702a6..c0df9778d52 100644 --- a/boards/arm/stm32/nucleo-f410rb/src/stm32_userleds.c +++ b/boards/arm/stm32/nucleo-f410rb/src/stm32_userleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "nucleo-f410rb.h" diff --git a/boards/arm/stm32/nucleo-f429zi/src/stm32_bbsram.c b/boards/arm/stm32/nucleo-f429zi/src/stm32_bbsram.c index 91437ad65d3..a1726801d19 100644 --- a/boards/arm/stm32/nucleo-f429zi/src/stm32_bbsram.c +++ b/boards/arm/stm32/nucleo-f429zi/src/stm32_bbsram.c @@ -37,7 +37,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "stm32_bbsram.h" #include "nucleo-144.h" diff --git a/boards/arm/stm32/nucleo-f429zi/src/stm32_boot.c b/boards/arm/stm32/nucleo-f429zi/src/stm32_boot.c index eb4fe85642a..c14075e2f22 100644 --- a/boards/arm/stm32/nucleo-f429zi/src/stm32_boot.c +++ b/boards/arm/stm32/nucleo-f429zi/src/stm32_boot.c @@ -29,7 +29,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "nucleo-144.h" /**************************************************************************** diff --git a/boards/arm/stm32/nucleo-f429zi/src/stm32_pwm.c b/boards/arm/stm32/nucleo-f429zi/src/stm32_pwm.c index 0a21395cf9b..feff276b3aa 100644 --- a/boards/arm/stm32/nucleo-f429zi/src/stm32_pwm.c +++ b/boards/arm/stm32/nucleo-f429zi/src/stm32_pwm.c @@ -33,7 +33,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "nucleo-144.h" diff --git a/boards/arm/stm32/nucleo-f429zi/src/stm32_spi.c b/boards/arm/stm32/nucleo-f429zi/src/stm32_spi.c index 504e8008c32..699149a2010 100644 --- a/boards/arm/stm32/nucleo-f429zi/src/stm32_spi.c +++ b/boards/arm/stm32/nucleo-f429zi/src/stm32_spi.c @@ -32,7 +32,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_spi.h" diff --git a/boards/arm/stm32/nucleo-f429zi/src/stm32_usb.c b/boards/arm/stm32/nucleo-f429zi/src/stm32_usb.c index bdddea6c8fd..bac2816d339 100644 --- a/boards/arm/stm32/nucleo-f429zi/src/stm32_usb.c +++ b/boards/arm/stm32/nucleo-f429zi/src/stm32_usb.c @@ -37,7 +37,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_otg.h" diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_adc.c b/boards/arm/stm32/nucleo-f446re/src/stm32_adc.c index 74396ff7602..cb1ce85caf9 100644 --- a/boards/arm/stm32/nucleo-f446re/src/stm32_adc.c +++ b/boards/arm/stm32/nucleo-f446re/src/stm32_adc.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "nucleo-f446re.h" diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f446re/src/stm32_autoleds.c index 62614d40a7a..aab8bed228f 100644 --- a/boards/arm/stm32/nucleo-f446re/src/stm32_autoleds.c +++ b/boards/arm/stm32/nucleo-f446re/src/stm32_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "nucleo-f446re.h" diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_boot.c b/boards/arm/stm32/nucleo-f446re/src/stm32_boot.c index f85d00ebfc7..dad49e85518 100644 --- a/boards/arm/stm32/nucleo-f446re/src/stm32_boot.c +++ b/boards/arm/stm32/nucleo-f446re/src/stm32_boot.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nucleo-f446re.h" /**************************************************************************** diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_qencoder.c b/boards/arm/stm32/nucleo-f446re/src/stm32_qencoder.c index 0ba00dce48e..4f6e6e37ef1 100644 --- a/boards/arm/stm32/nucleo-f446re/src/stm32_qencoder.c +++ b/boards/arm/stm32/nucleo-f446re/src/stm32_qencoder.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_qencoder.h" #include "nucleo-f446re.h" diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_spi.c b/boards/arm/stm32/nucleo-f446re/src/stm32_spi.c index 87578d1c228..f9518ea4f97 100644 --- a/boards/arm/stm32/nucleo-f446re/src/stm32_spi.c +++ b/boards/arm/stm32/nucleo-f446re/src/stm32_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f446re/src/stm32_userleds.c index 058d9102dc3..80019cefc50 100644 --- a/boards/arm/stm32/nucleo-f446re/src/stm32_userleds.c +++ b/boards/arm/stm32/nucleo-f446re/src/stm32_userleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "nucleo-f446re.h" diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c index e370117c296..8fa77eaaf0d 100644 --- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c +++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "nucleo-f4x1re.h" diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c index 6c25ced0642..0273933b41a 100644 --- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c +++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "nucleo-f4x1re.h" diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c index 240baf561b6..bb13505bbb3 100644 --- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c +++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c @@ -47,7 +47,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nucleo-f4x1re.h" #include diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_qencoder.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_qencoder.c index aef64c37342..e5b7edaea54 100644 --- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_qencoder.c +++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_qencoder.c @@ -45,7 +45,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_qencoder.h" #include "nucleo-f4x1re.h" diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c index 7d4762fd4bc..34f9a47f978 100644 --- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c +++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c @@ -46,7 +46,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c index 5eb688469b9..c18c51d3b3e 100644 --- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c +++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "nucleo-f4x1re.h" diff --git a/boards/arm/stm32/olimex-stm32-e407/src/stm32_autoleds.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_autoleds.c index 2568f0e0ac7..3e475135dfc 100644 --- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_autoleds.c +++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "olimex-stm32-e407.h" diff --git a/boards/arm/stm32/olimex-stm32-e407/src/stm32_boot.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_boot.c index c0a2b8a3235..1231233e2d3 100644 --- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_boot.c +++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_boot.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_ccm.h" #include "stm32.h" #include "stm32_i2c.h" diff --git a/boards/arm/stm32/olimex-stm32-e407/src/stm32_spi.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_spi.c index beedc3e2edd..25c13c680bb 100644 --- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_spi.c +++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_spi.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "olimex-stm32-e407.h" diff --git a/boards/arm/stm32/olimex-stm32-e407/src/stm32_usb.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_usb.c index 7dffead3b89..e74a49c5afc 100644 --- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_usb.c +++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_usb.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_otgfs.h" #include "olimex-stm32-e407.h" diff --git a/boards/arm/stm32/olimex-stm32-e407/src/stm32_userleds.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_userleds.c index 1111c469dcc..4528255aae5 100644 --- a/boards/arm/stm32/olimex-stm32-e407/src/stm32_userleds.c +++ b/boards/arm/stm32/olimex-stm32-e407/src/stm32_userleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "olimex-stm32-e407.h" diff --git a/boards/arm/stm32/olimex-stm32-h407/src/stm32_autoleds.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_autoleds.c index 22786ee310c..d0772986bff 100644 --- a/boards/arm/stm32/olimex-stm32-h407/src/stm32_autoleds.c +++ b/boards/arm/stm32/olimex-stm32-h407/src/stm32_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "olimex-stm32-h407.h" diff --git a/boards/arm/stm32/olimex-stm32-h407/src/stm32_boot.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_boot.c index 9eed69e684e..512cb7b576f 100644 --- a/boards/arm/stm32/olimex-stm32-h407/src/stm32_boot.c +++ b/boards/arm/stm32/olimex-stm32-h407/src/stm32_boot.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "olimex-stm32-h407.h" #include "stm32_ccm.h" diff --git a/boards/arm/stm32/olimex-stm32-h407/src/stm32_usb.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_usb.c index f3862ac7a7b..1c4c6ee5955 100644 --- a/boards/arm/stm32/olimex-stm32-h407/src/stm32_usb.c +++ b/boards/arm/stm32/olimex-stm32-h407/src/stm32_usb.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_otgfs.h" #include "stm32_otghs.h" diff --git a/boards/arm/stm32/olimex-stm32-h407/src/stm32_userleds.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_userleds.c index c36d0072308..80832074be4 100644 --- a/boards/arm/stm32/olimex-stm32-h407/src/stm32_userleds.c +++ b/boards/arm/stm32/olimex-stm32-h407/src/stm32_userleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "olimex-stm32-h407.h" diff --git a/boards/arm/stm32/olimex-stm32-p107/src/stm32_boot.c b/boards/arm/stm32/olimex-stm32-p107/src/stm32_boot.c index 722451eabb5..77e55a0d6a8 100644 --- a/boards/arm/stm32/olimex-stm32-p107/src/stm32_boot.c +++ b/boards/arm/stm32/olimex-stm32-p107/src/stm32_boot.c @@ -41,7 +41,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "olimex-stm32-p107.h" /**************************************************************************** diff --git a/boards/arm/stm32/olimex-stm32-p107/src/stm32_can.c b/boards/arm/stm32/olimex-stm32-p107/src/stm32_can.c index 3a42308ce8a..414ae0b689e 100644 --- a/boards/arm/stm32/olimex-stm32-p107/src/stm32_can.c +++ b/boards/arm/stm32/olimex-stm32-p107/src/stm32_can.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/arm/stm32/olimex-stm32-p107/src/stm32_encx24j600.c b/boards/arm/stm32/olimex-stm32-p107/src/stm32_encx24j600.c index 98fc50ee6d5..f40ccdb50eb 100644 --- a/boards/arm/stm32/olimex-stm32-p107/src/stm32_encx24j600.c +++ b/boards/arm/stm32/olimex-stm32-p107/src/stm32_encx24j600.c @@ -49,8 +49,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_spi.h" #include "olimex-stm32-p107.h" diff --git a/boards/arm/stm32/olimex-stm32-p107/src/stm32_spi.c b/boards/arm/stm32/olimex-stm32-p107/src/stm32_spi.c index 8bfb621b412..8ef726ce695 100644 --- a/boards/arm/stm32/olimex-stm32-p107/src/stm32_spi.c +++ b/boards/arm/stm32/olimex-stm32-p107/src/stm32_spi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/boards/arm/stm32/olimex-stm32-p407/src/stm32_sram.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_sram.c index 6d6621ffae1..a66f9d746ae 100644 --- a/boards/arm/stm32/olimex-stm32-p407/src/stm32_sram.c +++ b/boards/arm/stm32/olimex-stm32-p407/src/stm32_sram.c @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3240g-eval.h" diff --git a/boards/arm/stm32/olimex-stm32-p407/src/stm32_usb.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_usb.c index 6e9f004181b..7494db02c9b 100644 --- a/boards/arm/stm32/olimex-stm32-p407/src/stm32_usb.c +++ b/boards/arm/stm32/olimex-stm32-p407/src/stm32_usb.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_otgfs.h" #include "olimex-stm32-p407.h" diff --git a/boards/arm/stm32/olimexino-stm32/src/stm32_can.c b/boards/arm/stm32/olimexino-stm32/src/stm32_can.c index df647bc1ab4..0d331e9b6e6 100644 --- a/boards/arm/stm32/olimexino-stm32/src/stm32_can.c +++ b/boards/arm/stm32/olimexino-stm32/src/stm32_can.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/arm/stm32/omnibusf4/src/stm32_boot.c b/boards/arm/stm32/omnibusf4/src/stm32_boot.c index 38efa5e335e..b680e419b10 100644 --- a/boards/arm/stm32/omnibusf4/src/stm32_boot.c +++ b/boards/arm/stm32/omnibusf4/src/stm32_boot.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "itm.h" diff --git a/boards/arm/stm32/omnibusf4/src/stm32_critmon.c b/boards/arm/stm32/omnibusf4/src/stm32_critmon.c index d199222169a..6d7761cb4cc 100644 --- a/boards/arm/stm32/omnibusf4/src/stm32_critmon.c +++ b/boards/arm/stm32/omnibusf4/src/stm32_critmon.c @@ -43,7 +43,7 @@ #include #include "dwt.h" -#include "up_arch.h" +#include "arm_arch.h" #include diff --git a/boards/arm/stm32/omnibusf4/src/stm32_idle.c b/boards/arm/stm32/omnibusf4/src/stm32_idle.c index 14b073b103c..7fc2be0c59a 100644 --- a/boards/arm/stm32/omnibusf4/src/stm32_idle.c +++ b/boards/arm/stm32/omnibusf4/src/stm32_idle.c @@ -51,7 +51,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "stm32_pm.h" #include "stm32_rcc.h" #include "stm32_exti.h" diff --git a/boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c b/boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c index 0dce60da54b..be623b6f17a 100644 --- a/boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c +++ b/boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/boards/arm/stm32/omnibusf4/src/stm32_ostest.c b/boards/arm/stm32/omnibusf4/src/stm32_ostest.c index 834f589ac41..692462e3d76 100644 --- a/boards/arm/stm32/omnibusf4/src/stm32_ostest.c +++ b/boards/arm/stm32/omnibusf4/src/stm32_ostest.c @@ -47,8 +47,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "omnibusf4.h" /**************************************************************************** diff --git a/boards/arm/stm32/omnibusf4/src/stm32_pm.c b/boards/arm/stm32/omnibusf4/src/stm32_pm.c index c449a228e46..0682aa903c3 100644 --- a/boards/arm/stm32/omnibusf4/src/stm32_pm.c +++ b/boards/arm/stm32/omnibusf4/src/stm32_pm.c @@ -43,7 +43,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "stm32_pm.h" #include "omnibusf4.h" diff --git a/boards/arm/stm32/omnibusf4/src/stm32_pwm.c b/boards/arm/stm32/omnibusf4/src/stm32_pwm.c index 8fc5051552e..9234aafb9e4 100644 --- a/boards/arm/stm32/omnibusf4/src/stm32_pwm.c +++ b/boards/arm/stm32/omnibusf4/src/stm32_pwm.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "omnibusf4.h" diff --git a/boards/arm/stm32/omnibusf4/src/stm32_spi.c b/boards/arm/stm32/omnibusf4/src/stm32_spi.c index b00bc59f249..fd7a67ad8af 100644 --- a/boards/arm/stm32/omnibusf4/src/stm32_spi.c +++ b/boards/arm/stm32/omnibusf4/src/stm32_spi.c @@ -49,7 +49,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/boards/arm/stm32/omnibusf4/src/stm32_usb.c b/boards/arm/stm32/omnibusf4/src/stm32_usb.c index c2e092901c5..32946a506f2 100644 --- a/boards/arm/stm32/omnibusf4/src/stm32_usb.c +++ b/boards/arm/stm32/omnibusf4/src/stm32_usb.c @@ -54,7 +54,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_otgfs.h" #include "omnibusf4.h" diff --git a/boards/arm/stm32/omnibusf4/src/stm32_userleds.c b/boards/arm/stm32/omnibusf4/src/stm32_userleds.c index cfcb8e4c8a4..287283da760 100644 --- a/boards/arm/stm32/omnibusf4/src/stm32_userleds.c +++ b/boards/arm/stm32/omnibusf4/src/stm32_userleds.c @@ -50,8 +50,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "omnibusf4.h" diff --git a/boards/arm/stm32/photon/src/stm32_boot.c b/boards/arm/stm32/photon/src/stm32_boot.c index bd0226c5b97..e61746dfe12 100644 --- a/boards/arm/stm32/photon/src/stm32_boot.c +++ b/boards/arm/stm32/photon/src/stm32_boot.c @@ -42,7 +42,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "photon.h" /**************************************************************************** diff --git a/boards/arm/stm32/photon/src/stm32_rgbled.c b/boards/arm/stm32/photon/src/stm32_rgbled.c index c6680c87fa9..986e4f3891c 100644 --- a/boards/arm/stm32/photon/src/stm32_rgbled.c +++ b/boards/arm/stm32/photon/src/stm32_rgbled.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "photon.h" diff --git a/boards/arm/stm32/photon/src/stm32_spi.c b/boards/arm/stm32/photon/src/stm32_spi.c index d570af55ebb..e1eca5f8512 100644 --- a/boards/arm/stm32/photon/src/stm32_spi.c +++ b/boards/arm/stm32/photon/src/stm32_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/boards/arm/stm32/shenzhou/src/stm32_adc.c b/boards/arm/stm32/shenzhou/src/stm32_adc.c index 8a9d8fec8dd..2086ec67dee 100644 --- a/boards/arm/stm32/shenzhou/src/stm32_adc.c +++ b/boards/arm/stm32/shenzhou/src/stm32_adc.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "shenzhou.h" diff --git a/boards/arm/stm32/shenzhou/src/stm32_autoleds.c b/boards/arm/stm32/shenzhou/src/stm32_autoleds.c index abb9268b9c6..89048cf523f 100644 --- a/boards/arm/stm32/shenzhou/src/stm32_autoleds.c +++ b/boards/arm/stm32/shenzhou/src/stm32_autoleds.c @@ -48,8 +48,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "shenzhou.h" diff --git a/boards/arm/stm32/shenzhou/src/stm32_boot.c b/boards/arm/stm32/shenzhou/src/stm32_boot.c index 9087724cc32..3fb9b84b7a1 100644 --- a/boards/arm/stm32/shenzhou/src/stm32_boot.c +++ b/boards/arm/stm32/shenzhou/src/stm32_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "shenzhou.h" /**************************************************************************** diff --git a/boards/arm/stm32/shenzhou/src/stm32_can.c b/boards/arm/stm32/shenzhou/src/stm32_can.c index 949bf39062a..6c0e52432f9 100644 --- a/boards/arm/stm32/shenzhou/src/stm32_can.c +++ b/boards/arm/stm32/shenzhou/src/stm32_can.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/arm/stm32/shenzhou/src/stm32_chipid.c b/boards/arm/stm32/shenzhou/src/stm32_chipid.c index c82b4b91185..b060a22dda3 100644 --- a/boards/arm/stm32/shenzhou/src/stm32_chipid.c +++ b/boards/arm/stm32/shenzhou/src/stm32_chipid.c @@ -43,7 +43,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" /**************************************************************************** * Pre-processor Definitions diff --git a/boards/arm/stm32/shenzhou/src/stm32_ili93xx.c b/boards/arm/stm32/shenzhou/src/stm32_ili93xx.c index d8c5ccd425e..73c6a60af62 100644 --- a/boards/arm/stm32/shenzhou/src/stm32_ili93xx.c +++ b/boards/arm/stm32/shenzhou/src/stm32_ili93xx.c @@ -126,7 +126,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "shenzhou.h" diff --git a/boards/arm/stm32/shenzhou/src/stm32_spi.c b/boards/arm/stm32/shenzhou/src/stm32_spi.c index b6b99e0c8ad..cfe36084cb1 100644 --- a/boards/arm/stm32/shenzhou/src/stm32_spi.c +++ b/boards/arm/stm32/shenzhou/src/stm32_spi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "shenzhou.h" diff --git a/boards/arm/stm32/shenzhou/src/stm32_ssd1289.c b/boards/arm/stm32/shenzhou/src/stm32_ssd1289.c index a6fe6f11e93..200d8125dd0 100644 --- a/boards/arm/stm32/shenzhou/src/stm32_ssd1289.c +++ b/boards/arm/stm32/shenzhou/src/stm32_ssd1289.c @@ -57,7 +57,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "shenzhou.h" diff --git a/boards/arm/stm32/shenzhou/src/stm32_usb.c b/boards/arm/stm32/shenzhou/src/stm32_usb.c index 80423864e65..168b28a172b 100644 --- a/boards/arm/stm32/shenzhou/src/stm32_usb.c +++ b/boards/arm/stm32/shenzhou/src/stm32_usb.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_otgfs.h" #include "shenzhou.h" diff --git a/boards/arm/stm32/shenzhou/src/stm32_userleds.c b/boards/arm/stm32/shenzhou/src/stm32_userleds.c index 5dd7c94e8ef..fe89975fcf4 100644 --- a/boards/arm/stm32/shenzhou/src/stm32_userleds.c +++ b/boards/arm/stm32/shenzhou/src/stm32_userleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "shenzhou.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_adc.c b/boards/arm/stm32/stm3210e-eval/src/stm32_adc.c index 4374a6c82af..0a6ad7c8819 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_adc.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_adc.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "stm3210e-eval.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_boot.c b/boards/arm/stm32/stm3210e-eval/src/stm32_boot.c index 5ca876a1f78..4d6761760a5 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_boot.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm3210e-eval.h" /**************************************************************************** diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_can.c b/boards/arm/stm32/stm3210e-eval/src/stm32_can.c index 773a4545c01..89208d0c854 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_can.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_can.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_deselectlcd.c b/boards/arm/stm32/stm3210e-eval/src/stm32_deselectlcd.c index 5d24d4112cb..69d121d11ec 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_deselectlcd.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_deselectlcd.c @@ -41,7 +41,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3210e-eval.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_deselectnor.c b/boards/arm/stm32/stm3210e-eval/src/stm32_deselectnor.c index 00ec24703fc..dcbfe52916b 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_deselectnor.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_deselectnor.c @@ -41,7 +41,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3210e-eval.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_deselectsram.c b/boards/arm/stm32/stm3210e-eval/src/stm32_deselectsram.c index df3f9d57c58..1d9ca30ef3f 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_deselectsram.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_deselectsram.c @@ -41,7 +41,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3210e-eval.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_extcontext.c b/boards/arm/stm32/stm3210e-eval/src/stm32_extcontext.c index 1064d1df5e6..a932e439214 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_extcontext.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_extcontext.c @@ -43,7 +43,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3210e-eval.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_extmem.c b/boards/arm/stm32/stm3210e-eval/src/stm32_extmem.c index 03485075485..5b254e093da 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_extmem.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_extmem.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_gpio.h" #include "stm32.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_idle.c b/boards/arm/stm32/stm3210e-eval/src/stm32_idle.c index 43ab75049ae..834af55196d 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_idle.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_idle.c @@ -51,7 +51,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "stm32_pm.h" #include "stm32_rcc.h" #include "stm32_exti.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_lcd.c b/boards/arm/stm32/stm3210e-eval/src/stm32_lcd.c index 85bc7da57f8..c5d550ab552 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_lcd.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_lcd.c @@ -75,7 +75,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3210e-eval.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_leds.c b/boards/arm/stm32/stm3210e-eval/src/stm32_leds.c index ca79c7ac3c3..f49c4a5131b 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_leds.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_leds.c @@ -48,8 +48,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm3210e-eval.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_pm.c b/boards/arm/stm32/stm3210e-eval/src/stm32_pm.c index db5f785c71b..b1cc2564b11 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_pm.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_pm.c @@ -42,7 +42,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "stm32_pm.h" #include "stm3210e-eval.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_pmbuttons.c b/boards/arm/stm32/stm3210e-eval/src/stm32_pmbuttons.c index 8a4d251de92..882447c7b40 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_pmbuttons.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_pmbuttons.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "stm32_pwr.h" #include "stm32_pm.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_selectlcd.c b/boards/arm/stm32/stm3210e-eval/src/stm32_selectlcd.c index 2ddf3c9b6e9..97e140236ad 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_selectlcd.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_selectlcd.c @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3210e-eval.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_selectnor.c b/boards/arm/stm32/stm3210e-eval/src/stm32_selectnor.c index 8038b4a6b9c..643b271006f 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_selectnor.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_selectnor.c @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3210e-eval.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_selectsram.c b/boards/arm/stm32/stm3210e-eval/src/stm32_selectsram.c index b2cf5911f8c..98ca71c1e86 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_selectsram.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_selectsram.c @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3210e-eval.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_spi.c b/boards/arm/stm32/stm3210e-eval/src/stm32_spi.c index 69df9f961f0..60a8b0de043 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_spi.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_spi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "stm3210e-eval.h" diff --git a/boards/arm/stm32/stm3210e-eval/src/stm32_usbdev.c b/boards/arm/stm32/stm3210e-eval/src/stm32_usbdev.c index a0fed1ff69c..6589f6f218e 100644 --- a/boards/arm/stm32/stm3210e-eval/src/stm32_usbdev.c +++ b/boards/arm/stm32/stm3210e-eval/src/stm32_usbdev.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3210e-eval.h" diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_adc.c b/boards/arm/stm32/stm3220g-eval/src/stm32_adc.c index e0fe8864ba1..65a1928cc1b 100644 --- a/boards/arm/stm32/stm3220g-eval/src/stm32_adc.c +++ b/boards/arm/stm32/stm3220g-eval/src/stm32_adc.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "stm3220g-eval.h" diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_autoleds.c b/boards/arm/stm32/stm3220g-eval/src/stm32_autoleds.c index e98ad6ea96f..854de32671e 100644 --- a/boards/arm/stm32/stm3220g-eval/src/stm32_autoleds.c +++ b/boards/arm/stm32/stm3220g-eval/src/stm32_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm3220g-eval.h" diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_boot.c b/boards/arm/stm32/stm3220g-eval/src/stm32_boot.c index 9bb69136852..d0358933fe9 100644 --- a/boards/arm/stm32/stm3220g-eval/src/stm32_boot.c +++ b/boards/arm/stm32/stm3220g-eval/src/stm32_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm3220g-eval.h" /**************************************************************************** diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_can.c b/boards/arm/stm32/stm3220g-eval/src/stm32_can.c index 6d4093dbc51..cf2569bd399 100644 --- a/boards/arm/stm32/stm3220g-eval/src/stm32_can.c +++ b/boards/arm/stm32/stm3220g-eval/src/stm32_can.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_deselectlcd.c b/boards/arm/stm32/stm3220g-eval/src/stm32_deselectlcd.c index c7ce820f8bb..a280396f78c 100644 --- a/boards/arm/stm32/stm3220g-eval/src/stm32_deselectlcd.c +++ b/boards/arm/stm32/stm3220g-eval/src/stm32_deselectlcd.c @@ -42,7 +42,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3220g-eval.h" diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_deselectsram.c b/boards/arm/stm32/stm3220g-eval/src/stm32_deselectsram.c index c89ff01eedf..eff801a15c5 100644 --- a/boards/arm/stm32/stm3220g-eval/src/stm32_deselectsram.c +++ b/boards/arm/stm32/stm3220g-eval/src/stm32_deselectsram.c @@ -41,7 +41,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3220g-eval.h" diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_extmem.c b/boards/arm/stm32/stm3220g-eval/src/stm32_extmem.c index 34f183b3f2b..e7154bb8df9 100644 --- a/boards/arm/stm32/stm3220g-eval/src/stm32_extmem.c +++ b/boards/arm/stm32/stm3220g-eval/src/stm32_extmem.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_gpio.h" #include "stm32.h" diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_lcd.c b/boards/arm/stm32/stm3220g-eval/src/stm32_lcd.c index 668d245946b..83b7cf2690d 100644 --- a/boards/arm/stm32/stm3220g-eval/src/stm32_lcd.c +++ b/boards/arm/stm32/stm3220g-eval/src/stm32_lcd.c @@ -60,7 +60,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3220g-eval.h" diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_pwm.c b/boards/arm/stm32/stm3220g-eval/src/stm32_pwm.c index 4f16b287655..7cbf8fc256c 100644 --- a/boards/arm/stm32/stm3220g-eval/src/stm32_pwm.c +++ b/boards/arm/stm32/stm3220g-eval/src/stm32_pwm.c @@ -48,7 +48,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "stm3220g-eval.h" diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_selectlcd.c b/boards/arm/stm32/stm3220g-eval/src/stm32_selectlcd.c index fcd7d497cb3..533c614a64d 100644 --- a/boards/arm/stm32/stm3220g-eval/src/stm32_selectlcd.c +++ b/boards/arm/stm32/stm3220g-eval/src/stm32_selectlcd.c @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3220g-eval.h" diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_selectsram.c b/boards/arm/stm32/stm3220g-eval/src/stm32_selectsram.c index 6f125aa2afa..f3065ee3f9c 100644 --- a/boards/arm/stm32/stm3220g-eval/src/stm32_selectsram.c +++ b/boards/arm/stm32/stm3220g-eval/src/stm32_selectsram.c @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3220g-eval.h" diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_spi.c b/boards/arm/stm32/stm3220g-eval/src/stm32_spi.c index 3e0a71dcbc0..049cc5b032f 100644 --- a/boards/arm/stm32/stm3220g-eval/src/stm32_spi.c +++ b/boards/arm/stm32/stm3220g-eval/src/stm32_spi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "stm3220g-eval.h" diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_usb.c b/boards/arm/stm32/stm3220g-eval/src/stm32_usb.c index 9b116ab014d..6b216403dd5 100644 --- a/boards/arm/stm32/stm3220g-eval/src/stm32_usb.c +++ b/boards/arm/stm32/stm3220g-eval/src/stm32_usb.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_otgfs.h" #include "stm3220g-eval.h" diff --git a/boards/arm/stm32/stm3220g-eval/src/stm32_userleds.c b/boards/arm/stm32/stm3220g-eval/src/stm32_userleds.c index 2f9d4874b94..ba7f0b9abbe 100644 --- a/boards/arm/stm32/stm3220g-eval/src/stm32_userleds.c +++ b/boards/arm/stm32/stm3220g-eval/src/stm32_userleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm3220g-eval.h" diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_adc.c b/boards/arm/stm32/stm3240g-eval/src/stm32_adc.c index 4edfa1fcf04..97df01e0137 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm32_adc.c +++ b/boards/arm/stm32/stm3240g-eval/src/stm32_adc.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "stm3240g-eval.h" diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_autoleds.c b/boards/arm/stm32/stm3240g-eval/src/stm32_autoleds.c index 97f3fe96b69..db1090a0c01 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm32_autoleds.c +++ b/boards/arm/stm32/stm3240g-eval/src/stm32_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm3240g-eval.h" diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_can.c b/boards/arm/stm32/stm3240g-eval/src/stm32_can.c index 5517806ffc5..bb80b6d5811 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm32_can.c +++ b/boards/arm/stm32/stm3240g-eval/src/stm32_can.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_deselectlcd.c b/boards/arm/stm32/stm3240g-eval/src/stm32_deselectlcd.c index feba731d2c8..abb50e79b1b 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm32_deselectlcd.c +++ b/boards/arm/stm32/stm3240g-eval/src/stm32_deselectlcd.c @@ -42,7 +42,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3240g-eval.h" diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_deselectsram.c b/boards/arm/stm32/stm3240g-eval/src/stm32_deselectsram.c index c1b4320a5fa..96e24d6cfaf 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm32_deselectsram.c +++ b/boards/arm/stm32/stm3240g-eval/src/stm32_deselectsram.c @@ -41,7 +41,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3240g-eval.h" diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_extmem.c b/boards/arm/stm32/stm3240g-eval/src/stm32_extmem.c index ccda9acecbd..cf20ee6a99f 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm32_extmem.c +++ b/boards/arm/stm32/stm3240g-eval/src/stm32_extmem.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_gpio.h" #include "stm32.h" diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_lcd.c b/boards/arm/stm32/stm3240g-eval/src/stm32_lcd.c index 5f838ce8ba1..4d6a12e1225 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm32_lcd.c +++ b/boards/arm/stm32/stm3240g-eval/src/stm32_lcd.c @@ -60,7 +60,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3240g-eval.h" diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_ostest.c b/boards/arm/stm32/stm3240g-eval/src/stm32_ostest.c index 4b9759ecebc..86a9601c98e 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm32_ostest.c +++ b/boards/arm/stm32/stm3240g-eval/src/stm32_ostest.c @@ -32,8 +32,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm3240g-eval.h" /**************************************************************************** diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_pwm.c b/boards/arm/stm32/stm3240g-eval/src/stm32_pwm.c index 4f1363f9f19..1958d7162d0 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm32_pwm.c +++ b/boards/arm/stm32/stm3240g-eval/src/stm32_pwm.c @@ -48,7 +48,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "stm3240g-eval.h" diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_selectlcd.c b/boards/arm/stm32/stm3240g-eval/src/stm32_selectlcd.c index 62765a97ca9..c19278b49e8 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm32_selectlcd.c +++ b/boards/arm/stm32/stm3240g-eval/src/stm32_selectlcd.c @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3240g-eval.h" diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_selectsram.c b/boards/arm/stm32/stm3240g-eval/src/stm32_selectsram.c index 8899e64f5c4..775e3c2817e 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm32_selectsram.c +++ b/boards/arm/stm32/stm3240g-eval/src/stm32_selectsram.c @@ -43,7 +43,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm3240g-eval.h" diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_spi.c b/boards/arm/stm32/stm3240g-eval/src/stm32_spi.c index d9c368b2506..e1ddc82cf39 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm32_spi.c +++ b/boards/arm/stm32/stm3240g-eval/src/stm32_spi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "stm3240g-eval.h" diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_usb.c b/boards/arm/stm32/stm3240g-eval/src/stm32_usb.c index f864537d5aa..98a1f8691d8 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm32_usb.c +++ b/boards/arm/stm32/stm3240g-eval/src/stm32_usb.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_otgfs.h" #include "stm3240g-eval.h" diff --git a/boards/arm/stm32/stm3240g-eval/src/stm32_userleds.c b/boards/arm/stm32/stm3240g-eval/src/stm32_userleds.c index 57fcdf3779f..39d2ab9ef98 100644 --- a/boards/arm/stm32/stm3240g-eval/src/stm32_userleds.c +++ b/boards/arm/stm32/stm3240g-eval/src/stm32_userleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm3240g-eval.h" diff --git a/boards/arm/stm32/stm32_tiny/src/stm32_boot.c b/boards/arm/stm32/stm32_tiny/src/stm32_boot.c index f6d1609db73..43c3b2ef2ea 100644 --- a/boards/arm/stm32/stm32_tiny/src/stm32_boot.c +++ b/boards/arm/stm32/stm32_tiny/src/stm32_boot.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_tiny.h" /**************************************************************************** diff --git a/boards/arm/stm32/stm32_tiny/src/stm32_leds.c b/boards/arm/stm32/stm32_tiny/src/stm32_leds.c index 06d6f39fc05..378c0f5250e 100644 --- a/boards/arm/stm32/stm32_tiny/src/stm32_leds.c +++ b/boards/arm/stm32/stm32_tiny/src/stm32_leds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32_tiny.h" diff --git a/boards/arm/stm32/stm32_tiny/src/stm32_nrf24l01.c b/boards/arm/stm32/stm32_tiny/src/stm32_nrf24l01.c index db59ac74b1e..53164c3460d 100644 --- a/boards/arm/stm32/stm32_tiny/src/stm32_nrf24l01.c +++ b/boards/arm/stm32/stm32_tiny/src/stm32_nrf24l01.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "stm32_tiny.h" diff --git a/boards/arm/stm32/stm32_tiny/src/stm32_pwm.c b/boards/arm/stm32/stm32_tiny/src/stm32_pwm.c index 58bbc565fd2..544d96dcdd3 100644 --- a/boards/arm/stm32/stm32_tiny/src/stm32_pwm.c +++ b/boards/arm/stm32/stm32_tiny/src/stm32_pwm.c @@ -48,7 +48,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "stm32_tiny.h" diff --git a/boards/arm/stm32/stm32_tiny/src/stm32_spi.c b/boards/arm/stm32/stm32_tiny/src/stm32_spi.c index 58217d26cfd..7f6b0d06748 100644 --- a/boards/arm/stm32/stm32_tiny/src/stm32_spi.c +++ b/boards/arm/stm32/stm32_tiny/src/stm32_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "stm32_tiny.h" diff --git a/boards/arm/stm32/stm32_tiny/src/stm32_usbdev.c b/boards/arm/stm32/stm32_tiny/src/stm32_usbdev.c index 570aee92ef6..fe1979ce286 100644 --- a/boards/arm/stm32/stm32_tiny/src/stm32_usbdev.c +++ b/boards/arm/stm32/stm32_tiny/src/stm32_usbdev.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_tiny.h" diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_autoleds.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_autoleds.c index c6811328ec2..4bf1a4ebc9c 100644 --- a/boards/arm/stm32/stm32f103-minimum/src/stm32_autoleds.c +++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32f103_minimum.h" diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_boot.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_boot.c index a02b51f9f4c..79b9f66ccaf 100644 --- a/boards/arm/stm32/stm32f103-minimum/src/stm32_boot.c +++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_boot.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32f103_minimum.h" /**************************************************************************** diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_lcd.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_lcd.c index d6b30f2db11..3a81b7844f8 100644 --- a/boards/arm/stm32/stm32f103-minimum/src/stm32_lcd.c +++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_lcd.c @@ -57,8 +57,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_gpio.h" #include "stm32_spi.h" diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_nrf24l01.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_nrf24l01.c index c606a2141fc..010a7299fe5 100644 --- a/boards/arm/stm32/stm32f103-minimum/src/stm32_nrf24l01.c +++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_nrf24l01.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_pwm.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_pwm.c index 54f022771b0..28a557f28c8 100644 --- a/boards/arm/stm32/stm32f103-minimum/src/stm32_pwm.c +++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_pwm.c @@ -50,7 +50,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "stm32f103_minimum.h" diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_qencoder.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_qencoder.c index 74ac5a65d9d..49b9bb74a81 100644 --- a/boards/arm/stm32/stm32f103-minimum/src/stm32_qencoder.c +++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_qencoder.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_qencoder.h" #include "stm32f103_minimum.h" diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_rgbled.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_rgbled.c index ad45872a783..86a9935d198 100644 --- a/boards/arm/stm32/stm32f103-minimum/src/stm32_rgbled.c +++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_rgbled.c @@ -48,7 +48,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "stm32f103_minimum.h" diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_spi.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_spi.c index 985ff328663..6f3a5859028 100644 --- a/boards/arm/stm32/stm32f103-minimum/src/stm32_spi.c +++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "stm32f103_minimum.h" diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_tone.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_tone.c index 21b3208f422..453cd8e774d 100644 --- a/boards/arm/stm32/stm32f103-minimum/src/stm32_tone.c +++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_tone.c @@ -48,7 +48,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "stm32f103_minimum.h" diff --git a/boards/arm/stm32/stm32f103-minimum/src/stm32_usbdev.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_usbdev.c index 7e5526597a5..252183b273e 100644 --- a/boards/arm/stm32/stm32f103-minimum/src/stm32_usbdev.c +++ b/boards/arm/stm32/stm32f103-minimum/src/stm32_usbdev.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32f103_minimum.h" diff --git a/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c b/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c index 5240e1703c1..062411fa7c3 100644 --- a/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c +++ b/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c @@ -62,7 +62,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "ram_vectors.h" #include "stm32_hrtim.h" diff --git a/boards/arm/stm32/stm32f3discovery/src/stm32_boot.c b/boards/arm/stm32/stm32f3discovery/src/stm32_boot.c index c6de0222041..f2e3145759a 100644 --- a/boards/arm/stm32/stm32f3discovery/src/stm32_boot.c +++ b/boards/arm/stm32/stm32f3discovery/src/stm32_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32f3discovery.h" /**************************************************************************** diff --git a/boards/arm/stm32/stm32f3discovery/src/stm32_pwm.c b/boards/arm/stm32/stm32f3discovery/src/stm32_pwm.c index be89122d8ec..c56801d4e09 100644 --- a/boards/arm/stm32/stm32f3discovery/src/stm32_pwm.c +++ b/boards/arm/stm32/stm32f3discovery/src/stm32_pwm.c @@ -48,7 +48,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "stm32f3discovery.h" diff --git a/boards/arm/stm32/stm32f3discovery/src/stm32_qencoder.c b/boards/arm/stm32/stm32f3discovery/src/stm32_qencoder.c index b5ae71104c9..d29c72bdc2f 100644 --- a/boards/arm/stm32/stm32f3discovery/src/stm32_qencoder.c +++ b/boards/arm/stm32/stm32f3discovery/src/stm32_qencoder.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_qencoder.h" #include "stm32f3discovery.h" diff --git a/boards/arm/stm32/stm32f3discovery/src/stm32_spi.c b/boards/arm/stm32/stm32f3discovery/src/stm32_spi.c index 5c048f6cafe..ec937c14981 100644 --- a/boards/arm/stm32/stm32f3discovery/src/stm32_spi.c +++ b/boards/arm/stm32/stm32f3discovery/src/stm32_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "stm32f3discovery.h" diff --git a/boards/arm/stm32/stm32f3discovery/src/stm32_usb.c b/boards/arm/stm32/stm32f3discovery/src/stm32_usb.c index 41e16b81f0d..21ab0810fec 100644 --- a/boards/arm/stm32/stm32f3discovery/src/stm32_usb.c +++ b/boards/arm/stm32/stm32f3discovery/src/stm32_usb.c @@ -49,7 +49,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32f3discovery.h" diff --git a/boards/arm/stm32/stm32f411e-disco/src/stm32_boot.c b/boards/arm/stm32/stm32f411e-disco/src/stm32_boot.c index 5d80fc87d6b..05fb917ed5e 100644 --- a/boards/arm/stm32/stm32f411e-disco/src/stm32_boot.c +++ b/boards/arm/stm32/stm32f411e-disco/src/stm32_boot.c @@ -47,7 +47,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32f411e-disco.h" /**************************************************************************** diff --git a/boards/arm/stm32/stm32f411e-disco/src/stm32_usb.c b/boards/arm/stm32/stm32f411e-disco/src/stm32_usb.c index 2b546120448..421761904ea 100644 --- a/boards/arm/stm32/stm32f411e-disco/src/stm32_usb.c +++ b/boards/arm/stm32/stm32f411e-disco/src/stm32_usb.c @@ -55,7 +55,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_otgfs.h" #include "stm32f411e-disco.h" diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_autoleds.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_autoleds.c index b1c15c19453..e1931c1f661 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32_autoleds.c +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32f429i-disco.h" diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_boot.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_boot.c index 5111add767d..676341f1a3b 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32_boot.c +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32f429i-disco.h" #include "stm32_ccm.h" diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_extmem.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_extmem.c index 13039c864ea..ad1b8eb2350 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32_extmem.c +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_extmem.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32f429i-disco.h" diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c index a32b482b79b..cf0193c0475 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c @@ -53,7 +53,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "ram_vectors.h" #include "stm32_pwm.h" diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_idle.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_idle.c index 7b924dcfec4..dcfe97aad00 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32_idle.c +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_idle.c @@ -51,7 +51,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "stm32_pm.h" #include "stm32_rcc.h" #include "stm32_exti.h" diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_lcd.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_lcd.c index e5653e1648c..d45a6ed22cb 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32_lcd.c +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_lcd.c @@ -50,7 +50,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32f429i-disco.h" #include "stm32_ltdc.h" diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_ostest.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_ostest.c index 6f606947cf7..785e5714c65 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32_ostest.c +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_ostest.c @@ -32,8 +32,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32f429i-disco.h" /**************************************************************************** diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_pwm.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_pwm.c index c4a3c9da57f..ae336115094 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32_pwm.c +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_pwm.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "stm32f429i-disco.h" diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_spi.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_spi.c index 08474f8ccdb..eeaed045ad1 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32_spi.c +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_spi.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "stm32f429i-disco.h" diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_usb.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_usb.c index 3ef18663dc6..95dc1ee7f59 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32_usb.c +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_usb.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_otghs.h" #include "stm32f429i-disco.h" diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_userleds.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_userleds.c index b757c0409a7..429c6cc85a4 100644 --- a/boards/arm/stm32/stm32f429i-disco/src/stm32_userleds.c +++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_userleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32f429i-disco.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_autoleds.c b/boards/arm/stm32/stm32f4discovery/src/stm32_autoleds.c index b79b2aeb595..b273f83ea46 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_autoleds.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32f4discovery.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_boot.c b/boards/arm/stm32/stm32f4discovery/src/stm32_boot.c index 113eb738e1a..d5dc523a4e0 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_boot.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "itm.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_can.c b/boards/arm/stm32/stm32f4discovery/src/stm32_can.c index 8d2bd869ca4..66f3802143e 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_can.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_can.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_critmon.c b/boards/arm/stm32/stm32f4discovery/src/stm32_critmon.c index b5e5c8c02fa..9a94ccfc7ca 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_critmon.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_critmon.c @@ -43,7 +43,7 @@ #include #include "dwt.h" -#include "up_arch.h" +#include "arm_arch.h" #include diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_enc28j60.c b/boards/arm/stm32/stm32f4discovery/src/stm32_enc28j60.c index 588176d6b6b..2843a187db9 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_enc28j60.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_enc28j60.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_spi.h" #include "stm32f4discovery.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_extmem.c b/boards/arm/stm32/stm32f4discovery/src/stm32_extmem.c index 1f0efd7046c..5274db2139c 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_extmem.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_extmem.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32f4discovery.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_gs2200m.c b/boards/arm/stm32/stm32f4discovery/src/stm32_gs2200m.c index b0c7ae93612..9d3229bc857 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_gs2200m.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_gs2200m.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_idle.c b/boards/arm/stm32/stm32f4discovery/src/stm32_idle.c index 415047cf3b3..0412fe62868 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_idle.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_idle.c @@ -51,7 +51,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "stm32_pm.h" #include "stm32_rcc.h" #include "stm32_exti.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_mmcsd.c b/boards/arm/stm32/stm32f4discovery/src/stm32_mmcsd.c index d6f2f7025cd..f63e6e3352d 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_mmcsd.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_mmcsd.c @@ -51,7 +51,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_ostest.c b/boards/arm/stm32/stm32f4discovery/src/stm32_ostest.c index a29c94d9c54..65bca7faedf 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_ostest.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_ostest.c @@ -32,8 +32,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32f4discovery.h" /**************************************************************************** diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_pm.c b/boards/arm/stm32/stm32f4discovery/src/stm32_pm.c index c8385c0e985..8d63f3f8018 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_pm.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_pm.c @@ -43,7 +43,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "stm32_pm.h" #include "stm32f4discovery.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_pmbuttons.c b/boards/arm/stm32/stm32f4discovery/src/stm32_pmbuttons.c index 8a286ab5be8..42af087b12c 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_pmbuttons.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_pmbuttons.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "nvic.h" #include "stm32_pwr.h" #include "stm32_pm.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_pwm.c b/boards/arm/stm32/stm32f4discovery/src/stm32_pwm.c index 4bb9043d7ba..1ab86b2153e 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_pwm.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_pwm.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "stm32f4discovery.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_qencoder.c b/boards/arm/stm32/stm32f4discovery/src/stm32_qencoder.c index 17686bf923e..3d58ec15885 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_qencoder.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_qencoder.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_qencoder.h" #include "stm32f4discovery.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_rgbled.c b/boards/arm/stm32/stm32f4discovery/src/stm32_rgbled.c index a9b04074e18..cdae3d389e9 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_rgbled.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_rgbled.c @@ -48,7 +48,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "stm32f4discovery.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_spi.c b/boards/arm/stm32/stm32f4discovery/src/stm32_spi.c index e66c9940586..51cd6db35e9 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_spi.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_ssd1289.c b/boards/arm/stm32/stm32f4discovery/src/stm32_ssd1289.c index 51297f16f0a..d3bd908b16b 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_ssd1289.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_ssd1289.c @@ -57,7 +57,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32f4discovery.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_st7567.c b/boards/arm/stm32/stm32f4discovery/src/stm32_st7567.c index e936cbf32ac..fce65c77fad 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_st7567.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_st7567.c @@ -57,8 +57,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_gpio.h" #include "stm32_spi.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_usb.c b/boards/arm/stm32/stm32f4discovery/src/stm32_usb.c index d05ef4fadb6..0d92f895ee3 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_usb.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_usb.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_otgfs.h" #include "stm32f4discovery.h" diff --git a/boards/arm/stm32/stm32f4discovery/src/stm32_userleds.c b/boards/arm/stm32/stm32f4discovery/src/stm32_userleds.c index 5aaf1a7694b..cf01fea42b0 100644 --- a/boards/arm/stm32/stm32f4discovery/src/stm32_userleds.c +++ b/boards/arm/stm32/stm32f4discovery/src/stm32_userleds.c @@ -48,8 +48,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32f4discovery.h" diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32_boot.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_boot.c index 2e7468ccaa8..1158c0bf986 100644 --- a/boards/arm/stm32/stm32ldiscovery/src/stm32_boot.c +++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32ldiscovery.h" /**************************************************************************** diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c index e7ecaa6eff8..bef605c9274 100644 --- a/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c +++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c @@ -62,7 +62,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_gpio.h" #include "stm32_rcc.h" #include "hardware/stm32_lcd.h" diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32_pwm.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_pwm.c index 034ca83206f..18375f47c21 100644 --- a/boards/arm/stm32/stm32ldiscovery/src/stm32_pwm.c +++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_pwm.c @@ -48,7 +48,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "stm32ldiscovery.h" diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32_qencoder.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_qencoder.c index cf70b729f85..260fb8aedcc 100644 --- a/boards/arm/stm32/stm32ldiscovery/src/stm32_qencoder.c +++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_qencoder.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_qencoder.h" #include "stm32ldiscovery.h" diff --git a/boards/arm/stm32/stm32ldiscovery/src/stm32_spi.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_spi.c index 083ecca856b..5c5b67db8b3 100644 --- a/boards/arm/stm32/stm32ldiscovery/src/stm32_spi.c +++ b/boards/arm/stm32/stm32ldiscovery/src/stm32_spi.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "stm32ldiscovery.h" diff --git a/boards/arm/stm32/stm32vldiscovery/src/stm32_boot.c b/boards/arm/stm32/stm32vldiscovery/src/stm32_boot.c index e59965634f3..a0fafc632b7 100644 --- a/boards/arm/stm32/stm32vldiscovery/src/stm32_boot.c +++ b/boards/arm/stm32/stm32vldiscovery/src/stm32_boot.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32vldiscovery.h" /**************************************************************************** diff --git a/boards/arm/stm32/stm32vldiscovery/src/stm32_leds.c b/boards/arm/stm32/stm32vldiscovery/src/stm32_leds.c index 3dae0af0df0..4da35b668f4 100644 --- a/boards/arm/stm32/stm32vldiscovery/src/stm32_leds.c +++ b/boards/arm/stm32/stm32vldiscovery/src/stm32_leds.c @@ -49,8 +49,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32.h" #include "stm32vldiscovery.h" diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_ads7843e.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ads7843e.c index 1f5037e40a1..891f5ff288e 100644 --- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_ads7843e.c +++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ads7843e.c @@ -51,7 +51,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_gpio.h" #include "stm32_spi.h" diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_boot.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_boot.c index d56782f73e2..2d74e372219 100644 --- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_boot.c +++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_boot.c @@ -41,7 +41,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "viewtool_stm32f107.h" /**************************************************************************** diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_can.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_can.c index 5c08cbb0242..04285803ebb 100644 --- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_can.c +++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_can.c @@ -46,7 +46,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "stm32_can.h" diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_ft80x.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ft80x.c index e3c260f304d..75603a29f38 100644 --- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_ft80x.c +++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ft80x.c @@ -50,7 +50,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_gpio.h" #include "stm32_spi.h" diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c index d44c7c4b151..5eaa76b7565 100644 --- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c +++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c @@ -49,7 +49,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "ram_vectors.h" #include "stm32_tim.h" diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_max3421e.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_max3421e.c index e61d9937d73..1ec59ac6ae7 100644 --- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_max3421e.c +++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_max3421e.c @@ -58,7 +58,7 @@ # include #endif -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_gpio.h" #include "stm32_spi.h" diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_spi.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_spi.c index ec96baa6e1b..f1e66d463f1 100644 --- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_spi.c +++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_spi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "viewtool_stm32f107.h" diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_ssd1289.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ssd1289.c index 781d026c99c..5d12c6540f1 100644 --- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_ssd1289.c +++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ssd1289.c @@ -49,7 +49,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32.h" #include "viewtool_stm32f107.h" diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_spi.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_spi.c index 10cf9b46240..2507e512b93 100644 --- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_spi.c +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_spi.c @@ -46,7 +46,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_spi.h" diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_autoleds.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_autoleds.c index 2f676371a88..fd5f447ecd0 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_autoleds.c +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_gpio.h" #include "nucleo-f072rb.h" diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_boot.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_boot.c index cfade7de308..b2b6fca844e 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_boot.c +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_boot.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "nucleo-f072rb.h" /**************************************************************************** diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_userleds.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_userleds.c index 8927cf861be..985cbcc6b4c 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_userleds.c +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_userleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_gpio.h" #include "nucleo-f072rb.h" diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_autoleds.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_autoleds.c index 99f362137c9..5aa7585885f 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_autoleds.c +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_gpio.h" #include "nucleo-f091rc.h" diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_boot.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_boot.c index 8cd4e842199..fc920b380fb 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_boot.c +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_boot.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "nucleo-f091rc.h" /**************************************************************************** diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_spi.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_spi.c index 1f1e99a2a3c..05a36df8bda 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_spi.c +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_spi.c @@ -46,7 +46,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_spi.h" diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_userleds.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_userleds.c index 26c63b61734..1f0c656a0ee 100644 --- a/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_userleds.c +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_userleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32_gpio.h" #include "nucleo-f091rc.h" diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_nrf24l01.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_nrf24l01.c index 5eedb1dac06..f7b3e4a92d6 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_nrf24l01.c +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_nrf24l01.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "nucleo-l073rz.h" diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_spi.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_spi.c index aa3f1cf8624..1d2449a838e 100644 --- a/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_spi.c +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_spi.c @@ -46,7 +46,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_spi.h" diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_boot.c b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_boot.c index df6a0b64de4..ef7fec7098b 100644 --- a/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_boot.c +++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_boot.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32f051-discovery.h" /**************************************************************************** diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_boot.c b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_boot.c index 7aa4e56bab6..5685fbb537c 100644 --- a/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_boot.c +++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_boot.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32f072-discovery.h" /**************************************************************************** diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c b/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c index 53134eb628b..2b1864d9167 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c @@ -52,7 +52,7 @@ #include -#include "up_internal.h" +#include "arm_internal.h" #include "stm32_bbsram.h" #include "nucleo-144.h" diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c b/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c index e474195fc7d..bf407c8e5e7 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "nucleo-144.h" /**************************************************************************** diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c b/boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c index 46c5943f908..e8edf3e7ad8 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c @@ -49,7 +49,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "nucleo-144.h" diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c b/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c index d162343bd0d..72e74d4d00d 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_spi.h" diff --git a/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c b/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c index d9d7506f602..37e4ad3a720 100644 --- a/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c +++ b/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c @@ -53,7 +53,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_otg.h" diff --git a/boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c index 97449df28e0..6aa8a8f31a5 100644 --- a/boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c +++ b/boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32f746-ws.h" /**************************************************************************** diff --git a/boards/arm/stm32f7/stm32f746-ws/src/stm32_spi.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_spi.c index 79b9f1e2aee..ff8ab4ef872 100644 --- a/boards/arm/stm32f7/stm32f746-ws/src/stm32_spi.c +++ b/boards/arm/stm32f7/stm32f746-ws/src/stm32_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_spi.h" diff --git a/boards/arm/stm32f7/stm32f746-ws/src/stm32_usb.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_usb.c index 7973e198717..07bb8334905 100644 --- a/boards/arm/stm32f7/stm32f746-ws/src/stm32_usb.c +++ b/boards/arm/stm32f7/stm32f746-ws/src/stm32_usb.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_otg.h" #include "stm32_gpio.h" #include "stm32f746-ws.h" diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_boot.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_boot.c index bad708167a4..10569bd552f 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_boot.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32f746g-disco.h" /**************************************************************************** diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_extmem.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_extmem.c index 4cf675406d6..4ca8b1ef0e3 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_extmem.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_extmem.c @@ -44,7 +44,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_fmc.h" #include "stm32_gpio.h" diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_lcd.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_lcd.c index 68d29f3eba8..eed27cba2ec 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_lcd.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_lcd.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32f746g-disco.h" #include "stm32_gpio.h" #include "stm32_ltdc.h" diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_ostest.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_ostest.c index 968971d7572..f417d5a0945 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_ostest.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_ostest.c @@ -32,8 +32,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32f746g-disco.h" /**************************************************************************** diff --git a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_spi.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_spi.c index df272cd58a5..2d39c2e7056 100644 --- a/boards/arm/stm32f7/stm32f746g-disco/src/stm32_spi.c +++ b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_spi.h" diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_boot.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_boot.c index 81429d0d508..43b9305d3c8 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_boot.c +++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32f769i-disco.h" /**************************************************************************** diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_ostest.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_ostest.c index 84dcf8b0b9f..2c583a057ef 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_ostest.c +++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_ostest.c @@ -32,8 +32,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32f769i-disco.h" /**************************************************************************** diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_pwm.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_pwm.c index ab283fcbb15..4cdc070115c 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_pwm.c +++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_pwm.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "stm32f769i-disco.h" diff --git a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_spi.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_spi.c index 3885799aea4..f513e48e454 100644 --- a/boards/arm/stm32f7/stm32f769i-disco/src/stm32_spi.c +++ b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_spi.h" diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c index 64439ca8329..5d214df1a3a 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_start.h" #include "nucleo-h743zi.h" diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_nrf24l01.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_nrf24l01.c index 87a9078685b..d9fb2b56ed1 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_nrf24l01.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_nrf24l01.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32.h" #include "nucleo-h743zi.h" diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_pwm.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_pwm.c index b4ce847685d..2407ac39231 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_pwm.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_pwm.c @@ -31,7 +31,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_pwm.h" #include "nucleo-h743zi.h" diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_spi.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_spi.c index 41ccbd39c70..af1f3a9c6c5 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_spi.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_spi.c @@ -46,7 +46,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_spi.h" diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c index 4569fac2033..d2310a3b189 100644 --- a/boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c +++ b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_otg.h" diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c index 86212d4ef0d..7c3495bd54e 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c +++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32_start.h" #include "stm32h747i-disco.h" diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_spi.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_spi.c index 32578a9a639..5c060fa1a0f 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_spi.c +++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_spi.c @@ -46,7 +46,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_spi.h" diff --git a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_usb.c b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_usb.c index 52b30686f30..169cd277751 100644 --- a/boards/arm/stm32h7/stm32h747i-disco/src/stm32_usb.c +++ b/boards/arm/stm32h7/stm32h747i-disco/src/stm32_usb.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32_gpio.h" #include "stm32_otg.h" diff --git a/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_boot.c b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_boot.c index 491c00e627b..1535a3a254d 100644 --- a/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_boot.c +++ b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_boot.c @@ -42,7 +42,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4_start.h" #include "b-l475e-iot01a.h" diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_adc.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_adc.c index cdfaad8d17f..1fae4b27dc0 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_adc.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_adc.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4_adc.h" #include "nucleo-l432kc.h" diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_autoleds.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_autoleds.c index 40b58f1c0d9..9b61cb182b9 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_autoleds.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32l4.h" #include "nucleo-l432kc.h" diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_boot.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_boot.c index 7c8d6649fb8..3f62c3d6e5a 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_boot.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_boot.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nucleo-l432kc.h" /******************************************************************************* diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_pwm.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_pwm.c index e30f979e423..f386854db27 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_pwm.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_pwm.c @@ -52,7 +52,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4_pwm.h" #include "nucleo-l432kc.h" diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_qencoder.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_qencoder.c index e495f033db2..02a4a307fbd 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_qencoder.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_qencoder.c @@ -49,7 +49,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4_qencoder.h" #include "nucleo-l432kc.h" diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spi.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spi.c index 562d139d0ce..881cb3bf406 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spi.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spi.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include "chip.h" #include diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spwm.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spwm.c index 1caedeebc73..59ab5ea5387 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spwm.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spwm.c @@ -52,7 +52,7 @@ #include #include -#include "up_internal.h" +#include "arm_internal.h" #include "ram_vectors.h" #include "stm32l4_pwm.h" diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_userleds.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_userleds.c index dfb71ee5af0..deabb9cdbb3 100644 --- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_userleds.c +++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_userleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32l4.h" #include "nucleo-l432kc.h" diff --git a/boards/arm/stm32l4/nucleo-l452re/src/stm32_autoleds.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_autoleds.c index a0d00b54e6d..266848a285b 100644 --- a/boards/arm/stm32l4/nucleo-l452re/src/stm32_autoleds.c +++ b/boards/arm/stm32l4/nucleo-l452re/src/stm32_autoleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32l4_gpio.h" #include "nucleo-l452re.h" diff --git a/boards/arm/stm32l4/nucleo-l452re/src/stm32_boot.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_boot.c index 6cfa382f38f..dbd86b67bff 100644 --- a/boards/arm/stm32l4/nucleo-l452re/src/stm32_boot.c +++ b/boards/arm/stm32l4/nucleo-l452re/src/stm32_boot.c @@ -44,7 +44,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nucleo-l452re.h" #include diff --git a/boards/arm/stm32l4/nucleo-l452re/src/stm32_spi.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_spi.c index 47e4f077d2c..e3970cea634 100644 --- a/boards/arm/stm32l4/nucleo-l452re/src/stm32_spi.c +++ b/boards/arm/stm32l4/nucleo-l452re/src/stm32_spi.c @@ -46,7 +46,7 @@ #include -#include +#include #include "chip.h" #include diff --git a/boards/arm/stm32l4/nucleo-l452re/src/stm32_userleds.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_userleds.c index 239a132dfa0..0995d313bcc 100644 --- a/boards/arm/stm32l4/nucleo-l452re/src/stm32_userleds.c +++ b/boards/arm/stm32l4/nucleo-l452re/src/stm32_userleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32l4_gpio.h" #include "nucleo-l452re.h" diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_adc.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_adc.c index 36ff0d83e86..b962d0748d7 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_adc.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_adc.c @@ -47,7 +47,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4_pwm.h" #include "nucleo-l476rg.h" diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_autoleds.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_autoleds.c index 8a0e011abfa..c84062aea3f 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_autoleds.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32l4.h" #include "nucleo-l476rg.h" diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_boot.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_boot.c index cb0528ad39e..f3dec3f3c15 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_boot.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_boot.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "nucleo-l476rg.h" /**************************************************************************** diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_pwm.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_pwm.c index f948bcbeb43..a90490bb38c 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_pwm.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_pwm.c @@ -52,7 +52,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4_pwm.h" #include "nucleo-l476rg.h" diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_qencoder.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_qencoder.c index 0b705ba2eff..076e8a4aaf9 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_qencoder.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_qencoder.c @@ -49,7 +49,7 @@ #include #include "chip.h" -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4_qencoder.h" #include "nucleo-l476rg.h" diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spi.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spi.c index ab06e0b8c91..f3c6c10ae13 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spi.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spi.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include "chip.h" #include diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_userleds.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_userleds.c index 4e871d418b1..f473801edcb 100644 --- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_userleds.c +++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_userleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32l4.h" #include "nucleo-l476rg.h" diff --git a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c index 2132364d460..f1ed132ba5e 100644 --- a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c +++ b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c @@ -45,7 +45,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "nucleo-144.h" /**************************************************************************** diff --git a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_spi.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_spi.c index dadf1f5b3f6..48d30c05ada 100644 --- a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_spi.c +++ b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_spi.c @@ -48,7 +48,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32l4_gpio.h" #include "stm32l4_spi.h" diff --git a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_usb.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_usb.c index a9f67ddadaf..a41b884d650 100644 --- a/boards/arm/stm32l4/nucleo-l496zg/src/stm32_usb.c +++ b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_usb.c @@ -53,7 +53,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "stm32l4_gpio.h" #include "stm32l4_otgfs.h" diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_boot.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_boot.c index 8314d06aae5..e2db217ee17 100644 --- a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_boot.c +++ b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_boot.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l476-mdk.h" /**************************************************************************** diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_clockconfig.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_clockconfig.c index 7ff86c3288e..21ff558b62f 100644 --- a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_clockconfig.c +++ b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_clockconfig.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l476-mdk.h" /**************************************************************************** diff --git a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_spi.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_spi.c index 377944df7ab..d0715b85aa1 100644 --- a/boards/arm/stm32l4/stm32l476-mdk/src/stm32_spi.c +++ b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_spi.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include "chip.h" #include diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_autoleds.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_autoleds.c index b7670cee9d0..522a8024f0e 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_autoleds.c +++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_autoleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32l4.h" #include "stm32l476vg-disco.h" diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_boot.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_boot.c index 7ef7028de63..26b6e92a443 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_boot.c +++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_boot.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l476vg-disco.h" /**************************************************************************** diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_clockconfig.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_clockconfig.c index bfe26852ad6..d296f37949a 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_clockconfig.c +++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_clockconfig.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l476vg-disco.h" /**************************************************************************** diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_spi.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_spi.c index a8ec21abf80..6f2b91cee73 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_spi.c +++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_spi.c @@ -47,7 +47,7 @@ #include #include -#include +#include #include "chip.h" #include diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_usb.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_usb.c index a78e824d319..b96393a95a7 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_usb.c +++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_usb.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4.h" #include "stm32l4_otgfs.h" #include "stm32l476vg-disco.h" diff --git a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_userleds.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_userleds.c index 3da388456c0..5b672c42b8c 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_userleds.c +++ b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_userleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32l4.h" #include "stm32l476vg-disco.h" diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_autoleds.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_autoleds.c index 1fd0a44fc06..a8f3ce74cda 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_autoleds.c +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_autoleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32l4.h" #include "stm32l4r9ai-disco.h" diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_boot.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_boot.c index e913762d535..9879a90214e 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_boot.c +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_boot.c @@ -48,7 +48,7 @@ #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4r9ai-disco.h" /**************************************************************************** diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_clockconfig.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_clockconfig.c index 534a221c42f..79363809527 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_clockconfig.c +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_clockconfig.c @@ -43,7 +43,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4r9ai-disco.h" /**************************************************************************** diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_spi.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_spi.c index 2fa89f6e92a..57b0ae0a18c 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_spi.c +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_spi.c @@ -48,7 +48,7 @@ #include #include -#include +#include #include "chip.h" #include diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_usb.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_usb.c index 07da1b0b06d..1c7a56a1f22 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_usb.c +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_usb.c @@ -52,7 +52,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "stm32l4.h" #include "stm32l4_otgfs.h" #include "stm32l4r9ai-disco.h" diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_userleds.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_userleds.c index 49968ec2943..ddc02f686a0 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_userleds.c +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_userleds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "stm32l4.h" #include "stm32l4r9ai-disco.h" diff --git a/boards/arm/str71x/olimex-strp711/src/str71_buttons.c b/boards/arm/str71x/olimex-strp711/src/str71_buttons.c index 3af647dff4b..35cd9143e09 100644 --- a/boards/arm/str71x/olimex-strp711/src/str71_buttons.c +++ b/boards/arm/str71x/olimex-strp711/src/str71_buttons.c @@ -44,8 +44,8 @@ #include #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/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c b/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c index c3c07696929..9c1144a3c11 100644 --- a/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c +++ b/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c @@ -91,8 +91,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "str71x.h" #ifdef CONFIG_ENC28J60 diff --git a/boards/arm/str71x/olimex-strp711/src/str71_leds.c b/boards/arm/str71x/olimex-strp711/src/str71_leds.c index 9c29f559e14..77811d7f919 100644 --- a/boards/arm/str71x/olimex-strp711/src/str71_leds.c +++ b/boards/arm/str71x/olimex-strp711/src/str71_leds.c @@ -45,8 +45,8 @@ #include #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/boards/arm/str71x/olimex-strp711/src/str71_spi.c b/boards/arm/str71x/olimex-strp711/src/str71_spi.c index 0f57330befc..75101ab395a 100644 --- a/boards/arm/str71x/olimex-strp711/src/str71_spi.c +++ b/boards/arm/str71x/olimex-strp711/src/str71_spi.c @@ -54,8 +54,8 @@ #include -#include "up_internal.h" -#include "up_arch.h" +#include "arm_internal.h" +#include "arm_arch.h" #include "chip.h" #include "str71x.h" diff --git a/boards/arm/tiva/dk-tm4c129x/src/tm4c_boot.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_boot.c index 343a74c71a7..c4e5735e498 100644 --- a/boards/arm/tiva/dk-tm4c129x/src/tm4c_boot.c +++ b/boards/arm/tiva/dk-tm4c129x/src/tm4c_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "dk-tm4c129x.h" /**************************************************************************** diff --git a/boards/arm/tiva/dk-tm4c129x/src/tm4c_ethernet.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_ethernet.c index a769deae4ed..1140e12b37c 100644 --- a/boards/arm/tiva/dk-tm4c129x/src/tm4c_ethernet.c +++ b/boards/arm/tiva/dk-tm4c129x/src/tm4c_ethernet.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "hardware/tiva_flash.h" #include "tiva_ethernet.h" diff --git a/boards/arm/tiva/dk-tm4c129x/src/tm4c_ssi.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_ssi.c index 324e049d47e..7148c43063b 100644 --- a/boards/arm/tiva/dk-tm4c129x/src/tm4c_ssi.c +++ b/boards/arm/tiva/dk-tm4c129x/src/tm4c_ssi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_gpio.h" #include "dk-tm4c129x.h" diff --git a/boards/arm/tiva/eagle100/src/lm_boot.c b/boards/arm/tiva/eagle100/src/lm_boot.c index 9ed06194772..f872fb31346 100644 --- a/boards/arm/tiva/eagle100/src/lm_boot.c +++ b/boards/arm/tiva/eagle100/src/lm_boot.c @@ -44,7 +44,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "eagle100.h" /**************************************************************************** diff --git a/boards/arm/tiva/eagle100/src/lm_ethernet.c b/boards/arm/tiva/eagle100/src/lm_ethernet.c index 36754f359b7..add3e017b47 100644 --- a/boards/arm/tiva/eagle100/src/lm_ethernet.c +++ b/boards/arm/tiva/eagle100/src/lm_ethernet.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_ethernet.h" diff --git a/boards/arm/tiva/eagle100/src/lm_leds.c b/boards/arm/tiva/eagle100/src/lm_leds.c index 5ecc5492a12..bae6022ae94 100644 --- a/boards/arm/tiva/eagle100/src/lm_leds.c +++ b/boards/arm/tiva/eagle100/src/lm_leds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "tiva_gpio.h" #include "eagle100.h" diff --git a/boards/arm/tiva/eagle100/src/lm_ssi.c b/boards/arm/tiva/eagle100/src/lm_ssi.c index 4f86716ee98..fb18369923c 100644 --- a/boards/arm/tiva/eagle100/src/lm_ssi.c +++ b/boards/arm/tiva/eagle100/src/lm_ssi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_gpio.h" #include "eagle100.h" diff --git a/boards/arm/tiva/ekk-lm3s9b96/src/lm_boot.c b/boards/arm/tiva/ekk-lm3s9b96/src/lm_boot.c index 0ac43feb4c4..a80821871ba 100644 --- a/boards/arm/tiva/ekk-lm3s9b96/src/lm_boot.c +++ b/boards/arm/tiva/ekk-lm3s9b96/src/lm_boot.c @@ -45,8 +45,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "ekk-lm3s9b96.h" /**************************************************************************** diff --git a/boards/arm/tiva/ekk-lm3s9b96/src/lm_ethernet.c b/boards/arm/tiva/ekk-lm3s9b96/src/lm_ethernet.c index ef9fe65b3c8..82eeca92ce5 100644 --- a/boards/arm/tiva/ekk-lm3s9b96/src/lm_ethernet.c +++ b/boards/arm/tiva/ekk-lm3s9b96/src/lm_ethernet.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_ethernet.h" diff --git a/boards/arm/tiva/ekk-lm3s9b96/src/lm_leds.c b/boards/arm/tiva/ekk-lm3s9b96/src/lm_leds.c index 9872ad0ce7a..0a7c3b24ab8 100644 --- a/boards/arm/tiva/ekk-lm3s9b96/src/lm_leds.c +++ b/boards/arm/tiva/ekk-lm3s9b96/src/lm_leds.c @@ -47,8 +47,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "tiva_gpio.h" #include "ekk-lm3s9b96.h" diff --git a/boards/arm/tiva/ekk-lm3s9b96/src/lm_ssi.c b/boards/arm/tiva/ekk-lm3s9b96/src/lm_ssi.c index a740fff2ede..1cad595a229 100644 --- a/boards/arm/tiva/ekk-lm3s9b96/src/lm_ssi.c +++ b/boards/arm/tiva/ekk-lm3s9b96/src/lm_ssi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_gpio.h" #include "ekk-lm3s9b96.h" diff --git a/boards/arm/tiva/launchxl-cc1310/src/cc1310_boot.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_boot.c index 612b2eeb8b1..44a2869db64 100644 --- a/boards/arm/tiva/launchxl-cc1310/src/cc1310_boot.c +++ b/boards/arm/tiva/launchxl-cc1310/src/cc1310_boot.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "tiva_start.h" #include "launchxl-cc1310.h" diff --git a/boards/arm/tiva/launchxl-cc1310/src/cc1310_ssi.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_ssi.c index 53da216a3de..17ff72a1971 100644 --- a/boards/arm/tiva/launchxl-cc1310/src/cc1310_ssi.c +++ b/boards/arm/tiva/launchxl-cc1310/src/cc1310_ssi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_gpio.h" diff --git a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_boot.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_boot.c index fac301835cd..644508d80f5 100644 --- a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_boot.c +++ b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_boot.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "tiva_start.h" #include "launchxl-cc1312r1.h" diff --git a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_ssi.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_ssi.c index f10884cd0c5..a60bda650c9 100644 --- a/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_ssi.c +++ b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_ssi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_gpio.h" diff --git a/boards/arm/tiva/lm3s6432-s2e/src/lm_boot.c b/boards/arm/tiva/lm3s6432-s2e/src/lm_boot.c index 22bdefd4213..2abfa593c5e 100644 --- a/boards/arm/tiva/lm3s6432-s2e/src/lm_boot.c +++ b/boards/arm/tiva/lm3s6432-s2e/src/lm_boot.c @@ -44,9 +44,9 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" -#include "up_internal.h" +#include "arm_internal.h" #include "tiva_gpio.h" #include "lm3s6432-s2e.h" diff --git a/boards/arm/tiva/lm3s6432-s2e/src/lm_ethernet.c b/boards/arm/tiva/lm3s6432-s2e/src/lm_ethernet.c index 99b22150985..278a37a2fec 100644 --- a/boards/arm/tiva/lm3s6432-s2e/src/lm_ethernet.c +++ b/boards/arm/tiva/lm3s6432-s2e/src/lm_ethernet.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_ethernet.h" diff --git a/boards/arm/tiva/lm3s6432-s2e/src/lm_leds.c b/boards/arm/tiva/lm3s6432-s2e/src/lm_leds.c index 030a2f0b935..0d24551745f 100644 --- a/boards/arm/tiva/lm3s6432-s2e/src/lm_leds.c +++ b/boards/arm/tiva/lm3s6432-s2e/src/lm_leds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "tiva_gpio.h" #include "lm3s6432-s2e.h" diff --git a/boards/arm/tiva/lm3s6432-s2e/src/lm_ssi.c b/boards/arm/tiva/lm3s6432-s2e/src/lm_ssi.c index a079d4fde63..66d8ca441be 100644 --- a/boards/arm/tiva/lm3s6432-s2e/src/lm_ssi.c +++ b/boards/arm/tiva/lm3s6432-s2e/src/lm_ssi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_gpio.h" #include "lm3s6432-s2e.h" diff --git a/boards/arm/tiva/lm3s6965-ek/src/lm_boot.c b/boards/arm/tiva/lm3s6965-ek/src/lm_boot.c index 404190d3053..9e902818423 100644 --- a/boards/arm/tiva/lm3s6965-ek/src/lm_boot.c +++ b/boards/arm/tiva/lm3s6965-ek/src/lm_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lm3s6965-ek.h" /**************************************************************************** diff --git a/boards/arm/tiva/lm3s6965-ek/src/lm_ethernet.c b/boards/arm/tiva/lm3s6965-ek/src/lm_ethernet.c index 8d35a128388..4286a23a619 100644 --- a/boards/arm/tiva/lm3s6965-ek/src/lm_ethernet.c +++ b/boards/arm/tiva/lm3s6965-ek/src/lm_ethernet.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_ethernet.h" diff --git a/boards/arm/tiva/lm3s6965-ek/src/lm_leds.c b/boards/arm/tiva/lm3s6965-ek/src/lm_leds.c index e9343c8249b..14f564e6b9a 100644 --- a/boards/arm/tiva/lm3s6965-ek/src/lm_leds.c +++ b/boards/arm/tiva/lm3s6965-ek/src/lm_leds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "tiva_gpio.h" #include "lm3s6965-ek.h" diff --git a/boards/arm/tiva/lm3s6965-ek/src/lm_ssi.c b/boards/arm/tiva/lm3s6965-ek/src/lm_ssi.c index 5c53542f14e..043143c9d07 100644 --- a/boards/arm/tiva/lm3s6965-ek/src/lm_ssi.c +++ b/boards/arm/tiva/lm3s6965-ek/src/lm_ssi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_gpio.h" #include "lm3s6965-ek.h" diff --git a/boards/arm/tiva/lm3s8962-ek/src/lm_boot.c b/boards/arm/tiva/lm3s8962-ek/src/lm_boot.c index 9cb2e5bc111..5cc8b090b7f 100644 --- a/boards/arm/tiva/lm3s8962-ek/src/lm_boot.c +++ b/boards/arm/tiva/lm3s8962-ek/src/lm_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lm3s8962-ek.h" /**************************************************************************** diff --git a/boards/arm/tiva/lm3s8962-ek/src/lm_ethernet.c b/boards/arm/tiva/lm3s8962-ek/src/lm_ethernet.c index 1df67fc5630..0d61b665181 100644 --- a/boards/arm/tiva/lm3s8962-ek/src/lm_ethernet.c +++ b/boards/arm/tiva/lm3s8962-ek/src/lm_ethernet.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_ethernet.h" diff --git a/boards/arm/tiva/lm3s8962-ek/src/lm_leds.c b/boards/arm/tiva/lm3s8962-ek/src/lm_leds.c index cfd444e5788..07ed2645d8f 100644 --- a/boards/arm/tiva/lm3s8962-ek/src/lm_leds.c +++ b/boards/arm/tiva/lm3s8962-ek/src/lm_leds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "tiva_gpio.h" #include "lm3s8962-ek.h" diff --git a/boards/arm/tiva/lm3s8962-ek/src/lm_ssi.c b/boards/arm/tiva/lm3s8962-ek/src/lm_ssi.c index 8a0101108a8..84284f584d9 100644 --- a/boards/arm/tiva/lm3s8962-ek/src/lm_ssi.c +++ b/boards/arm/tiva/lm3s8962-ek/src/lm_ssi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_gpio.h" #include "lm3s8962-ek.h" diff --git a/boards/arm/tiva/lm4f120-launchpad/src/lm4f_autoleds.c b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_autoleds.c index 90d856cdf9e..8b1e336cd6d 100644 --- a/boards/arm/tiva/lm4f120-launchpad/src/lm4f_autoleds.c +++ b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_autoleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "tiva_gpio.h" #include "lmf4120-launchpad.h" diff --git a/boards/arm/tiva/lm4f120-launchpad/src/lm4f_boot.c b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_boot.c index 4364ee7e78e..8f1f9a13994 100644 --- a/boards/arm/tiva/lm4f120-launchpad/src/lm4f_boot.c +++ b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_boot.c @@ -44,8 +44,8 @@ #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "lmf4120-launchpad.h" /**************************************************************************** diff --git a/boards/arm/tiva/lm4f120-launchpad/src/lm4f_ssi.c b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_ssi.c index ea57371986e..ec8c9ffe2ff 100644 --- a/boards/arm/tiva/lm4f120-launchpad/src/lm4f_ssi.c +++ b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_ssi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_gpio.h" #include "lmf4120-launchpad.h" diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_autoleds.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_autoleds.c index d5f84620107..79aea6d6072 100644 --- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_autoleds.c +++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_autoleds.c @@ -46,8 +46,8 @@ #include #include "chip.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "tiva_gpio.h" #include "tm4c123g-launchpad.h" diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c index 690c075fb49..bfb64a38638 100644 --- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c +++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c @@ -44,8 +44,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "tm4c123g-launchpad.h" /**************************************************************************** diff --git a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c index b5d57ca76ec..e2a1f6cc306 100644 --- a/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c +++ b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tiva_gpio.h" #include "tm4c123g-launchpad.h" diff --git a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_boot.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_boot.c index 2fc1bf6463d..2490ba0cb02 100644 --- a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_boot.c +++ b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_boot.c @@ -45,8 +45,8 @@ #include #include "tm4c1294-launchpad.h" -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" /**************************************************************************** * Pre-processor Definitions diff --git a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_ethernet.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_ethernet.c index ef907ecd228..7373da7ebcf 100644 --- a/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_ethernet.c +++ b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_ethernet.c @@ -46,7 +46,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "hardware/tiva_flash.h" #include "tiva_ethernet.h" diff --git a/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c b/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c index d0a9586dbca..a7fa9037463 100644 --- a/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c +++ b/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c @@ -49,7 +49,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "tms570_gio.h" #include "launchxl-tms57004.h" diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c index 8ac40484d35..b9bfbe6a529 100644 --- a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c +++ b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c @@ -49,7 +49,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "tms570_gio.h" #include "tms570ls31x_usb_kit.h" diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_spi.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_spi.c index 91dd6fdf50d..2ba2d3c6b29 100644 --- a/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_spi.c +++ b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_spi.c @@ -47,7 +47,7 @@ #include #include -#include "up_arch.h" +#include "arm_arch.h" #include "chip.h" #include "tms570_spi.h" #include "tms570ls31x_usb_kit.h" diff --git a/boards/arm/xmc4/xmc4500-relax/src/xmc4_ostest.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_ostest.c index 857ab5e6baa..77b75e6c444 100644 --- a/boards/arm/xmc4/xmc4500-relax/src/xmc4_ostest.c +++ b/boards/arm/xmc4/xmc4500-relax/src/xmc4_ostest.c @@ -47,8 +47,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "xmc4500-relax.h" /**************************************************************************** diff --git a/boards/arm/xmc4/xmc4700-relax/src/xmc4_ostest.c b/boards/arm/xmc4/xmc4700-relax/src/xmc4_ostest.c index 6e55288de8b..3e746718bee 100644 --- a/boards/arm/xmc4/xmc4700-relax/src/xmc4_ostest.c +++ b/boards/arm/xmc4/xmc4700-relax/src/xmc4_ostest.c @@ -32,8 +32,8 @@ #include #include -#include "up_arch.h" -#include "up_internal.h" +#include "arm_arch.h" +#include "arm_internal.h" #include "xmc4700-relax.h" /****************************************************************************