diff --git a/boards/Kconfig b/boards/Kconfig index 07a9350a7f..b9cb5a397b 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -2064,519 +2064,525 @@ config ARCH_IRQBUTTONS comment "Board-Specific Options" -if ARCH_BOARD_AMBER -source "boards/amber/Kconfig" -endif -if ARCH_BOARD_ARDUINO_MEGA2560 -source "boards/arduino-mega2560/Kconfig" -endif if ARCH_BOARD_ARDUINO_DUE -source "boards/arduino-due/Kconfig" +source "boards/arm/arduino-due/Kconfig" endif -if ARCH_BOARD_AVR32DEV1 -source "boards/avr32dev1/Kconfig" -endif -if ARCH_BOARD_BAMBINO_200E -source "boards/bambino-200e/Kconfig" -endif -if ARCH_BOARD_C5471EVM -source "boards/c5471evm/Kconfig" -endif -if ARCH_BOARD_CLICKER2_STM32 -source "boards/clicker2-stm32/Kconfig" -endif -if ARCH_BOARD_CLOUDCTRL -source "boards/cloudctrl/Kconfig" -endif -if ARCH_BOARD_DEMOS92S12NEC64 -source "boards/demo9s12ne64/Kconfig" -endif -if ARCH_BOARD_DK_TM4C129X -source "boards/dk-tm4c129x/Kconfig" -endif -if ARCH_BOARD_EA3131 -source "boards/ea3131/Kconfig" -endif -if ARCH_BOARD_EA3152 -source "boards/ea3152/Kconfig" -endif -if ARCH_BOARD_EAGLE100 -source "boards/eagle100/Kconfig" -endif -if ARCH_BOARD_EFM32G8XXSTK -source "boards/efm32-g8xx-stk/Kconfig" -endif -if ARCH_BOARD_EFM32GG_STK3700 -source "boards/efm32gg-stk3700/Kconfig" -endif -if ARCH_BOARD_EKKLM3S9B96 -source "boards/ekk-lm3s9b96/Kconfig" -endif -if ARCH_BOARD_ESP32CORE -source "boards/esp32-core/Kconfig" -endif -if ARCH_BOARD_EZ80F910200KITG -source "boards/ez80f910200kitg/Kconfig" -endif -if ARCH_BOARD_EZ80F910200ZCO -source "boards/ez80f910200zco/Kconfig" -endif -if ARCH_BOARD_FIRE_STM32 -source "boards/fire-stm32v2/Kconfig" -endif -if ARCH_BOARD_FLIPNCLICK_PIC32MZ -source "boards/flipnclick-pic32mz/Kconfig" -endif -if ARCH_BOARD_FLIPNCLICK_SAM3X -source "boards/flipnclick-sam3x/Kconfig" -endif -if ARCH_BOARD_FREEDOM_K28F -source "boards/freedom-k28f/Kconfig" -endif -if ARCH_BOARD_FREEDOM_K64F -source "boards/freedom-k64f/Kconfig" -endif -if ARCH_BOARD_FREEDOM_K66F -source "boards/freedom-k66f/Kconfig" -endif -if ARCH_BOARD_FREEDOM_KL25Z -source "boards/freedom-kl25z/Kconfig" -endif -if ARCH_BOARD_FREEDOM_KL26Z -source "boards/freedom-kl26z/Kconfig" -endif -if ARCH_BOARD_GAPUINO -source "boards/gapuino/Kconfig" -endif -if ARCH_BOARD_HYMINI_STM32V -source "boards/hymini-stm32v/Kconfig" -endif -if ARCH_BOARD_IMXRT1050_EVK -source "boards/imxrt1050-evk/Kconfig" -endif -if ARCH_BOARD_IMXRT1060_EVK -source "boards/imxrt1060-evk/Kconfig" -endif -if ARCH_BOARD_KWIKSTIK_K40 -source "boards/kwikstik-k40/Kconfig" -endif -if ARCH_BOARD_LAUNCHXL_CC1310 -source "boards/launchxl-cc1310/Kconfig" -endif -if ARCH_BOARD_LAUNCHXL_CC1312R1 -source "boards/launchxl-cc1312r1/Kconfig" -endif -if ARCH_BOARD_LAUNCHXL_TMS57004 -source "boards/launchxl-tms57004/Kconfig" -endif -if ARCH_BOARD_LC823450_XGEVK -source "boards/lc823450-xgevk/Kconfig" -endif -if ARCH_BOARD_LINCOLN60 -source "boards/lincoln60/Kconfig" -endif -if ARCH_BOARD_LM3S6432S2E -source "boards/lm3s6432-s2e/Kconfig" -endif -if ARCH_BOARD_LM3S6965EK -source "boards/lm3s6965-ek/Kconfig" -endif -if ARCH_BOARD_LM3S8962EK -source "boards/lm3s8962-ek/Kconfig" -endif -if ARCH_BOARD_LM3S8962EK -source "boards/lm4f120-launchpad/Kconfig" -endif -if ARCH_BOARD_LPC4088_DEVKIT -source "boards/lpc4088-devkit/Kconfig" -endif -if ARCH_BOARD_LPC4088_QUICKSTART -source "boards/lpc4088-quickstart/Kconfig" -endif -if ARCH_BOARD_LPC4330_XPLORER -source "boards/lpc4330-xplorer/Kconfig" -endif -if ARCH_BOARD_LPC4337_WS -source "boards/lpc4337-ws/Kconfig" -endif -if ARCH_BOARD_LPC4357_EVB -source "boards/lpc4357-evb/Kconfig" -endif -if ARCH_BOARD_LPC4370_LINK2 -source "boards/lpc4370-link2/Kconfig" -endif -if ARCH_BOARD_LPCXPRESSO -source "boards/lpcxpresso-lpc1768/Kconfig" -endif -if ARCH_BOARD_LPCXPRESSO_LPC54628 -source "boards/lpcxpresso-lpc54628/Kconfig" -endif -if ARCH_BOARD_MAKERLISP -source "boards/makerlisp/Kconfig" -endif -if ARCH_BOARD_MAPLE -source "boards/maple/Kconfig" -endif -if ARCH_BOARD_MAX32660_EVSYS -source "boards/max32660-evsys/Kconfig" -endif -if ARCH_BOARD_MBED -source "boards/mbed/Kconfig" -endif -if ARCH_BOARD_MCB1700 -source "boards/mcb1700/Kconfig" -endif -if ARCH_BOARD_MCU123_LPC214X -source "boards/mcu123-lpc214x/Kconfig" -endif -if ARCH_BOARD_METRO_M4 -source "boards/metro-m4/Kconfig" -endif -if ARCH_BOARD_MICROPENDOUS3 -source "boards/micropendous3/Kconfig" -endif -if ARCH_BOARD_MIKROE_STM32F4 -source "boards/mikroe-stm32f4/Kconfig" -endif -if ARCH_BOARD_MIRTOO -source "boards/mirtoo/Kconfig" -endif -if ARCH_BOARD_MISOC_QEMU || ARCH_BOARD_MISOC_VERILATOR -source "boards/misoc/Kconfig" -endif -if ARCH_BOARD_MOTEINO_MEGA -source "boards/moteino-mega/Kconfig" -endif -if ARCH_BOARD_MOXA -source "boards/moxa/Kconfig" -endif -if ARCH_BOARD_NE64BADGE -source "boards/ne64badge/Kconfig" -endif -if ARCH_BOARD_NRF52_GENERIC -source "boards/nrf52-generic/Kconfig" -endif -if ARCH_BOARD_NTOSD_DM320 -source "boards/ntosd-dm320/Kconfig" -endif -if ARCH_BOARD_NUCLEO_144 -source "boards/nucleo-144/Kconfig" -endif -if ARCH_BOARD_NUCLEO_F072RB -source "boards/nucleo-f072rb/Kconfig" -endif -if ARCH_BOARD_NUCLEO_F091RC -source "boards/nucleo-f091rc/Kconfig" -endif -if ARCH_BOARD_NUCLEO_F103RB -source "boards/nucleo-f103rb/Kconfig" -endif -if ARCH_BOARD_NUCLEO_F207ZG -source "boards/nucleo-f207zg/Kconfig" -endif -if ARCH_BOARD_NUCLEO_F302R8 -source "boards/nucleo-f302r8/Kconfig" -endif -if ARCH_BOARD_NUCLEO_F303RE -source "boards/nucleo-f303re/Kconfig" -endif -if ARCH_BOARD_NUCLEO_F303ZE -source "boards/nucleo-f303ze/Kconfig" -endif -if ARCH_BOARD_NUCLEO_F334R8 -source "boards/nucleo-f334r8/Kconfig" -endif -if ARCH_BOARD_NUCLEO_F401RE || ARCH_BOARD_NUCLEO_F411RE -source "boards/nucleo-f4x1re/Kconfig" -endif -if ARCH_BOARD_NUCLEO_F44RE -source "boards/nucleo-f446re/Kconfig" -endif -if ARCH_BOARD_NUCLEO_F410RB -source "boards/nucleo-f410rb/Kconfig" -endif -if ARCH_BOARD_NUCLEO_G071RB -source "boards/nucleo-g071rb/Kconfig" -endif -if ARCH_BOARD_NUCLEO_H743ZI -source "boards/nucleo-h743zi/Kconfig" -endif -if ARCH_BOARD_NUCLEO_L073RZ -source "boards/nucleo-l073rz/Kconfig" -endif -if ARCH_BOARD_NUCLEO_L152RE -source "boards/nucleo-l152re/Kconfig" -endif -if ARCH_BOARD_NUCLEO_L432KC -source "boards/nucleo-l432kc/Kconfig" -endif -if ARCH_BOARD_NUCLEO_L452RE -source "boards/nucleo-l452re/Kconfig" -endif -if ARCH_BOARD_NUCLEO_L476RG -source "boards/nucleo-l476rg/Kconfig" -endif -if ARCH_BOARD_NUCLEO_L496ZG -source "boards/nucleo-l496zg/Kconfig" -endif -if ARCH_BOARD_NUTINY_NUC120 -source "boards/nutiny-nuc120/Kconfig" -endif -if ARCH_BOARD_OLIMEX_EFM32G880F128_STK -source "boards/olimex-efm32g880f128-stk/Kconfig" -endif -if ARCH_BOARD_LPC1766STK -source "boards/olimex-lpc1766stk/Kconfig" -endif -if ARCH_BOARD_OLIMEXLPC2378 -source "boards/olimex-lpc2378/Kconfig" -endif -if ARCH_BOARD_OLIMEX_LPC_H3131 -source "boards/olimex-lpc-h3131/Kconfig" -endif -if ARCH_BOARD_OLIMEX_STM32H405 -source "boards/olimex-stm32-h405/Kconfig" -endif -if ARCH_BOARD_OLIMEX_STM32H407 -source "boards/olimex-stm32-h407/Kconfig" -endif -if ARCH_BOARD_OLIMEX_STM32E407 -source "boards/olimex-stm32-e407/Kconfig" -endif -if ARCH_BOARD_OLIMEX_STM32P107 -source "boards/olimex-stm32-p107/Kconfig" -endif -if ARCH_BOARD_OLIMEX_STM32P207 -source "boards/olimex-stm32-p207/Kconfig" -endif -if ARCH_BOARD_OLIMEX_STM32P407 -source "boards/olimex-stm32-p407/Kconfig" -endif -if ARCH_BOARD_OLIMEX_STRP711 -source "boards/olimex-strp711/Kconfig" -endif -if ARCH_BOARD_OLIMEXINO_STM32 -source "boards/olimexino-stm32/Kconfig" -endif -if ARCH_BOARD_OMNIBUSF4 -source "boards/omnibusf4/Kconfig" -endif -if ARCH_BOARD_OPEN1788 -source "boards/open1788/Kconfig" -endif -if ARCH_BOARD_OR1K -source "boards/or1k/Kconfig" -endif -if ARCH_BOARD_PCDUINO_A10 -source "boards/pcduino-a10/Kconfig" -endif -if ARCH_BOARD_BEAGLEBONE_BLACK -source "boards/beaglebone-black/Kconfig" -endif -if ARCH_BOARD_PIC32MX_STARTERKIT -source "boards/pic32mx-starterkit/Kconfig" -endif -if ARCH_BOARD_PIC32MX7MMB -source "boards/pic32mx7mmb/Kconfig" -endif -if ARCH_BOARD_PIC32MZ_STARTERKIT -source "boards/pic32mz-starterkit/Kconfig" -endif -if ARCH_BOARD_QEMU_I486 -source "boards/qemu-i486/Kconfig" -endif -if ARCH_BOARD_SABRE_6QUAD -source "boards/sabre-6quad/Kconfig" -endif -if ARCH_BOARD_SAMA5D2_XULT -source "boards/sama5d2-xult/Kconfig" -endif -if ARCH_BOARD_SAMA5D3X_EK -source "boards/sama5d3x-ek/Kconfig" -endif -if ARCH_BOARD_SAMA5D3_XPLAINED -source "boards/sama5d3-xplained/Kconfig" -endif -if ARCH_BOARD_SAMA5D4_EK -source "boards/sama5d4-ek/Kconfig" -endif -if ARCH_BOARD_SAMD20_XPLAINED -source "boards/samd20-xplained/Kconfig" -endif -if ARCH_BOARD_SAMD21_XPLAINED -source "boards/samd21-xplained/Kconfig" -endif -if ARCH_BOARD_SAML21_XPLAINED -source "boards/saml21-xplained/Kconfig" -endif -if ARCH_BOARD_SAM3UEK -source "boards/sam3u-ek/Kconfig" -endif -if ARCH_BOARD_SAM4CMP_DB -source "boards/sam4cmp-db/Kconfig" -endif -if ARCH_BOARD_SAM4EEK -source "boards/sam4e-ek/Kconfig" -endif -if ARCH_BOARD_SAM4L_XPLAINED -source "boards/sam4l-xplained/Kconfig" -endif -if ARCH_BOARD_SAM4S_XPLAINED -source "boards/sam4s-xplained/Kconfig" -endif -if ARCH_BOARD_SAM4S_XPLAINED_PRO -source "boards/sam4s-xplained-pro/Kconfig" -endif -if ARCH_BOARD_SAME70_XPLAINED -source "boards/same70-xplained/Kconfig" -endif -if ARCH_BOARD_SAMV71_XULT -source "boards/samv71-xult/Kconfig" -endif -if ARCH_BOARD_SHENZHOU -source "boards/shenzhou/Kconfig" -endif -if ARCH_BOARD_SKP16C26 -source "boards/skp16c26/Kconfig" -endif -if ARCH_BOARD_PHOTON -source "boards/photon/Kconfig" -endif -if ARCH_BOARD_PNEV5180B -source "boards/pnev5180b/Kconfig" -endif -if ARCH_BOARD_STM32_BUTTERFLY2 -source "boards/stm32butterfly2/Kconfig" -endif -if ARCH_BOARD_STM32_TINY -source "boards/stm32_tiny/Kconfig" -endif -if ARCH_BOARD_STM32F051_DISCOVERY -source "boards/stm32f051-discovery/Kconfig" -endif -if ARCH_BOARD_STM32F072_DISCOVERY -source "boards/stm32f072-discovery/Kconfig" -endif -if ARCH_BOARD_STM32F103_MINIMUM -source "boards/stm32f103-minimum/Kconfig" -endif -if ARCH_BOARD_STM3210E_EVAL -source "boards/stm3210e-eval/Kconfig" -endif -if ARCH_BOARD_STM3220G_EVAL -source "boards/stm3220g-eval/Kconfig" -endif -if ARCH_BOARD_STM3240G_EVAL -source "boards/stm3240g-eval/Kconfig" -endif -if ARCH_BOARD_STM32F334_DISCO -source "boards/stm32f334-disco/Kconfig" -endif -if ARCH_BOARD_STM32F4_DISCOVERY -source "boards/stm32f4discovery/Kconfig" -endif -if ARCH_BOARD_STM32F411E_DISCO -source "boards/stm32f411e-disco/Kconfig" -endif -if ARCH_BOARD_STM32F429I_DISCO -source "boards/stm32f429i-disco/Kconfig" -endif -if ARCH_BOARD_STM32F746G_DISCO -source "boards/stm32f746g-disco/Kconfig" -endif -if ARCH_BOARD_STM32F769I_DISCO -source "boards/stm32f769i-disco/Kconfig" +if ARCH_BOARD_AXOLOTI +source "boards/arm/axoloti/Kconfig" endif if ARCH_BOARD_B_L072Z_LRWAN1 -source "boards/b-l072z-lrwan1/Kconfig" +source "boards/arm/b-l072z-lrwan1/Kconfig" endif if ARCH_BOARD_B_L475E_IOT01A -source "boards/b-l475e-iot01a/Kconfig" +source "boards/arm/b-l475e-iot01a/Kconfig" +endif +if ARCH_BOARD_BAMBINO_200E +source "boards/arm/bambino-200e/Kconfig" +endif +if ARCH_BOARD_BEAGLEBONE_BLACK +source "boards/arm/beaglebone-black/Kconfig" +endif +if ARCH_BOARD_C5471EVM +source "boards/arm/c5471evm/Kconfig" +endif +if ARCH_BOARD_CLICKER2_STM32 +source "boards/arm/clicker2-stm32/Kconfig" +endif +if ARCH_BOARD_CLOUDCTRL +source "boards/arm/cloudctrl/Kconfig" +endif +if ARCH_BOARD_DK_TM4C129X +source "boards/arm/dk-tm4c129x/Kconfig" +endif +if ARCH_BOARD_EA3131 +source "boards/arm/ea3131/Kconfig" +endif +if ARCH_BOARD_EA3152 +source "boards/arm/ea3152/Kconfig" +endif +if ARCH_BOARD_EAGLE100 +source "boards/arm/eagle100/Kconfig" +endif +if ARCH_BOARD_EFM32G8XXSTK +source "boards/arm/efm32-g8xx-stk/Kconfig" +endif +if ARCH_BOARD_EFM32GG_STK3700 +source "boards/arm/efm32gg-stk3700/Kconfig" +endif +if ARCH_BOARD_EKKLM3S9B96 +source "boards/arm/ekk-lm3s9b96/Kconfig" +endif +if ARCH_BOARD_FIRE_STM32 +source "boards/arm/fire-stm32v2/Kconfig" +endif +if ARCH_BOARD_FLIPNCLICK_SAM3X +source "boards/arm/flipnclick-sam3x/Kconfig" +endif +if ARCH_BOARD_FREEDOM_K28F +source "boards/arm/freedom-k28f/Kconfig" +endif +if ARCH_BOARD_FREEDOM_K64F +source "boards/arm/freedom-k64f/Kconfig" +endif +if ARCH_BOARD_FREEDOM_K66F +source "boards/arm/freedom-k66f/Kconfig" +endif +if ARCH_BOARD_FREEDOM_KL25Z +source "boards/arm/freedom-kl25z/Kconfig" +endif +if ARCH_BOARD_FREEDOM_KL26Z +source "boards/arm/freedom-kl26z/Kconfig" +endif +if ARCH_BOARD_HYMINI_STM32V +source "boards/arm/hymini-stm32v/Kconfig" +endif +if ARCH_BOARD_IMXRT1050_EVK +source "boards/arm/imxrt1050-evk/Kconfig" +endif +if ARCH_BOARD_IMXRT1060_EVK +source "boards/arm/imxrt1060-evk/Kconfig" +endif +if ARCH_BOARD_KWIKSTIK_K40 +source "boards/arm/kwikstik-k40/Kconfig" +endif +if ARCH_BOARD_LAUNCHXL_CC1310 +source "boards/arm/launchxl-cc1310/Kconfig" +endif +if ARCH_BOARD_LAUNCHXL_CC1312R1 +source "boards/arm/launchxl-cc1312r1/Kconfig" +endif +if ARCH_BOARD_LAUNCHXL_TMS57004 +source "boards/arm/launchxl-tms57004/Kconfig" +endif +if ARCH_BOARD_LC823450_XGEVK +source "boards/arm/lc823450-xgevk/Kconfig" +endif +if ARCH_BOARD_LINCOLN60 +source "boards/arm/lincoln60/Kconfig" +endif +if ARCH_BOARD_LM3S6432S2E +source "boards/arm/lm3s6432-s2e/Kconfig" +endif +if ARCH_BOARD_LM3S6965EK +source "boards/arm/lm3s6965-ek/Kconfig" +endif +if ARCH_BOARD_LM3S8962EK +source "boards/arm/lm3s8962-ek/Kconfig" +endif +if ARCH_BOARD_LM3S8962EK +source "boards/arm/lm4f120-launchpad/Kconfig" +endif +if ARCH_BOARD_LPC4088_DEVKIT +source "boards/arm/lpc4088-devkit/Kconfig" +endif +if ARCH_BOARD_LPC4088_QUICKSTART +source "boards/arm/lpc4088-quickstart/Kconfig" +endif +if ARCH_BOARD_LPC4330_XPLORER +source "boards/arm/lpc4330-xplorer/Kconfig" +endif +if ARCH_BOARD_LPC4337_WS +source "boards/arm/lpc4337-ws/Kconfig" +endif +if ARCH_BOARD_LPC4357_EVB +source "boards/arm/lpc4357-evb/Kconfig" +endif +if ARCH_BOARD_LPC4370_LINK2 +source "boards/arm/lpc4370-link2/Kconfig" +endif +if ARCH_BOARD_LPCXPRESSO +source "boards/arm/lpcxpresso-lpc1768/Kconfig" +endif +if ARCH_BOARD_LPCXPRESSO_LPC54628 +source "boards/arm/lpcxpresso-lpc54628/Kconfig" +endif +if ARCH_BOARD_MAPLE +source "boards/arm/maple/Kconfig" +endif +if ARCH_BOARD_MAX32660_EVSYS +source "boards/arm/max32660-evsys/Kconfig" +endif +if ARCH_BOARD_MBED +source "boards/arm/mbed/Kconfig" +endif +if ARCH_BOARD_MCB1700 +source "boards/arm/mcb1700/Kconfig" +endif +if ARCH_BOARD_MCU123_LPC214X +source "boards/arm/mcu123-lpc214x/Kconfig" +endif +if ARCH_BOARD_METRO_M4 +source "boards/arm/metro-m4/Kconfig" +endif +if ARCH_BOARD_MIKROE_STM32F4 +source "boards/arm/mikroe-stm32f4/Kconfig" +endif +if ARCH_BOARD_MOXA +source "boards/arm/moxa/Kconfig" +endif +if ARCH_BOARD_NRF52_GENERIC +source "boards/arm/nrf52-generic/Kconfig" +endif +if ARCH_BOARD_NTOSD_DM320 +source "boards/arm/ntosd-dm320/Kconfig" +endif +if ARCH_BOARD_NUCLEO_144 +source "boards/arm/nucleo-144/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F072RB +source "boards/arm/nucleo-f072rb/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F091RC +source "boards/arm/nucleo-f091rc/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F103RB +source "boards/arm/nucleo-f103rb/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F207ZG +source "boards/arm/nucleo-f207zg/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F302R8 +source "boards/arm/nucleo-f302r8/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F303RE +source "boards/arm/nucleo-f303re/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F303ZE +source "boards/arm/nucleo-f303ze/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F334R8 +source "boards/arm/nucleo-f334r8/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F401RE || ARCH_BOARD_NUCLEO_F411RE +source "boards/arm/nucleo-f4x1re/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F44RE +source "boards/arm/nucleo-f446re/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F410RB +source "boards/arm/nucleo-f410rb/Kconfig" +endif +if ARCH_BOARD_NUCLEO_G071RB +source "boards/arm/nucleo-g071rb/Kconfig" +endif +if ARCH_BOARD_NUCLEO_H743ZI +source "boards/arm/nucleo-h743zi/Kconfig" +endif +if ARCH_BOARD_NUCLEO_L073RZ +source "boards/arm/nucleo-l073rz/Kconfig" +endif +if ARCH_BOARD_NUCLEO_L152RE +source "boards/arm/nucleo-l152re/Kconfig" +endif +if ARCH_BOARD_NUCLEO_L432KC +source "boards/arm/nucleo-l432kc/Kconfig" +endif +if ARCH_BOARD_NUCLEO_L452RE +source "boards/arm/nucleo-l452re/Kconfig" +endif +if ARCH_BOARD_NUCLEO_L476RG +source "boards/arm/nucleo-l476rg/Kconfig" +endif +if ARCH_BOARD_NUCLEO_L496ZG +source "boards/arm/nucleo-l496zg/Kconfig" +endif +if ARCH_BOARD_NUTINY_NUC120 +source "boards/arm/nutiny-nuc120/Kconfig" +endif +if ARCH_BOARD_OLIMEX_EFM32G880F128_STK +source "boards/arm/olimex-efm32g880f128-stk/Kconfig" +endif +if ARCH_BOARD_LPC1766STK +source "boards/arm/olimex-lpc1766stk/Kconfig" +endif +if ARCH_BOARD_OLIMEXLPC2378 +source "boards/arm/olimex-lpc2378/Kconfig" +endif +if ARCH_BOARD_OLIMEX_LPC_H3131 +source "boards/arm/olimex-lpc-h3131/Kconfig" +endif +if ARCH_BOARD_OLIMEX_STM32H405 +source "boards/arm/olimex-stm32-h405/Kconfig" +endif +if ARCH_BOARD_OLIMEX_STM32H407 +source "boards/arm/olimex-stm32-h407/Kconfig" +endif +if ARCH_BOARD_OLIMEX_STM32E407 +source "boards/arm/olimex-stm32-e407/Kconfig" +endif +if ARCH_BOARD_OLIMEX_STM32P107 +source "boards/arm/olimex-stm32-p107/Kconfig" +endif +if ARCH_BOARD_OLIMEX_STM32P207 +source "boards/arm/olimex-stm32-p207/Kconfig" +endif +if ARCH_BOARD_OLIMEX_STM32P407 +source "boards/arm/olimex-stm32-p407/Kconfig" +endif +if ARCH_BOARD_OLIMEX_STRP711 +source "boards/arm/olimex-strp711/Kconfig" +endif +if ARCH_BOARD_OLIMEXINO_STM32 +source "boards/arm/olimexino-stm32/Kconfig" +endif +if ARCH_BOARD_OMNIBUSF4 +source "boards/arm/omnibusf4/Kconfig" +endif +if ARCH_BOARD_OPEN1788 +source "boards/arm/open1788/Kconfig" +endif +if ARCH_BOARD_PCDUINO_A10 +source "boards/arm/pcduino-a10/Kconfig" +endif +if ARCH_BOARD_SABRE_6QUAD +source "boards/arm/sabre-6quad/Kconfig" +endif +if ARCH_BOARD_SAMA5D2_XULT +source "boards/arm/sama5d2-xult/Kconfig" +endif +if ARCH_BOARD_SAMA5D3X_EK +source "boards/arm/sama5d3x-ek/Kconfig" +endif +if ARCH_BOARD_SAMA5D3_XPLAINED +source "boards/arm/sama5d3-xplained/Kconfig" +endif +if ARCH_BOARD_SAMA5D4_EK +source "boards/arm/sama5d4-ek/Kconfig" +endif +if ARCH_BOARD_SAMD20_XPLAINED +source "boards/arm/samd20-xplained/Kconfig" +endif +if ARCH_BOARD_SAMD21_XPLAINED +source "boards/arm/samd21-xplained/Kconfig" +endif +if ARCH_BOARD_SAML21_XPLAINED +source "boards/arm/saml21-xplained/Kconfig" +endif +if ARCH_BOARD_SAM3UEK +source "boards/arm/sam3u-ek/Kconfig" +endif +if ARCH_BOARD_SAM4CMP_DB +source "boards/arm/sam4cmp-db/Kconfig" +endif +if ARCH_BOARD_SAM4EEK +source "boards/arm/sam4e-ek/Kconfig" +endif +if ARCH_BOARD_SAM4L_XPLAINED +source "boards/arm/sam4l-xplained/Kconfig" +endif +if ARCH_BOARD_SAM4S_XPLAINED +source "boards/arm/sam4s-xplained/Kconfig" +endif +if ARCH_BOARD_SAM4S_XPLAINED_PRO +source "boards/arm/sam4s-xplained-pro/Kconfig" +endif +if ARCH_BOARD_SAME70_XPLAINED +source "boards/arm/same70-xplained/Kconfig" +endif +if ARCH_BOARD_SAMV71_XULT +source "boards/arm/samv71-xult/Kconfig" +endif +if ARCH_BOARD_SHENZHOU +source "boards/arm/shenzhou/Kconfig" +endif +if ARCH_BOARD_PHOTON +source "boards/arm/photon/Kconfig" +endif +if ARCH_BOARD_PNEV5180B +source "boards/arm/pnev5180b/Kconfig" +endif +if ARCH_BOARD_STM32_BUTTERFLY2 +source "boards/arm/stm32butterfly2/Kconfig" +endif +if ARCH_BOARD_STM32_TINY +source "boards/arm/stm32_tiny/Kconfig" +endif +if ARCH_BOARD_STM32F051_DISCOVERY +source "boards/arm/stm32f051-discovery/Kconfig" +endif +if ARCH_BOARD_STM32F072_DISCOVERY +source "boards/arm/stm32f072-discovery/Kconfig" +endif +if ARCH_BOARD_STM32F103_MINIMUM +source "boards/arm/stm32f103-minimum/Kconfig" +endif +if ARCH_BOARD_STM3210E_EVAL +source "boards/arm/stm3210e-eval/Kconfig" +endif +if ARCH_BOARD_STM3220G_EVAL +source "boards/arm/stm3220g-eval/Kconfig" +endif +if ARCH_BOARD_STM3240G_EVAL +source "boards/arm/stm3240g-eval/Kconfig" +endif +if ARCH_BOARD_STM32F334_DISCO +source "boards/arm/stm32f334-disco/Kconfig" +endif +if ARCH_BOARD_STM32F4_DISCOVERY +source "boards/arm/stm32f4discovery/Kconfig" +endif +if ARCH_BOARD_STM32F411E_DISCO +source "boards/arm/stm32f411e-disco/Kconfig" +endif +if ARCH_BOARD_STM32F429I_DISCO +source "boards/arm/stm32f429i-disco/Kconfig" +endif +if ARCH_BOARD_STM32F746G_DISCO +source "boards/arm/stm32f746g-disco/Kconfig" +endif +if ARCH_BOARD_STM32F769I_DISCO +source "boards/arm/stm32f769i-disco/Kconfig" endif if ARCH_BOARD_STM32F746_WS -source "boards/stm32f746-ws/Kconfig" +source "boards/arm/stm32f746-ws/Kconfig" endif if ARCH_BOARD_STM32L476VG_DISCO -source "boards/stm32l476vg-disco/Kconfig" +source "boards/arm/stm32l476vg-disco/Kconfig" endif if ARCH_BOARD_STM32L476_MDK -source "boards/stm32l476-mdk/Kconfig" +source "boards/arm/stm32l476-mdk/Kconfig" endif if ARCH_BOARD_STM32L_DISCOVERY -source "boards/stm32ldiscovery/Kconfig" +source "boards/arm/stm32ldiscovery/Kconfig" endif if ARCH_BOARD_STM32VL_DISCOVERY -source "boards/stm32vldiscovery/Kconfig" -endif -if ARCH_BOARD_SUREPIC32MX -source "boards/sure-pic32mx/Kconfig" -endif -if ARCH_BOARD_TEENSY_20 -source "boards/teensy-2.0/Kconfig" +source "boards/arm/stm32vldiscovery/Kconfig" endif if ARCH_BOARD_TEENSY_3X -source "boards/teensy-3.x/Kconfig" +source "boards/arm/teensy-3.x/Kconfig" endif if ARCH_BOARD_TEENSY_LC -source "boards/teensy-lc/Kconfig" +source "boards/arm/teensy-lc/Kconfig" endif if ARCH_BOARD_TM4C123G_LAUNCHPAD -source "boards/tm4c123g-launchpad/Kconfig" +source "boards/arm/tm4c123g-launchpad/Kconfig" endif if ARCH_BOARD_TM4C1294_LAUNCHPAD -source "boards/tm4c1294-launchpad/Kconfig" +source "boards/arm/tm4c1294-launchpad/Kconfig" endif if ARCH_BOARD_TMS570LS31X_USB_KIT -source "boards/tms570ls31x-usb-kit/Kconfig" +source "boards/arm/tms570ls31x-usb-kit/Kconfig" endif if ARCH_BOARD_TWR_K60N512 -source "boards/twr-k60n512/Kconfig" +source "boards/arm/twr-k60n512/Kconfig" endif if ARCH_BOARD_TWR_K64F120M -source "boards/twr-k64f120m/Kconfig" +source "boards/arm/twr-k64f120m/Kconfig" endif if ARCH_BOARD_U_BLOX_C027 -source "boards/u-blox-c027/Kconfig" -endif -if ARCH_BOARD_UBW32 -source "boards/ubw32/Kconfig" -endif -if ARCH_BOARD_US7032EVB1 -source "boards/us7032evb1/Kconfig" +source "boards/arm/u-blox-c027/Kconfig" endif if ARCH_BOARD_VIEWTOOL_STM32F107 -source "boards/viewtool-stm32f107/Kconfig" +source "boards/arm/viewtool-stm32f107/Kconfig" endif if ARCH_BOARD_XMC4500RELAX -source "boards/xmc4500-relax/Kconfig" -endif -if ARCH_BOARD_Z16F2800100ZCOG -source "boards/z16f2800100zcog/Kconfig" -endif -if ARCH_BOARD_Z80SIM -source "boards/z80sim/Kconfig" -endif -if ARCH_BOARD_Z8ENCORE000ZCO -source "boards/z8encore000zco/Kconfig" -endif -if ARCH_BOARD_Z8F64200100KIT -source "boards/z8f64200100kit/Kconfig" +source "boards/arm/xmc4500-relax/Kconfig" endif if ARCH_BOARD_ZP214XPA -source "boards/zp214xpa/Kconfig" +source "boards/arm/zp214xpa/Kconfig" endif if ARCH_BOARD_ZKITARM -source "boards/zkit-arm-1769/Kconfig" +source "boards/arm/zkit-arm-1769/Kconfig" endif if ARCH_BOARD_SPRESENSE -source "boards/spresense/Kconfig" +source "boards/arm/spresense/Kconfig" endif -if ARCH_BOARD_SIM -source "boards/sim/Kconfig" +if ARCH_BOARD_AMBER +source "boards/avr/amber/Kconfig" +endif +if ARCH_BOARD_ARDUINO_MEGA2560 +source "boards/avr/arduino-mega2560/Kconfig" +endif +if ARCH_BOARD_AVR32DEV1 +source "boards/avr/avr32dev1/Kconfig" +endif +if ARCH_BOARD_MICROPENDOUS3 +source "boards/avr/micropendous3/Kconfig" +endif +if ARCH_BOARD_MOTEINO_MEGA +source "boards/avr/moteino-mega/Kconfig" +endif +if ARCH_BOARD_TEENSY_20 +source "boards/avr/teensy-2.0/Kconfig" endif if ARCH_BOARD_CUSTOM source "boards/dummy/Kconfig" endif +if ARCH_BOARD_DEMOS92S12NEC64 +source "boards/hc/demo9s12ne64/Kconfig" +endif +if ARCH_BOARD_NE64BADGE +source "boards/hc/ne64badge/Kconfig" +endif +if ARCH_BOARD_FLIPNCLICK_PIC32MZ +source "boards/mips/flipnclick-pic32mz/Kconfig" +endif +if ARCH_BOARD_MIRTOO +source "boards/mips/mirtoo/Kconfig" +endif +if ARCH_BOARD_PIC32MX_STARTERKIT +source "boards/mips/pic32mx-starterkit/Kconfig" +endif +if ARCH_BOARD_PIC32MX7MMB +source "boards/mips/pic32mx7mmb/Kconfig" +endif +if ARCH_BOARD_PIC32MZ_STARTERKIT +source "boards/mips/pic32mz-starterkit/Kconfig" +endif +if ARCH_BOARD_SUREPIC32MX +source "boards/mips/sure-pic32mx/Kconfig" +endif +if ARCH_BOARD_UBW32 +source "boards/mips/ubw32/Kconfig" +endif +if ARCH_BOARD_MISOC_QEMU || ARCH_BOARD_MISOC_VERILATOR +source "boards/misoc/misoc/Kconfig" +endif +if ARCH_BOARD_OR1K +source "boards/or1k/or1k/Kconfig" +endif +if ARCH_BOARD_SKP16C26 +source "boards/renesas/skp16c26/Kconfig" +endif +if ARCH_BOARD_US7032EVB1 +source "boards/renesas/us7032evb1/Kconfig" +endif +if ARCH_BOARD_GAPUINO +source "boards/risc-v/gapuino/Kconfig" +endif +if ARCH_BOARD_NR5M100_NEXYS4 +source "boards/risc-v/nr5m100-nexys4/Kconfig" +endif +if ARCH_BOARD_SIM +source "boards/sim/sim/Kconfig" +endif +if ARCH_BOARD_QEMU_I486 +source "boards/x86/qemu-i486/Kconfig" +endif +if ARCH_BOARD_ESP32CORE +source "boards/xtensa/esp32-core/Kconfig" +endif +if ARCH_BOARD_Z16F2800100ZCOG +source "boards/z16/z16f2800100zcog/Kconfig" +endif +if ARCH_BOARD_EZ80F910200KITG +source "boards/z80/ez80f910200kitg/Kconfig" +endif +if ARCH_BOARD_EZ80F910200ZCO +source "boards/z80/ez80f910200zco/Kconfig" +endif +if ARCH_BOARD_MAKERLISP +source "boards/z80/makerlisp/Kconfig" +endif +if ARCH_BOARD_Z80SIM +source "boards/z80/z80sim/Kconfig" +endif +if ARCH_BOARD_Z8ENCORE000ZCO +source "boards/z80/z8encore000zco/Kconfig" +endif +if ARCH_BOARD_Z8F64200100KIT +source "boards/z80/z8f64200100kit/Kconfig" +endif config BOARD_CRASHDUMP bool "Enable Board level logging of crash dumps" diff --git a/boards/arduino-due/Kconfig b/boards/arm/arduino-due/Kconfig similarity index 100% rename from boards/arduino-due/Kconfig rename to boards/arm/arduino-due/Kconfig diff --git a/boards/arduino-due/README.txt b/boards/arm/arduino-due/README.txt similarity index 100% rename from boards/arduino-due/README.txt rename to boards/arm/arduino-due/README.txt diff --git a/boards/arduino-due/configs/nsh/defconfig b/boards/arm/arduino-due/configs/nsh/defconfig similarity index 100% rename from boards/arduino-due/configs/nsh/defconfig rename to boards/arm/arduino-due/configs/nsh/defconfig diff --git a/boards/arduino-due/include/board.h b/boards/arm/arduino-due/include/board.h similarity index 98% rename from boards/arduino-due/include/board.h rename to boards/arm/arduino-due/include/board.h index 11b7d6fa95..d009b9283d 100644 --- a/boards/arduino-due/include/board.h +++ b/boards/arm/arduino-due/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_ARDUINO_DUE_INCLUDE_BOARD_H -#define __BOARDS_ARDUINO_DUE_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_ARDUINO_DUE_INCLUDE_BOARD_H +#define __BOARDS_ARM_ARDUINO_DUE_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -224,4 +224,4 @@ GPIO_PIN8 | GPIO_CFG_PULLUP) #endif -#endif /* __BOARDS_ARDUINO_DUE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_ARDUINO_DUE_INCLUDE_BOARD_H */ diff --git a/boards/arduino-due/scripts/Make.defs b/boards/arm/arduino-due/scripts/Make.defs similarity index 96% rename from boards/arduino-due/scripts/Make.defs rename to boards/arm/arduino-due/scripts/Make.defs index 1af591437a..083b7a820b 100644 --- a/boards/arduino-due/scripts/Make.defs +++ b/boards/arm/arduino-due/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/arduino-due.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/arduino-due.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/arduino-due.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/arduino-due.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arduino-due/scripts/arduino-due.ld b/boards/arm/arduino-due/scripts/arduino-due.ld similarity index 100% rename from boards/arduino-due/scripts/arduino-due.ld rename to boards/arm/arduino-due/scripts/arduino-due.ld diff --git a/boards/amber/src/.gitignore b/boards/arm/arduino-due/src/.gitignore similarity index 100% rename from boards/amber/src/.gitignore rename to boards/arm/arduino-due/src/.gitignore diff --git a/boards/arduino-due/src/Makefile b/boards/arm/arduino-due/src/Makefile similarity index 100% rename from boards/arduino-due/src/Makefile rename to boards/arm/arduino-due/src/Makefile diff --git a/boards/arduino-due/src/arduino-due.h b/boards/arm/arduino-due/src/arduino-due.h similarity index 99% rename from boards/arduino-due/src/arduino-due.h rename to boards/arm/arduino-due/src/arduino-due.h index afa580467e..0933527266 100644 --- a/boards/arduino-due/src/arduino-due.h +++ b/boards/arm/arduino-due/src/arduino-due.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_ARDUINO_DUE_SRC_ARDUNO_DUE_H -#define __BOARDS_ARDUINO_DUE_SRC_ARDUNO_DUE_H +#ifndef __BOARDS_ARM_ARDUINO_DUE_SRC_ARDUNO_DUE_H +#define __BOARDS_ARM_ARDUINO_DUE_SRC_ARDUNO_DUE_H /************************************************************************************ * Included Files @@ -360,5 +360,5 @@ int sam_tsc_setup(int minor); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARDUINO_DUE_SRC_ARDUNO_DUE_H */ +#endif /* __BOARDS_ARM_ARDUINO_DUE_SRC_ARDUNO_DUE_H */ diff --git a/boards/arduino-due/src/sam_appinit.c b/boards/arm/arduino-due/src/sam_appinit.c similarity index 100% rename from boards/arduino-due/src/sam_appinit.c rename to boards/arm/arduino-due/src/sam_appinit.c diff --git a/boards/arduino-due/src/sam_autoleds.c b/boards/arm/arduino-due/src/sam_autoleds.c similarity index 100% rename from boards/arduino-due/src/sam_autoleds.c rename to boards/arm/arduino-due/src/sam_autoleds.c diff --git a/boards/arduino-due/src/sam_boot.c b/boards/arm/arduino-due/src/sam_boot.c similarity index 100% rename from boards/arduino-due/src/sam_boot.c rename to boards/arm/arduino-due/src/sam_boot.c diff --git a/boards/arduino-due/src/sam_bringup.c b/boards/arm/arduino-due/src/sam_bringup.c similarity index 100% rename from boards/arduino-due/src/sam_bringup.c rename to boards/arm/arduino-due/src/sam_bringup.c diff --git a/boards/arduino-due/src/sam_mmcsd.c b/boards/arm/arduino-due/src/sam_mmcsd.c similarity index 100% rename from boards/arduino-due/src/sam_mmcsd.c rename to boards/arm/arduino-due/src/sam_mmcsd.c diff --git a/boards/arduino-due/src/sam_touchscreen.c b/boards/arm/arduino-due/src/sam_touchscreen.c similarity index 100% rename from boards/arduino-due/src/sam_touchscreen.c rename to boards/arm/arduino-due/src/sam_touchscreen.c diff --git a/boards/arduino-due/src/sam_userleds.c b/boards/arm/arduino-due/src/sam_userleds.c similarity index 100% rename from boards/arduino-due/src/sam_userleds.c rename to boards/arm/arduino-due/src/sam_userleds.c diff --git a/boards/axoloti/Kconfig b/boards/arm/axoloti/Kconfig similarity index 100% rename from boards/axoloti/Kconfig rename to boards/arm/axoloti/Kconfig diff --git a/boards/axoloti/README.txt b/boards/arm/axoloti/README.txt similarity index 100% rename from boards/axoloti/README.txt rename to boards/arm/axoloti/README.txt diff --git a/boards/axoloti/configs/nsh/defconfig b/boards/arm/axoloti/configs/nsh/defconfig similarity index 100% rename from boards/axoloti/configs/nsh/defconfig rename to boards/arm/axoloti/configs/nsh/defconfig diff --git a/boards/axoloti/include/board.h b/boards/arm/axoloti/include/board.h similarity index 98% rename from boards/axoloti/include/board.h rename to boards/arm/axoloti/include/board.h index ae56c52bb8..6d75426503 100644 --- a/boards/axoloti/include/board.h +++ b/boards/arm/axoloti/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_AXOLOTI_INCLUDE_BOARD_H -#define __BOARDS_AXOLOTI_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_AXOLOTI_INCLUDE_BOARD_H +#define __BOARDS_ARM_AXOLOTI_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -272,4 +272,4 @@ #define DMAMAP_SDIO DMAMAP_SDIO_2 -#endif /* __CONFIG_AXOLOTI_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_AXOLOTI_INCLUDE_BOARD_H */ diff --git a/boards/axoloti/scripts/Make.defs b/boards/arm/axoloti/scripts/Make.defs similarity index 94% rename from boards/axoloti/scripts/Make.defs rename to boards/arm/axoloti/scripts/Make.defs index 9ca517c1a4..fc29a3bf3a 100644 --- a/boards/axoloti/scripts/Make.defs +++ b/boards/arm/axoloti/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc @@ -112,9 +112,9 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif diff --git a/boards/axoloti/scripts/gnu-elf.ld b/boards/arm/axoloti/scripts/gnu-elf.ld similarity index 100% rename from boards/axoloti/scripts/gnu-elf.ld rename to boards/arm/axoloti/scripts/gnu-elf.ld diff --git a/boards/axoloti/scripts/kernel-space.ld b/boards/arm/axoloti/scripts/kernel-space.ld similarity index 100% rename from boards/axoloti/scripts/kernel-space.ld rename to boards/arm/axoloti/scripts/kernel-space.ld diff --git a/boards/axoloti/scripts/ld.script b/boards/arm/axoloti/scripts/ld.script similarity index 100% rename from boards/axoloti/scripts/ld.script rename to boards/arm/axoloti/scripts/ld.script diff --git a/boards/axoloti/scripts/memory.ld b/boards/arm/axoloti/scripts/memory.ld similarity index 100% rename from boards/axoloti/scripts/memory.ld rename to boards/arm/axoloti/scripts/memory.ld diff --git a/boards/axoloti/scripts/user-space.ld b/boards/arm/axoloti/scripts/user-space.ld similarity index 100% rename from boards/axoloti/scripts/user-space.ld rename to boards/arm/axoloti/scripts/user-space.ld diff --git a/boards/arduino-due/src/.gitignore b/boards/arm/axoloti/src/.gitignore similarity index 100% rename from boards/arduino-due/src/.gitignore rename to boards/arm/axoloti/src/.gitignore diff --git a/boards/axoloti/src/Makefile b/boards/arm/axoloti/src/Makefile similarity index 100% rename from boards/axoloti/src/Makefile rename to boards/arm/axoloti/src/Makefile diff --git a/boards/axoloti/src/axoloti.h b/boards/arm/axoloti/src/axoloti.h similarity index 98% rename from boards/axoloti/src/axoloti.h rename to boards/arm/axoloti/src/axoloti.h index 1a1b0479ab..f47864d75f 100644 --- a/boards/axoloti/src/axoloti.h +++ b/boards/arm/axoloti/src/axoloti.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_AXOLOTI_SRC_AXOLOTI_H -#define __BOARDS_AXOLOTI_SRC_AXOLOTI_H +#ifndef __BOARDS_ARM_AXOLOTI_SRC_AXOLOTI_H +#define __BOARDS_ARM_AXOLOTI_SRC_AXOLOTI_H /**************************************************************************** * Included Files @@ -248,4 +248,4 @@ int stm32_sdram_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_AXOLOTI_SRC_AXOLOTI_H */ +#endif /* __BOARDS_ARM_AXOLOTI_SRC_AXOLOTI_H */ diff --git a/boards/axoloti/src/stm32_adau1961.c b/boards/arm/axoloti/src/stm32_adau1961.c similarity index 100% rename from boards/axoloti/src/stm32_adau1961.c rename to boards/arm/axoloti/src/stm32_adau1961.c diff --git a/boards/axoloti/src/stm32_boot.c b/boards/arm/axoloti/src/stm32_boot.c similarity index 100% rename from boards/axoloti/src/stm32_boot.c rename to boards/arm/axoloti/src/stm32_boot.c diff --git a/boards/axoloti/src/stm32_bringup.c b/boards/arm/axoloti/src/stm32_bringup.c similarity index 100% rename from boards/axoloti/src/stm32_bringup.c rename to boards/arm/axoloti/src/stm32_bringup.c diff --git a/boards/axoloti/src/stm32_buttons.c b/boards/arm/axoloti/src/stm32_buttons.c similarity index 100% rename from boards/axoloti/src/stm32_buttons.c rename to boards/arm/axoloti/src/stm32_buttons.c diff --git a/boards/axoloti/src/stm32_extmem.c b/boards/arm/axoloti/src/stm32_extmem.c similarity index 100% rename from boards/axoloti/src/stm32_extmem.c rename to boards/arm/axoloti/src/stm32_extmem.c diff --git a/boards/axoloti/src/stm32_sdio.c b/boards/arm/axoloti/src/stm32_sdio.c similarity index 100% rename from boards/axoloti/src/stm32_sdio.c rename to boards/arm/axoloti/src/stm32_sdio.c diff --git a/boards/axoloti/src/stm32_usbhost.c b/boards/arm/axoloti/src/stm32_usbhost.c similarity index 100% rename from boards/axoloti/src/stm32_usbhost.c rename to boards/arm/axoloti/src/stm32_usbhost.c diff --git a/boards/axoloti/src/stm32_userleds.c b/boards/arm/axoloti/src/stm32_userleds.c similarity index 100% rename from boards/axoloti/src/stm32_userleds.c rename to boards/arm/axoloti/src/stm32_userleds.c diff --git a/boards/b-l072z-lrwan1/Kconfig b/boards/arm/b-l072z-lrwan1/Kconfig similarity index 100% rename from boards/b-l072z-lrwan1/Kconfig rename to boards/arm/b-l072z-lrwan1/Kconfig diff --git a/boards/b-l072z-lrwan1/README.txt b/boards/arm/b-l072z-lrwan1/README.txt similarity index 100% rename from boards/b-l072z-lrwan1/README.txt rename to boards/arm/b-l072z-lrwan1/README.txt diff --git a/boards/b-l072z-lrwan1/configs/adc/defconfig b/boards/arm/b-l072z-lrwan1/configs/adc/defconfig similarity index 100% rename from boards/b-l072z-lrwan1/configs/adc/defconfig rename to boards/arm/b-l072z-lrwan1/configs/adc/defconfig diff --git a/boards/b-l072z-lrwan1/configs/nsh/defconfig b/boards/arm/b-l072z-lrwan1/configs/nsh/defconfig similarity index 100% rename from boards/b-l072z-lrwan1/configs/nsh/defconfig rename to boards/arm/b-l072z-lrwan1/configs/nsh/defconfig diff --git a/boards/b-l072z-lrwan1/configs/nxlines_oled/defconfig b/boards/arm/b-l072z-lrwan1/configs/nxlines_oled/defconfig similarity index 100% rename from boards/b-l072z-lrwan1/configs/nxlines_oled/defconfig rename to boards/arm/b-l072z-lrwan1/configs/nxlines_oled/defconfig diff --git a/boards/b-l072z-lrwan1/configs/sx127x/defconfig b/boards/arm/b-l072z-lrwan1/configs/sx127x/defconfig similarity index 100% rename from boards/b-l072z-lrwan1/configs/sx127x/defconfig rename to boards/arm/b-l072z-lrwan1/configs/sx127x/defconfig diff --git a/boards/b-l072z-lrwan1/include/board.h b/boards/arm/b-l072z-lrwan1/include/board.h similarity index 98% rename from boards/b-l072z-lrwan1/include/board.h rename to boards/arm/b-l072z-lrwan1/include/board.h index c0e6bb4874..7ba48b37af 100644 --- a/boards/b-l072z-lrwan1/include/board.h +++ b/boards/arm/b-l072z-lrwan1/include/board.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_B_L072Z_LRWAN1_INCLUDE_BOARD_H -#define __CONFIG_B_L072Z_LRWAN1_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_B_L072Z_LRWAN1_INCLUDE_BOARD_H +#define __BOARDS_ARM_B_L072Z_LRWAN1_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -258,4 +258,4 @@ #define ADC1_DMA_CHAN DMACHAN_ADC1_1 /* DMA1_CH1 */ -#endif /* __CONFIG_NUCLEO_LO73RZ_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_LO73RZ_INCLUDE_BOARD_H */ diff --git a/boards/b-l072z-lrwan1/scripts/Make.defs b/boards/arm/b-l072z-lrwan1/scripts/Make.defs similarity index 96% rename from boards/b-l072z-lrwan1/scripts/Make.defs rename to boards/arm/b-l072z-lrwan1/scripts/Make.defs index 27663dd0e6..d7031f32a8 100644 --- a/boards/b-l072z-lrwan1/scripts/Make.defs +++ b/boards/arm/b-l072z-lrwan1/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/b-l072z-lrwan1/scripts/ld.script b/boards/arm/b-l072z-lrwan1/scripts/ld.script similarity index 100% rename from boards/b-l072z-lrwan1/scripts/ld.script rename to boards/arm/b-l072z-lrwan1/scripts/ld.script diff --git a/boards/b-l072z-lrwan1/src/Makefile b/boards/arm/b-l072z-lrwan1/src/Makefile similarity index 100% rename from boards/b-l072z-lrwan1/src/Makefile rename to boards/arm/b-l072z-lrwan1/src/Makefile diff --git a/boards/b-l072z-lrwan1/src/b-l072z-lrwan1.h b/boards/arm/b-l072z-lrwan1/src/b-l072z-lrwan1.h similarity index 97% rename from boards/b-l072z-lrwan1/src/b-l072z-lrwan1.h rename to boards/arm/b-l072z-lrwan1/src/b-l072z-lrwan1.h index daa7c03b46..32ae94a522 100644 --- a/boards/b-l072z-lrwan1/src/b-l072z-lrwan1.h +++ b/boards/arm/b-l072z-lrwan1/src/b-l072z-lrwan1.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_B_L072Z_LRWAN1_SRC_B_L072Z_LRWAN1_H -#define __BOARDS_B_L072Z_LRWAN1_SRC_B_L072Z_LRWAN1_H +#ifndef __BOARDS_ARM_B_L072Z_LRWAN1_SRC_B_L072Z_LRWAN1_H +#define __BOARDS_ARM_B_L072Z_LRWAN1_SRC_B_L072Z_LRWAN1_H /**************************************************************************** * Included Files @@ -177,4 +177,4 @@ int stm32_lpwaninitialize(void); int stm32_adc_setup(void); #endif -#endif /* __BOARDS_B_L072Z_LRWAN1_SRC_B_L072Z_LRWAN1_H */ +#endif /* __BOARDS_ARM_B_L072Z_LRWAN1_SRC_B_L072Z_LRWAN1_H */ diff --git a/boards/b-l072z-lrwan1/src/stm32_adc.c b/boards/arm/b-l072z-lrwan1/src/stm32_adc.c similarity index 100% rename from boards/b-l072z-lrwan1/src/stm32_adc.c rename to boards/arm/b-l072z-lrwan1/src/stm32_adc.c diff --git a/boards/b-l072z-lrwan1/src/stm32_appinit.c b/boards/arm/b-l072z-lrwan1/src/stm32_appinit.c similarity index 100% rename from boards/b-l072z-lrwan1/src/stm32_appinit.c rename to boards/arm/b-l072z-lrwan1/src/stm32_appinit.c diff --git a/boards/b-l072z-lrwan1/src/stm32_autoleds.c b/boards/arm/b-l072z-lrwan1/src/stm32_autoleds.c similarity index 100% rename from boards/b-l072z-lrwan1/src/stm32_autoleds.c rename to boards/arm/b-l072z-lrwan1/src/stm32_autoleds.c diff --git a/boards/b-l072z-lrwan1/src/stm32_boot.c b/boards/arm/b-l072z-lrwan1/src/stm32_boot.c similarity index 100% rename from boards/b-l072z-lrwan1/src/stm32_boot.c rename to boards/arm/b-l072z-lrwan1/src/stm32_boot.c diff --git a/boards/b-l072z-lrwan1/src/stm32_bringup.c b/boards/arm/b-l072z-lrwan1/src/stm32_bringup.c similarity index 100% rename from boards/b-l072z-lrwan1/src/stm32_bringup.c rename to boards/arm/b-l072z-lrwan1/src/stm32_bringup.c diff --git a/boards/b-l072z-lrwan1/src/stm32_spi.c b/boards/arm/b-l072z-lrwan1/src/stm32_spi.c similarity index 100% rename from boards/b-l072z-lrwan1/src/stm32_spi.c rename to boards/arm/b-l072z-lrwan1/src/stm32_spi.c diff --git a/boards/b-l072z-lrwan1/src/stm32_ssd1306.c b/boards/arm/b-l072z-lrwan1/src/stm32_ssd1306.c similarity index 100% rename from boards/b-l072z-lrwan1/src/stm32_ssd1306.c rename to boards/arm/b-l072z-lrwan1/src/stm32_ssd1306.c diff --git a/boards/b-l072z-lrwan1/src/stm32_sx127x.c b/boards/arm/b-l072z-lrwan1/src/stm32_sx127x.c similarity index 100% rename from boards/b-l072z-lrwan1/src/stm32_sx127x.c rename to boards/arm/b-l072z-lrwan1/src/stm32_sx127x.c diff --git a/boards/b-l475e-iot01a/Kconfig b/boards/arm/b-l475e-iot01a/Kconfig similarity index 100% rename from boards/b-l475e-iot01a/Kconfig rename to boards/arm/b-l475e-iot01a/Kconfig diff --git a/boards/b-l475e-iot01a/README.txt b/boards/arm/b-l475e-iot01a/README.txt similarity index 100% rename from boards/b-l475e-iot01a/README.txt rename to boards/arm/b-l475e-iot01a/README.txt diff --git a/boards/b-l475e-iot01a/configs/nsh/defconfig b/boards/arm/b-l475e-iot01a/configs/nsh/defconfig similarity index 100% rename from boards/b-l475e-iot01a/configs/nsh/defconfig rename to boards/arm/b-l475e-iot01a/configs/nsh/defconfig diff --git a/boards/b-l475e-iot01a/configs/spirit-6lowpan/defconfig b/boards/arm/b-l475e-iot01a/configs/spirit-6lowpan/defconfig similarity index 100% rename from boards/b-l475e-iot01a/configs/spirit-6lowpan/defconfig rename to boards/arm/b-l475e-iot01a/configs/spirit-6lowpan/defconfig diff --git a/boards/b-l475e-iot01a/configs/spirit-starhub/defconfig b/boards/arm/b-l475e-iot01a/configs/spirit-starhub/defconfig similarity index 100% rename from boards/b-l475e-iot01a/configs/spirit-starhub/defconfig rename to boards/arm/b-l475e-iot01a/configs/spirit-starhub/defconfig diff --git a/boards/b-l475e-iot01a/configs/spirit-starpoint/defconfig b/boards/arm/b-l475e-iot01a/configs/spirit-starpoint/defconfig similarity index 100% rename from boards/b-l475e-iot01a/configs/spirit-starpoint/defconfig rename to boards/arm/b-l475e-iot01a/configs/spirit-starpoint/defconfig diff --git a/boards/b-l475e-iot01a/include/b-l475e-iot01a_clock.h b/boards/arm/b-l475e-iot01a/include/b-l475e-iot01a_clock.h similarity index 98% rename from boards/b-l475e-iot01a/include/b-l475e-iot01a_clock.h rename to boards/arm/b-l475e-iot01a/include/b-l475e-iot01a_clock.h index dbc2160534..ec09a6a2e8 100644 --- a/boards/b-l475e-iot01a/include/b-l475e-iot01a_clock.h +++ b/boards/arm/b-l475e-iot01a/include/b-l475e-iot01a_clock.h @@ -32,8 +32,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_B_L475E_IOT01A_INCLUDE_B_L475E_IOT01A_CLOCK_H -#define __CONFIG_B_L475E_IOT01A_INCLUDE_B_L475E_IOT01A_CLOCK_H +#ifndef __BOARDS_ARM_B_L475E_IOT01A_INCLUDE_B_L475E_IOT01A_CLOCK_H +#define __BOARDS_ARM_B_L475E_IOT01A_INCLUDE_B_L475E_IOT01A_CLOCK_H /************************************************************************************ * Included Files @@ -515,4 +515,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __CONFIG_B_L475E_IOT01A_INCLUDE_B_L475E_IOT01A_CLOCK */ +#endif /* __BOARDS_ARM_B_L475E_IOT01A_INCLUDE_B_L475E_IOT01A_CLOCK */ diff --git a/boards/b-l475e-iot01a/include/board.h b/boards/arm/b-l475e-iot01a/include/board.h similarity index 98% rename from boards/b-l475e-iot01a/include/board.h rename to boards/arm/b-l475e-iot01a/include/board.h index 4158ff675a..83c5f11ddf 100644 --- a/boards/b-l475e-iot01a/include/board.h +++ b/boards/arm/b-l475e-iot01a/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_B_L475E_IOT01A_INCLUDE_BOARD_H -#define __CONFIG_B_L475E_IOT01A_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_B_L475E_IOT01A_INCLUDE_BOARD_H +#define __BOARDS_ARM_B_L475E_IOT01A_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -198,4 +198,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __CONFIG_B_L475E_IOT01A_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_B_L475E_IOT01A_INCLUDE_BOARD_H */ diff --git a/boards/b-l475e-iot01a/scripts/Make.defs b/boards/arm/b-l475e-iot01a/scripts/Make.defs similarity index 97% rename from boards/b-l475e-iot01a/scripts/Make.defs rename to boards/arm/b-l475e-iot01a/scripts/Make.defs index c20baaea06..ffeab0a3c4 100644 --- a/boards/b-l475e-iot01a/scripts/Make.defs +++ b/boards/arm/b-l475e-iot01a/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/b-l475e-iot01a/scripts/flash.ld b/boards/arm/b-l475e-iot01a/scripts/flash.ld similarity index 100% rename from boards/b-l475e-iot01a/scripts/flash.ld rename to boards/arm/b-l475e-iot01a/scripts/flash.ld diff --git a/boards/avr32dev1/src/.gitignore b/boards/arm/b-l475e-iot01a/src/.gitignore similarity index 100% rename from boards/avr32dev1/src/.gitignore rename to boards/arm/b-l475e-iot01a/src/.gitignore diff --git a/boards/b-l475e-iot01a/src/Makefile b/boards/arm/b-l475e-iot01a/src/Makefile similarity index 100% rename from boards/b-l475e-iot01a/src/Makefile rename to boards/arm/b-l475e-iot01a/src/Makefile diff --git a/boards/b-l475e-iot01a/src/b-l475e-iot01a.h b/boards/arm/b-l475e-iot01a/src/b-l475e-iot01a.h similarity index 97% rename from boards/b-l475e-iot01a/src/b-l475e-iot01a.h rename to boards/arm/b-l475e-iot01a/src/b-l475e-iot01a.h index 2890b99088..773ab7f374 100644 --- a/boards/b-l475e-iot01a/src/b-l475e-iot01a.h +++ b/boards/arm/b-l475e-iot01a/src/b-l475e-iot01a.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_B_L475E_IOT01A_SRC_B_L475E_IOT01A_H -#define __BOARDS_B_L475E_IOT01A_SRC_B_L475E_IOT01A_H +#ifndef __BOARDS_ARM_B_L475E_IOT01A_SRC_B_L475E_IOT01A_H +#define __BOARDS_ARM_B_L475E_IOT01A_SRC_B_L475E_IOT01A_H /**************************************************************************** * Included Files @@ -206,4 +206,4 @@ int stm32l4_spirit_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_B_L475E_IOT01A_SRC_B_L475E_IOT01A_H */ +#endif /* __BOARDS_ARM_B_L475E_IOT01A_SRC_B_L475E_IOT01A_H */ diff --git a/boards/b-l475e-iot01a/src/stm32_appinit.c b/boards/arm/b-l475e-iot01a/src/stm32_appinit.c similarity index 100% rename from boards/b-l475e-iot01a/src/stm32_appinit.c rename to boards/arm/b-l475e-iot01a/src/stm32_appinit.c diff --git a/boards/b-l475e-iot01a/src/stm32_autoleds.c b/boards/arm/b-l475e-iot01a/src/stm32_autoleds.c similarity index 100% rename from boards/b-l475e-iot01a/src/stm32_autoleds.c rename to boards/arm/b-l475e-iot01a/src/stm32_autoleds.c diff --git a/boards/b-l475e-iot01a/src/stm32_boot.c b/boards/arm/b-l475e-iot01a/src/stm32_boot.c similarity index 100% rename from boards/b-l475e-iot01a/src/stm32_boot.c rename to boards/arm/b-l475e-iot01a/src/stm32_boot.c diff --git a/boards/b-l475e-iot01a/src/stm32_bringup.c b/boards/arm/b-l475e-iot01a/src/stm32_bringup.c similarity index 100% rename from boards/b-l475e-iot01a/src/stm32_bringup.c rename to boards/arm/b-l475e-iot01a/src/stm32_bringup.c diff --git a/boards/b-l475e-iot01a/src/stm32_spi.c b/boards/arm/b-l475e-iot01a/src/stm32_spi.c similarity index 100% rename from boards/b-l475e-iot01a/src/stm32_spi.c rename to boards/arm/b-l475e-iot01a/src/stm32_spi.c diff --git a/boards/b-l475e-iot01a/src/stm32_spirit.c b/boards/arm/b-l475e-iot01a/src/stm32_spirit.c similarity index 100% rename from boards/b-l475e-iot01a/src/stm32_spirit.c rename to boards/arm/b-l475e-iot01a/src/stm32_spirit.c diff --git a/boards/b-l475e-iot01a/src/stm32_timer.c b/boards/arm/b-l475e-iot01a/src/stm32_timer.c similarity index 100% rename from boards/b-l475e-iot01a/src/stm32_timer.c rename to boards/arm/b-l475e-iot01a/src/stm32_timer.c diff --git a/boards/b-l475e-iot01a/src/stm32_userleds.c b/boards/arm/b-l475e-iot01a/src/stm32_userleds.c similarity index 100% rename from boards/b-l475e-iot01a/src/stm32_userleds.c rename to boards/arm/b-l475e-iot01a/src/stm32_userleds.c diff --git a/boards/bambino-200e/Kconfig b/boards/arm/bambino-200e/Kconfig similarity index 100% rename from boards/bambino-200e/Kconfig rename to boards/arm/bambino-200e/Kconfig diff --git a/boards/bambino-200e/README.txt b/boards/arm/bambino-200e/README.txt similarity index 100% rename from boards/bambino-200e/README.txt rename to boards/arm/bambino-200e/README.txt diff --git a/boards/bambino-200e/configs/knsh/defconfig b/boards/arm/bambino-200e/configs/knsh/defconfig similarity index 100% rename from boards/bambino-200e/configs/knsh/defconfig rename to boards/arm/bambino-200e/configs/knsh/defconfig diff --git a/boards/bambino-200e/configs/max31855/defconfig b/boards/arm/bambino-200e/configs/max31855/defconfig similarity index 100% rename from boards/bambino-200e/configs/max31855/defconfig rename to boards/arm/bambino-200e/configs/max31855/defconfig diff --git a/boards/bambino-200e/configs/netnsh/Make.defs b/boards/arm/bambino-200e/configs/netnsh/Make.defs similarity index 97% rename from boards/bambino-200e/configs/netnsh/Make.defs rename to boards/arm/bambino-200e/configs/netnsh/Make.defs index 1c077e6404..7f6bd52bc7 100644 --- a/boards/bambino-200e/configs/netnsh/Make.defs +++ b/boards/arm/bambino-200e/configs/netnsh/Make.defs @@ -67,14 +67,14 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" \ -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" \ -isystem "${shell cygpath -w $(TOPDIR)/include/libcxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include \ -isystem $(TOPDIR)/include/cxx -isystem $(TOPDIR)/include/libcxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/bambino-200e/configs/netnsh/defconfig b/boards/arm/bambino-200e/configs/netnsh/defconfig similarity index 100% rename from boards/bambino-200e/configs/netnsh/defconfig rename to boards/arm/bambino-200e/configs/netnsh/defconfig diff --git a/boards/bambino-200e/configs/nsh/defconfig b/boards/arm/bambino-200e/configs/nsh/defconfig similarity index 100% rename from boards/bambino-200e/configs/nsh/defconfig rename to boards/arm/bambino-200e/configs/nsh/defconfig diff --git a/boards/bambino-200e/configs/usbnsh/defconfig b/boards/arm/bambino-200e/configs/usbnsh/defconfig similarity index 100% rename from boards/bambino-200e/configs/usbnsh/defconfig rename to boards/arm/bambino-200e/configs/usbnsh/defconfig diff --git a/boards/bambino-200e/include/board.h b/boards/arm/bambino-200e/include/board.h similarity index 99% rename from boards/bambino-200e/include/board.h rename to boards/arm/bambino-200e/include/board.h index 678420100e..986e5adb64 100644 --- a/boards/bambino-200e/include/board.h +++ b/boards/arm/bambino-200e/include/board.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_BAMBINO_200E_INCLUDE_BOARD_H -#define __CONFIG_BAMBINO_200E_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_BAMBINO_200E_INCLUDE_BOARD_H +#define __BOARDS_ARM_BAMBINO_200E_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -399,4 +399,4 @@ #define GPIO_SD_CMD PINCONF_SD_CMD_1 #define GPIO_SD_CLK CLKCONF_SD_CLK_2 -#endif /* __CONFIG_BAMBINO_200E_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_BAMBINO_200E_INCLUDE_BOARD_H */ diff --git a/boards/bambino-200e/kernel/.gitignore b/boards/arm/bambino-200e/kernel/.gitignore similarity index 100% rename from boards/bambino-200e/kernel/.gitignore rename to boards/arm/bambino-200e/kernel/.gitignore diff --git a/boards/bambino-200e/kernel/Makefile b/boards/arm/bambino-200e/kernel/Makefile similarity index 100% rename from boards/bambino-200e/kernel/Makefile rename to boards/arm/bambino-200e/kernel/Makefile diff --git a/boards/bambino-200e/kernel/lpc43_userspace.c b/boards/arm/bambino-200e/kernel/lpc43_userspace.c similarity index 100% rename from boards/bambino-200e/kernel/lpc43_userspace.c rename to boards/arm/bambino-200e/kernel/lpc43_userspace.c diff --git a/boards/bambino-200e/scripts/Make.defs b/boards/arm/bambino-200e/scripts/Make.defs similarity index 97% rename from boards/bambino-200e/scripts/Make.defs rename to boards/arm/bambino-200e/scripts/Make.defs index 24b29965f8..cf7e6e29b7 100644 --- a/boards/bambino-200e/scripts/Make.defs +++ b/boards/arm/bambino-200e/scripts/Make.defs @@ -65,13 +65,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/bambino-200e/scripts/flash.sh b/boards/arm/bambino-200e/scripts/flash.sh similarity index 100% rename from boards/bambino-200e/scripts/flash.sh rename to boards/arm/bambino-200e/scripts/flash.sh diff --git a/boards/bambino-200e/scripts/memory.ld b/boards/arm/bambino-200e/scripts/memory.ld similarity index 100% rename from boards/bambino-200e/scripts/memory.ld rename to boards/arm/bambino-200e/scripts/memory.ld diff --git a/boards/bambino-200e/scripts/ramconfig.ld b/boards/arm/bambino-200e/scripts/ramconfig.ld similarity index 100% rename from boards/bambino-200e/scripts/ramconfig.ld rename to boards/arm/bambino-200e/scripts/ramconfig.ld diff --git a/boards/bambino-200e/scripts/spificonfig.ld b/boards/arm/bambino-200e/scripts/spificonfig.ld similarity index 100% rename from boards/bambino-200e/scripts/spificonfig.ld rename to boards/arm/bambino-200e/scripts/spificonfig.ld diff --git a/boards/bambino-200e/scripts/user-space.ld b/boards/arm/bambino-200e/scripts/user-space.ld similarity index 100% rename from boards/bambino-200e/scripts/user-space.ld rename to boards/arm/bambino-200e/scripts/user-space.ld diff --git a/boards/axoloti/src/.gitignore b/boards/arm/bambino-200e/src/.gitignore similarity index 100% rename from boards/axoloti/src/.gitignore rename to boards/arm/bambino-200e/src/.gitignore diff --git a/boards/bambino-200e/src/Makefile b/boards/arm/bambino-200e/src/Makefile similarity index 100% rename from boards/bambino-200e/src/Makefile rename to boards/arm/bambino-200e/src/Makefile diff --git a/boards/bambino-200e/src/bambino-200e.h b/boards/arm/bambino-200e/src/bambino-200e.h similarity index 100% rename from boards/bambino-200e/src/bambino-200e.h rename to boards/arm/bambino-200e/src/bambino-200e.h diff --git a/boards/bambino-200e/src/lpc43_appinit.c b/boards/arm/bambino-200e/src/lpc43_appinit.c similarity index 100% rename from boards/bambino-200e/src/lpc43_appinit.c rename to boards/arm/bambino-200e/src/lpc43_appinit.c diff --git a/boards/bambino-200e/src/lpc43_autoleds.c b/boards/arm/bambino-200e/src/lpc43_autoleds.c similarity index 100% rename from boards/bambino-200e/src/lpc43_autoleds.c rename to boards/arm/bambino-200e/src/lpc43_autoleds.c diff --git a/boards/bambino-200e/src/lpc43_boot.c b/boards/arm/bambino-200e/src/lpc43_boot.c similarity index 100% rename from boards/bambino-200e/src/lpc43_boot.c rename to boards/arm/bambino-200e/src/lpc43_boot.c diff --git a/boards/bambino-200e/src/lpc43_buttons.c b/boards/arm/bambino-200e/src/lpc43_buttons.c similarity index 100% rename from boards/bambino-200e/src/lpc43_buttons.c rename to boards/arm/bambino-200e/src/lpc43_buttons.c diff --git a/boards/bambino-200e/src/lpc43_max31855.c b/boards/arm/bambino-200e/src/lpc43_max31855.c similarity index 100% rename from boards/bambino-200e/src/lpc43_max31855.c rename to boards/arm/bambino-200e/src/lpc43_max31855.c diff --git a/boards/bambino-200e/src/lpc43_ostest.c b/boards/arm/bambino-200e/src/lpc43_ostest.c similarity index 100% rename from boards/bambino-200e/src/lpc43_ostest.c rename to boards/arm/bambino-200e/src/lpc43_ostest.c diff --git a/boards/bambino-200e/src/lpc43_ssp.c b/boards/arm/bambino-200e/src/lpc43_ssp.c similarity index 100% rename from boards/bambino-200e/src/lpc43_ssp.c rename to boards/arm/bambino-200e/src/lpc43_ssp.c diff --git a/boards/bambino-200e/src/lpc43_timer.c b/boards/arm/bambino-200e/src/lpc43_timer.c similarity index 100% rename from boards/bambino-200e/src/lpc43_timer.c rename to boards/arm/bambino-200e/src/lpc43_timer.c diff --git a/boards/bambino-200e/src/lpc43_userleds.c b/boards/arm/bambino-200e/src/lpc43_userleds.c similarity index 100% rename from boards/bambino-200e/src/lpc43_userleds.c rename to boards/arm/bambino-200e/src/lpc43_userleds.c diff --git a/boards/beaglebone-black/Kconfig b/boards/arm/beaglebone-black/Kconfig similarity index 100% rename from boards/beaglebone-black/Kconfig rename to boards/arm/beaglebone-black/Kconfig diff --git a/boards/beaglebone-black/README.txt b/boards/arm/beaglebone-black/README.txt similarity index 100% rename from boards/beaglebone-black/README.txt rename to boards/arm/beaglebone-black/README.txt diff --git a/boards/beaglebone-black/configs/lcd/defconfig b/boards/arm/beaglebone-black/configs/lcd/defconfig similarity index 100% rename from boards/beaglebone-black/configs/lcd/defconfig rename to boards/arm/beaglebone-black/configs/lcd/defconfig diff --git a/boards/beaglebone-black/configs/nsh/defconfig b/boards/arm/beaglebone-black/configs/nsh/defconfig similarity index 100% rename from boards/beaglebone-black/configs/nsh/defconfig rename to boards/arm/beaglebone-black/configs/nsh/defconfig diff --git a/boards/beaglebone-black/include/board.h b/boards/arm/beaglebone-black/include/board.h similarity index 97% rename from boards/beaglebone-black/include/board.h rename to boards/arm/beaglebone-black/include/board.h index 99af08f1ff..54a761026c 100644 --- a/boards/beaglebone-black/include/board.h +++ b/boards/arm/beaglebone-black/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_BEAGLEBONE_BLACK_INCLUDE_BOARD_H -#define __BOARDS_BEAGLEBONE_BLACK_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_BEAGLEBONE_BLACK_INCLUDE_BOARD_H +#define __BOARDS_ARM_BEAGLEBONE_BLACK_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -133,4 +133,4 @@ .endm #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_BEAGLEBONE_BLACK_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_BEAGLEBONE_BLACK_INCLUDE_BOARD_H */ diff --git a/boards/beaglebone-black/include/board_memorymap.h b/boards/arm/beaglebone-black/include/board_memorymap.h similarity index 93% rename from boards/beaglebone-black/include/board_memorymap.h rename to boards/arm/beaglebone-black/include/board_memorymap.h index 332855bbb0..85b0f72e20 100644 --- a/boards/beaglebone-black/include/board_memorymap.h +++ b/boards/arm/beaglebone-black/include/board_memorymap.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_BEAGLEBONE_BLACK_INCLUDE_BOARD_MEMORYMAP_H -#define __BOARDS_BEAGLEBONE_BLACK_INCLUDE_BOARD_MEMORYMAP_H +#ifndef __BOARDS_ARM_BEAGLEBONE_BLACK_INCLUDE_BOARD_MEMORYMAP_H +#define __BOARDS_ARM_BEAGLEBONE_BLACK_INCLUDE_BOARD_MEMORYMAP_H /************************************************************************************ * Included Files @@ -71,4 +71,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_BEAGLEBONE_BLACK_INCLUDE_BOARD_MEMORYMAP_H */ +#endif /* __BOARDS_ARM_BEAGLEBONE_BLACK_INCLUDE_BOARD_MEMORYMAP_H */ diff --git a/boards/beaglebone-black/scripts/Make.defs b/boards/arm/beaglebone-black/scripts/Make.defs similarity index 97% rename from boards/beaglebone-black/scripts/Make.defs rename to boards/arm/beaglebone-black/scripts/Make.defs index a2feef55d5..d2b3a00ba2 100644 --- a/boards/beaglebone-black/scripts/Make.defs +++ b/boards/arm/beaglebone-black/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/beaglebone-black/scripts/sdram.ld b/boards/arm/beaglebone-black/scripts/sdram.ld similarity index 100% rename from boards/beaglebone-black/scripts/sdram.ld rename to boards/arm/beaglebone-black/scripts/sdram.ld diff --git a/boards/beaglebone-black/src/Makefile b/boards/arm/beaglebone-black/src/Makefile similarity index 100% rename from boards/beaglebone-black/src/Makefile rename to boards/arm/beaglebone-black/src/Makefile diff --git a/boards/beaglebone-black/src/am335x_boot.c b/boards/arm/beaglebone-black/src/am335x_boot.c similarity index 100% rename from boards/beaglebone-black/src/am335x_boot.c rename to boards/arm/beaglebone-black/src/am335x_boot.c diff --git a/boards/beaglebone-black/src/am335x_buttons.c b/boards/arm/beaglebone-black/src/am335x_buttons.c similarity index 100% rename from boards/beaglebone-black/src/am335x_buttons.c rename to boards/arm/beaglebone-black/src/am335x_buttons.c diff --git a/boards/beaglebone-black/src/am335x_lcd.c b/boards/arm/beaglebone-black/src/am335x_lcd.c similarity index 100% rename from boards/beaglebone-black/src/am335x_lcd.c rename to boards/arm/beaglebone-black/src/am335x_lcd.c diff --git a/boards/beaglebone-black/src/am335x_leds.c b/boards/arm/beaglebone-black/src/am335x_leds.c similarity index 100% rename from boards/beaglebone-black/src/am335x_leds.c rename to boards/arm/beaglebone-black/src/am335x_leds.c diff --git a/boards/beaglebone-black/src/beaglebone-black.h b/boards/arm/beaglebone-black/src/beaglebone-black.h similarity index 97% rename from boards/beaglebone-black/src/beaglebone-black.h rename to boards/arm/beaglebone-black/src/beaglebone-black.h index 26dd135aa9..700f4d8ce0 100644 --- a/boards/beaglebone-black/src/beaglebone-black.h +++ b/boards/arm/beaglebone-black/src/beaglebone-black.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_BEAGLEBONE_BLACK_SRC_BEAGLEBONE_BLACK_H -#define __BOARDS_BEAGLEBONE_BLACK_SRC_BEAGLEBONE_BLACK_H +#ifndef __BOARDS_ARM_BEAGLEBONE_BLACK_SRC_BEAGLEBONE_BLACK_H +#define __BOARDS_ARM_BEAGLEBONE_BLACK_SRC_BEAGLEBONE_BLACK_H /************************************************************************************ * Included Files @@ -149,4 +149,4 @@ void am335x_led_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_BEAGLEBONE_BLACK_SRC_BEAGLEBONE_BLACK_H */ +#endif /* __BOARDS_ARM_BEAGLEBONE_BLACK_SRC_BEAGLEBONE_BLACK_H */ diff --git a/boards/c5471evm/Kconfig b/boards/arm/c5471evm/Kconfig similarity index 100% rename from boards/c5471evm/Kconfig rename to boards/arm/c5471evm/Kconfig diff --git a/boards/c5471evm/README.txt b/boards/arm/c5471evm/README.txt similarity index 100% rename from boards/c5471evm/README.txt rename to boards/arm/c5471evm/README.txt diff --git a/boards/c5471evm/configs/httpd/defconfig b/boards/arm/c5471evm/configs/httpd/defconfig similarity index 100% rename from boards/c5471evm/configs/httpd/defconfig rename to boards/arm/c5471evm/configs/httpd/defconfig diff --git a/boards/c5471evm/configs/nettest/defconfig b/boards/arm/c5471evm/configs/nettest/defconfig similarity index 100% rename from boards/c5471evm/configs/nettest/defconfig rename to boards/arm/c5471evm/configs/nettest/defconfig diff --git a/boards/c5471evm/configs/nsh/defconfig b/boards/arm/c5471evm/configs/nsh/defconfig similarity index 100% rename from boards/c5471evm/configs/nsh/defconfig rename to boards/arm/c5471evm/configs/nsh/defconfig diff --git a/boards/c5471evm/include/board.h b/boards/arm/c5471evm/include/board.h similarity index 100% rename from boards/c5471evm/include/board.h rename to boards/arm/c5471evm/include/board.h diff --git a/boards/c5471evm/scripts/Make.defs b/boards/arm/c5471evm/scripts/Make.defs similarity index 97% rename from boards/c5471evm/scripts/Make.defs rename to boards/arm/c5471evm/scripts/Make.defs index f5c56da1ab..d9ff6c48bd 100644 --- a/boards/c5471evm/scripts/Make.defs +++ b/boards/arm/c5471evm/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/c5471evm/scripts/ld.script b/boards/arm/c5471evm/scripts/ld.script similarity index 100% rename from boards/c5471evm/scripts/ld.script rename to boards/arm/c5471evm/scripts/ld.script diff --git a/boards/b-l475e-iot01a/src/.gitignore b/boards/arm/c5471evm/src/.gitignore similarity index 100% rename from boards/b-l475e-iot01a/src/.gitignore rename to boards/arm/c5471evm/src/.gitignore diff --git a/boards/c5471evm/src/Makefile b/boards/arm/c5471evm/src/Makefile similarity index 100% rename from boards/c5471evm/src/Makefile rename to boards/arm/c5471evm/src/Makefile diff --git a/boards/c5471evm/src/c5471_leds.c b/boards/arm/c5471evm/src/c5471_leds.c similarity index 100% rename from boards/c5471evm/src/c5471_leds.c rename to boards/arm/c5471evm/src/c5471_leds.c diff --git a/boards/clicker2-stm32/Kconfig b/boards/arm/clicker2-stm32/Kconfig similarity index 100% rename from boards/clicker2-stm32/Kconfig rename to boards/arm/clicker2-stm32/Kconfig diff --git a/boards/clicker2-stm32/README.txt b/boards/arm/clicker2-stm32/README.txt similarity index 100% rename from boards/clicker2-stm32/README.txt rename to boards/arm/clicker2-stm32/README.txt diff --git a/boards/clicker2-stm32/configs/knsh/defconfig b/boards/arm/clicker2-stm32/configs/knsh/defconfig similarity index 100% rename from boards/clicker2-stm32/configs/knsh/defconfig rename to boards/arm/clicker2-stm32/configs/knsh/defconfig diff --git a/boards/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig b/boards/arm/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig similarity index 100% rename from boards/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig rename to boards/arm/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig diff --git a/boards/clicker2-stm32/configs/mrf24j40-mac/defconfig b/boards/arm/clicker2-stm32/configs/mrf24j40-mac/defconfig similarity index 100% rename from boards/clicker2-stm32/configs/mrf24j40-mac/defconfig rename to boards/arm/clicker2-stm32/configs/mrf24j40-mac/defconfig diff --git a/boards/clicker2-stm32/configs/mrf24j40-starhub/defconfig b/boards/arm/clicker2-stm32/configs/mrf24j40-starhub/defconfig similarity index 100% rename from boards/clicker2-stm32/configs/mrf24j40-starhub/defconfig rename to boards/arm/clicker2-stm32/configs/mrf24j40-starhub/defconfig diff --git a/boards/clicker2-stm32/configs/mrf24j40-starpoint/defconfig b/boards/arm/clicker2-stm32/configs/mrf24j40-starpoint/defconfig similarity index 100% rename from boards/clicker2-stm32/configs/mrf24j40-starpoint/defconfig rename to boards/arm/clicker2-stm32/configs/mrf24j40-starpoint/defconfig diff --git a/boards/clicker2-stm32/configs/nsh/defconfig b/boards/arm/clicker2-stm32/configs/nsh/defconfig similarity index 100% rename from boards/clicker2-stm32/configs/nsh/defconfig rename to boards/arm/clicker2-stm32/configs/nsh/defconfig diff --git a/boards/clicker2-stm32/configs/usbnsh/defconfig b/boards/arm/clicker2-stm32/configs/usbnsh/defconfig similarity index 100% rename from boards/clicker2-stm32/configs/usbnsh/defconfig rename to boards/arm/clicker2-stm32/configs/usbnsh/defconfig diff --git a/boards/clicker2-stm32/configs/xbee-6lowpan/defconfig b/boards/arm/clicker2-stm32/configs/xbee-6lowpan/defconfig similarity index 100% rename from boards/clicker2-stm32/configs/xbee-6lowpan/defconfig rename to boards/arm/clicker2-stm32/configs/xbee-6lowpan/defconfig diff --git a/boards/clicker2-stm32/include/board.h b/boards/arm/clicker2-stm32/include/board.h similarity index 98% rename from boards/clicker2-stm32/include/board.h rename to boards/arm/clicker2-stm32/include/board.h index a4501cdb09..9a54971690 100644 --- a/boards/clicker2-stm32/include/board.h +++ b/boards/arm/clicker2-stm32/include/board.h @@ -38,8 +38,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_CLICKER2_STM32_INCLUDE_BOARD_H -#define __CONFIG_CLICKER2_STM32_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_CLICKER2_STM32_INCLUDE_BOARD_H +#define __BOARDS_ARM_CLICKER2_STM32_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -327,4 +327,4 @@ #define DMAMAP_SDIO DMAMAP_SDIO_1 -#endif /* __CONFIG_CLICKER2_STM32_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_CLICKER2_STM32_INCLUDE_BOARD_H */ diff --git a/boards/clicker2-stm32/kernel/.gitignore b/boards/arm/clicker2-stm32/kernel/.gitignore similarity index 100% rename from boards/clicker2-stm32/kernel/.gitignore rename to boards/arm/clicker2-stm32/kernel/.gitignore diff --git a/boards/clicker2-stm32/kernel/Makefile b/boards/arm/clicker2-stm32/kernel/Makefile similarity index 100% rename from boards/clicker2-stm32/kernel/Makefile rename to boards/arm/clicker2-stm32/kernel/Makefile diff --git a/boards/clicker2-stm32/kernel/stm32_userspace.c b/boards/arm/clicker2-stm32/kernel/stm32_userspace.c similarity index 100% rename from boards/clicker2-stm32/kernel/stm32_userspace.c rename to boards/arm/clicker2-stm32/kernel/stm32_userspace.c diff --git a/boards/clicker2-stm32/scripts/Make.defs b/boards/arm/clicker2-stm32/scripts/Make.defs similarity index 97% rename from boards/clicker2-stm32/scripts/Make.defs rename to boards/arm/clicker2-stm32/scripts/Make.defs index c29037c7b9..a4a8c7321a 100644 --- a/boards/clicker2-stm32/scripts/Make.defs +++ b/boards/arm/clicker2-stm32/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/clicker2-stm32/scripts/flash.ld b/boards/arm/clicker2-stm32/scripts/flash.ld similarity index 100% rename from boards/clicker2-stm32/scripts/flash.ld rename to boards/arm/clicker2-stm32/scripts/flash.ld diff --git a/boards/clicker2-stm32/scripts/gnu-elf.ld b/boards/arm/clicker2-stm32/scripts/gnu-elf.ld similarity index 100% rename from boards/clicker2-stm32/scripts/gnu-elf.ld rename to boards/arm/clicker2-stm32/scripts/gnu-elf.ld diff --git a/boards/clicker2-stm32/scripts/kernel-space.ld b/boards/arm/clicker2-stm32/scripts/kernel-space.ld similarity index 100% rename from boards/clicker2-stm32/scripts/kernel-space.ld rename to boards/arm/clicker2-stm32/scripts/kernel-space.ld diff --git a/boards/clicker2-stm32/scripts/memory.ld b/boards/arm/clicker2-stm32/scripts/memory.ld similarity index 100% rename from boards/clicker2-stm32/scripts/memory.ld rename to boards/arm/clicker2-stm32/scripts/memory.ld diff --git a/boards/clicker2-stm32/scripts/user-space.ld b/boards/arm/clicker2-stm32/scripts/user-space.ld similarity index 100% rename from boards/clicker2-stm32/scripts/user-space.ld rename to boards/arm/clicker2-stm32/scripts/user-space.ld diff --git a/boards/bambino-200e/src/.gitignore b/boards/arm/clicker2-stm32/src/.gitignore similarity index 100% rename from boards/bambino-200e/src/.gitignore rename to boards/arm/clicker2-stm32/src/.gitignore diff --git a/boards/clicker2-stm32/src/Makefile b/boards/arm/clicker2-stm32/src/Makefile similarity index 100% rename from boards/clicker2-stm32/src/Makefile rename to boards/arm/clicker2-stm32/src/Makefile diff --git a/boards/clicker2-stm32/src/clicker2-stm32.h b/boards/arm/clicker2-stm32/src/clicker2-stm32.h similarity index 98% rename from boards/clicker2-stm32/src/clicker2-stm32.h rename to boards/arm/clicker2-stm32/src/clicker2-stm32.h index 46e285be58..92df8d77b2 100644 --- a/boards/clicker2-stm32/src/clicker2-stm32.h +++ b/boards/arm/clicker2-stm32/src/clicker2-stm32.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_CLICKER2_STM32_SRC_CLICKER2_H -#define __BOARDS_CLICKER2_STM32_SRC_CLICKER2_H +#ifndef __BOARDS_ARM_CLICKER2_STM32_SRC_CLICKER2_H +#define __BOARDS_ARM_CLICKER2_STM32_SRC_CLICKER2_H /**************************************************************************** * Included Files @@ -427,4 +427,4 @@ void stm32_automount_event(int slotno, bool inserted); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_CLICKER2_STM32_SRC_CLICKER2_H */ +#endif /* __BOARDS_ARM_CLICKER2_STM32_SRC_CLICKER2_H */ diff --git a/boards/clicker2-stm32/src/stm32_adc.c b/boards/arm/clicker2-stm32/src/stm32_adc.c similarity index 100% rename from boards/clicker2-stm32/src/stm32_adc.c rename to boards/arm/clicker2-stm32/src/stm32_adc.c diff --git a/boards/clicker2-stm32/src/stm32_appinit.c b/boards/arm/clicker2-stm32/src/stm32_appinit.c similarity index 100% rename from boards/clicker2-stm32/src/stm32_appinit.c rename to boards/arm/clicker2-stm32/src/stm32_appinit.c diff --git a/boards/clicker2-stm32/src/stm32_autoleds.c b/boards/arm/clicker2-stm32/src/stm32_autoleds.c similarity index 100% rename from boards/clicker2-stm32/src/stm32_autoleds.c rename to boards/arm/clicker2-stm32/src/stm32_autoleds.c diff --git a/boards/clicker2-stm32/src/stm32_automount.c b/boards/arm/clicker2-stm32/src/stm32_automount.c similarity index 100% rename from boards/clicker2-stm32/src/stm32_automount.c rename to boards/arm/clicker2-stm32/src/stm32_automount.c diff --git a/boards/clicker2-stm32/src/stm32_boot.c b/boards/arm/clicker2-stm32/src/stm32_boot.c similarity index 100% rename from boards/clicker2-stm32/src/stm32_boot.c rename to boards/arm/clicker2-stm32/src/stm32_boot.c diff --git a/boards/clicker2-stm32/src/stm32_bringup.c b/boards/arm/clicker2-stm32/src/stm32_bringup.c similarity index 100% rename from boards/clicker2-stm32/src/stm32_bringup.c rename to boards/arm/clicker2-stm32/src/stm32_bringup.c diff --git a/boards/clicker2-stm32/src/stm32_buttons.c b/boards/arm/clicker2-stm32/src/stm32_buttons.c similarity index 100% rename from boards/clicker2-stm32/src/stm32_buttons.c rename to boards/arm/clicker2-stm32/src/stm32_buttons.c diff --git a/boards/clicker2-stm32/src/stm32_can.c b/boards/arm/clicker2-stm32/src/stm32_can.c similarity index 100% rename from boards/clicker2-stm32/src/stm32_can.c rename to boards/arm/clicker2-stm32/src/stm32_can.c diff --git a/boards/clicker2-stm32/src/stm32_mmcsd.c b/boards/arm/clicker2-stm32/src/stm32_mmcsd.c similarity index 100% rename from boards/clicker2-stm32/src/stm32_mmcsd.c rename to boards/arm/clicker2-stm32/src/stm32_mmcsd.c diff --git a/boards/clicker2-stm32/src/stm32_mrf24j40.c b/boards/arm/clicker2-stm32/src/stm32_mrf24j40.c similarity index 100% rename from boards/clicker2-stm32/src/stm32_mrf24j40.c rename to boards/arm/clicker2-stm32/src/stm32_mrf24j40.c diff --git a/boards/clicker2-stm32/src/stm32_spi.c b/boards/arm/clicker2-stm32/src/stm32_spi.c similarity index 100% rename from boards/clicker2-stm32/src/stm32_spi.c rename to boards/arm/clicker2-stm32/src/stm32_spi.c diff --git a/boards/clicker2-stm32/src/stm32_usb.c b/boards/arm/clicker2-stm32/src/stm32_usb.c similarity index 100% rename from boards/clicker2-stm32/src/stm32_usb.c rename to boards/arm/clicker2-stm32/src/stm32_usb.c diff --git a/boards/clicker2-stm32/src/stm32_userleds.c b/boards/arm/clicker2-stm32/src/stm32_userleds.c similarity index 100% rename from boards/clicker2-stm32/src/stm32_userleds.c rename to boards/arm/clicker2-stm32/src/stm32_userleds.c diff --git a/boards/clicker2-stm32/src/stm32_xbee.c b/boards/arm/clicker2-stm32/src/stm32_xbee.c similarity index 100% rename from boards/clicker2-stm32/src/stm32_xbee.c rename to boards/arm/clicker2-stm32/src/stm32_xbee.c diff --git a/boards/cloudctrl/Kconfig b/boards/arm/cloudctrl/Kconfig similarity index 100% rename from boards/cloudctrl/Kconfig rename to boards/arm/cloudctrl/Kconfig diff --git a/boards/cloudctrl/README.txt b/boards/arm/cloudctrl/README.txt similarity index 100% rename from boards/cloudctrl/README.txt rename to boards/arm/cloudctrl/README.txt diff --git a/boards/cloudctrl/configs/nsh/defconfig b/boards/arm/cloudctrl/configs/nsh/defconfig similarity index 100% rename from boards/cloudctrl/configs/nsh/defconfig rename to boards/arm/cloudctrl/configs/nsh/defconfig diff --git a/boards/cloudctrl/include/board.h b/boards/arm/cloudctrl/include/board.h similarity index 98% rename from boards/cloudctrl/include/board.h rename to boards/arm/cloudctrl/include/board.h index 5f35bfb660..aef479b979 100644 --- a/boards/cloudctrl/include/board.h +++ b/boards/arm/cloudctrl/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_CLOUDCTRL_INCLUDE_BOARD_H -#define __BOARDS_CLOUDCTRL_INCLUDE_BOARD_H 1 +#ifndef __BOARDS_ARM_CLOUDCTRL_INCLUDE_BOARD_H +#define __BOARDS_ARM_CLOUDCTRL_INCLUDE_BOARD_H 1 /************************************************************************************ * Included Files @@ -365,4 +365,4 @@ const char *stm32_getchipid_string(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_CLOUDCTRL_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_CLOUDCTRL_INCLUDE_BOARD_H */ diff --git a/boards/cloudctrl/scripts/Make.defs b/boards/arm/cloudctrl/scripts/Make.defs similarity index 96% rename from boards/cloudctrl/scripts/Make.defs rename to boards/arm/cloudctrl/scripts/Make.defs index 58c514890c..c308617e1c 100644 --- a/boards/cloudctrl/scripts/Make.defs +++ b/boards/arm/cloudctrl/scripts/Make.defs @@ -52,13 +52,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/cloudctrl/scripts/cloudctrl-dfu.ld b/boards/arm/cloudctrl/scripts/cloudctrl-dfu.ld similarity index 100% rename from boards/cloudctrl/scripts/cloudctrl-dfu.ld rename to boards/arm/cloudctrl/scripts/cloudctrl-dfu.ld diff --git a/boards/cloudctrl/scripts/cloudctrl.ld b/boards/arm/cloudctrl/scripts/cloudctrl.ld similarity index 100% rename from boards/cloudctrl/scripts/cloudctrl.ld rename to boards/arm/cloudctrl/scripts/cloudctrl.ld diff --git a/boards/c5471evm/src/.gitignore b/boards/arm/cloudctrl/src/.gitignore similarity index 100% rename from boards/c5471evm/src/.gitignore rename to boards/arm/cloudctrl/src/.gitignore diff --git a/boards/cloudctrl/src/Makefile b/boards/arm/cloudctrl/src/Makefile similarity index 100% rename from boards/cloudctrl/src/Makefile rename to boards/arm/cloudctrl/src/Makefile diff --git a/boards/cloudctrl/src/cloudctrl.h b/boards/arm/cloudctrl/src/cloudctrl.h similarity index 98% rename from boards/cloudctrl/src/cloudctrl.h rename to boards/arm/cloudctrl/src/cloudctrl.h index 25fb244b40..f53cb6a978 100644 --- a/boards/cloudctrl/src/cloudctrl.h +++ b/boards/arm/cloudctrl/src/cloudctrl.h @@ -34,8 +34,8 @@ * ****************************************************************************************************/ -#ifndef __BOARDS_CLOUDCTRLL_SRC_CLOUDCTRL_H -#define __BOARDS_CLOUDCTRLL_SRC_CLOUDCTRL_H +#ifndef __BOARDS_ARM_CLOUDCTRLL_SRC_CLOUDCTRL_H +#define __BOARDS_ARM_CLOUDCTRLL_SRC_CLOUDCTRL_H /**************************************************************************************************** * Included Files @@ -290,4 +290,4 @@ int stm32_w25initialize(int minor); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_CLOUDCTRLL_SRC_CLOUDCTRL_H */ +#endif /* __BOARDS_ARM_CLOUDCTRLL_SRC_CLOUDCTRL_H */ diff --git a/boards/cloudctrl/src/stm32_adc.c b/boards/arm/cloudctrl/src/stm32_adc.c similarity index 100% rename from boards/cloudctrl/src/stm32_adc.c rename to boards/arm/cloudctrl/src/stm32_adc.c diff --git a/boards/cloudctrl/src/stm32_appinit.c b/boards/arm/cloudctrl/src/stm32_appinit.c similarity index 100% rename from boards/cloudctrl/src/stm32_appinit.c rename to boards/arm/cloudctrl/src/stm32_appinit.c diff --git a/boards/cloudctrl/src/stm32_autoleds.c b/boards/arm/cloudctrl/src/stm32_autoleds.c similarity index 100% rename from boards/cloudctrl/src/stm32_autoleds.c rename to boards/arm/cloudctrl/src/stm32_autoleds.c diff --git a/boards/cloudctrl/src/stm32_boot.c b/boards/arm/cloudctrl/src/stm32_boot.c similarity index 100% rename from boards/cloudctrl/src/stm32_boot.c rename to boards/arm/cloudctrl/src/stm32_boot.c diff --git a/boards/cloudctrl/src/stm32_buttons.c b/boards/arm/cloudctrl/src/stm32_buttons.c similarity index 100% rename from boards/cloudctrl/src/stm32_buttons.c rename to boards/arm/cloudctrl/src/stm32_buttons.c diff --git a/boards/cloudctrl/src/stm32_chipid.c b/boards/arm/cloudctrl/src/stm32_chipid.c similarity index 100% rename from boards/cloudctrl/src/stm32_chipid.c rename to boards/arm/cloudctrl/src/stm32_chipid.c diff --git a/boards/cloudctrl/src/stm32_phyinit.c b/boards/arm/cloudctrl/src/stm32_phyinit.c similarity index 100% rename from boards/cloudctrl/src/stm32_phyinit.c rename to boards/arm/cloudctrl/src/stm32_phyinit.c diff --git a/boards/cloudctrl/src/stm32_relays.c b/boards/arm/cloudctrl/src/stm32_relays.c similarity index 100% rename from boards/cloudctrl/src/stm32_relays.c rename to boards/arm/cloudctrl/src/stm32_relays.c diff --git a/boards/cloudctrl/src/stm32_spi.c b/boards/arm/cloudctrl/src/stm32_spi.c similarity index 100% rename from boards/cloudctrl/src/stm32_spi.c rename to boards/arm/cloudctrl/src/stm32_spi.c diff --git a/boards/cloudctrl/src/stm32_usb.c b/boards/arm/cloudctrl/src/stm32_usb.c similarity index 100% rename from boards/cloudctrl/src/stm32_usb.c rename to boards/arm/cloudctrl/src/stm32_usb.c diff --git a/boards/cloudctrl/src/stm32_usbmsc.c b/boards/arm/cloudctrl/src/stm32_usbmsc.c similarity index 100% rename from boards/cloudctrl/src/stm32_usbmsc.c rename to boards/arm/cloudctrl/src/stm32_usbmsc.c diff --git a/boards/cloudctrl/src/stm32_userleds.c b/boards/arm/cloudctrl/src/stm32_userleds.c similarity index 100% rename from boards/cloudctrl/src/stm32_userleds.c rename to boards/arm/cloudctrl/src/stm32_userleds.c diff --git a/boards/cloudctrl/src/stm32_w25.c b/boards/arm/cloudctrl/src/stm32_w25.c similarity index 100% rename from boards/cloudctrl/src/stm32_w25.c rename to boards/arm/cloudctrl/src/stm32_w25.c diff --git a/boards/cloudctrl/tools/olimex-arm-usb-ocd.cfg b/boards/arm/cloudctrl/tools/olimex-arm-usb-ocd.cfg similarity index 100% rename from boards/cloudctrl/tools/olimex-arm-usb-ocd.cfg rename to boards/arm/cloudctrl/tools/olimex-arm-usb-ocd.cfg diff --git a/boards/cloudctrl/tools/oocd.sh b/boards/arm/cloudctrl/tools/oocd.sh similarity index 100% rename from boards/cloudctrl/tools/oocd.sh rename to boards/arm/cloudctrl/tools/oocd.sh diff --git a/boards/cloudctrl/tools/stm32.cfg b/boards/arm/cloudctrl/tools/stm32.cfg similarity index 100% rename from boards/cloudctrl/tools/stm32.cfg rename to boards/arm/cloudctrl/tools/stm32.cfg diff --git a/boards/cloudctrl/tools/usb-driver.txt b/boards/arm/cloudctrl/tools/usb-driver.txt similarity index 100% rename from boards/cloudctrl/tools/usb-driver.txt rename to boards/arm/cloudctrl/tools/usb-driver.txt diff --git a/boards/dk-tm4c129x/Kconfig b/boards/arm/dk-tm4c129x/Kconfig similarity index 100% rename from boards/dk-tm4c129x/Kconfig rename to boards/arm/dk-tm4c129x/Kconfig diff --git a/boards/dk-tm4c129x/README.txt b/boards/arm/dk-tm4c129x/README.txt similarity index 100% rename from boards/dk-tm4c129x/README.txt rename to boards/arm/dk-tm4c129x/README.txt diff --git a/boards/dk-tm4c129x/configs/ipv6/defconfig b/boards/arm/dk-tm4c129x/configs/ipv6/defconfig similarity index 100% rename from boards/dk-tm4c129x/configs/ipv6/defconfig rename to boards/arm/dk-tm4c129x/configs/ipv6/defconfig diff --git a/boards/dk-tm4c129x/configs/nsh/defconfig b/boards/arm/dk-tm4c129x/configs/nsh/defconfig similarity index 100% rename from boards/dk-tm4c129x/configs/nsh/defconfig rename to boards/arm/dk-tm4c129x/configs/nsh/defconfig diff --git a/boards/dk-tm4c129x/include/board.h b/boards/arm/dk-tm4c129x/include/board.h similarity index 98% rename from boards/dk-tm4c129x/include/board.h rename to boards/arm/dk-tm4c129x/include/board.h index 06af30512c..93b3811f4e 100644 --- a/boards/dk-tm4c129x/include/board.h +++ b/boards/arm/dk-tm4c129x/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_DK_TM4C129X_INCLUDE_BOARD_H -#define __BOARDS_DK_TM4C129X_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_DK_TM4C129X_INCLUDE_BOARD_H +#define __BOARDS_ARM_DK_TM4C129X_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -275,4 +275,4 @@ int tiva_tmp100_initialize(FAR const char *devpath); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_DK_TM4C129X_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_DK_TM4C129X_INCLUDE_BOARD_H */ diff --git a/boards/dk-tm4c129x/scripts/Make.defs b/boards/arm/dk-tm4c129x/scripts/Make.defs similarity index 96% rename from boards/dk-tm4c129x/scripts/Make.defs rename to boards/arm/dk-tm4c129x/scripts/Make.defs index a5ede6a349..71ea473f34 100644 --- a/boards/dk-tm4c129x/scripts/Make.defs +++ b/boards/arm/dk-tm4c129x/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/dk-tm4c129x/scripts/ld.script b/boards/arm/dk-tm4c129x/scripts/ld.script similarity index 100% rename from boards/dk-tm4c129x/scripts/ld.script rename to boards/arm/dk-tm4c129x/scripts/ld.script diff --git a/boards/clicker2-stm32/src/.gitignore b/boards/arm/dk-tm4c129x/src/.gitignore similarity index 100% rename from boards/clicker2-stm32/src/.gitignore rename to boards/arm/dk-tm4c129x/src/.gitignore diff --git a/boards/dk-tm4c129x/src/Makefile b/boards/arm/dk-tm4c129x/src/Makefile similarity index 100% rename from boards/dk-tm4c129x/src/Makefile rename to boards/arm/dk-tm4c129x/src/Makefile diff --git a/boards/dk-tm4c129x/src/dk-tm4c129x.h b/boards/arm/dk-tm4c129x/src/dk-tm4c129x.h similarity index 98% rename from boards/dk-tm4c129x/src/dk-tm4c129x.h rename to boards/arm/dk-tm4c129x/src/dk-tm4c129x.h index 66869bf7e0..5a8c69d146 100644 --- a/boards/dk-tm4c129x/src/dk-tm4c129x.h +++ b/boards/arm/dk-tm4c129x/src/dk-tm4c129x.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_DK_TM4C129X_DK_TM4C129X_H -#define __BOARDS_DK_TM4C129X_DK_TM4C129X_H +#ifndef __BOARDS_ARM_DK_TM4C129X_DK_TM4C129X_H +#define __BOARDS_ARM_DK_TM4C129X_DK_TM4C129X_H /************************************************************************************ * Included Files @@ -189,5 +189,5 @@ int tiva_timer_configure(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_DK_TM4C129X_DK_TM4C129X_H */ +#endif /* __BOARDS_ARM_DK_TM4C129X_DK_TM4C129X_H */ diff --git a/boards/dk-tm4c129x/src/tm4c_appinit.c b/boards/arm/dk-tm4c129x/src/tm4c_appinit.c similarity index 100% rename from boards/dk-tm4c129x/src/tm4c_appinit.c rename to boards/arm/dk-tm4c129x/src/tm4c_appinit.c diff --git a/boards/dk-tm4c129x/src/tm4c_autoleds.c b/boards/arm/dk-tm4c129x/src/tm4c_autoleds.c similarity index 100% rename from boards/dk-tm4c129x/src/tm4c_autoleds.c rename to boards/arm/dk-tm4c129x/src/tm4c_autoleds.c diff --git a/boards/dk-tm4c129x/src/tm4c_boot.c b/boards/arm/dk-tm4c129x/src/tm4c_boot.c similarity index 100% rename from boards/dk-tm4c129x/src/tm4c_boot.c rename to boards/arm/dk-tm4c129x/src/tm4c_boot.c diff --git a/boards/dk-tm4c129x/src/tm4c_bringup.c b/boards/arm/dk-tm4c129x/src/tm4c_bringup.c similarity index 100% rename from boards/dk-tm4c129x/src/tm4c_bringup.c rename to boards/arm/dk-tm4c129x/src/tm4c_bringup.c diff --git a/boards/dk-tm4c129x/src/tm4c_buttons.c b/boards/arm/dk-tm4c129x/src/tm4c_buttons.c similarity index 100% rename from boards/dk-tm4c129x/src/tm4c_buttons.c rename to boards/arm/dk-tm4c129x/src/tm4c_buttons.c diff --git a/boards/dk-tm4c129x/src/tm4c_ethernet.c b/boards/arm/dk-tm4c129x/src/tm4c_ethernet.c similarity index 100% rename from boards/dk-tm4c129x/src/tm4c_ethernet.c rename to boards/arm/dk-tm4c129x/src/tm4c_ethernet.c diff --git a/boards/dk-tm4c129x/src/tm4c_ssi.c b/boards/arm/dk-tm4c129x/src/tm4c_ssi.c similarity index 100% rename from boards/dk-tm4c129x/src/tm4c_ssi.c rename to boards/arm/dk-tm4c129x/src/tm4c_ssi.c diff --git a/boards/dk-tm4c129x/src/tm4c_timer.c b/boards/arm/dk-tm4c129x/src/tm4c_timer.c similarity index 100% rename from boards/dk-tm4c129x/src/tm4c_timer.c rename to boards/arm/dk-tm4c129x/src/tm4c_timer.c diff --git a/boards/dk-tm4c129x/src/tm4c_tmp100.c b/boards/arm/dk-tm4c129x/src/tm4c_tmp100.c similarity index 100% rename from boards/dk-tm4c129x/src/tm4c_tmp100.c rename to boards/arm/dk-tm4c129x/src/tm4c_tmp100.c diff --git a/boards/dk-tm4c129x/src/tm4c_userleds.c b/boards/arm/dk-tm4c129x/src/tm4c_userleds.c similarity index 100% rename from boards/dk-tm4c129x/src/tm4c_userleds.c rename to boards/arm/dk-tm4c129x/src/tm4c_userleds.c diff --git a/boards/dk-tm4c129x/tools/dk-tm4c129x.cfg b/boards/arm/dk-tm4c129x/tools/dk-tm4c129x.cfg similarity index 100% rename from boards/dk-tm4c129x/tools/dk-tm4c129x.cfg rename to boards/arm/dk-tm4c129x/tools/dk-tm4c129x.cfg diff --git a/boards/dk-tm4c129x/tools/oocd.sh b/boards/arm/dk-tm4c129x/tools/oocd.sh similarity index 100% rename from boards/dk-tm4c129x/tools/oocd.sh rename to boards/arm/dk-tm4c129x/tools/oocd.sh diff --git a/boards/ea3131/Kconfig b/boards/arm/ea3131/Kconfig similarity index 100% rename from boards/ea3131/Kconfig rename to boards/arm/ea3131/Kconfig diff --git a/boards/ea3131/README.txt b/boards/arm/ea3131/README.txt similarity index 100% rename from boards/ea3131/README.txt rename to boards/arm/ea3131/README.txt diff --git a/boards/ea3131/configs/nsh/defconfig b/boards/arm/ea3131/configs/nsh/defconfig similarity index 100% rename from boards/ea3131/configs/nsh/defconfig rename to boards/arm/ea3131/configs/nsh/defconfig diff --git a/boards/ea3131/configs/pgnsh/Make.defs b/boards/arm/ea3131/configs/pgnsh/Make.defs similarity index 97% rename from boards/ea3131/configs/pgnsh/Make.defs rename to boards/arm/ea3131/configs/pgnsh/Make.defs index 24788b46e5..115b285154 100644 --- a/boards/ea3131/configs/pgnsh/Make.defs +++ b/boards/arm/ea3131/configs/pgnsh/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/pg-ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/pg-ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/pg-ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/pg-ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/ea3131/configs/pgnsh/defconfig b/boards/arm/ea3131/configs/pgnsh/defconfig similarity index 100% rename from boards/ea3131/configs/pgnsh/defconfig rename to boards/arm/ea3131/configs/pgnsh/defconfig diff --git a/boards/ea3131/configs/usbserial/defconfig b/boards/arm/ea3131/configs/usbserial/defconfig similarity index 100% rename from boards/ea3131/configs/usbserial/defconfig rename to boards/arm/ea3131/configs/usbserial/defconfig diff --git a/boards/ea3131/include/board.h b/boards/arm/ea3131/include/board.h similarity index 100% rename from boards/ea3131/include/board.h rename to boards/arm/ea3131/include/board.h diff --git a/boards/ea3131/include/board_memorymap.h b/boards/arm/ea3131/include/board_memorymap.h similarity index 100% rename from boards/ea3131/include/board_memorymap.h rename to boards/arm/ea3131/include/board_memorymap.h diff --git a/boards/ea3131/locked/.gitignore b/boards/arm/ea3131/locked/.gitignore similarity index 100% rename from boards/ea3131/locked/.gitignore rename to boards/arm/ea3131/locked/.gitignore diff --git a/boards/ea3131/locked/Makefile b/boards/arm/ea3131/locked/Makefile similarity index 100% rename from boards/ea3131/locked/Makefile rename to boards/arm/ea3131/locked/Makefile diff --git a/boards/ea3131/locked/ld-locked.script b/boards/arm/ea3131/locked/ld-locked.script similarity index 100% rename from boards/ea3131/locked/ld-locked.script rename to boards/arm/ea3131/locked/ld-locked.script diff --git a/boards/ea3131/locked/mklocked.sh b/boards/arm/ea3131/locked/mklocked.sh similarity index 100% rename from boards/ea3131/locked/mklocked.sh rename to boards/arm/ea3131/locked/mklocked.sh diff --git a/boards/ea3131/scripts/Make.defs b/boards/arm/ea3131/scripts/Make.defs similarity index 97% rename from boards/ea3131/scripts/Make.defs rename to boards/arm/ea3131/scripts/Make.defs index e1537cd140..b051965cf2 100644 --- a/boards/ea3131/scripts/Make.defs +++ b/boards/arm/ea3131/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/ea3131/scripts/ld.script b/boards/arm/ea3131/scripts/ld.script similarity index 100% rename from boards/ea3131/scripts/ld.script rename to boards/arm/ea3131/scripts/ld.script diff --git a/boards/ea3131/scripts/pg-ld.script b/boards/arm/ea3131/scripts/pg-ld.script similarity index 100% rename from boards/ea3131/scripts/pg-ld.script rename to boards/arm/ea3131/scripts/pg-ld.script diff --git a/boards/cloudctrl/src/.gitignore b/boards/arm/ea3131/src/.gitignore similarity index 100% rename from boards/cloudctrl/src/.gitignore rename to boards/arm/ea3131/src/.gitignore diff --git a/boards/ea3131/src/Makefile b/boards/arm/ea3131/src/Makefile similarity index 100% rename from boards/ea3131/src/Makefile rename to boards/arm/ea3131/src/Makefile diff --git a/boards/ea3131/src/ea3131.h b/boards/arm/ea3131/src/ea3131.h similarity index 97% rename from boards/ea3131/src/ea3131.h rename to boards/arm/ea3131/src/ea3131.h index 4d6b0ba525..da735d002d 100644 --- a/boards/ea3131/src/ea3131.h +++ b/boards/arm/ea3131/src/ea3131.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_EA3131_SRC_EA3131_H -#define __BOARDS_EA3131_SRC_EA3131_H +#ifndef __BOARDS_ARM_EA3131_SRC_EA3131_H +#define __BOARDS_ARM_EA3131_SRC_EA3131_H /************************************************************************************ * Included Files @@ -151,4 +151,4 @@ void weak_function lpc31_pginitialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_EA3131_SRC_EA3131_H */ +#endif /* __BOARDS_ARM_EA3131_SRC_EA3131_H */ diff --git a/boards/ea3131/src/lpc31_appinit.c b/boards/arm/ea3131/src/lpc31_appinit.c similarity index 100% rename from boards/ea3131/src/lpc31_appinit.c rename to boards/arm/ea3131/src/lpc31_appinit.c diff --git a/boards/ea3131/src/lpc31_boot.c b/boards/arm/ea3131/src/lpc31_boot.c similarity index 100% rename from boards/ea3131/src/lpc31_boot.c rename to boards/arm/ea3131/src/lpc31_boot.c diff --git a/boards/ea3131/src/lpc31_buttons.c b/boards/arm/ea3131/src/lpc31_buttons.c similarity index 100% rename from boards/ea3131/src/lpc31_buttons.c rename to boards/arm/ea3131/src/lpc31_buttons.c diff --git a/boards/ea3131/src/lpc31_clkinit.c b/boards/arm/ea3131/src/lpc31_clkinit.c similarity index 100% rename from boards/ea3131/src/lpc31_clkinit.c rename to boards/arm/ea3131/src/lpc31_clkinit.c diff --git a/boards/ea3131/src/lpc31_fillpage.c b/boards/arm/ea3131/src/lpc31_fillpage.c similarity index 100% rename from boards/ea3131/src/lpc31_fillpage.c rename to boards/arm/ea3131/src/lpc31_fillpage.c diff --git a/boards/ea3131/src/lpc31_leds.c b/boards/arm/ea3131/src/lpc31_leds.c similarity index 100% rename from boards/ea3131/src/lpc31_leds.c rename to boards/arm/ea3131/src/lpc31_leds.c diff --git a/boards/ea3131/src/lpc31_mem.c b/boards/arm/ea3131/src/lpc31_mem.c similarity index 100% rename from boards/ea3131/src/lpc31_mem.c rename to boards/arm/ea3131/src/lpc31_mem.c diff --git a/boards/ea3131/src/lpc31_spi.c b/boards/arm/ea3131/src/lpc31_spi.c similarity index 100% rename from boards/ea3131/src/lpc31_spi.c rename to boards/arm/ea3131/src/lpc31_spi.c diff --git a/boards/ea3131/src/lpc31_usbhost.c b/boards/arm/ea3131/src/lpc31_usbhost.c similarity index 100% rename from boards/ea3131/src/lpc31_usbhost.c rename to boards/arm/ea3131/src/lpc31_usbhost.c diff --git a/boards/ea3131/tools/.gitignore b/boards/arm/ea3131/tools/.gitignore similarity index 100% rename from boards/ea3131/tools/.gitignore rename to boards/arm/ea3131/tools/.gitignore diff --git a/boards/ea3131/tools/Makefile b/boards/arm/ea3131/tools/Makefile similarity index 100% rename from boards/ea3131/tools/Makefile rename to boards/arm/ea3131/tools/Makefile diff --git a/boards/ea3131/tools/armusbocd.cfg b/boards/arm/ea3131/tools/armusbocd.cfg similarity index 100% rename from boards/ea3131/tools/armusbocd.cfg rename to boards/arm/ea3131/tools/armusbocd.cfg diff --git a/boards/ea3131/tools/crc32.c b/boards/arm/ea3131/tools/crc32.c similarity index 100% rename from boards/ea3131/tools/crc32.c rename to boards/arm/ea3131/tools/crc32.c diff --git a/boards/ea3131/tools/lpchdr.c b/boards/arm/ea3131/tools/lpchdr.c similarity index 100% rename from boards/ea3131/tools/lpchdr.c rename to boards/arm/ea3131/tools/lpchdr.c diff --git a/boards/ea3131/tools/lpchdr.h b/boards/arm/ea3131/tools/lpchdr.h similarity index 97% rename from boards/ea3131/tools/lpchdr.h rename to boards/arm/ea3131/tools/lpchdr.h index 28f8b2c623..131197b9d5 100644 --- a/boards/ea3131/tools/lpchdr.h +++ b/boards/arm/ea3131/tools/lpchdr.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_EA3131_TOOLS_LPCHDR_H -#define __BOARDS_EA3131_TOOLS_LPCHDR_H +#ifndef __BOARDS_ARM_EA3131_TOOLS_LPCHDR_H +#define __BOARDS_ARM_EA3131_TOOLS_LPCHDR_H /************************************************************************************ * Included Files @@ -101,5 +101,5 @@ struct lpc31_header_s extern uint32_t crc32part(const uint8_t *src, size_t len, uint32_t crc32val); extern uint32_t crc32(const uint8_t *src, size_t len); -#endif /* __BOARDS_EA3131_TOOLS_LPCHDR_H */ +#endif /* __BOARDS_ARM_EA3131_TOOLS_LPCHDR_H */ diff --git a/boards/ea3131/tools/mklpc.sh b/boards/arm/ea3131/tools/mklpc.sh similarity index 100% rename from boards/ea3131/tools/mklpc.sh rename to boards/arm/ea3131/tools/mklpc.sh diff --git a/boards/ea3131/tools/oocd.sh b/boards/arm/ea3131/tools/oocd.sh similarity index 100% rename from boards/ea3131/tools/oocd.sh rename to boards/arm/ea3131/tools/oocd.sh diff --git a/boards/ea3131/tools/usb-driver.txt b/boards/arm/ea3131/tools/usb-driver.txt similarity index 100% rename from boards/ea3131/tools/usb-driver.txt rename to boards/arm/ea3131/tools/usb-driver.txt diff --git a/boards/ea3152/Kconfig b/boards/arm/ea3152/Kconfig similarity index 100% rename from boards/ea3152/Kconfig rename to boards/arm/ea3152/Kconfig diff --git a/boards/ea3152/README.txt b/boards/arm/ea3152/README.txt similarity index 100% rename from boards/ea3152/README.txt rename to boards/arm/ea3152/README.txt diff --git a/boards/ea3152/configs/ostest/defconfig b/boards/arm/ea3152/configs/ostest/defconfig similarity index 100% rename from boards/ea3152/configs/ostest/defconfig rename to boards/arm/ea3152/configs/ostest/defconfig diff --git a/boards/ea3152/include/board.h b/boards/arm/ea3152/include/board.h similarity index 100% rename from boards/ea3152/include/board.h rename to boards/arm/ea3152/include/board.h diff --git a/boards/ea3152/include/board_memorymap.h b/boards/arm/ea3152/include/board_memorymap.h similarity index 100% rename from boards/ea3152/include/board_memorymap.h rename to boards/arm/ea3152/include/board_memorymap.h diff --git a/boards/ea3152/scripts/Make.defs b/boards/arm/ea3152/scripts/Make.defs similarity index 97% rename from boards/ea3152/scripts/Make.defs rename to boards/arm/ea3152/scripts/Make.defs index fb5641befe..345f050691 100644 --- a/boards/ea3152/scripts/Make.defs +++ b/boards/arm/ea3152/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ea3152.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ea3152.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ea3152.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ea3152.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/ea3152/scripts/ea3152.ld b/boards/arm/ea3152/scripts/ea3152.ld similarity index 100% rename from boards/ea3152/scripts/ea3152.ld rename to boards/arm/ea3152/scripts/ea3152.ld diff --git a/boards/demo9s12ne64/src/.gitignore b/boards/arm/ea3152/src/.gitignore similarity index 100% rename from boards/demo9s12ne64/src/.gitignore rename to boards/arm/ea3152/src/.gitignore diff --git a/boards/ea3152/src/Makefile b/boards/arm/ea3152/src/Makefile similarity index 100% rename from boards/ea3152/src/Makefile rename to boards/arm/ea3152/src/Makefile diff --git a/boards/ea3152/src/ea3152.h b/boards/arm/ea3152/src/ea3152.h similarity index 97% rename from boards/ea3152/src/ea3152.h rename to boards/arm/ea3152/src/ea3152.h index 0ff44f60d3..8fe5cd1647 100644 --- a/boards/ea3152/src/ea3152.h +++ b/boards/arm/ea3152/src/ea3152.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_EA3152_SRC_EA3152_H -#define __BOARDS_EA3152_SRC_EA3152_H +#ifndef __BOARDS_ARM_EA3152_SRC_EA3152_H +#define __BOARDS_ARM_EA3152_SRC_EA3152_H /************************************************************************************ * Included Files @@ -122,4 +122,4 @@ void weak_function lpc31_pginitialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_EA3152_SRC_EA3152_H */ +#endif /* __BOARDS_ARM_EA3152_SRC_EA3152_H */ diff --git a/boards/ea3152/src/lpc31_appinit.c b/boards/arm/ea3152/src/lpc31_appinit.c similarity index 100% rename from boards/ea3152/src/lpc31_appinit.c rename to boards/arm/ea3152/src/lpc31_appinit.c diff --git a/boards/ea3152/src/lpc31_boot.c b/boards/arm/ea3152/src/lpc31_boot.c similarity index 100% rename from boards/ea3152/src/lpc31_boot.c rename to boards/arm/ea3152/src/lpc31_boot.c diff --git a/boards/ea3152/src/lpc31_buttons.c b/boards/arm/ea3152/src/lpc31_buttons.c similarity index 100% rename from boards/ea3152/src/lpc31_buttons.c rename to boards/arm/ea3152/src/lpc31_buttons.c diff --git a/boards/ea3152/src/lpc31_clkinit.c b/boards/arm/ea3152/src/lpc31_clkinit.c similarity index 100% rename from boards/ea3152/src/lpc31_clkinit.c rename to boards/arm/ea3152/src/lpc31_clkinit.c diff --git a/boards/ea3152/src/lpc31_fillpage.c b/boards/arm/ea3152/src/lpc31_fillpage.c similarity index 100% rename from boards/ea3152/src/lpc31_fillpage.c rename to boards/arm/ea3152/src/lpc31_fillpage.c diff --git a/boards/ea3152/src/lpc31_leds.c b/boards/arm/ea3152/src/lpc31_leds.c similarity index 100% rename from boards/ea3152/src/lpc31_leds.c rename to boards/arm/ea3152/src/lpc31_leds.c diff --git a/boards/ea3152/src/lpc31_mem.c b/boards/arm/ea3152/src/lpc31_mem.c similarity index 100% rename from boards/ea3152/src/lpc31_mem.c rename to boards/arm/ea3152/src/lpc31_mem.c diff --git a/boards/ea3152/src/lpc31_spi.c b/boards/arm/ea3152/src/lpc31_spi.c similarity index 100% rename from boards/ea3152/src/lpc31_spi.c rename to boards/arm/ea3152/src/lpc31_spi.c diff --git a/boards/ea3152/tools/.gitignore b/boards/arm/ea3152/tools/.gitignore similarity index 100% rename from boards/ea3152/tools/.gitignore rename to boards/arm/ea3152/tools/.gitignore diff --git a/boards/ea3152/tools/Makefile b/boards/arm/ea3152/tools/Makefile similarity index 100% rename from boards/ea3152/tools/Makefile rename to boards/arm/ea3152/tools/Makefile diff --git a/boards/ea3152/tools/armusbocd.cfg b/boards/arm/ea3152/tools/armusbocd.cfg similarity index 100% rename from boards/ea3152/tools/armusbocd.cfg rename to boards/arm/ea3152/tools/armusbocd.cfg diff --git a/boards/ea3152/tools/crc32.c b/boards/arm/ea3152/tools/crc32.c similarity index 100% rename from boards/ea3152/tools/crc32.c rename to boards/arm/ea3152/tools/crc32.c diff --git a/boards/ea3152/tools/jlink.cfg b/boards/arm/ea3152/tools/jlink.cfg similarity index 100% rename from boards/ea3152/tools/jlink.cfg rename to boards/arm/ea3152/tools/jlink.cfg diff --git a/boards/ea3152/tools/lpc3152.cfg b/boards/arm/ea3152/tools/lpc3152.cfg similarity index 100% rename from boards/ea3152/tools/lpc3152.cfg rename to boards/arm/ea3152/tools/lpc3152.cfg diff --git a/boards/ea3152/tools/lpchdr.c b/boards/arm/ea3152/tools/lpchdr.c similarity index 100% rename from boards/ea3152/tools/lpchdr.c rename to boards/arm/ea3152/tools/lpchdr.c diff --git a/boards/ea3152/tools/lpchdr.h b/boards/arm/ea3152/tools/lpchdr.h similarity index 97% rename from boards/ea3152/tools/lpchdr.h rename to boards/arm/ea3152/tools/lpchdr.h index 9a52fe39a2..b2599d338f 100644 --- a/boards/ea3152/tools/lpchdr.h +++ b/boards/arm/ea3152/tools/lpchdr.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_EA3152_TOOLS_LPCHDR_H -#define __BOARDS_EA3152_TOOLS_LPCHDR_H +#ifndef __BOARDS_ARM_EA3152_TOOLS_LPCHDR_H +#define __BOARDS_ARM_EA3152_TOOLS_LPCHDR_H /************************************************************************************ * Included Files @@ -101,5 +101,5 @@ struct lpc31_header_s extern uint32_t crc32part(const uint8_t *src, size_t len, uint32_t crc32val); extern uint32_t crc32(const uint8_t *src, size_t len); -#endif /* __BOARDS_EA3152_TOOLS_LPCHDR_H */ +#endif /* __BOARDS_ARM_EA3152_TOOLS_LPCHDR_H */ diff --git a/boards/ea3152/tools/mklpc.sh b/boards/arm/ea3152/tools/mklpc.sh similarity index 100% rename from boards/ea3152/tools/mklpc.sh rename to boards/arm/ea3152/tools/mklpc.sh diff --git a/boards/ea3152/tools/olimex-arm-usb-ocd.cfg b/boards/arm/ea3152/tools/olimex-arm-usb-ocd.cfg similarity index 100% rename from boards/ea3152/tools/olimex-arm-usb-ocd.cfg rename to boards/arm/ea3152/tools/olimex-arm-usb-ocd.cfg diff --git a/boards/ea3152/tools/oocd.sh b/boards/arm/ea3152/tools/oocd.sh similarity index 100% rename from boards/ea3152/tools/oocd.sh rename to boards/arm/ea3152/tools/oocd.sh diff --git a/boards/ea3152/tools/usb-driver.txt b/boards/arm/ea3152/tools/usb-driver.txt similarity index 100% rename from boards/ea3152/tools/usb-driver.txt rename to boards/arm/ea3152/tools/usb-driver.txt diff --git a/boards/eagle100/Kconfig b/boards/arm/eagle100/Kconfig similarity index 100% rename from boards/eagle100/Kconfig rename to boards/arm/eagle100/Kconfig diff --git a/boards/eagle100/README.txt b/boards/arm/eagle100/README.txt similarity index 100% rename from boards/eagle100/README.txt rename to boards/arm/eagle100/README.txt diff --git a/boards/eagle100/configs/httpd/defconfig b/boards/arm/eagle100/configs/httpd/defconfig similarity index 100% rename from boards/eagle100/configs/httpd/defconfig rename to boards/arm/eagle100/configs/httpd/defconfig diff --git a/boards/eagle100/configs/nettest/defconfig b/boards/arm/eagle100/configs/nettest/defconfig similarity index 100% rename from boards/eagle100/configs/nettest/defconfig rename to boards/arm/eagle100/configs/nettest/defconfig diff --git a/boards/eagle100/configs/nsh/defconfig b/boards/arm/eagle100/configs/nsh/defconfig similarity index 100% rename from boards/eagle100/configs/nsh/defconfig rename to boards/arm/eagle100/configs/nsh/defconfig diff --git a/boards/eagle100/configs/nxflat/defconfig b/boards/arm/eagle100/configs/nxflat/defconfig similarity index 100% rename from boards/eagle100/configs/nxflat/defconfig rename to boards/arm/eagle100/configs/nxflat/defconfig diff --git a/boards/eagle100/configs/thttpd/defconfig b/boards/arm/eagle100/configs/thttpd/defconfig similarity index 100% rename from boards/eagle100/configs/thttpd/defconfig rename to boards/arm/eagle100/configs/thttpd/defconfig diff --git a/boards/eagle100/include/board.h b/boards/arm/eagle100/include/board.h similarity index 100% rename from boards/eagle100/include/board.h rename to boards/arm/eagle100/include/board.h diff --git a/boards/eagle100/scripts/Make.defs b/boards/arm/eagle100/scripts/Make.defs similarity index 96% rename from boards/eagle100/scripts/Make.defs rename to boards/arm/eagle100/scripts/Make.defs index 1cc4ef3d10..e2e9e70d13 100644 --- a/boards/eagle100/scripts/Make.defs +++ b/boards/arm/eagle100/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/eagle100/scripts/ld.script b/boards/arm/eagle100/scripts/ld.script similarity index 100% rename from boards/eagle100/scripts/ld.script rename to boards/arm/eagle100/scripts/ld.script diff --git a/boards/dk-tm4c129x/src/.gitignore b/boards/arm/eagle100/src/.gitignore similarity index 100% rename from boards/dk-tm4c129x/src/.gitignore rename to boards/arm/eagle100/src/.gitignore diff --git a/boards/eagle100/src/Makefile b/boards/arm/eagle100/src/Makefile similarity index 100% rename from boards/eagle100/src/Makefile rename to boards/arm/eagle100/src/Makefile diff --git a/boards/eagle100/src/eagle100.h b/boards/arm/eagle100/src/eagle100.h similarity index 96% rename from boards/eagle100/src/eagle100.h rename to boards/arm/eagle100/src/eagle100.h index 397384eb76..9db02fa285 100644 --- a/boards/eagle100/src/eagle100.h +++ b/boards/arm/eagle100/src/eagle100.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_EAGLE100_SRC_EAGLE100_H -#define __BOARDS_EAGLE100_SRC_EAGLE100_H +#ifndef __BOARDS_ARM_EAGLE100_SRC_EAGLE100_H +#define __BOARDS_ARM_EAGLE100_SRC_EAGLE100_H /************************************************************************************ * Included Files @@ -87,5 +87,5 @@ void weak_function lm_ssidev_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_EAGLE100_SRC_EAGLE100_H */ +#endif /* __BOARDS_ARM_EAGLE100_SRC_EAGLE100_H */ diff --git a/boards/eagle100/src/lm_appinit.c b/boards/arm/eagle100/src/lm_appinit.c similarity index 100% rename from boards/eagle100/src/lm_appinit.c rename to boards/arm/eagle100/src/lm_appinit.c diff --git a/boards/eagle100/src/lm_boot.c b/boards/arm/eagle100/src/lm_boot.c similarity index 100% rename from boards/eagle100/src/lm_boot.c rename to boards/arm/eagle100/src/lm_boot.c diff --git a/boards/eagle100/src/lm_ethernet.c b/boards/arm/eagle100/src/lm_ethernet.c similarity index 100% rename from boards/eagle100/src/lm_ethernet.c rename to boards/arm/eagle100/src/lm_ethernet.c diff --git a/boards/eagle100/src/lm_leds.c b/boards/arm/eagle100/src/lm_leds.c similarity index 100% rename from boards/eagle100/src/lm_leds.c rename to boards/arm/eagle100/src/lm_leds.c diff --git a/boards/eagle100/src/lm_ssi.c b/boards/arm/eagle100/src/lm_ssi.c similarity index 100% rename from boards/eagle100/src/lm_ssi.c rename to boards/arm/eagle100/src/lm_ssi.c diff --git a/boards/efm32-g8xx-stk/Kconfig b/boards/arm/efm32-g8xx-stk/Kconfig similarity index 100% rename from boards/efm32-g8xx-stk/Kconfig rename to boards/arm/efm32-g8xx-stk/Kconfig diff --git a/boards/efm32-g8xx-stk/README.txt b/boards/arm/efm32-g8xx-stk/README.txt similarity index 100% rename from boards/efm32-g8xx-stk/README.txt rename to boards/arm/efm32-g8xx-stk/README.txt diff --git a/boards/efm32-g8xx-stk/configs/nsh/defconfig b/boards/arm/efm32-g8xx-stk/configs/nsh/defconfig similarity index 100% rename from boards/efm32-g8xx-stk/configs/nsh/defconfig rename to boards/arm/efm32-g8xx-stk/configs/nsh/defconfig diff --git a/boards/efm32-g8xx-stk/include/board.h b/boards/arm/efm32-g8xx-stk/include/board.h similarity index 98% rename from boards/efm32-g8xx-stk/include/board.h rename to boards/arm/efm32-g8xx-stk/include/board.h index 99e664d806..5503032809 100644 --- a/boards/efm32-g8xx-stk/include/board.h +++ b/boards/arm/efm32-g8xx-stk/include/board.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_EFM32_G8XX_STK_INCLUDE_BOARD_H -#define __BOARDS_EFM32_G8XX_STK_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_EFM32_G8XX_STK_INCLUDE_BOARD_H +#define __BOARDS_ARM_EFM32_G8XX_STK_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -224,4 +224,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __BOARDS_EFM32_G8XX_STK_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_EFM32_G8XX_STK_INCLUDE_BOARD_H */ diff --git a/boards/efm32-g8xx-stk/scripts/Make.defs b/boards/arm/efm32-g8xx-stk/scripts/Make.defs similarity index 96% rename from boards/efm32-g8xx-stk/scripts/Make.defs rename to boards/arm/efm32-g8xx-stk/scripts/Make.defs index 4f3da6b110..d18c402a1d 100644 --- a/boards/efm32-g8xx-stk/scripts/Make.defs +++ b/boards/arm/efm32-g8xx-stk/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/efm32-g8xx-stk/scripts/efm32-g8xx-stk.ld b/boards/arm/efm32-g8xx-stk/scripts/efm32-g8xx-stk.ld similarity index 100% rename from boards/efm32-g8xx-stk/scripts/efm32-g8xx-stk.ld rename to boards/arm/efm32-g8xx-stk/scripts/efm32-g8xx-stk.ld diff --git a/boards/ea3131/src/.gitignore b/boards/arm/efm32-g8xx-stk/src/.gitignore similarity index 100% rename from boards/ea3131/src/.gitignore rename to boards/arm/efm32-g8xx-stk/src/.gitignore diff --git a/boards/efm32-g8xx-stk/src/Makefile b/boards/arm/efm32-g8xx-stk/src/Makefile similarity index 100% rename from boards/efm32-g8xx-stk/src/Makefile rename to boards/arm/efm32-g8xx-stk/src/Makefile diff --git a/boards/efm32-g8xx-stk/src/efm32-g8xx-stk.h b/boards/arm/efm32-g8xx-stk/src/efm32-g8xx-stk.h similarity index 95% rename from boards/efm32-g8xx-stk/src/efm32-g8xx-stk.h rename to boards/arm/efm32-g8xx-stk/src/efm32-g8xx-stk.h index 88433c503b..8ebe3d2b93 100644 --- a/boards/efm32-g8xx-stk/src/efm32-g8xx-stk.h +++ b/boards/arm/efm32-g8xx-stk/src/efm32-g8xx-stk.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_EFM32_G8XX_STK_SRC_EFM32_G8XX_STK_H -#define __BOARDS_EFM32_G8XX_STK_SRC_EFM32_G8XX_STK_H +#ifndef __BOARDS_ARM_EFM32_G8XX_STK_SRC_EFM32_G8XX_STK_H +#define __BOARDS_ARM_EFM32_G8XX_STK_SRC_EFM32_G8XX_STK_H /**************************************************************************** * Included Files @@ -91,4 +91,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __BOARDS_EFM32_G8XX_STK_SRC_EFM32_G8XX_STK_H */ +#endif /* __BOARDS_ARM_EFM32_G8XX_STK_SRC_EFM32_G8XX_STK_H */ diff --git a/boards/efm32-g8xx-stk/src/efm32_autoleds.c b/boards/arm/efm32-g8xx-stk/src/efm32_autoleds.c similarity index 100% rename from boards/efm32-g8xx-stk/src/efm32_autoleds.c rename to boards/arm/efm32-g8xx-stk/src/efm32_autoleds.c diff --git a/boards/efm32-g8xx-stk/src/efm32_boot.c b/boards/arm/efm32-g8xx-stk/src/efm32_boot.c similarity index 100% rename from boards/efm32-g8xx-stk/src/efm32_boot.c rename to boards/arm/efm32-g8xx-stk/src/efm32_boot.c diff --git a/boards/efm32-g8xx-stk/src/efm32_userleds.c b/boards/arm/efm32-g8xx-stk/src/efm32_userleds.c similarity index 100% rename from boards/efm32-g8xx-stk/src/efm32_userleds.c rename to boards/arm/efm32-g8xx-stk/src/efm32_userleds.c diff --git a/boards/efm32gg-stk3700/Kconfig b/boards/arm/efm32gg-stk3700/Kconfig similarity index 100% rename from boards/efm32gg-stk3700/Kconfig rename to boards/arm/efm32gg-stk3700/Kconfig diff --git a/boards/efm32gg-stk3700/README.txt b/boards/arm/efm32gg-stk3700/README.txt similarity index 100% rename from boards/efm32gg-stk3700/README.txt rename to boards/arm/efm32gg-stk3700/README.txt diff --git a/boards/efm32gg-stk3700/configs/nsh/defconfig b/boards/arm/efm32gg-stk3700/configs/nsh/defconfig similarity index 100% rename from boards/efm32gg-stk3700/configs/nsh/defconfig rename to boards/arm/efm32gg-stk3700/configs/nsh/defconfig diff --git a/boards/efm32gg-stk3700/include/board.h b/boards/arm/efm32gg-stk3700/include/board.h similarity index 98% rename from boards/efm32gg-stk3700/include/board.h rename to boards/arm/efm32gg-stk3700/include/board.h index 9fef7086b0..0d57da38b2 100644 --- a/boards/efm32gg-stk3700/include/board.h +++ b/boards/arm/efm32gg-stk3700/include/board.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_EFM32GG_STK3700_INCLUDE_BOARD_H -#define __BOARDS_EFM32GG_STK3700_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_EFM32GG_STK3700_INCLUDE_BOARD_H +#define __BOARDS_ARM_EFM32GG_STK3700_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -269,4 +269,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __BOARDS_EFM32GG_STK3700_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_EFM32GG_STK3700_INCLUDE_BOARD_H */ diff --git a/boards/efm32gg-stk3700/scripts/Make.defs b/boards/arm/efm32gg-stk3700/scripts/Make.defs similarity index 96% rename from boards/efm32gg-stk3700/scripts/Make.defs rename to boards/arm/efm32gg-stk3700/scripts/Make.defs index b688ad5779..0e29feb477 100644 --- a/boards/efm32gg-stk3700/scripts/Make.defs +++ b/boards/arm/efm32gg-stk3700/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/efm32gg-stk3700/scripts/ld.script b/boards/arm/efm32gg-stk3700/scripts/ld.script similarity index 100% rename from boards/efm32gg-stk3700/scripts/ld.script rename to boards/arm/efm32gg-stk3700/scripts/ld.script diff --git a/boards/ea3152/src/.gitignore b/boards/arm/efm32gg-stk3700/src/.gitignore similarity index 100% rename from boards/ea3152/src/.gitignore rename to boards/arm/efm32gg-stk3700/src/.gitignore diff --git a/boards/efm32gg-stk3700/src/Makefile b/boards/arm/efm32gg-stk3700/src/Makefile similarity index 100% rename from boards/efm32gg-stk3700/src/Makefile rename to boards/arm/efm32gg-stk3700/src/Makefile diff --git a/boards/efm32gg-stk3700/src/efm32_autoleds.c b/boards/arm/efm32gg-stk3700/src/efm32_autoleds.c similarity index 100% rename from boards/efm32gg-stk3700/src/efm32_autoleds.c rename to boards/arm/efm32gg-stk3700/src/efm32_autoleds.c diff --git a/boards/efm32gg-stk3700/src/efm32_boot.c b/boards/arm/efm32gg-stk3700/src/efm32_boot.c similarity index 100% rename from boards/efm32gg-stk3700/src/efm32_boot.c rename to boards/arm/efm32gg-stk3700/src/efm32_boot.c diff --git a/boards/efm32gg-stk3700/src/efm32_userleds.c b/boards/arm/efm32gg-stk3700/src/efm32_userleds.c similarity index 100% rename from boards/efm32gg-stk3700/src/efm32_userleds.c rename to boards/arm/efm32gg-stk3700/src/efm32_userleds.c diff --git a/boards/efm32gg-stk3700/src/efm32gg-stk3700.h b/boards/arm/efm32gg-stk3700/src/efm32gg-stk3700.h similarity index 95% rename from boards/efm32gg-stk3700/src/efm32gg-stk3700.h rename to boards/arm/efm32gg-stk3700/src/efm32gg-stk3700.h index 245f5fe258..b9a7995285 100644 --- a/boards/efm32gg-stk3700/src/efm32gg-stk3700.h +++ b/boards/arm/efm32gg-stk3700/src/efm32gg-stk3700.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_EFM32GG_STK3700_SRC_EFM32GG_STK3700_H -#define __BOARDS_EFM32GG_STK3700_SRC_EFM32GG_STK3700_H +#ifndef __BOARDS_ARM_EFM32GG_STK3700_SRC_EFM32GG_STK3700_H +#define __BOARDS_ARM_EFM32GG_STK3700_SRC_EFM32GG_STK3700_H /**************************************************************************** * Included Files @@ -89,4 +89,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __BOARDS_EFM32GG_STK3700_SRC_EFM32GG_STK3700_H */ +#endif /* __BOARDS_ARM_EFM32GG_STK3700_SRC_EFM32GG_STK3700_H */ diff --git a/boards/ekk-lm3s9b96/Kconfig b/boards/arm/ekk-lm3s9b96/Kconfig similarity index 100% rename from boards/ekk-lm3s9b96/Kconfig rename to boards/arm/ekk-lm3s9b96/Kconfig diff --git a/boards/ekk-lm3s9b96/README.txt b/boards/arm/ekk-lm3s9b96/README.txt similarity index 100% rename from boards/ekk-lm3s9b96/README.txt rename to boards/arm/ekk-lm3s9b96/README.txt diff --git a/boards/ekk-lm3s9b96/configs/nsh/defconfig b/boards/arm/ekk-lm3s9b96/configs/nsh/defconfig similarity index 100% rename from boards/ekk-lm3s9b96/configs/nsh/defconfig rename to boards/arm/ekk-lm3s9b96/configs/nsh/defconfig diff --git a/boards/ekk-lm3s9b96/include/board.h b/boards/arm/ekk-lm3s9b96/include/board.h similarity index 100% rename from boards/ekk-lm3s9b96/include/board.h rename to boards/arm/ekk-lm3s9b96/include/board.h diff --git a/boards/ekk-lm3s9b96/scripts/Make.defs b/boards/arm/ekk-lm3s9b96/scripts/Make.defs similarity index 96% rename from boards/ekk-lm3s9b96/scripts/Make.defs rename to boards/arm/ekk-lm3s9b96/scripts/Make.defs index 19414e2017..4dfd70d613 100644 --- a/boards/ekk-lm3s9b96/scripts/Make.defs +++ b/boards/arm/ekk-lm3s9b96/scripts/Make.defs @@ -45,13 +45,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ekk-lm3s9b96.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ekk-lm3s9b96.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ekk-lm3s9b96.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ekk-lm3s9b96.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/ekk-lm3s9b96/scripts/ekk-lm3s9b96.ld b/boards/arm/ekk-lm3s9b96/scripts/ekk-lm3s9b96.ld similarity index 100% rename from boards/ekk-lm3s9b96/scripts/ekk-lm3s9b96.ld rename to boards/arm/ekk-lm3s9b96/scripts/ekk-lm3s9b96.ld diff --git a/boards/eagle100/src/.gitignore b/boards/arm/ekk-lm3s9b96/src/.gitignore similarity index 100% rename from boards/eagle100/src/.gitignore rename to boards/arm/ekk-lm3s9b96/src/.gitignore diff --git a/boards/ekk-lm3s9b96/src/Makefile b/boards/arm/ekk-lm3s9b96/src/Makefile similarity index 100% rename from boards/ekk-lm3s9b96/src/Makefile rename to boards/arm/ekk-lm3s9b96/src/Makefile diff --git a/boards/ekk-lm3s9b96/src/ekk-lm3s9b96.h b/boards/arm/ekk-lm3s9b96/src/ekk-lm3s9b96.h similarity index 96% rename from boards/ekk-lm3s9b96/src/ekk-lm3s9b96.h rename to boards/arm/ekk-lm3s9b96/src/ekk-lm3s9b96.h index 9e865a713c..c57f4bc843 100644 --- a/boards/ekk-lm3s9b96/src/ekk-lm3s9b96.h +++ b/boards/arm/ekk-lm3s9b96/src/ekk-lm3s9b96.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_EKK_LM3S9B96_SRC_EKKLM3S9B96_H -#define __BOARDS_EKK_LM3S9B96_SRC_EKKLM3S9B96_H +#ifndef __BOARDS_ARM_EKK_LM3S9B96_SRC_EKKLM3S9B96_H +#define __BOARDS_ARM_EKK_LM3S9B96_SRC_EKKLM3S9B96_H /************************************************************************************ * Included Files @@ -108,5 +108,5 @@ extern void weak_function lm_ssidev_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_EKK_LM3S9B96_SRC_EKKLM3S9B96_H */ +#endif /* __BOARDS_ARM_EKK_LM3S9B96_SRC_EKKLM3S9B96_H */ diff --git a/boards/ekk-lm3s9b96/src/lm_appinit.c b/boards/arm/ekk-lm3s9b96/src/lm_appinit.c similarity index 100% rename from boards/ekk-lm3s9b96/src/lm_appinit.c rename to boards/arm/ekk-lm3s9b96/src/lm_appinit.c diff --git a/boards/ekk-lm3s9b96/src/lm_boot.c b/boards/arm/ekk-lm3s9b96/src/lm_boot.c similarity index 100% rename from boards/ekk-lm3s9b96/src/lm_boot.c rename to boards/arm/ekk-lm3s9b96/src/lm_boot.c diff --git a/boards/ekk-lm3s9b96/src/lm_ethernet.c b/boards/arm/ekk-lm3s9b96/src/lm_ethernet.c similarity index 100% rename from boards/ekk-lm3s9b96/src/lm_ethernet.c rename to boards/arm/ekk-lm3s9b96/src/lm_ethernet.c diff --git a/boards/ekk-lm3s9b96/src/lm_leds.c b/boards/arm/ekk-lm3s9b96/src/lm_leds.c similarity index 100% rename from boards/ekk-lm3s9b96/src/lm_leds.c rename to boards/arm/ekk-lm3s9b96/src/lm_leds.c diff --git a/boards/ekk-lm3s9b96/src/lm_ssi.c b/boards/arm/ekk-lm3s9b96/src/lm_ssi.c similarity index 100% rename from boards/ekk-lm3s9b96/src/lm_ssi.c rename to boards/arm/ekk-lm3s9b96/src/lm_ssi.c diff --git a/boards/fire-stm32v2/Kconfig b/boards/arm/fire-stm32v2/Kconfig similarity index 100% rename from boards/fire-stm32v2/Kconfig rename to boards/arm/fire-stm32v2/Kconfig diff --git a/boards/fire-stm32v2/README.txt b/boards/arm/fire-stm32v2/README.txt similarity index 100% rename from boards/fire-stm32v2/README.txt rename to boards/arm/fire-stm32v2/README.txt diff --git a/boards/fire-stm32v2/configs/nsh/defconfig b/boards/arm/fire-stm32v2/configs/nsh/defconfig similarity index 100% rename from boards/fire-stm32v2/configs/nsh/defconfig rename to boards/arm/fire-stm32v2/configs/nsh/defconfig diff --git a/boards/fire-stm32v2/include/board.h b/boards/arm/fire-stm32v2/include/board.h similarity index 99% rename from boards/fire-stm32v2/include/board.h rename to boards/arm/fire-stm32v2/include/board.h index 9aae606b7f..1e0bce0624 100644 --- a/boards/fire-stm32v2/include/board.h +++ b/boards/arm/fire-stm32v2/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_FIRE_STM32V2_INCLUDE_BOARD_H -#define __BOARDS_FIRE_STM32V2_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_FIRE_STM32V2_INCLUDE_BOARD_H +#define __BOARDS_ARM_FIRE_STM32V2_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -402,4 +402,4 @@ void fire_lcdclear(uint16_t color); #undef EXTERN #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_FIRE_STM32V2_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_FIRE_STM32V2_INCLUDE_BOARD_H */ diff --git a/boards/fire-stm32v2/scripts/Make.defs b/boards/arm/fire-stm32v2/scripts/Make.defs similarity index 96% rename from boards/fire-stm32v2/scripts/Make.defs rename to boards/arm/fire-stm32v2/scripts/Make.defs index a12cb92f71..a2ca054d62 100644 --- a/boards/fire-stm32v2/scripts/Make.defs +++ b/boards/arm/fire-stm32v2/scripts/Make.defs @@ -52,13 +52,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/fire-stm32v2/scripts/fire-stm32v2-dfu.ld b/boards/arm/fire-stm32v2/scripts/fire-stm32v2-dfu.ld similarity index 100% rename from boards/fire-stm32v2/scripts/fire-stm32v2-dfu.ld rename to boards/arm/fire-stm32v2/scripts/fire-stm32v2-dfu.ld diff --git a/boards/fire-stm32v2/scripts/fire-stm32v2.ld b/boards/arm/fire-stm32v2/scripts/fire-stm32v2.ld similarity index 100% rename from boards/fire-stm32v2/scripts/fire-stm32v2.ld rename to boards/arm/fire-stm32v2/scripts/fire-stm32v2.ld diff --git a/boards/efm32-g8xx-stk/src/.gitignore b/boards/arm/fire-stm32v2/src/.gitignore similarity index 100% rename from boards/efm32-g8xx-stk/src/.gitignore rename to boards/arm/fire-stm32v2/src/.gitignore diff --git a/boards/fire-stm32v2/src/Makefile b/boards/arm/fire-stm32v2/src/Makefile similarity index 100% rename from boards/fire-stm32v2/src/Makefile rename to boards/arm/fire-stm32v2/src/Makefile diff --git a/boards/fire-stm32v2/src/fire-stm32v2.h b/boards/arm/fire-stm32v2/src/fire-stm32v2.h similarity index 98% rename from boards/fire-stm32v2/src/fire-stm32v2.h rename to boards/arm/fire-stm32v2/src/fire-stm32v2.h index 6d2301c1b3..50eb878ebe 100644 --- a/boards/fire-stm32v2/src/fire-stm32v2.h +++ b/boards/arm/fire-stm32v2/src/fire-stm32v2.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_FIRE_STM32V2_SRC_FIRE_H -#define __BOARDS_FIRE_STM32V2_SRC_FIRE_H +#ifndef __BOARDS_ARM_FIRE_STM32V2_SRC_FIRE_H +#define __BOARDS_ARM_FIRE_STM32V2_SRC_FIRE_H /************************************************************************************ * Included Files @@ -335,5 +335,5 @@ int stm32_w25initialize(int minor); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_FIRE_STM32V2_SRC_FIRE_H */ +#endif /* __BOARDS_ARM_FIRE_STM32V2_SRC_FIRE_H */ diff --git a/boards/fire-stm32v2/src/stm32_appinit.c b/boards/arm/fire-stm32v2/src/stm32_appinit.c similarity index 100% rename from boards/fire-stm32v2/src/stm32_appinit.c rename to boards/arm/fire-stm32v2/src/stm32_appinit.c diff --git a/boards/fire-stm32v2/src/stm32_autoleds.c b/boards/arm/fire-stm32v2/src/stm32_autoleds.c similarity index 100% rename from boards/fire-stm32v2/src/stm32_autoleds.c rename to boards/arm/fire-stm32v2/src/stm32_autoleds.c diff --git a/boards/fire-stm32v2/src/stm32_boot.c b/boards/arm/fire-stm32v2/src/stm32_boot.c similarity index 100% rename from boards/fire-stm32v2/src/stm32_boot.c rename to boards/arm/fire-stm32v2/src/stm32_boot.c diff --git a/boards/fire-stm32v2/src/stm32_buttons.c b/boards/arm/fire-stm32v2/src/stm32_buttons.c similarity index 100% rename from boards/fire-stm32v2/src/stm32_buttons.c rename to boards/arm/fire-stm32v2/src/stm32_buttons.c diff --git a/boards/fire-stm32v2/src/stm32_enc28j60.c b/boards/arm/fire-stm32v2/src/stm32_enc28j60.c similarity index 100% rename from boards/fire-stm32v2/src/stm32_enc28j60.c rename to boards/arm/fire-stm32v2/src/stm32_enc28j60.c diff --git a/boards/fire-stm32v2/src/stm32_mmcsd.c b/boards/arm/fire-stm32v2/src/stm32_mmcsd.c similarity index 100% rename from boards/fire-stm32v2/src/stm32_mmcsd.c rename to boards/arm/fire-stm32v2/src/stm32_mmcsd.c diff --git a/boards/fire-stm32v2/src/stm32_selectlcd.c b/boards/arm/fire-stm32v2/src/stm32_selectlcd.c similarity index 100% rename from boards/fire-stm32v2/src/stm32_selectlcd.c rename to boards/arm/fire-stm32v2/src/stm32_selectlcd.c diff --git a/boards/fire-stm32v2/src/stm32_spi.c b/boards/arm/fire-stm32v2/src/stm32_spi.c similarity index 100% rename from boards/fire-stm32v2/src/stm32_spi.c rename to boards/arm/fire-stm32v2/src/stm32_spi.c diff --git a/boards/fire-stm32v2/src/stm32_usbdev.c b/boards/arm/fire-stm32v2/src/stm32_usbdev.c similarity index 100% rename from boards/fire-stm32v2/src/stm32_usbdev.c rename to boards/arm/fire-stm32v2/src/stm32_usbdev.c diff --git a/boards/fire-stm32v2/src/stm32_usbmsc.c b/boards/arm/fire-stm32v2/src/stm32_usbmsc.c similarity index 100% rename from boards/fire-stm32v2/src/stm32_usbmsc.c rename to boards/arm/fire-stm32v2/src/stm32_usbmsc.c diff --git a/boards/fire-stm32v2/src/stm32_userleds.c b/boards/arm/fire-stm32v2/src/stm32_userleds.c similarity index 100% rename from boards/fire-stm32v2/src/stm32_userleds.c rename to boards/arm/fire-stm32v2/src/stm32_userleds.c diff --git a/boards/fire-stm32v2/src/stm32_w25.c b/boards/arm/fire-stm32v2/src/stm32_w25.c similarity index 100% rename from boards/fire-stm32v2/src/stm32_w25.c rename to boards/arm/fire-stm32v2/src/stm32_w25.c diff --git a/boards/flipnclick-sam3x/Kconfig b/boards/arm/flipnclick-sam3x/Kconfig similarity index 100% rename from boards/flipnclick-sam3x/Kconfig rename to boards/arm/flipnclick-sam3x/Kconfig diff --git a/boards/flipnclick-sam3x/README.txt b/boards/arm/flipnclick-sam3x/README.txt similarity index 100% rename from boards/flipnclick-sam3x/README.txt rename to boards/arm/flipnclick-sam3x/README.txt diff --git a/boards/flipnclick-sam3x/configs/nsh/defconfig b/boards/arm/flipnclick-sam3x/configs/nsh/defconfig similarity index 100% rename from boards/flipnclick-sam3x/configs/nsh/defconfig rename to boards/arm/flipnclick-sam3x/configs/nsh/defconfig diff --git a/boards/flipnclick-sam3x/configs/nxlines/defconfig b/boards/arm/flipnclick-sam3x/configs/nxlines/defconfig similarity index 100% rename from boards/flipnclick-sam3x/configs/nxlines/defconfig rename to boards/arm/flipnclick-sam3x/configs/nxlines/defconfig diff --git a/boards/flipnclick-sam3x/include/board.h b/boards/arm/flipnclick-sam3x/include/board.h similarity index 98% rename from boards/flipnclick-sam3x/include/board.h rename to boards/arm/flipnclick-sam3x/include/board.h index 529973f3e6..96ae083f2f 100644 --- a/boards/flipnclick-sam3x/include/board.h +++ b/boards/arm/flipnclick-sam3x/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_FLIPNCLICK_SAM3X_INCLUDE_BOARD_H -#define __BOARDS_FLIPNCLICK_SAM3X_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_FLIPNCLICK_SAM3X_INCLUDE_BOARD_H +#define __BOARDS_ARM_FLIPNCLICK_SAM3X_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -324,4 +324,4 @@ * There are no alternative pin selections for TWI0 and TWI1. */ -#endif /* __BOARDS_FLIPNCLICK_SAM3X_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_FLIPNCLICK_SAM3X_INCLUDE_BOARD_H */ diff --git a/boards/flipnclick-sam3x/scripts/Make.defs b/boards/arm/flipnclick-sam3x/scripts/Make.defs similarity index 97% rename from boards/flipnclick-sam3x/scripts/Make.defs rename to boards/arm/flipnclick-sam3x/scripts/Make.defs index 3dc11aca3e..898d0fbe22 100644 --- a/boards/flipnclick-sam3x/scripts/Make.defs +++ b/boards/arm/flipnclick-sam3x/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/flash.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/flash.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/flipnclick-sam3x/scripts/flash.ld b/boards/arm/flipnclick-sam3x/scripts/flash.ld similarity index 100% rename from boards/flipnclick-sam3x/scripts/flash.ld rename to boards/arm/flipnclick-sam3x/scripts/flash.ld diff --git a/boards/efm32gg-stk3700/src/.gitignore b/boards/arm/flipnclick-sam3x/src/.gitignore similarity index 100% rename from boards/efm32gg-stk3700/src/.gitignore rename to boards/arm/flipnclick-sam3x/src/.gitignore diff --git a/boards/flipnclick-sam3x/src/Makefile b/boards/arm/flipnclick-sam3x/src/Makefile similarity index 100% rename from boards/flipnclick-sam3x/src/Makefile rename to boards/arm/flipnclick-sam3x/src/Makefile diff --git a/boards/flipnclick-sam3x/src/flipnclick-sam3x.h b/boards/arm/flipnclick-sam3x/src/flipnclick-sam3x.h similarity index 98% rename from boards/flipnclick-sam3x/src/flipnclick-sam3x.h rename to boards/arm/flipnclick-sam3x/src/flipnclick-sam3x.h index 28c0170226..c46b289f94 100644 --- a/boards/flipnclick-sam3x/src/flipnclick-sam3x.h +++ b/boards/arm/flipnclick-sam3x/src/flipnclick-sam3x.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_FLIPNCLICK_SAM3X_SRC_FLIPNCLICK_SAM3X_H -#define __BOARDS_FLIPNCLICK_SAM3X_SRC_FLIPNCLICK_SAM3X_H +#ifndef __BOARDS_ARM_FLIPNCLICK_SAM3X_SRC_FLIPNCLICK_SAM3X_H +#define __BOARDS_ARM_FLIPNCLICK_SAM3X_SRC_FLIPNCLICK_SAM3X_H /************************************************************************************ * Included Files @@ -276,5 +276,5 @@ FAR struct lcd_dev_s *sam_graphics_setup(unsigned int devno); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_FLIPNCLICK_SAM3X_SRC_FLIPNCLICK_SAM3X_H */ +#endif /* __BOARDS_ARM_FLIPNCLICK_SAM3X_SRC_FLIPNCLICK_SAM3X_H */ diff --git a/boards/flipnclick-sam3x/src/sam_appinit.c b/boards/arm/flipnclick-sam3x/src/sam_appinit.c similarity index 100% rename from boards/flipnclick-sam3x/src/sam_appinit.c rename to boards/arm/flipnclick-sam3x/src/sam_appinit.c diff --git a/boards/flipnclick-sam3x/src/sam_autoleds.c b/boards/arm/flipnclick-sam3x/src/sam_autoleds.c similarity index 100% rename from boards/flipnclick-sam3x/src/sam_autoleds.c rename to boards/arm/flipnclick-sam3x/src/sam_autoleds.c diff --git a/boards/flipnclick-sam3x/src/sam_boot.c b/boards/arm/flipnclick-sam3x/src/sam_boot.c similarity index 100% rename from boards/flipnclick-sam3x/src/sam_boot.c rename to boards/arm/flipnclick-sam3x/src/sam_boot.c diff --git a/boards/flipnclick-sam3x/src/sam_bringup.c b/boards/arm/flipnclick-sam3x/src/sam_bringup.c similarity index 100% rename from boards/flipnclick-sam3x/src/sam_bringup.c rename to boards/arm/flipnclick-sam3x/src/sam_bringup.c diff --git a/boards/flipnclick-sam3x/src/sam_spi0.c b/boards/arm/flipnclick-sam3x/src/sam_spi0.c similarity index 100% rename from boards/flipnclick-sam3x/src/sam_spi0.c rename to boards/arm/flipnclick-sam3x/src/sam_spi0.c diff --git a/boards/flipnclick-sam3x/src/sam_ssd1306.c b/boards/arm/flipnclick-sam3x/src/sam_ssd1306.c similarity index 100% rename from boards/flipnclick-sam3x/src/sam_ssd1306.c rename to boards/arm/flipnclick-sam3x/src/sam_ssd1306.c diff --git a/boards/flipnclick-sam3x/src/sam_userleds.c b/boards/arm/flipnclick-sam3x/src/sam_userleds.c similarity index 100% rename from boards/flipnclick-sam3x/src/sam_userleds.c rename to boards/arm/flipnclick-sam3x/src/sam_userleds.c diff --git a/boards/freedom-k28f/Kconfig b/boards/arm/freedom-k28f/Kconfig similarity index 100% rename from boards/freedom-k28f/Kconfig rename to boards/arm/freedom-k28f/Kconfig diff --git a/boards/freedom-k28f/README.txt b/boards/arm/freedom-k28f/README.txt similarity index 100% rename from boards/freedom-k28f/README.txt rename to boards/arm/freedom-k28f/README.txt diff --git a/boards/freedom-k28f/configs/nsh/defconfig b/boards/arm/freedom-k28f/configs/nsh/defconfig similarity index 100% rename from boards/freedom-k28f/configs/nsh/defconfig rename to boards/arm/freedom-k28f/configs/nsh/defconfig diff --git a/boards/freedom-k28f/include/board.h b/boards/arm/freedom-k28f/include/board.h similarity index 99% rename from boards/freedom-k28f/include/board.h rename to boards/arm/freedom-k28f/include/board.h index 13bc6e8a9c..211ca07c87 100644 --- a/boards/freedom-k28f/include/board.h +++ b/boards/arm/freedom-k28f/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_FREEDOM_K28F_INCLUDE_BOARD_H -#define __BOARDS_FREEDOM_K28F_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_FREEDOM_K28F_INCLUDE_BOARD_H +#define __BOARDS_ARM_FREEDOM_K28F_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -459,4 +459,4 @@ #define BUTTON_SW2_BIT (1 << BUTTON_SW2) #define BUTTON_SW3_BIT (1 << BUTTON_SW3) -#endif /* __BOARDS_FREEDOM_K28F_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_FREEDOM_K28F_INCLUDE_BOARD_H */ diff --git a/boards/freedom-k28f/scripts/Make.defs b/boards/arm/freedom-k28f/scripts/Make.defs similarity index 96% rename from boards/freedom-k28f/scripts/Make.defs rename to boards/arm/freedom-k28f/scripts/Make.defs index df44833747..4af2d4cf9b 100644 --- a/boards/freedom-k28f/scripts/Make.defs +++ b/boards/arm/freedom-k28f/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/freedom-k28f/scripts/flash.ld b/boards/arm/freedom-k28f/scripts/flash.ld similarity index 100% rename from boards/freedom-k28f/scripts/flash.ld rename to boards/arm/freedom-k28f/scripts/flash.ld diff --git a/boards/ekk-lm3s9b96/src/.gitignore b/boards/arm/freedom-k28f/src/.gitignore similarity index 100% rename from boards/ekk-lm3s9b96/src/.gitignore rename to boards/arm/freedom-k28f/src/.gitignore diff --git a/boards/freedom-k28f/src/Makefile b/boards/arm/freedom-k28f/src/Makefile similarity index 100% rename from boards/freedom-k28f/src/Makefile rename to boards/arm/freedom-k28f/src/Makefile diff --git a/boards/freedom-k28f/src/freedom-k28f.h b/boards/arm/freedom-k28f/src/freedom-k28f.h similarity index 97% rename from boards/freedom-k28f/src/freedom-k28f.h rename to boards/arm/freedom-k28f/src/freedom-k28f.h index ddca8978e1..9a0548aaeb 100644 --- a/boards/freedom-k28f/src/freedom-k28f.h +++ b/boards/arm/freedom-k28f/src/freedom-k28f.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_FREEDOM_K28F_SRC_FREEDOM_K28F_H -#define __BOARDS_FREEDOM_K28F_SRC_FREEDOM_K28F_H +#ifndef __BOARDS_ARM_FREEDOM_K28F_SRC_FREEDOM_K28F_H +#define __BOARDS_ARM_FREEDOM_K28F_SRC_FREEDOM_K28F_H /**************************************************************************** * Included Files @@ -158,4 +158,4 @@ int k28_pwm_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_FREEDOM_K28F_SRC_FREEDOM_K28F_H */ +#endif /* __BOARDS_ARM_FREEDOM_K28F_SRC_FREEDOM_K28F_H */ diff --git a/boards/freedom-k28f/src/k28_appinit.c b/boards/arm/freedom-k28f/src/k28_appinit.c similarity index 100% rename from boards/freedom-k28f/src/k28_appinit.c rename to boards/arm/freedom-k28f/src/k28_appinit.c diff --git a/boards/freedom-k28f/src/k28_autoleds.c b/boards/arm/freedom-k28f/src/k28_autoleds.c similarity index 100% rename from boards/freedom-k28f/src/k28_autoleds.c rename to boards/arm/freedom-k28f/src/k28_autoleds.c diff --git a/boards/freedom-k28f/src/k28_boot.c b/boards/arm/freedom-k28f/src/k28_boot.c similarity index 100% rename from boards/freedom-k28f/src/k28_boot.c rename to boards/arm/freedom-k28f/src/k28_boot.c diff --git a/boards/freedom-k28f/src/k28_bringup.c b/boards/arm/freedom-k28f/src/k28_bringup.c similarity index 100% rename from boards/freedom-k28f/src/k28_bringup.c rename to boards/arm/freedom-k28f/src/k28_bringup.c diff --git a/boards/freedom-k28f/src/k28_i2c.c b/boards/arm/freedom-k28f/src/k28_i2c.c similarity index 100% rename from boards/freedom-k28f/src/k28_i2c.c rename to boards/arm/freedom-k28f/src/k28_i2c.c diff --git a/boards/freedom-k28f/src/k28_pwm.c b/boards/arm/freedom-k28f/src/k28_pwm.c similarity index 100% rename from boards/freedom-k28f/src/k28_pwm.c rename to boards/arm/freedom-k28f/src/k28_pwm.c diff --git a/boards/freedom-k28f/src/k28_spi.c b/boards/arm/freedom-k28f/src/k28_spi.c similarity index 100% rename from boards/freedom-k28f/src/k28_spi.c rename to boards/arm/freedom-k28f/src/k28_spi.c diff --git a/boards/freedom-k28f/src/k28_usbdev.c b/boards/arm/freedom-k28f/src/k28_usbdev.c similarity index 100% rename from boards/freedom-k28f/src/k28_usbdev.c rename to boards/arm/freedom-k28f/src/k28_usbdev.c diff --git a/boards/freedom-k28f/src/k28_userleds.c b/boards/arm/freedom-k28f/src/k28_userleds.c similarity index 100% rename from boards/freedom-k28f/src/k28_userleds.c rename to boards/arm/freedom-k28f/src/k28_userleds.c diff --git a/boards/freedom-k64f/Kconfig b/boards/arm/freedom-k64f/Kconfig similarity index 100% rename from boards/freedom-k64f/Kconfig rename to boards/arm/freedom-k64f/Kconfig diff --git a/boards/freedom-k64f/README.txt b/boards/arm/freedom-k64f/README.txt similarity index 100% rename from boards/freedom-k64f/README.txt rename to boards/arm/freedom-k64f/README.txt diff --git a/boards/freedom-k64f/configs/netnsh/defconfig b/boards/arm/freedom-k64f/configs/netnsh/defconfig similarity index 100% rename from boards/freedom-k64f/configs/netnsh/defconfig rename to boards/arm/freedom-k64f/configs/netnsh/defconfig diff --git a/boards/freedom-k64f/configs/nsh/defconfig b/boards/arm/freedom-k64f/configs/nsh/defconfig similarity index 100% rename from boards/freedom-k64f/configs/nsh/defconfig rename to boards/arm/freedom-k64f/configs/nsh/defconfig diff --git a/boards/freedom-k64f/include/board.h b/boards/arm/freedom-k64f/include/board.h similarity index 98% rename from boards/freedom-k64f/include/board.h rename to boards/arm/freedom-k64f/include/board.h index 47001b7963..3e04242f93 100644 --- a/boards/freedom-k64f/include/board.h +++ b/boards/arm/freedom-k64f/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_FREEDOM_K64F_INCLUDE_BOARD_H -#define __CONFIG_FREEDOM_K64F_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_FREEDOM_K64F_INCLUDE_BOARD_H +#define __BOARDS_ARM_FREEDOM_K64F_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -248,4 +248,4 @@ #define PIN_UART3_RX PIN_UART3_RX_2 #define PIN_UART3_TX PIN_UART3_TX_2 -#endif /* __CONFIG_FREEDOM_K64F_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_FREEDOM_K64F_INCLUDE_BOARD_H */ diff --git a/boards/freedom-k64f/scripts/Make.defs b/boards/arm/freedom-k64f/scripts/Make.defs similarity index 97% rename from boards/freedom-k64f/scripts/Make.defs rename to boards/arm/freedom-k64f/scripts/Make.defs index 50b6a73008..e8061c5850 100644 --- a/boards/freedom-k64f/scripts/Make.defs +++ b/boards/arm/freedom-k64f/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/flash.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/flash.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/freedom-k64f/scripts/flash.ld b/boards/arm/freedom-k64f/scripts/flash.ld similarity index 100% rename from boards/freedom-k64f/scripts/flash.ld rename to boards/arm/freedom-k64f/scripts/flash.ld diff --git a/boards/freedom-k64f/src/Makefile b/boards/arm/freedom-k64f/src/Makefile similarity index 100% rename from boards/freedom-k64f/src/Makefile rename to boards/arm/freedom-k64f/src/Makefile diff --git a/boards/freedom-k64f/src/freedom-k64f.h b/boards/arm/freedom-k64f/src/freedom-k64f.h similarity index 98% rename from boards/freedom-k64f/src/freedom-k64f.h rename to boards/arm/freedom-k64f/src/freedom-k64f.h index fea283c6db..fdb58fdeac 100644 --- a/boards/freedom-k64f/src/freedom-k64f.h +++ b/boards/arm/freedom-k64f/src/freedom-k64f.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_FREEDOM_K64F_SRC_FREEDOM_K64F_H -#define __BOARDS_FREEDOM_K64F_SRC_FREEDOM_K64F_H +#ifndef __BOARDS_ARM_FREEDOM_K64F_SRC_FREEDOM_K64F_H +#define __BOARDS_ARM_FREEDOM_K64F_SRC_FREEDOM_K64F_H /************************************************************************************ * Included Files @@ -358,4 +358,4 @@ int k64_pwm_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_FREEDOM_K64F_SRC_FREEDOM_K64F_H */ +#endif /* __BOARDS_ARM_FREEDOM_K64F_SRC_FREEDOM_K64F_H */ diff --git a/boards/freedom-k64f/src/k64_appinit.c b/boards/arm/freedom-k64f/src/k64_appinit.c similarity index 100% rename from boards/freedom-k64f/src/k64_appinit.c rename to boards/arm/freedom-k64f/src/k64_appinit.c diff --git a/boards/freedom-k64f/src/k64_autoleds.c b/boards/arm/freedom-k64f/src/k64_autoleds.c similarity index 100% rename from boards/freedom-k64f/src/k64_autoleds.c rename to boards/arm/freedom-k64f/src/k64_autoleds.c diff --git a/boards/freedom-k64f/src/k64_automount.c b/boards/arm/freedom-k64f/src/k64_automount.c similarity index 100% rename from boards/freedom-k64f/src/k64_automount.c rename to boards/arm/freedom-k64f/src/k64_automount.c diff --git a/boards/freedom-k64f/src/k64_boot.c b/boards/arm/freedom-k64f/src/k64_boot.c similarity index 100% rename from boards/freedom-k64f/src/k64_boot.c rename to boards/arm/freedom-k64f/src/k64_boot.c diff --git a/boards/freedom-k64f/src/k64_bringup.c b/boards/arm/freedom-k64f/src/k64_bringup.c similarity index 100% rename from boards/freedom-k64f/src/k64_bringup.c rename to boards/arm/freedom-k64f/src/k64_bringup.c diff --git a/boards/freedom-k64f/src/k64_buttons.c b/boards/arm/freedom-k64f/src/k64_buttons.c similarity index 100% rename from boards/freedom-k64f/src/k64_buttons.c rename to boards/arm/freedom-k64f/src/k64_buttons.c diff --git a/boards/freedom-k64f/src/k64_pwm.c b/boards/arm/freedom-k64f/src/k64_pwm.c similarity index 100% rename from boards/freedom-k64f/src/k64_pwm.c rename to boards/arm/freedom-k64f/src/k64_pwm.c diff --git a/boards/freedom-k64f/src/k64_sdhc.c b/boards/arm/freedom-k64f/src/k64_sdhc.c similarity index 100% rename from boards/freedom-k64f/src/k64_sdhc.c rename to boards/arm/freedom-k64f/src/k64_sdhc.c diff --git a/boards/freedom-k64f/src/k64_spi.c b/boards/arm/freedom-k64f/src/k64_spi.c similarity index 100% rename from boards/freedom-k64f/src/k64_spi.c rename to boards/arm/freedom-k64f/src/k64_spi.c diff --git a/boards/freedom-k64f/src/k64_uid.c b/boards/arm/freedom-k64f/src/k64_uid.c similarity index 100% rename from boards/freedom-k64f/src/k64_uid.c rename to boards/arm/freedom-k64f/src/k64_uid.c diff --git a/boards/freedom-k64f/src/k64_usbdev.c b/boards/arm/freedom-k64f/src/k64_usbdev.c similarity index 100% rename from boards/freedom-k64f/src/k64_usbdev.c rename to boards/arm/freedom-k64f/src/k64_usbdev.c diff --git a/boards/freedom-k64f/src/k64_usbmsc.c b/boards/arm/freedom-k64f/src/k64_usbmsc.c similarity index 100% rename from boards/freedom-k64f/src/k64_usbmsc.c rename to boards/arm/freedom-k64f/src/k64_usbmsc.c diff --git a/boards/freedom-k64f/src/k64_userleds.c b/boards/arm/freedom-k64f/src/k64_userleds.c similarity index 100% rename from boards/freedom-k64f/src/k64_userleds.c rename to boards/arm/freedom-k64f/src/k64_userleds.c diff --git a/boards/freedom-k66f/Kconfig b/boards/arm/freedom-k66f/Kconfig similarity index 100% rename from boards/freedom-k66f/Kconfig rename to boards/arm/freedom-k66f/Kconfig diff --git a/boards/freedom-k66f/README.txt b/boards/arm/freedom-k66f/README.txt similarity index 100% rename from boards/freedom-k66f/README.txt rename to boards/arm/freedom-k66f/README.txt diff --git a/boards/freedom-k66f/configs/netnsh/defconfig b/boards/arm/freedom-k66f/configs/netnsh/defconfig similarity index 100% rename from boards/freedom-k66f/configs/netnsh/defconfig rename to boards/arm/freedom-k66f/configs/netnsh/defconfig diff --git a/boards/freedom-k66f/configs/nsh/defconfig b/boards/arm/freedom-k66f/configs/nsh/defconfig similarity index 100% rename from boards/freedom-k66f/configs/nsh/defconfig rename to boards/arm/freedom-k66f/configs/nsh/defconfig diff --git a/boards/freedom-k66f/include/board.h b/boards/arm/freedom-k66f/include/board.h similarity index 99% rename from boards/freedom-k66f/include/board.h rename to boards/arm/freedom-k66f/include/board.h index d8c996d551..cc3986de6b 100644 --- a/boards/freedom-k66f/include/board.h +++ b/boards/arm/freedom-k66f/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_FREEDOM_K66F_INCLUDE_BOARD_H -#define __CONFIG_FREEDOM_K66F_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_FREEDOM_K66F_INCLUDE_BOARD_H +#define __BOARDS_ARM_FREEDOM_K66F_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -396,4 +396,4 @@ #define PIN_RMII0_MDIO PIN_RMII0_MDIO_1 #define PIN_RMII0_MDC PIN_RMII0_MDC_1 -#endif /* __CONFIG_FREEDOM_K66F_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_FREEDOM_K66F_INCLUDE_BOARD_H */ diff --git a/boards/freedom-k66f/scripts/Make.defs b/boards/arm/freedom-k66f/scripts/Make.defs similarity index 97% rename from boards/freedom-k66f/scripts/Make.defs rename to boards/arm/freedom-k66f/scripts/Make.defs index 8b41f698ed..d7922812b3 100644 --- a/boards/freedom-k66f/scripts/Make.defs +++ b/boards/arm/freedom-k66f/scripts/Make.defs @@ -45,13 +45,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/flash.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/flash.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/freedom-k66f/scripts/flash.ld b/boards/arm/freedom-k66f/scripts/flash.ld similarity index 100% rename from boards/freedom-k66f/scripts/flash.ld rename to boards/arm/freedom-k66f/scripts/flash.ld diff --git a/boards/freedom-k66f/src/Makefile b/boards/arm/freedom-k66f/src/Makefile similarity index 100% rename from boards/freedom-k66f/src/Makefile rename to boards/arm/freedom-k66f/src/Makefile diff --git a/boards/freedom-k66f/src/freedom-k66f.h b/boards/arm/freedom-k66f/src/freedom-k66f.h similarity index 98% rename from boards/freedom-k66f/src/freedom-k66f.h rename to boards/arm/freedom-k66f/src/freedom-k66f.h index 8d38dc7c9d..7a29c21210 100644 --- a/boards/freedom-k66f/src/freedom-k66f.h +++ b/boards/arm/freedom-k66f/src/freedom-k66f.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_FREEDOM_K66F_SRC_FREEDOM_K66F_H -#define __BOARDS_FREEDOM_K66F_SRC_FREEDOM_K66F_H +#ifndef __BOARDS_ARM_FREEDOM_K66F_SRC_FREEDOM_K66F_H +#define __BOARDS_ARM_FREEDOM_K66F_SRC_FREEDOM_K66F_H /************************************************************************************ * Included Files @@ -386,4 +386,4 @@ int k66_pwm_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_FREEDOM_K66F_SRC_FREEDOM_K66F_H */ +#endif /* __BOARDS_ARM_FREEDOM_K66F_SRC_FREEDOM_K66F_H */ diff --git a/boards/freedom-k66f/src/k66_appinit.c b/boards/arm/freedom-k66f/src/k66_appinit.c similarity index 100% rename from boards/freedom-k66f/src/k66_appinit.c rename to boards/arm/freedom-k66f/src/k66_appinit.c diff --git a/boards/freedom-k66f/src/k66_autoleds.c b/boards/arm/freedom-k66f/src/k66_autoleds.c similarity index 100% rename from boards/freedom-k66f/src/k66_autoleds.c rename to boards/arm/freedom-k66f/src/k66_autoleds.c diff --git a/boards/freedom-k66f/src/k66_automount.c b/boards/arm/freedom-k66f/src/k66_automount.c similarity index 100% rename from boards/freedom-k66f/src/k66_automount.c rename to boards/arm/freedom-k66f/src/k66_automount.c diff --git a/boards/freedom-k66f/src/k66_boot.c b/boards/arm/freedom-k66f/src/k66_boot.c similarity index 100% rename from boards/freedom-k66f/src/k66_boot.c rename to boards/arm/freedom-k66f/src/k66_boot.c diff --git a/boards/freedom-k66f/src/k66_bringup.c b/boards/arm/freedom-k66f/src/k66_bringup.c similarity index 100% rename from boards/freedom-k66f/src/k66_bringup.c rename to boards/arm/freedom-k66f/src/k66_bringup.c diff --git a/boards/freedom-k66f/src/k66_buttons.c b/boards/arm/freedom-k66f/src/k66_buttons.c similarity index 100% rename from boards/freedom-k66f/src/k66_buttons.c rename to boards/arm/freedom-k66f/src/k66_buttons.c diff --git a/boards/freedom-k66f/src/k66_pwm.c b/boards/arm/freedom-k66f/src/k66_pwm.c similarity index 100% rename from boards/freedom-k66f/src/k66_pwm.c rename to boards/arm/freedom-k66f/src/k66_pwm.c diff --git a/boards/freedom-k66f/src/k66_reset.c b/boards/arm/freedom-k66f/src/k66_reset.c similarity index 100% rename from boards/freedom-k66f/src/k66_reset.c rename to boards/arm/freedom-k66f/src/k66_reset.c diff --git a/boards/freedom-k66f/src/k66_rtc.c b/boards/arm/freedom-k66f/src/k66_rtc.c similarity index 100% rename from boards/freedom-k66f/src/k66_rtc.c rename to boards/arm/freedom-k66f/src/k66_rtc.c diff --git a/boards/freedom-k66f/src/k66_sdhc.c b/boards/arm/freedom-k66f/src/k66_sdhc.c similarity index 100% rename from boards/freedom-k66f/src/k66_sdhc.c rename to boards/arm/freedom-k66f/src/k66_sdhc.c diff --git a/boards/freedom-k66f/src/k66_spi.c b/boards/arm/freedom-k66f/src/k66_spi.c similarity index 100% rename from boards/freedom-k66f/src/k66_spi.c rename to boards/arm/freedom-k66f/src/k66_spi.c diff --git a/boards/freedom-k66f/src/k66_uid.c b/boards/arm/freedom-k66f/src/k66_uid.c similarity index 100% rename from boards/freedom-k66f/src/k66_uid.c rename to boards/arm/freedom-k66f/src/k66_uid.c diff --git a/boards/freedom-k66f/src/k66_usbdev.c b/boards/arm/freedom-k66f/src/k66_usbdev.c similarity index 100% rename from boards/freedom-k66f/src/k66_usbdev.c rename to boards/arm/freedom-k66f/src/k66_usbdev.c diff --git a/boards/freedom-k66f/src/k66_usbmsc.c b/boards/arm/freedom-k66f/src/k66_usbmsc.c similarity index 100% rename from boards/freedom-k66f/src/k66_usbmsc.c rename to boards/arm/freedom-k66f/src/k66_usbmsc.c diff --git a/boards/freedom-k66f/src/k66_userleds.c b/boards/arm/freedom-k66f/src/k66_userleds.c similarity index 100% rename from boards/freedom-k66f/src/k66_userleds.c rename to boards/arm/freedom-k66f/src/k66_userleds.c diff --git a/boards/freedom-kl25z/Kconfig b/boards/arm/freedom-kl25z/Kconfig similarity index 100% rename from boards/freedom-kl25z/Kconfig rename to boards/arm/freedom-kl25z/Kconfig diff --git a/boards/freedom-kl25z/README.txt b/boards/arm/freedom-kl25z/README.txt similarity index 100% rename from boards/freedom-kl25z/README.txt rename to boards/arm/freedom-kl25z/README.txt diff --git a/boards/freedom-kl25z/configs/nsh/defconfig b/boards/arm/freedom-kl25z/configs/nsh/defconfig similarity index 100% rename from boards/freedom-kl25z/configs/nsh/defconfig rename to boards/arm/freedom-kl25z/configs/nsh/defconfig diff --git a/boards/freedom-kl25z/include/board.h b/boards/arm/freedom-kl25z/include/board.h similarity index 100% rename from boards/freedom-kl25z/include/board.h rename to boards/arm/freedom-kl25z/include/board.h diff --git a/boards/freedom-kl25z/scripts/Make.defs b/boards/arm/freedom-kl25z/scripts/Make.defs similarity index 97% rename from boards/freedom-kl25z/scripts/Make.defs rename to boards/arm/freedom-kl25z/scripts/Make.defs index bbff3649d8..486f1cf359 100644 --- a/boards/freedom-kl25z/scripts/Make.defs +++ b/boards/arm/freedom-kl25z/scripts/Make.defs @@ -43,12 +43,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/freedom-kl25z/scripts/freedom-kl25z.ld b/boards/arm/freedom-kl25z/scripts/freedom-kl25z.ld similarity index 100% rename from boards/freedom-kl25z/scripts/freedom-kl25z.ld rename to boards/arm/freedom-kl25z/scripts/freedom-kl25z.ld diff --git a/boards/esp32-core/src/.gitignore b/boards/arm/freedom-kl25z/src/.gitignore similarity index 100% rename from boards/esp32-core/src/.gitignore rename to boards/arm/freedom-kl25z/src/.gitignore diff --git a/boards/freedom-kl25z/src/Makefile b/boards/arm/freedom-kl25z/src/Makefile similarity index 100% rename from boards/freedom-kl25z/src/Makefile rename to boards/arm/freedom-kl25z/src/Makefile diff --git a/boards/freedom-kl25z/src/freedom-kl25z.h b/boards/arm/freedom-kl25z/src/freedom-kl25z.h similarity index 97% rename from boards/freedom-kl25z/src/freedom-kl25z.h rename to boards/arm/freedom-kl25z/src/freedom-kl25z.h index 72be297669..4a759b4c13 100644 --- a/boards/freedom-kl25z/src/freedom-kl25z.h +++ b/boards/arm/freedom-kl25z/src/freedom-kl25z.h @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __BOARDS_FREEDOM_KL25Z_SRC_FREEDOM_KL25Z_H -#define __BOARDS_FREEDOM_KL25Z_SRC_FREEDOM_KL25Z_H +#ifndef __BOARDS_ARM_FREEDOM_KL25Z_SRC_FREEDOM_KL25Z_H +#define __BOARDS_ARM_FREEDOM_KL25Z_SRC_FREEDOM_KL25Z_H /**************************************************************************************************** * Included Files @@ -149,5 +149,5 @@ int kl_pwm_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_FREEDOM_KL25Z_SRC_FREEDOM_KL25Z_H */ +#endif /* __BOARDS_ARM_FREEDOM_KL25Z_SRC_FREEDOM_KL25Z_H */ diff --git a/boards/freedom-kl25z/src/kl_adxl345.c b/boards/arm/freedom-kl25z/src/kl_adxl345.c similarity index 100% rename from boards/freedom-kl25z/src/kl_adxl345.c rename to boards/arm/freedom-kl25z/src/kl_adxl345.c diff --git a/boards/freedom-kl25z/src/kl_appinit.c b/boards/arm/freedom-kl25z/src/kl_appinit.c similarity index 100% rename from boards/freedom-kl25z/src/kl_appinit.c rename to boards/arm/freedom-kl25z/src/kl_appinit.c diff --git a/boards/freedom-kl25z/src/kl_boardinitialize.c b/boards/arm/freedom-kl25z/src/kl_boardinitialize.c similarity index 100% rename from boards/freedom-kl25z/src/kl_boardinitialize.c rename to boards/arm/freedom-kl25z/src/kl_boardinitialize.c diff --git a/boards/freedom-kl25z/src/kl_led.c b/boards/arm/freedom-kl25z/src/kl_led.c similarity index 100% rename from boards/freedom-kl25z/src/kl_led.c rename to boards/arm/freedom-kl25z/src/kl_led.c diff --git a/boards/freedom-kl25z/src/kl_pwm.c b/boards/arm/freedom-kl25z/src/kl_pwm.c similarity index 100% rename from boards/freedom-kl25z/src/kl_pwm.c rename to boards/arm/freedom-kl25z/src/kl_pwm.c diff --git a/boards/freedom-kl25z/src/kl_spi.c b/boards/arm/freedom-kl25z/src/kl_spi.c similarity index 100% rename from boards/freedom-kl25z/src/kl_spi.c rename to boards/arm/freedom-kl25z/src/kl_spi.c diff --git a/boards/freedom-kl25z/src/kl_tsi.c b/boards/arm/freedom-kl25z/src/kl_tsi.c similarity index 100% rename from boards/freedom-kl25z/src/kl_tsi.c rename to boards/arm/freedom-kl25z/src/kl_tsi.c diff --git a/boards/freedom-kl26z/Kconfig b/boards/arm/freedom-kl26z/Kconfig similarity index 100% rename from boards/freedom-kl26z/Kconfig rename to boards/arm/freedom-kl26z/Kconfig diff --git a/boards/freedom-kl26z/README.txt b/boards/arm/freedom-kl26z/README.txt similarity index 100% rename from boards/freedom-kl26z/README.txt rename to boards/arm/freedom-kl26z/README.txt diff --git a/boards/freedom-kl26z/configs/nsh/defconfig b/boards/arm/freedom-kl26z/configs/nsh/defconfig similarity index 100% rename from boards/freedom-kl26z/configs/nsh/defconfig rename to boards/arm/freedom-kl26z/configs/nsh/defconfig diff --git a/boards/freedom-kl26z/include/board.h b/boards/arm/freedom-kl26z/include/board.h similarity index 98% rename from boards/freedom-kl26z/include/board.h rename to boards/arm/freedom-kl26z/include/board.h index 9ebb9b8bcc..135f1181fe 100644 --- a/boards/freedom-kl26z/include/board.h +++ b/boards/arm/freedom-kl26z/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_FREEDOME_KL26Z_BOARD_H -#define __BOARDS_FREEDOME_KL26Z_BOARD_H +#ifndef __BOARDS_ARM_FREEDOME_KL26Z_BOARD_H +#define __BOARDS_ARM_FREEDOME_KL26Z_BOARD_H /************************************************************************************ * Included Files @@ -256,4 +256,4 @@ void kl_tsi_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_FREEDOME_KL26Z_BOARD_H */ +#endif /* __BOARDS_ARM_FREEDOME_KL26Z_BOARD_H */ diff --git a/boards/freedom-kl26z/scripts/Make.defs b/boards/arm/freedom-kl26z/scripts/Make.defs similarity index 97% rename from boards/freedom-kl26z/scripts/Make.defs rename to boards/arm/freedom-kl26z/scripts/Make.defs index ded98704ce..35a3bba286 100644 --- a/boards/freedom-kl26z/scripts/Make.defs +++ b/boards/arm/freedom-kl26z/scripts/Make.defs @@ -43,12 +43,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/freedom-kl26z/scripts/freedom-kl26z.ld b/boards/arm/freedom-kl26z/scripts/freedom-kl26z.ld similarity index 100% rename from boards/freedom-kl26z/scripts/freedom-kl26z.ld rename to boards/arm/freedom-kl26z/scripts/freedom-kl26z.ld diff --git a/boards/fire-stm32v2/src/.gitignore b/boards/arm/freedom-kl26z/src/.gitignore similarity index 100% rename from boards/fire-stm32v2/src/.gitignore rename to boards/arm/freedom-kl26z/src/.gitignore diff --git a/boards/freedom-kl26z/src/Makefile b/boards/arm/freedom-kl26z/src/Makefile similarity index 100% rename from boards/freedom-kl26z/src/Makefile rename to boards/arm/freedom-kl26z/src/Makefile diff --git a/boards/freedom-kl26z/src/freedom-kl26z.h b/boards/arm/freedom-kl26z/src/freedom-kl26z.h similarity index 97% rename from boards/freedom-kl26z/src/freedom-kl26z.h rename to boards/arm/freedom-kl26z/src/freedom-kl26z.h index 19c2bf81ae..b338ce69d8 100644 --- a/boards/freedom-kl26z/src/freedom-kl26z.h +++ b/boards/arm/freedom-kl26z/src/freedom-kl26z.h @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __BOARDS_FREEDOM_KL26Z_SRC_FREEDOM_KL26Z_H -#define __BOARDS_FREEDOM_KL26Z_SRC_FREEDOM_KL26Z_H +#ifndef __BOARDS_ARM_FREEDOM_KL26Z_SRC_FREEDOM_KL26Z_H +#define __BOARDS_ARM_FREEDOM_KL26Z_SRC_FREEDOM_KL26Z_H /**************************************************************************************************** * Included Files @@ -149,4 +149,4 @@ int kl_pwm_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_FREEDOM_KL26Z_SRC_FREEDOM_KL26Z_H */ +#endif /* __BOARDS_ARM_FREEDOM_KL26Z_SRC_FREEDOM_KL26Z_H */ diff --git a/boards/freedom-kl26z/src/kl_appinit.c b/boards/arm/freedom-kl26z/src/kl_appinit.c similarity index 100% rename from boards/freedom-kl26z/src/kl_appinit.c rename to boards/arm/freedom-kl26z/src/kl_appinit.c diff --git a/boards/freedom-kl26z/src/kl_boardinitialize.c b/boards/arm/freedom-kl26z/src/kl_boardinitialize.c similarity index 100% rename from boards/freedom-kl26z/src/kl_boardinitialize.c rename to boards/arm/freedom-kl26z/src/kl_boardinitialize.c diff --git a/boards/freedom-kl26z/src/kl_led.c b/boards/arm/freedom-kl26z/src/kl_led.c similarity index 100% rename from boards/freedom-kl26z/src/kl_led.c rename to boards/arm/freedom-kl26z/src/kl_led.c diff --git a/boards/freedom-kl26z/src/kl_pwm.c b/boards/arm/freedom-kl26z/src/kl_pwm.c similarity index 100% rename from boards/freedom-kl26z/src/kl_pwm.c rename to boards/arm/freedom-kl26z/src/kl_pwm.c diff --git a/boards/freedom-kl26z/src/kl_spi.c b/boards/arm/freedom-kl26z/src/kl_spi.c similarity index 100% rename from boards/freedom-kl26z/src/kl_spi.c rename to boards/arm/freedom-kl26z/src/kl_spi.c diff --git a/boards/freedom-kl26z/src/kl_tsi.c b/boards/arm/freedom-kl26z/src/kl_tsi.c similarity index 100% rename from boards/freedom-kl26z/src/kl_tsi.c rename to boards/arm/freedom-kl26z/src/kl_tsi.c diff --git a/boards/hymini-stm32v/Kconfig b/boards/arm/hymini-stm32v/Kconfig similarity index 100% rename from boards/hymini-stm32v/Kconfig rename to boards/arm/hymini-stm32v/Kconfig diff --git a/boards/hymini-stm32v/README.txt b/boards/arm/hymini-stm32v/README.txt similarity index 100% rename from boards/hymini-stm32v/README.txt rename to boards/arm/hymini-stm32v/README.txt diff --git a/boards/hymini-stm32v/configs/nsh/defconfig b/boards/arm/hymini-stm32v/configs/nsh/defconfig similarity index 100% rename from boards/hymini-stm32v/configs/nsh/defconfig rename to boards/arm/hymini-stm32v/configs/nsh/defconfig diff --git a/boards/hymini-stm32v/configs/nsh2/defconfig b/boards/arm/hymini-stm32v/configs/nsh2/defconfig similarity index 100% rename from boards/hymini-stm32v/configs/nsh2/defconfig rename to boards/arm/hymini-stm32v/configs/nsh2/defconfig diff --git a/boards/hymini-stm32v/configs/usbmsc/defconfig b/boards/arm/hymini-stm32v/configs/usbmsc/defconfig similarity index 100% rename from boards/hymini-stm32v/configs/usbmsc/defconfig rename to boards/arm/hymini-stm32v/configs/usbmsc/defconfig diff --git a/boards/hymini-stm32v/configs/usbnsh/defconfig b/boards/arm/hymini-stm32v/configs/usbnsh/defconfig similarity index 100% rename from boards/hymini-stm32v/configs/usbnsh/defconfig rename to boards/arm/hymini-stm32v/configs/usbnsh/defconfig diff --git a/boards/hymini-stm32v/configs/usbserial/defconfig b/boards/arm/hymini-stm32v/configs/usbserial/defconfig similarity index 100% rename from boards/hymini-stm32v/configs/usbserial/defconfig rename to boards/arm/hymini-stm32v/configs/usbserial/defconfig diff --git a/boards/hymini-stm32v/include/board.h b/boards/arm/hymini-stm32v/include/board.h similarity index 97% rename from boards/hymini-stm32v/include/board.h rename to boards/arm/hymini-stm32v/include/board.h index 244d5f307b..f7e6c48170 100644 --- a/boards/hymini-stm32v/include/board.h +++ b/boards/arm/hymini-stm32v/include/board.h @@ -40,8 +40,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_HYMINI_STM32V_INCLUDE_BOARD_H -#define __BOARDS_HYMINI_STM32V_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_HYMINI_STM32V_INCLUDE_BOARD_H +#define __BOARDS_ARM_HYMINI_STM32V_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -175,4 +175,4 @@ #define BUTTON_KEYA_BIT (1 << BUTTON_KEYA) #define BUTTON_KEYB_BIT (1 << BUTTON_KEYB) -#endif /* __BOARDS_HYMINI_STM32V_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_HYMINI_STM32V_INCLUDE_BOARD_H */ diff --git a/boards/hymini-stm32v/scripts/Make.defs b/boards/arm/hymini-stm32v/scripts/Make.defs similarity index 96% rename from boards/hymini-stm32v/scripts/Make.defs rename to boards/arm/hymini-stm32v/scripts/Make.defs index 7519f4cd82..11f40fa8b9 100644 --- a/boards/hymini-stm32v/scripts/Make.defs +++ b/boards/arm/hymini-stm32v/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/hymini-stm32v/scripts/ld.script b/boards/arm/hymini-stm32v/scripts/ld.script similarity index 100% rename from boards/hymini-stm32v/scripts/ld.script rename to boards/arm/hymini-stm32v/scripts/ld.script diff --git a/boards/flipnclick-pic32mz/src/.gitignore b/boards/arm/hymini-stm32v/src/.gitignore similarity index 100% rename from boards/flipnclick-pic32mz/src/.gitignore rename to boards/arm/hymini-stm32v/src/.gitignore diff --git a/boards/hymini-stm32v/src/Makefile b/boards/arm/hymini-stm32v/src/Makefile similarity index 100% rename from boards/hymini-stm32v/src/Makefile rename to boards/arm/hymini-stm32v/src/Makefile diff --git a/boards/hymini-stm32v/src/hymini-stm32v.h b/boards/arm/hymini-stm32v/src/hymini-stm32v.h similarity index 98% rename from boards/hymini-stm32v/src/hymini-stm32v.h rename to boards/arm/hymini-stm32v/src/hymini-stm32v.h index bbd9ec1168..f0e213d28b 100644 --- a/boards/hymini-stm32v/src/hymini-stm32v.h +++ b/boards/arm/hymini-stm32v/src/hymini-stm32v.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_HYMINI_STM32V_H -#define __BOARDS_HYMINI_STM32V_H +#ifndef __BOARDS_ARM_HYMINI_STM32V_H +#define __BOARDS_ARM_HYMINI_STM32V_H /************************************************************************************ * Included Files @@ -159,5 +159,5 @@ int stm32_tsc_setup(int minor); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_HYMINI_STM32V_H */ +#endif /* __BOARDS_ARM_HYMINI_STM32V_H */ diff --git a/boards/hymini-stm32v/src/stm32_appinit.c b/boards/arm/hymini-stm32v/src/stm32_appinit.c similarity index 100% rename from boards/hymini-stm32v/src/stm32_appinit.c rename to boards/arm/hymini-stm32v/src/stm32_appinit.c diff --git a/boards/hymini-stm32v/src/stm32_boot.c b/boards/arm/hymini-stm32v/src/stm32_boot.c similarity index 100% rename from boards/hymini-stm32v/src/stm32_boot.c rename to boards/arm/hymini-stm32v/src/stm32_boot.c diff --git a/boards/hymini-stm32v/src/stm32_buttons.c b/boards/arm/hymini-stm32v/src/stm32_buttons.c similarity index 100% rename from boards/hymini-stm32v/src/stm32_buttons.c rename to boards/arm/hymini-stm32v/src/stm32_buttons.c diff --git a/boards/hymini-stm32v/src/stm32_leds.c b/boards/arm/hymini-stm32v/src/stm32_leds.c similarity index 100% rename from boards/hymini-stm32v/src/stm32_leds.c rename to boards/arm/hymini-stm32v/src/stm32_leds.c diff --git a/boards/hymini-stm32v/src/stm32_r61505u.c b/boards/arm/hymini-stm32v/src/stm32_r61505u.c similarity index 100% rename from boards/hymini-stm32v/src/stm32_r61505u.c rename to boards/arm/hymini-stm32v/src/stm32_r61505u.c diff --git a/boards/hymini-stm32v/src/stm32_spi.c b/boards/arm/hymini-stm32v/src/stm32_spi.c similarity index 100% rename from boards/hymini-stm32v/src/stm32_spi.c rename to boards/arm/hymini-stm32v/src/stm32_spi.c diff --git a/boards/hymini-stm32v/src/stm32_ssd1289.c b/boards/arm/hymini-stm32v/src/stm32_ssd1289.c similarity index 100% rename from boards/hymini-stm32v/src/stm32_ssd1289.c rename to boards/arm/hymini-stm32v/src/stm32_ssd1289.c diff --git a/boards/hymini-stm32v/src/stm32_ts.c b/boards/arm/hymini-stm32v/src/stm32_ts.c similarity index 100% rename from boards/hymini-stm32v/src/stm32_ts.c rename to boards/arm/hymini-stm32v/src/stm32_ts.c diff --git a/boards/hymini-stm32v/src/stm32_usbdev.c b/boards/arm/hymini-stm32v/src/stm32_usbdev.c similarity index 100% rename from boards/hymini-stm32v/src/stm32_usbdev.c rename to boards/arm/hymini-stm32v/src/stm32_usbdev.c diff --git a/boards/hymini-stm32v/src/stm32_usbmsc.c b/boards/arm/hymini-stm32v/src/stm32_usbmsc.c similarity index 100% rename from boards/hymini-stm32v/src/stm32_usbmsc.c rename to boards/arm/hymini-stm32v/src/stm32_usbmsc.c diff --git a/boards/imxrt1050-evk/Kconfig b/boards/arm/imxrt1050-evk/Kconfig similarity index 100% rename from boards/imxrt1050-evk/Kconfig rename to boards/arm/imxrt1050-evk/Kconfig diff --git a/boards/imxrt1050-evk/README.txt b/boards/arm/imxrt1050-evk/README.txt similarity index 100% rename from boards/imxrt1050-evk/README.txt rename to boards/arm/imxrt1050-evk/README.txt diff --git a/boards/imxrt1050-evk/configs/knsh/Make.defs b/boards/arm/imxrt1050-evk/configs/knsh/Make.defs similarity index 94% rename from boards/imxrt1050-evk/configs/knsh/Make.defs rename to boards/arm/imxrt1050-evk/configs/knsh/Make.defs index 7f6c937d7d..0c24e2b76b 100644 --- a/boards/imxrt1050-evk/configs/knsh/Make.defs +++ b/boards/arm/imxrt1050-evk/configs/knsh/Make.defs @@ -47,15 +47,15 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) - ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) + ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) endif CC = $(CROSSDEV)gcc diff --git a/boards/imxrt1050-evk/configs/knsh/defconfig b/boards/arm/imxrt1050-evk/configs/knsh/defconfig similarity index 100% rename from boards/imxrt1050-evk/configs/knsh/defconfig rename to boards/arm/imxrt1050-evk/configs/knsh/defconfig diff --git a/boards/imxrt1050-evk/configs/libcxxtest/Make.defs b/boards/arm/imxrt1050-evk/configs/libcxxtest/Make.defs similarity index 97% rename from boards/imxrt1050-evk/configs/libcxxtest/Make.defs rename to boards/arm/imxrt1050-evk/configs/libcxxtest/Make.defs index 154aace583..539f0f0c2e 100644 --- a/boards/imxrt1050-evk/configs/libcxxtest/Make.defs +++ b/boards/arm/imxrt1050-evk/configs/libcxxtest/Make.defs @@ -67,13 +67,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx -isystem $(TOPDIR)/include/libcxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) diff --git a/boards/imxrt1050-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt1050-evk/configs/libcxxtest/defconfig similarity index 100% rename from boards/imxrt1050-evk/configs/libcxxtest/defconfig rename to boards/arm/imxrt1050-evk/configs/libcxxtest/defconfig diff --git a/boards/imxrt1050-evk/configs/netnsh/defconfig b/boards/arm/imxrt1050-evk/configs/netnsh/defconfig similarity index 100% rename from boards/imxrt1050-evk/configs/netnsh/defconfig rename to boards/arm/imxrt1050-evk/configs/netnsh/defconfig diff --git a/boards/imxrt1050-evk/configs/nsh/defconfig b/boards/arm/imxrt1050-evk/configs/nsh/defconfig similarity index 100% rename from boards/imxrt1050-evk/configs/nsh/defconfig rename to boards/arm/imxrt1050-evk/configs/nsh/defconfig diff --git a/boards/imxrt1050-evk/include/board.h b/boards/arm/imxrt1050-evk/include/board.h similarity index 98% rename from boards/imxrt1050-evk/include/board.h rename to boards/arm/imxrt1050-evk/include/board.h index 3fccdafe66..60b03c784a 100644 --- a/boards/imxrt1050-evk/include/board.h +++ b/boards/arm/imxrt1050-evk/include/board.h @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_IMXRT1050_EVK_INCLUDE_BOARD_H -#define __BOARDS_IMXRT1050_EVK_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_IMXRT1050_EVK_INCLUDE_BOARD_H +#define __BOARDS_ARM_IMXRT1050_EVK_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -290,4 +290,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_IMXRT1050_EVK_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_IMXRT1050_EVK_INCLUDE_BOARD_H */ diff --git a/boards/imxrt1050-evk/kernel/.gitignore b/boards/arm/imxrt1050-evk/kernel/.gitignore similarity index 100% rename from boards/imxrt1050-evk/kernel/.gitignore rename to boards/arm/imxrt1050-evk/kernel/.gitignore diff --git a/boards/imxrt1050-evk/kernel/Makefile b/boards/arm/imxrt1050-evk/kernel/Makefile similarity index 100% rename from boards/imxrt1050-evk/kernel/Makefile rename to boards/arm/imxrt1050-evk/kernel/Makefile diff --git a/boards/imxrt1050-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt1050-evk/kernel/imxrt_userspace.c similarity index 100% rename from boards/imxrt1050-evk/kernel/imxrt_userspace.c rename to boards/arm/imxrt1050-evk/kernel/imxrt_userspace.c diff --git a/boards/imxrt1050-evk/scripts/Make.defs b/boards/arm/imxrt1050-evk/scripts/Make.defs similarity index 97% rename from boards/imxrt1050-evk/scripts/Make.defs rename to boards/arm/imxrt1050-evk/scripts/Make.defs index 25168f3c30..449264185c 100644 --- a/boards/imxrt1050-evk/scripts/Make.defs +++ b/boards/arm/imxrt1050-evk/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/imxrt1050-evk/scripts/flash-ocram.ld b/boards/arm/imxrt1050-evk/scripts/flash-ocram.ld similarity index 100% rename from boards/imxrt1050-evk/scripts/flash-ocram.ld rename to boards/arm/imxrt1050-evk/scripts/flash-ocram.ld diff --git a/boards/imxrt1050-evk/scripts/kernel-space.ld b/boards/arm/imxrt1050-evk/scripts/kernel-space.ld similarity index 100% rename from boards/imxrt1050-evk/scripts/kernel-space.ld rename to boards/arm/imxrt1050-evk/scripts/kernel-space.ld diff --git a/boards/imxrt1050-evk/scripts/memory.ld b/boards/arm/imxrt1050-evk/scripts/memory.ld similarity index 100% rename from boards/imxrt1050-evk/scripts/memory.ld rename to boards/arm/imxrt1050-evk/scripts/memory.ld diff --git a/boards/imxrt1050-evk/scripts/user-space.ld b/boards/arm/imxrt1050-evk/scripts/user-space.ld similarity index 100% rename from boards/imxrt1050-evk/scripts/user-space.ld rename to boards/arm/imxrt1050-evk/scripts/user-space.ld diff --git a/boards/imxrt1050-evk/src/Makefile b/boards/arm/imxrt1050-evk/src/Makefile similarity index 100% rename from boards/imxrt1050-evk/src/Makefile rename to boards/arm/imxrt1050-evk/src/Makefile diff --git a/boards/imxrt1050-evk/src/imxrt1050-evk.h b/boards/arm/imxrt1050-evk/src/imxrt1050-evk.h similarity index 98% rename from boards/imxrt1050-evk/src/imxrt1050-evk.h rename to boards/arm/imxrt1050-evk/src/imxrt1050-evk.h index 00135d2da2..14845e52cf 100644 --- a/boards/imxrt1050-evk/src/imxrt1050-evk.h +++ b/boards/arm/imxrt1050-evk/src/imxrt1050-evk.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_IMXRT1050_EVK_SRC_IMXRT1050_EVK_H -#define __BOARDS_IMXRT1050_EVK_SRC_IMXRT1050_EVK_H +#ifndef __BOARDS_ARM_IMXRT1050_EVK_SRC_IMXRT1050_EVK_H +#define __BOARDS_ARM_IMXRT1050_EVK_SRC_IMXRT1050_EVK_H /**************************************************************************** * Included Files @@ -253,4 +253,4 @@ int imxrt_gpio_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_IMXRT1050_EVK_SRC_IMXRT1050_EVK_H */ +#endif /* __BOARDS_ARM_IMXRT1050_EVK_SRC_IMXRT1050_EVK_H */ diff --git a/boards/imxrt1050-evk/src/imxrt_appinit.c b/boards/arm/imxrt1050-evk/src/imxrt_appinit.c similarity index 100% rename from boards/imxrt1050-evk/src/imxrt_appinit.c rename to boards/arm/imxrt1050-evk/src/imxrt_appinit.c diff --git a/boards/imxrt1050-evk/src/imxrt_autoleds.c b/boards/arm/imxrt1050-evk/src/imxrt_autoleds.c similarity index 100% rename from boards/imxrt1050-evk/src/imxrt_autoleds.c rename to boards/arm/imxrt1050-evk/src/imxrt_autoleds.c diff --git a/boards/imxrt1050-evk/src/imxrt_boot.c b/boards/arm/imxrt1050-evk/src/imxrt_boot.c similarity index 100% rename from boards/imxrt1050-evk/src/imxrt_boot.c rename to boards/arm/imxrt1050-evk/src/imxrt_boot.c diff --git a/boards/imxrt1050-evk/src/imxrt_bringup.c b/boards/arm/imxrt1050-evk/src/imxrt_bringup.c similarity index 100% rename from boards/imxrt1050-evk/src/imxrt_bringup.c rename to boards/arm/imxrt1050-evk/src/imxrt_bringup.c diff --git a/boards/imxrt1050-evk/src/imxrt_buttons.c b/boards/arm/imxrt1050-evk/src/imxrt_buttons.c similarity index 100% rename from boards/imxrt1050-evk/src/imxrt_buttons.c rename to boards/arm/imxrt1050-evk/src/imxrt_buttons.c diff --git a/boards/imxrt1050-evk/src/imxrt_ethernet.c b/boards/arm/imxrt1050-evk/src/imxrt_ethernet.c similarity index 100% rename from boards/imxrt1050-evk/src/imxrt_ethernet.c rename to boards/arm/imxrt1050-evk/src/imxrt_ethernet.c diff --git a/boards/imxrt1050-evk/src/imxrt_flexspi_nor_boot.c b/boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_boot.c similarity index 100% rename from boards/imxrt1050-evk/src/imxrt_flexspi_nor_boot.c rename to boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_boot.c diff --git a/boards/imxrt1050-evk/src/imxrt_flexspi_nor_boot.h b/boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_boot.h similarity index 96% rename from boards/imxrt1050-evk/src/imxrt_flexspi_nor_boot.h rename to boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_boot.h index 7c827fccc7..8282be7b4b 100644 --- a/boards/imxrt1050-evk/src/imxrt_flexspi_nor_boot.h +++ b/boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_boot.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H -#define __BOARDS_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H +#ifndef __BOARDS_ARM_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H +#define __BOARDS_ARM_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H /**************************************************************************** * Included Files @@ -154,4 +154,4 @@ extern const struct boot_data_s g_boot_data; extern const uint8_t g_dcd_data[]; #endif -#endif /* __BOARDS_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H */ +#endif /* __BOARDS_ARM_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H */ diff --git a/boards/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c b/boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c similarity index 100% rename from boards/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c rename to boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c diff --git a/boards/imxrt1050-evk/src/imxrt_flexspi_nor_flash.h b/boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_flash.h similarity index 98% rename from boards/imxrt1050-evk/src/imxrt_flexspi_nor_flash.h rename to boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_flash.h index 366799649f..1c46da6b14 100644 --- a/boards/imxrt1050-evk/src/imxrt_flexspi_nor_flash.h +++ b/boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_flash.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H -#define __BOARDS_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H +#ifndef __BOARDS_ARM_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H +#define __BOARDS_ARM_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H /**************************************************************************** * Included Files @@ -355,4 +355,4 @@ struct flexspi_nor_config_s uint32_t reserve2[11]; /* Reserved for future use */ }; -#endif /* __BOARDS_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H */ +#endif /* __BOARDS_ARM_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H */ diff --git a/boards/imxrt1050-evk/src/imxrt_gpio.c b/boards/arm/imxrt1050-evk/src/imxrt_gpio.c similarity index 100% rename from boards/imxrt1050-evk/src/imxrt_gpio.c rename to boards/arm/imxrt1050-evk/src/imxrt_gpio.c diff --git a/boards/imxrt1050-evk/src/imxrt_lcd.c b/boards/arm/imxrt1050-evk/src/imxrt_lcd.c similarity index 100% rename from boards/imxrt1050-evk/src/imxrt_lcd.c rename to boards/arm/imxrt1050-evk/src/imxrt_lcd.c diff --git a/boards/imxrt1050-evk/src/imxrt_mmcsd_spi.c b/boards/arm/imxrt1050-evk/src/imxrt_mmcsd_spi.c similarity index 100% rename from boards/imxrt1050-evk/src/imxrt_mmcsd_spi.c rename to boards/arm/imxrt1050-evk/src/imxrt_mmcsd_spi.c diff --git a/boards/imxrt1050-evk/src/imxrt_sdram_ini_dcd.c b/boards/arm/imxrt1050-evk/src/imxrt_sdram_ini_dcd.c similarity index 100% rename from boards/imxrt1050-evk/src/imxrt_sdram_ini_dcd.c rename to boards/arm/imxrt1050-evk/src/imxrt_sdram_ini_dcd.c diff --git a/boards/imxrt1050-evk/src/imxrt_spi.c b/boards/arm/imxrt1050-evk/src/imxrt_spi.c similarity index 100% rename from boards/imxrt1050-evk/src/imxrt_spi.c rename to boards/arm/imxrt1050-evk/src/imxrt_spi.c diff --git a/boards/imxrt1050-evk/src/imxrt_userleds.c b/boards/arm/imxrt1050-evk/src/imxrt_userleds.c similarity index 100% rename from boards/imxrt1050-evk/src/imxrt_userleds.c rename to boards/arm/imxrt1050-evk/src/imxrt_userleds.c diff --git a/boards/imxrt1060-evk/Kconfig b/boards/arm/imxrt1060-evk/Kconfig similarity index 100% rename from boards/imxrt1060-evk/Kconfig rename to boards/arm/imxrt1060-evk/Kconfig diff --git a/boards/imxrt1060-evk/README.txt b/boards/arm/imxrt1060-evk/README.txt similarity index 100% rename from boards/imxrt1060-evk/README.txt rename to boards/arm/imxrt1060-evk/README.txt diff --git a/boards/imxrt1060-evk/configs/knsh/Make.defs b/boards/arm/imxrt1060-evk/configs/knsh/Make.defs similarity index 94% rename from boards/imxrt1060-evk/configs/knsh/Make.defs rename to boards/arm/imxrt1060-evk/configs/knsh/Make.defs index 07274c6d49..b0c716fc59 100644 --- a/boards/imxrt1060-evk/configs/knsh/Make.defs +++ b/boards/arm/imxrt1060-evk/configs/knsh/Make.defs @@ -47,15 +47,15 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) - ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) + ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) endif CC = $(CROSSDEV)gcc diff --git a/boards/imxrt1060-evk/configs/knsh/defconfig b/boards/arm/imxrt1060-evk/configs/knsh/defconfig similarity index 100% rename from boards/imxrt1060-evk/configs/knsh/defconfig rename to boards/arm/imxrt1060-evk/configs/knsh/defconfig diff --git a/boards/imxrt1060-evk/configs/libcxxtest/Make.defs b/boards/arm/imxrt1060-evk/configs/libcxxtest/Make.defs similarity index 97% rename from boards/imxrt1060-evk/configs/libcxxtest/Make.defs rename to boards/arm/imxrt1060-evk/configs/libcxxtest/Make.defs index 5e024a0ece..c0e82c3db4 100644 --- a/boards/imxrt1060-evk/configs/libcxxtest/Make.defs +++ b/boards/arm/imxrt1060-evk/configs/libcxxtest/Make.defs @@ -67,13 +67,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx -isystem $(TOPDIR)/include/libcxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) diff --git a/boards/imxrt1060-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt1060-evk/configs/libcxxtest/defconfig similarity index 100% rename from boards/imxrt1060-evk/configs/libcxxtest/defconfig rename to boards/arm/imxrt1060-evk/configs/libcxxtest/defconfig diff --git a/boards/imxrt1060-evk/configs/netnsh/defconfig b/boards/arm/imxrt1060-evk/configs/netnsh/defconfig similarity index 100% rename from boards/imxrt1060-evk/configs/netnsh/defconfig rename to boards/arm/imxrt1060-evk/configs/netnsh/defconfig diff --git a/boards/imxrt1060-evk/configs/nsh/defconfig b/boards/arm/imxrt1060-evk/configs/nsh/defconfig similarity index 100% rename from boards/imxrt1060-evk/configs/nsh/defconfig rename to boards/arm/imxrt1060-evk/configs/nsh/defconfig diff --git a/boards/imxrt1060-evk/include/board.h b/boards/arm/imxrt1060-evk/include/board.h similarity index 98% rename from boards/imxrt1060-evk/include/board.h rename to boards/arm/imxrt1060-evk/include/board.h index d88335f8ee..9c81032948 100644 --- a/boards/imxrt1060-evk/include/board.h +++ b/boards/arm/imxrt1060-evk/include/board.h @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_IMXRT1060_EVK_INCLUDE_BOARD_H -#define __BOARDS_IMXRT1060_EVK_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_IMXRT1060_EVK_INCLUDE_BOARD_H +#define __BOARDS_ARM_IMXRT1060_EVK_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -282,4 +282,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_IMXRT1060_EVK_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_IMXRT1060_EVK_INCLUDE_BOARD_H */ diff --git a/boards/imxrt1060-evk/kernel/.gitignore b/boards/arm/imxrt1060-evk/kernel/.gitignore similarity index 100% rename from boards/imxrt1060-evk/kernel/.gitignore rename to boards/arm/imxrt1060-evk/kernel/.gitignore diff --git a/boards/imxrt1060-evk/kernel/Makefile b/boards/arm/imxrt1060-evk/kernel/Makefile similarity index 100% rename from boards/imxrt1060-evk/kernel/Makefile rename to boards/arm/imxrt1060-evk/kernel/Makefile diff --git a/boards/imxrt1060-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt1060-evk/kernel/imxrt_userspace.c similarity index 100% rename from boards/imxrt1060-evk/kernel/imxrt_userspace.c rename to boards/arm/imxrt1060-evk/kernel/imxrt_userspace.c diff --git a/boards/imxrt1060-evk/scripts/Make.defs b/boards/arm/imxrt1060-evk/scripts/Make.defs similarity index 97% rename from boards/imxrt1060-evk/scripts/Make.defs rename to boards/arm/imxrt1060-evk/scripts/Make.defs index dc89879a8e..28f5680dbf 100644 --- a/boards/imxrt1060-evk/scripts/Make.defs +++ b/boards/arm/imxrt1060-evk/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/imxrt1060-evk/scripts/flash-ocram.ld b/boards/arm/imxrt1060-evk/scripts/flash-ocram.ld similarity index 100% rename from boards/imxrt1060-evk/scripts/flash-ocram.ld rename to boards/arm/imxrt1060-evk/scripts/flash-ocram.ld diff --git a/boards/imxrt1060-evk/scripts/kernel-space.ld b/boards/arm/imxrt1060-evk/scripts/kernel-space.ld similarity index 100% rename from boards/imxrt1060-evk/scripts/kernel-space.ld rename to boards/arm/imxrt1060-evk/scripts/kernel-space.ld diff --git a/boards/imxrt1060-evk/scripts/memory.ld b/boards/arm/imxrt1060-evk/scripts/memory.ld similarity index 100% rename from boards/imxrt1060-evk/scripts/memory.ld rename to boards/arm/imxrt1060-evk/scripts/memory.ld diff --git a/boards/imxrt1060-evk/scripts/user-space.ld b/boards/arm/imxrt1060-evk/scripts/user-space.ld similarity index 100% rename from boards/imxrt1060-evk/scripts/user-space.ld rename to boards/arm/imxrt1060-evk/scripts/user-space.ld diff --git a/boards/imxrt1060-evk/src/Makefile b/boards/arm/imxrt1060-evk/src/Makefile similarity index 100% rename from boards/imxrt1060-evk/src/Makefile rename to boards/arm/imxrt1060-evk/src/Makefile diff --git a/boards/imxrt1060-evk/src/imxrt1060-evk.h b/boards/arm/imxrt1060-evk/src/imxrt1060-evk.h similarity index 97% rename from boards/imxrt1060-evk/src/imxrt1060-evk.h rename to boards/arm/imxrt1060-evk/src/imxrt1060-evk.h index 44046ebf48..c14c3f105f 100644 --- a/boards/imxrt1060-evk/src/imxrt1060-evk.h +++ b/boards/arm/imxrt1060-evk/src/imxrt1060-evk.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_IMXRT1060_EVK_SRC_IMXRT1060_EVK_H -#define __BOARDS_IMXRT1060_EVK_SRC_IMXRT1060_EVK_H +#ifndef __BOARDS_ARM_IMXRT1060_EVK_SRC_IMXRT1060_EVK_H +#define __BOARDS_ARM_IMXRT1060_EVK_SRC_IMXRT1060_EVK_H /**************************************************************************** * Included Files @@ -211,4 +211,4 @@ void imxrt_autoled_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_IMXRT1060_EVK_SRC_IMXRT1060_EVK_H */ +#endif /* __BOARDS_ARM_IMXRT1060_EVK_SRC_IMXRT1060_EVK_H */ diff --git a/boards/imxrt1060-evk/src/imxrt_appinit.c b/boards/arm/imxrt1060-evk/src/imxrt_appinit.c similarity index 100% rename from boards/imxrt1060-evk/src/imxrt_appinit.c rename to boards/arm/imxrt1060-evk/src/imxrt_appinit.c diff --git a/boards/imxrt1060-evk/src/imxrt_autoleds.c b/boards/arm/imxrt1060-evk/src/imxrt_autoleds.c similarity index 100% rename from boards/imxrt1060-evk/src/imxrt_autoleds.c rename to boards/arm/imxrt1060-evk/src/imxrt_autoleds.c diff --git a/boards/imxrt1060-evk/src/imxrt_boot.c b/boards/arm/imxrt1060-evk/src/imxrt_boot.c similarity index 100% rename from boards/imxrt1060-evk/src/imxrt_boot.c rename to boards/arm/imxrt1060-evk/src/imxrt_boot.c diff --git a/boards/imxrt1060-evk/src/imxrt_bringup.c b/boards/arm/imxrt1060-evk/src/imxrt_bringup.c similarity index 100% rename from boards/imxrt1060-evk/src/imxrt_bringup.c rename to boards/arm/imxrt1060-evk/src/imxrt_bringup.c diff --git a/boards/imxrt1060-evk/src/imxrt_buttons.c b/boards/arm/imxrt1060-evk/src/imxrt_buttons.c similarity index 100% rename from boards/imxrt1060-evk/src/imxrt_buttons.c rename to boards/arm/imxrt1060-evk/src/imxrt_buttons.c diff --git a/boards/imxrt1060-evk/src/imxrt_ethernet.c b/boards/arm/imxrt1060-evk/src/imxrt_ethernet.c similarity index 100% rename from boards/imxrt1060-evk/src/imxrt_ethernet.c rename to boards/arm/imxrt1060-evk/src/imxrt_ethernet.c diff --git a/boards/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c b/boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c similarity index 100% rename from boards/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c rename to boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c diff --git a/boards/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h b/boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h similarity index 96% rename from boards/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h rename to boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h index 987708f1af..8f43a9d97e 100644 --- a/boards/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h +++ b/boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H -#define __BOARDS_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H +#ifndef __BOARDS_ARM_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H +#define __BOARDS_ARM_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H /**************************************************************************** * Included Files @@ -146,4 +146,4 @@ struct boot_data_s extern const struct boot_data_s g_boot_data; -#endif /* __BOARDS_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H */ +#endif /* __BOARDS_ARM_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H */ diff --git a/boards/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c b/boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c similarity index 100% rename from boards/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c rename to boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c diff --git a/boards/imxrt1060-evk/src/imxrt_flexspi_nor_flash.h b/boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_flash.h similarity index 98% rename from boards/imxrt1060-evk/src/imxrt_flexspi_nor_flash.h rename to boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_flash.h index 48169c487c..0c3ee2e1f3 100644 --- a/boards/imxrt1060-evk/src/imxrt_flexspi_nor_flash.h +++ b/boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_flash.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H -#define __BOARDS_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H +#ifndef __BOARDS_ARM_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H +#define __BOARDS_ARM_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H /**************************************************************************** * Included Files @@ -356,4 +356,4 @@ struct flexspi_nor_config_s uint32_t reserve2[11]; /* Reserved for future use */ }; -#endif /* __BOARDS_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H */ +#endif /* __BOARDS_ARM_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H */ diff --git a/boards/imxrt1060-evk/src/imxrt_mmcsd_spi.c b/boards/arm/imxrt1060-evk/src/imxrt_mmcsd_spi.c similarity index 100% rename from boards/imxrt1060-evk/src/imxrt_mmcsd_spi.c rename to boards/arm/imxrt1060-evk/src/imxrt_mmcsd_spi.c diff --git a/boards/imxrt1060-evk/src/imxrt_spi.c b/boards/arm/imxrt1060-evk/src/imxrt_spi.c similarity index 100% rename from boards/imxrt1060-evk/src/imxrt_spi.c rename to boards/arm/imxrt1060-evk/src/imxrt_spi.c diff --git a/boards/imxrt1060-evk/src/imxrt_userleds.c b/boards/arm/imxrt1060-evk/src/imxrt_userleds.c similarity index 100% rename from boards/imxrt1060-evk/src/imxrt_userleds.c rename to boards/arm/imxrt1060-evk/src/imxrt_userleds.c diff --git a/boards/kwikstik-k40/Kconfig b/boards/arm/kwikstik-k40/Kconfig similarity index 100% rename from boards/kwikstik-k40/Kconfig rename to boards/arm/kwikstik-k40/Kconfig diff --git a/boards/kwikstik-k40/README.txt b/boards/arm/kwikstik-k40/README.txt similarity index 100% rename from boards/kwikstik-k40/README.txt rename to boards/arm/kwikstik-k40/README.txt diff --git a/boards/kwikstik-k40/configs/ostest/defconfig b/boards/arm/kwikstik-k40/configs/ostest/defconfig similarity index 100% rename from boards/kwikstik-k40/configs/ostest/defconfig rename to boards/arm/kwikstik-k40/configs/ostest/defconfig diff --git a/boards/kwikstik-k40/include/board.h b/boards/arm/kwikstik-k40/include/board.h similarity index 100% rename from boards/kwikstik-k40/include/board.h rename to boards/arm/kwikstik-k40/include/board.h diff --git a/boards/kwikstik-k40/scripts/Make.defs b/boards/arm/kwikstik-k40/scripts/Make.defs similarity index 96% rename from boards/kwikstik-k40/scripts/Make.defs rename to boards/arm/kwikstik-k40/scripts/Make.defs index ec62619f91..51cff8f790 100644 --- a/boards/kwikstik-k40/scripts/Make.defs +++ b/boards/arm/kwikstik-k40/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/kwikstik-k40.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/kwikstik-k40.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/kwikstik-k40.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/kwikstik-k40.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/kwikstik-k40/scripts/kwikstik-k40.ld b/boards/arm/kwikstik-k40/scripts/kwikstik-k40.ld similarity index 100% rename from boards/kwikstik-k40/scripts/kwikstik-k40.ld rename to boards/arm/kwikstik-k40/scripts/kwikstik-k40.ld diff --git a/boards/flipnclick-sam3x/src/.gitignore b/boards/arm/kwikstik-k40/src/.gitignore similarity index 100% rename from boards/flipnclick-sam3x/src/.gitignore rename to boards/arm/kwikstik-k40/src/.gitignore diff --git a/boards/kwikstik-k40/src/Makefile b/boards/arm/kwikstik-k40/src/Makefile similarity index 100% rename from boards/kwikstik-k40/src/Makefile rename to boards/arm/kwikstik-k40/src/Makefile diff --git a/boards/kwikstik-k40/src/k40_appinit.c b/boards/arm/kwikstik-k40/src/k40_appinit.c similarity index 100% rename from boards/kwikstik-k40/src/k40_appinit.c rename to boards/arm/kwikstik-k40/src/k40_appinit.c diff --git a/boards/kwikstik-k40/src/k40_boot.c b/boards/arm/kwikstik-k40/src/k40_boot.c similarity index 100% rename from boards/kwikstik-k40/src/k40_boot.c rename to boards/arm/kwikstik-k40/src/k40_boot.c diff --git a/boards/kwikstik-k40/src/k40_buttons.c b/boards/arm/kwikstik-k40/src/k40_buttons.c similarity index 100% rename from boards/kwikstik-k40/src/k40_buttons.c rename to boards/arm/kwikstik-k40/src/k40_buttons.c diff --git a/boards/kwikstik-k40/src/k40_lcd.c b/boards/arm/kwikstik-k40/src/k40_lcd.c similarity index 100% rename from boards/kwikstik-k40/src/k40_lcd.c rename to boards/arm/kwikstik-k40/src/k40_lcd.c diff --git a/boards/kwikstik-k40/src/k40_leds.c b/boards/arm/kwikstik-k40/src/k40_leds.c similarity index 100% rename from boards/kwikstik-k40/src/k40_leds.c rename to boards/arm/kwikstik-k40/src/k40_leds.c diff --git a/boards/kwikstik-k40/src/k40_spi.c b/boards/arm/kwikstik-k40/src/k40_spi.c similarity index 100% rename from boards/kwikstik-k40/src/k40_spi.c rename to boards/arm/kwikstik-k40/src/k40_spi.c diff --git a/boards/kwikstik-k40/src/k40_usbdev.c b/boards/arm/kwikstik-k40/src/k40_usbdev.c similarity index 100% rename from boards/kwikstik-k40/src/k40_usbdev.c rename to boards/arm/kwikstik-k40/src/k40_usbdev.c diff --git a/boards/kwikstik-k40/src/k40_usbmsc.c b/boards/arm/kwikstik-k40/src/k40_usbmsc.c similarity index 100% rename from boards/kwikstik-k40/src/k40_usbmsc.c rename to boards/arm/kwikstik-k40/src/k40_usbmsc.c diff --git a/boards/kwikstik-k40/src/kwikstik-k40.h b/boards/arm/kwikstik-k40/src/kwikstik-k40.h similarity index 98% rename from boards/kwikstik-k40/src/kwikstik-k40.h rename to boards/arm/kwikstik-k40/src/kwikstik-k40.h index e21d5ed4c6..7165864ea0 100644 --- a/boards/kwikstik-k40/src/kwikstik-k40.h +++ b/boards/arm/kwikstik-k40/src/kwikstik-k40.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_KWIKSTK_K40_SRC_KWIKSTIK_H -#define __BOARDS_KWIKSTK_K40_SRC_KWIKSTIK_H +#ifndef __BOARDS_ARM_KWIKSTK_K40_SRC_KWIKSTIK_H +#define __BOARDS_ARM_KWIKSTK_K40_SRC_KWIKSTIK_H /************************************************************************************ * Included Files @@ -180,5 +180,5 @@ extern void weak_function kinetis_spidev_initialize(void); extern void weak_function kinetis_usbinitialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_KWIKSTK_K40_SRC_KWIKSTIK_H */ +#endif /* __BOARDS_ARM_KWIKSTK_K40_SRC_KWIKSTIK_H */ diff --git a/boards/launchxl-cc1310/Kconfig b/boards/arm/launchxl-cc1310/Kconfig similarity index 100% rename from boards/launchxl-cc1310/Kconfig rename to boards/arm/launchxl-cc1310/Kconfig diff --git a/boards/launchxl-cc1310/README.txt b/boards/arm/launchxl-cc1310/README.txt similarity index 100% rename from boards/launchxl-cc1310/README.txt rename to boards/arm/launchxl-cc1310/README.txt diff --git a/boards/launchxl-cc1310/configs/nsh/defconfig b/boards/arm/launchxl-cc1310/configs/nsh/defconfig similarity index 100% rename from boards/launchxl-cc1310/configs/nsh/defconfig rename to boards/arm/launchxl-cc1310/configs/nsh/defconfig diff --git a/boards/launchxl-cc1310/include/board.h b/boards/arm/launchxl-cc1310/include/board.h similarity index 97% rename from boards/launchxl-cc1310/include/board.h rename to boards/arm/launchxl-cc1310/include/board.h index 525006886b..a79bf50a39 100644 --- a/boards/launchxl-cc1310/include/board.h +++ b/boards/arm/launchxl-cc1310/include/board.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_LAUNCH_CC1310_INCLUDE_BOARD_H -#define __CONFIG_LAUNCH_CC1310_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_LAUNCH_CC1310_INCLUDE_BOARD_H +#define __BOARDS_ARM_LAUNCH_CC1310_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -148,4 +148,4 @@ extern const struct cc13xx_pinconfig_s g_gpio_uart0_rx; extern const struct cc13xx_pinconfig_s g_gpio_uart0_tx; #endif -#endif /* __CONFIG_NUCLEO_F303ZE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F303ZE_INCLUDE_BOARD_H */ diff --git a/boards/launchxl-cc1310/scripts/Make.defs b/boards/arm/launchxl-cc1310/scripts/Make.defs similarity index 97% rename from boards/launchxl-cc1310/scripts/Make.defs rename to boards/arm/launchxl-cc1310/scripts/Make.defs index 45377b65c2..d9ff47d8a5 100644 --- a/boards/launchxl-cc1310/scripts/Make.defs +++ b/boards/arm/launchxl-cc1310/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/launchxl-cc1310/scripts/flash.ld b/boards/arm/launchxl-cc1310/scripts/flash.ld similarity index 100% rename from boards/launchxl-cc1310/scripts/flash.ld rename to boards/arm/launchxl-cc1310/scripts/flash.ld diff --git a/boards/launchxl-cc1310/src/Makefile b/boards/arm/launchxl-cc1310/src/Makefile similarity index 100% rename from boards/launchxl-cc1310/src/Makefile rename to boards/arm/launchxl-cc1310/src/Makefile diff --git a/boards/launchxl-cc1310/src/cc1310_appinit.c b/boards/arm/launchxl-cc1310/src/cc1310_appinit.c similarity index 100% rename from boards/launchxl-cc1310/src/cc1310_appinit.c rename to boards/arm/launchxl-cc1310/src/cc1310_appinit.c diff --git a/boards/launchxl-cc1310/src/cc1310_autoleds.c b/boards/arm/launchxl-cc1310/src/cc1310_autoleds.c similarity index 100% rename from boards/launchxl-cc1310/src/cc1310_autoleds.c rename to boards/arm/launchxl-cc1310/src/cc1310_autoleds.c diff --git a/boards/launchxl-cc1310/src/cc1310_boot.c b/boards/arm/launchxl-cc1310/src/cc1310_boot.c similarity index 100% rename from boards/launchxl-cc1310/src/cc1310_boot.c rename to boards/arm/launchxl-cc1310/src/cc1310_boot.c diff --git a/boards/launchxl-cc1310/src/cc1310_bringup.c b/boards/arm/launchxl-cc1310/src/cc1310_bringup.c similarity index 100% rename from boards/launchxl-cc1310/src/cc1310_bringup.c rename to boards/arm/launchxl-cc1310/src/cc1310_bringup.c diff --git a/boards/launchxl-cc1310/src/cc1310_buttons.c b/boards/arm/launchxl-cc1310/src/cc1310_buttons.c similarity index 100% rename from boards/launchxl-cc1310/src/cc1310_buttons.c rename to boards/arm/launchxl-cc1310/src/cc1310_buttons.c diff --git a/boards/launchxl-cc1310/src/cc1310_pinconfig.c b/boards/arm/launchxl-cc1310/src/cc1310_pinconfig.c similarity index 100% rename from boards/launchxl-cc1310/src/cc1310_pinconfig.c rename to boards/arm/launchxl-cc1310/src/cc1310_pinconfig.c diff --git a/boards/launchxl-cc1310/src/cc1310_ssi.c b/boards/arm/launchxl-cc1310/src/cc1310_ssi.c similarity index 100% rename from boards/launchxl-cc1310/src/cc1310_ssi.c rename to boards/arm/launchxl-cc1310/src/cc1310_ssi.c diff --git a/boards/launchxl-cc1310/src/cc1310_userleds.c b/boards/arm/launchxl-cc1310/src/cc1310_userleds.c similarity index 100% rename from boards/launchxl-cc1310/src/cc1310_userleds.c rename to boards/arm/launchxl-cc1310/src/cc1310_userleds.c diff --git a/boards/launchxl-cc1310/src/launchxl-cc1310.h b/boards/arm/launchxl-cc1310/src/launchxl-cc1310.h similarity index 96% rename from boards/launchxl-cc1310/src/launchxl-cc1310.h rename to boards/arm/launchxl-cc1310/src/launchxl-cc1310.h index b6072ae32d..dd516f6746 100644 --- a/boards/launchxl-cc1310/src/launchxl-cc1310.h +++ b/boards/arm/launchxl-cc1310/src/launchxl-cc1310.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_LAUNCH_CC1310_SRC_LAUNCH_CC1310_H -#define __CONFIG_LAUNCH_CC1310_SRC_LAUNCH_CC1310_H +#ifndef __BOARDS_ARM_LAUNCH_CC1310_SRC_LAUNCH_CC1310_H +#define __BOARDS_ARM_LAUNCH_CC1310_SRC_LAUNCH_CC1310_H /**************************************************************************** * Included Files @@ -116,4 +116,4 @@ int cc1310_bringup(void); void cc1310_ssidev_initialize(void); #endif -#endif /* __CONFIG_NUCLEO_F303ZE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F303ZE_INCLUDE_BOARD_H */ diff --git a/boards/launchxl-cc1312r1/Kconfig b/boards/arm/launchxl-cc1312r1/Kconfig similarity index 100% rename from boards/launchxl-cc1312r1/Kconfig rename to boards/arm/launchxl-cc1312r1/Kconfig diff --git a/boards/launchxl-cc1312r1/README.txt b/boards/arm/launchxl-cc1312r1/README.txt similarity index 100% rename from boards/launchxl-cc1312r1/README.txt rename to boards/arm/launchxl-cc1312r1/README.txt diff --git a/boards/launchxl-cc1312r1/configs/nsh/defconfig b/boards/arm/launchxl-cc1312r1/configs/nsh/defconfig similarity index 100% rename from boards/launchxl-cc1312r1/configs/nsh/defconfig rename to boards/arm/launchxl-cc1312r1/configs/nsh/defconfig diff --git a/boards/launchxl-cc1312r1/include/board.h b/boards/arm/launchxl-cc1312r1/include/board.h similarity index 97% rename from boards/launchxl-cc1312r1/include/board.h rename to boards/arm/launchxl-cc1312r1/include/board.h index cc0e0876cf..777cd0dab1 100644 --- a/boards/launchxl-cc1312r1/include/board.h +++ b/boards/arm/launchxl-cc1312r1/include/board.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_LAUNCHXL_CC1312R1_INCLUDE_BOARD_H -#define __CONFIG_LAUNCHXL_CC1312R1_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_LAUNCHXL_CC1312R1_INCLUDE_BOARD_H +#define __BOARDS_ARM_LAUNCHXL_CC1312R1_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -148,4 +148,4 @@ extern const struct cc13xx_pinconfig_s g_gpio_uart0_rx; extern const struct cc13xx_pinconfig_s g_gpio_uart0_tx; #endif -#endif /* __CONFIG_NUCLEO_F303ZE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F303ZE_INCLUDE_BOARD_H */ diff --git a/boards/launchxl-cc1312r1/scripts/Make.defs b/boards/arm/launchxl-cc1312r1/scripts/Make.defs similarity index 97% rename from boards/launchxl-cc1312r1/scripts/Make.defs rename to boards/arm/launchxl-cc1312r1/scripts/Make.defs index 79133a9e3d..e6f27eb937 100644 --- a/boards/launchxl-cc1312r1/scripts/Make.defs +++ b/boards/arm/launchxl-cc1312r1/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/launchxl-cc1312r1/scripts/flash.ld b/boards/arm/launchxl-cc1312r1/scripts/flash.ld similarity index 100% rename from boards/launchxl-cc1312r1/scripts/flash.ld rename to boards/arm/launchxl-cc1312r1/scripts/flash.ld diff --git a/boards/launchxl-cc1312r1/scripts/sram.ld b/boards/arm/launchxl-cc1312r1/scripts/sram.ld similarity index 100% rename from boards/launchxl-cc1312r1/scripts/sram.ld rename to boards/arm/launchxl-cc1312r1/scripts/sram.ld diff --git a/boards/launchxl-cc1312r1/src/Makefile b/boards/arm/launchxl-cc1312r1/src/Makefile similarity index 100% rename from boards/launchxl-cc1312r1/src/Makefile rename to boards/arm/launchxl-cc1312r1/src/Makefile diff --git a/boards/launchxl-cc1312r1/src/cc1312_appinit.c b/boards/arm/launchxl-cc1312r1/src/cc1312_appinit.c similarity index 100% rename from boards/launchxl-cc1312r1/src/cc1312_appinit.c rename to boards/arm/launchxl-cc1312r1/src/cc1312_appinit.c diff --git a/boards/launchxl-cc1312r1/src/cc1312_autoleds.c b/boards/arm/launchxl-cc1312r1/src/cc1312_autoleds.c similarity index 100% rename from boards/launchxl-cc1312r1/src/cc1312_autoleds.c rename to boards/arm/launchxl-cc1312r1/src/cc1312_autoleds.c diff --git a/boards/launchxl-cc1312r1/src/cc1312_boot.c b/boards/arm/launchxl-cc1312r1/src/cc1312_boot.c similarity index 100% rename from boards/launchxl-cc1312r1/src/cc1312_boot.c rename to boards/arm/launchxl-cc1312r1/src/cc1312_boot.c diff --git a/boards/launchxl-cc1312r1/src/cc1312_bringup.c b/boards/arm/launchxl-cc1312r1/src/cc1312_bringup.c similarity index 100% rename from boards/launchxl-cc1312r1/src/cc1312_bringup.c rename to boards/arm/launchxl-cc1312r1/src/cc1312_bringup.c diff --git a/boards/launchxl-cc1312r1/src/cc1312_buttons.c b/boards/arm/launchxl-cc1312r1/src/cc1312_buttons.c similarity index 100% rename from boards/launchxl-cc1312r1/src/cc1312_buttons.c rename to boards/arm/launchxl-cc1312r1/src/cc1312_buttons.c diff --git a/boards/launchxl-cc1312r1/src/cc1312_pinconfig.c b/boards/arm/launchxl-cc1312r1/src/cc1312_pinconfig.c similarity index 100% rename from boards/launchxl-cc1312r1/src/cc1312_pinconfig.c rename to boards/arm/launchxl-cc1312r1/src/cc1312_pinconfig.c diff --git a/boards/launchxl-cc1312r1/src/cc1312_ssi.c b/boards/arm/launchxl-cc1312r1/src/cc1312_ssi.c similarity index 100% rename from boards/launchxl-cc1312r1/src/cc1312_ssi.c rename to boards/arm/launchxl-cc1312r1/src/cc1312_ssi.c diff --git a/boards/launchxl-cc1312r1/src/cc1312_userleds.c b/boards/arm/launchxl-cc1312r1/src/cc1312_userleds.c similarity index 100% rename from boards/launchxl-cc1312r1/src/cc1312_userleds.c rename to boards/arm/launchxl-cc1312r1/src/cc1312_userleds.c diff --git a/boards/launchxl-cc1312r1/src/launchxl-cc1312r1.h b/boards/arm/launchxl-cc1312r1/src/launchxl-cc1312r1.h similarity index 96% rename from boards/launchxl-cc1312r1/src/launchxl-cc1312r1.h rename to boards/arm/launchxl-cc1312r1/src/launchxl-cc1312r1.h index d6bef0df79..86925f8868 100644 --- a/boards/launchxl-cc1312r1/src/launchxl-cc1312r1.h +++ b/boards/arm/launchxl-cc1312r1/src/launchxl-cc1312r1.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_LAUNCHXL_CC1312R1_SRC_LAUNCHXL_CC1312R1_H -#define __CONFIG_LAUNCHXL_CC1312R1_SRC_LAUNCHXL_CC1312R1_H +#ifndef __BOARDS_ARM_LAUNCHXL_CC1312R1_SRC_LAUNCHXL_CC1312R1_H +#define __BOARDS_ARM_LAUNCHXL_CC1312R1_SRC_LAUNCHXL_CC1312R1_H /**************************************************************************** * Included Files @@ -116,4 +116,4 @@ int cc1312_bringup(void); void cc1312_ssidev_initialize(void); #endif -#endif /* __CONFIG_NUCLEO_F303ZE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F303ZE_INCLUDE_BOARD_H */ diff --git a/boards/launchxl-tms57004/Kconfig b/boards/arm/launchxl-tms57004/Kconfig similarity index 100% rename from boards/launchxl-tms57004/Kconfig rename to boards/arm/launchxl-tms57004/Kconfig diff --git a/boards/launchxl-tms57004/README.txt b/boards/arm/launchxl-tms57004/README.txt similarity index 100% rename from boards/launchxl-tms57004/README.txt rename to boards/arm/launchxl-tms57004/README.txt diff --git a/boards/launchxl-tms57004/configs/nsh/defconfig b/boards/arm/launchxl-tms57004/configs/nsh/defconfig similarity index 100% rename from boards/launchxl-tms57004/configs/nsh/defconfig rename to boards/arm/launchxl-tms57004/configs/nsh/defconfig diff --git a/boards/launchxl-tms57004/include/board.h b/boards/arm/launchxl-tms57004/include/board.h similarity index 98% rename from boards/launchxl-tms57004/include/board.h rename to boards/arm/launchxl-tms57004/include/board.h index 375fe6f9c5..6f8cb0471b 100644 --- a/boards/launchxl-tms57004/include/board.h +++ b/boards/arm/launchxl-tms57004/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_LAUNCHXL_TMS57004_INCLUDE_BOARD_H -#define __BOARDS_LAUNCHXL_TMS57004_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_LAUNCHXL_TMS57004_INCLUDE_BOARD_H +#define __BOARDS_ARM_LAUNCHXL_TMS57004_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -276,4 +276,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_LAUNCHXL_TMS57004_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_LAUNCHXL_TMS57004_INCLUDE_BOARD_H */ diff --git a/boards/launchxl-tms57004/scripts/Make.defs b/boards/arm/launchxl-tms57004/scripts/Make.defs similarity index 93% rename from boards/launchxl-tms57004/scripts/Make.defs rename to boards/arm/launchxl-tms57004/scripts/Make.defs index 19fe64d98a..aa752b967f 100644 --- a/boards/launchxl-tms57004/scripts/Make.defs +++ b/boards/arm/launchxl-tms57004/scripts/Make.defs @@ -43,12 +43,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) endif CC = $(CROSSDEV)gcc @@ -97,9 +97,9 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/launchxl-tms57004/scripts/flash-sram.ld b/boards/arm/launchxl-tms57004/scripts/flash-sram.ld similarity index 100% rename from boards/launchxl-tms57004/scripts/flash-sram.ld rename to boards/arm/launchxl-tms57004/scripts/flash-sram.ld diff --git a/boards/launchxl-tms57004/src/Makefile b/boards/arm/launchxl-tms57004/src/Makefile similarity index 100% rename from boards/launchxl-tms57004/src/Makefile rename to boards/arm/launchxl-tms57004/src/Makefile diff --git a/boards/launchxl-tms57004/src/launchxl-tms57004.h b/boards/arm/launchxl-tms57004/src/launchxl-tms57004.h similarity index 95% rename from boards/launchxl-tms57004/src/launchxl-tms57004.h rename to boards/arm/launchxl-tms57004/src/launchxl-tms57004.h index ac39e177b1..f8274609ff 100644 --- a/boards/launchxl-tms57004/src/launchxl-tms57004.h +++ b/boards/arm/launchxl-tms57004/src/launchxl-tms57004.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_LAUNCHXL_TMS57004_SRC_LAUNCHXL_TMS57004_H -#define __BOARDS_LAUNCHXL_TMS57004_SRC_LAUNCHXL_TMS57004_H +#ifndef __BOARDS_ARM_LAUNCHXL_TMS57004_SRC_LAUNCHXL_TMS57004_H +#define __BOARDS_ARM_LAUNCHXL_TMS57004_SRC_LAUNCHXL_TMS57004_H /**************************************************************************** * Included Files @@ -96,4 +96,4 @@ int tms570_bringup(void); -#endif /* __BOARDS_LAUNCHXL_TMS57004_SRC_LAUNCHXL_TMS57004_H */ +#endif /* __BOARDS_ARM_LAUNCHXL_TMS57004_SRC_LAUNCHXL_TMS57004_H */ diff --git a/boards/launchxl-tms57004/src/tms570_appinit.c b/boards/arm/launchxl-tms57004/src/tms570_appinit.c similarity index 100% rename from boards/launchxl-tms57004/src/tms570_appinit.c rename to boards/arm/launchxl-tms57004/src/tms570_appinit.c diff --git a/boards/launchxl-tms57004/src/tms570_autoleds.c b/boards/arm/launchxl-tms57004/src/tms570_autoleds.c similarity index 100% rename from boards/launchxl-tms57004/src/tms570_autoleds.c rename to boards/arm/launchxl-tms57004/src/tms570_autoleds.c diff --git a/boards/launchxl-tms57004/src/tms570_bringup.c b/boards/arm/launchxl-tms57004/src/tms570_bringup.c similarity index 100% rename from boards/launchxl-tms57004/src/tms570_bringup.c rename to boards/arm/launchxl-tms57004/src/tms570_bringup.c diff --git a/boards/launchxl-tms57004/src/tms570_buttons.c b/boards/arm/launchxl-tms57004/src/tms570_buttons.c similarity index 100% rename from boards/launchxl-tms57004/src/tms570_buttons.c rename to boards/arm/launchxl-tms57004/src/tms570_buttons.c diff --git a/boards/launchxl-tms57004/src/tms570_initialize.c b/boards/arm/launchxl-tms57004/src/tms570_initialize.c similarity index 100% rename from boards/launchxl-tms57004/src/tms570_initialize.c rename to boards/arm/launchxl-tms57004/src/tms570_initialize.c diff --git a/boards/launchxl-tms57004/src/tms570_userleds.c b/boards/arm/launchxl-tms57004/src/tms570_userleds.c similarity index 100% rename from boards/launchxl-tms57004/src/tms570_userleds.c rename to boards/arm/launchxl-tms57004/src/tms570_userleds.c diff --git a/boards/lc823450-xgevk/Kconfig b/boards/arm/lc823450-xgevk/Kconfig similarity index 100% rename from boards/lc823450-xgevk/Kconfig rename to boards/arm/lc823450-xgevk/Kconfig diff --git a/boards/lc823450-xgevk/README.txt b/boards/arm/lc823450-xgevk/README.txt similarity index 100% rename from boards/lc823450-xgevk/README.txt rename to boards/arm/lc823450-xgevk/README.txt diff --git a/boards/lc823450-xgevk/configs/audio/defconfig b/boards/arm/lc823450-xgevk/configs/audio/defconfig similarity index 100% rename from boards/lc823450-xgevk/configs/audio/defconfig rename to boards/arm/lc823450-xgevk/configs/audio/defconfig diff --git a/boards/lc823450-xgevk/configs/bt/defconfig b/boards/arm/lc823450-xgevk/configs/bt/defconfig similarity index 100% rename from boards/lc823450-xgevk/configs/bt/defconfig rename to boards/arm/lc823450-xgevk/configs/bt/defconfig diff --git a/boards/lc823450-xgevk/configs/elf/defconfig b/boards/arm/lc823450-xgevk/configs/elf/defconfig similarity index 100% rename from boards/lc823450-xgevk/configs/elf/defconfig rename to boards/arm/lc823450-xgevk/configs/elf/defconfig diff --git a/boards/lc823450-xgevk/configs/ipl2/defconfig b/boards/arm/lc823450-xgevk/configs/ipl2/defconfig similarity index 100% rename from boards/lc823450-xgevk/configs/ipl2/defconfig rename to boards/arm/lc823450-xgevk/configs/ipl2/defconfig diff --git a/boards/lc823450-xgevk/configs/knsh/defconfig b/boards/arm/lc823450-xgevk/configs/knsh/defconfig similarity index 100% rename from boards/lc823450-xgevk/configs/knsh/defconfig rename to boards/arm/lc823450-xgevk/configs/knsh/defconfig diff --git a/boards/lc823450-xgevk/configs/kostest/defconfig b/boards/arm/lc823450-xgevk/configs/kostest/defconfig similarity index 100% rename from boards/lc823450-xgevk/configs/kostest/defconfig rename to boards/arm/lc823450-xgevk/configs/kostest/defconfig diff --git a/boards/lc823450-xgevk/configs/krndis/defconfig b/boards/arm/lc823450-xgevk/configs/krndis/defconfig similarity index 100% rename from boards/lc823450-xgevk/configs/krndis/defconfig rename to boards/arm/lc823450-xgevk/configs/krndis/defconfig diff --git a/boards/lc823450-xgevk/configs/nsh/defconfig b/boards/arm/lc823450-xgevk/configs/nsh/defconfig similarity index 100% rename from boards/lc823450-xgevk/configs/nsh/defconfig rename to boards/arm/lc823450-xgevk/configs/nsh/defconfig diff --git a/boards/lc823450-xgevk/configs/posix_spawn/defconfig b/boards/arm/lc823450-xgevk/configs/posix_spawn/defconfig similarity index 100% rename from boards/lc823450-xgevk/configs/posix_spawn/defconfig rename to boards/arm/lc823450-xgevk/configs/posix_spawn/defconfig diff --git a/boards/lc823450-xgevk/configs/rndis/defconfig b/boards/arm/lc823450-xgevk/configs/rndis/defconfig similarity index 100% rename from boards/lc823450-xgevk/configs/rndis/defconfig rename to boards/arm/lc823450-xgevk/configs/rndis/defconfig diff --git a/boards/lc823450-xgevk/configs/usb/defconfig b/boards/arm/lc823450-xgevk/configs/usb/defconfig similarity index 100% rename from boards/lc823450-xgevk/configs/usb/defconfig rename to boards/arm/lc823450-xgevk/configs/usb/defconfig diff --git a/boards/lc823450-xgevk/include/board.h b/boards/arm/lc823450-xgevk/include/board.h similarity index 95% rename from boards/lc823450-xgevk/include/board.h rename to boards/arm/lc823450-xgevk/include/board.h index 291e6a435c..85653a04ce 100644 --- a/boards/lc823450-xgevk/include/board.h +++ b/boards/arm/lc823450-xgevk/include/board.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_LC823450_XGEVK_INCLUDE_BOARD_H -#define __BOARDS_LC823450_XGEVK_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_LC823450_XGEVK_INCLUDE_BOARD_H +#define __BOARDS_ARM_LC823450_XGEVK_INCLUDE_BOARD_H #include @@ -80,4 +80,4 @@ void up_init_default_mux(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_LC823450_XGEVK_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_LC823450_XGEVK_INCLUDE_BOARD_H */ diff --git a/boards/lc823450-xgevk/kernel/.gitignore b/boards/arm/lc823450-xgevk/kernel/.gitignore similarity index 100% rename from boards/lc823450-xgevk/kernel/.gitignore rename to boards/arm/lc823450-xgevk/kernel/.gitignore diff --git a/boards/lc823450-xgevk/kernel/Makefile b/boards/arm/lc823450-xgevk/kernel/Makefile similarity index 100% rename from boards/lc823450-xgevk/kernel/Makefile rename to boards/arm/lc823450-xgevk/kernel/Makefile diff --git a/boards/lc823450-xgevk/kernel/lc823450_userspace.c b/boards/arm/lc823450-xgevk/kernel/lc823450_userspace.c similarity index 100% rename from boards/lc823450-xgevk/kernel/lc823450_userspace.c rename to boards/arm/lc823450-xgevk/kernel/lc823450_userspace.c diff --git a/boards/lc823450-xgevk/scripts/Make.defs b/boards/arm/lc823450-xgevk/scripts/Make.defs similarity index 95% rename from boards/lc823450-xgevk/scripts/Make.defs rename to boards/arm/lc823450-xgevk/scripts/Make.defs index 348cf2fd03..d274c366f9 100644 --- a/boards/lc823450-xgevk/scripts/Make.defs +++ b/boards/arm/lc823450-xgevk/scripts/Make.defs @@ -54,13 +54,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc @@ -111,9 +111,9 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif # File extensions diff --git a/boards/lc823450-xgevk/scripts/gnu-elf.ld b/boards/arm/lc823450-xgevk/scripts/gnu-elf.ld similarity index 100% rename from boards/lc823450-xgevk/scripts/gnu-elf.ld rename to boards/arm/lc823450-xgevk/scripts/gnu-elf.ld diff --git a/boards/lc823450-xgevk/scripts/ld-ipl2.script b/boards/arm/lc823450-xgevk/scripts/ld-ipl2.script similarity index 100% rename from boards/lc823450-xgevk/scripts/ld-ipl2.script rename to boards/arm/lc823450-xgevk/scripts/ld-ipl2.script diff --git a/boards/lc823450-xgevk/scripts/ld-spif-boot.script b/boards/arm/lc823450-xgevk/scripts/ld-spif-boot.script similarity index 100% rename from boards/lc823450-xgevk/scripts/ld-spif-boot.script rename to boards/arm/lc823450-xgevk/scripts/ld-spif-boot.script diff --git a/boards/lc823450-xgevk/scripts/ld.script b/boards/arm/lc823450-xgevk/scripts/ld.script similarity index 100% rename from boards/lc823450-xgevk/scripts/ld.script rename to boards/arm/lc823450-xgevk/scripts/ld.script diff --git a/boards/lc823450-xgevk/scripts/memory.ld b/boards/arm/lc823450-xgevk/scripts/memory.ld similarity index 100% rename from boards/lc823450-xgevk/scripts/memory.ld rename to boards/arm/lc823450-xgevk/scripts/memory.ld diff --git a/boards/lc823450-xgevk/scripts/user-space.ld b/boards/arm/lc823450-xgevk/scripts/user-space.ld similarity index 100% rename from boards/lc823450-xgevk/scripts/user-space.ld rename to boards/arm/lc823450-xgevk/scripts/user-space.ld diff --git a/boards/lc823450-xgevk/src/Makefile b/boards/arm/lc823450-xgevk/src/Makefile similarity index 100% rename from boards/lc823450-xgevk/src/Makefile rename to boards/arm/lc823450-xgevk/src/Makefile diff --git a/boards/lc823450-xgevk/src/lc823450-xgevk.h b/boards/arm/lc823450-xgevk/src/lc823450-xgevk.h similarity index 95% rename from boards/lc823450-xgevk/src/lc823450-xgevk.h rename to boards/arm/lc823450-xgevk/src/lc823450-xgevk.h index 688925f142..93fed90062 100644 --- a/boards/lc823450-xgevk/src/lc823450-xgevk.h +++ b/boards/arm/lc823450-xgevk/src/lc823450-xgevk.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_LC823450_XGEVK_SRC_LC823450_XGEVK_H -#define __BOARDS_LC823450_XGEVK_SRC_LC823450_XGEVK_H +#ifndef __BOARDS_ARM_LC823450_XGEVK_SRC_LC823450_XGEVK_H +#define __BOARDS_ARM_LC823450_XGEVK_SRC_LC823450_XGEVK_H /**************************************************************************** * Included Files @@ -99,4 +99,4 @@ int lc823450_wm8776initialize(int minor); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_LC823450_XGEVK_SRC_LC823450_XGEVK_H */ +#endif /* __BOARDS_ARM_LC823450_XGEVK_SRC_LC823450_XGEVK_H */ diff --git a/boards/lc823450-xgevk/src/lc823450-xgevk_mux.h b/boards/arm/lc823450-xgevk/src/lc823450-xgevk_mux.h similarity index 99% rename from boards/lc823450-xgevk/src/lc823450-xgevk_mux.h rename to boards/arm/lc823450-xgevk/src/lc823450-xgevk_mux.h index 6f103e95ca..2fdbd8b909 100644 --- a/boards/lc823450-xgevk/src/lc823450-xgevk_mux.h +++ b/boards/arm/lc823450-xgevk/src/lc823450-xgevk_mux.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_LC823450_XGEVK_SRC_LC823450_XGEVK_MUX_H -#define __BOARDS_LC823450_XGEVK_SRC_LC823450_XGEVK_MUX_H +#ifndef __BOARDS_ARM_LC823450_XGEVK_SRC_LC823450_XGEVK_MUX_H +#define __BOARDS_ARM_LC823450_XGEVK_SRC_LC823450_XGEVK_MUX_H /**************************************************************************** * Pre-processor Definitions @@ -605,4 +605,4 @@ 0 << 22 | /* XTALI0 0:2mA, 1:---, 2:4mA, 3:8mA */ \ 0 << 24 /* XTALI1 0:2mA, 1:---, 2:4mA, 3:8mA */ -#endif /* __BOARDS_LC823450_XGEVK_SRC_LC823450_XGEVK_MUX_H */ +#endif /* __BOARDS_ARM_LC823450_XGEVK_SRC_LC823450_XGEVK_MUX_H */ diff --git a/boards/lc823450-xgevk/src/lc823450_adc.c b/boards/arm/lc823450-xgevk/src/lc823450_adc.c similarity index 100% rename from boards/lc823450-xgevk/src/lc823450_adc.c rename to boards/arm/lc823450-xgevk/src/lc823450_adc.c diff --git a/boards/lc823450-xgevk/src/lc823450_appinit.c b/boards/arm/lc823450-xgevk/src/lc823450_appinit.c similarity index 100% rename from boards/lc823450-xgevk/src/lc823450_appinit.c rename to boards/arm/lc823450-xgevk/src/lc823450_appinit.c diff --git a/boards/lc823450-xgevk/src/lc823450_autoleds.c b/boards/arm/lc823450-xgevk/src/lc823450_autoleds.c similarity index 100% rename from boards/lc823450-xgevk/src/lc823450_autoleds.c rename to boards/arm/lc823450-xgevk/src/lc823450_autoleds.c diff --git a/boards/lc823450-xgevk/src/lc823450_boot.c b/boards/arm/lc823450-xgevk/src/lc823450_boot.c similarity index 100% rename from boards/lc823450-xgevk/src/lc823450_boot.c rename to boards/arm/lc823450-xgevk/src/lc823450_boot.c diff --git a/boards/lc823450-xgevk/src/lc823450_bringup.c b/boards/arm/lc823450-xgevk/src/lc823450_bringup.c similarity index 100% rename from boards/lc823450-xgevk/src/lc823450_bringup.c rename to boards/arm/lc823450-xgevk/src/lc823450_bringup.c diff --git a/boards/lc823450-xgevk/src/lc823450_bt.c b/boards/arm/lc823450-xgevk/src/lc823450_bt.c similarity index 100% rename from boards/lc823450-xgevk/src/lc823450_bt.c rename to boards/arm/lc823450-xgevk/src/lc823450_bt.c diff --git a/boards/lc823450-xgevk/src/lc823450_mux.c b/boards/arm/lc823450-xgevk/src/lc823450_mux.c similarity index 100% rename from boards/lc823450-xgevk/src/lc823450_mux.c rename to boards/arm/lc823450-xgevk/src/lc823450_mux.c diff --git a/boards/lc823450-xgevk/src/lc823450_netinit.c b/boards/arm/lc823450-xgevk/src/lc823450_netinit.c similarity index 100% rename from boards/lc823450-xgevk/src/lc823450_netinit.c rename to boards/arm/lc823450-xgevk/src/lc823450_netinit.c diff --git a/boards/lc823450-xgevk/src/lc823450_reset.c b/boards/arm/lc823450-xgevk/src/lc823450_reset.c similarity index 100% rename from boards/lc823450-xgevk/src/lc823450_reset.c rename to boards/arm/lc823450-xgevk/src/lc823450_reset.c diff --git a/boards/lc823450-xgevk/src/lc823450_sdif.c b/boards/arm/lc823450-xgevk/src/lc823450_sdif.c similarity index 100% rename from boards/lc823450-xgevk/src/lc823450_sdif.c rename to boards/arm/lc823450-xgevk/src/lc823450_sdif.c diff --git a/boards/lc823450-xgevk/src/lc823450_spi.c b/boards/arm/lc823450-xgevk/src/lc823450_spi.c similarity index 100% rename from boards/lc823450-xgevk/src/lc823450_spi.c rename to boards/arm/lc823450-xgevk/src/lc823450_spi.c diff --git a/boards/lc823450-xgevk/src/lc823450_st7565.c b/boards/arm/lc823450-xgevk/src/lc823450_st7565.c similarity index 100% rename from boards/lc823450-xgevk/src/lc823450_st7565.c rename to boards/arm/lc823450-xgevk/src/lc823450_st7565.c diff --git a/boards/lc823450-xgevk/src/lc823450_usbmsc.c b/boards/arm/lc823450-xgevk/src/lc823450_usbmsc.c similarity index 100% rename from boards/lc823450-xgevk/src/lc823450_usbmsc.c rename to boards/arm/lc823450-xgevk/src/lc823450_usbmsc.c diff --git a/boards/lc823450-xgevk/src/lc823450_wm8776.c b/boards/arm/lc823450-xgevk/src/lc823450_wm8776.c similarity index 100% rename from boards/lc823450-xgevk/src/lc823450_wm8776.c rename to boards/arm/lc823450-xgevk/src/lc823450_wm8776.c diff --git a/boards/lincoln60/Kconfig b/boards/arm/lincoln60/Kconfig similarity index 100% rename from boards/lincoln60/Kconfig rename to boards/arm/lincoln60/Kconfig diff --git a/boards/lincoln60/README.txt b/boards/arm/lincoln60/README.txt similarity index 100% rename from boards/lincoln60/README.txt rename to boards/arm/lincoln60/README.txt diff --git a/boards/lincoln60/configs/netnsh/defconfig b/boards/arm/lincoln60/configs/netnsh/defconfig similarity index 100% rename from boards/lincoln60/configs/netnsh/defconfig rename to boards/arm/lincoln60/configs/netnsh/defconfig diff --git a/boards/lincoln60/configs/nsh/defconfig b/boards/arm/lincoln60/configs/nsh/defconfig similarity index 100% rename from boards/lincoln60/configs/nsh/defconfig rename to boards/arm/lincoln60/configs/nsh/defconfig diff --git a/boards/lincoln60/configs/thttpd-binfs/defconfig b/boards/arm/lincoln60/configs/thttpd-binfs/defconfig similarity index 100% rename from boards/lincoln60/configs/thttpd-binfs/defconfig rename to boards/arm/lincoln60/configs/thttpd-binfs/defconfig diff --git a/boards/lincoln60/include/board.h b/boards/arm/lincoln60/include/board.h similarity index 98% rename from boards/lincoln60/include/board.h rename to boards/arm/lincoln60/include/board.h index bc6f3ff252..e56c1cb447 100644 --- a/boards/lincoln60/include/board.h +++ b/boards/arm/lincoln60/include/board.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_LINCOLN60_INCLUDE_BOARD_H -#define __BOARDS_LINCOLN60_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_LINCOLN60_INCLUDE_BOARD_H +#define __BOARDS_ARM_LINCOLN60_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -218,4 +218,4 @@ void lpc17_40_led(int lednum, int state); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_LINCOLN60_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_LINCOLN60_INCLUDE_BOARD_H */ diff --git a/boards/lincoln60/scripts/Make.defs b/boards/arm/lincoln60/scripts/Make.defs similarity index 96% rename from boards/lincoln60/scripts/Make.defs rename to boards/arm/lincoln60/scripts/Make.defs index bc298f62b3..029dd662de 100644 --- a/boards/lincoln60/scripts/Make.defs +++ b/boards/arm/lincoln60/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/lincoln60/scripts/ld.script b/boards/arm/lincoln60/scripts/ld.script similarity index 100% rename from boards/lincoln60/scripts/ld.script rename to boards/arm/lincoln60/scripts/ld.script diff --git a/boards/freedom-k28f/src/.gitignore b/boards/arm/lincoln60/src/.gitignore similarity index 100% rename from boards/freedom-k28f/src/.gitignore rename to boards/arm/lincoln60/src/.gitignore diff --git a/boards/lincoln60/src/Makefile b/boards/arm/lincoln60/src/Makefile similarity index 100% rename from boards/lincoln60/src/Makefile rename to boards/arm/lincoln60/src/Makefile diff --git a/boards/lincoln60/src/lincoln60.h b/boards/arm/lincoln60/src/lincoln60.h similarity index 100% rename from boards/lincoln60/src/lincoln60.h rename to boards/arm/lincoln60/src/lincoln60.h diff --git a/boards/lincoln60/src/lpc17_40_appinit.c b/boards/arm/lincoln60/src/lpc17_40_appinit.c similarity index 100% rename from boards/lincoln60/src/lpc17_40_appinit.c rename to boards/arm/lincoln60/src/lpc17_40_appinit.c diff --git a/boards/lincoln60/src/lpc17_40_boot.c b/boards/arm/lincoln60/src/lpc17_40_boot.c similarity index 100% rename from boards/lincoln60/src/lpc17_40_boot.c rename to boards/arm/lincoln60/src/lpc17_40_boot.c diff --git a/boards/lincoln60/src/lpc17_40_buttons.c b/boards/arm/lincoln60/src/lpc17_40_buttons.c similarity index 100% rename from boards/lincoln60/src/lpc17_40_buttons.c rename to boards/arm/lincoln60/src/lpc17_40_buttons.c diff --git a/boards/lincoln60/src/lpc17_40_leds.c b/boards/arm/lincoln60/src/lpc17_40_leds.c similarity index 100% rename from boards/lincoln60/src/lpc17_40_leds.c rename to boards/arm/lincoln60/src/lpc17_40_leds.c diff --git a/boards/lm3s6432-s2e/Kconfig b/boards/arm/lm3s6432-s2e/Kconfig similarity index 100% rename from boards/lm3s6432-s2e/Kconfig rename to boards/arm/lm3s6432-s2e/Kconfig diff --git a/boards/lm3s6432-s2e/README.txt b/boards/arm/lm3s6432-s2e/README.txt similarity index 100% rename from boards/lm3s6432-s2e/README.txt rename to boards/arm/lm3s6432-s2e/README.txt diff --git a/boards/lm3s6432-s2e/configs/nsh/defconfig b/boards/arm/lm3s6432-s2e/configs/nsh/defconfig similarity index 100% rename from boards/lm3s6432-s2e/configs/nsh/defconfig rename to boards/arm/lm3s6432-s2e/configs/nsh/defconfig diff --git a/boards/lm3s6432-s2e/include/board.h b/boards/arm/lm3s6432-s2e/include/board.h similarity index 100% rename from boards/lm3s6432-s2e/include/board.h rename to boards/arm/lm3s6432-s2e/include/board.h diff --git a/boards/lm3s6432-s2e/scripts/Make.defs b/boards/arm/lm3s6432-s2e/scripts/Make.defs similarity index 96% rename from boards/lm3s6432-s2e/scripts/Make.defs rename to boards/arm/lm3s6432-s2e/scripts/Make.defs index ac90525cd7..47b320b37f 100644 --- a/boards/lm3s6432-s2e/scripts/Make.defs +++ b/boards/arm/lm3s6432-s2e/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/lm3s6432-s2e.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/lm3s6432-s2e.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/lm3s6432-s2e.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/lm3s6432-s2e.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/lm3s6432-s2e/scripts/lm3s6432-s2e.ld b/boards/arm/lm3s6432-s2e/scripts/lm3s6432-s2e.ld similarity index 100% rename from boards/lm3s6432-s2e/scripts/lm3s6432-s2e.ld rename to boards/arm/lm3s6432-s2e/scripts/lm3s6432-s2e.ld diff --git a/boards/freedom-kl25z/src/.gitignore b/boards/arm/lm3s6432-s2e/src/.gitignore similarity index 100% rename from boards/freedom-kl25z/src/.gitignore rename to boards/arm/lm3s6432-s2e/src/.gitignore diff --git a/boards/lm3s6432-s2e/src/Makefile b/boards/arm/lm3s6432-s2e/src/Makefile similarity index 100% rename from boards/lm3s6432-s2e/src/Makefile rename to boards/arm/lm3s6432-s2e/src/Makefile diff --git a/boards/lm3s6432-s2e/src/lm3s6432-s2e.h b/boards/arm/lm3s6432-s2e/src/lm3s6432-s2e.h similarity index 96% rename from boards/lm3s6432-s2e/src/lm3s6432-s2e.h rename to boards/arm/lm3s6432-s2e/src/lm3s6432-s2e.h index eb5a7af5b1..ea44eb31ec 100644 --- a/boards/lm3s6432-s2e/src/lm3s6432-s2e.h +++ b/boards/arm/lm3s6432-s2e/src/lm3s6432-s2e.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_LM3S6432_S2E_SRC_LM3S6432S2E_H -#define __BOARDS_LM3S6432_S2E_SRC_LM3S6432S2E_H +#ifndef __BOARDS_ARM_LM3S6432_S2E_SRC_LM3S6432S2E_H +#define __BOARDS_ARM_LM3S6432_S2E_SRC_LM3S6432S2E_H /************************************************************************************ * Included Files @@ -120,5 +120,5 @@ void weak_function lm_ssidev_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_LM3S6432_S2E_SRC_LM3S6432S2E_H */ +#endif /* __BOARDS_ARM_LM3S6432_S2E_SRC_LM3S6432S2E_H */ diff --git a/boards/lm3s6432-s2e/src/lm_appinit.c b/boards/arm/lm3s6432-s2e/src/lm_appinit.c similarity index 100% rename from boards/lm3s6432-s2e/src/lm_appinit.c rename to boards/arm/lm3s6432-s2e/src/lm_appinit.c diff --git a/boards/lm3s6432-s2e/src/lm_boot.c b/boards/arm/lm3s6432-s2e/src/lm_boot.c similarity index 100% rename from boards/lm3s6432-s2e/src/lm_boot.c rename to boards/arm/lm3s6432-s2e/src/lm_boot.c diff --git a/boards/lm3s6432-s2e/src/lm_ethernet.c b/boards/arm/lm3s6432-s2e/src/lm_ethernet.c similarity index 100% rename from boards/lm3s6432-s2e/src/lm_ethernet.c rename to boards/arm/lm3s6432-s2e/src/lm_ethernet.c diff --git a/boards/lm3s6432-s2e/src/lm_leds.c b/boards/arm/lm3s6432-s2e/src/lm_leds.c similarity index 100% rename from boards/lm3s6432-s2e/src/lm_leds.c rename to boards/arm/lm3s6432-s2e/src/lm_leds.c diff --git a/boards/lm3s6432-s2e/src/lm_ssi.c b/boards/arm/lm3s6432-s2e/src/lm_ssi.c similarity index 100% rename from boards/lm3s6432-s2e/src/lm_ssi.c rename to boards/arm/lm3s6432-s2e/src/lm_ssi.c diff --git a/boards/lm3s6965-ek/Kconfig b/boards/arm/lm3s6965-ek/Kconfig similarity index 100% rename from boards/lm3s6965-ek/Kconfig rename to boards/arm/lm3s6965-ek/Kconfig diff --git a/boards/lm3s6965-ek/README.txt b/boards/arm/lm3s6965-ek/README.txt similarity index 100% rename from boards/lm3s6965-ek/README.txt rename to boards/arm/lm3s6965-ek/README.txt diff --git a/boards/lm3s6965-ek/configs/discover/defconfig b/boards/arm/lm3s6965-ek/configs/discover/defconfig similarity index 100% rename from boards/lm3s6965-ek/configs/discover/defconfig rename to boards/arm/lm3s6965-ek/configs/discover/defconfig diff --git a/boards/lm3s6965-ek/configs/nsh/defconfig b/boards/arm/lm3s6965-ek/configs/nsh/defconfig similarity index 100% rename from boards/lm3s6965-ek/configs/nsh/defconfig rename to boards/arm/lm3s6965-ek/configs/nsh/defconfig diff --git a/boards/lm3s6965-ek/configs/nx/defconfig b/boards/arm/lm3s6965-ek/configs/nx/defconfig similarity index 100% rename from boards/lm3s6965-ek/configs/nx/defconfig rename to boards/arm/lm3s6965-ek/configs/nx/defconfig diff --git a/boards/lm3s6965-ek/configs/tcpecho/defconfig b/boards/arm/lm3s6965-ek/configs/tcpecho/defconfig similarity index 100% rename from boards/lm3s6965-ek/configs/tcpecho/defconfig rename to boards/arm/lm3s6965-ek/configs/tcpecho/defconfig diff --git a/boards/lm3s6965-ek/include/board.h b/boards/arm/lm3s6965-ek/include/board.h similarity index 100% rename from boards/lm3s6965-ek/include/board.h rename to boards/arm/lm3s6965-ek/include/board.h diff --git a/boards/lm3s6965-ek/scripts/Make.defs b/boards/arm/lm3s6965-ek/scripts/Make.defs similarity index 96% rename from boards/lm3s6965-ek/scripts/Make.defs rename to boards/arm/lm3s6965-ek/scripts/Make.defs index 975dd7f2ff..524f75287f 100644 --- a/boards/lm3s6965-ek/scripts/Make.defs +++ b/boards/arm/lm3s6965-ek/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/lm3s6965-ek/scripts/ld.script b/boards/arm/lm3s6965-ek/scripts/ld.script similarity index 100% rename from boards/lm3s6965-ek/scripts/ld.script rename to boards/arm/lm3s6965-ek/scripts/ld.script diff --git a/boards/freedom-kl26z/src/.gitignore b/boards/arm/lm3s6965-ek/src/.gitignore similarity index 100% rename from boards/freedom-kl26z/src/.gitignore rename to boards/arm/lm3s6965-ek/src/.gitignore diff --git a/boards/lm3s6965-ek/src/Makefile b/boards/arm/lm3s6965-ek/src/Makefile similarity index 100% rename from boards/lm3s6965-ek/src/Makefile rename to boards/arm/lm3s6965-ek/src/Makefile diff --git a/boards/lm3s6965-ek/src/lm3s6965-ek.h b/boards/arm/lm3s6965-ek/src/lm3s6965-ek.h similarity index 96% rename from boards/lm3s6965-ek/src/lm3s6965-ek.h rename to boards/arm/lm3s6965-ek/src/lm3s6965-ek.h index 37294d1fe3..a6c1981840 100644 --- a/boards/lm3s6965-ek/src/lm3s6965-ek.h +++ b/boards/arm/lm3s6965-ek/src/lm3s6965-ek.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_LM3S6965_EK_SRC_LM3S6965EK_H -#define __BOARDS_LM3S6965_EK_SRC_LM3S6965EK_H +#ifndef __BOARDS_ARM_LM3S6965_EK_SRC_LM3S6965EK_H +#define __BOARDS_ARM_LM3S6965_EK_SRC_LM3S6965EK_H /************************************************************************************ * Included Files @@ -129,4 +129,4 @@ void weak_function lm_ssidev_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_LM3S6965_EK_SRC_LM3S6965EK_H */ +#endif /* __BOARDS_ARM_LM3S6965_EK_SRC_LM3S6965EK_H */ diff --git a/boards/lm3s6965-ek/src/lm_appinit.c b/boards/arm/lm3s6965-ek/src/lm_appinit.c similarity index 100% rename from boards/lm3s6965-ek/src/lm_appinit.c rename to boards/arm/lm3s6965-ek/src/lm_appinit.c diff --git a/boards/lm3s6965-ek/src/lm_boot.c b/boards/arm/lm3s6965-ek/src/lm_boot.c similarity index 100% rename from boards/lm3s6965-ek/src/lm_boot.c rename to boards/arm/lm3s6965-ek/src/lm_boot.c diff --git a/boards/lm3s6965-ek/src/lm_ethernet.c b/boards/arm/lm3s6965-ek/src/lm_ethernet.c similarity index 100% rename from boards/lm3s6965-ek/src/lm_ethernet.c rename to boards/arm/lm3s6965-ek/src/lm_ethernet.c diff --git a/boards/lm3s6965-ek/src/lm_leds.c b/boards/arm/lm3s6965-ek/src/lm_leds.c similarity index 100% rename from boards/lm3s6965-ek/src/lm_leds.c rename to boards/arm/lm3s6965-ek/src/lm_leds.c diff --git a/boards/lm3s6965-ek/src/lm_oled.c b/boards/arm/lm3s6965-ek/src/lm_oled.c similarity index 100% rename from boards/lm3s6965-ek/src/lm_oled.c rename to boards/arm/lm3s6965-ek/src/lm_oled.c diff --git a/boards/lm3s6965-ek/src/lm_ssi.c b/boards/arm/lm3s6965-ek/src/lm_ssi.c similarity index 100% rename from boards/lm3s6965-ek/src/lm_ssi.c rename to boards/arm/lm3s6965-ek/src/lm_ssi.c diff --git a/boards/lm3s6965-ek/tools/lm3s6965-ek.cfg b/boards/arm/lm3s6965-ek/tools/lm3s6965-ek.cfg similarity index 100% rename from boards/lm3s6965-ek/tools/lm3s6965-ek.cfg rename to boards/arm/lm3s6965-ek/tools/lm3s6965-ek.cfg diff --git a/boards/lm3s6965-ek/tools/oocd.sh b/boards/arm/lm3s6965-ek/tools/oocd.sh similarity index 100% rename from boards/lm3s6965-ek/tools/oocd.sh rename to boards/arm/lm3s6965-ek/tools/oocd.sh diff --git a/boards/lm3s8962-ek/Kconfig b/boards/arm/lm3s8962-ek/Kconfig similarity index 100% rename from boards/lm3s8962-ek/Kconfig rename to boards/arm/lm3s8962-ek/Kconfig diff --git a/boards/lm3s8962-ek/README.txt b/boards/arm/lm3s8962-ek/README.txt similarity index 100% rename from boards/lm3s8962-ek/README.txt rename to boards/arm/lm3s8962-ek/README.txt diff --git a/boards/lm3s8962-ek/configs/nsh/defconfig b/boards/arm/lm3s8962-ek/configs/nsh/defconfig similarity index 100% rename from boards/lm3s8962-ek/configs/nsh/defconfig rename to boards/arm/lm3s8962-ek/configs/nsh/defconfig diff --git a/boards/lm3s8962-ek/configs/nx/defconfig b/boards/arm/lm3s8962-ek/configs/nx/defconfig similarity index 100% rename from boards/lm3s8962-ek/configs/nx/defconfig rename to boards/arm/lm3s8962-ek/configs/nx/defconfig diff --git a/boards/lm3s8962-ek/include/board.h b/boards/arm/lm3s8962-ek/include/board.h similarity index 100% rename from boards/lm3s8962-ek/include/board.h rename to boards/arm/lm3s8962-ek/include/board.h diff --git a/boards/lm3s8962-ek/scripts/Make.defs b/boards/arm/lm3s8962-ek/scripts/Make.defs similarity index 96% rename from boards/lm3s8962-ek/scripts/Make.defs rename to boards/arm/lm3s8962-ek/scripts/Make.defs index 91fdd42e59..48aa9a0b6c 100644 --- a/boards/lm3s8962-ek/scripts/Make.defs +++ b/boards/arm/lm3s8962-ek/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/lm3s8962-ek/scripts/ld.script b/boards/arm/lm3s8962-ek/scripts/ld.script similarity index 100% rename from boards/lm3s8962-ek/scripts/ld.script rename to boards/arm/lm3s8962-ek/scripts/ld.script diff --git a/boards/hymini-stm32v/src/.gitignore b/boards/arm/lm3s8962-ek/src/.gitignore similarity index 100% rename from boards/hymini-stm32v/src/.gitignore rename to boards/arm/lm3s8962-ek/src/.gitignore diff --git a/boards/lm3s8962-ek/src/Makefile b/boards/arm/lm3s8962-ek/src/Makefile similarity index 100% rename from boards/lm3s8962-ek/src/Makefile rename to boards/arm/lm3s8962-ek/src/Makefile diff --git a/boards/lm3s8962-ek/src/lm3s8962-ek.h b/boards/arm/lm3s8962-ek/src/lm3s8962-ek.h similarity index 96% rename from boards/lm3s8962-ek/src/lm3s8962-ek.h rename to boards/arm/lm3s8962-ek/src/lm3s8962-ek.h index b4f27f7926..c19a0d7d8c 100644 --- a/boards/lm3s8962-ek/src/lm3s8962-ek.h +++ b/boards/arm/lm3s8962-ek/src/lm3s8962-ek.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_LM3S8962_EK_SRC_LM3S8962EK_H -#define __BOARDS_LM3S8962_EK_SRC_LM3S8962EK_H +#ifndef __BOARDS_ARM_LM3S8962_EK_SRC_LM3S8962EK_H +#define __BOARDS_ARM_LM3S8962_EK_SRC_LM3S8962EK_H /************************************************************************************ * Included Files @@ -129,5 +129,5 @@ void weak_function lm_ssidev_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_LM3S8962_EK_SRC_LM3S8962EK_H */ +#endif /* __BOARDS_ARM_LM3S8962_EK_SRC_LM3S8962EK_H */ diff --git a/boards/lm3s8962-ek/src/lm_appinit.c b/boards/arm/lm3s8962-ek/src/lm_appinit.c similarity index 100% rename from boards/lm3s8962-ek/src/lm_appinit.c rename to boards/arm/lm3s8962-ek/src/lm_appinit.c diff --git a/boards/lm3s8962-ek/src/lm_boot.c b/boards/arm/lm3s8962-ek/src/lm_boot.c similarity index 100% rename from boards/lm3s8962-ek/src/lm_boot.c rename to boards/arm/lm3s8962-ek/src/lm_boot.c diff --git a/boards/lm3s8962-ek/src/lm_ethernet.c b/boards/arm/lm3s8962-ek/src/lm_ethernet.c similarity index 100% rename from boards/lm3s8962-ek/src/lm_ethernet.c rename to boards/arm/lm3s8962-ek/src/lm_ethernet.c diff --git a/boards/lm3s8962-ek/src/lm_leds.c b/boards/arm/lm3s8962-ek/src/lm_leds.c similarity index 100% rename from boards/lm3s8962-ek/src/lm_leds.c rename to boards/arm/lm3s8962-ek/src/lm_leds.c diff --git a/boards/lm3s8962-ek/src/lm_oled.c b/boards/arm/lm3s8962-ek/src/lm_oled.c similarity index 100% rename from boards/lm3s8962-ek/src/lm_oled.c rename to boards/arm/lm3s8962-ek/src/lm_oled.c diff --git a/boards/lm3s8962-ek/src/lm_ssi.c b/boards/arm/lm3s8962-ek/src/lm_ssi.c similarity index 100% rename from boards/lm3s8962-ek/src/lm_ssi.c rename to boards/arm/lm3s8962-ek/src/lm_ssi.c diff --git a/boards/lm4f120-launchpad/Kconfig b/boards/arm/lm4f120-launchpad/Kconfig similarity index 100% rename from boards/lm4f120-launchpad/Kconfig rename to boards/arm/lm4f120-launchpad/Kconfig diff --git a/boards/lm4f120-launchpad/README.txt b/boards/arm/lm4f120-launchpad/README.txt similarity index 100% rename from boards/lm4f120-launchpad/README.txt rename to boards/arm/lm4f120-launchpad/README.txt diff --git a/boards/lm4f120-launchpad/configs/nsh/defconfig b/boards/arm/lm4f120-launchpad/configs/nsh/defconfig similarity index 100% rename from boards/lm4f120-launchpad/configs/nsh/defconfig rename to boards/arm/lm4f120-launchpad/configs/nsh/defconfig diff --git a/boards/lm4f120-launchpad/include/board.h b/boards/arm/lm4f120-launchpad/include/board.h similarity index 97% rename from boards/lm4f120-launchpad/include/board.h rename to boards/arm/lm4f120-launchpad/include/board.h index c1ecf6e23d..6c9c68f2c1 100644 --- a/boards/lm4f120-launchpad/include/board.h +++ b/boards/arm/lm4f120-launchpad/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_LM4F120_LAUNCHPAD_INCLUDE_BOARD_H -#define __BOARDS_LM4F120_LAUNCHPAD_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_LM4F120_LAUNCHPAD_INCLUDE_BOARD_H +#define __BOARDS_ARM_LM4F120_LAUNCHPAD_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -191,4 +191,4 @@ #define GPIO_UART1_RX GPIO_UART1_RX_1 #define GPIO_UART1_TX GPIO_UART1_TX_1 -#endif /* __BOARDS_LM4F120_LAUNCHPAD_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_LM4F120_LAUNCHPAD_INCLUDE_BOARD_H */ diff --git a/boards/lm4f120-launchpad/scripts/Make.defs b/boards/arm/lm4f120-launchpad/scripts/Make.defs similarity index 96% rename from boards/lm4f120-launchpad/scripts/Make.defs rename to boards/arm/lm4f120-launchpad/scripts/Make.defs index 9f0245a4db..9e9ead4149 100644 --- a/boards/lm4f120-launchpad/scripts/Make.defs +++ b/boards/arm/lm4f120-launchpad/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/lm4f120-launchpad.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/lm4f120-launchpad.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/lm4f120-launchpad.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/lm4f120-launchpad.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/lm4f120-launchpad/scripts/lm4f120-launchpad.ld b/boards/arm/lm4f120-launchpad/scripts/lm4f120-launchpad.ld similarity index 100% rename from boards/lm4f120-launchpad/scripts/lm4f120-launchpad.ld rename to boards/arm/lm4f120-launchpad/scripts/lm4f120-launchpad.ld diff --git a/boards/kwikstik-k40/src/.gitignore b/boards/arm/lm4f120-launchpad/src/.gitignore similarity index 100% rename from boards/kwikstik-k40/src/.gitignore rename to boards/arm/lm4f120-launchpad/src/.gitignore diff --git a/boards/lm4f120-launchpad/src/Makefile b/boards/arm/lm4f120-launchpad/src/Makefile similarity index 100% rename from boards/lm4f120-launchpad/src/Makefile rename to boards/arm/lm4f120-launchpad/src/Makefile diff --git a/boards/lm4f120-launchpad/src/lm4f_appinit.c b/boards/arm/lm4f120-launchpad/src/lm4f_appinit.c similarity index 100% rename from boards/lm4f120-launchpad/src/lm4f_appinit.c rename to boards/arm/lm4f120-launchpad/src/lm4f_appinit.c diff --git a/boards/lm4f120-launchpad/src/lm4f_autoleds.c b/boards/arm/lm4f120-launchpad/src/lm4f_autoleds.c similarity index 100% rename from boards/lm4f120-launchpad/src/lm4f_autoleds.c rename to boards/arm/lm4f120-launchpad/src/lm4f_autoleds.c diff --git a/boards/lm4f120-launchpad/src/lm4f_boot.c b/boards/arm/lm4f120-launchpad/src/lm4f_boot.c similarity index 100% rename from boards/lm4f120-launchpad/src/lm4f_boot.c rename to boards/arm/lm4f120-launchpad/src/lm4f_boot.c diff --git a/boards/lm4f120-launchpad/src/lm4f_ssi.c b/boards/arm/lm4f120-launchpad/src/lm4f_ssi.c similarity index 100% rename from boards/lm4f120-launchpad/src/lm4f_ssi.c rename to boards/arm/lm4f120-launchpad/src/lm4f_ssi.c diff --git a/boards/lm4f120-launchpad/src/lmf4120-launchpad.h b/boards/arm/lm4f120-launchpad/src/lmf4120-launchpad.h similarity index 97% rename from boards/lm4f120-launchpad/src/lmf4120-launchpad.h rename to boards/arm/lm4f120-launchpad/src/lmf4120-launchpad.h index d393aac973..052edad76d 100644 --- a/boards/lm4f120-launchpad/src/lmf4120-launchpad.h +++ b/boards/arm/lm4f120-launchpad/src/lmf4120-launchpad.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_LM4F120_LAUNCHPAD_LM4F120_LAUNCHPAD_H -#define __BOARDS_LM4F120_LAUNCHPAD_LM4F120_LAUNCHPAD_H +#ifndef __BOARDS_ARM_LM4F120_LAUNCHPAD_LM4F120_LAUNCHPAD_H +#define __BOARDS_ARM_LM4F120_LAUNCHPAD_LM4F120_LAUNCHPAD_H /************************************************************************************ * Included Files @@ -149,5 +149,5 @@ void lm4f_led_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_LM4F120_LAUNCHPAD_LM4F120_LAUNCHPAD_H */ +#endif /* __BOARDS_ARM_LM4F120_LAUNCHPAD_LM4F120_LAUNCHPAD_H */ diff --git a/boards/lm4f120-launchpad/tools/lm4f120-launchpad.cfg b/boards/arm/lm4f120-launchpad/tools/lm4f120-launchpad.cfg similarity index 100% rename from boards/lm4f120-launchpad/tools/lm4f120-launchpad.cfg rename to boards/arm/lm4f120-launchpad/tools/lm4f120-launchpad.cfg diff --git a/boards/lm4f120-launchpad/tools/oocd.sh b/boards/arm/lm4f120-launchpad/tools/oocd.sh similarity index 100% rename from boards/lm4f120-launchpad/tools/oocd.sh rename to boards/arm/lm4f120-launchpad/tools/oocd.sh diff --git a/boards/lpc4088-devkit/Kconfig b/boards/arm/lpc4088-devkit/Kconfig similarity index 100% rename from boards/lpc4088-devkit/Kconfig rename to boards/arm/lpc4088-devkit/Kconfig diff --git a/boards/lpc4088-devkit/README.txt b/boards/arm/lpc4088-devkit/README.txt similarity index 100% rename from boards/lpc4088-devkit/README.txt rename to boards/arm/lpc4088-devkit/README.txt diff --git a/boards/lpc4088-devkit/configs/knsh/Make.defs b/boards/arm/lpc4088-devkit/configs/knsh/Make.defs similarity index 91% rename from boards/lpc4088-devkit/configs/knsh/Make.defs rename to boards/arm/lpc4088-devkit/configs/knsh/Make.defs index 30781b244d..cdeef211bd 100644 --- a/boards/lpc4088-devkit/configs/knsh/Make.defs +++ b/boards/arm/lpc4088-devkit/configs/knsh/Make.defs @@ -44,15 +44,15 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/lpc4088-devkit/configs/knsh/defconfig b/boards/arm/lpc4088-devkit/configs/knsh/defconfig similarity index 100% rename from boards/lpc4088-devkit/configs/knsh/defconfig rename to boards/arm/lpc4088-devkit/configs/knsh/defconfig diff --git a/boards/lpc4088-devkit/configs/nsh/defconfig b/boards/arm/lpc4088-devkit/configs/nsh/defconfig similarity index 100% rename from boards/lpc4088-devkit/configs/nsh/defconfig rename to boards/arm/lpc4088-devkit/configs/nsh/defconfig diff --git a/boards/lpc4088-devkit/include/board.h b/boards/arm/lpc4088-devkit/include/board.h similarity index 99% rename from boards/lpc4088-devkit/include/board.h rename to boards/arm/lpc4088-devkit/include/board.h index fe21f1ec94..600255df40 100644 --- a/boards/lpc4088-devkit/include/board.h +++ b/boards/arm/lpc4088-devkit/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_LPC4088_DEVKIT_INCLUDE_BOARD_H -#define __CONFIG_LPC4088_DEVKIT_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_LPC4088_DEVKIT_INCLUDE_BOARD_H +#define __BOARDS_ARM_LPC4088_DEVKIT_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -436,4 +436,4 @@ #endif -#endif /* __CONFIG_LPC4088_DEVKIT_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_LPC4088_DEVKIT_INCLUDE_BOARD_H */ diff --git a/boards/lpc4088-devkit/kernel/.gitignore b/boards/arm/lpc4088-devkit/kernel/.gitignore similarity index 100% rename from boards/lpc4088-devkit/kernel/.gitignore rename to boards/arm/lpc4088-devkit/kernel/.gitignore diff --git a/boards/lpc4088-devkit/kernel/Makefile b/boards/arm/lpc4088-devkit/kernel/Makefile similarity index 100% rename from boards/lpc4088-devkit/kernel/Makefile rename to boards/arm/lpc4088-devkit/kernel/Makefile diff --git a/boards/lpc4088-devkit/kernel/lpc17_40_userspace.c b/boards/arm/lpc4088-devkit/kernel/lpc17_40_userspace.c similarity index 100% rename from boards/lpc4088-devkit/kernel/lpc17_40_userspace.c rename to boards/arm/lpc4088-devkit/kernel/lpc17_40_userspace.c diff --git a/boards/lpc4088-devkit/scripts/Make.defs b/boards/arm/lpc4088-devkit/scripts/Make.defs similarity index 95% rename from boards/lpc4088-devkit/scripts/Make.defs rename to boards/arm/lpc4088-devkit/scripts/Make.defs index 4031c0538a..a36627351d 100644 --- a/boards/lpc4088-devkit/scripts/Make.defs +++ b/boards/arm/lpc4088-devkit/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/lpc4088-devkit/scripts/kernel-space.ld b/boards/arm/lpc4088-devkit/scripts/kernel-space.ld similarity index 100% rename from boards/lpc4088-devkit/scripts/kernel-space.ld rename to boards/arm/lpc4088-devkit/scripts/kernel-space.ld diff --git a/boards/lpc4088-devkit/scripts/ld.script b/boards/arm/lpc4088-devkit/scripts/ld.script similarity index 100% rename from boards/lpc4088-devkit/scripts/ld.script rename to boards/arm/lpc4088-devkit/scripts/ld.script diff --git a/boards/lpc4088-devkit/scripts/memory.ld b/boards/arm/lpc4088-devkit/scripts/memory.ld similarity index 100% rename from boards/lpc4088-devkit/scripts/memory.ld rename to boards/arm/lpc4088-devkit/scripts/memory.ld diff --git a/boards/lpc4088-devkit/scripts/user-space.ld b/boards/arm/lpc4088-devkit/scripts/user-space.ld similarity index 100% rename from boards/lpc4088-devkit/scripts/user-space.ld rename to boards/arm/lpc4088-devkit/scripts/user-space.ld diff --git a/boards/lincoln60/src/.gitignore b/boards/arm/lpc4088-devkit/src/.gitignore similarity index 100% rename from boards/lincoln60/src/.gitignore rename to boards/arm/lpc4088-devkit/src/.gitignore diff --git a/boards/lpc4088-devkit/src/Makefile b/boards/arm/lpc4088-devkit/src/Makefile similarity index 100% rename from boards/lpc4088-devkit/src/Makefile rename to boards/arm/lpc4088-devkit/src/Makefile diff --git a/boards/lpc4088-devkit/src/lpc17_40_appinit.c b/boards/arm/lpc4088-devkit/src/lpc17_40_appinit.c similarity index 100% rename from boards/lpc4088-devkit/src/lpc17_40_appinit.c rename to boards/arm/lpc4088-devkit/src/lpc17_40_appinit.c diff --git a/boards/lpc4088-devkit/src/lpc17_40_autoleds.c b/boards/arm/lpc4088-devkit/src/lpc17_40_autoleds.c similarity index 100% rename from boards/lpc4088-devkit/src/lpc17_40_autoleds.c rename to boards/arm/lpc4088-devkit/src/lpc17_40_autoleds.c diff --git a/boards/lpc4088-devkit/src/lpc17_40_boardinitialize.c b/boards/arm/lpc4088-devkit/src/lpc17_40_boardinitialize.c similarity index 100% rename from boards/lpc4088-devkit/src/lpc17_40_boardinitialize.c rename to boards/arm/lpc4088-devkit/src/lpc17_40_boardinitialize.c diff --git a/boards/lpc4088-devkit/src/lpc17_40_bringup.c b/boards/arm/lpc4088-devkit/src/lpc17_40_bringup.c similarity index 100% rename from boards/lpc4088-devkit/src/lpc17_40_bringup.c rename to boards/arm/lpc4088-devkit/src/lpc17_40_bringup.c diff --git a/boards/lpc4088-devkit/src/lpc17_40_buttons.c b/boards/arm/lpc4088-devkit/src/lpc17_40_buttons.c similarity index 100% rename from boards/lpc4088-devkit/src/lpc17_40_buttons.c rename to boards/arm/lpc4088-devkit/src/lpc17_40_buttons.c diff --git a/boards/lpc4088-devkit/src/lpc17_40_djoystick.c b/boards/arm/lpc4088-devkit/src/lpc17_40_djoystick.c similarity index 100% rename from boards/lpc4088-devkit/src/lpc17_40_djoystick.c rename to boards/arm/lpc4088-devkit/src/lpc17_40_djoystick.c diff --git a/boards/lpc4088-devkit/src/lpc17_40_lcd.c b/boards/arm/lpc4088-devkit/src/lpc17_40_lcd.c similarity index 100% rename from boards/lpc4088-devkit/src/lpc17_40_lcd.c rename to boards/arm/lpc4088-devkit/src/lpc17_40_lcd.c diff --git a/boards/lpc4088-devkit/src/lpc17_40_nandinitialize.c b/boards/arm/lpc4088-devkit/src/lpc17_40_nandinitialize.c similarity index 100% rename from boards/lpc4088-devkit/src/lpc17_40_nandinitialize.c rename to boards/arm/lpc4088-devkit/src/lpc17_40_nandinitialize.c diff --git a/boards/lpc4088-devkit/src/lpc17_40_norinitialize.c b/boards/arm/lpc4088-devkit/src/lpc17_40_norinitialize.c similarity index 100% rename from boards/lpc4088-devkit/src/lpc17_40_norinitialize.c rename to boards/arm/lpc4088-devkit/src/lpc17_40_norinitialize.c diff --git a/boards/lpc4088-devkit/src/lpc17_40_sdraminitialize.c b/boards/arm/lpc4088-devkit/src/lpc17_40_sdraminitialize.c similarity index 100% rename from boards/lpc4088-devkit/src/lpc17_40_sdraminitialize.c rename to boards/arm/lpc4088-devkit/src/lpc17_40_sdraminitialize.c diff --git a/boards/lpc4088-devkit/src/lpc17_40_ssp.c b/boards/arm/lpc4088-devkit/src/lpc17_40_ssp.c similarity index 100% rename from boards/lpc4088-devkit/src/lpc17_40_ssp.c rename to boards/arm/lpc4088-devkit/src/lpc17_40_ssp.c diff --git a/boards/lpc4088-devkit/src/lpc17_40_touchscreen.c b/boards/arm/lpc4088-devkit/src/lpc17_40_touchscreen.c similarity index 100% rename from boards/lpc4088-devkit/src/lpc17_40_touchscreen.c rename to boards/arm/lpc4088-devkit/src/lpc17_40_touchscreen.c diff --git a/boards/lpc4088-devkit/src/lpc17_40_userleds.c b/boards/arm/lpc4088-devkit/src/lpc17_40_userleds.c similarity index 100% rename from boards/lpc4088-devkit/src/lpc17_40_userleds.c rename to boards/arm/lpc4088-devkit/src/lpc17_40_userleds.c diff --git a/boards/lpc4088-devkit/src/lpc4088-devkit.h b/boards/arm/lpc4088-devkit/src/lpc4088-devkit.h similarity index 100% rename from boards/lpc4088-devkit/src/lpc4088-devkit.h rename to boards/arm/lpc4088-devkit/src/lpc4088-devkit.h diff --git a/boards/lpc4088-devkit/tools/lpc4088-devkit.cfg b/boards/arm/lpc4088-devkit/tools/lpc4088-devkit.cfg similarity index 100% rename from boards/lpc4088-devkit/tools/lpc4088-devkit.cfg rename to boards/arm/lpc4088-devkit/tools/lpc4088-devkit.cfg diff --git a/boards/lpc4088-devkit/tools/oocd.sh b/boards/arm/lpc4088-devkit/tools/oocd.sh similarity index 100% rename from boards/lpc4088-devkit/tools/oocd.sh rename to boards/arm/lpc4088-devkit/tools/oocd.sh diff --git a/boards/lpc4088-quickstart/Kconfig b/boards/arm/lpc4088-quickstart/Kconfig similarity index 100% rename from boards/lpc4088-quickstart/Kconfig rename to boards/arm/lpc4088-quickstart/Kconfig diff --git a/boards/lpc4088-quickstart/README.txt b/boards/arm/lpc4088-quickstart/README.txt similarity index 100% rename from boards/lpc4088-quickstart/README.txt rename to boards/arm/lpc4088-quickstart/README.txt diff --git a/boards/lpc4088-quickstart/configs/knsh/Make.defs b/boards/arm/lpc4088-quickstart/configs/knsh/Make.defs similarity index 91% rename from boards/lpc4088-quickstart/configs/knsh/Make.defs rename to boards/arm/lpc4088-quickstart/configs/knsh/Make.defs index ecc1afa8f7..6fbcc6ee50 100644 --- a/boards/lpc4088-quickstart/configs/knsh/Make.defs +++ b/boards/arm/lpc4088-quickstart/configs/knsh/Make.defs @@ -44,15 +44,15 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/lpc4088-quickstart/configs/knsh/defconfig b/boards/arm/lpc4088-quickstart/configs/knsh/defconfig similarity index 100% rename from boards/lpc4088-quickstart/configs/knsh/defconfig rename to boards/arm/lpc4088-quickstart/configs/knsh/defconfig diff --git a/boards/lpc4088-quickstart/configs/nsh/defconfig b/boards/arm/lpc4088-quickstart/configs/nsh/defconfig similarity index 100% rename from boards/lpc4088-quickstart/configs/nsh/defconfig rename to boards/arm/lpc4088-quickstart/configs/nsh/defconfig diff --git a/boards/lpc4088-quickstart/include/board.h b/boards/arm/lpc4088-quickstart/include/board.h similarity index 98% rename from boards/lpc4088-quickstart/include/board.h rename to boards/arm/lpc4088-quickstart/include/board.h index a99a40891d..a668391a8c 100644 --- a/boards/lpc4088-quickstart/include/board.h +++ b/boards/arm/lpc4088-quickstart/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_LPC4088_QUICKSTART_INCLUDE_BOARD_H -#define __CONFIG_LPC4088_QUICKSTART_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_LPC4088_QUICKSTART_INCLUDE_BOARD_H +#define __BOARDS_ARM_LPC4088_QUICKSTART_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -377,4 +377,4 @@ #endif -#endif /* __CONFIG_LPC4088_QUICKSTART_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_LPC4088_QUICKSTART_INCLUDE_BOARD_H */ diff --git a/boards/lpc4088-quickstart/kernel/.gitignore b/boards/arm/lpc4088-quickstart/kernel/.gitignore similarity index 100% rename from boards/lpc4088-quickstart/kernel/.gitignore rename to boards/arm/lpc4088-quickstart/kernel/.gitignore diff --git a/boards/lpc4088-quickstart/kernel/Makefile b/boards/arm/lpc4088-quickstart/kernel/Makefile similarity index 100% rename from boards/lpc4088-quickstart/kernel/Makefile rename to boards/arm/lpc4088-quickstart/kernel/Makefile diff --git a/boards/lpc4088-quickstart/kernel/lpc17_40_userspace.c b/boards/arm/lpc4088-quickstart/kernel/lpc17_40_userspace.c similarity index 100% rename from boards/lpc4088-quickstart/kernel/lpc17_40_userspace.c rename to boards/arm/lpc4088-quickstart/kernel/lpc17_40_userspace.c diff --git a/boards/lpc4088-quickstart/scripts/Make.defs b/boards/arm/lpc4088-quickstart/scripts/Make.defs similarity index 95% rename from boards/lpc4088-quickstart/scripts/Make.defs rename to boards/arm/lpc4088-quickstart/scripts/Make.defs index 4cbfd6369c..34d9588053 100644 --- a/boards/lpc4088-quickstart/scripts/Make.defs +++ b/boards/arm/lpc4088-quickstart/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/lpc4088-quickstart/scripts/kernel-space.ld b/boards/arm/lpc4088-quickstart/scripts/kernel-space.ld similarity index 100% rename from boards/lpc4088-quickstart/scripts/kernel-space.ld rename to boards/arm/lpc4088-quickstart/scripts/kernel-space.ld diff --git a/boards/lpc4088-quickstart/scripts/ld.script b/boards/arm/lpc4088-quickstart/scripts/ld.script similarity index 100% rename from boards/lpc4088-quickstart/scripts/ld.script rename to boards/arm/lpc4088-quickstart/scripts/ld.script diff --git a/boards/lpc4088-quickstart/scripts/memory.ld b/boards/arm/lpc4088-quickstart/scripts/memory.ld similarity index 100% rename from boards/lpc4088-quickstart/scripts/memory.ld rename to boards/arm/lpc4088-quickstart/scripts/memory.ld diff --git a/boards/lpc4088-quickstart/scripts/user-space.ld b/boards/arm/lpc4088-quickstart/scripts/user-space.ld similarity index 100% rename from boards/lpc4088-quickstart/scripts/user-space.ld rename to boards/arm/lpc4088-quickstart/scripts/user-space.ld diff --git a/boards/lm3s6432-s2e/src/.gitignore b/boards/arm/lpc4088-quickstart/src/.gitignore similarity index 100% rename from boards/lm3s6432-s2e/src/.gitignore rename to boards/arm/lpc4088-quickstart/src/.gitignore diff --git a/boards/lpc4088-quickstart/src/Makefile b/boards/arm/lpc4088-quickstart/src/Makefile similarity index 100% rename from boards/lpc4088-quickstart/src/Makefile rename to boards/arm/lpc4088-quickstart/src/Makefile diff --git a/boards/lpc4088-quickstart/src/lpc17_40_appinit.c b/boards/arm/lpc4088-quickstart/src/lpc17_40_appinit.c similarity index 100% rename from boards/lpc4088-quickstart/src/lpc17_40_appinit.c rename to boards/arm/lpc4088-quickstart/src/lpc17_40_appinit.c diff --git a/boards/lpc4088-quickstart/src/lpc17_40_autoleds.c b/boards/arm/lpc4088-quickstart/src/lpc17_40_autoleds.c similarity index 100% rename from boards/lpc4088-quickstart/src/lpc17_40_autoleds.c rename to boards/arm/lpc4088-quickstart/src/lpc17_40_autoleds.c diff --git a/boards/lpc4088-quickstart/src/lpc17_40_boardinitialize.c b/boards/arm/lpc4088-quickstart/src/lpc17_40_boardinitialize.c similarity index 100% rename from boards/lpc4088-quickstart/src/lpc17_40_boardinitialize.c rename to boards/arm/lpc4088-quickstart/src/lpc17_40_boardinitialize.c diff --git a/boards/lpc4088-quickstart/src/lpc17_40_bringup.c b/boards/arm/lpc4088-quickstart/src/lpc17_40_bringup.c similarity index 100% rename from boards/lpc4088-quickstart/src/lpc17_40_bringup.c rename to boards/arm/lpc4088-quickstart/src/lpc17_40_bringup.c diff --git a/boards/lpc4088-quickstart/src/lpc17_40_buttons.c b/boards/arm/lpc4088-quickstart/src/lpc17_40_buttons.c similarity index 100% rename from boards/lpc4088-quickstart/src/lpc17_40_buttons.c rename to boards/arm/lpc4088-quickstart/src/lpc17_40_buttons.c diff --git a/boards/lpc4088-quickstart/src/lpc17_40_lcd.c b/boards/arm/lpc4088-quickstart/src/lpc17_40_lcd.c similarity index 100% rename from boards/lpc4088-quickstart/src/lpc17_40_lcd.c rename to boards/arm/lpc4088-quickstart/src/lpc17_40_lcd.c diff --git a/boards/lpc4088-quickstart/src/lpc17_40_nandinitialize.c b/boards/arm/lpc4088-quickstart/src/lpc17_40_nandinitialize.c similarity index 100% rename from boards/lpc4088-quickstart/src/lpc17_40_nandinitialize.c rename to boards/arm/lpc4088-quickstart/src/lpc17_40_nandinitialize.c diff --git a/boards/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c b/boards/arm/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c similarity index 100% rename from boards/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c rename to boards/arm/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c diff --git a/boards/lpc4088-quickstart/src/lpc17_40_ssp.c b/boards/arm/lpc4088-quickstart/src/lpc17_40_ssp.c similarity index 100% rename from boards/lpc4088-quickstart/src/lpc17_40_ssp.c rename to boards/arm/lpc4088-quickstart/src/lpc17_40_ssp.c diff --git a/boards/lpc4088-quickstart/src/lpc17_40_userleds.c b/boards/arm/lpc4088-quickstart/src/lpc17_40_userleds.c similarity index 100% rename from boards/lpc4088-quickstart/src/lpc17_40_userleds.c rename to boards/arm/lpc4088-quickstart/src/lpc17_40_userleds.c diff --git a/boards/lpc4088-quickstart/src/lpc4088-quickstart.h b/boards/arm/lpc4088-quickstart/src/lpc4088-quickstart.h similarity index 100% rename from boards/lpc4088-quickstart/src/lpc4088-quickstart.h rename to boards/arm/lpc4088-quickstart/src/lpc4088-quickstart.h diff --git a/boards/lpc4088-quickstart/tools/lpc4088-quickstart.cfg b/boards/arm/lpc4088-quickstart/tools/lpc4088-quickstart.cfg similarity index 100% rename from boards/lpc4088-quickstart/tools/lpc4088-quickstart.cfg rename to boards/arm/lpc4088-quickstart/tools/lpc4088-quickstart.cfg diff --git a/boards/lpc4088-quickstart/tools/oocd.sh b/boards/arm/lpc4088-quickstart/tools/oocd.sh similarity index 100% rename from boards/lpc4088-quickstart/tools/oocd.sh rename to boards/arm/lpc4088-quickstart/tools/oocd.sh diff --git a/boards/lpc4330-xplorer/Kconfig b/boards/arm/lpc4330-xplorer/Kconfig similarity index 100% rename from boards/lpc4330-xplorer/Kconfig rename to boards/arm/lpc4330-xplorer/Kconfig diff --git a/boards/lpc4330-xplorer/README.txt b/boards/arm/lpc4330-xplorer/README.txt similarity index 100% rename from boards/lpc4330-xplorer/README.txt rename to boards/arm/lpc4330-xplorer/README.txt diff --git a/boards/lpc4330-xplorer/configs/nsh/defconfig b/boards/arm/lpc4330-xplorer/configs/nsh/defconfig similarity index 100% rename from boards/lpc4330-xplorer/configs/nsh/defconfig rename to boards/arm/lpc4330-xplorer/configs/nsh/defconfig diff --git a/boards/lpc4330-xplorer/include/board.h b/boards/arm/lpc4330-xplorer/include/board.h similarity index 100% rename from boards/lpc4330-xplorer/include/board.h rename to boards/arm/lpc4330-xplorer/include/board.h diff --git a/boards/lpc4330-xplorer/scripts/Make.defs b/boards/arm/lpc4330-xplorer/scripts/Make.defs similarity index 97% rename from boards/lpc4330-xplorer/scripts/Make.defs rename to boards/arm/lpc4330-xplorer/scripts/Make.defs index 6fe328c720..f8526c1c14 100644 --- a/boards/lpc4330-xplorer/scripts/Make.defs +++ b/boards/arm/lpc4330-xplorer/scripts/Make.defs @@ -64,13 +64,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/lpc4330-xplorer/scripts/flash.sh b/boards/arm/lpc4330-xplorer/scripts/flash.sh similarity index 100% rename from boards/lpc4330-xplorer/scripts/flash.sh rename to boards/arm/lpc4330-xplorer/scripts/flash.sh diff --git a/boards/lpc4330-xplorer/scripts/ramconfig.ld b/boards/arm/lpc4330-xplorer/scripts/ramconfig.ld similarity index 100% rename from boards/lpc4330-xplorer/scripts/ramconfig.ld rename to boards/arm/lpc4330-xplorer/scripts/ramconfig.ld diff --git a/boards/lpc4330-xplorer/scripts/spificonfig.ld b/boards/arm/lpc4330-xplorer/scripts/spificonfig.ld similarity index 100% rename from boards/lpc4330-xplorer/scripts/spificonfig.ld rename to boards/arm/lpc4330-xplorer/scripts/spificonfig.ld diff --git a/boards/lm3s6965-ek/src/.gitignore b/boards/arm/lpc4330-xplorer/src/.gitignore similarity index 100% rename from boards/lm3s6965-ek/src/.gitignore rename to boards/arm/lpc4330-xplorer/src/.gitignore diff --git a/boards/lpc4330-xplorer/src/Makefile b/boards/arm/lpc4330-xplorer/src/Makefile similarity index 100% rename from boards/lpc4330-xplorer/src/Makefile rename to boards/arm/lpc4330-xplorer/src/Makefile diff --git a/boards/lpc4330-xplorer/src/lpc4330-xplorer.h b/boards/arm/lpc4330-xplorer/src/lpc4330-xplorer.h similarity index 100% rename from boards/lpc4330-xplorer/src/lpc4330-xplorer.h rename to boards/arm/lpc4330-xplorer/src/lpc4330-xplorer.h diff --git a/boards/lpc4330-xplorer/src/lpc43_appinit.c b/boards/arm/lpc4330-xplorer/src/lpc43_appinit.c similarity index 100% rename from boards/lpc4330-xplorer/src/lpc43_appinit.c rename to boards/arm/lpc4330-xplorer/src/lpc43_appinit.c diff --git a/boards/lpc4330-xplorer/src/lpc43_autoleds.c b/boards/arm/lpc4330-xplorer/src/lpc43_autoleds.c similarity index 100% rename from boards/lpc4330-xplorer/src/lpc43_autoleds.c rename to boards/arm/lpc4330-xplorer/src/lpc43_autoleds.c diff --git a/boards/lpc4330-xplorer/src/lpc43_boot.c b/boards/arm/lpc4330-xplorer/src/lpc43_boot.c similarity index 100% rename from boards/lpc4330-xplorer/src/lpc43_boot.c rename to boards/arm/lpc4330-xplorer/src/lpc43_boot.c diff --git a/boards/lpc4330-xplorer/src/lpc43_buttons.c b/boards/arm/lpc4330-xplorer/src/lpc43_buttons.c similarity index 100% rename from boards/lpc4330-xplorer/src/lpc43_buttons.c rename to boards/arm/lpc4330-xplorer/src/lpc43_buttons.c diff --git a/boards/lpc4330-xplorer/src/lpc43_ostest.c b/boards/arm/lpc4330-xplorer/src/lpc43_ostest.c similarity index 100% rename from boards/lpc4330-xplorer/src/lpc43_ostest.c rename to boards/arm/lpc4330-xplorer/src/lpc43_ostest.c diff --git a/boards/lpc4330-xplorer/src/lpc43_userleds.c b/boards/arm/lpc4330-xplorer/src/lpc43_userleds.c similarity index 100% rename from boards/lpc4330-xplorer/src/lpc43_userleds.c rename to boards/arm/lpc4330-xplorer/src/lpc43_userleds.c diff --git a/boards/lpc4337-ws/Kconfig b/boards/arm/lpc4337-ws/Kconfig similarity index 100% rename from boards/lpc4337-ws/Kconfig rename to boards/arm/lpc4337-ws/Kconfig diff --git a/boards/lpc4337-ws/README.txt b/boards/arm/lpc4337-ws/README.txt similarity index 100% rename from boards/lpc4337-ws/README.txt rename to boards/arm/lpc4337-ws/README.txt diff --git a/boards/lpc4337-ws/configs/nsh/defconfig b/boards/arm/lpc4337-ws/configs/nsh/defconfig similarity index 100% rename from boards/lpc4337-ws/configs/nsh/defconfig rename to boards/arm/lpc4337-ws/configs/nsh/defconfig diff --git a/boards/lpc4337-ws/include/board.h b/boards/arm/lpc4337-ws/include/board.h similarity index 98% rename from boards/lpc4337-ws/include/board.h rename to boards/arm/lpc4337-ws/include/board.h index a1d57959f1..68035c3b6b 100644 --- a/boards/lpc4337-ws/include/board.h +++ b/boards/arm/lpc4337-ws/include/board.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_LPC4337_WS_INCLUDE_BOARD_H -#define __BOARDS_LPC4337_WS_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_LPC4337_WS_INCLUDE_BOARD_H +#define __BOARDS_ARM_LPC4337_WS_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -317,4 +317,4 @@ #define PINCONF_SSP1_MOSI PINCONF_SSP1_MOSI_1 #define PINCONF_SSP1_SCK PINCONF_SSP1_SCK_2 -#endif /* __BOARDS_LPC4337_WS_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_LPC4337_WS_INCLUDE_BOARD_H */ diff --git a/boards/lpc4337-ws/scripts/Make.defs b/boards/arm/lpc4337-ws/scripts/Make.defs similarity index 97% rename from boards/lpc4337-ws/scripts/Make.defs rename to boards/arm/lpc4337-ws/scripts/Make.defs index 4c30b84af8..db36477a52 100644 --- a/boards/lpc4337-ws/scripts/Make.defs +++ b/boards/arm/lpc4337-ws/scripts/Make.defs @@ -64,13 +64,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/lpc4337-ws/scripts/flash.bat b/boards/arm/lpc4337-ws/scripts/flash.bat similarity index 100% rename from boards/lpc4337-ws/scripts/flash.bat rename to boards/arm/lpc4337-ws/scripts/flash.bat diff --git a/boards/lpc4337-ws/scripts/flash.sh b/boards/arm/lpc4337-ws/scripts/flash.sh similarity index 100% rename from boards/lpc4337-ws/scripts/flash.sh rename to boards/arm/lpc4337-ws/scripts/flash.sh diff --git a/boards/lpc4337-ws/scripts/flashaconfig.ld b/boards/arm/lpc4337-ws/scripts/flashaconfig.ld similarity index 100% rename from boards/lpc4337-ws/scripts/flashaconfig.ld rename to boards/arm/lpc4337-ws/scripts/flashaconfig.ld diff --git a/boards/lpc4337-ws/scripts/ramconfig.ld b/boards/arm/lpc4337-ws/scripts/ramconfig.ld similarity index 100% rename from boards/lpc4337-ws/scripts/ramconfig.ld rename to boards/arm/lpc4337-ws/scripts/ramconfig.ld diff --git a/boards/lm3s8962-ek/src/.gitignore b/boards/arm/lpc4337-ws/src/.gitignore similarity index 100% rename from boards/lm3s8962-ek/src/.gitignore rename to boards/arm/lpc4337-ws/src/.gitignore diff --git a/boards/lpc4337-ws/src/Makefile b/boards/arm/lpc4337-ws/src/Makefile similarity index 100% rename from boards/lpc4337-ws/src/Makefile rename to boards/arm/lpc4337-ws/src/Makefile diff --git a/boards/lpc4337-ws/src/lpc4337-ws.h b/boards/arm/lpc4337-ws/src/lpc4337-ws.h similarity index 100% rename from boards/lpc4337-ws/src/lpc4337-ws.h rename to boards/arm/lpc4337-ws/src/lpc4337-ws.h diff --git a/boards/lpc4337-ws/src/lpc43_adc.c b/boards/arm/lpc4337-ws/src/lpc43_adc.c similarity index 100% rename from boards/lpc4337-ws/src/lpc43_adc.c rename to boards/arm/lpc4337-ws/src/lpc43_adc.c diff --git a/boards/lpc4337-ws/src/lpc43_appinit.c b/boards/arm/lpc4337-ws/src/lpc43_appinit.c similarity index 100% rename from boards/lpc4337-ws/src/lpc43_appinit.c rename to boards/arm/lpc4337-ws/src/lpc43_appinit.c diff --git a/boards/lpc4337-ws/src/lpc43_boot.c b/boards/arm/lpc4337-ws/src/lpc43_boot.c similarity index 100% rename from boards/lpc4337-ws/src/lpc43_boot.c rename to boards/arm/lpc4337-ws/src/lpc43_boot.c diff --git a/boards/lpc4357-evb/Kconfig b/boards/arm/lpc4357-evb/Kconfig similarity index 100% rename from boards/lpc4357-evb/Kconfig rename to boards/arm/lpc4357-evb/Kconfig diff --git a/boards/lpc4357-evb/README.txt b/boards/arm/lpc4357-evb/README.txt similarity index 100% rename from boards/lpc4357-evb/README.txt rename to boards/arm/lpc4357-evb/README.txt diff --git a/boards/lpc4357-evb/configs/nsh/defconfig b/boards/arm/lpc4357-evb/configs/nsh/defconfig similarity index 100% rename from boards/lpc4357-evb/configs/nsh/defconfig rename to boards/arm/lpc4357-evb/configs/nsh/defconfig diff --git a/boards/lpc4357-evb/include/board.h b/boards/arm/lpc4357-evb/include/board.h similarity index 100% rename from boards/lpc4357-evb/include/board.h rename to boards/arm/lpc4357-evb/include/board.h diff --git a/boards/lpc4357-evb/scripts/Make.defs b/boards/arm/lpc4357-evb/scripts/Make.defs similarity index 97% rename from boards/lpc4357-evb/scripts/Make.defs rename to boards/arm/lpc4357-evb/scripts/Make.defs index 3186525db8..5a7a6d8b0b 100644 --- a/boards/lpc4357-evb/scripts/Make.defs +++ b/boards/arm/lpc4357-evb/scripts/Make.defs @@ -64,13 +64,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/lpc4357-evb/scripts/bin_checksum_hex.sh b/boards/arm/lpc4357-evb/scripts/bin_checksum_hex.sh similarity index 100% rename from boards/lpc4357-evb/scripts/bin_checksum_hex.sh rename to boards/arm/lpc4357-evb/scripts/bin_checksum_hex.sh diff --git a/boards/lpc4357-evb/scripts/flash.sh b/boards/arm/lpc4357-evb/scripts/flash.sh similarity index 100% rename from boards/lpc4357-evb/scripts/flash.sh rename to boards/arm/lpc4357-evb/scripts/flash.sh diff --git a/boards/lpc4357-evb/scripts/flashaconfig.ld b/boards/arm/lpc4357-evb/scripts/flashaconfig.ld similarity index 100% rename from boards/lpc4357-evb/scripts/flashaconfig.ld rename to boards/arm/lpc4357-evb/scripts/flashaconfig.ld diff --git a/boards/lpc4357-evb/scripts/ramconfig.ld b/boards/arm/lpc4357-evb/scripts/ramconfig.ld similarity index 100% rename from boards/lpc4357-evb/scripts/ramconfig.ld rename to boards/arm/lpc4357-evb/scripts/ramconfig.ld diff --git a/boards/lpc4357-evb/scripts/spificonfig.ld b/boards/arm/lpc4357-evb/scripts/spificonfig.ld similarity index 100% rename from boards/lpc4357-evb/scripts/spificonfig.ld rename to boards/arm/lpc4357-evb/scripts/spificonfig.ld diff --git a/boards/lm4f120-launchpad/src/.gitignore b/boards/arm/lpc4357-evb/src/.gitignore similarity index 100% rename from boards/lm4f120-launchpad/src/.gitignore rename to boards/arm/lpc4357-evb/src/.gitignore diff --git a/boards/lpc4357-evb/src/Makefile b/boards/arm/lpc4357-evb/src/Makefile similarity index 100% rename from boards/lpc4357-evb/src/Makefile rename to boards/arm/lpc4357-evb/src/Makefile diff --git a/boards/lpc4357-evb/src/lpc4357-evb.h b/boards/arm/lpc4357-evb/src/lpc4357-evb.h similarity index 100% rename from boards/lpc4357-evb/src/lpc4357-evb.h rename to boards/arm/lpc4357-evb/src/lpc4357-evb.h diff --git a/boards/lpc4357-evb/src/lpc43_appinit.c b/boards/arm/lpc4357-evb/src/lpc43_appinit.c similarity index 100% rename from boards/lpc4357-evb/src/lpc43_appinit.c rename to boards/arm/lpc4357-evb/src/lpc43_appinit.c diff --git a/boards/lpc4357-evb/src/lpc43_autoleds.c b/boards/arm/lpc4357-evb/src/lpc43_autoleds.c similarity index 100% rename from boards/lpc4357-evb/src/lpc43_autoleds.c rename to boards/arm/lpc4357-evb/src/lpc43_autoleds.c diff --git a/boards/lpc4357-evb/src/lpc43_boot.c b/boards/arm/lpc4357-evb/src/lpc43_boot.c similarity index 100% rename from boards/lpc4357-evb/src/lpc43_boot.c rename to boards/arm/lpc4357-evb/src/lpc43_boot.c diff --git a/boards/lpc4357-evb/src/lpc43_buttons.c b/boards/arm/lpc4357-evb/src/lpc43_buttons.c similarity index 100% rename from boards/lpc4357-evb/src/lpc43_buttons.c rename to boards/arm/lpc4357-evb/src/lpc43_buttons.c diff --git a/boards/lpc4357-evb/src/lpc43_ostest.c b/boards/arm/lpc4357-evb/src/lpc43_ostest.c similarity index 100% rename from boards/lpc4357-evb/src/lpc43_ostest.c rename to boards/arm/lpc4357-evb/src/lpc43_ostest.c diff --git a/boards/lpc4357-evb/src/lpc43_userleds.c b/boards/arm/lpc4357-evb/src/lpc43_userleds.c similarity index 100% rename from boards/lpc4357-evb/src/lpc43_userleds.c rename to boards/arm/lpc4357-evb/src/lpc43_userleds.c diff --git a/boards/lpc4370-link2/Kconfig b/boards/arm/lpc4370-link2/Kconfig similarity index 100% rename from boards/lpc4370-link2/Kconfig rename to boards/arm/lpc4370-link2/Kconfig diff --git a/boards/lpc4370-link2/README.txt b/boards/arm/lpc4370-link2/README.txt similarity index 100% rename from boards/lpc4370-link2/README.txt rename to boards/arm/lpc4370-link2/README.txt diff --git a/boards/lpc4370-link2/configs/nsh/defconfig b/boards/arm/lpc4370-link2/configs/nsh/defconfig similarity index 100% rename from boards/lpc4370-link2/configs/nsh/defconfig rename to boards/arm/lpc4370-link2/configs/nsh/defconfig diff --git a/boards/lpc4370-link2/include/board.h b/boards/arm/lpc4370-link2/include/board.h similarity index 98% rename from boards/lpc4370-link2/include/board.h rename to boards/arm/lpc4370-link2/include/board.h index 8368b2a000..3b5515af1b 100644 --- a/boards/lpc4370-link2/include/board.h +++ b/boards/arm/lpc4370-link2/include/board.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_LPC4357_LINK2_INCLUDE_BOARD_H -#define __BOARDS_LPC4357_LINK2_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_LPC4357_LINK2_INCLUDE_BOARD_H +#define __BOARDS_ARM_LPC4357_LINK2_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -320,4 +320,4 @@ #define PINCONF_SSP1_SCK PINCONF_SSP1_SCK_1 #define PINCONF_SSP1_SSEL PINCONF_SSP1_SSEL_1 -#endif /* __BOARDS_LPC4357_LINK2_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_LPC4357_LINK2_INCLUDE_BOARD_H */ diff --git a/boards/lpc4370-link2/scripts/Make.defs b/boards/arm/lpc4370-link2/scripts/Make.defs similarity index 97% rename from boards/lpc4370-link2/scripts/Make.defs rename to boards/arm/lpc4370-link2/scripts/Make.defs index 2ff02c7fae..73a478bab4 100644 --- a/boards/lpc4370-link2/scripts/Make.defs +++ b/boards/arm/lpc4370-link2/scripts/Make.defs @@ -64,13 +64,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/lpc4370-link2/scripts/flash.bat b/boards/arm/lpc4370-link2/scripts/flash.bat similarity index 100% rename from boards/lpc4370-link2/scripts/flash.bat rename to boards/arm/lpc4370-link2/scripts/flash.bat diff --git a/boards/lpc4370-link2/scripts/flash.sh b/boards/arm/lpc4370-link2/scripts/flash.sh similarity index 100% rename from boards/lpc4370-link2/scripts/flash.sh rename to boards/arm/lpc4370-link2/scripts/flash.sh diff --git a/boards/lpc4370-link2/scripts/ramconfig.ld b/boards/arm/lpc4370-link2/scripts/ramconfig.ld similarity index 100% rename from boards/lpc4370-link2/scripts/ramconfig.ld rename to boards/arm/lpc4370-link2/scripts/ramconfig.ld diff --git a/boards/lpc4370-link2/scripts/spificonfig.ld b/boards/arm/lpc4370-link2/scripts/spificonfig.ld similarity index 100% rename from boards/lpc4370-link2/scripts/spificonfig.ld rename to boards/arm/lpc4370-link2/scripts/spificonfig.ld diff --git a/boards/lpc4088-devkit/src/.gitignore b/boards/arm/lpc4370-link2/src/.gitignore similarity index 100% rename from boards/lpc4088-devkit/src/.gitignore rename to boards/arm/lpc4370-link2/src/.gitignore diff --git a/boards/lpc4370-link2/src/Makefile b/boards/arm/lpc4370-link2/src/Makefile similarity index 100% rename from boards/lpc4370-link2/src/Makefile rename to boards/arm/lpc4370-link2/src/Makefile diff --git a/boards/lpc4370-link2/src/lpc4370-link2.h b/boards/arm/lpc4370-link2/src/lpc4370-link2.h similarity index 100% rename from boards/lpc4370-link2/src/lpc4370-link2.h rename to boards/arm/lpc4370-link2/src/lpc4370-link2.h diff --git a/boards/lpc4370-link2/src/lpc43_adc.c b/boards/arm/lpc4370-link2/src/lpc43_adc.c similarity index 100% rename from boards/lpc4370-link2/src/lpc43_adc.c rename to boards/arm/lpc4370-link2/src/lpc43_adc.c diff --git a/boards/lpc4370-link2/src/lpc43_appinit.c b/boards/arm/lpc4370-link2/src/lpc43_appinit.c similarity index 100% rename from boards/lpc4370-link2/src/lpc43_appinit.c rename to boards/arm/lpc4370-link2/src/lpc43_appinit.c diff --git a/boards/lpc4370-link2/src/lpc43_autoleds.c b/boards/arm/lpc4370-link2/src/lpc43_autoleds.c similarity index 100% rename from boards/lpc4370-link2/src/lpc43_autoleds.c rename to boards/arm/lpc4370-link2/src/lpc43_autoleds.c diff --git a/boards/lpc4370-link2/src/lpc43_boot.c b/boards/arm/lpc4370-link2/src/lpc43_boot.c similarity index 100% rename from boards/lpc4370-link2/src/lpc43_boot.c rename to boards/arm/lpc4370-link2/src/lpc43_boot.c diff --git a/boards/lpc4370-link2/src/lpc43_ostest.c b/boards/arm/lpc4370-link2/src/lpc43_ostest.c similarity index 100% rename from boards/lpc4370-link2/src/lpc43_ostest.c rename to boards/arm/lpc4370-link2/src/lpc43_ostest.c diff --git a/boards/lpc4370-link2/src/lpc43_spifilib_init.c b/boards/arm/lpc4370-link2/src/lpc43_spifilib_init.c similarity index 100% rename from boards/lpc4370-link2/src/lpc43_spifilib_init.c rename to boards/arm/lpc4370-link2/src/lpc43_spifilib_init.c diff --git a/boards/lpc4370-link2/src/lpc43_userleds.c b/boards/arm/lpc4370-link2/src/lpc43_userleds.c similarity index 100% rename from boards/lpc4370-link2/src/lpc43_userleds.c rename to boards/arm/lpc4370-link2/src/lpc43_userleds.c diff --git a/boards/lpcxpresso-lpc1768/Kconfig b/boards/arm/lpcxpresso-lpc1768/Kconfig similarity index 100% rename from boards/lpcxpresso-lpc1768/Kconfig rename to boards/arm/lpcxpresso-lpc1768/Kconfig diff --git a/boards/lpcxpresso-lpc1768/README.txt b/boards/arm/lpcxpresso-lpc1768/README.txt similarity index 100% rename from boards/lpcxpresso-lpc1768/README.txt rename to boards/arm/lpcxpresso-lpc1768/README.txt diff --git a/boards/lpcxpresso-lpc1768/configs/dhcpd/defconfig b/boards/arm/lpcxpresso-lpc1768/configs/dhcpd/defconfig similarity index 100% rename from boards/lpcxpresso-lpc1768/configs/dhcpd/defconfig rename to boards/arm/lpcxpresso-lpc1768/configs/dhcpd/defconfig diff --git a/boards/lpcxpresso-lpc1768/configs/nsh/defconfig b/boards/arm/lpcxpresso-lpc1768/configs/nsh/defconfig similarity index 100% rename from boards/lpcxpresso-lpc1768/configs/nsh/defconfig rename to boards/arm/lpcxpresso-lpc1768/configs/nsh/defconfig diff --git a/boards/lpcxpresso-lpc1768/configs/nx/defconfig b/boards/arm/lpcxpresso-lpc1768/configs/nx/defconfig similarity index 100% rename from boards/lpcxpresso-lpc1768/configs/nx/defconfig rename to boards/arm/lpcxpresso-lpc1768/configs/nx/defconfig diff --git a/boards/lpcxpresso-lpc1768/configs/thttpd/Make.defs b/boards/arm/lpcxpresso-lpc1768/configs/thttpd/Make.defs similarity index 97% rename from boards/lpcxpresso-lpc1768/configs/thttpd/Make.defs rename to boards/arm/lpcxpresso-lpc1768/configs/thttpd/Make.defs index e9537785a7..b44a9c0d13 100644 --- a/boards/lpcxpresso-lpc1768/configs/thttpd/Make.defs +++ b/boards/arm/lpcxpresso-lpc1768/configs/thttpd/Make.defs @@ -44,14 +44,14 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" NXFLATLDSCRIPT = -T "${shell cygpath -w $(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script NXFLATLDSCRIPT = -T"$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld" endif diff --git a/boards/lpcxpresso-lpc1768/configs/thttpd/defconfig b/boards/arm/lpcxpresso-lpc1768/configs/thttpd/defconfig similarity index 100% rename from boards/lpcxpresso-lpc1768/configs/thttpd/defconfig rename to boards/arm/lpcxpresso-lpc1768/configs/thttpd/defconfig diff --git a/boards/lpcxpresso-lpc1768/configs/usbmsc/defconfig b/boards/arm/lpcxpresso-lpc1768/configs/usbmsc/defconfig similarity index 100% rename from boards/lpcxpresso-lpc1768/configs/usbmsc/defconfig rename to boards/arm/lpcxpresso-lpc1768/configs/usbmsc/defconfig diff --git a/boards/lpcxpresso-lpc1768/include/board.h b/boards/arm/lpcxpresso-lpc1768/include/board.h similarity index 100% rename from boards/lpcxpresso-lpc1768/include/board.h rename to boards/arm/lpcxpresso-lpc1768/include/board.h diff --git a/boards/lpcxpresso-lpc1768/scripts/Make.defs b/boards/arm/lpcxpresso-lpc1768/scripts/Make.defs similarity index 96% rename from boards/lpcxpresso-lpc1768/scripts/Make.defs rename to boards/arm/lpcxpresso-lpc1768/scripts/Make.defs index 4087dd0a42..1feff0b79e 100644 --- a/boards/lpcxpresso-lpc1768/scripts/Make.defs +++ b/boards/arm/lpcxpresso-lpc1768/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/lpcxpresso-lpc1768/scripts/ld.script b/boards/arm/lpcxpresso-lpc1768/scripts/ld.script similarity index 100% rename from boards/lpcxpresso-lpc1768/scripts/ld.script rename to boards/arm/lpcxpresso-lpc1768/scripts/ld.script diff --git a/boards/lpc4088-quickstart/src/.gitignore b/boards/arm/lpcxpresso-lpc1768/src/.gitignore similarity index 100% rename from boards/lpc4088-quickstart/src/.gitignore rename to boards/arm/lpcxpresso-lpc1768/src/.gitignore diff --git a/boards/lpcxpresso-lpc1768/src/Makefile b/boards/arm/lpcxpresso-lpc1768/src/Makefile similarity index 100% rename from boards/lpcxpresso-lpc1768/src/Makefile rename to boards/arm/lpcxpresso-lpc1768/src/Makefile diff --git a/boards/lpcxpresso-lpc1768/src/lpc17_40_adc.c b/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_adc.c similarity index 100% rename from boards/lpcxpresso-lpc1768/src/lpc17_40_adc.c rename to boards/arm/lpcxpresso-lpc1768/src/lpc17_40_adc.c diff --git a/boards/lpcxpresso-lpc1768/src/lpc17_40_appinit.c b/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_appinit.c similarity index 100% rename from boards/lpcxpresso-lpc1768/src/lpc17_40_appinit.c rename to boards/arm/lpcxpresso-lpc1768/src/lpc17_40_appinit.c diff --git a/boards/lpcxpresso-lpc1768/src/lpc17_40_boot.c b/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_boot.c similarity index 100% rename from boards/lpcxpresso-lpc1768/src/lpc17_40_boot.c rename to boards/arm/lpcxpresso-lpc1768/src/lpc17_40_boot.c diff --git a/boards/lpcxpresso-lpc1768/src/lpc17_40_dac.c b/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_dac.c similarity index 100% rename from boards/lpcxpresso-lpc1768/src/lpc17_40_dac.c rename to boards/arm/lpcxpresso-lpc1768/src/lpc17_40_dac.c diff --git a/boards/lpcxpresso-lpc1768/src/lpc17_40_leds.c b/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_leds.c similarity index 100% rename from boards/lpcxpresso-lpc1768/src/lpc17_40_leds.c rename to boards/arm/lpcxpresso-lpc1768/src/lpc17_40_leds.c diff --git a/boards/lpcxpresso-lpc1768/src/lpc17_40_oled.c b/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_oled.c similarity index 100% rename from boards/lpcxpresso-lpc1768/src/lpc17_40_oled.c rename to boards/arm/lpcxpresso-lpc1768/src/lpc17_40_oled.c diff --git a/boards/lpcxpresso-lpc1768/src/lpc17_40_pwm.c b/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_pwm.c similarity index 100% rename from boards/lpcxpresso-lpc1768/src/lpc17_40_pwm.c rename to boards/arm/lpcxpresso-lpc1768/src/lpc17_40_pwm.c diff --git a/boards/lpcxpresso-lpc1768/src/lpc17_40_ssp.c b/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_ssp.c similarity index 100% rename from boards/lpcxpresso-lpc1768/src/lpc17_40_ssp.c rename to boards/arm/lpcxpresso-lpc1768/src/lpc17_40_ssp.c diff --git a/boards/lpcxpresso-lpc1768/src/lpc17_40_usbmsc.c b/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_usbmsc.c similarity index 100% rename from boards/lpcxpresso-lpc1768/src/lpc17_40_usbmsc.c rename to boards/arm/lpcxpresso-lpc1768/src/lpc17_40_usbmsc.c diff --git a/boards/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h b/boards/arm/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h similarity index 100% rename from boards/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h rename to boards/arm/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h diff --git a/boards/lpcxpresso-lpc1768/tools/flash.sh b/boards/arm/lpcxpresso-lpc1768/tools/flash.sh similarity index 100% rename from boards/lpcxpresso-lpc1768/tools/flash.sh rename to boards/arm/lpcxpresso-lpc1768/tools/flash.sh diff --git a/boards/lpcxpresso-lpc54628/Kconfig b/boards/arm/lpcxpresso-lpc54628/Kconfig similarity index 100% rename from boards/lpcxpresso-lpc54628/Kconfig rename to boards/arm/lpcxpresso-lpc54628/Kconfig diff --git a/boards/lpcxpresso-lpc54628/README.txt b/boards/arm/lpcxpresso-lpc54628/README.txt similarity index 100% rename from boards/lpcxpresso-lpc54628/README.txt rename to boards/arm/lpcxpresso-lpc54628/README.txt diff --git a/boards/lpcxpresso-lpc54628/configs/fb/defconfig b/boards/arm/lpcxpresso-lpc54628/configs/fb/defconfig similarity index 100% rename from boards/lpcxpresso-lpc54628/configs/fb/defconfig rename to boards/arm/lpcxpresso-lpc54628/configs/fb/defconfig diff --git a/boards/lpcxpresso-lpc54628/configs/lvgl/defconfig b/boards/arm/lpcxpresso-lpc54628/configs/lvgl/defconfig similarity index 100% rename from boards/lpcxpresso-lpc54628/configs/lvgl/defconfig rename to boards/arm/lpcxpresso-lpc54628/configs/lvgl/defconfig diff --git a/boards/lpcxpresso-lpc54628/configs/netnsh/defconfig b/boards/arm/lpcxpresso-lpc54628/configs/netnsh/defconfig similarity index 100% rename from boards/lpcxpresso-lpc54628/configs/netnsh/defconfig rename to boards/arm/lpcxpresso-lpc54628/configs/netnsh/defconfig diff --git a/boards/lpcxpresso-lpc54628/configs/nsh/defconfig b/boards/arm/lpcxpresso-lpc54628/configs/nsh/defconfig similarity index 100% rename from boards/lpcxpresso-lpc54628/configs/nsh/defconfig rename to boards/arm/lpcxpresso-lpc54628/configs/nsh/defconfig diff --git a/boards/lpcxpresso-lpc54628/configs/nxwm/defconfig b/boards/arm/lpcxpresso-lpc54628/configs/nxwm/defconfig similarity index 100% rename from boards/lpcxpresso-lpc54628/configs/nxwm/defconfig rename to boards/arm/lpcxpresso-lpc54628/configs/nxwm/defconfig diff --git a/boards/lpcxpresso-lpc54628/configs/pwfb/defconfig b/boards/arm/lpcxpresso-lpc54628/configs/pwfb/defconfig similarity index 100% rename from boards/lpcxpresso-lpc54628/configs/pwfb/defconfig rename to boards/arm/lpcxpresso-lpc54628/configs/pwfb/defconfig diff --git a/boards/lpcxpresso-lpc54628/configs/pwlines/defconfig b/boards/arm/lpcxpresso-lpc54628/configs/pwlines/defconfig similarity index 100% rename from boards/lpcxpresso-lpc54628/configs/pwlines/defconfig rename to boards/arm/lpcxpresso-lpc54628/configs/pwlines/defconfig diff --git a/boards/lpcxpresso-lpc54628/configs/twm4nx1/defconfig b/boards/arm/lpcxpresso-lpc54628/configs/twm4nx1/defconfig similarity index 100% rename from boards/lpcxpresso-lpc54628/configs/twm4nx1/defconfig rename to boards/arm/lpcxpresso-lpc54628/configs/twm4nx1/defconfig diff --git a/boards/lpcxpresso-lpc54628/configs/twm4nx2/defconfig b/boards/arm/lpcxpresso-lpc54628/configs/twm4nx2/defconfig similarity index 100% rename from boards/lpcxpresso-lpc54628/configs/twm4nx2/defconfig rename to boards/arm/lpcxpresso-lpc54628/configs/twm4nx2/defconfig diff --git a/boards/lpcxpresso-lpc54628/include/board.h b/boards/arm/lpcxpresso-lpc54628/include/board.h similarity index 100% rename from boards/lpcxpresso-lpc54628/include/board.h rename to boards/arm/lpcxpresso-lpc54628/include/board.h diff --git a/boards/lpcxpresso-lpc54628/scripts/Make.defs b/boards/arm/lpcxpresso-lpc54628/scripts/Make.defs similarity index 96% rename from boards/lpcxpresso-lpc54628/scripts/Make.defs rename to boards/arm/lpcxpresso-lpc54628/scripts/Make.defs index fdfebd5b4c..dc0ead32d6 100644 --- a/boards/lpcxpresso-lpc54628/scripts/Make.defs +++ b/boards/arm/lpcxpresso-lpc54628/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/lpcxpresso-lpc54628/scripts/flash.ld b/boards/arm/lpcxpresso-lpc54628/scripts/flash.ld similarity index 100% rename from boards/lpcxpresso-lpc54628/scripts/flash.ld rename to boards/arm/lpcxpresso-lpc54628/scripts/flash.ld diff --git a/boards/lpcxpresso-lpc54628/src/Makefile b/boards/arm/lpcxpresso-lpc54628/src/Makefile similarity index 100% rename from boards/lpcxpresso-lpc54628/src/Makefile rename to boards/arm/lpcxpresso-lpc54628/src/Makefile diff --git a/boards/lpcxpresso-lpc54628/src/lpc54_appinit.c b/boards/arm/lpcxpresso-lpc54628/src/lpc54_appinit.c similarity index 100% rename from boards/lpcxpresso-lpc54628/src/lpc54_appinit.c rename to boards/arm/lpcxpresso-lpc54628/src/lpc54_appinit.c diff --git a/boards/lpcxpresso-lpc54628/src/lpc54_autoleds.c b/boards/arm/lpcxpresso-lpc54628/src/lpc54_autoleds.c similarity index 100% rename from boards/lpcxpresso-lpc54628/src/lpc54_autoleds.c rename to boards/arm/lpcxpresso-lpc54628/src/lpc54_autoleds.c diff --git a/boards/lpcxpresso-lpc54628/src/lpc54_boot.c b/boards/arm/lpcxpresso-lpc54628/src/lpc54_boot.c similarity index 100% rename from boards/lpcxpresso-lpc54628/src/lpc54_boot.c rename to boards/arm/lpcxpresso-lpc54628/src/lpc54_boot.c diff --git a/boards/lpcxpresso-lpc54628/src/lpc54_bringup.c b/boards/arm/lpcxpresso-lpc54628/src/lpc54_bringup.c similarity index 100% rename from boards/lpcxpresso-lpc54628/src/lpc54_bringup.c rename to boards/arm/lpcxpresso-lpc54628/src/lpc54_bringup.c diff --git a/boards/lpcxpresso-lpc54628/src/lpc54_buttons.c b/boards/arm/lpcxpresso-lpc54628/src/lpc54_buttons.c similarity index 100% rename from boards/lpcxpresso-lpc54628/src/lpc54_buttons.c rename to boards/arm/lpcxpresso-lpc54628/src/lpc54_buttons.c diff --git a/boards/lpcxpresso-lpc54628/src/lpc54_ft5x06.c b/boards/arm/lpcxpresso-lpc54628/src/lpc54_ft5x06.c similarity index 100% rename from boards/lpcxpresso-lpc54628/src/lpc54_ft5x06.c rename to boards/arm/lpcxpresso-lpc54628/src/lpc54_ft5x06.c diff --git a/boards/lpcxpresso-lpc54628/src/lpc54_i2c.c b/boards/arm/lpcxpresso-lpc54628/src/lpc54_i2c.c similarity index 100% rename from boards/lpcxpresso-lpc54628/src/lpc54_i2c.c rename to boards/arm/lpcxpresso-lpc54628/src/lpc54_i2c.c diff --git a/boards/lpcxpresso-lpc54628/src/lpc54_i2ctool.c b/boards/arm/lpcxpresso-lpc54628/src/lpc54_i2ctool.c similarity index 100% rename from boards/lpcxpresso-lpc54628/src/lpc54_i2ctool.c rename to boards/arm/lpcxpresso-lpc54628/src/lpc54_i2ctool.c diff --git a/boards/lpcxpresso-lpc54628/src/lpc54_lcd.c b/boards/arm/lpcxpresso-lpc54628/src/lpc54_lcd.c similarity index 100% rename from boards/lpcxpresso-lpc54628/src/lpc54_lcd.c rename to boards/arm/lpcxpresso-lpc54628/src/lpc54_lcd.c diff --git a/boards/lpcxpresso-lpc54628/src/lpc54_sdram.c b/boards/arm/lpcxpresso-lpc54628/src/lpc54_sdram.c similarity index 100% rename from boards/lpcxpresso-lpc54628/src/lpc54_sdram.c rename to boards/arm/lpcxpresso-lpc54628/src/lpc54_sdram.c diff --git a/boards/lpcxpresso-lpc54628/src/lpc54_userleds.c b/boards/arm/lpcxpresso-lpc54628/src/lpc54_userleds.c similarity index 100% rename from boards/lpcxpresso-lpc54628/src/lpc54_userleds.c rename to boards/arm/lpcxpresso-lpc54628/src/lpc54_userleds.c diff --git a/boards/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h b/boards/arm/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h similarity index 100% rename from boards/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h rename to boards/arm/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h diff --git a/boards/maple/Kconfig b/boards/arm/maple/Kconfig similarity index 100% rename from boards/maple/Kconfig rename to boards/arm/maple/Kconfig diff --git a/boards/maple/README.txt b/boards/arm/maple/README.txt similarity index 100% rename from boards/maple/README.txt rename to boards/arm/maple/README.txt diff --git a/boards/maple/configs/nsh/defconfig b/boards/arm/maple/configs/nsh/defconfig similarity index 100% rename from boards/maple/configs/nsh/defconfig rename to boards/arm/maple/configs/nsh/defconfig diff --git a/boards/maple/configs/nx/defconfig b/boards/arm/maple/configs/nx/defconfig similarity index 100% rename from boards/maple/configs/nx/defconfig rename to boards/arm/maple/configs/nx/defconfig diff --git a/boards/maple/configs/usbnsh/defconfig b/boards/arm/maple/configs/usbnsh/defconfig similarity index 100% rename from boards/maple/configs/usbnsh/defconfig rename to boards/arm/maple/configs/usbnsh/defconfig diff --git a/boards/maple/include/board.h b/boards/arm/maple/include/board.h similarity index 97% rename from boards/maple/include/board.h rename to boards/arm/maple/include/board.h index 0810b4cf49..fe99dc288d 100644 --- a/boards/maple/include/board.h +++ b/boards/arm/maple/include/board.h @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_MAPLE_INCLUDE_BOARD_H -#define __BOARDS_MAPLE_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_MAPLE_INCLUDE_BOARD_H +#define __BOARDS_ARM_MAPLE_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -162,4 +162,4 @@ #define LED_ASSERTION 6 /* LED1 + LED2 */ #define LED_PANIC 7 /* LED1 / LED2 blinking */ -#endif /* __BOARDS_MAPLE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_MAPLE_INCLUDE_BOARD_H */ diff --git a/boards/maple/scripts/Make.defs b/boards/arm/maple/scripts/Make.defs similarity index 96% rename from boards/maple/scripts/Make.defs rename to boards/arm/maple/scripts/Make.defs index 43b9cd6c17..6e5c653efe 100644 --- a/boards/maple/scripts/Make.defs +++ b/boards/arm/maple/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/maple/scripts/ld.script b/boards/arm/maple/scripts/ld.script similarity index 100% rename from boards/maple/scripts/ld.script rename to boards/arm/maple/scripts/ld.script diff --git a/boards/maple/scripts/ld.script.dfu b/boards/arm/maple/scripts/ld.script.dfu similarity index 100% rename from boards/maple/scripts/ld.script.dfu rename to boards/arm/maple/scripts/ld.script.dfu diff --git a/boards/maple/src/Makefile b/boards/arm/maple/src/Makefile similarity index 100% rename from boards/maple/src/Makefile rename to boards/arm/maple/src/Makefile diff --git a/boards/maple/src/maple.h b/boards/arm/maple/src/maple.h similarity index 97% rename from boards/maple/src/maple.h rename to boards/arm/maple/src/maple.h index 436029eb9b..95f6922838 100644 --- a/boards/maple/src/maple.h +++ b/boards/arm/maple/src/maple.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_MAPLE_SRC_MAPLE_H -#define __BOARDS_MAPLE_SRC_MAPLE_H +#ifndef __BOARDS_ARM_MAPLE_SRC_MAPLE_H +#define __BOARDS_ARM_MAPLE_SRC_MAPLE_H /************************************************************************************ * Included Files @@ -128,4 +128,4 @@ void stm32_spidev_initialize(void); void stm32_usbinitialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_MAPLE_SRC_MAPLE_H */ +#endif /* __BOARDS_ARM_MAPLE_SRC_MAPLE_H */ diff --git a/boards/maple/src/stm32_appinit.c b/boards/arm/maple/src/stm32_appinit.c similarity index 100% rename from boards/maple/src/stm32_appinit.c rename to boards/arm/maple/src/stm32_appinit.c diff --git a/boards/maple/src/stm32_boot.c b/boards/arm/maple/src/stm32_boot.c similarity index 100% rename from boards/maple/src/stm32_boot.c rename to boards/arm/maple/src/stm32_boot.c diff --git a/boards/maple/src/stm32_lcd.c b/boards/arm/maple/src/stm32_lcd.c similarity index 100% rename from boards/maple/src/stm32_lcd.c rename to boards/arm/maple/src/stm32_lcd.c diff --git a/boards/maple/src/stm32_leds.c b/boards/arm/maple/src/stm32_leds.c similarity index 100% rename from boards/maple/src/stm32_leds.c rename to boards/arm/maple/src/stm32_leds.c diff --git a/boards/maple/src/stm32_spi.c b/boards/arm/maple/src/stm32_spi.c similarity index 100% rename from boards/maple/src/stm32_spi.c rename to boards/arm/maple/src/stm32_spi.c diff --git a/boards/maple/src/stm32_usbdev.c b/boards/arm/maple/src/stm32_usbdev.c similarity index 100% rename from boards/maple/src/stm32_usbdev.c rename to boards/arm/maple/src/stm32_usbdev.c diff --git a/boards/maple/tools/dfu.sh b/boards/arm/maple/tools/dfu.sh similarity index 100% rename from boards/maple/tools/dfu.sh rename to boards/arm/maple/tools/dfu.sh diff --git a/boards/maple/tools/env.sh b/boards/arm/maple/tools/env.sh similarity index 100% rename from boards/maple/tools/env.sh rename to boards/arm/maple/tools/env.sh diff --git a/boards/max32660-evsys/Kconfig b/boards/arm/max32660-evsys/Kconfig similarity index 100% rename from boards/max32660-evsys/Kconfig rename to boards/arm/max32660-evsys/Kconfig diff --git a/boards/max32660-evsys/README.txt b/boards/arm/max32660-evsys/README.txt similarity index 100% rename from boards/max32660-evsys/README.txt rename to boards/arm/max32660-evsys/README.txt diff --git a/boards/max32660-evsys/configs/nsh/defconfig b/boards/arm/max32660-evsys/configs/nsh/defconfig similarity index 100% rename from boards/max32660-evsys/configs/nsh/defconfig rename to boards/arm/max32660-evsys/configs/nsh/defconfig diff --git a/boards/max32660-evsys/include/board.h b/boards/arm/max32660-evsys/include/board.h similarity index 97% rename from boards/max32660-evsys/include/board.h rename to boards/arm/max32660-evsys/include/board.h index 1fcb0b2cab..7c69c2953e 100644 --- a/boards/max32660-evsys/include/board.h +++ b/boards/arm/max32660-evsys/include/board.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_MAX32660_EVSYS_INCLUDE_BOARD_H -#define __CONFIG_MAX32660_EVSYS_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_MAX32660_EVSYS_INCLUDE_BOARD_H +#define __BOARDS_ARM_MAX32660_EVSYS_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -185,4 +185,4 @@ /* DMA **********************************************************************/ -#endif /* __CONFIG_NUCLEO_F303ZE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F303ZE_INCLUDE_BOARD_H */ diff --git a/boards/max32660-evsys/scripts/Make.defs b/boards/arm/max32660-evsys/scripts/Make.defs similarity index 97% rename from boards/max32660-evsys/scripts/Make.defs rename to boards/arm/max32660-evsys/scripts/Make.defs index a3949faaf1..b24869ba3b 100644 --- a/boards/max32660-evsys/scripts/Make.defs +++ b/boards/arm/max32660-evsys/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/max32660-evsys/scripts/flash.ld b/boards/arm/max32660-evsys/scripts/flash.ld similarity index 100% rename from boards/max32660-evsys/scripts/flash.ld rename to boards/arm/max32660-evsys/scripts/flash.ld diff --git a/boards/max32660-evsys/scripts/sram.ld b/boards/arm/max32660-evsys/scripts/sram.ld similarity index 100% rename from boards/max32660-evsys/scripts/sram.ld rename to boards/arm/max32660-evsys/scripts/sram.ld diff --git a/boards/max32660-evsys/src/Makefile b/boards/arm/max32660-evsys/src/Makefile similarity index 100% rename from boards/max32660-evsys/src/Makefile rename to boards/arm/max32660-evsys/src/Makefile diff --git a/boards/max32660-evsys/src/max32660-evsys.h b/boards/arm/max32660-evsys/src/max32660-evsys.h similarity index 97% rename from boards/max32660-evsys/src/max32660-evsys.h rename to boards/arm/max32660-evsys/src/max32660-evsys.h index 36f1de45ad..c9693094ae 100644 --- a/boards/max32660-evsys/src/max32660-evsys.h +++ b/boards/arm/max32660-evsys/src/max32660-evsys.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_MAX32660_EVSYS_SRC_MAX32660_EVSYS_H -#define __CONFIG_MAX32660_EVSYS_SRC_MAX32660_EVSYS_H +#ifndef __BOARDS_ARM_MAX32660_EVSYS_SRC_MAX32660_EVSYS_H +#define __BOARDS_ARM_MAX32660_EVSYS_SRC_MAX32660_EVSYS_H /**************************************************************************** * Included Files @@ -148,4 +148,4 @@ void max326_spidev_initialize(void); int max326_mmcsd_initialize(int minor); #endif -#endif /* __CONFIG_NUCLEO_F303ZE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F303ZE_INCLUDE_BOARD_H */ diff --git a/boards/max32660-evsys/src/max326_appinit.c b/boards/arm/max32660-evsys/src/max326_appinit.c similarity index 100% rename from boards/max32660-evsys/src/max326_appinit.c rename to boards/arm/max32660-evsys/src/max326_appinit.c diff --git a/boards/max32660-evsys/src/max326_autoleds.c b/boards/arm/max32660-evsys/src/max326_autoleds.c similarity index 100% rename from boards/max32660-evsys/src/max326_autoleds.c rename to boards/arm/max32660-evsys/src/max326_autoleds.c diff --git a/boards/max32660-evsys/src/max326_boot.c b/boards/arm/max32660-evsys/src/max326_boot.c similarity index 100% rename from boards/max32660-evsys/src/max326_boot.c rename to boards/arm/max32660-evsys/src/max326_boot.c diff --git a/boards/max32660-evsys/src/max326_bringup.c b/boards/arm/max32660-evsys/src/max326_bringup.c similarity index 100% rename from boards/max32660-evsys/src/max326_bringup.c rename to boards/arm/max32660-evsys/src/max326_bringup.c diff --git a/boards/max32660-evsys/src/max326_button.c b/boards/arm/max32660-evsys/src/max326_button.c similarity index 100% rename from boards/max32660-evsys/src/max326_button.c rename to boards/arm/max32660-evsys/src/max326_button.c diff --git a/boards/max32660-evsys/src/max326_mmcsd.c b/boards/arm/max32660-evsys/src/max326_mmcsd.c similarity index 100% rename from boards/max32660-evsys/src/max326_mmcsd.c rename to boards/arm/max32660-evsys/src/max326_mmcsd.c diff --git a/boards/max32660-evsys/src/max326_spi.c b/boards/arm/max32660-evsys/src/max326_spi.c similarity index 100% rename from boards/max32660-evsys/src/max326_spi.c rename to boards/arm/max32660-evsys/src/max326_spi.c diff --git a/boards/max32660-evsys/src/max326_userleds.c b/boards/arm/max32660-evsys/src/max326_userleds.c similarity index 100% rename from boards/max32660-evsys/src/max326_userleds.c rename to boards/arm/max32660-evsys/src/max326_userleds.c diff --git a/boards/mbed/Kconfig b/boards/arm/mbed/Kconfig similarity index 100% rename from boards/mbed/Kconfig rename to boards/arm/mbed/Kconfig diff --git a/boards/mbed/README.txt b/boards/arm/mbed/README.txt similarity index 100% rename from boards/mbed/README.txt rename to boards/arm/mbed/README.txt diff --git a/boards/mbed/configs/nsh/defconfig b/boards/arm/mbed/configs/nsh/defconfig similarity index 100% rename from boards/mbed/configs/nsh/defconfig rename to boards/arm/mbed/configs/nsh/defconfig diff --git a/boards/mbed/include/board.h b/boards/arm/mbed/include/board.h similarity index 99% rename from boards/mbed/include/board.h rename to boards/arm/mbed/include/board.h index 3f46b00663..612f59f1df 100644 --- a/boards/mbed/include/board.h +++ b/boards/arm/mbed/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_MBED_INCLUDE_BOARD_H -#define __BOARDS_MBED_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_MBED_INCLUDE_BOARD_H +#define __BOARDS_ARM_MBED_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -314,4 +314,4 @@ void lpc17_40_led(int lednum, int state); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_MBED_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_MBED_INCLUDE_BOARD_H */ diff --git a/boards/mbed/scripts/Make.defs b/boards/arm/mbed/scripts/Make.defs similarity index 96% rename from boards/mbed/scripts/Make.defs rename to boards/arm/mbed/scripts/Make.defs index f9d19d52e2..a2716befe6 100644 --- a/boards/mbed/scripts/Make.defs +++ b/boards/arm/mbed/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/mbed/scripts/ld.script b/boards/arm/mbed/scripts/ld.script similarity index 100% rename from boards/mbed/scripts/ld.script rename to boards/arm/mbed/scripts/ld.script diff --git a/boards/lpc4330-xplorer/src/.gitignore b/boards/arm/mbed/src/.gitignore similarity index 100% rename from boards/lpc4330-xplorer/src/.gitignore rename to boards/arm/mbed/src/.gitignore diff --git a/boards/mbed/src/Makefile b/boards/arm/mbed/src/Makefile similarity index 100% rename from boards/mbed/src/Makefile rename to boards/arm/mbed/src/Makefile diff --git a/boards/mbed/src/lpc17_40_adc.c b/boards/arm/mbed/src/lpc17_40_adc.c similarity index 100% rename from boards/mbed/src/lpc17_40_adc.c rename to boards/arm/mbed/src/lpc17_40_adc.c diff --git a/boards/mbed/src/lpc17_40_appinit.c b/boards/arm/mbed/src/lpc17_40_appinit.c similarity index 100% rename from boards/mbed/src/lpc17_40_appinit.c rename to boards/arm/mbed/src/lpc17_40_appinit.c diff --git a/boards/mbed/src/lpc17_40_boot.c b/boards/arm/mbed/src/lpc17_40_boot.c similarity index 100% rename from boards/mbed/src/lpc17_40_boot.c rename to boards/arm/mbed/src/lpc17_40_boot.c diff --git a/boards/mbed/src/lpc17_40_dac.c b/boards/arm/mbed/src/lpc17_40_dac.c similarity index 100% rename from boards/mbed/src/lpc17_40_dac.c rename to boards/arm/mbed/src/lpc17_40_dac.c diff --git a/boards/mbed/src/lpc17_40_leds.c b/boards/arm/mbed/src/lpc17_40_leds.c similarity index 100% rename from boards/mbed/src/lpc17_40_leds.c rename to boards/arm/mbed/src/lpc17_40_leds.c diff --git a/boards/mbed/src/lpc17_40_pwm.c b/boards/arm/mbed/src/lpc17_40_pwm.c similarity index 100% rename from boards/mbed/src/lpc17_40_pwm.c rename to boards/arm/mbed/src/lpc17_40_pwm.c diff --git a/boards/mbed/src/mbed.h b/boards/arm/mbed/src/mbed.h similarity index 100% rename from boards/mbed/src/mbed.h rename to boards/arm/mbed/src/mbed.h diff --git a/boards/mcb1700/Kconfig b/boards/arm/mcb1700/Kconfig similarity index 100% rename from boards/mcb1700/Kconfig rename to boards/arm/mcb1700/Kconfig diff --git a/boards/mcb1700/README.txt b/boards/arm/mcb1700/README.txt similarity index 100% rename from boards/mcb1700/README.txt rename to boards/arm/mcb1700/README.txt diff --git a/boards/mcb1700/configs/nsh/defconfig b/boards/arm/mcb1700/configs/nsh/defconfig similarity index 100% rename from boards/mcb1700/configs/nsh/defconfig rename to boards/arm/mcb1700/configs/nsh/defconfig diff --git a/boards/mcb1700/include/board.h b/boards/arm/mcb1700/include/board.h similarity index 98% rename from boards/mcb1700/include/board.h rename to boards/arm/mcb1700/include/board.h index e1090fda7c..b98d9ceb47 100644 --- a/boards/mcb1700/include/board.h +++ b/boards/arm/mcb1700/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_MCB1700_INCLUDE_BOARD_H -#define __BOARDS_MCB1700_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_MCB1700_INCLUDE_BOARD_H +#define __BOARDS_ARM_MCB1700_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -314,4 +314,4 @@ void lpc17_40_led(int lednum, int state); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_MCB1700_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_MCB1700_INCLUDE_BOARD_H */ diff --git a/boards/mcb1700/scripts/Make.defs b/boards/arm/mcb1700/scripts/Make.defs similarity index 96% rename from boards/mcb1700/scripts/Make.defs rename to boards/arm/mcb1700/scripts/Make.defs index adafe9ad75..f9078b1c83 100644 --- a/boards/mcb1700/scripts/Make.defs +++ b/boards/arm/mcb1700/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/mcb1700/scripts/ld.script b/boards/arm/mcb1700/scripts/ld.script similarity index 100% rename from boards/mcb1700/scripts/ld.script rename to boards/arm/mcb1700/scripts/ld.script diff --git a/boards/lpc4337-ws/src/.gitignore b/boards/arm/mcb1700/src/.gitignore similarity index 100% rename from boards/lpc4337-ws/src/.gitignore rename to boards/arm/mcb1700/src/.gitignore diff --git a/boards/mcb1700/src/Makefile b/boards/arm/mcb1700/src/Makefile similarity index 100% rename from boards/mcb1700/src/Makefile rename to boards/arm/mcb1700/src/Makefile diff --git a/boards/mcb1700/src/lpc17_40_adc.c b/boards/arm/mcb1700/src/lpc17_40_adc.c similarity index 100% rename from boards/mcb1700/src/lpc17_40_adc.c rename to boards/arm/mcb1700/src/lpc17_40_adc.c diff --git a/boards/mcb1700/src/lpc17_40_appinit.c b/boards/arm/mcb1700/src/lpc17_40_appinit.c similarity index 100% rename from boards/mcb1700/src/lpc17_40_appinit.c rename to boards/arm/mcb1700/src/lpc17_40_appinit.c diff --git a/boards/mcb1700/src/lpc17_40_boot.c b/boards/arm/mcb1700/src/lpc17_40_boot.c similarity index 100% rename from boards/mcb1700/src/lpc17_40_boot.c rename to boards/arm/mcb1700/src/lpc17_40_boot.c diff --git a/boards/mcb1700/src/lpc17_40_bringup.c b/boards/arm/mcb1700/src/lpc17_40_bringup.c similarity index 100% rename from boards/mcb1700/src/lpc17_40_bringup.c rename to boards/arm/mcb1700/src/lpc17_40_bringup.c diff --git a/boards/mcb1700/src/lpc17_40_dac.c b/boards/arm/mcb1700/src/lpc17_40_dac.c similarity index 100% rename from boards/mcb1700/src/lpc17_40_dac.c rename to boards/arm/mcb1700/src/lpc17_40_dac.c diff --git a/boards/mcb1700/src/lpc17_40_leds.c b/boards/arm/mcb1700/src/lpc17_40_leds.c similarity index 100% rename from boards/mcb1700/src/lpc17_40_leds.c rename to boards/arm/mcb1700/src/lpc17_40_leds.c diff --git a/boards/mcb1700/src/lpc17_40_pwm.c b/boards/arm/mcb1700/src/lpc17_40_pwm.c similarity index 100% rename from boards/mcb1700/src/lpc17_40_pwm.c rename to boards/arm/mcb1700/src/lpc17_40_pwm.c diff --git a/boards/mcb1700/src/mcb1700.h b/boards/arm/mcb1700/src/mcb1700.h similarity index 100% rename from boards/mcb1700/src/mcb1700.h rename to boards/arm/mcb1700/src/mcb1700.h diff --git a/boards/mcu123-lpc214x/Kconfig b/boards/arm/mcu123-lpc214x/Kconfig similarity index 100% rename from boards/mcu123-lpc214x/Kconfig rename to boards/arm/mcu123-lpc214x/Kconfig diff --git a/boards/mcu123-lpc214x/README.txt b/boards/arm/mcu123-lpc214x/README.txt similarity index 100% rename from boards/mcu123-lpc214x/README.txt rename to boards/arm/mcu123-lpc214x/README.txt diff --git a/boards/mcu123-lpc214x/configs/composite/defconfig b/boards/arm/mcu123-lpc214x/configs/composite/defconfig similarity index 100% rename from boards/mcu123-lpc214x/configs/composite/defconfig rename to boards/arm/mcu123-lpc214x/configs/composite/defconfig diff --git a/boards/mcu123-lpc214x/configs/nsh/defconfig b/boards/arm/mcu123-lpc214x/configs/nsh/defconfig similarity index 100% rename from boards/mcu123-lpc214x/configs/nsh/defconfig rename to boards/arm/mcu123-lpc214x/configs/nsh/defconfig diff --git a/boards/mcu123-lpc214x/configs/usbmsc/defconfig b/boards/arm/mcu123-lpc214x/configs/usbmsc/defconfig similarity index 100% rename from boards/mcu123-lpc214x/configs/usbmsc/defconfig rename to boards/arm/mcu123-lpc214x/configs/usbmsc/defconfig diff --git a/boards/mcu123-lpc214x/configs/usbserial/defconfig b/boards/arm/mcu123-lpc214x/configs/usbserial/defconfig similarity index 100% rename from boards/mcu123-lpc214x/configs/usbserial/defconfig rename to boards/arm/mcu123-lpc214x/configs/usbserial/defconfig diff --git a/boards/mcu123-lpc214x/include/board.h b/boards/arm/mcu123-lpc214x/include/board.h similarity index 100% rename from boards/mcu123-lpc214x/include/board.h rename to boards/arm/mcu123-lpc214x/include/board.h diff --git a/boards/mcu123-lpc214x/lpc21isp-1.60.diff b/boards/arm/mcu123-lpc214x/lpc21isp-1.60.diff similarity index 100% rename from boards/mcu123-lpc214x/lpc21isp-1.60.diff rename to boards/arm/mcu123-lpc214x/lpc21isp-1.60.diff diff --git a/boards/mcu123-lpc214x/scripts/Make.defs b/boards/arm/mcu123-lpc214x/scripts/Make.defs similarity index 97% rename from boards/mcu123-lpc214x/scripts/Make.defs rename to boards/arm/mcu123-lpc214x/scripts/Make.defs index 9661ccd96a..9f966110ef 100644 --- a/boards/mcu123-lpc214x/scripts/Make.defs +++ b/boards/arm/mcu123-lpc214x/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/mcu123-lpc214x/scripts/ld.script b/boards/arm/mcu123-lpc214x/scripts/ld.script similarity index 100% rename from boards/mcu123-lpc214x/scripts/ld.script rename to boards/arm/mcu123-lpc214x/scripts/ld.script diff --git a/boards/mcu123-lpc214x/scripts/lpc21isp.sh b/boards/arm/mcu123-lpc214x/scripts/lpc21isp.sh similarity index 100% rename from boards/mcu123-lpc214x/scripts/lpc21isp.sh rename to boards/arm/mcu123-lpc214x/scripts/lpc21isp.sh diff --git a/boards/lpc4357-evb/src/.gitignore b/boards/arm/mcu123-lpc214x/src/.gitignore similarity index 100% rename from boards/lpc4357-evb/src/.gitignore rename to boards/arm/mcu123-lpc214x/src/.gitignore diff --git a/boards/mcu123-lpc214x/src/Makefile b/boards/arm/mcu123-lpc214x/src/Makefile similarity index 100% rename from boards/mcu123-lpc214x/src/Makefile rename to boards/arm/mcu123-lpc214x/src/Makefile diff --git a/boards/mcu123-lpc214x/src/lpc2148_appinit.c b/boards/arm/mcu123-lpc214x/src/lpc2148_appinit.c similarity index 100% rename from boards/mcu123-lpc214x/src/lpc2148_appinit.c rename to boards/arm/mcu123-lpc214x/src/lpc2148_appinit.c diff --git a/boards/mcu123-lpc214x/src/lpc2148_composite.c b/boards/arm/mcu123-lpc214x/src/lpc2148_composite.c similarity index 100% rename from boards/mcu123-lpc214x/src/lpc2148_composite.c rename to boards/arm/mcu123-lpc214x/src/lpc2148_composite.c diff --git a/boards/mcu123-lpc214x/src/lpc2148_leds.c b/boards/arm/mcu123-lpc214x/src/lpc2148_leds.c similarity index 100% rename from boards/mcu123-lpc214x/src/lpc2148_leds.c rename to boards/arm/mcu123-lpc214x/src/lpc2148_leds.c diff --git a/boards/mcu123-lpc214x/src/lpc2148_spi1.c b/boards/arm/mcu123-lpc214x/src/lpc2148_spi1.c similarity index 100% rename from boards/mcu123-lpc214x/src/lpc2148_spi1.c rename to boards/arm/mcu123-lpc214x/src/lpc2148_spi1.c diff --git a/boards/mcu123-lpc214x/src/lpc2148_usbmsc.c b/boards/arm/mcu123-lpc214x/src/lpc2148_usbmsc.c similarity index 100% rename from boards/mcu123-lpc214x/src/lpc2148_usbmsc.c rename to boards/arm/mcu123-lpc214x/src/lpc2148_usbmsc.c diff --git a/boards/metro-m4/Kconfig b/boards/arm/metro-m4/Kconfig similarity index 100% rename from boards/metro-m4/Kconfig rename to boards/arm/metro-m4/Kconfig diff --git a/boards/metro-m4/README.txt b/boards/arm/metro-m4/README.txt similarity index 100% rename from boards/metro-m4/README.txt rename to boards/arm/metro-m4/README.txt diff --git a/boards/metro-m4/configs/nsh/defconfig b/boards/arm/metro-m4/configs/nsh/defconfig similarity index 100% rename from boards/metro-m4/configs/nsh/defconfig rename to boards/arm/metro-m4/configs/nsh/defconfig diff --git a/boards/metro-m4/include/board.h b/boards/arm/metro-m4/include/board.h similarity index 99% rename from boards/metro-m4/include/board.h rename to boards/arm/metro-m4/include/board.h index e1d5dd9c39..49fae68214 100644 --- a/boards/metro-m4/include/board.h +++ b/boards/arm/metro-m4/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_METRO_M4_INCLUDE_BOARD_H -#define __CONFIG_METRO_M4_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_METRO_M4_INCLUDE_BOARD_H +#define __BOARDS_ARM_METRO_M4_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -457,4 +457,4 @@ #define BOARD_USB_GCLKGEN 1 /* GCLK1, 48MHz */ -#endif /* __CONFIG_METRO_M4_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_METRO_M4_INCLUDE_BOARD_H */ diff --git a/boards/metro-m4/scripts/Make.defs b/boards/arm/metro-m4/scripts/Make.defs similarity index 97% rename from boards/metro-m4/scripts/Make.defs rename to boards/arm/metro-m4/scripts/Make.defs index d40784f995..9851fc9256 100644 --- a/boards/metro-m4/scripts/Make.defs +++ b/boards/arm/metro-m4/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/metro-m4/scripts/flash.ld b/boards/arm/metro-m4/scripts/flash.ld similarity index 100% rename from boards/metro-m4/scripts/flash.ld rename to boards/arm/metro-m4/scripts/flash.ld diff --git a/boards/metro-m4/scripts/nvm.c b/boards/arm/metro-m4/scripts/nvm.c similarity index 100% rename from boards/metro-m4/scripts/nvm.c rename to boards/arm/metro-m4/scripts/nvm.c diff --git a/boards/metro-m4/scripts/nvm.srec b/boards/arm/metro-m4/scripts/nvm.srec similarity index 100% rename from boards/metro-m4/scripts/nvm.srec rename to boards/arm/metro-m4/scripts/nvm.srec diff --git a/boards/metro-m4/scripts/sram.ld b/boards/arm/metro-m4/scripts/sram.ld similarity index 100% rename from boards/metro-m4/scripts/sram.ld rename to boards/arm/metro-m4/scripts/sram.ld diff --git a/boards/metro-m4/src/Makefile b/boards/arm/metro-m4/src/Makefile similarity index 100% rename from boards/metro-m4/src/Makefile rename to boards/arm/metro-m4/src/Makefile diff --git a/boards/metro-m4/src/metro-m4.h b/boards/arm/metro-m4/src/metro-m4.h similarity index 96% rename from boards/metro-m4/src/metro-m4.h rename to boards/arm/metro-m4/src/metro-m4.h index 1abc023b8c..150aca8ab5 100644 --- a/boards/metro-m4/src/metro-m4.h +++ b/boards/arm/metro-m4/src/metro-m4.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_METRO_M4_SRC_METRO_M4_H -#define __BOARDS_METRO_M4_SRC_METRO_M4_H +#ifndef __BOARDS_ARM_METRO_M4_SRC_METRO_M4_H +#define __BOARDS_ARM_METRO_M4_SRC_METRO_M4_H /**************************************************************************** * Included Files @@ -113,4 +113,4 @@ void sam_led_pminitialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_METRO_M4_SRC_METRO_M4_H */ +#endif /* __BOARDS_ARM_METRO_M4_SRC_METRO_M4_H */ diff --git a/boards/metro-m4/src/sam_appinit.c b/boards/arm/metro-m4/src/sam_appinit.c similarity index 100% rename from boards/metro-m4/src/sam_appinit.c rename to boards/arm/metro-m4/src/sam_appinit.c diff --git a/boards/metro-m4/src/sam_autoleds.c b/boards/arm/metro-m4/src/sam_autoleds.c similarity index 100% rename from boards/metro-m4/src/sam_autoleds.c rename to boards/arm/metro-m4/src/sam_autoleds.c diff --git a/boards/metro-m4/src/sam_boot.c b/boards/arm/metro-m4/src/sam_boot.c similarity index 100% rename from boards/metro-m4/src/sam_boot.c rename to boards/arm/metro-m4/src/sam_boot.c diff --git a/boards/metro-m4/src/sam_bringup.c b/boards/arm/metro-m4/src/sam_bringup.c similarity index 100% rename from boards/metro-m4/src/sam_bringup.c rename to boards/arm/metro-m4/src/sam_bringup.c diff --git a/boards/metro-m4/src/sam_userleds.c b/boards/arm/metro-m4/src/sam_userleds.c similarity index 100% rename from boards/metro-m4/src/sam_userleds.c rename to boards/arm/metro-m4/src/sam_userleds.c diff --git a/boards/mikroe-stm32f4/Kconfig b/boards/arm/mikroe-stm32f4/Kconfig similarity index 100% rename from boards/mikroe-stm32f4/Kconfig rename to boards/arm/mikroe-stm32f4/Kconfig diff --git a/boards/mikroe-stm32f4/README.txt b/boards/arm/mikroe-stm32f4/README.txt similarity index 100% rename from boards/mikroe-stm32f4/README.txt rename to boards/arm/mikroe-stm32f4/README.txt diff --git a/boards/mikroe-stm32f4/configs/fulldemo/defconfig b/boards/arm/mikroe-stm32f4/configs/fulldemo/defconfig similarity index 100% rename from boards/mikroe-stm32f4/configs/fulldemo/defconfig rename to boards/arm/mikroe-stm32f4/configs/fulldemo/defconfig diff --git a/boards/mikroe-stm32f4/configs/kostest/defconfig b/boards/arm/mikroe-stm32f4/configs/kostest/defconfig similarity index 100% rename from boards/mikroe-stm32f4/configs/kostest/defconfig rename to boards/arm/mikroe-stm32f4/configs/kostest/defconfig diff --git a/boards/mikroe-stm32f4/configs/nsh/defconfig b/boards/arm/mikroe-stm32f4/configs/nsh/defconfig similarity index 100% rename from boards/mikroe-stm32f4/configs/nsh/defconfig rename to boards/arm/mikroe-stm32f4/configs/nsh/defconfig diff --git a/boards/mikroe-stm32f4/configs/nx/defconfig b/boards/arm/mikroe-stm32f4/configs/nx/defconfig similarity index 100% rename from boards/mikroe-stm32f4/configs/nx/defconfig rename to boards/arm/mikroe-stm32f4/configs/nx/defconfig diff --git a/boards/mikroe-stm32f4/configs/nxlines/defconfig b/boards/arm/mikroe-stm32f4/configs/nxlines/defconfig similarity index 100% rename from boards/mikroe-stm32f4/configs/nxlines/defconfig rename to boards/arm/mikroe-stm32f4/configs/nxlines/defconfig diff --git a/boards/mikroe-stm32f4/configs/nxtext/defconfig b/boards/arm/mikroe-stm32f4/configs/nxtext/defconfig similarity index 100% rename from boards/mikroe-stm32f4/configs/nxtext/defconfig rename to boards/arm/mikroe-stm32f4/configs/nxtext/defconfig diff --git a/boards/mikroe-stm32f4/configs/usbnsh/defconfig b/boards/arm/mikroe-stm32f4/configs/usbnsh/defconfig similarity index 100% rename from boards/mikroe-stm32f4/configs/usbnsh/defconfig rename to boards/arm/mikroe-stm32f4/configs/usbnsh/defconfig diff --git a/boards/mikroe-stm32f4/include/board.h b/boards/arm/mikroe-stm32f4/include/board.h similarity index 98% rename from boards/mikroe-stm32f4/include/board.h rename to boards/arm/mikroe-stm32f4/include/board.h index dd7e702d82..e3b3122967 100644 --- a/boards/mikroe-stm32f4/include/board.h +++ b/boards/arm/mikroe-stm32f4/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_MIKROE_STM32F4_INCLUDE_BOARD_H -#define __CONFIG_MIKROE_STM32F4_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_MIKROE_STM32F4_INCLUDE_BOARD_H +#define __BOARDS_ARM_MIKROE_STM32F4_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -257,4 +257,4 @@ #define GPIO_TIM8_CH1IN GPIO_TIM8_CH1IN_1 #define GPIO_TIM8_CH2IN GPIO_TIM8_CH2IN_1 -#endif /* __CONFIG_MIKROE_STM32F4_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_MIKROE_STM32F4_INCLUDE_BOARD_H */ diff --git a/boards/mikroe-stm32f4/kernel/.gitignore b/boards/arm/mikroe-stm32f4/kernel/.gitignore similarity index 100% rename from boards/mikroe-stm32f4/kernel/.gitignore rename to boards/arm/mikroe-stm32f4/kernel/.gitignore diff --git a/boards/mikroe-stm32f4/kernel/Makefile b/boards/arm/mikroe-stm32f4/kernel/Makefile similarity index 100% rename from boards/mikroe-stm32f4/kernel/Makefile rename to boards/arm/mikroe-stm32f4/kernel/Makefile diff --git a/boards/mikroe-stm32f4/kernel/stm32_userspace.c b/boards/arm/mikroe-stm32f4/kernel/stm32_userspace.c similarity index 100% rename from boards/mikroe-stm32f4/kernel/stm32_userspace.c rename to boards/arm/mikroe-stm32f4/kernel/stm32_userspace.c diff --git a/boards/mikroe-stm32f4/scripts/Make.defs b/boards/arm/mikroe-stm32f4/scripts/Make.defs similarity index 96% rename from boards/mikroe-stm32f4/scripts/Make.defs rename to boards/arm/mikroe-stm32f4/scripts/Make.defs index f99b02be4f..e7ccce395d 100644 --- a/boards/mikroe-stm32f4/scripts/Make.defs +++ b/boards/arm/mikroe-stm32f4/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/mikroe-stm32f4/scripts/gnu-elf.ld b/boards/arm/mikroe-stm32f4/scripts/gnu-elf.ld similarity index 100% rename from boards/mikroe-stm32f4/scripts/gnu-elf.ld rename to boards/arm/mikroe-stm32f4/scripts/gnu-elf.ld diff --git a/boards/mikroe-stm32f4/scripts/kernel-space.ld b/boards/arm/mikroe-stm32f4/scripts/kernel-space.ld similarity index 100% rename from boards/mikroe-stm32f4/scripts/kernel-space.ld rename to boards/arm/mikroe-stm32f4/scripts/kernel-space.ld diff --git a/boards/mikroe-stm32f4/scripts/ld.script b/boards/arm/mikroe-stm32f4/scripts/ld.script similarity index 100% rename from boards/mikroe-stm32f4/scripts/ld.script rename to boards/arm/mikroe-stm32f4/scripts/ld.script diff --git a/boards/mikroe-stm32f4/scripts/memory.ld b/boards/arm/mikroe-stm32f4/scripts/memory.ld similarity index 100% rename from boards/mikroe-stm32f4/scripts/memory.ld rename to boards/arm/mikroe-stm32f4/scripts/memory.ld diff --git a/boards/mikroe-stm32f4/scripts/user-space.ld b/boards/arm/mikroe-stm32f4/scripts/user-space.ld similarity index 100% rename from boards/mikroe-stm32f4/scripts/user-space.ld rename to boards/arm/mikroe-stm32f4/scripts/user-space.ld diff --git a/boards/lpc4370-link2/src/.gitignore b/boards/arm/mikroe-stm32f4/src/.gitignore similarity index 100% rename from boards/lpc4370-link2/src/.gitignore rename to boards/arm/mikroe-stm32f4/src/.gitignore diff --git a/boards/mikroe-stm32f4/src/Makefile b/boards/arm/mikroe-stm32f4/src/Makefile similarity index 100% rename from boards/mikroe-stm32f4/src/Makefile rename to boards/arm/mikroe-stm32f4/src/Makefile diff --git a/boards/mikroe-stm32f4/src/mikroe-stm32f4.h b/boards/arm/mikroe-stm32f4/src/mikroe-stm32f4.h similarity index 98% rename from boards/mikroe-stm32f4/src/mikroe-stm32f4.h rename to boards/arm/mikroe-stm32f4/src/mikroe-stm32f4.h index 3a3d670242..b1fa81d4f7 100644 --- a/boards/mikroe-stm32f4/src/mikroe-stm32f4.h +++ b/boards/arm/mikroe-stm32f4/src/mikroe-stm32f4.h @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __BOARDS_MIKROE_STM32F4_SRC_MIKROE_STM32F4_H -#define __BOARDS_MIKROE_STM32F4_SRC_MIKROE_STM32F4_H +#ifndef __BOARDS_ARM_MIKROE_STM32F4_SRC_MIKROE_STM32F4_H +#define __BOARDS_ARM_MIKROE_STM32F4_SRC_MIKROE_STM32F4_H /**************************************************************************************************** * Included Files @@ -310,4 +310,4 @@ void up_vs1053initialize(FAR struct spi_dev_s *spi); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_MIKROE_STM32F4_SRC_MIKROE_STM32F4_H */ +#endif /* __BOARDS_ARM_MIKROE_STM32F4_SRC_MIKROE_STM32F4_H */ diff --git a/boards/mikroe-stm32f4/src/stm32_appinit.c b/boards/arm/mikroe-stm32f4/src/stm32_appinit.c similarity index 100% rename from boards/mikroe-stm32f4/src/stm32_appinit.c rename to boards/arm/mikroe-stm32f4/src/stm32_appinit.c diff --git a/boards/mikroe-stm32f4/src/stm32_boot.c b/boards/arm/mikroe-stm32f4/src/stm32_boot.c similarity index 100% rename from boards/mikroe-stm32f4/src/stm32_boot.c rename to boards/arm/mikroe-stm32f4/src/stm32_boot.c diff --git a/boards/mikroe-stm32f4/src/stm32_clockconfig.c b/boards/arm/mikroe-stm32f4/src/stm32_clockconfig.c similarity index 100% rename from boards/mikroe-stm32f4/src/stm32_clockconfig.c rename to boards/arm/mikroe-stm32f4/src/stm32_clockconfig.c diff --git a/boards/mikroe-stm32f4/src/stm32_extmem.c b/boards/arm/mikroe-stm32f4/src/stm32_extmem.c similarity index 100% rename from boards/mikroe-stm32f4/src/stm32_extmem.c rename to boards/arm/mikroe-stm32f4/src/stm32_extmem.c diff --git a/boards/mikroe-stm32f4/src/stm32_idle.c b/boards/arm/mikroe-stm32f4/src/stm32_idle.c similarity index 100% rename from boards/mikroe-stm32f4/src/stm32_idle.c rename to boards/arm/mikroe-stm32f4/src/stm32_idle.c diff --git a/boards/mikroe-stm32f4/src/stm32_mio283qt2.c b/boards/arm/mikroe-stm32f4/src/stm32_mio283qt2.c similarity index 100% rename from boards/mikroe-stm32f4/src/stm32_mio283qt2.c rename to boards/arm/mikroe-stm32f4/src/stm32_mio283qt2.c diff --git a/boards/mikroe-stm32f4/src/stm32_mio283qt9a.c b/boards/arm/mikroe-stm32f4/src/stm32_mio283qt9a.c similarity index 100% rename from boards/mikroe-stm32f4/src/stm32_mio283qt9a.c rename to boards/arm/mikroe-stm32f4/src/stm32_mio283qt9a.c diff --git a/boards/mikroe-stm32f4/src/stm32_pm.c b/boards/arm/mikroe-stm32f4/src/stm32_pm.c similarity index 100% rename from boards/mikroe-stm32f4/src/stm32_pm.c rename to boards/arm/mikroe-stm32f4/src/stm32_pm.c diff --git a/boards/mikroe-stm32f4/src/stm32_pwm.c b/boards/arm/mikroe-stm32f4/src/stm32_pwm.c similarity index 100% rename from boards/mikroe-stm32f4/src/stm32_pwm.c rename to boards/arm/mikroe-stm32f4/src/stm32_pwm.c diff --git a/boards/mikroe-stm32f4/src/stm32_qencoder.c b/boards/arm/mikroe-stm32f4/src/stm32_qencoder.c similarity index 100% rename from boards/mikroe-stm32f4/src/stm32_qencoder.c rename to boards/arm/mikroe-stm32f4/src/stm32_qencoder.c diff --git a/boards/mikroe-stm32f4/src/stm32_spi.c b/boards/arm/mikroe-stm32f4/src/stm32_spi.c similarity index 100% rename from boards/mikroe-stm32f4/src/stm32_spi.c rename to boards/arm/mikroe-stm32f4/src/stm32_spi.c diff --git a/boards/mikroe-stm32f4/src/stm32_touchscreen.c b/boards/arm/mikroe-stm32f4/src/stm32_touchscreen.c similarity index 100% rename from boards/mikroe-stm32f4/src/stm32_touchscreen.c rename to boards/arm/mikroe-stm32f4/src/stm32_touchscreen.c diff --git a/boards/mikroe-stm32f4/src/stm32_usb.c b/boards/arm/mikroe-stm32f4/src/stm32_usb.c similarity index 100% rename from boards/mikroe-stm32f4/src/stm32_usb.c rename to boards/arm/mikroe-stm32f4/src/stm32_usb.c diff --git a/boards/mikroe-stm32f4/src/stm32_vs1053.c b/boards/arm/mikroe-stm32f4/src/stm32_vs1053.c similarity index 100% rename from boards/mikroe-stm32f4/src/stm32_vs1053.c rename to boards/arm/mikroe-stm32f4/src/stm32_vs1053.c diff --git a/boards/moxa/Kconfig b/boards/arm/moxa/Kconfig similarity index 100% rename from boards/moxa/Kconfig rename to boards/arm/moxa/Kconfig diff --git a/boards/moxa/configs/nsh/defconfig b/boards/arm/moxa/configs/nsh/defconfig similarity index 100% rename from boards/moxa/configs/nsh/defconfig rename to boards/arm/moxa/configs/nsh/defconfig diff --git a/boards/moxa/include/board.h b/boards/arm/moxa/include/board.h similarity index 98% rename from boards/moxa/include/board.h rename to boards/arm/moxa/include/board.h index 87b9cbc742..33e9cad2ae 100644 --- a/boards/moxa/include/board.h +++ b/boards/arm/moxa/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_MOXA_INCLUDE_BOARD_H -#define __BOARDS_MOXA_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_MOXA_INCLUDE_BOARD_H +#define __BOARDS_ARM_MOXA_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -227,4 +227,4 @@ inline void ftintc010_set_trig_level(int irq, int level); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_MOXA_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_MOXA_INCLUDE_BOARD_H */ diff --git a/boards/moxa/scripts/Make.defs b/boards/arm/moxa/scripts/Make.defs similarity index 97% rename from boards/moxa/scripts/Make.defs rename to boards/arm/moxa/scripts/Make.defs index 18ccecb0dd..a4dc7755f4 100644 --- a/boards/moxa/scripts/Make.defs +++ b/boards/arm/moxa/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/moxa.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/moxa.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/moxa.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/moxa.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/moxa/scripts/moxa.ld b/boards/arm/moxa/scripts/moxa.ld similarity index 100% rename from boards/moxa/scripts/moxa.ld rename to boards/arm/moxa/scripts/moxa.ld diff --git a/boards/moxa/src/Makefile b/boards/arm/moxa/src/Makefile similarity index 100% rename from boards/moxa/src/Makefile rename to boards/arm/moxa/src/Makefile diff --git a/boards/moxa/src/moxart_appinit.c b/boards/arm/moxa/src/moxart_appinit.c similarity index 100% rename from boards/moxa/src/moxart_appinit.c rename to boards/arm/moxa/src/moxart_appinit.c diff --git a/boards/moxa/src/moxart_boot.c b/boards/arm/moxa/src/moxart_boot.c similarity index 100% rename from boards/moxa/src/moxart_boot.c rename to boards/arm/moxa/src/moxart_boot.c diff --git a/boards/moxa/src/moxart_reset.c b/boards/arm/moxa/src/moxart_reset.c similarity index 100% rename from boards/moxa/src/moxart_reset.c rename to boards/arm/moxa/src/moxart_reset.c diff --git a/boards/nrf52-generic/Kconfig b/boards/arm/nrf52-generic/Kconfig similarity index 100% rename from boards/nrf52-generic/Kconfig rename to boards/arm/nrf52-generic/Kconfig diff --git a/boards/nrf52-generic/README.txt b/boards/arm/nrf52-generic/README.txt similarity index 100% rename from boards/nrf52-generic/README.txt rename to boards/arm/nrf52-generic/README.txt diff --git a/boards/nrf52-generic/configs/feather-nsh/defconfig b/boards/arm/nrf52-generic/configs/feather-nsh/defconfig similarity index 100% rename from boards/nrf52-generic/configs/feather-nsh/defconfig rename to boards/arm/nrf52-generic/configs/feather-nsh/defconfig diff --git a/boards/nrf52-generic/configs/feather-userleds/defconfig b/boards/arm/nrf52-generic/configs/feather-userleds/defconfig similarity index 100% rename from boards/nrf52-generic/configs/feather-userleds/defconfig rename to boards/arm/nrf52-generic/configs/feather-userleds/defconfig diff --git a/boards/nrf52-generic/configs/pca10040-nsh/defconfig b/boards/arm/nrf52-generic/configs/pca10040-nsh/defconfig similarity index 100% rename from boards/nrf52-generic/configs/pca10040-nsh/defconfig rename to boards/arm/nrf52-generic/configs/pca10040-nsh/defconfig diff --git a/boards/nrf52-generic/configs/pca10040-wdog/defconfig b/boards/arm/nrf52-generic/configs/pca10040-wdog/defconfig similarity index 100% rename from boards/nrf52-generic/configs/pca10040-wdog/defconfig rename to boards/arm/nrf52-generic/configs/pca10040-wdog/defconfig diff --git a/boards/nrf52-generic/include/board.h b/boards/arm/nrf52-generic/include/board.h similarity index 100% rename from boards/nrf52-generic/include/board.h rename to boards/arm/nrf52-generic/include/board.h diff --git a/boards/nrf52-generic/scripts/Make.defs b/boards/arm/nrf52-generic/scripts/Make.defs similarity index 96% rename from boards/nrf52-generic/scripts/Make.defs rename to boards/arm/nrf52-generic/scripts/Make.defs index d1f41a50d7..51a31d4ed3 100644 --- a/boards/nrf52-generic/scripts/Make.defs +++ b/boards/arm/nrf52-generic/scripts/Make.defs @@ -48,13 +48,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nrf52-generic/scripts/flash_config.ld b/boards/arm/nrf52-generic/scripts/flash_config.ld similarity index 100% rename from boards/nrf52-generic/scripts/flash_config.ld rename to boards/arm/nrf52-generic/scripts/flash_config.ld diff --git a/boards/lpcxpresso-lpc1768/src/.gitignore b/boards/arm/nrf52-generic/src/.gitignore similarity index 100% rename from boards/lpcxpresso-lpc1768/src/.gitignore rename to boards/arm/nrf52-generic/src/.gitignore diff --git a/boards/nrf52-generic/src/Makefile b/boards/arm/nrf52-generic/src/Makefile similarity index 100% rename from boards/nrf52-generic/src/Makefile rename to boards/arm/nrf52-generic/src/Makefile diff --git a/boards/nrf52-generic/src/nrf52-generic.h b/boards/arm/nrf52-generic/src/nrf52-generic.h similarity index 100% rename from boards/nrf52-generic/src/nrf52-generic.h rename to boards/arm/nrf52-generic/src/nrf52-generic.h diff --git a/boards/nrf52-generic/src/nrf52_appinit.c b/boards/arm/nrf52-generic/src/nrf52_appinit.c similarity index 100% rename from boards/nrf52-generic/src/nrf52_appinit.c rename to boards/arm/nrf52-generic/src/nrf52_appinit.c diff --git a/boards/nrf52-generic/src/nrf52_autoleds.c b/boards/arm/nrf52-generic/src/nrf52_autoleds.c similarity index 100% rename from boards/nrf52-generic/src/nrf52_autoleds.c rename to boards/arm/nrf52-generic/src/nrf52_autoleds.c diff --git a/boards/nrf52-generic/src/nrf52_boot.c b/boards/arm/nrf52-generic/src/nrf52_boot.c similarity index 100% rename from boards/nrf52-generic/src/nrf52_boot.c rename to boards/arm/nrf52-generic/src/nrf52_boot.c diff --git a/boards/nrf52-generic/src/nrf52_bringup.c b/boards/arm/nrf52-generic/src/nrf52_bringup.c similarity index 100% rename from boards/nrf52-generic/src/nrf52_bringup.c rename to boards/arm/nrf52-generic/src/nrf52_bringup.c diff --git a/boards/nrf52-generic/src/nrf52_buttons.c b/boards/arm/nrf52-generic/src/nrf52_buttons.c similarity index 100% rename from boards/nrf52-generic/src/nrf52_buttons.c rename to boards/arm/nrf52-generic/src/nrf52_buttons.c diff --git a/boards/nrf52-generic/src/nrf52_userleds.c b/boards/arm/nrf52-generic/src/nrf52_userleds.c similarity index 100% rename from boards/nrf52-generic/src/nrf52_userleds.c rename to boards/arm/nrf52-generic/src/nrf52_userleds.c diff --git a/boards/ntosd-dm320/Kconfig b/boards/arm/ntosd-dm320/Kconfig similarity index 100% rename from boards/ntosd-dm320/Kconfig rename to boards/arm/ntosd-dm320/Kconfig diff --git a/boards/ntosd-dm320/README.txt b/boards/arm/ntosd-dm320/README.txt similarity index 100% rename from boards/ntosd-dm320/README.txt rename to boards/arm/ntosd-dm320/README.txt diff --git a/boards/ntosd-dm320/configs/nettest/defconfig b/boards/arm/ntosd-dm320/configs/nettest/defconfig similarity index 100% rename from boards/ntosd-dm320/configs/nettest/defconfig rename to boards/arm/ntosd-dm320/configs/nettest/defconfig diff --git a/boards/ntosd-dm320/configs/nsh/defconfig b/boards/arm/ntosd-dm320/configs/nsh/defconfig similarity index 100% rename from boards/ntosd-dm320/configs/nsh/defconfig rename to boards/arm/ntosd-dm320/configs/nsh/defconfig diff --git a/boards/ntosd-dm320/configs/poll/defconfig b/boards/arm/ntosd-dm320/configs/poll/defconfig similarity index 100% rename from boards/ntosd-dm320/configs/poll/defconfig rename to boards/arm/ntosd-dm320/configs/poll/defconfig diff --git a/boards/ntosd-dm320/configs/udp/defconfig b/boards/arm/ntosd-dm320/configs/udp/defconfig similarity index 100% rename from boards/ntosd-dm320/configs/udp/defconfig rename to boards/arm/ntosd-dm320/configs/udp/defconfig diff --git a/boards/ntosd-dm320/configs/webserver/defconfig b/boards/arm/ntosd-dm320/configs/webserver/defconfig similarity index 100% rename from boards/ntosd-dm320/configs/webserver/defconfig rename to boards/arm/ntosd-dm320/configs/webserver/defconfig diff --git a/boards/ntosd-dm320/doc/README.txt b/boards/arm/ntosd-dm320/doc/README.txt similarity index 100% rename from boards/ntosd-dm320/doc/README.txt rename to boards/arm/ntosd-dm320/doc/README.txt diff --git a/boards/ntosd-dm320/include/board.h b/boards/arm/ntosd-dm320/include/board.h similarity index 97% rename from boards/ntosd-dm320/include/board.h rename to boards/arm/ntosd-dm320/include/board.h index 38af564b6f..f64377265d 100644 --- a/boards/ntosd-dm320/include/board.h +++ b/boards/arm/ntosd-dm320/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NTOSD_DM320_INCLUDE_BOARD_H -#define __BOARDS_NTOSD_DM320_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NTOSD_DM320_INCLUDE_BOARD_H +#define __BOARDS_ARM_NTOSD_DM320_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -144,4 +144,4 @@ #endif -#endif /* __BOARDS_NTOSD_DM320_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NTOSD_DM320_INCLUDE_BOARD_H */ diff --git a/boards/ntosd-dm320/scripts/Make.defs b/boards/arm/ntosd-dm320/scripts/Make.defs similarity index 97% rename from boards/ntosd-dm320/scripts/Make.defs rename to boards/arm/ntosd-dm320/scripts/Make.defs index 334d8b782e..d06a6c942a 100644 --- a/boards/ntosd-dm320/scripts/Make.defs +++ b/boards/arm/ntosd-dm320/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/sdram.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/sdram.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/sdram.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/sdram.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/ntosd-dm320/scripts/sdram.ld b/boards/arm/ntosd-dm320/scripts/sdram.ld similarity index 100% rename from boards/ntosd-dm320/scripts/sdram.ld rename to boards/arm/ntosd-dm320/scripts/sdram.ld diff --git a/boards/mbed/src/.gitignore b/boards/arm/ntosd-dm320/src/.gitignore similarity index 100% rename from boards/mbed/src/.gitignore rename to boards/arm/ntosd-dm320/src/.gitignore diff --git a/boards/ntosd-dm320/src/Makefile b/boards/arm/ntosd-dm320/src/Makefile similarity index 100% rename from boards/ntosd-dm320/src/Makefile rename to boards/arm/ntosd-dm320/src/Makefile diff --git a/boards/ntosd-dm320/src/dm320_leds.c b/boards/arm/ntosd-dm320/src/dm320_leds.c similarity index 100% rename from boards/ntosd-dm320/src/dm320_leds.c rename to boards/arm/ntosd-dm320/src/dm320_leds.c diff --git a/boards/ntosd-dm320/src/dm320_network.c b/boards/arm/ntosd-dm320/src/dm320_network.c similarity index 100% rename from boards/ntosd-dm320/src/dm320_network.c rename to boards/arm/ntosd-dm320/src/dm320_network.c diff --git a/boards/nucleo-144/Kconfig b/boards/arm/nucleo-144/Kconfig similarity index 100% rename from boards/nucleo-144/Kconfig rename to boards/arm/nucleo-144/Kconfig diff --git a/boards/nucleo-144/README.txt b/boards/arm/nucleo-144/README.txt similarity index 100% rename from boards/nucleo-144/README.txt rename to boards/arm/nucleo-144/README.txt diff --git a/boards/nucleo-144/configs/f722-nsh/Make.defs b/boards/arm/nucleo-144/configs/f722-nsh/Make.defs similarity index 97% rename from boards/nucleo-144/configs/f722-nsh/Make.defs rename to boards/arm/nucleo-144/configs/f722-nsh/Make.defs index fac5bcf14e..3a2e7161fa 100644 --- a/boards/nucleo-144/configs/f722-nsh/Make.defs +++ b/boards/arm/nucleo-144/configs/f722-nsh/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-144/configs/f722-nsh/defconfig b/boards/arm/nucleo-144/configs/f722-nsh/defconfig similarity index 100% rename from boards/nucleo-144/configs/f722-nsh/defconfig rename to boards/arm/nucleo-144/configs/f722-nsh/defconfig diff --git a/boards/nucleo-144/configs/f746-evalos/Make.defs b/boards/arm/nucleo-144/configs/f746-evalos/Make.defs similarity index 96% rename from boards/nucleo-144/configs/f746-evalos/Make.defs rename to boards/arm/nucleo-144/configs/f746-evalos/Make.defs index e5de25a382..f6d0518c5b 100644 --- a/boards/nucleo-144/configs/f746-evalos/Make.defs +++ b/boards/arm/nucleo-144/configs/f746-evalos/Make.defs @@ -48,13 +48,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-144/configs/f746-evalos/defconfig b/boards/arm/nucleo-144/configs/f746-evalos/defconfig similarity index 100% rename from boards/nucleo-144/configs/f746-evalos/defconfig rename to boards/arm/nucleo-144/configs/f746-evalos/defconfig diff --git a/boards/nucleo-144/configs/f746-nsh/Make.defs b/boards/arm/nucleo-144/configs/f746-nsh/Make.defs similarity index 96% rename from boards/nucleo-144/configs/f746-nsh/Make.defs rename to boards/arm/nucleo-144/configs/f746-nsh/Make.defs index a7ad2ad563..24e5cc13cf 100644 --- a/boards/nucleo-144/configs/f746-nsh/Make.defs +++ b/boards/arm/nucleo-144/configs/f746-nsh/Make.defs @@ -47,13 +47,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-144/configs/f746-nsh/defconfig b/boards/arm/nucleo-144/configs/f746-nsh/defconfig similarity index 100% rename from boards/nucleo-144/configs/f746-nsh/defconfig rename to boards/arm/nucleo-144/configs/f746-nsh/defconfig diff --git a/boards/nucleo-144/configs/f767-evalos/Make.defs b/boards/arm/nucleo-144/configs/f767-evalos/Make.defs similarity index 96% rename from boards/nucleo-144/configs/f767-evalos/Make.defs rename to boards/arm/nucleo-144/configs/f767-evalos/Make.defs index 9351ac8f3f..f8617c1ebb 100644 --- a/boards/nucleo-144/configs/f767-evalos/Make.defs +++ b/boards/arm/nucleo-144/configs/f767-evalos/Make.defs @@ -48,13 +48,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-144/configs/f767-evalos/defconfig b/boards/arm/nucleo-144/configs/f767-evalos/defconfig similarity index 100% rename from boards/nucleo-144/configs/f767-evalos/defconfig rename to boards/arm/nucleo-144/configs/f767-evalos/defconfig diff --git a/boards/nucleo-144/configs/f767-netnsh/Make.defs b/boards/arm/nucleo-144/configs/f767-netnsh/Make.defs similarity index 96% rename from boards/nucleo-144/configs/f767-netnsh/Make.defs rename to boards/arm/nucleo-144/configs/f767-netnsh/Make.defs index 53b93079cc..c70e8b7fe1 100644 --- a/boards/nucleo-144/configs/f767-netnsh/Make.defs +++ b/boards/arm/nucleo-144/configs/f767-netnsh/Make.defs @@ -47,13 +47,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-144/configs/f767-netnsh/defconfig b/boards/arm/nucleo-144/configs/f767-netnsh/defconfig similarity index 100% rename from boards/nucleo-144/configs/f767-netnsh/defconfig rename to boards/arm/nucleo-144/configs/f767-netnsh/defconfig diff --git a/boards/nucleo-144/configs/f767-nsh/Make.defs b/boards/arm/nucleo-144/configs/f767-nsh/Make.defs similarity index 96% rename from boards/nucleo-144/configs/f767-nsh/Make.defs rename to boards/arm/nucleo-144/configs/f767-nsh/Make.defs index 0b0dbfa27a..3c4ecc62f5 100644 --- a/boards/nucleo-144/configs/f767-nsh/Make.defs +++ b/boards/arm/nucleo-144/configs/f767-nsh/Make.defs @@ -47,13 +47,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-144/configs/f767-nsh/defconfig b/boards/arm/nucleo-144/configs/f767-nsh/defconfig similarity index 100% rename from boards/nucleo-144/configs/f767-nsh/defconfig rename to boards/arm/nucleo-144/configs/f767-nsh/defconfig diff --git a/boards/nucleo-144/include/board.h b/boards/arm/nucleo-144/include/board.h similarity index 99% rename from boards/nucleo-144/include/board.h rename to boards/arm/nucleo-144/include/board.h index b5bd24e6f5..1b28d34a0e 100644 --- a/boards/nucleo-144/include/board.h +++ b/boards/arm/nucleo-144/include/board.h @@ -36,8 +36,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_NUCLEO_144_INCLUDE_BOARD_H -#define __CONFIG_NUCLEO_144_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEO_144_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEO_144_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -510,5 +510,5 @@ #define GPIO_ETH_RMII_TXD0 GPIO_ETH_RMII_TXD0_2 #define GPIO_ETH_RMII_TXD1 GPIO_ETH_RMII_TXD1_1 -#endif /* __CONFIG_NUCLEO_144_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_144_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-144/scripts/f722-flash.ld b/boards/arm/nucleo-144/scripts/f722-flash.ld similarity index 100% rename from boards/nucleo-144/scripts/f722-flash.ld rename to boards/arm/nucleo-144/scripts/f722-flash.ld diff --git a/boards/nucleo-144/scripts/f746-flash.ld b/boards/arm/nucleo-144/scripts/f746-flash.ld similarity index 100% rename from boards/nucleo-144/scripts/f746-flash.ld rename to boards/arm/nucleo-144/scripts/f746-flash.ld diff --git a/boards/nucleo-144/scripts/f767-flash.ld b/boards/arm/nucleo-144/scripts/f767-flash.ld similarity index 100% rename from boards/nucleo-144/scripts/f767-flash.ld rename to boards/arm/nucleo-144/scripts/f767-flash.ld diff --git a/boards/nucleo-144/scripts/kernel-space.ld b/boards/arm/nucleo-144/scripts/kernel-space.ld similarity index 100% rename from boards/nucleo-144/scripts/kernel-space.ld rename to boards/arm/nucleo-144/scripts/kernel-space.ld diff --git a/boards/nucleo-144/scripts/memory.ld b/boards/arm/nucleo-144/scripts/memory.ld similarity index 100% rename from boards/nucleo-144/scripts/memory.ld rename to boards/arm/nucleo-144/scripts/memory.ld diff --git a/boards/nucleo-144/scripts/user-space.ld b/boards/arm/nucleo-144/scripts/user-space.ld similarity index 100% rename from boards/nucleo-144/scripts/user-space.ld rename to boards/arm/nucleo-144/scripts/user-space.ld diff --git a/boards/mcb1700/src/.gitignore b/boards/arm/nucleo-144/src/.gitignore similarity index 100% rename from boards/mcb1700/src/.gitignore rename to boards/arm/nucleo-144/src/.gitignore diff --git a/boards/nucleo-144/src/Makefile b/boards/arm/nucleo-144/src/Makefile similarity index 100% rename from boards/nucleo-144/src/Makefile rename to boards/arm/nucleo-144/src/Makefile diff --git a/boards/nucleo-144/src/nucleo-144.h b/boards/arm/nucleo-144/src/nucleo-144.h similarity index 98% rename from boards/nucleo-144/src/nucleo-144.h rename to boards/arm/nucleo-144/src/nucleo-144.h index b049ffe510..ec7e9fecbc 100644 --- a/boards/nucleo-144/src/nucleo-144.h +++ b/boards/arm/nucleo-144/src/nucleo-144.h @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_144_SRC_NUCLEO_144_H -#define __BOARDS_NUCLEO_144_SRC_NUCLEO_144_H +#ifndef __BOARDS_ARM_NUCLEO_144_SRC_NUCLEO_144_H +#define __BOARDS_ARM_NUCLEO_144_SRC_NUCLEO_144_H /************************************************************************************ * Included Files @@ -300,4 +300,4 @@ int stm32_bbsram_int(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_NUCLEO_144_SRC_NUCLEO_144_H */ +#endif /* __BOARDS_ARM_NUCLEO_144_SRC_NUCLEO_144_H */ diff --git a/boards/nucleo-144/src/stm32_adc.c b/boards/arm/nucleo-144/src/stm32_adc.c similarity index 100% rename from boards/nucleo-144/src/stm32_adc.c rename to boards/arm/nucleo-144/src/stm32_adc.c diff --git a/boards/nucleo-144/src/stm32_appinitialize.c b/boards/arm/nucleo-144/src/stm32_appinitialize.c similarity index 100% rename from boards/nucleo-144/src/stm32_appinitialize.c rename to boards/arm/nucleo-144/src/stm32_appinitialize.c diff --git a/boards/nucleo-144/src/stm32_autoleds.c b/boards/arm/nucleo-144/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-144/src/stm32_autoleds.c rename to boards/arm/nucleo-144/src/stm32_autoleds.c diff --git a/boards/nucleo-144/src/stm32_bbsram.c b/boards/arm/nucleo-144/src/stm32_bbsram.c similarity index 100% rename from boards/nucleo-144/src/stm32_bbsram.c rename to boards/arm/nucleo-144/src/stm32_bbsram.c diff --git a/boards/nucleo-144/src/stm32_boot.c b/boards/arm/nucleo-144/src/stm32_boot.c similarity index 100% rename from boards/nucleo-144/src/stm32_boot.c rename to boards/arm/nucleo-144/src/stm32_boot.c diff --git a/boards/nucleo-144/src/stm32_buttons.c b/boards/arm/nucleo-144/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-144/src/stm32_buttons.c rename to boards/arm/nucleo-144/src/stm32_buttons.c diff --git a/boards/nucleo-144/src/stm32_dma_alloc.c b/boards/arm/nucleo-144/src/stm32_dma_alloc.c similarity index 100% rename from boards/nucleo-144/src/stm32_dma_alloc.c rename to boards/arm/nucleo-144/src/stm32_dma_alloc.c diff --git a/boards/nucleo-144/src/stm32_gpio.c b/boards/arm/nucleo-144/src/stm32_gpio.c similarity index 100% rename from boards/nucleo-144/src/stm32_gpio.c rename to boards/arm/nucleo-144/src/stm32_gpio.c diff --git a/boards/nucleo-144/src/stm32_pwm.c b/boards/arm/nucleo-144/src/stm32_pwm.c similarity index 100% rename from boards/nucleo-144/src/stm32_pwm.c rename to boards/arm/nucleo-144/src/stm32_pwm.c diff --git a/boards/nucleo-144/src/stm32_reset.c b/boards/arm/nucleo-144/src/stm32_reset.c similarity index 100% rename from boards/nucleo-144/src/stm32_reset.c rename to boards/arm/nucleo-144/src/stm32_reset.c diff --git a/boards/nucleo-144/src/stm32_romfs.h b/boards/arm/nucleo-144/src/stm32_romfs.h similarity index 95% rename from boards/nucleo-144/src/stm32_romfs.h rename to boards/arm/nucleo-144/src/stm32_romfs.h index dd54109d15..b63a08b297 100644 --- a/boards/nucleo-144/src/stm32_romfs.h +++ b/boards/arm/nucleo-144/src/stm32_romfs.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_NUCLEO144_SRC_STM32_ROMFS_H -#define __BOARDS_NUCLEO144_SRC_STM32_ROMFS_H +#ifndef __BOARDS_ARM_NUCLEO144_SRC_STM32_ROMFS_H +#define __BOARDS_ARM_NUCLEO144_SRC_STM32_ROMFS_H /**************************************************************************** * Included Files @@ -73,4 +73,4 @@ int stm32_romfs_initialize(void); #endif /* CONFIG_STM32_ROMFS */ -#endif /* __BOARDS_NUCLEO144_SRC_STM32_ROMFS_H */ +#endif /* __BOARDS_ARM_NUCLEO144_SRC_STM32_ROMFS_H */ diff --git a/boards/nucleo-144/src/stm32_romfs_initialize.c b/boards/arm/nucleo-144/src/stm32_romfs_initialize.c similarity index 100% rename from boards/nucleo-144/src/stm32_romfs_initialize.c rename to boards/arm/nucleo-144/src/stm32_romfs_initialize.c diff --git a/boards/nucleo-144/src/stm32_sdio.c b/boards/arm/nucleo-144/src/stm32_sdio.c similarity index 100% rename from boards/nucleo-144/src/stm32_sdio.c rename to boards/arm/nucleo-144/src/stm32_sdio.c diff --git a/boards/nucleo-144/src/stm32_spi.c b/boards/arm/nucleo-144/src/stm32_spi.c similarity index 100% rename from boards/nucleo-144/src/stm32_spi.c rename to boards/arm/nucleo-144/src/stm32_spi.c diff --git a/boards/nucleo-144/src/stm32_usb.c b/boards/arm/nucleo-144/src/stm32_usb.c similarity index 100% rename from boards/nucleo-144/src/stm32_usb.c rename to boards/arm/nucleo-144/src/stm32_usb.c diff --git a/boards/nucleo-144/src/stm32_userleds.c b/boards/arm/nucleo-144/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-144/src/stm32_userleds.c rename to boards/arm/nucleo-144/src/stm32_userleds.c diff --git a/boards/nucleo-f072rb/Kconfig b/boards/arm/nucleo-f072rb/Kconfig similarity index 100% rename from boards/nucleo-f072rb/Kconfig rename to boards/arm/nucleo-f072rb/Kconfig diff --git a/boards/nucleo-f072rb/README.txt b/boards/arm/nucleo-f072rb/README.txt similarity index 100% rename from boards/nucleo-f072rb/README.txt rename to boards/arm/nucleo-f072rb/README.txt diff --git a/boards/nucleo-f072rb/configs/nsh/defconfig b/boards/arm/nucleo-f072rb/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-f072rb/configs/nsh/defconfig rename to boards/arm/nucleo-f072rb/configs/nsh/defconfig diff --git a/boards/nucleo-f072rb/include/board.h b/boards/arm/nucleo-f072rb/include/board.h similarity index 98% rename from boards/nucleo-f072rb/include/board.h rename to boards/arm/nucleo-f072rb/include/board.h index c44acff52c..2a93499a5c 100644 --- a/boards/nucleo-f072rb/include/board.h +++ b/boards/arm/nucleo-f072rb/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_NUCLEO_F072RB_INCLUDE_BOARD_H -#define __CONFIG_NUCLEO_F072RB_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEO_F072RB_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEO_F072RB_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -245,4 +245,4 @@ /* I2C2 */ -#endif /* __CONFIG_NUCLEO_F072RB_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F072RB_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-f072rb/scripts/Make.defs b/boards/arm/nucleo-f072rb/scripts/Make.defs similarity index 96% rename from boards/nucleo-f072rb/scripts/Make.defs rename to boards/arm/nucleo-f072rb/scripts/Make.defs index 0298d766a6..afc597e661 100644 --- a/boards/nucleo-f072rb/scripts/Make.defs +++ b/boards/arm/nucleo-f072rb/scripts/Make.defs @@ -47,13 +47,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-f072rb/scripts/flash.ld b/boards/arm/nucleo-f072rb/scripts/flash.ld similarity index 100% rename from boards/nucleo-f072rb/scripts/flash.ld rename to boards/arm/nucleo-f072rb/scripts/flash.ld diff --git a/boards/mcu123-lpc214x/src/.gitignore b/boards/arm/nucleo-f072rb/src/.gitignore similarity index 100% rename from boards/mcu123-lpc214x/src/.gitignore rename to boards/arm/nucleo-f072rb/src/.gitignore diff --git a/boards/nucleo-f072rb/src/Makefile b/boards/arm/nucleo-f072rb/src/Makefile similarity index 100% rename from boards/nucleo-f072rb/src/Makefile rename to boards/arm/nucleo-f072rb/src/Makefile diff --git a/boards/nucleo-f072rb/src/nucleo-f072rb.h b/boards/arm/nucleo-f072rb/src/nucleo-f072rb.h similarity index 96% rename from boards/nucleo-f072rb/src/nucleo-f072rb.h rename to boards/arm/nucleo-f072rb/src/nucleo-f072rb.h index f30446d733..0cd8ffe7aa 100644 --- a/boards/nucleo-f072rb/src/nucleo-f072rb.h +++ b/boards/arm/nucleo-f072rb/src/nucleo-f072rb.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_NUCLEO_F072RB_SRC_NUCLEO_F072RB_H -#define __BOARDS_NUCLEO_F072RB_SRC_NUCLEO_F072RB_H +#ifndef __BOARDS_ARM_NUCLEO_F072RB_SRC_NUCLEO_F072RB_H +#define __BOARDS_ARM_NUCLEO_F072RB_SRC_NUCLEO_F072RB_H /**************************************************************************** * Included Files @@ -120,4 +120,4 @@ int stm32_bringup(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_NUCLEO_F072RB_SRC_NUCLEO_F072RB_H */ +#endif /* __BOARDS_ARM_NUCLEO_F072RB_SRC_NUCLEO_F072RB_H */ diff --git a/boards/nucleo-f072rb/src/stm32_appinit.c b/boards/arm/nucleo-f072rb/src/stm32_appinit.c similarity index 100% rename from boards/nucleo-f072rb/src/stm32_appinit.c rename to boards/arm/nucleo-f072rb/src/stm32_appinit.c diff --git a/boards/nucleo-f072rb/src/stm32_autoleds.c b/boards/arm/nucleo-f072rb/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-f072rb/src/stm32_autoleds.c rename to boards/arm/nucleo-f072rb/src/stm32_autoleds.c diff --git a/boards/nucleo-f072rb/src/stm32_boot.c b/boards/arm/nucleo-f072rb/src/stm32_boot.c similarity index 100% rename from boards/nucleo-f072rb/src/stm32_boot.c rename to boards/arm/nucleo-f072rb/src/stm32_boot.c diff --git a/boards/nucleo-f072rb/src/stm32_bringup.c b/boards/arm/nucleo-f072rb/src/stm32_bringup.c similarity index 100% rename from boards/nucleo-f072rb/src/stm32_bringup.c rename to boards/arm/nucleo-f072rb/src/stm32_bringup.c diff --git a/boards/nucleo-f072rb/src/stm32_buttons.c b/boards/arm/nucleo-f072rb/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-f072rb/src/stm32_buttons.c rename to boards/arm/nucleo-f072rb/src/stm32_buttons.c diff --git a/boards/nucleo-f072rb/src/stm32_userleds.c b/boards/arm/nucleo-f072rb/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-f072rb/src/stm32_userleds.c rename to boards/arm/nucleo-f072rb/src/stm32_userleds.c diff --git a/boards/nucleo-f091rc/Kconfig b/boards/arm/nucleo-f091rc/Kconfig similarity index 100% rename from boards/nucleo-f091rc/Kconfig rename to boards/arm/nucleo-f091rc/Kconfig diff --git a/boards/nucleo-f091rc/README.txt b/boards/arm/nucleo-f091rc/README.txt similarity index 100% rename from boards/nucleo-f091rc/README.txt rename to boards/arm/nucleo-f091rc/README.txt diff --git a/boards/nucleo-f091rc/configs/nsh/defconfig b/boards/arm/nucleo-f091rc/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-f091rc/configs/nsh/defconfig rename to boards/arm/nucleo-f091rc/configs/nsh/defconfig diff --git a/boards/nucleo-f091rc/configs/sx127x/defconfig b/boards/arm/nucleo-f091rc/configs/sx127x/defconfig similarity index 100% rename from boards/nucleo-f091rc/configs/sx127x/defconfig rename to boards/arm/nucleo-f091rc/configs/sx127x/defconfig diff --git a/boards/nucleo-f091rc/include/board.h b/boards/arm/nucleo-f091rc/include/board.h similarity index 98% rename from boards/nucleo-f091rc/include/board.h rename to boards/arm/nucleo-f091rc/include/board.h index b38f1c84d7..0f6bcf5fab 100644 --- a/boards/nucleo-f091rc/include/board.h +++ b/boards/arm/nucleo-f091rc/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_NUCLEO_F091RC_INCLUDE_BOARD_H -#define __CONFIG_NUCLEO_F091RC_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEO_F091RC_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEO_F091RC_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -250,4 +250,4 @@ #define GPIO_USART2_TX GPIO_USART2_TX_3 #define GPIO_USART2_RX GPIO_USART2_RX_3 -#endif /* __CONFIG_NUCLEO_F091RC_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F091RC_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-f091rc/scripts/Make.defs b/boards/arm/nucleo-f091rc/scripts/Make.defs similarity index 96% rename from boards/nucleo-f091rc/scripts/Make.defs rename to boards/arm/nucleo-f091rc/scripts/Make.defs index aba5436756..4f63cb5973 100644 --- a/boards/nucleo-f091rc/scripts/Make.defs +++ b/boards/arm/nucleo-f091rc/scripts/Make.defs @@ -47,13 +47,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-f091rc/scripts/flash.ld b/boards/arm/nucleo-f091rc/scripts/flash.ld similarity index 100% rename from boards/nucleo-f091rc/scripts/flash.ld rename to boards/arm/nucleo-f091rc/scripts/flash.ld diff --git a/boards/micropendous3/src/.gitignore b/boards/arm/nucleo-f091rc/src/.gitignore similarity index 100% rename from boards/micropendous3/src/.gitignore rename to boards/arm/nucleo-f091rc/src/.gitignore diff --git a/boards/nucleo-f091rc/src/Makefile b/boards/arm/nucleo-f091rc/src/Makefile similarity index 100% rename from boards/nucleo-f091rc/src/Makefile rename to boards/arm/nucleo-f091rc/src/Makefile diff --git a/boards/nucleo-f091rc/src/nucleo-f091rc.h b/boards/arm/nucleo-f091rc/src/nucleo-f091rc.h similarity index 97% rename from boards/nucleo-f091rc/src/nucleo-f091rc.h rename to boards/arm/nucleo-f091rc/src/nucleo-f091rc.h index 424ceea486..31b8661956 100644 --- a/boards/nucleo-f091rc/src/nucleo-f091rc.h +++ b/boards/arm/nucleo-f091rc/src/nucleo-f091rc.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_NUCLEO_F091RC_SRC_NUCLEO_F091RC_H -#define __BOARDS_NUCLEO_F091RC_SRC_NUCLEO_F091RC_H +#ifndef __BOARDS_ARM_NUCLEO_F091RC_SRC_NUCLEO_F091RC_H +#define __BOARDS_ARM_NUCLEO_F091RC_SRC_NUCLEO_F091RC_H /**************************************************************************** * Included Files @@ -155,4 +155,4 @@ int stm32_lpwaninitialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_NUCLEO_F091RC_SRC_NUCLEO_F091RC_H */ +#endif /* __BOARDS_ARM_NUCLEO_F091RC_SRC_NUCLEO_F091RC_H */ diff --git a/boards/nucleo-f091rc/src/stm32_appinit.c b/boards/arm/nucleo-f091rc/src/stm32_appinit.c similarity index 100% rename from boards/nucleo-f091rc/src/stm32_appinit.c rename to boards/arm/nucleo-f091rc/src/stm32_appinit.c diff --git a/boards/nucleo-f091rc/src/stm32_autoleds.c b/boards/arm/nucleo-f091rc/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-f091rc/src/stm32_autoleds.c rename to boards/arm/nucleo-f091rc/src/stm32_autoleds.c diff --git a/boards/nucleo-f091rc/src/stm32_boot.c b/boards/arm/nucleo-f091rc/src/stm32_boot.c similarity index 100% rename from boards/nucleo-f091rc/src/stm32_boot.c rename to boards/arm/nucleo-f091rc/src/stm32_boot.c diff --git a/boards/nucleo-f091rc/src/stm32_bringup.c b/boards/arm/nucleo-f091rc/src/stm32_bringup.c similarity index 100% rename from boards/nucleo-f091rc/src/stm32_bringup.c rename to boards/arm/nucleo-f091rc/src/stm32_bringup.c diff --git a/boards/nucleo-f091rc/src/stm32_buttons.c b/boards/arm/nucleo-f091rc/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-f091rc/src/stm32_buttons.c rename to boards/arm/nucleo-f091rc/src/stm32_buttons.c diff --git a/boards/nucleo-f091rc/src/stm32_spi.c b/boards/arm/nucleo-f091rc/src/stm32_spi.c similarity index 100% rename from boards/nucleo-f091rc/src/stm32_spi.c rename to boards/arm/nucleo-f091rc/src/stm32_spi.c diff --git a/boards/nucleo-f091rc/src/stm32_sx127x.c b/boards/arm/nucleo-f091rc/src/stm32_sx127x.c similarity index 100% rename from boards/nucleo-f091rc/src/stm32_sx127x.c rename to boards/arm/nucleo-f091rc/src/stm32_sx127x.c diff --git a/boards/nucleo-f091rc/src/stm32_userleds.c b/boards/arm/nucleo-f091rc/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-f091rc/src/stm32_userleds.c rename to boards/arm/nucleo-f091rc/src/stm32_userleds.c diff --git a/boards/nucleo-f103rb/Kconfig b/boards/arm/nucleo-f103rb/Kconfig similarity index 100% rename from boards/nucleo-f103rb/Kconfig rename to boards/arm/nucleo-f103rb/Kconfig diff --git a/boards/nucleo-f103rb/README.txt b/boards/arm/nucleo-f103rb/README.txt similarity index 100% rename from boards/nucleo-f103rb/README.txt rename to boards/arm/nucleo-f103rb/README.txt diff --git a/boards/nucleo-f103rb/configs/adc/defconfig b/boards/arm/nucleo-f103rb/configs/adc/defconfig similarity index 100% rename from boards/nucleo-f103rb/configs/adc/defconfig rename to boards/arm/nucleo-f103rb/configs/adc/defconfig diff --git a/boards/nucleo-f103rb/configs/nsh/defconfig b/boards/arm/nucleo-f103rb/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-f103rb/configs/nsh/defconfig rename to boards/arm/nucleo-f103rb/configs/nsh/defconfig diff --git a/boards/nucleo-f103rb/configs/pwm/defconfig b/boards/arm/nucleo-f103rb/configs/pwm/defconfig similarity index 100% rename from boards/nucleo-f103rb/configs/pwm/defconfig rename to boards/arm/nucleo-f103rb/configs/pwm/defconfig diff --git a/boards/nucleo-f103rb/include/board.h b/boards/arm/nucleo-f103rb/include/board.h similarity index 97% rename from boards/nucleo-f103rb/include/board.h rename to boards/arm/nucleo-f103rb/include/board.h index 9ab5490acb..bb7bc2ea11 100644 --- a/boards/nucleo-f103rb/include/board.h +++ b/boards/arm/nucleo-f103rb/include/board.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_NUCLEOF103RB_INCLUDE_BOARD_H -#define __CONFIG_NUCLEOF103RB_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEOF103RB_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEOF103RB_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -185,4 +185,4 @@ #define ADC1_DMA_CHAN DMACHAN_ADC1 /* DMA1_CH1 */ -#endif /* __CONFIG_NUCLEO_F103RB_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F103RB_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-f103rb/scripts/Make.defs b/boards/arm/nucleo-f103rb/scripts/Make.defs similarity index 96% rename from boards/nucleo-f103rb/scripts/Make.defs rename to boards/arm/nucleo-f103rb/scripts/Make.defs index e252cd3488..03ff5410cf 100644 --- a/boards/nucleo-f103rb/scripts/Make.defs +++ b/boards/arm/nucleo-f103rb/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-f103rb/scripts/ld.script b/boards/arm/nucleo-f103rb/scripts/ld.script similarity index 100% rename from boards/nucleo-f103rb/scripts/ld.script rename to boards/arm/nucleo-f103rb/scripts/ld.script diff --git a/boards/nucleo-f103rb/src/Makefile b/boards/arm/nucleo-f103rb/src/Makefile similarity index 100% rename from boards/nucleo-f103rb/src/Makefile rename to boards/arm/nucleo-f103rb/src/Makefile diff --git a/boards/nucleo-f103rb/src/nucleo-f103rb.h b/boards/arm/nucleo-f103rb/src/nucleo-f103rb.h similarity index 96% rename from boards/nucleo-f103rb/src/nucleo-f103rb.h rename to boards/arm/nucleo-f103rb/src/nucleo-f103rb.h index fd18168312..7d48531b09 100644 --- a/boards/nucleo-f103rb/src/nucleo-f103rb.h +++ b/boards/arm/nucleo-f103rb/src/nucleo-f103rb.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_NUCLEO_F103RB_SRC_NUCLEO_F103RB_H -#define __BOARDS_NUCLEO_F103RB_SRC_NUCLEO_F103RB_H +#ifndef __BOARDS_ARM_NUCLEO_F103RB_SRC_NUCLEO_F103RB_H +#define __BOARDS_ARM_NUCLEO_F103RB_SRC_NUCLEO_F103RB_H /**************************************************************************** * Included Files @@ -118,4 +118,4 @@ int stm32_pwm_setup(void); int stm32_adc_setup(void); #endif -#endif /* __BOARDS_NUCLEO_F103RB_SRC_NUCLEO_F103RB_H */ +#endif /* __BOARDS_ARM_NUCLEO_F103RB_SRC_NUCLEO_F103RB_H */ diff --git a/boards/nucleo-f103rb/src/stm32_adc.c b/boards/arm/nucleo-f103rb/src/stm32_adc.c similarity index 100% rename from boards/nucleo-f103rb/src/stm32_adc.c rename to boards/arm/nucleo-f103rb/src/stm32_adc.c diff --git a/boards/nucleo-f103rb/src/stm32_appinitialize.c b/boards/arm/nucleo-f103rb/src/stm32_appinitialize.c similarity index 100% rename from boards/nucleo-f103rb/src/stm32_appinitialize.c rename to boards/arm/nucleo-f103rb/src/stm32_appinitialize.c diff --git a/boards/nucleo-f103rb/src/stm32_autoleds.c b/boards/arm/nucleo-f103rb/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-f103rb/src/stm32_autoleds.c rename to boards/arm/nucleo-f103rb/src/stm32_autoleds.c diff --git a/boards/nucleo-f103rb/src/stm32_boot.c b/boards/arm/nucleo-f103rb/src/stm32_boot.c similarity index 100% rename from boards/nucleo-f103rb/src/stm32_boot.c rename to boards/arm/nucleo-f103rb/src/stm32_boot.c diff --git a/boards/nucleo-f103rb/src/stm32_buttons.c b/boards/arm/nucleo-f103rb/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-f103rb/src/stm32_buttons.c rename to boards/arm/nucleo-f103rb/src/stm32_buttons.c diff --git a/boards/nucleo-f103rb/src/stm32_pwm.c b/boards/arm/nucleo-f103rb/src/stm32_pwm.c similarity index 100% rename from boards/nucleo-f103rb/src/stm32_pwm.c rename to boards/arm/nucleo-f103rb/src/stm32_pwm.c diff --git a/boards/nucleo-f103rb/src/stm32_userleds.c b/boards/arm/nucleo-f103rb/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-f103rb/src/stm32_userleds.c rename to boards/arm/nucleo-f103rb/src/stm32_userleds.c diff --git a/boards/nucleo-f207zg/Kconfig b/boards/arm/nucleo-f207zg/Kconfig similarity index 100% rename from boards/nucleo-f207zg/Kconfig rename to boards/arm/nucleo-f207zg/Kconfig diff --git a/boards/nucleo-f207zg/README.txt b/boards/arm/nucleo-f207zg/README.txt similarity index 100% rename from boards/nucleo-f207zg/README.txt rename to boards/arm/nucleo-f207zg/README.txt diff --git a/boards/nucleo-f207zg/configs/adc/defconfig b/boards/arm/nucleo-f207zg/configs/adc/defconfig similarity index 100% rename from boards/nucleo-f207zg/configs/adc/defconfig rename to boards/arm/nucleo-f207zg/configs/adc/defconfig diff --git a/boards/nucleo-f207zg/configs/nsh/defconfig b/boards/arm/nucleo-f207zg/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-f207zg/configs/nsh/defconfig rename to boards/arm/nucleo-f207zg/configs/nsh/defconfig diff --git a/boards/nucleo-f207zg/configs/pwm/defconfig b/boards/arm/nucleo-f207zg/configs/pwm/defconfig similarity index 100% rename from boards/nucleo-f207zg/configs/pwm/defconfig rename to boards/arm/nucleo-f207zg/configs/pwm/defconfig diff --git a/boards/nucleo-f207zg/include/board.h b/boards/arm/nucleo-f207zg/include/board.h similarity index 98% rename from boards/nucleo-f207zg/include/board.h rename to boards/arm/nucleo-f207zg/include/board.h index 30a8831fc6..cc01387743 100644 --- a/boards/nucleo-f207zg/include/board.h +++ b/boards/arm/nucleo-f207zg/include/board.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_NUCLEOF207ZG_INCLUDE_BOARD_H -#define __CONFIG_NUCLEOF207ZG_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEOF207ZG_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEOF207ZG_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -214,4 +214,4 @@ #define ADC1_DMA_CHAN DMAMAP_ADC1_1 -#endif /* __CONFIG_NUCLEO_F207ZG_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F207ZG_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-f207zg/scripts/Make.defs b/boards/arm/nucleo-f207zg/scripts/Make.defs similarity index 96% rename from boards/nucleo-f207zg/scripts/Make.defs rename to boards/arm/nucleo-f207zg/scripts/Make.defs index 5a00a9be8a..4f8e821e53 100644 --- a/boards/nucleo-f207zg/scripts/Make.defs +++ b/boards/arm/nucleo-f207zg/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-f207zg/scripts/ld.script b/boards/arm/nucleo-f207zg/scripts/ld.script similarity index 100% rename from boards/nucleo-f207zg/scripts/ld.script rename to boards/arm/nucleo-f207zg/scripts/ld.script diff --git a/boards/nucleo-f207zg/src/Makefile b/boards/arm/nucleo-f207zg/src/Makefile similarity index 100% rename from boards/nucleo-f207zg/src/Makefile rename to boards/arm/nucleo-f207zg/src/Makefile diff --git a/boards/nucleo-f207zg/src/nucleo-f207zg.h b/boards/arm/nucleo-f207zg/src/nucleo-f207zg.h similarity index 97% rename from boards/nucleo-f207zg/src/nucleo-f207zg.h rename to boards/arm/nucleo-f207zg/src/nucleo-f207zg.h index 26a311b163..970b308bf5 100644 --- a/boards/nucleo-f207zg/src/nucleo-f207zg.h +++ b/boards/arm/nucleo-f207zg/src/nucleo-f207zg.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_NUCLEO_F207ZG_SRC_NUCLEO_F207ZG_H -#define __BOARDS_NUCLEO_F207ZG_SRC_NUCLEO_F207ZG_H +#ifndef __BOARDS_ARM_NUCLEO_F207ZG_SRC_NUCLEO_F207ZG_H +#define __BOARDS_ARM_NUCLEO_F207ZG_SRC_NUCLEO_F207ZG_H /**************************************************************************** * Included Files @@ -145,4 +145,4 @@ int stm32_pwm_setup(void); int stm32_adc_setup(void); #endif -#endif /* __BOARDS_NUCLEO_F207ZG_SRC_NUCLEO_F207ZG_H */ +#endif /* __BOARDS_ARM_NUCLEO_F207ZG_SRC_NUCLEO_F207ZG_H */ diff --git a/boards/nucleo-f207zg/src/stm32_adc.c b/boards/arm/nucleo-f207zg/src/stm32_adc.c similarity index 100% rename from boards/nucleo-f207zg/src/stm32_adc.c rename to boards/arm/nucleo-f207zg/src/stm32_adc.c diff --git a/boards/nucleo-f207zg/src/stm32_appinitialize.c b/boards/arm/nucleo-f207zg/src/stm32_appinitialize.c similarity index 100% rename from boards/nucleo-f207zg/src/stm32_appinitialize.c rename to boards/arm/nucleo-f207zg/src/stm32_appinitialize.c diff --git a/boards/nucleo-f207zg/src/stm32_autoleds.c b/boards/arm/nucleo-f207zg/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-f207zg/src/stm32_autoleds.c rename to boards/arm/nucleo-f207zg/src/stm32_autoleds.c diff --git a/boards/nucleo-f207zg/src/stm32_boot.c b/boards/arm/nucleo-f207zg/src/stm32_boot.c similarity index 100% rename from boards/nucleo-f207zg/src/stm32_boot.c rename to boards/arm/nucleo-f207zg/src/stm32_boot.c diff --git a/boards/nucleo-f207zg/src/stm32_bringup.c b/boards/arm/nucleo-f207zg/src/stm32_bringup.c similarity index 100% rename from boards/nucleo-f207zg/src/stm32_bringup.c rename to boards/arm/nucleo-f207zg/src/stm32_bringup.c diff --git a/boards/nucleo-f207zg/src/stm32_buttons.c b/boards/arm/nucleo-f207zg/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-f207zg/src/stm32_buttons.c rename to boards/arm/nucleo-f207zg/src/stm32_buttons.c diff --git a/boards/nucleo-f207zg/src/stm32_pwm.c b/boards/arm/nucleo-f207zg/src/stm32_pwm.c similarity index 100% rename from boards/nucleo-f207zg/src/stm32_pwm.c rename to boards/arm/nucleo-f207zg/src/stm32_pwm.c diff --git a/boards/nucleo-f207zg/src/stm32_usb.c b/boards/arm/nucleo-f207zg/src/stm32_usb.c similarity index 100% rename from boards/nucleo-f207zg/src/stm32_usb.c rename to boards/arm/nucleo-f207zg/src/stm32_usb.c diff --git a/boards/nucleo-f207zg/src/stm32_userleds.c b/boards/arm/nucleo-f207zg/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-f207zg/src/stm32_userleds.c rename to boards/arm/nucleo-f207zg/src/stm32_userleds.c diff --git a/boards/nucleo-f302r8/Kconfig b/boards/arm/nucleo-f302r8/Kconfig similarity index 100% rename from boards/nucleo-f302r8/Kconfig rename to boards/arm/nucleo-f302r8/Kconfig diff --git a/boards/nucleo-f302r8/README.txt b/boards/arm/nucleo-f302r8/README.txt similarity index 100% rename from boards/nucleo-f302r8/README.txt rename to boards/arm/nucleo-f302r8/README.txt diff --git a/boards/nucleo-f302r8/configs/highpri/defconfig b/boards/arm/nucleo-f302r8/configs/highpri/defconfig similarity index 100% rename from boards/nucleo-f302r8/configs/highpri/defconfig rename to boards/arm/nucleo-f302r8/configs/highpri/defconfig diff --git a/boards/nucleo-f302r8/configs/nsh/defconfig b/boards/arm/nucleo-f302r8/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-f302r8/configs/nsh/defconfig rename to boards/arm/nucleo-f302r8/configs/nsh/defconfig diff --git a/boards/nucleo-f302r8/include/board.h b/boards/arm/nucleo-f302r8/include/board.h similarity index 98% rename from boards/nucleo-f302r8/include/board.h rename to boards/arm/nucleo-f302r8/include/board.h index 796fd9c5b6..cf2cd5e3c8 100644 --- a/boards/nucleo-f302r8/include/board.h +++ b/boards/arm/nucleo-f302r8/include/board.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_NUCLEOF302R8_INCLUDE_BOARD_H -#define __CONFIG_NUCLEOF302R8_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEOF302R8_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEOF302R8_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -256,4 +256,4 @@ #define ADC1_DMA_CHAN DMACHAN_ADC1 /* DMA1_CH1 */ -#endif /* __CONFIG_NUCLEO_F302R8_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F302R8_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-f302r8/scripts/Make.defs b/boards/arm/nucleo-f302r8/scripts/Make.defs similarity index 96% rename from boards/nucleo-f302r8/scripts/Make.defs rename to boards/arm/nucleo-f302r8/scripts/Make.defs index b41305d0c8..bb45c6c239 100644 --- a/boards/nucleo-f302r8/scripts/Make.defs +++ b/boards/arm/nucleo-f302r8/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-f302r8/scripts/ld.script b/boards/arm/nucleo-f302r8/scripts/ld.script similarity index 100% rename from boards/nucleo-f302r8/scripts/ld.script rename to boards/arm/nucleo-f302r8/scripts/ld.script diff --git a/boards/nucleo-f302r8/src/Makefile b/boards/arm/nucleo-f302r8/src/Makefile similarity index 100% rename from boards/nucleo-f302r8/src/Makefile rename to boards/arm/nucleo-f302r8/src/Makefile diff --git a/boards/nucleo-f302r8/src/nucleo-f302r8.h b/boards/arm/nucleo-f302r8/src/nucleo-f302r8.h similarity index 96% rename from boards/nucleo-f302r8/src/nucleo-f302r8.h rename to boards/arm/nucleo-f302r8/src/nucleo-f302r8.h index f39dc307f1..1b821ca0f5 100644 --- a/boards/nucleo-f302r8/src/nucleo-f302r8.h +++ b/boards/arm/nucleo-f302r8/src/nucleo-f302r8.h @@ -35,8 +35,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_NUCLEO_F302R8_SRC_NUCLEO_F302R8_H -#define __BOARDS_NUCLEO_F302R8_SRC_NUCLEO_F302R8_H +#ifndef __BOARDS_ARM_NUCLEO_F302R8_SRC_NUCLEO_F302R8_H +#define __BOARDS_ARM_NUCLEO_F302R8_SRC_NUCLEO_F302R8_H /**************************************************************************** * Included Files @@ -112,4 +112,4 @@ int stm32_pwm_setup(void); #endif -#endif /* __BOARDS_NUCLEO_F302R8_SRC_NUCLEO_F302R8_H */ +#endif /* __BOARDS_ARM_NUCLEO_F302R8_SRC_NUCLEO_F302R8_H */ diff --git a/boards/nucleo-f302r8/src/stm32_appinitialize.c b/boards/arm/nucleo-f302r8/src/stm32_appinitialize.c similarity index 100% rename from boards/nucleo-f302r8/src/stm32_appinitialize.c rename to boards/arm/nucleo-f302r8/src/stm32_appinitialize.c diff --git a/boards/nucleo-f302r8/src/stm32_autoleds.c b/boards/arm/nucleo-f302r8/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-f302r8/src/stm32_autoleds.c rename to boards/arm/nucleo-f302r8/src/stm32_autoleds.c diff --git a/boards/nucleo-f302r8/src/stm32_boot.c b/boards/arm/nucleo-f302r8/src/stm32_boot.c similarity index 100% rename from boards/nucleo-f302r8/src/stm32_boot.c rename to boards/arm/nucleo-f302r8/src/stm32_boot.c diff --git a/boards/nucleo-f302r8/src/stm32_buttons.c b/boards/arm/nucleo-f302r8/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-f302r8/src/stm32_buttons.c rename to boards/arm/nucleo-f302r8/src/stm32_buttons.c diff --git a/boards/nucleo-f302r8/src/stm32_highpri.c b/boards/arm/nucleo-f302r8/src/stm32_highpri.c similarity index 100% rename from boards/nucleo-f302r8/src/stm32_highpri.c rename to boards/arm/nucleo-f302r8/src/stm32_highpri.c diff --git a/boards/nucleo-f302r8/src/stm32_pwm.c b/boards/arm/nucleo-f302r8/src/stm32_pwm.c similarity index 100% rename from boards/nucleo-f302r8/src/stm32_pwm.c rename to boards/arm/nucleo-f302r8/src/stm32_pwm.c diff --git a/boards/nucleo-f302r8/src/stm32_userleds.c b/boards/arm/nucleo-f302r8/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-f302r8/src/stm32_userleds.c rename to boards/arm/nucleo-f302r8/src/stm32_userleds.c diff --git a/boards/nucleo-f303re/Kconfig b/boards/arm/nucleo-f303re/Kconfig similarity index 100% rename from boards/nucleo-f303re/Kconfig rename to boards/arm/nucleo-f303re/Kconfig diff --git a/boards/nucleo-f303re/README.txt b/boards/arm/nucleo-f303re/README.txt similarity index 100% rename from boards/nucleo-f303re/README.txt rename to boards/arm/nucleo-f303re/README.txt diff --git a/boards/nucleo-f303re/configs/adc/defconfig b/boards/arm/nucleo-f303re/configs/adc/defconfig similarity index 100% rename from boards/nucleo-f303re/configs/adc/defconfig rename to boards/arm/nucleo-f303re/configs/adc/defconfig diff --git a/boards/nucleo-f303re/configs/can/defconfig b/boards/arm/nucleo-f303re/configs/can/defconfig similarity index 100% rename from boards/nucleo-f303re/configs/can/defconfig rename to boards/arm/nucleo-f303re/configs/can/defconfig diff --git a/boards/nucleo-f303re/configs/hello/defconfig b/boards/arm/nucleo-f303re/configs/hello/defconfig similarity index 100% rename from boards/nucleo-f303re/configs/hello/defconfig rename to boards/arm/nucleo-f303re/configs/hello/defconfig diff --git a/boards/nucleo-f303re/configs/nxlines/defconfig b/boards/arm/nucleo-f303re/configs/nxlines/defconfig similarity index 100% rename from boards/nucleo-f303re/configs/nxlines/defconfig rename to boards/arm/nucleo-f303re/configs/nxlines/defconfig diff --git a/boards/nucleo-f303re/configs/pwm/defconfig b/boards/arm/nucleo-f303re/configs/pwm/defconfig similarity index 100% rename from boards/nucleo-f303re/configs/pwm/defconfig rename to boards/arm/nucleo-f303re/configs/pwm/defconfig diff --git a/boards/nucleo-f303re/configs/serialrx/defconfig b/boards/arm/nucleo-f303re/configs/serialrx/defconfig similarity index 100% rename from boards/nucleo-f303re/configs/serialrx/defconfig rename to boards/arm/nucleo-f303re/configs/serialrx/defconfig diff --git a/boards/nucleo-f303re/include/board.h b/boards/arm/nucleo-f303re/include/board.h similarity index 98% rename from boards/nucleo-f303re/include/board.h rename to boards/arm/nucleo-f303re/include/board.h index 35b469afe7..aeedd38a54 100644 --- a/boards/nucleo-f303re/include/board.h +++ b/boards/arm/nucleo-f303re/include/board.h @@ -36,8 +36,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_STM32F3DISCOVERY_INCLUDE_BOARD_H -#define __CONFIG_STM32F3DISCOVERY_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32F3DISCOVERY_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32F3DISCOVERY_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -247,4 +247,4 @@ #define ADC3_DMA_CHAN DMACHAN_ADC3 #define ADC4_DMA_CHAN DMACHAN_ADC4_1 -#endif /* __CONFIG_NUCLEO_F303RE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F303RE_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-f303re/scripts/Make.defs b/boards/arm/nucleo-f303re/scripts/Make.defs similarity index 96% rename from boards/nucleo-f303re/scripts/Make.defs rename to boards/arm/nucleo-f303re/scripts/Make.defs index 7c9728e4fe..0f9e91c5bb 100644 --- a/boards/nucleo-f303re/scripts/Make.defs +++ b/boards/arm/nucleo-f303re/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-f303re/scripts/ld.script b/boards/arm/nucleo-f303re/scripts/ld.script similarity index 100% rename from boards/nucleo-f303re/scripts/ld.script rename to boards/arm/nucleo-f303re/scripts/ld.script diff --git a/boards/nucleo-f303re/src/Makefile b/boards/arm/nucleo-f303re/src/Makefile similarity index 100% rename from boards/nucleo-f303re/src/Makefile rename to boards/arm/nucleo-f303re/src/Makefile diff --git a/boards/nucleo-f303re/src/nucleo-f303re.h b/boards/arm/nucleo-f303re/src/nucleo-f303re.h similarity index 97% rename from boards/nucleo-f303re/src/nucleo-f303re.h rename to boards/arm/nucleo-f303re/src/nucleo-f303re.h index f27e85cac0..75ecf20883 100644 --- a/boards/nucleo-f303re/src/nucleo-f303re.h +++ b/boards/arm/nucleo-f303re/src/nucleo-f303re.h @@ -35,8 +35,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_NUCLEO_F303RE_SRC_NUCLEO_F303RE_H -#define __BOARDS_NUCLEO_F303RE_SRC_NUCLEO_F303RE_H +#ifndef __BOARDS_ARM_NUCLEO_F303RE_SRC_NUCLEO_F303RE_H +#define __BOARDS_ARM_NUCLEO_F303RE_SRC_NUCLEO_F303RE_H /**************************************************************************** * Included Files @@ -203,4 +203,4 @@ int stm32_adc_setup(void); int stm32_can_setup(void); #endif -#endif /* __BOARDS_NUCLEO_F303RE_SRC_NUCLEO_F303RE_H */ +#endif /* __BOARDS_ARM_NUCLEO_F303RE_SRC_NUCLEO_F303RE_H */ diff --git a/boards/nucleo-f303re/src/stm32_adc.c b/boards/arm/nucleo-f303re/src/stm32_adc.c similarity index 100% rename from boards/nucleo-f303re/src/stm32_adc.c rename to boards/arm/nucleo-f303re/src/stm32_adc.c diff --git a/boards/nucleo-f303re/src/stm32_appinitialize.c b/boards/arm/nucleo-f303re/src/stm32_appinitialize.c similarity index 100% rename from boards/nucleo-f303re/src/stm32_appinitialize.c rename to boards/arm/nucleo-f303re/src/stm32_appinitialize.c diff --git a/boards/nucleo-f303re/src/stm32_autoleds.c b/boards/arm/nucleo-f303re/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-f303re/src/stm32_autoleds.c rename to boards/arm/nucleo-f303re/src/stm32_autoleds.c diff --git a/boards/nucleo-f303re/src/stm32_boot.c b/boards/arm/nucleo-f303re/src/stm32_boot.c similarity index 100% rename from boards/nucleo-f303re/src/stm32_boot.c rename to boards/arm/nucleo-f303re/src/stm32_boot.c diff --git a/boards/nucleo-f303re/src/stm32_buttons.c b/boards/arm/nucleo-f303re/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-f303re/src/stm32_buttons.c rename to boards/arm/nucleo-f303re/src/stm32_buttons.c diff --git a/boards/nucleo-f303re/src/stm32_can.c b/boards/arm/nucleo-f303re/src/stm32_can.c similarity index 100% rename from boards/nucleo-f303re/src/stm32_can.c rename to boards/arm/nucleo-f303re/src/stm32_can.c diff --git a/boards/nucleo-f303re/src/stm32_pwm.c b/boards/arm/nucleo-f303re/src/stm32_pwm.c similarity index 100% rename from boards/nucleo-f303re/src/stm32_pwm.c rename to boards/arm/nucleo-f303re/src/stm32_pwm.c diff --git a/boards/nucleo-f303re/src/stm32_spi.c b/boards/arm/nucleo-f303re/src/stm32_spi.c similarity index 100% rename from boards/nucleo-f303re/src/stm32_spi.c rename to boards/arm/nucleo-f303re/src/stm32_spi.c diff --git a/boards/nucleo-f303re/src/stm32_ssd1351.c b/boards/arm/nucleo-f303re/src/stm32_ssd1351.c similarity index 100% rename from boards/nucleo-f303re/src/stm32_ssd1351.c rename to boards/arm/nucleo-f303re/src/stm32_ssd1351.c diff --git a/boards/nucleo-f303re/src/stm32_timer.c b/boards/arm/nucleo-f303re/src/stm32_timer.c similarity index 100% rename from boards/nucleo-f303re/src/stm32_timer.c rename to boards/arm/nucleo-f303re/src/stm32_timer.c diff --git a/boards/nucleo-f303re/src/stm32_uid.c b/boards/arm/nucleo-f303re/src/stm32_uid.c similarity index 100% rename from boards/nucleo-f303re/src/stm32_uid.c rename to boards/arm/nucleo-f303re/src/stm32_uid.c diff --git a/boards/nucleo-f303re/src/stm32_userleds.c b/boards/arm/nucleo-f303re/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-f303re/src/stm32_userleds.c rename to boards/arm/nucleo-f303re/src/stm32_userleds.c diff --git a/boards/nucleo-f303ze/Kconfig b/boards/arm/nucleo-f303ze/Kconfig similarity index 100% rename from boards/nucleo-f303ze/Kconfig rename to boards/arm/nucleo-f303ze/Kconfig diff --git a/boards/nucleo-f303ze/README.txt b/boards/arm/nucleo-f303ze/README.txt similarity index 100% rename from boards/nucleo-f303ze/README.txt rename to boards/arm/nucleo-f303ze/README.txt diff --git a/boards/nucleo-f303ze/configs/adc/defconfig b/boards/arm/nucleo-f303ze/configs/adc/defconfig similarity index 100% rename from boards/nucleo-f303ze/configs/adc/defconfig rename to boards/arm/nucleo-f303ze/configs/adc/defconfig diff --git a/boards/nucleo-f303ze/configs/nsh/defconfig b/boards/arm/nucleo-f303ze/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-f303ze/configs/nsh/defconfig rename to boards/arm/nucleo-f303ze/configs/nsh/defconfig diff --git a/boards/nucleo-f303ze/configs/nxlines_oled/defconfig b/boards/arm/nucleo-f303ze/configs/nxlines_oled/defconfig similarity index 100% rename from boards/nucleo-f303ze/configs/nxlines_oled/defconfig rename to boards/arm/nucleo-f303ze/configs/nxlines_oled/defconfig diff --git a/boards/nucleo-f303ze/include/board.h b/boards/arm/nucleo-f303ze/include/board.h similarity index 98% rename from boards/nucleo-f303ze/include/board.h rename to boards/arm/nucleo-f303ze/include/board.h index 338add722f..a508377ed0 100644 --- a/boards/nucleo-f303ze/include/board.h +++ b/boards/arm/nucleo-f303ze/include/board.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_NUCLEOF303ZE_INCLUDE_BOARD_H -#define __CONFIG_NUCLEOF303ZE_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEOF303ZE_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEOF303ZE_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -215,4 +215,4 @@ #define ADC1_DMA_CHAN DMACHAN_ADC1 #define ADC3_DMA_CHAN DMACHAN_ADC3 -#endif /* __CONFIG_NUCLEO_F303ZE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F303ZE_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-f303ze/scripts/Make.defs b/boards/arm/nucleo-f303ze/scripts/Make.defs similarity index 96% rename from boards/nucleo-f303ze/scripts/Make.defs rename to boards/arm/nucleo-f303ze/scripts/Make.defs index c106ca2924..8833e4f36e 100644 --- a/boards/nucleo-f303ze/scripts/Make.defs +++ b/boards/arm/nucleo-f303ze/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-f303ze/scripts/ld.script b/boards/arm/nucleo-f303ze/scripts/ld.script similarity index 100% rename from boards/nucleo-f303ze/scripts/ld.script rename to boards/arm/nucleo-f303ze/scripts/ld.script diff --git a/boards/nucleo-f303ze/src/Makefile b/boards/arm/nucleo-f303ze/src/Makefile similarity index 100% rename from boards/nucleo-f303ze/src/Makefile rename to boards/arm/nucleo-f303ze/src/Makefile diff --git a/boards/nucleo-f303ze/src/nucleo-f303ze.h b/boards/arm/nucleo-f303ze/src/nucleo-f303ze.h similarity index 96% rename from boards/nucleo-f303ze/src/nucleo-f303ze.h rename to boards/arm/nucleo-f303ze/src/nucleo-f303ze.h index 99c4bbd780..af5a800d38 100644 --- a/boards/nucleo-f303ze/src/nucleo-f303ze.h +++ b/boards/arm/nucleo-f303ze/src/nucleo-f303ze.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_NUCLEO_F303ZE_SRC_NUCLEO_F303ZE_H -#define __BOARDS_NUCLEO_F303ZE_SRC_NUCLEO_F303ZE_H +#ifndef __BOARDS_ARM_NUCLEO_F303ZE_SRC_NUCLEO_F303ZE_H +#define __BOARDS_ARM_NUCLEO_F303ZE_SRC_NUCLEO_F303ZE_H /**************************************************************************** * Included Files @@ -110,4 +110,4 @@ int stm32_bringup(void); int stm32_adc_setup(void); #endif -#endif /* __BOARDS_NUCLEO_F303ZE_SRC_NUCLEO_F303ZE_H */ +#endif /* __BOARDS_ARM_NUCLEO_F303ZE_SRC_NUCLEO_F303ZE_H */ diff --git a/boards/nucleo-f303ze/src/stm32_adc.c b/boards/arm/nucleo-f303ze/src/stm32_adc.c similarity index 100% rename from boards/nucleo-f303ze/src/stm32_adc.c rename to boards/arm/nucleo-f303ze/src/stm32_adc.c diff --git a/boards/nucleo-f303ze/src/stm32_appinitialize.c b/boards/arm/nucleo-f303ze/src/stm32_appinitialize.c similarity index 100% rename from boards/nucleo-f303ze/src/stm32_appinitialize.c rename to boards/arm/nucleo-f303ze/src/stm32_appinitialize.c diff --git a/boards/nucleo-f303ze/src/stm32_autoleds.c b/boards/arm/nucleo-f303ze/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-f303ze/src/stm32_autoleds.c rename to boards/arm/nucleo-f303ze/src/stm32_autoleds.c diff --git a/boards/nucleo-f303ze/src/stm32_boot.c b/boards/arm/nucleo-f303ze/src/stm32_boot.c similarity index 100% rename from boards/nucleo-f303ze/src/stm32_boot.c rename to boards/arm/nucleo-f303ze/src/stm32_boot.c diff --git a/boards/nucleo-f303ze/src/stm32_bringup.c b/boards/arm/nucleo-f303ze/src/stm32_bringup.c similarity index 100% rename from boards/nucleo-f303ze/src/stm32_bringup.c rename to boards/arm/nucleo-f303ze/src/stm32_bringup.c diff --git a/boards/nucleo-f303ze/src/stm32_buttons.c b/boards/arm/nucleo-f303ze/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-f303ze/src/stm32_buttons.c rename to boards/arm/nucleo-f303ze/src/stm32_buttons.c diff --git a/boards/nucleo-f303ze/src/stm32_ssd1306.c b/boards/arm/nucleo-f303ze/src/stm32_ssd1306.c similarity index 100% rename from boards/nucleo-f303ze/src/stm32_ssd1306.c rename to boards/arm/nucleo-f303ze/src/stm32_ssd1306.c diff --git a/boards/nucleo-f303ze/src/stm32_userleds.c b/boards/arm/nucleo-f303ze/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-f303ze/src/stm32_userleds.c rename to boards/arm/nucleo-f303ze/src/stm32_userleds.c diff --git a/boards/nucleo-f334r8/Kconfig b/boards/arm/nucleo-f334r8/Kconfig similarity index 100% rename from boards/nucleo-f334r8/Kconfig rename to boards/arm/nucleo-f334r8/Kconfig diff --git a/boards/nucleo-f334r8/README.txt b/boards/arm/nucleo-f334r8/README.txt similarity index 100% rename from boards/nucleo-f334r8/README.txt rename to boards/arm/nucleo-f334r8/README.txt diff --git a/boards/nucleo-f334r8/configs/adc/defconfig b/boards/arm/nucleo-f334r8/configs/adc/defconfig similarity index 100% rename from boards/nucleo-f334r8/configs/adc/defconfig rename to boards/arm/nucleo-f334r8/configs/adc/defconfig diff --git a/boards/nucleo-f334r8/configs/highpri/defconfig b/boards/arm/nucleo-f334r8/configs/highpri/defconfig similarity index 100% rename from boards/nucleo-f334r8/configs/highpri/defconfig rename to boards/arm/nucleo-f334r8/configs/highpri/defconfig diff --git a/boards/nucleo-f334r8/configs/nsh/defconfig b/boards/arm/nucleo-f334r8/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-f334r8/configs/nsh/defconfig rename to boards/arm/nucleo-f334r8/configs/nsh/defconfig diff --git a/boards/nucleo-f334r8/configs/spwm1/defconfig b/boards/arm/nucleo-f334r8/configs/spwm1/defconfig similarity index 100% rename from boards/nucleo-f334r8/configs/spwm1/defconfig rename to boards/arm/nucleo-f334r8/configs/spwm1/defconfig diff --git a/boards/nucleo-f334r8/configs/spwm2/defconfig b/boards/arm/nucleo-f334r8/configs/spwm2/defconfig similarity index 100% rename from boards/nucleo-f334r8/configs/spwm2/defconfig rename to boards/arm/nucleo-f334r8/configs/spwm2/defconfig diff --git a/boards/nucleo-f334r8/include/board.h b/boards/arm/nucleo-f334r8/include/board.h similarity index 98% rename from boards/nucleo-f334r8/include/board.h rename to boards/arm/nucleo-f334r8/include/board.h index 49d9712c47..4b9b693c12 100644 --- a/boards/nucleo-f334r8/include/board.h +++ b/boards/arm/nucleo-f334r8/include/board.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_NUCLEO_F334R8_INCLUDE_BOARD_H -#define __CONFIG_NUCLEO_F334R8_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEO_F334R8_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEO_F334R8_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -345,4 +345,4 @@ #define ADC1_DMA_CHAN DMACHAN_ADC1 /* DMA1_CH1 */ -#endif /* __CONFIG_NUCLEO_F334R8_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F334R8_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-f334r8/scripts/Make.defs b/boards/arm/nucleo-f334r8/scripts/Make.defs similarity index 96% rename from boards/nucleo-f334r8/scripts/Make.defs rename to boards/arm/nucleo-f334r8/scripts/Make.defs index 859563146b..5ce0d8ff44 100644 --- a/boards/nucleo-f334r8/scripts/Make.defs +++ b/boards/arm/nucleo-f334r8/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-f334r8/scripts/ld.script b/boards/arm/nucleo-f334r8/scripts/ld.script similarity index 100% rename from boards/nucleo-f334r8/scripts/ld.script rename to boards/arm/nucleo-f334r8/scripts/ld.script diff --git a/boards/nucleo-f334r8/src/Makefile b/boards/arm/nucleo-f334r8/src/Makefile similarity index 100% rename from boards/nucleo-f334r8/src/Makefile rename to boards/arm/nucleo-f334r8/src/Makefile diff --git a/boards/nucleo-f334r8/src/nucleo-f334r8.h b/boards/arm/nucleo-f334r8/src/nucleo-f334r8.h similarity index 97% rename from boards/nucleo-f334r8/src/nucleo-f334r8.h rename to boards/arm/nucleo-f334r8/src/nucleo-f334r8.h index 07dd953357..a8d98d9fef 100644 --- a/boards/nucleo-f334r8/src/nucleo-f334r8.h +++ b/boards/arm/nucleo-f334r8/src/nucleo-f334r8.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_NUCLEO_F334R8_SRC_NUCLEO_F334R8_H -#define __BOARDS_NUCLEO_F334R8_SRC_NUCLEO_F334R8_H +#ifndef __BOARDS_ARM_NUCLEO_F334R8_SRC_NUCLEO_F334R8_H +#define __BOARDS_ARM_NUCLEO_F334R8_SRC_NUCLEO_F334R8_H /**************************************************************************** * Included Files @@ -226,4 +226,4 @@ int stm32_opamp_setup(void); int stm32_hrtim_setup(void); #endif -#endif /* __BOARDS_NUCLEO_F334R8_SRC_NUCLEO_F334R8_H */ +#endif /* __BOARDS_ARM_NUCLEO_F334R8_SRC_NUCLEO_F334R8_H */ diff --git a/boards/nucleo-f334r8/src/stm32_adc.c b/boards/arm/nucleo-f334r8/src/stm32_adc.c similarity index 100% rename from boards/nucleo-f334r8/src/stm32_adc.c rename to boards/arm/nucleo-f334r8/src/stm32_adc.c diff --git a/boards/nucleo-f334r8/src/stm32_appinit.c b/boards/arm/nucleo-f334r8/src/stm32_appinit.c similarity index 100% rename from boards/nucleo-f334r8/src/stm32_appinit.c rename to boards/arm/nucleo-f334r8/src/stm32_appinit.c diff --git a/boards/nucleo-f334r8/src/stm32_autoleds.c b/boards/arm/nucleo-f334r8/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-f334r8/src/stm32_autoleds.c rename to boards/arm/nucleo-f334r8/src/stm32_autoleds.c diff --git a/boards/nucleo-f334r8/src/stm32_boot.c b/boards/arm/nucleo-f334r8/src/stm32_boot.c similarity index 100% rename from boards/nucleo-f334r8/src/stm32_boot.c rename to boards/arm/nucleo-f334r8/src/stm32_boot.c diff --git a/boards/nucleo-f334r8/src/stm32_buttons.c b/boards/arm/nucleo-f334r8/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-f334r8/src/stm32_buttons.c rename to boards/arm/nucleo-f334r8/src/stm32_buttons.c diff --git a/boards/nucleo-f334r8/src/stm32_can.c b/boards/arm/nucleo-f334r8/src/stm32_can.c similarity index 100% rename from boards/nucleo-f334r8/src/stm32_can.c rename to boards/arm/nucleo-f334r8/src/stm32_can.c diff --git a/boards/nucleo-f334r8/src/stm32_comp.c b/boards/arm/nucleo-f334r8/src/stm32_comp.c similarity index 100% rename from boards/nucleo-f334r8/src/stm32_comp.c rename to boards/arm/nucleo-f334r8/src/stm32_comp.c diff --git a/boards/nucleo-f334r8/src/stm32_highpri.c b/boards/arm/nucleo-f334r8/src/stm32_highpri.c similarity index 100% rename from boards/nucleo-f334r8/src/stm32_highpri.c rename to boards/arm/nucleo-f334r8/src/stm32_highpri.c diff --git a/boards/nucleo-f334r8/src/stm32_hrtim.c b/boards/arm/nucleo-f334r8/src/stm32_hrtim.c similarity index 100% rename from boards/nucleo-f334r8/src/stm32_hrtim.c rename to boards/arm/nucleo-f334r8/src/stm32_hrtim.c diff --git a/boards/nucleo-f334r8/src/stm32_opamp.c b/boards/arm/nucleo-f334r8/src/stm32_opamp.c similarity index 100% rename from boards/nucleo-f334r8/src/stm32_opamp.c rename to boards/arm/nucleo-f334r8/src/stm32_opamp.c diff --git a/boards/nucleo-f334r8/src/stm32_pwm.c b/boards/arm/nucleo-f334r8/src/stm32_pwm.c similarity index 100% rename from boards/nucleo-f334r8/src/stm32_pwm.c rename to boards/arm/nucleo-f334r8/src/stm32_pwm.c diff --git a/boards/nucleo-f334r8/src/stm32_spi.c b/boards/arm/nucleo-f334r8/src/stm32_spi.c similarity index 100% rename from boards/nucleo-f334r8/src/stm32_spi.c rename to boards/arm/nucleo-f334r8/src/stm32_spi.c diff --git a/boards/nucleo-f334r8/src/stm32_spwm.c b/boards/arm/nucleo-f334r8/src/stm32_spwm.c similarity index 100% rename from boards/nucleo-f334r8/src/stm32_spwm.c rename to boards/arm/nucleo-f334r8/src/stm32_spwm.c diff --git a/boards/nucleo-f334r8/src/stm32_timer.c b/boards/arm/nucleo-f334r8/src/stm32_timer.c similarity index 100% rename from boards/nucleo-f334r8/src/stm32_timer.c rename to boards/arm/nucleo-f334r8/src/stm32_timer.c diff --git a/boards/nucleo-f334r8/src/stm32_userleds.c b/boards/arm/nucleo-f334r8/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-f334r8/src/stm32_userleds.c rename to boards/arm/nucleo-f334r8/src/stm32_userleds.c diff --git a/boards/nucleo-f410rb/Kconfig b/boards/arm/nucleo-f410rb/Kconfig similarity index 100% rename from boards/nucleo-f410rb/Kconfig rename to boards/arm/nucleo-f410rb/Kconfig diff --git a/boards/nucleo-f410rb/README.txt b/boards/arm/nucleo-f410rb/README.txt similarity index 100% rename from boards/nucleo-f410rb/README.txt rename to boards/arm/nucleo-f410rb/README.txt diff --git a/boards/nucleo-f410rb/configs/nsh/defconfig b/boards/arm/nucleo-f410rb/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-f410rb/configs/nsh/defconfig rename to boards/arm/nucleo-f410rb/configs/nsh/defconfig diff --git a/boards/nucleo-f410rb/include/board.h b/boards/arm/nucleo-f410rb/include/board.h similarity index 98% rename from boards/nucleo-f410rb/include/board.h rename to boards/arm/nucleo-f410rb/include/board.h index d46800dce0..fe51131370 100644 --- a/boards/nucleo-f410rb/include/board.h +++ b/boards/arm/nucleo-f410rb/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_F410RB_INCLUDE_BOARD_H -#define __BOARDS_NUCLEO_F410RB_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEO_F410RB_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEO_F410RB_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -308,4 +308,4 @@ #define BUTTON_USER_BIT (1 << BUTTON_USER) -#endif /* __BOARDS_NUCLEO_F410RB_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F410RB_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-f410rb/scripts/Make.defs b/boards/arm/nucleo-f410rb/scripts/Make.defs similarity index 96% rename from boards/nucleo-f410rb/scripts/Make.defs rename to boards/arm/nucleo-f410rb/scripts/Make.defs index 78d4a3a654..512c67f88d 100644 --- a/boards/nucleo-f410rb/scripts/Make.defs +++ b/boards/arm/nucleo-f410rb/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-f410rb/scripts/f410rb.ld b/boards/arm/nucleo-f410rb/scripts/f410rb.ld similarity index 100% rename from boards/nucleo-f410rb/scripts/f410rb.ld rename to boards/arm/nucleo-f410rb/scripts/f410rb.ld diff --git a/boards/nucleo-f410rb/src/Makefile b/boards/arm/nucleo-f410rb/src/Makefile similarity index 100% rename from boards/nucleo-f410rb/src/Makefile rename to boards/arm/nucleo-f410rb/src/Makefile diff --git a/boards/nucleo-f410rb/src/nucleo-f410rb.h b/boards/arm/nucleo-f410rb/src/nucleo-f410rb.h similarity index 95% rename from boards/nucleo-f410rb/src/nucleo-f410rb.h rename to boards/arm/nucleo-f410rb/src/nucleo-f410rb.h index b443b94302..f97cb5399f 100644 --- a/boards/nucleo-f410rb/src/nucleo-f410rb.h +++ b/boards/arm/nucleo-f410rb/src/nucleo-f410rb.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_F410RB_SRC_NUCLEO_F410RB_H -#define __BOARDS_NUCLEO_F410RB_SRC_NUCLEO_F410RB_H +#ifndef __BOARDS_ARM_NUCLEO_F410RB_SRC_NUCLEO_F410RB_H +#define __BOARDS_ARM_NUCLEO_F410RB_SRC_NUCLEO_F410RB_H /************************************************************************************ * Included Files @@ -106,4 +106,4 @@ int stm32_bringup(void); int stm32_adc_setup(void); #endif -#endif /* __BOARDS_NUCLEO_F410RB_SRC_NUCLEO_F410RB_H */ +#endif /* __BOARDS_ARM_NUCLEO_F410RB_SRC_NUCLEO_F410RB_H */ diff --git a/boards/nucleo-f410rb/src/stm32_adc.c b/boards/arm/nucleo-f410rb/src/stm32_adc.c similarity index 100% rename from boards/nucleo-f410rb/src/stm32_adc.c rename to boards/arm/nucleo-f410rb/src/stm32_adc.c diff --git a/boards/nucleo-f410rb/src/stm32_appinit.c b/boards/arm/nucleo-f410rb/src/stm32_appinit.c similarity index 100% rename from boards/nucleo-f410rb/src/stm32_appinit.c rename to boards/arm/nucleo-f410rb/src/stm32_appinit.c diff --git a/boards/nucleo-f410rb/src/stm32_autoleds.c b/boards/arm/nucleo-f410rb/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-f410rb/src/stm32_autoleds.c rename to boards/arm/nucleo-f410rb/src/stm32_autoleds.c diff --git a/boards/nucleo-f410rb/src/stm32_boot.c b/boards/arm/nucleo-f410rb/src/stm32_boot.c similarity index 100% rename from boards/nucleo-f410rb/src/stm32_boot.c rename to boards/arm/nucleo-f410rb/src/stm32_boot.c diff --git a/boards/nucleo-f410rb/src/stm32_bringup.c b/boards/arm/nucleo-f410rb/src/stm32_bringup.c similarity index 100% rename from boards/nucleo-f410rb/src/stm32_bringup.c rename to boards/arm/nucleo-f410rb/src/stm32_bringup.c diff --git a/boards/nucleo-f410rb/src/stm32_buttons.c b/boards/arm/nucleo-f410rb/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-f410rb/src/stm32_buttons.c rename to boards/arm/nucleo-f410rb/src/stm32_buttons.c diff --git a/boards/nucleo-f410rb/src/stm32_userleds.c b/boards/arm/nucleo-f410rb/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-f410rb/src/stm32_userleds.c rename to boards/arm/nucleo-f410rb/src/stm32_userleds.c diff --git a/boards/nucleo-f446re/Kconfig b/boards/arm/nucleo-f446re/Kconfig similarity index 100% rename from boards/nucleo-f446re/Kconfig rename to boards/arm/nucleo-f446re/Kconfig diff --git a/boards/nucleo-f446re/README.txt b/boards/arm/nucleo-f446re/README.txt similarity index 100% rename from boards/nucleo-f446re/README.txt rename to boards/arm/nucleo-f446re/README.txt diff --git a/boards/nucleo-f446re/configs/nsh/defconfig b/boards/arm/nucleo-f446re/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-f446re/configs/nsh/defconfig rename to boards/arm/nucleo-f446re/configs/nsh/defconfig diff --git a/boards/nucleo-f446re/include/board.h b/boards/arm/nucleo-f446re/include/board.h similarity index 97% rename from boards/nucleo-f446re/include/board.h rename to boards/arm/nucleo-f446re/include/board.h index fa176f0231..94f6a8b7ff 100644 --- a/boards/nucleo-f446re/include/board.h +++ b/boards/arm/nucleo-f446re/include/board.h @@ -33,8 +33,8 @@ * ******************************************************************************/ -#ifndef __BOARDS_NUCLEO_F446RE_INCLUDE_BOARD_H -#define __BOARDS_NUCLEO_F446RE_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEO_F446RE_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEO_F446RE_INCLUDE_BOARD_H /******************************************************************************* * Included Files @@ -220,4 +220,4 @@ #define GPIO_TIM2_CH1IN (GPIO_TIM2_CH1IN_1 | GPIO_PULLUP) #define GPIO_TIM2_CH2IN (GPIO_TIM2_CH2IN_1 | GPIO_PULLUP) -#endif /* __BOARDS_NUCLEO_F446RE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F446RE_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-f446re/include/nucleo-f446re.h b/boards/arm/nucleo-f446re/include/nucleo-f446re.h similarity index 98% rename from boards/nucleo-f446re/include/nucleo-f446re.h rename to boards/arm/nucleo-f446re/include/nucleo-f446re.h index 0990f5d006..6af6c7bc18 100644 --- a/boards/nucleo-f446re/include/nucleo-f446re.h +++ b/boards/arm/nucleo-f446re/include/nucleo-f446re.h @@ -33,8 +33,8 @@ * ******************************************************************************/ -#ifndef __BOARDS_NUCLEO_F446RE_INCLUDE_NUCLEO_F446RE_H -#define __BOARDS_NUCLEO_F446RE_INCLUDE_NUCLEO_F446RE_H +#ifndef __BOARDS_ARM_NUCLEO_F446RE_INCLUDE_NUCLEO_F446RE_H +#define __BOARDS_ARM_NUCLEO_F446RE_INCLUDE_NUCLEO_F446RE_H /******************************************************************************* * Included Files @@ -236,4 +236,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_NUCLEO_F446RE_INCLUDE_NUCLEO_F446RE_H */ +#endif /* __BOARDS_ARM_NUCLEO_F446RE_INCLUDE_NUCLEO_F446RE_H */ diff --git a/boards/nucleo-f446re/scripts/Make.defs b/boards/arm/nucleo-f446re/scripts/Make.defs similarity index 98% rename from boards/nucleo-f446re/scripts/Make.defs rename to boards/arm/nucleo-f446re/scripts/Make.defs index 95309f01b6..2f4e46c0be 100644 --- a/boards/nucleo-f446re/scripts/Make.defs +++ b/boards/arm/nucleo-f446re/scripts/Make.defs @@ -46,7 +46,7 @@ else BOARD_DIR = $(CONFIG_ARCH_BOARD_CUSTOM_DIR) endif else -BOARD_DIR = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD) +BOARD_DIR = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD) endif ifeq ($(WINTOOL),y) diff --git a/boards/nucleo-f446re/scripts/f446re.ld b/boards/arm/nucleo-f446re/scripts/f446re.ld similarity index 100% rename from boards/nucleo-f446re/scripts/f446re.ld rename to boards/arm/nucleo-f446re/scripts/f446re.ld diff --git a/boards/mikroe-stm32f4/src/.gitignore b/boards/arm/nucleo-f446re/src/.gitignore similarity index 100% rename from boards/mikroe-stm32f4/src/.gitignore rename to boards/arm/nucleo-f446re/src/.gitignore diff --git a/boards/nucleo-f446re/src/Makefile b/boards/arm/nucleo-f446re/src/Makefile similarity index 100% rename from boards/nucleo-f446re/src/Makefile rename to boards/arm/nucleo-f446re/src/Makefile diff --git a/boards/nucleo-f446re/src/nucleo-f446re.h b/boards/arm/nucleo-f446re/src/nucleo-f446re.h similarity index 98% rename from boards/nucleo-f446re/src/nucleo-f446re.h rename to boards/arm/nucleo-f446re/src/nucleo-f446re.h index caa40474f2..35f0072375 100644 --- a/boards/nucleo-f446re/src/nucleo-f446re.h +++ b/boards/arm/nucleo-f446re/src/nucleo-f446re.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_F401RE_SRC_NUCLEO_F446RE_H -#define __BOARDS_NUCLEO_F401RE_SRC_NUCLEO_F446RE_H +#ifndef __BOARDS_ARM_NUCLEO_F401RE_SRC_NUCLEO_F446RE_H +#define __BOARDS_ARM_NUCLEO_F401RE_SRC_NUCLEO_F446RE_H /************************************************************************************ * Included Files @@ -284,4 +284,4 @@ int stm32_qencoder_initialize(FAR const char *devpath, int timer); int board_ajoy_initialize(void); #endif -#endif /* __BOARDS_NUCLEO_F401RE_SRC_NUCLEO_F446RE_H */ +#endif /* __BOARDS_ARM_NUCLEO_F401RE_SRC_NUCLEO_F446RE_H */ diff --git a/boards/nucleo-f446re/src/stm32_adc.c b/boards/arm/nucleo-f446re/src/stm32_adc.c similarity index 100% rename from boards/nucleo-f446re/src/stm32_adc.c rename to boards/arm/nucleo-f446re/src/stm32_adc.c diff --git a/boards/nucleo-f446re/src/stm32_ajoystick.c b/boards/arm/nucleo-f446re/src/stm32_ajoystick.c similarity index 100% rename from boards/nucleo-f446re/src/stm32_ajoystick.c rename to boards/arm/nucleo-f446re/src/stm32_ajoystick.c diff --git a/boards/nucleo-f446re/src/stm32_appinit.c b/boards/arm/nucleo-f446re/src/stm32_appinit.c similarity index 100% rename from boards/nucleo-f446re/src/stm32_appinit.c rename to boards/arm/nucleo-f446re/src/stm32_appinit.c diff --git a/boards/nucleo-f446re/src/stm32_autoleds.c b/boards/arm/nucleo-f446re/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-f446re/src/stm32_autoleds.c rename to boards/arm/nucleo-f446re/src/stm32_autoleds.c diff --git a/boards/nucleo-f446re/src/stm32_boot.c b/boards/arm/nucleo-f446re/src/stm32_boot.c similarity index 100% rename from boards/nucleo-f446re/src/stm32_boot.c rename to boards/arm/nucleo-f446re/src/stm32_boot.c diff --git a/boards/nucleo-f446re/src/stm32_buttons.c b/boards/arm/nucleo-f446re/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-f446re/src/stm32_buttons.c rename to boards/arm/nucleo-f446re/src/stm32_buttons.c diff --git a/boards/nucleo-f446re/src/stm32_qencoder.c b/boards/arm/nucleo-f446re/src/stm32_qencoder.c similarity index 100% rename from boards/nucleo-f446re/src/stm32_qencoder.c rename to boards/arm/nucleo-f446re/src/stm32_qencoder.c diff --git a/boards/nucleo-f446re/src/stm32_spi.c b/boards/arm/nucleo-f446re/src/stm32_spi.c similarity index 100% rename from boards/nucleo-f446re/src/stm32_spi.c rename to boards/arm/nucleo-f446re/src/stm32_spi.c diff --git a/boards/nucleo-f446re/src/stm32_userleds.c b/boards/arm/nucleo-f446re/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-f446re/src/stm32_userleds.c rename to boards/arm/nucleo-f446re/src/stm32_userleds.c diff --git a/boards/nucleo-f4x1re/Kconfig b/boards/arm/nucleo-f4x1re/Kconfig similarity index 100% rename from boards/nucleo-f4x1re/Kconfig rename to boards/arm/nucleo-f4x1re/Kconfig diff --git a/boards/nucleo-f4x1re/README.txt b/boards/arm/nucleo-f4x1re/README.txt similarity index 100% rename from boards/nucleo-f4x1re/README.txt rename to boards/arm/nucleo-f4x1re/README.txt diff --git a/boards/nucleo-f4x1re/configs/f401-nsh/defconfig b/boards/arm/nucleo-f4x1re/configs/f401-nsh/defconfig similarity index 100% rename from boards/nucleo-f4x1re/configs/f401-nsh/defconfig rename to boards/arm/nucleo-f4x1re/configs/f401-nsh/defconfig diff --git a/boards/nucleo-f4x1re/configs/f411-nsh/defconfig b/boards/arm/nucleo-f4x1re/configs/f411-nsh/defconfig similarity index 100% rename from boards/nucleo-f4x1re/configs/f411-nsh/defconfig rename to boards/arm/nucleo-f4x1re/configs/f411-nsh/defconfig diff --git a/boards/nucleo-f4x1re/include/board.h b/boards/arm/nucleo-f4x1re/include/board.h similarity index 97% rename from boards/nucleo-f4x1re/include/board.h rename to boards/arm/nucleo-f4x1re/include/board.h index bff0019616..0a65ab2e42 100644 --- a/boards/nucleo-f4x1re/include/board.h +++ b/boards/arm/nucleo-f4x1re/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_F401RE_INCLUDE_BOARD_H -#define __BOARDS_NUCLEO_F401RE_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEO_F401RE_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEO_F401RE_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -219,4 +219,4 @@ #define GPIO_TIM2_CH1IN (GPIO_TIM2_CH1IN_1 | GPIO_PULLUP) #define GPIO_TIM2_CH2IN (GPIO_TIM2_CH2IN_1 | GPIO_PULLUP) -#endif /* __BOARDS_NUCLEO_F401RE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F401RE_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-f4x1re/include/nucleo-f401re.h b/boards/arm/nucleo-f4x1re/include/nucleo-f401re.h similarity index 98% rename from boards/nucleo-f4x1re/include/nucleo-f401re.h rename to boards/arm/nucleo-f4x1re/include/nucleo-f401re.h index 6c93ed2227..20fb382ef8 100644 --- a/boards/nucleo-f4x1re/include/nucleo-f401re.h +++ b/boards/arm/nucleo-f4x1re/include/nucleo-f401re.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_F401RE_INCLUDE_NUCLEO_F401RE_H -#define __BOARDS_NUCLEO_F401RE_INCLUDE_NUCLEO_F401RE_H +#ifndef __BOARDS_ARM_NUCLEO_F401RE_INCLUDE_NUCLEO_F401RE_H +#define __BOARDS_ARM_NUCLEO_F401RE_INCLUDE_NUCLEO_F401RE_H /************************************************************************************ * Included Files @@ -235,4 +235,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_NUCLEO_F401RE_INCLUDE_NUCLEO_F401RE_H */ +#endif /* __BOARDS_ARM_NUCLEO_F401RE_INCLUDE_NUCLEO_F401RE_H */ diff --git a/boards/nucleo-f4x1re/include/nucleo-f411re.h b/boards/arm/nucleo-f4x1re/include/nucleo-f411re.h similarity index 97% rename from boards/nucleo-f4x1re/include/nucleo-f411re.h rename to boards/arm/nucleo-f4x1re/include/nucleo-f411re.h index 097d2c1f57..290bd23558 100644 --- a/boards/nucleo-f4x1re/include/nucleo-f411re.h +++ b/boards/arm/nucleo-f4x1re/include/nucleo-f411re.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_F401RE_INCLUDE_NUCLEO_F411RE_H -#define __BOARDS_NUCLEO_F401RE_INCLUDE_NUCLEO_F411RE_H +#ifndef __BOARDS_ARM_NUCLEO_F401RE_INCLUDE_NUCLEO_F411RE_H +#define __BOARDS_ARM_NUCLEO_F401RE_INCLUDE_NUCLEO_F411RE_H /************************************************************************************ * Included Files @@ -231,4 +231,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_NUCLEO_F401RE_INCLUDE_NUCLEO_F411RE_H */ +#endif /* __BOARDS_ARM_NUCLEO_F401RE_INCLUDE_NUCLEO_F411RE_H */ diff --git a/boards/nucleo-f4x1re/scripts/Make.defs b/boards/arm/nucleo-f4x1re/scripts/Make.defs similarity index 97% rename from boards/nucleo-f4x1re/scripts/Make.defs rename to boards/arm/nucleo-f4x1re/scripts/Make.defs index 0934890b6f..f28cd3a177 100644 --- a/boards/nucleo-f4x1re/scripts/Make.defs +++ b/boards/arm/nucleo-f4x1re/scripts/Make.defs @@ -52,13 +52,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) diff --git a/boards/nucleo-f4x1re/scripts/f401re.ld b/boards/arm/nucleo-f4x1re/scripts/f401re.ld similarity index 100% rename from boards/nucleo-f4x1re/scripts/f401re.ld rename to boards/arm/nucleo-f4x1re/scripts/f401re.ld diff --git a/boards/nucleo-f4x1re/scripts/f411re.ld b/boards/arm/nucleo-f4x1re/scripts/f411re.ld similarity index 100% rename from boards/nucleo-f4x1re/scripts/f411re.ld rename to boards/arm/nucleo-f4x1re/scripts/f411re.ld diff --git a/boards/nucleo-f4x1re/src/Makefile b/boards/arm/nucleo-f4x1re/src/Makefile similarity index 100% rename from boards/nucleo-f4x1re/src/Makefile rename to boards/arm/nucleo-f4x1re/src/Makefile diff --git a/boards/nucleo-f4x1re/src/nucleo-f4x1re.h b/boards/arm/nucleo-f4x1re/src/nucleo-f4x1re.h similarity index 98% rename from boards/nucleo-f4x1re/src/nucleo-f4x1re.h rename to boards/arm/nucleo-f4x1re/src/nucleo-f4x1re.h index 5ea6913ac0..aea0a4932c 100644 --- a/boards/nucleo-f4x1re/src/nucleo-f4x1re.h +++ b/boards/arm/nucleo-f4x1re/src/nucleo-f4x1re.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_F401RE_SRC_NUCLEO_F401RE_H -#define __BOARDS_NUCLEO_F401RE_SRC_NUCLEO_F401RE_H +#ifndef __BOARDS_ARM_NUCLEO_F401RE_SRC_NUCLEO_F401RE_H +#define __BOARDS_ARM_NUCLEO_F401RE_SRC_NUCLEO_F401RE_H /************************************************************************************ * Included Files @@ -303,4 +303,4 @@ int stm32_qencoder_initialize(FAR const char *devpath, int timer); int board_ajoy_initialize(void); #endif -#endif /* __BOARDS_NUCLEO_F401RE_SRC_NUCLEO_F401RE_H */ +#endif /* __BOARDS_ARM_NUCLEO_F401RE_SRC_NUCLEO_F401RE_H */ diff --git a/boards/nucleo-f4x1re/src/stm32_adc.c b/boards/arm/nucleo-f4x1re/src/stm32_adc.c similarity index 100% rename from boards/nucleo-f4x1re/src/stm32_adc.c rename to boards/arm/nucleo-f4x1re/src/stm32_adc.c diff --git a/boards/nucleo-f4x1re/src/stm32_ajoystick.c b/boards/arm/nucleo-f4x1re/src/stm32_ajoystick.c similarity index 100% rename from boards/nucleo-f4x1re/src/stm32_ajoystick.c rename to boards/arm/nucleo-f4x1re/src/stm32_ajoystick.c diff --git a/boards/nucleo-f4x1re/src/stm32_appinit.c b/boards/arm/nucleo-f4x1re/src/stm32_appinit.c similarity index 100% rename from boards/nucleo-f4x1re/src/stm32_appinit.c rename to boards/arm/nucleo-f4x1re/src/stm32_appinit.c diff --git a/boards/nucleo-f4x1re/src/stm32_autoleds.c b/boards/arm/nucleo-f4x1re/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-f4x1re/src/stm32_autoleds.c rename to boards/arm/nucleo-f4x1re/src/stm32_autoleds.c diff --git a/boards/nucleo-f4x1re/src/stm32_boot.c b/boards/arm/nucleo-f4x1re/src/stm32_boot.c similarity index 100% rename from boards/nucleo-f4x1re/src/stm32_boot.c rename to boards/arm/nucleo-f4x1re/src/stm32_boot.c diff --git a/boards/nucleo-f4x1re/src/stm32_bringup.c b/boards/arm/nucleo-f4x1re/src/stm32_bringup.c similarity index 100% rename from boards/nucleo-f4x1re/src/stm32_bringup.c rename to boards/arm/nucleo-f4x1re/src/stm32_bringup.c diff --git a/boards/nucleo-f4x1re/src/stm32_buttons.c b/boards/arm/nucleo-f4x1re/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-f4x1re/src/stm32_buttons.c rename to boards/arm/nucleo-f4x1re/src/stm32_buttons.c diff --git a/boards/nucleo-f4x1re/src/stm32_qencoder.c b/boards/arm/nucleo-f4x1re/src/stm32_qencoder.c similarity index 100% rename from boards/nucleo-f4x1re/src/stm32_qencoder.c rename to boards/arm/nucleo-f4x1re/src/stm32_qencoder.c diff --git a/boards/nucleo-f4x1re/src/stm32_spi.c b/boards/arm/nucleo-f4x1re/src/stm32_spi.c similarity index 100% rename from boards/nucleo-f4x1re/src/stm32_spi.c rename to boards/arm/nucleo-f4x1re/src/stm32_spi.c diff --git a/boards/nucleo-f4x1re/src/stm32_userleds.c b/boards/arm/nucleo-f4x1re/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-f4x1re/src/stm32_userleds.c rename to boards/arm/nucleo-f4x1re/src/stm32_userleds.c diff --git a/boards/nucleo-g071rb/Kconfig b/boards/arm/nucleo-g071rb/Kconfig similarity index 100% rename from boards/nucleo-g071rb/Kconfig rename to boards/arm/nucleo-g071rb/Kconfig diff --git a/boards/nucleo-g071rb/README.txt b/boards/arm/nucleo-g071rb/README.txt similarity index 100% rename from boards/nucleo-g071rb/README.txt rename to boards/arm/nucleo-g071rb/README.txt diff --git a/boards/nucleo-g071rb/configs/nsh/defconfig b/boards/arm/nucleo-g071rb/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-g071rb/configs/nsh/defconfig rename to boards/arm/nucleo-g071rb/configs/nsh/defconfig diff --git a/boards/nucleo-g071rb/include/board.h b/boards/arm/nucleo-g071rb/include/board.h similarity index 97% rename from boards/nucleo-g071rb/include/board.h rename to boards/arm/nucleo-g071rb/include/board.h index c9dadbd5a5..b2599c69a8 100644 --- a/boards/nucleo-g071rb/include/board.h +++ b/boards/arm/nucleo-g071rb/include/board.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_NUCLEO_G071RB_INCLUDE_BOARD_H -#define __CONFIG_NUCLEO_G071RB_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEO_G071RB_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEO_G071RB_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -219,4 +219,4 @@ #define ADC1_DMA_CHAN DMACHAN_ADC1 /* DMA1_CH1 */ -#endif /* __CONFIG_NUCLEO_LO73RZ_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_LO73RZ_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-g071rb/scripts/Make.defs b/boards/arm/nucleo-g071rb/scripts/Make.defs similarity index 96% rename from boards/nucleo-g071rb/scripts/Make.defs rename to boards/arm/nucleo-g071rb/scripts/Make.defs index b24cdf448e..73b6779ab3 100644 --- a/boards/nucleo-g071rb/scripts/Make.defs +++ b/boards/arm/nucleo-g071rb/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-g071rb/scripts/ld.script b/boards/arm/nucleo-g071rb/scripts/ld.script similarity index 100% rename from boards/nucleo-g071rb/scripts/ld.script rename to boards/arm/nucleo-g071rb/scripts/ld.script diff --git a/boards/nucleo-g071rb/src/Makefile b/boards/arm/nucleo-g071rb/src/Makefile similarity index 100% rename from boards/nucleo-g071rb/src/Makefile rename to boards/arm/nucleo-g071rb/src/Makefile diff --git a/boards/nucleo-g071rb/src/nucleo-g071rb.h b/boards/arm/nucleo-g071rb/src/nucleo-g071rb.h similarity index 96% rename from boards/nucleo-g071rb/src/nucleo-g071rb.h rename to boards/arm/nucleo-g071rb/src/nucleo-g071rb.h index 773a34f98e..83e0977da7 100644 --- a/boards/nucleo-g071rb/src/nucleo-g071rb.h +++ b/boards/arm/nucleo-g071rb/src/nucleo-g071rb.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_NUCLEO_G071RB_SRC_NUCLEO_G071RB_H -#define __BOARDS_NUCLEO_G071RB_SRC_NUCLEO_G071RB_H +#ifndef __BOARDS_ARM_NUCLEO_G071RB_SRC_NUCLEO_G071RB_H +#define __BOARDS_ARM_NUCLEO_G071RB_SRC_NUCLEO_G071RB_H /**************************************************************************** * Included Files @@ -111,4 +111,4 @@ int stm32_bringup(void); -#endif /* __BOARDS_NUCLEO_G071RB_SRC_NUCLEO_G071RB_H */ +#endif /* __BOARDS_ARM_NUCLEO_G071RB_SRC_NUCLEO_G071RB_H */ diff --git a/boards/nucleo-g071rb/src/stm32_appinit.c b/boards/arm/nucleo-g071rb/src/stm32_appinit.c similarity index 100% rename from boards/nucleo-g071rb/src/stm32_appinit.c rename to boards/arm/nucleo-g071rb/src/stm32_appinit.c diff --git a/boards/nucleo-g071rb/src/stm32_autoleds.c b/boards/arm/nucleo-g071rb/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-g071rb/src/stm32_autoleds.c rename to boards/arm/nucleo-g071rb/src/stm32_autoleds.c diff --git a/boards/nucleo-g071rb/src/stm32_boot.c b/boards/arm/nucleo-g071rb/src/stm32_boot.c similarity index 100% rename from boards/nucleo-g071rb/src/stm32_boot.c rename to boards/arm/nucleo-g071rb/src/stm32_boot.c diff --git a/boards/nucleo-g071rb/src/stm32_bringup.c b/boards/arm/nucleo-g071rb/src/stm32_bringup.c similarity index 100% rename from boards/nucleo-g071rb/src/stm32_bringup.c rename to boards/arm/nucleo-g071rb/src/stm32_bringup.c diff --git a/boards/nucleo-g071rb/src/stm32_buttons.c b/boards/arm/nucleo-g071rb/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-g071rb/src/stm32_buttons.c rename to boards/arm/nucleo-g071rb/src/stm32_buttons.c diff --git a/boards/nucleo-h743zi/Kconfig b/boards/arm/nucleo-h743zi/Kconfig similarity index 100% rename from boards/nucleo-h743zi/Kconfig rename to boards/arm/nucleo-h743zi/Kconfig diff --git a/boards/nucleo-h743zi/README.txt b/boards/arm/nucleo-h743zi/README.txt similarity index 100% rename from boards/nucleo-h743zi/README.txt rename to boards/arm/nucleo-h743zi/README.txt diff --git a/boards/nucleo-h743zi/configs/nsh/defconfig b/boards/arm/nucleo-h743zi/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-h743zi/configs/nsh/defconfig rename to boards/arm/nucleo-h743zi/configs/nsh/defconfig diff --git a/boards/nucleo-h743zi/configs/nxlines_oled/defconfig b/boards/arm/nucleo-h743zi/configs/nxlines_oled/defconfig similarity index 100% rename from boards/nucleo-h743zi/configs/nxlines_oled/defconfig rename to boards/arm/nucleo-h743zi/configs/nxlines_oled/defconfig diff --git a/boards/nucleo-h743zi/include/board.h b/boards/arm/nucleo-h743zi/include/board.h similarity index 98% rename from boards/nucleo-h743zi/include/board.h rename to boards/arm/nucleo-h743zi/include/board.h index ca55f0a1c1..62ecc0f128 100644 --- a/boards/nucleo-h743zi/include/board.h +++ b/boards/arm/nucleo-h743zi/include/board.h @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_NUCLEO_H743ZI_INCLUDE_BOARD_H -#define __CONFIG_NUCLEO_H743ZI_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEO_H743ZI_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEO_H743ZI_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -426,4 +426,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __CONFIG_NUCLEO_H743ZI_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_H743ZI_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-h743zi/kernel/.gitignore b/boards/arm/nucleo-h743zi/kernel/.gitignore similarity index 100% rename from boards/nucleo-h743zi/kernel/.gitignore rename to boards/arm/nucleo-h743zi/kernel/.gitignore diff --git a/boards/nucleo-h743zi/kernel/Makefile b/boards/arm/nucleo-h743zi/kernel/Makefile similarity index 100% rename from boards/nucleo-h743zi/kernel/Makefile rename to boards/arm/nucleo-h743zi/kernel/Makefile diff --git a/boards/nucleo-h743zi/kernel/stm32_userspace.c b/boards/arm/nucleo-h743zi/kernel/stm32_userspace.c similarity index 100% rename from boards/nucleo-h743zi/kernel/stm32_userspace.c rename to boards/arm/nucleo-h743zi/kernel/stm32_userspace.c diff --git a/boards/nucleo-h743zi/scripts/Make.defs b/boards/arm/nucleo-h743zi/scripts/Make.defs similarity index 96% rename from boards/nucleo-h743zi/scripts/Make.defs rename to boards/arm/nucleo-h743zi/scripts/Make.defs index 74de2f68d4..708b08fb63 100644 --- a/boards/nucleo-h743zi/scripts/Make.defs +++ b/boards/arm/nucleo-h743zi/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-h743zi/scripts/flash.ld b/boards/arm/nucleo-h743zi/scripts/flash.ld similarity index 100% rename from boards/nucleo-h743zi/scripts/flash.ld rename to boards/arm/nucleo-h743zi/scripts/flash.ld diff --git a/boards/nucleo-h743zi/scripts/kernel.space.ld b/boards/arm/nucleo-h743zi/scripts/kernel.space.ld similarity index 100% rename from boards/nucleo-h743zi/scripts/kernel.space.ld rename to boards/arm/nucleo-h743zi/scripts/kernel.space.ld diff --git a/boards/nucleo-h743zi/scripts/memory.ld b/boards/arm/nucleo-h743zi/scripts/memory.ld similarity index 100% rename from boards/nucleo-h743zi/scripts/memory.ld rename to boards/arm/nucleo-h743zi/scripts/memory.ld diff --git a/boards/nucleo-h743zi/scripts/user-space.ld b/boards/arm/nucleo-h743zi/scripts/user-space.ld similarity index 100% rename from boards/nucleo-h743zi/scripts/user-space.ld rename to boards/arm/nucleo-h743zi/scripts/user-space.ld diff --git a/boards/mirtoo/src/.gitignore b/boards/arm/nucleo-h743zi/src/.gitignore similarity index 100% rename from boards/mirtoo/src/.gitignore rename to boards/arm/nucleo-h743zi/src/.gitignore diff --git a/boards/nucleo-h743zi/src/Makefile b/boards/arm/nucleo-h743zi/src/Makefile similarity index 100% rename from boards/nucleo-h743zi/src/Makefile rename to boards/arm/nucleo-h743zi/src/Makefile diff --git a/boards/nucleo-h743zi/src/nucleo-h743zi.h b/boards/arm/nucleo-h743zi/src/nucleo-h743zi.h similarity index 98% rename from boards/nucleo-h743zi/src/nucleo-h743zi.h rename to boards/arm/nucleo-h743zi/src/nucleo-h743zi.h index 22ad18c463..785e87c8af 100644 --- a/boards/nucleo-h743zi/src/nucleo-h743zi.h +++ b/boards/arm/nucleo-h743zi/src/nucleo-h743zi.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_H743ZI_SRC_NUCLEO_H743ZI_H -#define __BOARDS_NUCLEO_H743ZI_SRC_NUCLEO_H743ZI_H +#ifndef __BOARDS_ARM_NUCLEO_H743ZI_SRC_NUCLEO_H743ZI_H +#define __BOARDS_ARM_NUCLEO_H743ZI_SRC_NUCLEO_H743ZI_H /************************************************************************************ * Included Files @@ -260,4 +260,4 @@ int stm32_lsm9ds1_initialize(char *devpath); int stm32_pca9635_initialize(void); #endif -#endif /* __BOARDS_NUCLEO_H743ZI_SRC_NUCLEO_H743ZI_H */ +#endif /* __BOARDS_ARM_NUCLEO_H743ZI_SRC_NUCLEO_H743ZI_H */ diff --git a/boards/nucleo-h743zi/src/stm32_adc.c b/boards/arm/nucleo-h743zi/src/stm32_adc.c similarity index 100% rename from boards/nucleo-h743zi/src/stm32_adc.c rename to boards/arm/nucleo-h743zi/src/stm32_adc.c diff --git a/boards/nucleo-h743zi/src/stm32_appinitialize.c b/boards/arm/nucleo-h743zi/src/stm32_appinitialize.c similarity index 100% rename from boards/nucleo-h743zi/src/stm32_appinitialize.c rename to boards/arm/nucleo-h743zi/src/stm32_appinitialize.c diff --git a/boards/nucleo-h743zi/src/stm32_autoleds.c b/boards/arm/nucleo-h743zi/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-h743zi/src/stm32_autoleds.c rename to boards/arm/nucleo-h743zi/src/stm32_autoleds.c diff --git a/boards/nucleo-h743zi/src/stm32_boot.c b/boards/arm/nucleo-h743zi/src/stm32_boot.c similarity index 100% rename from boards/nucleo-h743zi/src/stm32_boot.c rename to boards/arm/nucleo-h743zi/src/stm32_boot.c diff --git a/boards/nucleo-h743zi/src/stm32_bringup.c b/boards/arm/nucleo-h743zi/src/stm32_bringup.c similarity index 100% rename from boards/nucleo-h743zi/src/stm32_bringup.c rename to boards/arm/nucleo-h743zi/src/stm32_bringup.c diff --git a/boards/nucleo-h743zi/src/stm32_buttons.c b/boards/arm/nucleo-h743zi/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-h743zi/src/stm32_buttons.c rename to boards/arm/nucleo-h743zi/src/stm32_buttons.c diff --git a/boards/nucleo-h743zi/src/stm32_lsm303agr.c b/boards/arm/nucleo-h743zi/src/stm32_lsm303agr.c similarity index 100% rename from boards/nucleo-h743zi/src/stm32_lsm303agr.c rename to boards/arm/nucleo-h743zi/src/stm32_lsm303agr.c diff --git a/boards/nucleo-h743zi/src/stm32_lsm6dsl.c b/boards/arm/nucleo-h743zi/src/stm32_lsm6dsl.c similarity index 100% rename from boards/nucleo-h743zi/src/stm32_lsm6dsl.c rename to boards/arm/nucleo-h743zi/src/stm32_lsm6dsl.c diff --git a/boards/nucleo-h743zi/src/stm32_lsm9ds1.c b/boards/arm/nucleo-h743zi/src/stm32_lsm9ds1.c similarity index 100% rename from boards/nucleo-h743zi/src/stm32_lsm9ds1.c rename to boards/arm/nucleo-h743zi/src/stm32_lsm9ds1.c diff --git a/boards/nucleo-h743zi/src/stm32_nrf24l01.c b/boards/arm/nucleo-h743zi/src/stm32_nrf24l01.c similarity index 100% rename from boards/nucleo-h743zi/src/stm32_nrf24l01.c rename to boards/arm/nucleo-h743zi/src/stm32_nrf24l01.c diff --git a/boards/nucleo-h743zi/src/stm32_pca9635.c b/boards/arm/nucleo-h743zi/src/stm32_pca9635.c similarity index 100% rename from boards/nucleo-h743zi/src/stm32_pca9635.c rename to boards/arm/nucleo-h743zi/src/stm32_pca9635.c diff --git a/boards/nucleo-h743zi/src/stm32_spi.c b/boards/arm/nucleo-h743zi/src/stm32_spi.c similarity index 100% rename from boards/nucleo-h743zi/src/stm32_spi.c rename to boards/arm/nucleo-h743zi/src/stm32_spi.c diff --git a/boards/nucleo-h743zi/src/stm32_ssd1306.c b/boards/arm/nucleo-h743zi/src/stm32_ssd1306.c similarity index 100% rename from boards/nucleo-h743zi/src/stm32_ssd1306.c rename to boards/arm/nucleo-h743zi/src/stm32_ssd1306.c diff --git a/boards/nucleo-h743zi/src/stm32_usb.c b/boards/arm/nucleo-h743zi/src/stm32_usb.c similarity index 100% rename from boards/nucleo-h743zi/src/stm32_usb.c rename to boards/arm/nucleo-h743zi/src/stm32_usb.c diff --git a/boards/nucleo-h743zi/src/stm32_userleds.c b/boards/arm/nucleo-h743zi/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-h743zi/src/stm32_userleds.c rename to boards/arm/nucleo-h743zi/src/stm32_userleds.c diff --git a/boards/nucleo-l073rz/Kconfig b/boards/arm/nucleo-l073rz/Kconfig similarity index 100% rename from boards/nucleo-l073rz/Kconfig rename to boards/arm/nucleo-l073rz/Kconfig diff --git a/boards/nucleo-l073rz/README.txt b/boards/arm/nucleo-l073rz/README.txt similarity index 100% rename from boards/nucleo-l073rz/README.txt rename to boards/arm/nucleo-l073rz/README.txt diff --git a/boards/nucleo-l073rz/configs/nsh/defconfig b/boards/arm/nucleo-l073rz/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-l073rz/configs/nsh/defconfig rename to boards/arm/nucleo-l073rz/configs/nsh/defconfig diff --git a/boards/nucleo-l073rz/configs/sx127x/defconfig b/boards/arm/nucleo-l073rz/configs/sx127x/defconfig similarity index 100% rename from boards/nucleo-l073rz/configs/sx127x/defconfig rename to boards/arm/nucleo-l073rz/configs/sx127x/defconfig diff --git a/boards/nucleo-l073rz/include/board.h b/boards/arm/nucleo-l073rz/include/board.h similarity index 97% rename from boards/nucleo-l073rz/include/board.h rename to boards/arm/nucleo-l073rz/include/board.h index 8efd348ff5..fcb4a38e05 100644 --- a/boards/nucleo-l073rz/include/board.h +++ b/boards/arm/nucleo-l073rz/include/board.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_NUCLEO_L073RZ_INCLUDE_BOARD_H -#define __CONFIG_NUCLEO_L073RZ_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEO_L073RZ_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEO_L073RZ_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -210,4 +210,4 @@ #define ADC1_DMA_CHAN DMACHAN_ADC1 /* DMA1_CH1 */ -#endif /* __CONFIG_NUCLEO_LO73RZ_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_LO73RZ_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-l073rz/scripts/Make.defs b/boards/arm/nucleo-l073rz/scripts/Make.defs similarity index 96% rename from boards/nucleo-l073rz/scripts/Make.defs rename to boards/arm/nucleo-l073rz/scripts/Make.defs index 93af5ce5fc..461848af0c 100644 --- a/boards/nucleo-l073rz/scripts/Make.defs +++ b/boards/arm/nucleo-l073rz/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-l073rz/scripts/ld.script b/boards/arm/nucleo-l073rz/scripts/ld.script similarity index 100% rename from boards/nucleo-l073rz/scripts/ld.script rename to boards/arm/nucleo-l073rz/scripts/ld.script diff --git a/boards/nucleo-l073rz/src/Makefile b/boards/arm/nucleo-l073rz/src/Makefile similarity index 100% rename from boards/nucleo-l073rz/src/Makefile rename to boards/arm/nucleo-l073rz/src/Makefile diff --git a/boards/nucleo-l073rz/src/nucleo-l073rz.h b/boards/arm/nucleo-l073rz/src/nucleo-l073rz.h similarity index 97% rename from boards/nucleo-l073rz/src/nucleo-l073rz.h rename to boards/arm/nucleo-l073rz/src/nucleo-l073rz.h index b3f3db97e3..1f09e15f9a 100644 --- a/boards/nucleo-l073rz/src/nucleo-l073rz.h +++ b/boards/arm/nucleo-l073rz/src/nucleo-l073rz.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_NUCLEO_L073RZ_SRC_NUCLEO_L073RZ_H -#define __BOARDS_NUCLEO_L073RZ_SRC_NUCLEO_L073RZ_H +#ifndef __BOARDS_ARM_NUCLEO_L073RZ_SRC_NUCLEO_L073RZ_H +#define __BOARDS_ARM_NUCLEO_L073RZ_SRC_NUCLEO_L073RZ_H /**************************************************************************** * Included Files @@ -191,4 +191,4 @@ int stm32_lpwaninitialize(void); int stm32_mfrc522initialize(FAR const char *devpath); #endif -#endif /* __BOARDS_NUCLEO_L073RZ_SRC_NUCLEO_L073RZ_H */ +#endif /* __BOARDS_ARM_NUCLEO_L073RZ_SRC_NUCLEO_L073RZ_H */ diff --git a/boards/nucleo-l073rz/src/stm32_appinit.c b/boards/arm/nucleo-l073rz/src/stm32_appinit.c similarity index 100% rename from boards/nucleo-l073rz/src/stm32_appinit.c rename to boards/arm/nucleo-l073rz/src/stm32_appinit.c diff --git a/boards/nucleo-l073rz/src/stm32_autoleds.c b/boards/arm/nucleo-l073rz/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-l073rz/src/stm32_autoleds.c rename to boards/arm/nucleo-l073rz/src/stm32_autoleds.c diff --git a/boards/nucleo-l073rz/src/stm32_boot.c b/boards/arm/nucleo-l073rz/src/stm32_boot.c similarity index 100% rename from boards/nucleo-l073rz/src/stm32_boot.c rename to boards/arm/nucleo-l073rz/src/stm32_boot.c diff --git a/boards/nucleo-l073rz/src/stm32_bringup.c b/boards/arm/nucleo-l073rz/src/stm32_bringup.c similarity index 100% rename from boards/nucleo-l073rz/src/stm32_bringup.c rename to boards/arm/nucleo-l073rz/src/stm32_bringup.c diff --git a/boards/nucleo-l073rz/src/stm32_buttons.c b/boards/arm/nucleo-l073rz/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-l073rz/src/stm32_buttons.c rename to boards/arm/nucleo-l073rz/src/stm32_buttons.c diff --git a/boards/nucleo-l073rz/src/stm32_mfrc522.c b/boards/arm/nucleo-l073rz/src/stm32_mfrc522.c similarity index 100% rename from boards/nucleo-l073rz/src/stm32_mfrc522.c rename to boards/arm/nucleo-l073rz/src/stm32_mfrc522.c diff --git a/boards/nucleo-l073rz/src/stm32_nrf24l01.c b/boards/arm/nucleo-l073rz/src/stm32_nrf24l01.c similarity index 100% rename from boards/nucleo-l073rz/src/stm32_nrf24l01.c rename to boards/arm/nucleo-l073rz/src/stm32_nrf24l01.c diff --git a/boards/nucleo-l073rz/src/stm32_spi.c b/boards/arm/nucleo-l073rz/src/stm32_spi.c similarity index 100% rename from boards/nucleo-l073rz/src/stm32_spi.c rename to boards/arm/nucleo-l073rz/src/stm32_spi.c diff --git a/boards/nucleo-l073rz/src/stm32_sx127x.c b/boards/arm/nucleo-l073rz/src/stm32_sx127x.c similarity index 100% rename from boards/nucleo-l073rz/src/stm32_sx127x.c rename to boards/arm/nucleo-l073rz/src/stm32_sx127x.c diff --git a/boards/nucleo-l152re/Kconfig b/boards/arm/nucleo-l152re/Kconfig similarity index 100% rename from boards/nucleo-l152re/Kconfig rename to boards/arm/nucleo-l152re/Kconfig diff --git a/boards/nucleo-l152re/README.txt b/boards/arm/nucleo-l152re/README.txt similarity index 100% rename from boards/nucleo-l152re/README.txt rename to boards/arm/nucleo-l152re/README.txt diff --git a/boards/nucleo-l152re/configs/nsh/defconfig b/boards/arm/nucleo-l152re/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-l152re/configs/nsh/defconfig rename to boards/arm/nucleo-l152re/configs/nsh/defconfig diff --git a/boards/nucleo-l152re/include/board.h b/boards/arm/nucleo-l152re/include/board.h similarity index 98% rename from boards/nucleo-l152re/include/board.h rename to boards/arm/nucleo-l152re/include/board.h index eda82d9c68..5a3d601ba6 100644 --- a/boards/nucleo-l152re/include/board.h +++ b/boards/arm/nucleo-l152re/include/board.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_NUCLEOL152RE_INCLUDE_BOARD_H -#define __CONFIG_NUCLEOL152RE_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEOL152RE_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEOL152RE_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -225,4 +225,4 @@ #define GPIO_USART2_RX GPIO_USART2_RX_1 /* PA3 */ #define GPIO_USART2_TX GPIO_USART2_TX_1 /* PA2 */ -#endif /* __CONFIG_NUCLEO_L152RE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_L152RE_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-l152re/scripts/Make.defs b/boards/arm/nucleo-l152re/scripts/Make.defs similarity index 96% rename from boards/nucleo-l152re/scripts/Make.defs rename to boards/arm/nucleo-l152re/scripts/Make.defs index c178a22cc6..cac831ba5e 100644 --- a/boards/nucleo-l152re/scripts/Make.defs +++ b/boards/arm/nucleo-l152re/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-l152re/scripts/ld.script b/boards/arm/nucleo-l152re/scripts/ld.script similarity index 100% rename from boards/nucleo-l152re/scripts/ld.script rename to boards/arm/nucleo-l152re/scripts/ld.script diff --git a/boards/nucleo-l152re/src/Makefile b/boards/arm/nucleo-l152re/src/Makefile similarity index 100% rename from boards/nucleo-l152re/src/Makefile rename to boards/arm/nucleo-l152re/src/Makefile diff --git a/boards/nucleo-l152re/src/nucleo-l152re.h b/boards/arm/nucleo-l152re/src/nucleo-l152re.h similarity index 95% rename from boards/nucleo-l152re/src/nucleo-l152re.h rename to boards/arm/nucleo-l152re/src/nucleo-l152re.h index 332729577a..85cb76b821 100644 --- a/boards/nucleo-l152re/src/nucleo-l152re.h +++ b/boards/arm/nucleo-l152re/src/nucleo-l152re.h @@ -35,8 +35,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_NUCLEO_L152RE_SRC_NUCLEO_L152RE_H -#define __BOARDS_NUCLEO_L152RE_SRC_NUCLEO_L152RE_H +#ifndef __BOARDS_ARM_NUCLEO_L152RE_SRC_NUCLEO_L152RE_H +#define __BOARDS_ARM_NUCLEO_L152RE_SRC_NUCLEO_L152RE_H /**************************************************************************** * Included Files @@ -88,4 +88,4 @@ #define GPIO_BTN_USER (GPIO_INPUT|GPIO_FLOAT|GPIO_EXTI|GPIO_PORTC|GPIO_PIN13) -#endif /* __BOARDS_NUCLEO_L152RE_SRC_NUCLEO_L152RE_H */ +#endif /* __BOARDS_ARM_NUCLEO_L152RE_SRC_NUCLEO_L152RE_H */ diff --git a/boards/nucleo-l152re/src/stm32_appinitialize.c b/boards/arm/nucleo-l152re/src/stm32_appinitialize.c similarity index 100% rename from boards/nucleo-l152re/src/stm32_appinitialize.c rename to boards/arm/nucleo-l152re/src/stm32_appinitialize.c diff --git a/boards/nucleo-l152re/src/stm32_autoleds.c b/boards/arm/nucleo-l152re/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-l152re/src/stm32_autoleds.c rename to boards/arm/nucleo-l152re/src/stm32_autoleds.c diff --git a/boards/nucleo-l152re/src/stm32_boot.c b/boards/arm/nucleo-l152re/src/stm32_boot.c similarity index 100% rename from boards/nucleo-l152re/src/stm32_boot.c rename to boards/arm/nucleo-l152re/src/stm32_boot.c diff --git a/boards/nucleo-l152re/src/stm32_buttons.c b/boards/arm/nucleo-l152re/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-l152re/src/stm32_buttons.c rename to boards/arm/nucleo-l152re/src/stm32_buttons.c diff --git a/boards/nucleo-l152re/src/stm32_userleds.c b/boards/arm/nucleo-l152re/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-l152re/src/stm32_userleds.c rename to boards/arm/nucleo-l152re/src/stm32_userleds.c diff --git a/boards/nucleo-l432kc/Kconfig b/boards/arm/nucleo-l432kc/Kconfig similarity index 100% rename from boards/nucleo-l432kc/Kconfig rename to boards/arm/nucleo-l432kc/Kconfig diff --git a/boards/nucleo-l432kc/README.txt b/boards/arm/nucleo-l432kc/README.txt similarity index 100% rename from boards/nucleo-l432kc/README.txt rename to boards/arm/nucleo-l432kc/README.txt diff --git a/boards/nucleo-l432kc/configs/nsh/defconfig b/boards/arm/nucleo-l432kc/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-l432kc/configs/nsh/defconfig rename to boards/arm/nucleo-l432kc/configs/nsh/defconfig diff --git a/boards/nucleo-l432kc/include/board.h b/boards/arm/nucleo-l432kc/include/board.h similarity index 98% rename from boards/nucleo-l432kc/include/board.h rename to boards/arm/nucleo-l432kc/include/board.h index 42c9325642..dd30752819 100644 --- a/boards/nucleo-l432kc/include/board.h +++ b/boards/arm/nucleo-l432kc/include/board.h @@ -33,8 +33,8 @@ * ******************************************************************************/ -#ifndef __BOARDS_NUCLEO_L432KC_INCLUDE_BOARD_H -#define __BOARDS_NUCLEO_L432KC_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEO_L432KC_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEO_L432KC_INCLUDE_BOARD_H /******************************************************************************* * Included File @@ -267,4 +267,4 @@ void stm32l4_board_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_NUCLEO_L432KC_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_L432KC_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-l432kc/include/nucleo-l432kc.h b/boards/arm/nucleo-l432kc/include/nucleo-l432kc.h similarity index 99% rename from boards/nucleo-l432kc/include/nucleo-l432kc.h rename to boards/arm/nucleo-l432kc/include/nucleo-l432kc.h index 433571cf43..d118a245ad 100644 --- a/boards/nucleo-l432kc/include/nucleo-l432kc.h +++ b/boards/arm/nucleo-l432kc/include/nucleo-l432kc.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_L432KC_INCLUDE_NUCLEO_L432KC_H -#define __BOARDS_NUCLEO_L432KC_INCLUDE_NUCLEO_L432KC_H +#ifndef __BOARDS_ARM_NUCLEO_L432KC_INCLUDE_NUCLEO_L432KC_H +#define __BOARDS_ARM_NUCLEO_L432KC_INCLUDE_NUCLEO_L432KC_H /************************************************************************************ * Included Files @@ -522,4 +522,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_NUCLEO_L432KC_INCLUDE_NUCLEO_L432KC_H */ +#endif /* __BOARDS_ARM_NUCLEO_L432KC_INCLUDE_NUCLEO_L432KC_H */ diff --git a/boards/nucleo-l432kc/scripts/Make.defs b/boards/arm/nucleo-l432kc/scripts/Make.defs similarity index 96% rename from boards/nucleo-l432kc/scripts/Make.defs rename to boards/arm/nucleo-l432kc/scripts/Make.defs index 39eb303b6f..301481810d 100644 --- a/boards/nucleo-l432kc/scripts/Make.defs +++ b/boards/arm/nucleo-l432kc/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mknulldeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-l432kc/scripts/l432kc.ld b/boards/arm/nucleo-l432kc/scripts/l432kc.ld similarity index 100% rename from boards/nucleo-l432kc/scripts/l432kc.ld rename to boards/arm/nucleo-l432kc/scripts/l432kc.ld diff --git a/boards/nucleo-l432kc/src/Makefile b/boards/arm/nucleo-l432kc/src/Makefile similarity index 100% rename from boards/nucleo-l432kc/src/Makefile rename to boards/arm/nucleo-l432kc/src/Makefile diff --git a/boards/nucleo-l432kc/src/nucleo-l432kc.h b/boards/arm/nucleo-l432kc/src/nucleo-l432kc.h similarity index 98% rename from boards/nucleo-l432kc/src/nucleo-l432kc.h rename to boards/arm/nucleo-l432kc/src/nucleo-l432kc.h index 0da12ffdc7..a420b4d411 100644 --- a/boards/nucleo-l432kc/src/nucleo-l432kc.h +++ b/boards/arm/nucleo-l432kc/src/nucleo-l432kc.h @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_L432KC_SRC_NUCLEO_L432KC_H -#define __BOARDS_NUCLEO_L432KC_SRC_NUCLEO_L432KC_H +#ifndef __BOARDS_ARM_NUCLEO_L432KC_SRC_NUCLEO_L432KC_H +#define __BOARDS_ARM_NUCLEO_L432KC_SRC_NUCLEO_L432KC_H /************************************************************************************ * Included Files @@ -271,4 +271,4 @@ int board_timer_driver_initialize(FAR const char *devpath, int timer); int stm32l4_qencoder_initialize(FAR const char *devpath, int timer); #endif -#endif /* __BOARDS_NUCLEO_L432KC_SRC_NUCLEO_L432KC_H */ +#endif /* __BOARDS_ARM_NUCLEO_L432KC_SRC_NUCLEO_L432KC_H */ diff --git a/boards/nucleo-l432kc/src/stm32_adc.c b/boards/arm/nucleo-l432kc/src/stm32_adc.c similarity index 100% rename from boards/nucleo-l432kc/src/stm32_adc.c rename to boards/arm/nucleo-l432kc/src/stm32_adc.c diff --git a/boards/nucleo-l432kc/src/stm32_appinit.c b/boards/arm/nucleo-l432kc/src/stm32_appinit.c similarity index 100% rename from boards/nucleo-l432kc/src/stm32_appinit.c rename to boards/arm/nucleo-l432kc/src/stm32_appinit.c diff --git a/boards/nucleo-l432kc/src/stm32_at45db.c b/boards/arm/nucleo-l432kc/src/stm32_at45db.c similarity index 100% rename from boards/nucleo-l432kc/src/stm32_at45db.c rename to boards/arm/nucleo-l432kc/src/stm32_at45db.c diff --git a/boards/nucleo-l432kc/src/stm32_autoleds.c b/boards/arm/nucleo-l432kc/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-l432kc/src/stm32_autoleds.c rename to boards/arm/nucleo-l432kc/src/stm32_autoleds.c diff --git a/boards/nucleo-l432kc/src/stm32_boot.c b/boards/arm/nucleo-l432kc/src/stm32_boot.c similarity index 100% rename from boards/nucleo-l432kc/src/stm32_boot.c rename to boards/arm/nucleo-l432kc/src/stm32_boot.c diff --git a/boards/nucleo-l432kc/src/stm32_buttons.c b/boards/arm/nucleo-l432kc/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-l432kc/src/stm32_buttons.c rename to boards/arm/nucleo-l432kc/src/stm32_buttons.c diff --git a/boards/nucleo-l432kc/src/stm32_dac7571.c b/boards/arm/nucleo-l432kc/src/stm32_dac7571.c similarity index 100% rename from boards/nucleo-l432kc/src/stm32_dac7571.c rename to boards/arm/nucleo-l432kc/src/stm32_dac7571.c diff --git a/boards/nucleo-l432kc/src/stm32_gpio.c b/boards/arm/nucleo-l432kc/src/stm32_gpio.c similarity index 100% rename from boards/nucleo-l432kc/src/stm32_gpio.c rename to boards/arm/nucleo-l432kc/src/stm32_gpio.c diff --git a/boards/nucleo-l432kc/src/stm32_ina219.c b/boards/arm/nucleo-l432kc/src/stm32_ina219.c similarity index 100% rename from boards/nucleo-l432kc/src/stm32_ina219.c rename to boards/arm/nucleo-l432kc/src/stm32_ina219.c diff --git a/boards/nucleo-l432kc/src/stm32_ina226.c b/boards/arm/nucleo-l432kc/src/stm32_ina226.c similarity index 100% rename from boards/nucleo-l432kc/src/stm32_ina226.c rename to boards/arm/nucleo-l432kc/src/stm32_ina226.c diff --git a/boards/nucleo-l432kc/src/stm32_pwm.c b/boards/arm/nucleo-l432kc/src/stm32_pwm.c similarity index 100% rename from boards/nucleo-l432kc/src/stm32_pwm.c rename to boards/arm/nucleo-l432kc/src/stm32_pwm.c diff --git a/boards/nucleo-l432kc/src/stm32_qencoder.c b/boards/arm/nucleo-l432kc/src/stm32_qencoder.c similarity index 100% rename from boards/nucleo-l432kc/src/stm32_qencoder.c rename to boards/arm/nucleo-l432kc/src/stm32_qencoder.c diff --git a/boards/nucleo-l432kc/src/stm32_spi.c b/boards/arm/nucleo-l432kc/src/stm32_spi.c similarity index 100% rename from boards/nucleo-l432kc/src/stm32_spi.c rename to boards/arm/nucleo-l432kc/src/stm32_spi.c diff --git a/boards/nucleo-l432kc/src/stm32_timer.c b/boards/arm/nucleo-l432kc/src/stm32_timer.c similarity index 100% rename from boards/nucleo-l432kc/src/stm32_timer.c rename to boards/arm/nucleo-l432kc/src/stm32_timer.c diff --git a/boards/nucleo-l432kc/src/stm32_userleds.c b/boards/arm/nucleo-l432kc/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-l432kc/src/stm32_userleds.c rename to boards/arm/nucleo-l432kc/src/stm32_userleds.c diff --git a/boards/nucleo-l432kc/src/stm32_zerocross.c b/boards/arm/nucleo-l432kc/src/stm32_zerocross.c similarity index 100% rename from boards/nucleo-l432kc/src/stm32_zerocross.c rename to boards/arm/nucleo-l432kc/src/stm32_zerocross.c diff --git a/boards/nucleo-l452re/Kconfig b/boards/arm/nucleo-l452re/Kconfig similarity index 100% rename from boards/nucleo-l452re/Kconfig rename to boards/arm/nucleo-l452re/Kconfig diff --git a/boards/nucleo-l452re/README.txt b/boards/arm/nucleo-l452re/README.txt similarity index 100% rename from boards/nucleo-l452re/README.txt rename to boards/arm/nucleo-l452re/README.txt diff --git a/boards/nucleo-l452re/configs/nsh/defconfig b/boards/arm/nucleo-l452re/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-l452re/configs/nsh/defconfig rename to boards/arm/nucleo-l452re/configs/nsh/defconfig diff --git a/boards/nucleo-l452re/include/board.h b/boards/arm/nucleo-l452re/include/board.h similarity index 98% rename from boards/nucleo-l452re/include/board.h rename to boards/arm/nucleo-l452re/include/board.h index 01d05c93fa..f96ec01070 100644 --- a/boards/nucleo-l452re/include/board.h +++ b/boards/arm/nucleo-l452re/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_L452RE_INCLUDE_BOARD_H -#define __BOARDS_NUCLEO_L452RE_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEO_L452RE_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEO_L452RE_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -285,4 +285,4 @@ void stm32l4_board_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_NUCLEO_L452RE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_L452RE_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-l452re/include/nucleo-l452re.h b/boards/arm/nucleo-l452re/include/nucleo-l452re.h similarity index 99% rename from boards/nucleo-l452re/include/nucleo-l452re.h rename to boards/arm/nucleo-l452re/include/nucleo-l452re.h index 3aec4ed2cb..82c74b6091 100644 --- a/boards/nucleo-l452re/include/nucleo-l452re.h +++ b/boards/arm/nucleo-l452re/include/nucleo-l452re.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_L452RE_INCLUDE_NUCLEO_L452RE_H -#define __BOARDS_NUCLEO_L452RE_INCLUDE_NUCLEO_L452RE_H +#ifndef __BOARDS_ARM_NUCLEO_L452RE_INCLUDE_NUCLEO_L452RE_H +#define __BOARDS_ARM_NUCLEO_L452RE_INCLUDE_NUCLEO_L452RE_H /************************************************************************************ * Included Files @@ -511,4 +511,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_NUCLEO_L452RE_INCLUDE_NUCLEO_L452RE_H */ +#endif /* __BOARDS_ARM_NUCLEO_L452RE_INCLUDE_NUCLEO_L452RE_H */ diff --git a/boards/nucleo-l452re/scripts/Make.defs b/boards/arm/nucleo-l452re/scripts/Make.defs similarity index 96% rename from boards/nucleo-l452re/scripts/Make.defs rename to boards/arm/nucleo-l452re/scripts/Make.defs index 6660f5dab5..a47e382d6a 100644 --- a/boards/nucleo-l452re/scripts/Make.defs +++ b/boards/arm/nucleo-l452re/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mknulldeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-l452re/scripts/l452re-flash.ld b/boards/arm/nucleo-l452re/scripts/l452re-flash.ld similarity index 100% rename from boards/nucleo-l452re/scripts/l452re-flash.ld rename to boards/arm/nucleo-l452re/scripts/l452re-flash.ld diff --git a/boards/misoc/src/.gitignore b/boards/arm/nucleo-l452re/src/.gitignore similarity index 100% rename from boards/misoc/src/.gitignore rename to boards/arm/nucleo-l452re/src/.gitignore diff --git a/boards/nucleo-l452re/src/Makefile b/boards/arm/nucleo-l452re/src/Makefile similarity index 100% rename from boards/nucleo-l452re/src/Makefile rename to boards/arm/nucleo-l452re/src/Makefile diff --git a/boards/nucleo-l452re/src/nucleo-l452re.h b/boards/arm/nucleo-l452re/src/nucleo-l452re.h similarity index 97% rename from boards/nucleo-l452re/src/nucleo-l452re.h rename to boards/arm/nucleo-l452re/src/nucleo-l452re.h index 65c6198101..dc330bf0d9 100644 --- a/boards/nucleo-l452re/src/nucleo-l452re.h +++ b/boards/arm/nucleo-l452re/src/nucleo-l452re.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_NUCLEO_L452RE_SRC_NUCLEO_L452RE_H -#define __BOARDS_NUCLEO_L452RE_SRC_NUCLEO_L452RE_H +#ifndef __BOARDS_ARM_NUCLEO_L452RE_SRC_NUCLEO_L452RE_H +#define __BOARDS_ARM_NUCLEO_L452RE_SRC_NUCLEO_L452RE_H /**************************************************************************** * Included Files @@ -176,4 +176,4 @@ int stm32l4_dac_setup(void); int stm32_bringup(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_NUCLEO_L452RE_SRC_NUCLEO_L452RE_H */ +#endif /* __BOARDS_ARM_NUCLEO_L452RE_SRC_NUCLEO_L452RE_H */ diff --git a/boards/nucleo-l452re/src/stm32_adc.c b/boards/arm/nucleo-l452re/src/stm32_adc.c similarity index 100% rename from boards/nucleo-l452re/src/stm32_adc.c rename to boards/arm/nucleo-l452re/src/stm32_adc.c diff --git a/boards/nucleo-l452re/src/stm32_appinit.c b/boards/arm/nucleo-l452re/src/stm32_appinit.c similarity index 100% rename from boards/nucleo-l452re/src/stm32_appinit.c rename to boards/arm/nucleo-l452re/src/stm32_appinit.c diff --git a/boards/nucleo-l452re/src/stm32_autoleds.c b/boards/arm/nucleo-l452re/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-l452re/src/stm32_autoleds.c rename to boards/arm/nucleo-l452re/src/stm32_autoleds.c diff --git a/boards/nucleo-l452re/src/stm32_boot.c b/boards/arm/nucleo-l452re/src/stm32_boot.c similarity index 100% rename from boards/nucleo-l452re/src/stm32_boot.c rename to boards/arm/nucleo-l452re/src/stm32_boot.c diff --git a/boards/nucleo-l452re/src/stm32_bringup.c b/boards/arm/nucleo-l452re/src/stm32_bringup.c similarity index 100% rename from boards/nucleo-l452re/src/stm32_bringup.c rename to boards/arm/nucleo-l452re/src/stm32_bringup.c diff --git a/boards/nucleo-l452re/src/stm32_buttons.c b/boards/arm/nucleo-l452re/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-l452re/src/stm32_buttons.c rename to boards/arm/nucleo-l452re/src/stm32_buttons.c diff --git a/boards/nucleo-l452re/src/stm32_dac.c b/boards/arm/nucleo-l452re/src/stm32_dac.c similarity index 100% rename from boards/nucleo-l452re/src/stm32_dac.c rename to boards/arm/nucleo-l452re/src/stm32_dac.c diff --git a/boards/nucleo-l452re/src/stm32_spi.c b/boards/arm/nucleo-l452re/src/stm32_spi.c similarity index 100% rename from boards/nucleo-l452re/src/stm32_spi.c rename to boards/arm/nucleo-l452re/src/stm32_spi.c diff --git a/boards/nucleo-l452re/src/stm32_userleds.c b/boards/arm/nucleo-l452re/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-l452re/src/stm32_userleds.c rename to boards/arm/nucleo-l452re/src/stm32_userleds.c diff --git a/boards/nucleo-l476rg/Kconfig b/boards/arm/nucleo-l476rg/Kconfig similarity index 100% rename from boards/nucleo-l476rg/Kconfig rename to boards/arm/nucleo-l476rg/Kconfig diff --git a/boards/nucleo-l476rg/README.txt b/boards/arm/nucleo-l476rg/README.txt similarity index 100% rename from boards/nucleo-l476rg/README.txt rename to boards/arm/nucleo-l476rg/README.txt diff --git a/boards/nucleo-l476rg/configs/nsh/defconfig b/boards/arm/nucleo-l476rg/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-l476rg/configs/nsh/defconfig rename to boards/arm/nucleo-l476rg/configs/nsh/defconfig diff --git a/boards/nucleo-l476rg/configs/nxdemo/defconfig b/boards/arm/nucleo-l476rg/configs/nxdemo/defconfig similarity index 100% rename from boards/nucleo-l476rg/configs/nxdemo/defconfig rename to boards/arm/nucleo-l476rg/configs/nxdemo/defconfig diff --git a/boards/nucleo-l476rg/include/board.h b/boards/arm/nucleo-l476rg/include/board.h similarity index 98% rename from boards/nucleo-l476rg/include/board.h rename to boards/arm/nucleo-l476rg/include/board.h index 04e251d5fc..9612f0281c 100644 --- a/boards/nucleo-l476rg/include/board.h +++ b/boards/arm/nucleo-l476rg/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_L476RG_INCLUDE_BOARD_H -#define __BOARDS_NUCLEO_L476RG_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEO_L476RG_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEO_L476RG_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -285,4 +285,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_NUCLEO_F476RG_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_F476RG_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-l476rg/include/nucleo-l476rg.h b/boards/arm/nucleo-l476rg/include/nucleo-l476rg.h similarity index 99% rename from boards/nucleo-l476rg/include/nucleo-l476rg.h rename to boards/arm/nucleo-l476rg/include/nucleo-l476rg.h index cd60bd769f..4667b4114c 100644 --- a/boards/nucleo-l476rg/include/nucleo-l476rg.h +++ b/boards/arm/nucleo-l476rg/include/nucleo-l476rg.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_L476RG_INCLUDE_NUCLEO_L476RG_H -#define __BOARDS_NUCLEO_L476RG_INCLUDE_NUCLEO_L476RG_H +#ifndef __BOARDS_ARM_NUCLEO_L476RG_INCLUDE_NUCLEO_L476RG_H +#define __BOARDS_ARM_NUCLEO_L476RG_INCLUDE_NUCLEO_L476RG_H /************************************************************************************ * Included Files @@ -516,4 +516,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_NUCLEO_L476RG_INCLUDE_NUCLEO_L476RG_H */ +#endif /* __BOARDS_ARM_NUCLEO_L476RG_INCLUDE_NUCLEO_L476RG_H */ diff --git a/boards/nucleo-l476rg/scripts/Make.defs b/boards/arm/nucleo-l476rg/scripts/Make.defs similarity index 96% rename from boards/nucleo-l476rg/scripts/Make.defs rename to boards/arm/nucleo-l476rg/scripts/Make.defs index 314b5e11ed..08069187e5 100644 --- a/boards/nucleo-l476rg/scripts/Make.defs +++ b/boards/arm/nucleo-l476rg/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mknulldeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-l476rg/scripts/l476rg.ld b/boards/arm/nucleo-l476rg/scripts/l476rg.ld similarity index 100% rename from boards/nucleo-l476rg/scripts/l476rg.ld rename to boards/arm/nucleo-l476rg/scripts/l476rg.ld diff --git a/boards/nucleo-l476rg/src/Makefile b/boards/arm/nucleo-l476rg/src/Makefile similarity index 100% rename from boards/nucleo-l476rg/src/Makefile rename to boards/arm/nucleo-l476rg/src/Makefile diff --git a/boards/nucleo-l476rg/src/nucleo-l476rg.h b/boards/arm/nucleo-l476rg/src/nucleo-l476rg.h similarity index 98% rename from boards/nucleo-l476rg/src/nucleo-l476rg.h rename to boards/arm/nucleo-l476rg/src/nucleo-l476rg.h index a2eb4c37bf..f43e08dc50 100644 --- a/boards/nucleo-l476rg/src/nucleo-l476rg.h +++ b/boards/arm/nucleo-l476rg/src/nucleo-l476rg.h @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_L476RG_SRC_NUCLEO_L476RG_H -#define __BOARDS_NUCLEO_L476RG_SRC_NUCLEO_L476RG_H +#ifndef __BOARDS_ARM_NUCLEO_L476RG_SRC_NUCLEO_L476RG_H +#define __BOARDS_ARM_NUCLEO_L476RG_SRC_NUCLEO_L476RG_H /************************************************************************************ * Included Files @@ -445,4 +445,4 @@ int stm32_as726xinitialize(FAR const char *devpath); int stm32_bmp180initialize(FAR const char *devpath); #endif -#endif /* __BOARDS_NUCLEO_L476RG_SRC_NUCLEO_L476RG_H */ +#endif /* __BOARDS_ARM_NUCLEO_L476RG_SRC_NUCLEO_L476RG_H */ diff --git a/boards/nucleo-l476rg/src/stm32_adc.c b/boards/arm/nucleo-l476rg/src/stm32_adc.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_adc.c rename to boards/arm/nucleo-l476rg/src/stm32_adc.c diff --git a/boards/nucleo-l476rg/src/stm32_ajoystick.c b/boards/arm/nucleo-l476rg/src/stm32_ajoystick.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_ajoystick.c rename to boards/arm/nucleo-l476rg/src/stm32_ajoystick.c diff --git a/boards/nucleo-l476rg/src/stm32_appinit.c b/boards/arm/nucleo-l476rg/src/stm32_appinit.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_appinit.c rename to boards/arm/nucleo-l476rg/src/stm32_appinit.c diff --git a/boards/nucleo-l476rg/src/stm32_as726x.c b/boards/arm/nucleo-l476rg/src/stm32_as726x.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_as726x.c rename to boards/arm/nucleo-l476rg/src/stm32_as726x.c diff --git a/boards/nucleo-l476rg/src/stm32_autoleds.c b/boards/arm/nucleo-l476rg/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_autoleds.c rename to boards/arm/nucleo-l476rg/src/stm32_autoleds.c diff --git a/boards/nucleo-l476rg/src/stm32_bmp180.c b/boards/arm/nucleo-l476rg/src/stm32_bmp180.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_bmp180.c rename to boards/arm/nucleo-l476rg/src/stm32_bmp180.c diff --git a/boards/nucleo-l476rg/src/stm32_boot.c b/boards/arm/nucleo-l476rg/src/stm32_boot.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_boot.c rename to boards/arm/nucleo-l476rg/src/stm32_boot.c diff --git a/boards/nucleo-l476rg/src/stm32_buttons.c b/boards/arm/nucleo-l476rg/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_buttons.c rename to boards/arm/nucleo-l476rg/src/stm32_buttons.c diff --git a/boards/nucleo-l476rg/src/stm32_can.c b/boards/arm/nucleo-l476rg/src/stm32_can.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_can.c rename to boards/arm/nucleo-l476rg/src/stm32_can.c diff --git a/boards/nucleo-l476rg/src/stm32_cc1101.c b/boards/arm/nucleo-l476rg/src/stm32_cc1101.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_cc1101.c rename to boards/arm/nucleo-l476rg/src/stm32_cc1101.c diff --git a/boards/nucleo-l476rg/src/stm32_gpio.c b/boards/arm/nucleo-l476rg/src/stm32_gpio.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_gpio.c rename to boards/arm/nucleo-l476rg/src/stm32_gpio.c diff --git a/boards/nucleo-l476rg/src/stm32_lsm303agr.c b/boards/arm/nucleo-l476rg/src/stm32_lsm303agr.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_lsm303agr.c rename to boards/arm/nucleo-l476rg/src/stm32_lsm303agr.c diff --git a/boards/nucleo-l476rg/src/stm32_lsm6dsl.c b/boards/arm/nucleo-l476rg/src/stm32_lsm6dsl.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_lsm6dsl.c rename to boards/arm/nucleo-l476rg/src/stm32_lsm6dsl.c diff --git a/boards/nucleo-l476rg/src/stm32_pcd8544.c b/boards/arm/nucleo-l476rg/src/stm32_pcd8544.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_pcd8544.c rename to boards/arm/nucleo-l476rg/src/stm32_pcd8544.c diff --git a/boards/nucleo-l476rg/src/stm32_pwm.c b/boards/arm/nucleo-l476rg/src/stm32_pwm.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_pwm.c rename to boards/arm/nucleo-l476rg/src/stm32_pwm.c diff --git a/boards/nucleo-l476rg/src/stm32_qencoder.c b/boards/arm/nucleo-l476rg/src/stm32_qencoder.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_qencoder.c rename to boards/arm/nucleo-l476rg/src/stm32_qencoder.c diff --git a/boards/nucleo-l476rg/src/stm32_spi.c b/boards/arm/nucleo-l476rg/src/stm32_spi.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_spi.c rename to boards/arm/nucleo-l476rg/src/stm32_spi.c diff --git a/boards/nucleo-l476rg/src/stm32_spimmcsd.c b/boards/arm/nucleo-l476rg/src/stm32_spimmcsd.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_spimmcsd.c rename to boards/arm/nucleo-l476rg/src/stm32_spimmcsd.c diff --git a/boards/nucleo-l476rg/src/stm32_timer.c b/boards/arm/nucleo-l476rg/src/stm32_timer.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_timer.c rename to boards/arm/nucleo-l476rg/src/stm32_timer.c diff --git a/boards/nucleo-l476rg/src/stm32_userleds.c b/boards/arm/nucleo-l476rg/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-l476rg/src/stm32_userleds.c rename to boards/arm/nucleo-l476rg/src/stm32_userleds.c diff --git a/boards/nucleo-l496zg/Kconfig b/boards/arm/nucleo-l496zg/Kconfig similarity index 100% rename from boards/nucleo-l496zg/Kconfig rename to boards/arm/nucleo-l496zg/Kconfig diff --git a/boards/nucleo-l496zg/README.txt b/boards/arm/nucleo-l496zg/README.txt similarity index 100% rename from boards/nucleo-l496zg/README.txt rename to boards/arm/nucleo-l496zg/README.txt diff --git a/boards/nucleo-l496zg/configs/nsh/defconfig b/boards/arm/nucleo-l496zg/configs/nsh/defconfig similarity index 100% rename from boards/nucleo-l496zg/configs/nsh/defconfig rename to boards/arm/nucleo-l496zg/configs/nsh/defconfig diff --git a/boards/nucleo-l496zg/include/board.h b/boards/arm/nucleo-l496zg/include/board.h similarity index 99% rename from boards/nucleo-l496zg/include/board.h rename to boards/arm/nucleo-l496zg/include/board.h index e2e9cd2487..768f6d8400 100644 --- a/boards/nucleo-l496zg/include/board.h +++ b/boards/arm/nucleo-l496zg/include/board.h @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_NUCLEO_L496ZG_INCLUDE_BOARD_H -#define __CONFIG_NUCLEO_L496ZG_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUCLEO_L496ZG_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUCLEO_L496ZG_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -688,4 +688,4 @@ void stm32l4_board_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __CONFIG_NUCLEO_L496ZG_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUCLEO_L496ZG_INCLUDE_BOARD_H */ diff --git a/boards/nucleo-l496zg/scripts/Make.defs b/boards/arm/nucleo-l496zg/scripts/Make.defs similarity index 96% rename from boards/nucleo-l496zg/scripts/Make.defs rename to boards/arm/nucleo-l496zg/scripts/Make.defs index 4c8c44c719..39856cc227 100644 --- a/boards/nucleo-l496zg/scripts/Make.defs +++ b/boards/arm/nucleo-l496zg/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mknulldeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nucleo-l496zg/scripts/kernel-space.ld b/boards/arm/nucleo-l496zg/scripts/kernel-space.ld similarity index 100% rename from boards/nucleo-l496zg/scripts/kernel-space.ld rename to boards/arm/nucleo-l496zg/scripts/kernel-space.ld diff --git a/boards/nucleo-l496zg/scripts/l496zg-flash.ld b/boards/arm/nucleo-l496zg/scripts/l496zg-flash.ld similarity index 100% rename from boards/nucleo-l496zg/scripts/l496zg-flash.ld rename to boards/arm/nucleo-l496zg/scripts/l496zg-flash.ld diff --git a/boards/nucleo-l496zg/scripts/memory.ld b/boards/arm/nucleo-l496zg/scripts/memory.ld similarity index 100% rename from boards/nucleo-l496zg/scripts/memory.ld rename to boards/arm/nucleo-l496zg/scripts/memory.ld diff --git a/boards/nucleo-l496zg/scripts/user-space.ld b/boards/arm/nucleo-l496zg/scripts/user-space.ld similarity index 100% rename from boards/nucleo-l496zg/scripts/user-space.ld rename to boards/arm/nucleo-l496zg/scripts/user-space.ld diff --git a/boards/moteino-mega/src/.gitignore b/boards/arm/nucleo-l496zg/src/.gitignore similarity index 100% rename from boards/moteino-mega/src/.gitignore rename to boards/arm/nucleo-l496zg/src/.gitignore diff --git a/boards/nucleo-l496zg/src/Makefile b/boards/arm/nucleo-l496zg/src/Makefile similarity index 100% rename from boards/nucleo-l496zg/src/Makefile rename to boards/arm/nucleo-l496zg/src/Makefile diff --git a/boards/nucleo-l496zg/src/nucleo-144.h b/boards/arm/nucleo-l496zg/src/nucleo-144.h similarity index 98% rename from boards/nucleo-l496zg/src/nucleo-144.h rename to boards/arm/nucleo-l496zg/src/nucleo-144.h index 78709913f4..72f2376fb9 100644 --- a/boards/nucleo-l496zg/src/nucleo-144.h +++ b/boards/arm/nucleo-l496zg/src/nucleo-144.h @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUCLEO_L496ZG_SRC_NUCLEO_144_H -#define __BOARDS_NUCLEO_L496ZG_SRC_NUCLEO_144_H +#ifndef __BOARDS_ARM_NUCLEO_L496ZG_SRC_NUCLEO_144_H +#define __BOARDS_ARM_NUCLEO_L496ZG_SRC_NUCLEO_144_H /************************************************************************************ * Included Files @@ -292,4 +292,4 @@ int stm32_dfsdm_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_NUCLEO_L496ZG_SRC_NUCLEO_144_H */ +#endif /* __BOARDS_ARM_NUCLEO_L496ZG_SRC_NUCLEO_144_H */ diff --git a/boards/nucleo-l496zg/src/stm32_adc.c b/boards/arm/nucleo-l496zg/src/stm32_adc.c similarity index 100% rename from boards/nucleo-l496zg/src/stm32_adc.c rename to boards/arm/nucleo-l496zg/src/stm32_adc.c diff --git a/boards/nucleo-l496zg/src/stm32_appinitialize.c b/boards/arm/nucleo-l496zg/src/stm32_appinitialize.c similarity index 100% rename from boards/nucleo-l496zg/src/stm32_appinitialize.c rename to boards/arm/nucleo-l496zg/src/stm32_appinitialize.c diff --git a/boards/nucleo-l496zg/src/stm32_autoleds.c b/boards/arm/nucleo-l496zg/src/stm32_autoleds.c similarity index 100% rename from boards/nucleo-l496zg/src/stm32_autoleds.c rename to boards/arm/nucleo-l496zg/src/stm32_autoleds.c diff --git a/boards/nucleo-l496zg/src/stm32_boot.c b/boards/arm/nucleo-l496zg/src/stm32_boot.c similarity index 100% rename from boards/nucleo-l496zg/src/stm32_boot.c rename to boards/arm/nucleo-l496zg/src/stm32_boot.c diff --git a/boards/nucleo-l496zg/src/stm32_buttons.c b/boards/arm/nucleo-l496zg/src/stm32_buttons.c similarity index 100% rename from boards/nucleo-l496zg/src/stm32_buttons.c rename to boards/arm/nucleo-l496zg/src/stm32_buttons.c diff --git a/boards/nucleo-l496zg/src/stm32_dac.c b/boards/arm/nucleo-l496zg/src/stm32_dac.c similarity index 100% rename from boards/nucleo-l496zg/src/stm32_dac.c rename to boards/arm/nucleo-l496zg/src/stm32_dac.c diff --git a/boards/nucleo-l496zg/src/stm32_dfsdm.c b/boards/arm/nucleo-l496zg/src/stm32_dfsdm.c similarity index 100% rename from boards/nucleo-l496zg/src/stm32_dfsdm.c rename to boards/arm/nucleo-l496zg/src/stm32_dfsdm.c diff --git a/boards/nucleo-l496zg/src/stm32_dma_alloc.c b/boards/arm/nucleo-l496zg/src/stm32_dma_alloc.c similarity index 100% rename from boards/nucleo-l496zg/src/stm32_dma_alloc.c rename to boards/arm/nucleo-l496zg/src/stm32_dma_alloc.c diff --git a/boards/nucleo-l496zg/src/stm32_sdio.c b/boards/arm/nucleo-l496zg/src/stm32_sdio.c similarity index 100% rename from boards/nucleo-l496zg/src/stm32_sdio.c rename to boards/arm/nucleo-l496zg/src/stm32_sdio.c diff --git a/boards/nucleo-l496zg/src/stm32_spi.c b/boards/arm/nucleo-l496zg/src/stm32_spi.c similarity index 100% rename from boards/nucleo-l496zg/src/stm32_spi.c rename to boards/arm/nucleo-l496zg/src/stm32_spi.c diff --git a/boards/nucleo-l496zg/src/stm32_usb.c b/boards/arm/nucleo-l496zg/src/stm32_usb.c similarity index 100% rename from boards/nucleo-l496zg/src/stm32_usb.c rename to boards/arm/nucleo-l496zg/src/stm32_usb.c diff --git a/boards/nucleo-l496zg/src/stm32_userleds.c b/boards/arm/nucleo-l496zg/src/stm32_userleds.c similarity index 100% rename from boards/nucleo-l496zg/src/stm32_userleds.c rename to boards/arm/nucleo-l496zg/src/stm32_userleds.c diff --git a/boards/nutiny-nuc120/Kconfig b/boards/arm/nutiny-nuc120/Kconfig similarity index 100% rename from boards/nutiny-nuc120/Kconfig rename to boards/arm/nutiny-nuc120/Kconfig diff --git a/boards/nutiny-nuc120/README.txt b/boards/arm/nutiny-nuc120/README.txt similarity index 100% rename from boards/nutiny-nuc120/README.txt rename to boards/arm/nutiny-nuc120/README.txt diff --git a/boards/nutiny-nuc120/configs/nsh/defconfig b/boards/arm/nutiny-nuc120/configs/nsh/defconfig similarity index 100% rename from boards/nutiny-nuc120/configs/nsh/defconfig rename to boards/arm/nutiny-nuc120/configs/nsh/defconfig diff --git a/boards/nutiny-nuc120/include/board.h b/boards/arm/nutiny-nuc120/include/board.h similarity index 97% rename from boards/nutiny-nuc120/include/board.h rename to boards/arm/nutiny-nuc120/include/board.h index 5f613496f0..6cff7ab787 100644 --- a/boards/nutiny-nuc120/include/board.h +++ b/boards/arm/nutiny-nuc120/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NUTINY_NUC12_INCLUDE_BOARD_H -#define __BOARDS_NUTINY_NUC12_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_NUTINY_NUC12_INCLUDE_BOARD_H +#define __BOARDS_ARM_NUTINY_NUC12_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -131,4 +131,4 @@ #define NUM_BUTTONS 0 -#endif /* __BOARDS_NUTINY_NUC12_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_NUTINY_NUC12_INCLUDE_BOARD_H */ diff --git a/boards/nutiny-nuc120/scripts/Make.defs b/boards/arm/nutiny-nuc120/scripts/Make.defs similarity index 97% rename from boards/nutiny-nuc120/scripts/Make.defs rename to boards/arm/nutiny-nuc120/scripts/Make.defs index 3563d204fa..5bd7486149 100644 --- a/boards/nutiny-nuc120/scripts/Make.defs +++ b/boards/arm/nutiny-nuc120/scripts/Make.defs @@ -43,12 +43,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nutiny-nuc120/scripts/nutiny-nuc120.ld b/boards/arm/nutiny-nuc120/scripts/nutiny-nuc120.ld similarity index 100% rename from boards/nutiny-nuc120/scripts/nutiny-nuc120.ld rename to boards/arm/nutiny-nuc120/scripts/nutiny-nuc120.ld diff --git a/boards/ne64badge/src/.gitignore b/boards/arm/nutiny-nuc120/src/.gitignore similarity index 100% rename from boards/ne64badge/src/.gitignore rename to boards/arm/nutiny-nuc120/src/.gitignore diff --git a/boards/nutiny-nuc120/src/Makefile b/boards/arm/nutiny-nuc120/src/Makefile similarity index 100% rename from boards/nutiny-nuc120/src/Makefile rename to boards/arm/nutiny-nuc120/src/Makefile diff --git a/boards/nutiny-nuc120/src/nuc_boardinitialize.c b/boards/arm/nutiny-nuc120/src/nuc_boardinitialize.c similarity index 100% rename from boards/nutiny-nuc120/src/nuc_boardinitialize.c rename to boards/arm/nutiny-nuc120/src/nuc_boardinitialize.c diff --git a/boards/nutiny-nuc120/src/nuc_led.c b/boards/arm/nutiny-nuc120/src/nuc_led.c similarity index 100% rename from boards/nutiny-nuc120/src/nuc_led.c rename to boards/arm/nutiny-nuc120/src/nuc_led.c diff --git a/boards/nutiny-nuc120/src/nutiny-nuc120.h b/boards/arm/nutiny-nuc120/src/nutiny-nuc120.h similarity index 97% rename from boards/nutiny-nuc120/src/nutiny-nuc120.h rename to boards/arm/nutiny-nuc120/src/nutiny-nuc120.h index 664733f45d..1885b92659 100644 --- a/boards/nutiny-nuc120/src/nutiny-nuc120.h +++ b/boards/arm/nutiny-nuc120/src/nutiny-nuc120.h @@ -34,8 +34,8 @@ * ****************************************************************************************************/ -#ifndef __BOARDS_NUTINY_NUC120_SRC_NUTINY_NUC120_H -#define __BOARDS_NUTINY_NUC120_SRC_NUTINY_NUC120_H +#ifndef __BOARDS_ARM_NUTINY_NUC120_SRC_NUTINY_NUC120_H +#define __BOARDS_ARM_NUTINY_NUC120_SRC_NUTINY_NUC120_H /**************************************************************************************************** * Included Files @@ -127,5 +127,5 @@ void nuc_led_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_NUTINY_NUC120_SRC_NUTINY_NUC120_H */ +#endif /* __BOARDS_ARM_NUTINY_NUC120_SRC_NUTINY_NUC120_H */ diff --git a/boards/olimex-efm32g880f128-stk/Kconfig b/boards/arm/olimex-efm32g880f128-stk/Kconfig similarity index 100% rename from boards/olimex-efm32g880f128-stk/Kconfig rename to boards/arm/olimex-efm32g880f128-stk/Kconfig diff --git a/boards/olimex-efm32g880f128-stk/README.txt b/boards/arm/olimex-efm32g880f128-stk/README.txt similarity index 100% rename from boards/olimex-efm32g880f128-stk/README.txt rename to boards/arm/olimex-efm32g880f128-stk/README.txt diff --git a/boards/olimex-efm32g880f128-stk/configs/nsh/defconfig b/boards/arm/olimex-efm32g880f128-stk/configs/nsh/defconfig similarity index 100% rename from boards/olimex-efm32g880f128-stk/configs/nsh/defconfig rename to boards/arm/olimex-efm32g880f128-stk/configs/nsh/defconfig diff --git a/boards/olimex-efm32g880f128-stk/include/board.h b/boards/arm/olimex-efm32g880f128-stk/include/board.h similarity index 98% rename from boards/olimex-efm32g880f128-stk/include/board.h rename to boards/arm/olimex-efm32g880f128-stk/include/board.h index da7cdb7763..c65f5ab88f 100644 --- a/boards/olimex-efm32g880f128-stk/include/board.h +++ b/boards/arm/olimex-efm32g880f128-stk/include/board.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_OLIMEX_EFM32G880F128_STK_INCLUDE_BOARD_H -#define __BOARDS_OLIMEX_EFM32G880F128_STK_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_OLIMEX_EFM32G880F128_STK_INCLUDE_BOARD_H +#define __BOARDS_ARM_OLIMEX_EFM32G880F128_STK_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -255,4 +255,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __BOARDS_EFM32_DK3650_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_EFM32_DK3650_INCLUDE_BOARD_H */ diff --git a/boards/olimex-efm32g880f128-stk/scripts/Make.defs b/boards/arm/olimex-efm32g880f128-stk/scripts/Make.defs similarity index 96% rename from boards/olimex-efm32g880f128-stk/scripts/Make.defs rename to boards/arm/olimex-efm32g880f128-stk/scripts/Make.defs index 0ce425f908..39f57650a8 100644 --- a/boards/olimex-efm32g880f128-stk/scripts/Make.defs +++ b/boards/arm/olimex-efm32g880f128-stk/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/olimex-efm32g880f128-stk/scripts/ld.script b/boards/arm/olimex-efm32g880f128-stk/scripts/ld.script similarity index 100% rename from boards/olimex-efm32g880f128-stk/scripts/ld.script rename to boards/arm/olimex-efm32g880f128-stk/scripts/ld.script diff --git a/boards/nrf52-generic/src/.gitignore b/boards/arm/olimex-efm32g880f128-stk/src/.gitignore similarity index 100% rename from boards/nrf52-generic/src/.gitignore rename to boards/arm/olimex-efm32g880f128-stk/src/.gitignore diff --git a/boards/olimex-efm32g880f128-stk/src/Makefile b/boards/arm/olimex-efm32g880f128-stk/src/Makefile similarity index 100% rename from boards/olimex-efm32g880f128-stk/src/Makefile rename to boards/arm/olimex-efm32g880f128-stk/src/Makefile diff --git a/boards/olimex-efm32g880f128-stk/src/efm32_boot.c b/boards/arm/olimex-efm32g880f128-stk/src/efm32_boot.c similarity index 100% rename from boards/olimex-efm32g880f128-stk/src/efm32_boot.c rename to boards/arm/olimex-efm32g880f128-stk/src/efm32_boot.c diff --git a/boards/olimex-efm32g880f128-stk/src/efm32_buttons.c b/boards/arm/olimex-efm32g880f128-stk/src/efm32_buttons.c similarity index 100% rename from boards/olimex-efm32g880f128-stk/src/efm32_buttons.c rename to boards/arm/olimex-efm32g880f128-stk/src/efm32_buttons.c diff --git a/boards/olimex-efm32g880f128-stk/src/efm32g880f128-stk.h b/boards/arm/olimex-efm32g880f128-stk/src/efm32g880f128-stk.h similarity index 95% rename from boards/olimex-efm32g880f128-stk/src/efm32g880f128-stk.h rename to boards/arm/olimex-efm32g880f128-stk/src/efm32g880f128-stk.h index 23c761fcf0..624c7d991d 100644 --- a/boards/olimex-efm32g880f128-stk/src/efm32g880f128-stk.h +++ b/boards/arm/olimex-efm32g880f128-stk/src/efm32g880f128-stk.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_OLIMEX_EFM32G880F128_STK_SRC_EFM32G880F128_STK_H -#define __BOARDS_OLIMEX_EFM32G880F128_STK_SRC_EFM32G880F128_STK_H +#ifndef __BOARDS_ARM_OLIMEX_EFM32G880F128_STK_SRC_EFM32G880F128_STK_H +#define __BOARDS_ARM_OLIMEX_EFM32G880F128_STK_SRC_EFM32G880F128_STK_H /**************************************************************************** * Included Files @@ -83,4 +83,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __BOARDS_EFM32_DK3650_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_EFM32_DK3650_INCLUDE_BOARD_H */ diff --git a/boards/olimex-lpc-h3131/Kconfig b/boards/arm/olimex-lpc-h3131/Kconfig similarity index 100% rename from boards/olimex-lpc-h3131/Kconfig rename to boards/arm/olimex-lpc-h3131/Kconfig diff --git a/boards/olimex-lpc-h3131/README.txt b/boards/arm/olimex-lpc-h3131/README.txt similarity index 100% rename from boards/olimex-lpc-h3131/README.txt rename to boards/arm/olimex-lpc-h3131/README.txt diff --git a/boards/olimex-lpc-h3131/configs/nsh/defconfig b/boards/arm/olimex-lpc-h3131/configs/nsh/defconfig similarity index 100% rename from boards/olimex-lpc-h3131/configs/nsh/defconfig rename to boards/arm/olimex-lpc-h3131/configs/nsh/defconfig diff --git a/boards/olimex-lpc-h3131/include/board.h b/boards/arm/olimex-lpc-h3131/include/board.h similarity index 97% rename from boards/olimex-lpc-h3131/include/board.h rename to boards/arm/olimex-lpc-h3131/include/board.h index 7680b1ac0c..9b8dfa53c1 100644 --- a/boards/olimex-lpc-h3131/include/board.h +++ b/boards/arm/olimex-lpc-h3131/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_OLIMEX_LPC_H3131_INCLUDE_BOARD_H -#define __BOARDS_OLIMEX_LPC_H3131_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_OLIMEX_LPC_H3131_INCLUDE_BOARD_H +#define __BOARDS_ARM_OLIMEX_LPC_H3131_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -188,4 +188,4 @@ int lpc31_setup_overcurrent(xcpt_t handler, void *arg); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_OLIMEX_LPC_H3131_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_OLIMEX_LPC_H3131_INCLUDE_BOARD_H */ diff --git a/boards/olimex-lpc-h3131/include/board_memorymap.h b/boards/arm/olimex-lpc-h3131/include/board_memorymap.h similarity index 96% rename from boards/olimex-lpc-h3131/include/board_memorymap.h rename to boards/arm/olimex-lpc-h3131/include/board_memorymap.h index f7d78509fc..91725e4d57 100644 --- a/boards/olimex-lpc-h3131/include/board_memorymap.h +++ b/boards/arm/olimex-lpc-h3131/include/board_memorymap.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_OLIMEX_LPC_H3131_INCLUDE_BOARD_MEMORYMAP_H -#define __BOARDS_OLIMEX_LPC_H3131_INCLUDE_BOARD_MEMORYMAP_H +#ifndef __BOARDS_ARM_OLIMEX_LPC_H3131_INCLUDE_BOARD_MEMORYMAP_H +#define __BOARDS_ARM_OLIMEX_LPC_H3131_INCLUDE_BOARD_MEMORYMAP_H /* This file should never be included directly, but only indirectly via * lpc31_memorymap.h. @@ -113,4 +113,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_OLIMEX_LPC_H3131_INCLUDE_BOARD_MEMORYMAP_H */ +#endif /* __BOARDS_ARM_OLIMEX_LPC_H3131_INCLUDE_BOARD_MEMORYMAP_H */ diff --git a/boards/olimex-lpc-h3131/scripts/Make.defs b/boards/arm/olimex-lpc-h3131/scripts/Make.defs similarity index 97% rename from boards/olimex-lpc-h3131/scripts/Make.defs rename to boards/arm/olimex-lpc-h3131/scripts/Make.defs index b711051156..a052765b30 100644 --- a/boards/olimex-lpc-h3131/scripts/Make.defs +++ b/boards/arm/olimex-lpc-h3131/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/olimex-lpc-h3131/scripts/ld.script b/boards/arm/olimex-lpc-h3131/scripts/ld.script similarity index 100% rename from boards/olimex-lpc-h3131/scripts/ld.script rename to boards/arm/olimex-lpc-h3131/scripts/ld.script diff --git a/boards/ntosd-dm320/src/.gitignore b/boards/arm/olimex-lpc-h3131/src/.gitignore similarity index 100% rename from boards/ntosd-dm320/src/.gitignore rename to boards/arm/olimex-lpc-h3131/src/.gitignore diff --git a/boards/olimex-lpc-h3131/src/Makefile b/boards/arm/olimex-lpc-h3131/src/Makefile similarity index 100% rename from boards/olimex-lpc-h3131/src/Makefile rename to boards/arm/olimex-lpc-h3131/src/Makefile diff --git a/boards/olimex-lpc-h3131/src/lpc31_appinit.c b/boards/arm/olimex-lpc-h3131/src/lpc31_appinit.c similarity index 100% rename from boards/olimex-lpc-h3131/src/lpc31_appinit.c rename to boards/arm/olimex-lpc-h3131/src/lpc31_appinit.c diff --git a/boards/olimex-lpc-h3131/src/lpc31_boot.c b/boards/arm/olimex-lpc-h3131/src/lpc31_boot.c similarity index 100% rename from boards/olimex-lpc-h3131/src/lpc31_boot.c rename to boards/arm/olimex-lpc-h3131/src/lpc31_boot.c diff --git a/boards/olimex-lpc-h3131/src/lpc31_clkinit.c b/boards/arm/olimex-lpc-h3131/src/lpc31_clkinit.c similarity index 100% rename from boards/olimex-lpc-h3131/src/lpc31_clkinit.c rename to boards/arm/olimex-lpc-h3131/src/lpc31_clkinit.c diff --git a/boards/olimex-lpc-h3131/src/lpc31_leds.c b/boards/arm/olimex-lpc-h3131/src/lpc31_leds.c similarity index 100% rename from boards/olimex-lpc-h3131/src/lpc31_leds.c rename to boards/arm/olimex-lpc-h3131/src/lpc31_leds.c diff --git a/boards/olimex-lpc-h3131/src/lpc31_mem.c b/boards/arm/olimex-lpc-h3131/src/lpc31_mem.c similarity index 100% rename from boards/olimex-lpc-h3131/src/lpc31_mem.c rename to boards/arm/olimex-lpc-h3131/src/lpc31_mem.c diff --git a/boards/olimex-lpc-h3131/src/lpc31_mmcsd.c b/boards/arm/olimex-lpc-h3131/src/lpc31_mmcsd.c similarity index 100% rename from boards/olimex-lpc-h3131/src/lpc31_mmcsd.c rename to boards/arm/olimex-lpc-h3131/src/lpc31_mmcsd.c diff --git a/boards/olimex-lpc-h3131/src/lpc31_spi.c b/boards/arm/olimex-lpc-h3131/src/lpc31_spi.c similarity index 100% rename from boards/olimex-lpc-h3131/src/lpc31_spi.c rename to boards/arm/olimex-lpc-h3131/src/lpc31_spi.c diff --git a/boards/olimex-lpc-h3131/src/lpc31_usbhost.c b/boards/arm/olimex-lpc-h3131/src/lpc31_usbhost.c similarity index 100% rename from boards/olimex-lpc-h3131/src/lpc31_usbhost.c rename to boards/arm/olimex-lpc-h3131/src/lpc31_usbhost.c diff --git a/boards/olimex-lpc-h3131/src/lpc_h3131.h b/boards/arm/olimex-lpc-h3131/src/lpc_h3131.h similarity index 97% rename from boards/olimex-lpc-h3131/src/lpc_h3131.h rename to boards/arm/olimex-lpc-h3131/src/lpc_h3131.h index 1521d26b08..3f9dd935b3 100644 --- a/boards/olimex-lpc-h3131/src/lpc_h3131.h +++ b/boards/arm/olimex-lpc-h3131/src/lpc_h3131.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_OLIMEX_LPC_H3131_SRC_LPC_H3131_H -#define __BOARDS_OLIMEX_LPC_H3131_SRC_LPC_H3131_H +#ifndef __BOARDS_ARM_OLIMEX_LPC_H3131_SRC_LPC_H3131_H +#define __BOARDS_ARM_OLIMEX_LPC_H3131_SRC_LPC_H3131_H /************************************************************************************ * Included Files @@ -206,5 +206,5 @@ int lpc31_mmcsd_initialize(int slot, int minor) #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_OLIMEX_LPC_H3131_SRC_LPC_H3131_H */ +#endif /* __BOARDS_ARM_OLIMEX_LPC_H3131_SRC_LPC_H3131_H */ diff --git a/boards/olimex-lpc-h3131/tools/.gitignore b/boards/arm/olimex-lpc-h3131/tools/.gitignore similarity index 100% rename from boards/olimex-lpc-h3131/tools/.gitignore rename to boards/arm/olimex-lpc-h3131/tools/.gitignore diff --git a/boards/olimex-lpc-h3131/tools/Makefile b/boards/arm/olimex-lpc-h3131/tools/Makefile similarity index 100% rename from boards/olimex-lpc-h3131/tools/Makefile rename to boards/arm/olimex-lpc-h3131/tools/Makefile diff --git a/boards/olimex-lpc-h3131/tools/armusbocd.cfg b/boards/arm/olimex-lpc-h3131/tools/armusbocd.cfg similarity index 100% rename from boards/olimex-lpc-h3131/tools/armusbocd.cfg rename to boards/arm/olimex-lpc-h3131/tools/armusbocd.cfg diff --git a/boards/olimex-lpc-h3131/tools/crc32.c b/boards/arm/olimex-lpc-h3131/tools/crc32.c similarity index 100% rename from boards/olimex-lpc-h3131/tools/crc32.c rename to boards/arm/olimex-lpc-h3131/tools/crc32.c diff --git a/boards/olimex-lpc-h3131/tools/lpchdr.c b/boards/arm/olimex-lpc-h3131/tools/lpchdr.c similarity index 100% rename from boards/olimex-lpc-h3131/tools/lpchdr.c rename to boards/arm/olimex-lpc-h3131/tools/lpchdr.c diff --git a/boards/olimex-lpc-h3131/tools/lpchdr.h b/boards/arm/olimex-lpc-h3131/tools/lpchdr.h similarity index 97% rename from boards/olimex-lpc-h3131/tools/lpchdr.h rename to boards/arm/olimex-lpc-h3131/tools/lpchdr.h index c1d788dc89..a726b9d95c 100644 --- a/boards/olimex-lpc-h3131/tools/lpchdr.h +++ b/boards/arm/olimex-lpc-h3131/tools/lpchdr.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_OLIMEX_LPC_H3131_TOOLS_LPCHDR_H -#define __BOARDS_OLIMEX_LPC_H3131_TOOLS_LPCHDR_H +#ifndef __BOARDS_ARM_OLIMEX_LPC_H3131_TOOLS_LPCHDR_H +#define __BOARDS_ARM_OLIMEX_LPC_H3131_TOOLS_LPCHDR_H /************************************************************************************ * Included Files @@ -101,5 +101,5 @@ struct lpc31_header_s extern uint32_t crc32part(const uint8_t *src, size_t len, uint32_t crc32val); extern uint32_t crc32(const uint8_t *src, size_t len); -#endif /* __BOARDS_OLIMEX_LPC_H3131_TOOLS_LPCHDR_H */ +#endif /* __BOARDS_ARM_OLIMEX_LPC_H3131_TOOLS_LPCHDR_H */ diff --git a/boards/olimex-lpc-h3131/tools/mklpc.sh b/boards/arm/olimex-lpc-h3131/tools/mklpc.sh similarity index 100% rename from boards/olimex-lpc-h3131/tools/mklpc.sh rename to boards/arm/olimex-lpc-h3131/tools/mklpc.sh diff --git a/boards/olimex-lpc-h3131/tools/oocd.sh b/boards/arm/olimex-lpc-h3131/tools/oocd.sh similarity index 100% rename from boards/olimex-lpc-h3131/tools/oocd.sh rename to boards/arm/olimex-lpc-h3131/tools/oocd.sh diff --git a/boards/olimex-lpc-h3131/tools/usb-driver.txt b/boards/arm/olimex-lpc-h3131/tools/usb-driver.txt similarity index 100% rename from boards/olimex-lpc-h3131/tools/usb-driver.txt rename to boards/arm/olimex-lpc-h3131/tools/usb-driver.txt diff --git a/boards/olimex-lpc1766stk/Kconfig b/boards/arm/olimex-lpc1766stk/Kconfig similarity index 100% rename from boards/olimex-lpc1766stk/Kconfig rename to boards/arm/olimex-lpc1766stk/Kconfig diff --git a/boards/olimex-lpc1766stk/README.txt b/boards/arm/olimex-lpc1766stk/README.txt similarity index 100% rename from boards/olimex-lpc1766stk/README.txt rename to boards/arm/olimex-lpc1766stk/README.txt diff --git a/boards/olimex-lpc1766stk/configs/ftpc/defconfig b/boards/arm/olimex-lpc1766stk/configs/ftpc/defconfig similarity index 100% rename from boards/olimex-lpc1766stk/configs/ftpc/defconfig rename to boards/arm/olimex-lpc1766stk/configs/ftpc/defconfig diff --git a/boards/olimex-lpc1766stk/configs/hidkbd/defconfig b/boards/arm/olimex-lpc1766stk/configs/hidkbd/defconfig similarity index 100% rename from boards/olimex-lpc1766stk/configs/hidkbd/defconfig rename to boards/arm/olimex-lpc1766stk/configs/hidkbd/defconfig diff --git a/boards/olimex-lpc1766stk/configs/hidmouse/defconfig b/boards/arm/olimex-lpc1766stk/configs/hidmouse/defconfig similarity index 100% rename from boards/olimex-lpc1766stk/configs/hidmouse/defconfig rename to boards/arm/olimex-lpc1766stk/configs/hidmouse/defconfig diff --git a/boards/olimex-lpc1766stk/configs/nettest/defconfig b/boards/arm/olimex-lpc1766stk/configs/nettest/defconfig similarity index 100% rename from boards/olimex-lpc1766stk/configs/nettest/defconfig rename to boards/arm/olimex-lpc1766stk/configs/nettest/defconfig diff --git a/boards/olimex-lpc1766stk/configs/nsh/defconfig b/boards/arm/olimex-lpc1766stk/configs/nsh/defconfig similarity index 100% rename from boards/olimex-lpc1766stk/configs/nsh/defconfig rename to boards/arm/olimex-lpc1766stk/configs/nsh/defconfig diff --git a/boards/olimex-lpc1766stk/configs/slip-httpd/defconfig b/boards/arm/olimex-lpc1766stk/configs/slip-httpd/defconfig similarity index 100% rename from boards/olimex-lpc1766stk/configs/slip-httpd/defconfig rename to boards/arm/olimex-lpc1766stk/configs/slip-httpd/defconfig diff --git a/boards/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs b/boards/arm/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs similarity index 97% rename from boards/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs rename to boards/arm/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs index e05501782b..d454a905fc 100644 --- a/boards/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs +++ b/boards/arm/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/olimex-lpc1766stk/configs/thttpd-binfs/defconfig b/boards/arm/olimex-lpc1766stk/configs/thttpd-binfs/defconfig similarity index 100% rename from boards/olimex-lpc1766stk/configs/thttpd-binfs/defconfig rename to boards/arm/olimex-lpc1766stk/configs/thttpd-binfs/defconfig diff --git a/boards/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs b/boards/arm/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs similarity index 97% rename from boards/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs rename to boards/arm/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs index 099b00e2d7..f7efa8c99e 100644 --- a/boards/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs +++ b/boards/arm/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig b/boards/arm/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig similarity index 100% rename from boards/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig rename to boards/arm/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig diff --git a/boards/olimex-lpc1766stk/configs/usbmsc/defconfig b/boards/arm/olimex-lpc1766stk/configs/usbmsc/defconfig similarity index 100% rename from boards/olimex-lpc1766stk/configs/usbmsc/defconfig rename to boards/arm/olimex-lpc1766stk/configs/usbmsc/defconfig diff --git a/boards/olimex-lpc1766stk/configs/usbserial/defconfig b/boards/arm/olimex-lpc1766stk/configs/usbserial/defconfig similarity index 100% rename from boards/olimex-lpc1766stk/configs/usbserial/defconfig rename to boards/arm/olimex-lpc1766stk/configs/usbserial/defconfig diff --git a/boards/olimex-lpc1766stk/configs/zmodem/defconfig b/boards/arm/olimex-lpc1766stk/configs/zmodem/defconfig similarity index 100% rename from boards/olimex-lpc1766stk/configs/zmodem/defconfig rename to boards/arm/olimex-lpc1766stk/configs/zmodem/defconfig diff --git a/boards/olimex-lpc1766stk/include/board.h b/boards/arm/olimex-lpc1766stk/include/board.h similarity index 100% rename from boards/olimex-lpc1766stk/include/board.h rename to boards/arm/olimex-lpc1766stk/include/board.h diff --git a/boards/olimex-lpc1766stk/scripts/Make.defs b/boards/arm/olimex-lpc1766stk/scripts/Make.defs similarity index 97% rename from boards/olimex-lpc1766stk/scripts/Make.defs rename to boards/arm/olimex-lpc1766stk/scripts/Make.defs index 05984b4b32..124f98c532 100644 --- a/boards/olimex-lpc1766stk/scripts/Make.defs +++ b/boards/arm/olimex-lpc1766stk/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/olimex-lpc1766stk/scripts/ld.script b/boards/arm/olimex-lpc1766stk/scripts/ld.script similarity index 100% rename from boards/olimex-lpc1766stk/scripts/ld.script rename to boards/arm/olimex-lpc1766stk/scripts/ld.script diff --git a/boards/nucleo-144/src/.gitignore b/boards/arm/olimex-lpc1766stk/src/.gitignore similarity index 100% rename from boards/nucleo-144/src/.gitignore rename to boards/arm/olimex-lpc1766stk/src/.gitignore diff --git a/boards/olimex-lpc1766stk/src/Makefile b/boards/arm/olimex-lpc1766stk/src/Makefile similarity index 100% rename from boards/olimex-lpc1766stk/src/Makefile rename to boards/arm/olimex-lpc1766stk/src/Makefile diff --git a/boards/olimex-lpc1766stk/src/lpc1766stk.h b/boards/arm/olimex-lpc1766stk/src/lpc1766stk.h similarity index 100% rename from boards/olimex-lpc1766stk/src/lpc1766stk.h rename to boards/arm/olimex-lpc1766stk/src/lpc1766stk.h diff --git a/boards/olimex-lpc1766stk/src/lpc17_40_appinit.c b/boards/arm/olimex-lpc1766stk/src/lpc17_40_appinit.c similarity index 100% rename from boards/olimex-lpc1766stk/src/lpc17_40_appinit.c rename to boards/arm/olimex-lpc1766stk/src/lpc17_40_appinit.c diff --git a/boards/olimex-lpc1766stk/src/lpc17_40_boot.c b/boards/arm/olimex-lpc1766stk/src/lpc17_40_boot.c similarity index 100% rename from boards/olimex-lpc1766stk/src/lpc17_40_boot.c rename to boards/arm/olimex-lpc1766stk/src/lpc17_40_boot.c diff --git a/boards/olimex-lpc1766stk/src/lpc17_40_bringup.c b/boards/arm/olimex-lpc1766stk/src/lpc17_40_bringup.c similarity index 100% rename from boards/olimex-lpc1766stk/src/lpc17_40_bringup.c rename to boards/arm/olimex-lpc1766stk/src/lpc17_40_bringup.c diff --git a/boards/olimex-lpc1766stk/src/lpc17_40_buttons.c b/boards/arm/olimex-lpc1766stk/src/lpc17_40_buttons.c similarity index 100% rename from boards/olimex-lpc1766stk/src/lpc17_40_buttons.c rename to boards/arm/olimex-lpc1766stk/src/lpc17_40_buttons.c diff --git a/boards/olimex-lpc1766stk/src/lpc17_40_can.c b/boards/arm/olimex-lpc1766stk/src/lpc17_40_can.c similarity index 100% rename from boards/olimex-lpc1766stk/src/lpc17_40_can.c rename to boards/arm/olimex-lpc1766stk/src/lpc17_40_can.c diff --git a/boards/olimex-lpc1766stk/src/lpc17_40_leds.c b/boards/arm/olimex-lpc1766stk/src/lpc17_40_leds.c similarity index 100% rename from boards/olimex-lpc1766stk/src/lpc17_40_leds.c rename to boards/arm/olimex-lpc1766stk/src/lpc17_40_leds.c diff --git a/boards/olimex-lpc1766stk/src/lpc17_40_ssp.c b/boards/arm/olimex-lpc1766stk/src/lpc17_40_ssp.c similarity index 100% rename from boards/olimex-lpc1766stk/src/lpc17_40_ssp.c rename to boards/arm/olimex-lpc1766stk/src/lpc17_40_ssp.c diff --git a/boards/olimex-lpc1766stk/src/lpc17_40_usbmsc.c b/boards/arm/olimex-lpc1766stk/src/lpc17_40_usbmsc.c similarity index 100% rename from boards/olimex-lpc1766stk/src/lpc17_40_usbmsc.c rename to boards/arm/olimex-lpc1766stk/src/lpc17_40_usbmsc.c diff --git a/boards/olimex-lpc1766stk/tools/olimex.cfg b/boards/arm/olimex-lpc1766stk/tools/olimex.cfg similarity index 100% rename from boards/olimex-lpc1766stk/tools/olimex.cfg rename to boards/arm/olimex-lpc1766stk/tools/olimex.cfg diff --git a/boards/olimex-lpc1766stk/tools/oocd.sh b/boards/arm/olimex-lpc1766stk/tools/oocd.sh similarity index 100% rename from boards/olimex-lpc1766stk/tools/oocd.sh rename to boards/arm/olimex-lpc1766stk/tools/oocd.sh diff --git a/boards/olimex-lpc1766stk/tools/usb-driver.txt b/boards/arm/olimex-lpc1766stk/tools/usb-driver.txt similarity index 100% rename from boards/olimex-lpc1766stk/tools/usb-driver.txt rename to boards/arm/olimex-lpc1766stk/tools/usb-driver.txt diff --git a/boards/olimex-lpc2378/Kconfig b/boards/arm/olimex-lpc2378/Kconfig similarity index 100% rename from boards/olimex-lpc2378/Kconfig rename to boards/arm/olimex-lpc2378/Kconfig diff --git a/boards/olimex-lpc2378/README.txt b/boards/arm/olimex-lpc2378/README.txt similarity index 100% rename from boards/olimex-lpc2378/README.txt rename to boards/arm/olimex-lpc2378/README.txt diff --git a/boards/olimex-lpc2378/configs/nsh/defconfig b/boards/arm/olimex-lpc2378/configs/nsh/defconfig similarity index 100% rename from boards/olimex-lpc2378/configs/nsh/defconfig rename to boards/arm/olimex-lpc2378/configs/nsh/defconfig diff --git a/boards/olimex-lpc2378/include/board.h b/boards/arm/olimex-lpc2378/include/board.h similarity index 95% rename from boards/olimex-lpc2378/include/board.h rename to boards/arm/olimex-lpc2378/include/board.h index 9a08e4d6cc..dfdc358bf4 100644 --- a/boards/olimex-lpc2378/include/board.h +++ b/boards/arm/olimex-lpc2378/include/board.h @@ -38,8 +38,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_OLIMEX_LPC2378_INCLUDE_BOARD_H -#define __BOARDS_OLIMEX_LPC2378_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_OLIMEX_LPC2378_INCLUDE_BOARD_H +#define __BOARDS_ARM_OLIMEX_LPC2378_INCLUDE_BOARD_H /************************************************************************************ * Pre-processor Definitions @@ -84,4 +84,4 @@ * Inline Functions ****************************************************************************/ -#endif /* __BOARDS_OLIMEX_LPC2378_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_OLIMEX_LPC2378_INCLUDE_BOARD_H */ diff --git a/boards/olimex-lpc2378/scripts/Make.defs b/boards/arm/olimex-lpc2378/scripts/Make.defs similarity index 97% rename from boards/olimex-lpc2378/scripts/Make.defs rename to boards/arm/olimex-lpc2378/scripts/Make.defs index 316b65caa8..503a3382f4 100644 --- a/boards/olimex-lpc2378/scripts/Make.defs +++ b/boards/arm/olimex-lpc2378/scripts/Make.defs @@ -49,13 +49,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/olimex-lpc2378/scripts/ld.script b/boards/arm/olimex-lpc2378/scripts/ld.script similarity index 100% rename from boards/olimex-lpc2378/scripts/ld.script rename to boards/arm/olimex-lpc2378/scripts/ld.script diff --git a/boards/nucleo-f072rb/src/.gitignore b/boards/arm/olimex-lpc2378/src/.gitignore similarity index 100% rename from boards/nucleo-f072rb/src/.gitignore rename to boards/arm/olimex-lpc2378/src/.gitignore diff --git a/boards/olimex-lpc2378/src/Makefile b/boards/arm/olimex-lpc2378/src/Makefile similarity index 100% rename from boards/olimex-lpc2378/src/Makefile rename to boards/arm/olimex-lpc2378/src/Makefile diff --git a/boards/olimex-lpc2378/src/lpc2378_appinit.c b/boards/arm/olimex-lpc2378/src/lpc2378_appinit.c similarity index 100% rename from boards/olimex-lpc2378/src/lpc2378_appinit.c rename to boards/arm/olimex-lpc2378/src/lpc2378_appinit.c diff --git a/boards/olimex-lpc2378/src/lpc2378_leds.c b/boards/arm/olimex-lpc2378/src/lpc2378_leds.c similarity index 100% rename from boards/olimex-lpc2378/src/lpc2378_leds.c rename to boards/arm/olimex-lpc2378/src/lpc2378_leds.c diff --git a/boards/olimex-stm32-e407/Kconfig b/boards/arm/olimex-stm32-e407/Kconfig similarity index 100% rename from boards/olimex-stm32-e407/Kconfig rename to boards/arm/olimex-stm32-e407/Kconfig diff --git a/boards/olimex-stm32-e407/README.txt b/boards/arm/olimex-stm32-e407/README.txt similarity index 100% rename from boards/olimex-stm32-e407/README.txt rename to boards/arm/olimex-stm32-e407/README.txt diff --git a/boards/olimex-stm32-e407/configs/bmp180/defconfig b/boards/arm/olimex-stm32-e407/configs/bmp180/defconfig similarity index 100% rename from boards/olimex-stm32-e407/configs/bmp180/defconfig rename to boards/arm/olimex-stm32-e407/configs/bmp180/defconfig diff --git a/boards/olimex-stm32-e407/configs/dac/defconfig b/boards/arm/olimex-stm32-e407/configs/dac/defconfig similarity index 100% rename from boards/olimex-stm32-e407/configs/dac/defconfig rename to boards/arm/olimex-stm32-e407/configs/dac/defconfig diff --git a/boards/olimex-stm32-e407/configs/discover/defconfig b/boards/arm/olimex-stm32-e407/configs/discover/defconfig similarity index 100% rename from boards/olimex-stm32-e407/configs/discover/defconfig rename to boards/arm/olimex-stm32-e407/configs/discover/defconfig diff --git a/boards/olimex-stm32-e407/configs/ina219/defconfig b/boards/arm/olimex-stm32-e407/configs/ina219/defconfig similarity index 100% rename from boards/olimex-stm32-e407/configs/ina219/defconfig rename to boards/arm/olimex-stm32-e407/configs/ina219/defconfig diff --git a/boards/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig b/boards/arm/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig similarity index 100% rename from boards/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig rename to boards/arm/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig diff --git a/boards/olimex-stm32-e407/configs/mrf24j40-mac/defconfig b/boards/arm/olimex-stm32-e407/configs/mrf24j40-mac/defconfig similarity index 100% rename from boards/olimex-stm32-e407/configs/mrf24j40-mac/defconfig rename to boards/arm/olimex-stm32-e407/configs/mrf24j40-mac/defconfig diff --git a/boards/olimex-stm32-e407/configs/netnsh/defconfig b/boards/arm/olimex-stm32-e407/configs/netnsh/defconfig similarity index 100% rename from boards/olimex-stm32-e407/configs/netnsh/defconfig rename to boards/arm/olimex-stm32-e407/configs/netnsh/defconfig diff --git a/boards/olimex-stm32-e407/configs/nsh/defconfig b/boards/arm/olimex-stm32-e407/configs/nsh/defconfig similarity index 100% rename from boards/olimex-stm32-e407/configs/nsh/defconfig rename to boards/arm/olimex-stm32-e407/configs/nsh/defconfig diff --git a/boards/olimex-stm32-e407/configs/telnetd/defconfig b/boards/arm/olimex-stm32-e407/configs/telnetd/defconfig similarity index 100% rename from boards/olimex-stm32-e407/configs/telnetd/defconfig rename to boards/arm/olimex-stm32-e407/configs/telnetd/defconfig diff --git a/boards/olimex-stm32-e407/configs/timer/defconfig b/boards/arm/olimex-stm32-e407/configs/timer/defconfig similarity index 100% rename from boards/olimex-stm32-e407/configs/timer/defconfig rename to boards/arm/olimex-stm32-e407/configs/timer/defconfig diff --git a/boards/olimex-stm32-e407/configs/usbnsh/defconfig b/boards/arm/olimex-stm32-e407/configs/usbnsh/defconfig similarity index 100% rename from boards/olimex-stm32-e407/configs/usbnsh/defconfig rename to boards/arm/olimex-stm32-e407/configs/usbnsh/defconfig diff --git a/boards/olimex-stm32-e407/configs/webserver/defconfig b/boards/arm/olimex-stm32-e407/configs/webserver/defconfig similarity index 100% rename from boards/olimex-stm32-e407/configs/webserver/defconfig rename to boards/arm/olimex-stm32-e407/configs/webserver/defconfig diff --git a/boards/olimex-stm32-e407/include/board.h b/boards/arm/olimex-stm32-e407/include/board.h similarity index 98% rename from boards/olimex-stm32-e407/include/board.h rename to boards/arm/olimex-stm32-e407/include/board.h index 40f4bc4a42..e379b307e7 100644 --- a/boards/olimex-stm32-e407/include/board.h +++ b/boards/arm/olimex-stm32-e407/include/board.h @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_OLIMEX_STM32_E407_INCLUDE_BOARD_H -#define __BOARDS_OLIMEX_STM32_E407_INCLUDE_BOARD_H 1 +#ifndef __BOARDS_ARM_OLIMEX_STM32_E407_INCLUDE_BOARD_H +#define __BOARDS_ARM_OLIMEX_STM32_E407_INCLUDE_BOARD_H 1 /************************************************************************************ * Included Files @@ -266,4 +266,4 @@ #endif -#endif /* __BOARDS_OLIMEX_STM32_E407_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_OLIMEX_STM32_E407_INCLUDE_BOARD_H */ diff --git a/boards/olimex-stm32-e407/scripts/Make.defs b/boards/arm/olimex-stm32-e407/scripts/Make.defs similarity index 96% rename from boards/olimex-stm32-e407/scripts/Make.defs rename to boards/arm/olimex-stm32-e407/scripts/Make.defs index 2a52619ea4..0ed55238ba 100644 --- a/boards/olimex-stm32-e407/scripts/Make.defs +++ b/boards/arm/olimex-stm32-e407/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/olimex-stm32-e407/scripts/ld.script b/boards/arm/olimex-stm32-e407/scripts/ld.script similarity index 100% rename from boards/olimex-stm32-e407/scripts/ld.script rename to boards/arm/olimex-stm32-e407/scripts/ld.script diff --git a/boards/olimex-stm32-e407/src/Makefile b/boards/arm/olimex-stm32-e407/src/Makefile similarity index 100% rename from boards/olimex-stm32-e407/src/Makefile rename to boards/arm/olimex-stm32-e407/src/Makefile diff --git a/boards/olimex-stm32-e407/src/olimex-stm32-e407.h b/boards/arm/olimex-stm32-e407/src/olimex-stm32-e407.h similarity index 98% rename from boards/olimex-stm32-e407/src/olimex-stm32-e407.h rename to boards/arm/olimex-stm32-e407/src/olimex-stm32-e407.h index f6798fb140..73a756cff7 100644 --- a/boards/olimex-stm32-e407/src/olimex-stm32-e407.h +++ b/boards/arm/olimex-stm32-e407/src/olimex-stm32-e407.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_OLIMEX_STM32_E407_SRC_H -#define __BOARDS_OLIMEX_STM32_E407_SRC_H +#ifndef __BOARDS_ARM_OLIMEX_STM32_E407_SRC_H +#define __BOARDS_ARM_OLIMEX_STM32_E407_SRC_H /**************************************************************************** * Included Files @@ -381,4 +381,4 @@ int stm32_mrf24j40_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_OLIMEX_STM32_E407_SRC_INTERNAL_H */ +#endif /* __BOARDS_ARM_OLIMEX_STM32_E407_SRC_INTERNAL_H */ diff --git a/boards/olimex-stm32-e407/src/stm32_adc.c b/boards/arm/olimex-stm32-e407/src/stm32_adc.c similarity index 100% rename from boards/olimex-stm32-e407/src/stm32_adc.c rename to boards/arm/olimex-stm32-e407/src/stm32_adc.c diff --git a/boards/olimex-stm32-e407/src/stm32_appinit.c b/boards/arm/olimex-stm32-e407/src/stm32_appinit.c similarity index 100% rename from boards/olimex-stm32-e407/src/stm32_appinit.c rename to boards/arm/olimex-stm32-e407/src/stm32_appinit.c diff --git a/boards/olimex-stm32-e407/src/stm32_autoleds.c b/boards/arm/olimex-stm32-e407/src/stm32_autoleds.c similarity index 100% rename from boards/olimex-stm32-e407/src/stm32_autoleds.c rename to boards/arm/olimex-stm32-e407/src/stm32_autoleds.c diff --git a/boards/olimex-stm32-e407/src/stm32_bmp180.c b/boards/arm/olimex-stm32-e407/src/stm32_bmp180.c similarity index 100% rename from boards/olimex-stm32-e407/src/stm32_bmp180.c rename to boards/arm/olimex-stm32-e407/src/stm32_bmp180.c diff --git a/boards/olimex-stm32-e407/src/stm32_boot.c b/boards/arm/olimex-stm32-e407/src/stm32_boot.c similarity index 100% rename from boards/olimex-stm32-e407/src/stm32_boot.c rename to boards/arm/olimex-stm32-e407/src/stm32_boot.c diff --git a/boards/olimex-stm32-e407/src/stm32_bringup.c b/boards/arm/olimex-stm32-e407/src/stm32_bringup.c similarity index 100% rename from boards/olimex-stm32-e407/src/stm32_bringup.c rename to boards/arm/olimex-stm32-e407/src/stm32_bringup.c diff --git a/boards/olimex-stm32-e407/src/stm32_buttons.c b/boards/arm/olimex-stm32-e407/src/stm32_buttons.c similarity index 100% rename from boards/olimex-stm32-e407/src/stm32_buttons.c rename to boards/arm/olimex-stm32-e407/src/stm32_buttons.c diff --git a/boards/olimex-stm32-e407/src/stm32_can.c b/boards/arm/olimex-stm32-e407/src/stm32_can.c similarity index 100% rename from boards/olimex-stm32-e407/src/stm32_can.c rename to boards/arm/olimex-stm32-e407/src/stm32_can.c diff --git a/boards/olimex-stm32-e407/src/stm32_dac.c b/boards/arm/olimex-stm32-e407/src/stm32_dac.c similarity index 100% rename from boards/olimex-stm32-e407/src/stm32_dac.c rename to boards/arm/olimex-stm32-e407/src/stm32_dac.c diff --git a/boards/olimex-stm32-e407/src/stm32_ina219.c b/boards/arm/olimex-stm32-e407/src/stm32_ina219.c similarity index 100% rename from boards/olimex-stm32-e407/src/stm32_ina219.c rename to boards/arm/olimex-stm32-e407/src/stm32_ina219.c diff --git a/boards/olimex-stm32-e407/src/stm32_mrf24j40.c b/boards/arm/olimex-stm32-e407/src/stm32_mrf24j40.c similarity index 100% rename from boards/olimex-stm32-e407/src/stm32_mrf24j40.c rename to boards/arm/olimex-stm32-e407/src/stm32_mrf24j40.c diff --git a/boards/olimex-stm32-e407/src/stm32_spi.c b/boards/arm/olimex-stm32-e407/src/stm32_spi.c similarity index 100% rename from boards/olimex-stm32-e407/src/stm32_spi.c rename to boards/arm/olimex-stm32-e407/src/stm32_spi.c diff --git a/boards/olimex-stm32-e407/src/stm32_timer.c b/boards/arm/olimex-stm32-e407/src/stm32_timer.c similarity index 100% rename from boards/olimex-stm32-e407/src/stm32_timer.c rename to boards/arm/olimex-stm32-e407/src/stm32_timer.c diff --git a/boards/olimex-stm32-e407/src/stm32_usb.c b/boards/arm/olimex-stm32-e407/src/stm32_usb.c similarity index 100% rename from boards/olimex-stm32-e407/src/stm32_usb.c rename to boards/arm/olimex-stm32-e407/src/stm32_usb.c diff --git a/boards/olimex-stm32-e407/src/stm32_userleds.c b/boards/arm/olimex-stm32-e407/src/stm32_userleds.c similarity index 100% rename from boards/olimex-stm32-e407/src/stm32_userleds.c rename to boards/arm/olimex-stm32-e407/src/stm32_userleds.c diff --git a/boards/olimex-stm32-h405/Kconfig b/boards/arm/olimex-stm32-h405/Kconfig similarity index 100% rename from boards/olimex-stm32-h405/Kconfig rename to boards/arm/olimex-stm32-h405/Kconfig diff --git a/boards/olimex-stm32-h405/README.txt b/boards/arm/olimex-stm32-h405/README.txt similarity index 100% rename from boards/olimex-stm32-h405/README.txt rename to boards/arm/olimex-stm32-h405/README.txt diff --git a/boards/olimex-stm32-h405/configs/usbnsh/defconfig b/boards/arm/olimex-stm32-h405/configs/usbnsh/defconfig similarity index 100% rename from boards/olimex-stm32-h405/configs/usbnsh/defconfig rename to boards/arm/olimex-stm32-h405/configs/usbnsh/defconfig diff --git a/boards/olimex-stm32-h405/include/board.h b/boards/arm/olimex-stm32-h405/include/board.h similarity index 97% rename from boards/olimex-stm32-h405/include/board.h rename to boards/arm/olimex-stm32-h405/include/board.h index 0186ce0860..c04aab00b4 100644 --- a/boards/olimex-stm32-h405/include/board.h +++ b/boards/arm/olimex-stm32-h405/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_OLIMEX_STM32_H405_INCLUDE_BOARD_H -#define __BOARDS_OLIMEX_STM32_H405_INCLUDE_BOARD_H 1 +#ifndef __BOARDS_ARM_OLIMEX_STM32_H405_INCLUDE_BOARD_H +#define __BOARDS_ARM_OLIMEX_STM32_H405_INCLUDE_BOARD_H 1 /************************************************************************************ * Included Files @@ -188,4 +188,4 @@ #define GPIO_CAN2_RX GPIO_CAN1_RX_2 //PB5 #define GPIO_CAN2_TX GPIO_CAN1_TX_2 //PB6 -#endif /* __BOARDS_OLIMEX_STM32_H405_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_OLIMEX_STM32_H405_INCLUDE_BOARD_H */ diff --git a/boards/olimex-stm32-h405/scripts/Make.defs b/boards/arm/olimex-stm32-h405/scripts/Make.defs similarity index 96% rename from boards/olimex-stm32-h405/scripts/Make.defs rename to boards/arm/olimex-stm32-h405/scripts/Make.defs index 461a67ad55..0ebe39ecc2 100644 --- a/boards/olimex-stm32-h405/scripts/Make.defs +++ b/boards/arm/olimex-stm32-h405/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/olimex-stm32-h405/scripts/ld.script b/boards/arm/olimex-stm32-h405/scripts/ld.script similarity index 100% rename from boards/olimex-stm32-h405/scripts/ld.script rename to boards/arm/olimex-stm32-h405/scripts/ld.script diff --git a/boards/olimex-stm32-h405/src/Makefile b/boards/arm/olimex-stm32-h405/src/Makefile similarity index 100% rename from boards/olimex-stm32-h405/src/Makefile rename to boards/arm/olimex-stm32-h405/src/Makefile diff --git a/boards/olimex-stm32-h405/src/olimex-stm32-h405.h b/boards/arm/olimex-stm32-h405/src/olimex-stm32-h405.h similarity index 96% rename from boards/olimex-stm32-h405/src/olimex-stm32-h405.h rename to boards/arm/olimex-stm32-h405/src/olimex-stm32-h405.h index c4e161edc7..c306380f85 100644 --- a/boards/olimex-stm32-h405/src/olimex-stm32-h405.h +++ b/boards/arm/olimex-stm32-h405/src/olimex-stm32-h405.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_OLIMEX_STM32_H405_SRC_H -#define __BOARDS_OLIMEX_STM32_H405_SRC_H +#ifndef __BOARDS_ARM_OLIMEX_STM32_H405_SRC_H +#define __BOARDS_ARM_OLIMEX_STM32_H405_SRC_H /**************************************************************************** * Included Files @@ -113,4 +113,4 @@ int stm32_can_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_OLIMEX_STM32_H405_SRC_H */ +#endif /* __BOARDS_ARM_OLIMEX_STM32_H405_SRC_H */ diff --git a/boards/olimex-stm32-h405/src/stm32_adc.c b/boards/arm/olimex-stm32-h405/src/stm32_adc.c similarity index 100% rename from boards/olimex-stm32-h405/src/stm32_adc.c rename to boards/arm/olimex-stm32-h405/src/stm32_adc.c diff --git a/boards/olimex-stm32-h405/src/stm32_appinit.c b/boards/arm/olimex-stm32-h405/src/stm32_appinit.c similarity index 100% rename from boards/olimex-stm32-h405/src/stm32_appinit.c rename to boards/arm/olimex-stm32-h405/src/stm32_appinit.c diff --git a/boards/olimex-stm32-h405/src/stm32_autoleds.c b/boards/arm/olimex-stm32-h405/src/stm32_autoleds.c similarity index 100% rename from boards/olimex-stm32-h405/src/stm32_autoleds.c rename to boards/arm/olimex-stm32-h405/src/stm32_autoleds.c diff --git a/boards/olimex-stm32-h405/src/stm32_boot.c b/boards/arm/olimex-stm32-h405/src/stm32_boot.c similarity index 100% rename from boards/olimex-stm32-h405/src/stm32_boot.c rename to boards/arm/olimex-stm32-h405/src/stm32_boot.c diff --git a/boards/olimex-stm32-h405/src/stm32_buttons.c b/boards/arm/olimex-stm32-h405/src/stm32_buttons.c similarity index 100% rename from boards/olimex-stm32-h405/src/stm32_buttons.c rename to boards/arm/olimex-stm32-h405/src/stm32_buttons.c diff --git a/boards/olimex-stm32-h405/src/stm32_can.c b/boards/arm/olimex-stm32-h405/src/stm32_can.c similarity index 100% rename from boards/olimex-stm32-h405/src/stm32_can.c rename to boards/arm/olimex-stm32-h405/src/stm32_can.c diff --git a/boards/olimex-stm32-h405/src/stm32_usb.c b/boards/arm/olimex-stm32-h405/src/stm32_usb.c similarity index 100% rename from boards/olimex-stm32-h405/src/stm32_usb.c rename to boards/arm/olimex-stm32-h405/src/stm32_usb.c diff --git a/boards/olimex-stm32-h405/src/stm32_userleds.c b/boards/arm/olimex-stm32-h405/src/stm32_userleds.c similarity index 100% rename from boards/olimex-stm32-h405/src/stm32_userleds.c rename to boards/arm/olimex-stm32-h405/src/stm32_userleds.c diff --git a/boards/olimex-stm32-h407/Kconfig b/boards/arm/olimex-stm32-h407/Kconfig similarity index 100% rename from boards/olimex-stm32-h407/Kconfig rename to boards/arm/olimex-stm32-h407/Kconfig diff --git a/boards/olimex-stm32-h407/README.txt b/boards/arm/olimex-stm32-h407/README.txt similarity index 100% rename from boards/olimex-stm32-h407/README.txt rename to boards/arm/olimex-stm32-h407/README.txt diff --git a/boards/olimex-stm32-h407/configs/nsh/defconfig b/boards/arm/olimex-stm32-h407/configs/nsh/defconfig similarity index 100% rename from boards/olimex-stm32-h407/configs/nsh/defconfig rename to boards/arm/olimex-stm32-h407/configs/nsh/defconfig diff --git a/boards/olimex-stm32-h407/configs/nsh_uext/defconfig b/boards/arm/olimex-stm32-h407/configs/nsh_uext/defconfig similarity index 100% rename from boards/olimex-stm32-h407/configs/nsh_uext/defconfig rename to boards/arm/olimex-stm32-h407/configs/nsh_uext/defconfig diff --git a/boards/olimex-stm32-h407/include/board.h b/boards/arm/olimex-stm32-h407/include/board.h similarity index 98% rename from boards/olimex-stm32-h407/include/board.h rename to boards/arm/olimex-stm32-h407/include/board.h index 2dac665deb..8a22ec6448 100644 --- a/boards/olimex-stm32-h407/include/board.h +++ b/boards/arm/olimex-stm32-h407/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_OLIMEX_STM32_H407_INCLUDE_BOARD_H -#define __BOARDS_OLIMEX_STM32_H407_INCLUDE_BOARD_H 1 +#ifndef __BOARDS_ARM_OLIMEX_STM32_H407_INCLUDE_BOARD_H +#define __BOARDS_ARM_OLIMEX_STM32_H407_INCLUDE_BOARD_H 1 /************************************************************************************ * Included Files @@ -281,4 +281,4 @@ #define DMAMAP_SDIO DMAMAP_SDIO_1 -#endif /* __BOARDS_OLIMEX_STM32_H407_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_OLIMEX_STM32_H407_INCLUDE_BOARD_H */ diff --git a/boards/olimex-stm32-h407/scripts/Make.defs b/boards/arm/olimex-stm32-h407/scripts/Make.defs similarity index 96% rename from boards/olimex-stm32-h407/scripts/Make.defs rename to boards/arm/olimex-stm32-h407/scripts/Make.defs index 8e71502549..8a84e7da73 100644 --- a/boards/olimex-stm32-h407/scripts/Make.defs +++ b/boards/arm/olimex-stm32-h407/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/olimex-stm32-h407/scripts/ld.script b/boards/arm/olimex-stm32-h407/scripts/ld.script similarity index 100% rename from boards/olimex-stm32-h407/scripts/ld.script rename to boards/arm/olimex-stm32-h407/scripts/ld.script diff --git a/boards/nucleo-f091rc/src/.gitignore b/boards/arm/olimex-stm32-h407/src/.gitignore similarity index 100% rename from boards/nucleo-f091rc/src/.gitignore rename to boards/arm/olimex-stm32-h407/src/.gitignore diff --git a/boards/olimex-stm32-h407/src/Makefile b/boards/arm/olimex-stm32-h407/src/Makefile similarity index 100% rename from boards/olimex-stm32-h407/src/Makefile rename to boards/arm/olimex-stm32-h407/src/Makefile diff --git a/boards/olimex-stm32-h407/src/olimex-stm32-h407.h b/boards/arm/olimex-stm32-h407/src/olimex-stm32-h407.h similarity index 98% rename from boards/olimex-stm32-h407/src/olimex-stm32-h407.h rename to boards/arm/olimex-stm32-h407/src/olimex-stm32-h407.h index 069ad71eee..cf907b4c9e 100644 --- a/boards/olimex-stm32-h407/src/olimex-stm32-h407.h +++ b/boards/arm/olimex-stm32-h407/src/olimex-stm32-h407.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_OLIMEX_STM32_H407_SRC_H -#define __BOARDS_OLIMEX_STM32_H407_SRC_H +#ifndef __BOARDS_ARM_OLIMEX_STM32_H407_SRC_H +#define __BOARDS_ARM_OLIMEX_STM32_H407_SRC_H /**************************************************************************** * Included Files @@ -266,4 +266,4 @@ int stm32_can_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_OLIMEX_STM32_H407_SRC_INTERNAL_H */ +#endif /* __BOARDS_ARM_OLIMEX_STM32_H407_SRC_INTERNAL_H */ diff --git a/boards/olimex-stm32-h407/src/stm32_adc.c b/boards/arm/olimex-stm32-h407/src/stm32_adc.c similarity index 100% rename from boards/olimex-stm32-h407/src/stm32_adc.c rename to boards/arm/olimex-stm32-h407/src/stm32_adc.c diff --git a/boards/olimex-stm32-h407/src/stm32_appinit.c b/boards/arm/olimex-stm32-h407/src/stm32_appinit.c similarity index 100% rename from boards/olimex-stm32-h407/src/stm32_appinit.c rename to boards/arm/olimex-stm32-h407/src/stm32_appinit.c diff --git a/boards/olimex-stm32-h407/src/stm32_autoleds.c b/boards/arm/olimex-stm32-h407/src/stm32_autoleds.c similarity index 100% rename from boards/olimex-stm32-h407/src/stm32_autoleds.c rename to boards/arm/olimex-stm32-h407/src/stm32_autoleds.c diff --git a/boards/olimex-stm32-h407/src/stm32_boot.c b/boards/arm/olimex-stm32-h407/src/stm32_boot.c similarity index 100% rename from boards/olimex-stm32-h407/src/stm32_boot.c rename to boards/arm/olimex-stm32-h407/src/stm32_boot.c diff --git a/boards/olimex-stm32-h407/src/stm32_bringup.c b/boards/arm/olimex-stm32-h407/src/stm32_bringup.c similarity index 100% rename from boards/olimex-stm32-h407/src/stm32_bringup.c rename to boards/arm/olimex-stm32-h407/src/stm32_bringup.c diff --git a/boards/olimex-stm32-h407/src/stm32_buttons.c b/boards/arm/olimex-stm32-h407/src/stm32_buttons.c similarity index 100% rename from boards/olimex-stm32-h407/src/stm32_buttons.c rename to boards/arm/olimex-stm32-h407/src/stm32_buttons.c diff --git a/boards/olimex-stm32-h407/src/stm32_can.c b/boards/arm/olimex-stm32-h407/src/stm32_can.c similarity index 100% rename from boards/olimex-stm32-h407/src/stm32_can.c rename to boards/arm/olimex-stm32-h407/src/stm32_can.c diff --git a/boards/olimex-stm32-h407/src/stm32_sdio.c b/boards/arm/olimex-stm32-h407/src/stm32_sdio.c similarity index 100% rename from boards/olimex-stm32-h407/src/stm32_sdio.c rename to boards/arm/olimex-stm32-h407/src/stm32_sdio.c diff --git a/boards/olimex-stm32-h407/src/stm32_usb.c b/boards/arm/olimex-stm32-h407/src/stm32_usb.c similarity index 100% rename from boards/olimex-stm32-h407/src/stm32_usb.c rename to boards/arm/olimex-stm32-h407/src/stm32_usb.c diff --git a/boards/olimex-stm32-h407/src/stm32_userleds.c b/boards/arm/olimex-stm32-h407/src/stm32_userleds.c similarity index 100% rename from boards/olimex-stm32-h407/src/stm32_userleds.c rename to boards/arm/olimex-stm32-h407/src/stm32_userleds.c diff --git a/boards/olimex-stm32-p107/Kconfig b/boards/arm/olimex-stm32-p107/Kconfig similarity index 100% rename from boards/olimex-stm32-p107/Kconfig rename to boards/arm/olimex-stm32-p107/Kconfig diff --git a/boards/olimex-stm32-p107/configs/nsh/defconfig b/boards/arm/olimex-stm32-p107/configs/nsh/defconfig similarity index 100% rename from boards/olimex-stm32-p107/configs/nsh/defconfig rename to boards/arm/olimex-stm32-p107/configs/nsh/defconfig diff --git a/boards/olimex-stm32-p107/include/board.h b/boards/arm/olimex-stm32-p107/include/board.h similarity index 96% rename from boards/olimex-stm32-p107/include/board.h rename to boards/arm/olimex-stm32-p107/include/board.h index 05328c4003..03d82897b6 100644 --- a/boards/olimex-stm32-p107/include/board.h +++ b/boards/arm/olimex-stm32-p107/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_OLIMEX_STM32_P107_INCLUDE_BOARD_H -#define __BOARDS_OLIMEX_STM32_P107_INCLUDE_BOARD_H 1 +#ifndef __BOARDS_ARM_OLIMEX_STM32_P107_INCLUDE_BOARD_H +#define __BOARDS_ARM_OLIMEX_STM32_P107_INCLUDE_BOARD_H 1 /************************************************************************************ * Included Files @@ -117,4 +117,4 @@ # define STM32_PLL_PLL3MUL RCC_CFGR2_PLL3MULx10 /* MCO 5MHz * 10 = 50MHz */ #endif -#endif /* __BOARDS_OLIMEX_STM32_P107_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_OLIMEX_STM32_P107_INCLUDE_BOARD_H */ diff --git a/boards/olimex-stm32-p107/scripts/Make.defs b/boards/arm/olimex-stm32-p107/scripts/Make.defs similarity index 95% rename from boards/olimex-stm32-p107/scripts/Make.defs rename to boards/arm/olimex-stm32-p107/scripts/Make.defs index 9e40a86c73..5c4bd128dd 100644 --- a/boards/olimex-stm32-p107/scripts/Make.defs +++ b/boards/arm/olimex-stm32-p107/scripts/Make.defs @@ -50,7 +50,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y) MKDEP = $(TOPDIR)\tools\mkdeps.exe ARCHINCLUDES = -I. -isystem $(TOPDIR)\include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)\include -isystem $(TOPDIR)\include\cxx - ARCHSCRIPT = -T$(TOPDIR)\boards\$(CONFIG_ARCH_BOARD)\scripts\$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)\boards\$(CONFIG_ARCH)\$(CONFIG_ARCH_BOARD)\scripts\$(LDSCRIPT) else ifeq ($(WINTOOL),y) # Windows-native toolchains @@ -59,13 +59,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif endif diff --git a/boards/olimex-stm32-p107/scripts/ld.script b/boards/arm/olimex-stm32-p107/scripts/ld.script similarity index 100% rename from boards/olimex-stm32-p107/scripts/ld.script rename to boards/arm/olimex-stm32-p107/scripts/ld.script diff --git a/boards/olimex-stm32-p107/scripts/ld.script.dfu b/boards/arm/olimex-stm32-p107/scripts/ld.script.dfu similarity index 100% rename from boards/olimex-stm32-p107/scripts/ld.script.dfu rename to boards/arm/olimex-stm32-p107/scripts/ld.script.dfu diff --git a/boards/nucleo-f446re/src/.gitignore b/boards/arm/olimex-stm32-p107/src/.gitignore similarity index 100% rename from boards/nucleo-f446re/src/.gitignore rename to boards/arm/olimex-stm32-p107/src/.gitignore diff --git a/boards/olimex-stm32-p107/src/Makefile b/boards/arm/olimex-stm32-p107/src/Makefile similarity index 100% rename from boards/olimex-stm32-p107/src/Makefile rename to boards/arm/olimex-stm32-p107/src/Makefile diff --git a/boards/olimex-stm32-p107/src/olimex-stm32-p107.h b/boards/arm/olimex-stm32-p107/src/olimex-stm32-p107.h similarity index 96% rename from boards/olimex-stm32-p107/src/olimex-stm32-p107.h rename to boards/arm/olimex-stm32-p107/src/olimex-stm32-p107.h index b949452b1b..c7f81534a6 100644 --- a/boards/olimex-stm32-p107/src/olimex-stm32-p107.h +++ b/boards/arm/olimex-stm32-p107/src/olimex-stm32-p107.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_OLIMEX_STM32_P107_SRC_H -#define __BOARDS_OLIMEX_STM32_P107_SRC_H +#ifndef __BOARDS_ARM_OLIMEX_STM32_P107_SRC_H +#define __BOARDS_ARM_OLIMEX_STM32_P107_SRC_H /**************************************************************************** * Included Files @@ -98,4 +98,4 @@ int stm32_can_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_OLIMEX_STM32_P107_SRC_H */ +#endif /* __BOARDS_ARM_OLIMEX_STM32_P107_SRC_H */ diff --git a/boards/olimex-stm32-p107/src/stm32_appinit.c b/boards/arm/olimex-stm32-p107/src/stm32_appinit.c similarity index 100% rename from boards/olimex-stm32-p107/src/stm32_appinit.c rename to boards/arm/olimex-stm32-p107/src/stm32_appinit.c diff --git a/boards/olimex-stm32-p107/src/stm32_boot.c b/boards/arm/olimex-stm32-p107/src/stm32_boot.c similarity index 100% rename from boards/olimex-stm32-p107/src/stm32_boot.c rename to boards/arm/olimex-stm32-p107/src/stm32_boot.c diff --git a/boards/olimex-stm32-p107/src/stm32_can.c b/boards/arm/olimex-stm32-p107/src/stm32_can.c similarity index 100% rename from boards/olimex-stm32-p107/src/stm32_can.c rename to boards/arm/olimex-stm32-p107/src/stm32_can.c diff --git a/boards/olimex-stm32-p107/src/stm32_encx24j600.c b/boards/arm/olimex-stm32-p107/src/stm32_encx24j600.c similarity index 100% rename from boards/olimex-stm32-p107/src/stm32_encx24j600.c rename to boards/arm/olimex-stm32-p107/src/stm32_encx24j600.c diff --git a/boards/olimex-stm32-p107/src/stm32_spi.c b/boards/arm/olimex-stm32-p107/src/stm32_spi.c similarity index 100% rename from boards/olimex-stm32-p107/src/stm32_spi.c rename to boards/arm/olimex-stm32-p107/src/stm32_spi.c diff --git a/boards/olimex-stm32-p207/Kconfig b/boards/arm/olimex-stm32-p207/Kconfig similarity index 100% rename from boards/olimex-stm32-p207/Kconfig rename to boards/arm/olimex-stm32-p207/Kconfig diff --git a/boards/olimex-stm32-p207/README.txt b/boards/arm/olimex-stm32-p207/README.txt similarity index 100% rename from boards/olimex-stm32-p207/README.txt rename to boards/arm/olimex-stm32-p207/README.txt diff --git a/boards/olimex-stm32-p207/configs/nsh/defconfig b/boards/arm/olimex-stm32-p207/configs/nsh/defconfig similarity index 100% rename from boards/olimex-stm32-p207/configs/nsh/defconfig rename to boards/arm/olimex-stm32-p207/configs/nsh/defconfig diff --git a/boards/olimex-stm32-p207/include/board.h b/boards/arm/olimex-stm32-p207/include/board.h similarity index 98% rename from boards/olimex-stm32-p207/include/board.h rename to boards/arm/olimex-stm32-p207/include/board.h index 9d0417b6b7..75e142b1ca 100644 --- a/boards/olimex-stm32-p207/include/board.h +++ b/boards/arm/olimex-stm32-p207/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_OLIMEX_STM32_P207_INCLUDE_BOARD_H -#define __BOARDS_OLIMEX_STM32_P207_INCLUDE_BOARD_H 1 +#ifndef __BOARDS_ARM_OLIMEX_STM32_P207_INCLUDE_BOARD_H +#define __BOARDS_ARM_OLIMEX_STM32_P207_INCLUDE_BOARD_H 1 /************************************************************************************ * Included Files @@ -245,4 +245,4 @@ #define GPIO_ETH_RMII_TXD0 GPIO_ETH_RMII_TXD0_2 #define GPIO_ETH_RMII_TXD1 GPIO_ETH_RMII_TXD1_2 -#endif /* __BOARDS_OLIMEX_STM32_P207_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_OLIMEX_STM32_P207_INCLUDE_BOARD_H */ diff --git a/boards/olimex-stm32-p207/scripts/Make.defs b/boards/arm/olimex-stm32-p207/scripts/Make.defs similarity index 96% rename from boards/olimex-stm32-p207/scripts/Make.defs rename to boards/arm/olimex-stm32-p207/scripts/Make.defs index 55eed39bfe..270b7ded37 100644 --- a/boards/olimex-stm32-p207/scripts/Make.defs +++ b/boards/arm/olimex-stm32-p207/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/olimex-stm32-p207/scripts/ld.script b/boards/arm/olimex-stm32-p207/scripts/ld.script similarity index 100% rename from boards/olimex-stm32-p207/scripts/ld.script rename to boards/arm/olimex-stm32-p207/scripts/ld.script diff --git a/boards/olimex-stm32-p207/src/Makefile b/boards/arm/olimex-stm32-p207/src/Makefile similarity index 100% rename from boards/olimex-stm32-p207/src/Makefile rename to boards/arm/olimex-stm32-p207/src/Makefile diff --git a/boards/olimex-stm32-p207/src/olimex-stm32-p207.h b/boards/arm/olimex-stm32-p207/src/olimex-stm32-p207.h similarity index 97% rename from boards/olimex-stm32-p207/src/olimex-stm32-p207.h rename to boards/arm/olimex-stm32-p207/src/olimex-stm32-p207.h index 056677a1cc..dd855edd8e 100644 --- a/boards/olimex-stm32-p207/src/olimex-stm32-p207.h +++ b/boards/arm/olimex-stm32-p207/src/olimex-stm32-p207.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_OLIMEX_STM32_P207_SRC_H -#define __BOARDS_OLIMEX_STM32_P207_SRC_H +#ifndef __BOARDS_ARM_OLIMEX_STM32_P207_SRC_H +#define __BOARDS_ARM_OLIMEX_STM32_P207_SRC_H /**************************************************************************** * Included Files @@ -149,4 +149,4 @@ int stm32_can_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_OLIMEX_STM32_P207_SRC_H */ +#endif /* __BOARDS_ARM_OLIMEX_STM32_P207_SRC_H */ diff --git a/boards/olimex-stm32-p207/src/stm32_adc.c b/boards/arm/olimex-stm32-p207/src/stm32_adc.c similarity index 100% rename from boards/olimex-stm32-p207/src/stm32_adc.c rename to boards/arm/olimex-stm32-p207/src/stm32_adc.c diff --git a/boards/olimex-stm32-p207/src/stm32_appinit.c b/boards/arm/olimex-stm32-p207/src/stm32_appinit.c similarity index 100% rename from boards/olimex-stm32-p207/src/stm32_appinit.c rename to boards/arm/olimex-stm32-p207/src/stm32_appinit.c diff --git a/boards/olimex-stm32-p207/src/stm32_autoleds.c b/boards/arm/olimex-stm32-p207/src/stm32_autoleds.c similarity index 100% rename from boards/olimex-stm32-p207/src/stm32_autoleds.c rename to boards/arm/olimex-stm32-p207/src/stm32_autoleds.c diff --git a/boards/olimex-stm32-p207/src/stm32_boot.c b/boards/arm/olimex-stm32-p207/src/stm32_boot.c similarity index 100% rename from boards/olimex-stm32-p207/src/stm32_boot.c rename to boards/arm/olimex-stm32-p207/src/stm32_boot.c diff --git a/boards/olimex-stm32-p207/src/stm32_buttons.c b/boards/arm/olimex-stm32-p207/src/stm32_buttons.c similarity index 100% rename from boards/olimex-stm32-p207/src/stm32_buttons.c rename to boards/arm/olimex-stm32-p207/src/stm32_buttons.c diff --git a/boards/olimex-stm32-p207/src/stm32_can.c b/boards/arm/olimex-stm32-p207/src/stm32_can.c similarity index 100% rename from boards/olimex-stm32-p207/src/stm32_can.c rename to boards/arm/olimex-stm32-p207/src/stm32_can.c diff --git a/boards/olimex-stm32-p207/src/stm32_usb.c b/boards/arm/olimex-stm32-p207/src/stm32_usb.c similarity index 100% rename from boards/olimex-stm32-p207/src/stm32_usb.c rename to boards/arm/olimex-stm32-p207/src/stm32_usb.c diff --git a/boards/olimex-stm32-p207/src/stm32_userleds.c b/boards/arm/olimex-stm32-p207/src/stm32_userleds.c similarity index 100% rename from boards/olimex-stm32-p207/src/stm32_userleds.c rename to boards/arm/olimex-stm32-p207/src/stm32_userleds.c diff --git a/boards/olimex-stm32-p407/Kconfig b/boards/arm/olimex-stm32-p407/Kconfig similarity index 100% rename from boards/olimex-stm32-p407/Kconfig rename to boards/arm/olimex-stm32-p407/Kconfig diff --git a/boards/olimex-stm32-p407/README.txt b/boards/arm/olimex-stm32-p407/README.txt similarity index 100% rename from boards/olimex-stm32-p407/README.txt rename to boards/arm/olimex-stm32-p407/README.txt diff --git a/boards/olimex-stm32-p407/configs/dhtxx/defconfig b/boards/arm/olimex-stm32-p407/configs/dhtxx/defconfig similarity index 100% rename from boards/olimex-stm32-p407/configs/dhtxx/defconfig rename to boards/arm/olimex-stm32-p407/configs/dhtxx/defconfig diff --git a/boards/olimex-stm32-p407/configs/hidkbd/defconfig b/boards/arm/olimex-stm32-p407/configs/hidkbd/defconfig similarity index 100% rename from boards/olimex-stm32-p407/configs/hidkbd/defconfig rename to boards/arm/olimex-stm32-p407/configs/hidkbd/defconfig diff --git a/boards/olimex-stm32-p407/configs/kelf/Make.defs b/boards/arm/olimex-stm32-p407/configs/kelf/Make.defs similarity index 92% rename from boards/olimex-stm32-p407/configs/kelf/Make.defs rename to boards/arm/olimex-stm32-p407/configs/kelf/Make.defs index 7f6122cc0d..5d6e2b3827 100644 --- a/boards/olimex-stm32-p407/configs/kelf/Make.defs +++ b/boards/arm/olimex-stm32-p407/configs/kelf/Make.defs @@ -44,15 +44,15 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/olimex-stm32-p407/configs/kelf/defconfig b/boards/arm/olimex-stm32-p407/configs/kelf/defconfig similarity index 100% rename from boards/olimex-stm32-p407/configs/kelf/defconfig rename to boards/arm/olimex-stm32-p407/configs/kelf/defconfig diff --git a/boards/olimex-stm32-p407/configs/kmodule/Make.defs b/boards/arm/olimex-stm32-p407/configs/kmodule/Make.defs similarity index 92% rename from boards/olimex-stm32-p407/configs/kmodule/Make.defs rename to boards/arm/olimex-stm32-p407/configs/kmodule/Make.defs index 449b67f0ff..46504254ba 100644 --- a/boards/olimex-stm32-p407/configs/kmodule/Make.defs +++ b/boards/arm/olimex-stm32-p407/configs/kmodule/Make.defs @@ -44,15 +44,15 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/olimex-stm32-p407/configs/kmodule/defconfig b/boards/arm/olimex-stm32-p407/configs/kmodule/defconfig similarity index 100% rename from boards/olimex-stm32-p407/configs/kmodule/defconfig rename to boards/arm/olimex-stm32-p407/configs/kmodule/defconfig diff --git a/boards/olimex-stm32-p407/configs/knsh/Make.defs b/boards/arm/olimex-stm32-p407/configs/knsh/Make.defs similarity index 94% rename from boards/olimex-stm32-p407/configs/knsh/Make.defs rename to boards/arm/olimex-stm32-p407/configs/knsh/Make.defs index 5c2088b1a2..29b81c11ad 100644 --- a/boards/olimex-stm32-p407/configs/knsh/Make.defs +++ b/boards/arm/olimex-stm32-p407/configs/knsh/Make.defs @@ -47,15 +47,15 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) - ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) + ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) endif CC = $(CROSSDEV)gcc diff --git a/boards/olimex-stm32-p407/configs/knsh/defconfig b/boards/arm/olimex-stm32-p407/configs/knsh/defconfig similarity index 100% rename from boards/olimex-stm32-p407/configs/knsh/defconfig rename to boards/arm/olimex-stm32-p407/configs/knsh/defconfig diff --git a/boards/olimex-stm32-p407/configs/module/defconfig b/boards/arm/olimex-stm32-p407/configs/module/defconfig similarity index 100% rename from boards/olimex-stm32-p407/configs/module/defconfig rename to boards/arm/olimex-stm32-p407/configs/module/defconfig diff --git a/boards/olimex-stm32-p407/configs/nsh/defconfig b/boards/arm/olimex-stm32-p407/configs/nsh/defconfig similarity index 100% rename from boards/olimex-stm32-p407/configs/nsh/defconfig rename to boards/arm/olimex-stm32-p407/configs/nsh/defconfig diff --git a/boards/olimex-stm32-p407/configs/zmodem/defconfig b/boards/arm/olimex-stm32-p407/configs/zmodem/defconfig similarity index 100% rename from boards/olimex-stm32-p407/configs/zmodem/defconfig rename to boards/arm/olimex-stm32-p407/configs/zmodem/defconfig diff --git a/boards/olimex-stm32-p407/include/board.h b/boards/arm/olimex-stm32-p407/include/board.h similarity index 98% rename from boards/olimex-stm32-p407/include/board.h rename to boards/arm/olimex-stm32-p407/include/board.h index 83543d5103..4bbd9e6444 100644 --- a/boards/olimex-stm32-p407/include/board.h +++ b/boards/arm/olimex-stm32-p407/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_OLIMEX_STM32_P407_INCLUDE_BOARD_H -#define __BOARDS_OLIMEX_STM32_P407_INCLUDE_BOARD_H 1 +#ifndef __BOARDS_ARM_OLIMEX_STM32_P407_INCLUDE_BOARD_H +#define __BOARDS_ARM_OLIMEX_STM32_P407_INCLUDE_BOARD_H 1 /************************************************************************************ * Included Files @@ -327,4 +327,4 @@ #define DMAMAP_USART6_RX DMAMAP_USART6_RX_1 #define DMAMAP_USART6_TX DMAMAP_USART6_TX_1 -#endif /* __BOARDS_OLIMEX_STM32_P407_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_OLIMEX_STM32_P407_INCLUDE_BOARD_H */ diff --git a/boards/olimex-stm32-p407/kernel/.gitignore b/boards/arm/olimex-stm32-p407/kernel/.gitignore similarity index 100% rename from boards/olimex-stm32-p407/kernel/.gitignore rename to boards/arm/olimex-stm32-p407/kernel/.gitignore diff --git a/boards/olimex-stm32-p407/kernel/Makefile b/boards/arm/olimex-stm32-p407/kernel/Makefile similarity index 100% rename from boards/olimex-stm32-p407/kernel/Makefile rename to boards/arm/olimex-stm32-p407/kernel/Makefile diff --git a/boards/olimex-stm32-p407/kernel/stm32_userspace.c b/boards/arm/olimex-stm32-p407/kernel/stm32_userspace.c similarity index 100% rename from boards/olimex-stm32-p407/kernel/stm32_userspace.c rename to boards/arm/olimex-stm32-p407/kernel/stm32_userspace.c diff --git a/boards/olimex-stm32-p407/scripts/Make.defs b/boards/arm/olimex-stm32-p407/scripts/Make.defs similarity index 97% rename from boards/olimex-stm32-p407/scripts/Make.defs rename to boards/arm/olimex-stm32-p407/scripts/Make.defs index 4ec0a956fb..cd838c7156 100644 --- a/boards/olimex-stm32-p407/scripts/Make.defs +++ b/boards/arm/olimex-stm32-p407/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/olimex-stm32-p407/scripts/flash.ld b/boards/arm/olimex-stm32-p407/scripts/flash.ld similarity index 100% rename from boards/olimex-stm32-p407/scripts/flash.ld rename to boards/arm/olimex-stm32-p407/scripts/flash.ld diff --git a/boards/olimex-stm32-p407/scripts/kernel-space.ld b/boards/arm/olimex-stm32-p407/scripts/kernel-space.ld similarity index 100% rename from boards/olimex-stm32-p407/scripts/kernel-space.ld rename to boards/arm/olimex-stm32-p407/scripts/kernel-space.ld diff --git a/boards/olimex-stm32-p407/scripts/memory.ld b/boards/arm/olimex-stm32-p407/scripts/memory.ld similarity index 100% rename from boards/olimex-stm32-p407/scripts/memory.ld rename to boards/arm/olimex-stm32-p407/scripts/memory.ld diff --git a/boards/olimex-stm32-p407/scripts/user-space.ld b/boards/arm/olimex-stm32-p407/scripts/user-space.ld similarity index 100% rename from boards/olimex-stm32-p407/scripts/user-space.ld rename to boards/arm/olimex-stm32-p407/scripts/user-space.ld diff --git a/boards/olimex-stm32-p407/src/Makefile b/boards/arm/olimex-stm32-p407/src/Makefile similarity index 100% rename from boards/olimex-stm32-p407/src/Makefile rename to boards/arm/olimex-stm32-p407/src/Makefile diff --git a/boards/olimex-stm32-p407/src/olimex-stm32-p407.h b/boards/arm/olimex-stm32-p407/src/olimex-stm32-p407.h similarity index 98% rename from boards/olimex-stm32-p407/src/olimex-stm32-p407.h rename to boards/arm/olimex-stm32-p407/src/olimex-stm32-p407.h index d910a15c93..82f776ff0b 100644 --- a/boards/olimex-stm32-p407/src/olimex-stm32-p407.h +++ b/boards/arm/olimex-stm32-p407/src/olimex-stm32-p407.h @@ -38,8 +38,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_OLIMEX_STM32_P407_SRC_H -#define __BOARDS_OLIMEX_STM32_P407_SRC_H +#ifndef __BOARDS_ARM_OLIMEX_STM32_P407_SRC_H +#define __BOARDS_ARM_OLIMEX_STM32_P407_SRC_H /**************************************************************************** * Included Files @@ -308,4 +308,4 @@ int stm32_dhtxx_initialize(FAR const char *devpath); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_OLIMEX_STM32_P407_SRC_H */ +#endif /* __BOARDS_ARM_OLIMEX_STM32_P407_SRC_H */ diff --git a/boards/olimex-stm32-p407/src/stm32_adc.c b/boards/arm/olimex-stm32-p407/src/stm32_adc.c similarity index 100% rename from boards/olimex-stm32-p407/src/stm32_adc.c rename to boards/arm/olimex-stm32-p407/src/stm32_adc.c diff --git a/boards/olimex-stm32-p407/src/stm32_appinit.c b/boards/arm/olimex-stm32-p407/src/stm32_appinit.c similarity index 100% rename from boards/olimex-stm32-p407/src/stm32_appinit.c rename to boards/arm/olimex-stm32-p407/src/stm32_appinit.c diff --git a/boards/olimex-stm32-p407/src/stm32_autoleds.c b/boards/arm/olimex-stm32-p407/src/stm32_autoleds.c similarity index 100% rename from boards/olimex-stm32-p407/src/stm32_autoleds.c rename to boards/arm/olimex-stm32-p407/src/stm32_autoleds.c diff --git a/boards/olimex-stm32-p407/src/stm32_boot.c b/boards/arm/olimex-stm32-p407/src/stm32_boot.c similarity index 100% rename from boards/olimex-stm32-p407/src/stm32_boot.c rename to boards/arm/olimex-stm32-p407/src/stm32_boot.c diff --git a/boards/olimex-stm32-p407/src/stm32_bringup.c b/boards/arm/olimex-stm32-p407/src/stm32_bringup.c similarity index 100% rename from boards/olimex-stm32-p407/src/stm32_bringup.c rename to boards/arm/olimex-stm32-p407/src/stm32_bringup.c diff --git a/boards/olimex-stm32-p407/src/stm32_buttons.c b/boards/arm/olimex-stm32-p407/src/stm32_buttons.c similarity index 100% rename from boards/olimex-stm32-p407/src/stm32_buttons.c rename to boards/arm/olimex-stm32-p407/src/stm32_buttons.c diff --git a/boards/olimex-stm32-p407/src/stm32_can.c b/boards/arm/olimex-stm32-p407/src/stm32_can.c similarity index 100% rename from boards/olimex-stm32-p407/src/stm32_can.c rename to boards/arm/olimex-stm32-p407/src/stm32_can.c diff --git a/boards/olimex-stm32-p407/src/stm32_dhtxx.c b/boards/arm/olimex-stm32-p407/src/stm32_dhtxx.c similarity index 100% rename from boards/olimex-stm32-p407/src/stm32_dhtxx.c rename to boards/arm/olimex-stm32-p407/src/stm32_dhtxx.c diff --git a/boards/olimex-stm32-p407/src/stm32_sram.c b/boards/arm/olimex-stm32-p407/src/stm32_sram.c similarity index 100% rename from boards/olimex-stm32-p407/src/stm32_sram.c rename to boards/arm/olimex-stm32-p407/src/stm32_sram.c diff --git a/boards/olimex-stm32-p407/src/stm32_usb.c b/boards/arm/olimex-stm32-p407/src/stm32_usb.c similarity index 100% rename from boards/olimex-stm32-p407/src/stm32_usb.c rename to boards/arm/olimex-stm32-p407/src/stm32_usb.c diff --git a/boards/olimex-stm32-p407/src/stm32_userleds.c b/boards/arm/olimex-stm32-p407/src/stm32_userleds.c similarity index 100% rename from boards/olimex-stm32-p407/src/stm32_userleds.c rename to boards/arm/olimex-stm32-p407/src/stm32_userleds.c diff --git a/boards/olimex-strp711/Kconfig b/boards/arm/olimex-strp711/Kconfig similarity index 100% rename from boards/olimex-strp711/Kconfig rename to boards/arm/olimex-strp711/Kconfig diff --git a/boards/olimex-strp711/README.txt b/boards/arm/olimex-strp711/README.txt similarity index 100% rename from boards/olimex-strp711/README.txt rename to boards/arm/olimex-strp711/README.txt diff --git a/boards/olimex-strp711/configs/nettest/defconfig b/boards/arm/olimex-strp711/configs/nettest/defconfig similarity index 100% rename from boards/olimex-strp711/configs/nettest/defconfig rename to boards/arm/olimex-strp711/configs/nettest/defconfig diff --git a/boards/olimex-strp711/configs/nsh/defconfig b/boards/arm/olimex-strp711/configs/nsh/defconfig similarity index 100% rename from boards/olimex-strp711/configs/nsh/defconfig rename to boards/arm/olimex-strp711/configs/nsh/defconfig diff --git a/boards/olimex-strp711/include/board.h b/boards/arm/olimex-strp711/include/board.h similarity index 100% rename from boards/olimex-strp711/include/board.h rename to boards/arm/olimex-strp711/include/board.h diff --git a/boards/olimex-strp711/scripts/Make.defs b/boards/arm/olimex-strp711/scripts/Make.defs similarity index 97% rename from boards/olimex-strp711/scripts/Make.defs rename to boards/arm/olimex-strp711/scripts/Make.defs index 8ab4a421fc..731a529ea8 100644 --- a/boards/olimex-strp711/scripts/Make.defs +++ b/boards/arm/olimex-strp711/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/olimex-strp711/scripts/ld.script b/boards/arm/olimex-strp711/scripts/ld.script similarity index 100% rename from boards/olimex-strp711/scripts/ld.script rename to boards/arm/olimex-strp711/scripts/ld.script diff --git a/boards/olimex-strp711/scripts/oocd-reset b/boards/arm/olimex-strp711/scripts/oocd-reset similarity index 100% rename from boards/olimex-strp711/scripts/oocd-reset rename to boards/arm/olimex-strp711/scripts/oocd-reset diff --git a/boards/olimex-strp711/scripts/oocd.sh b/boards/arm/olimex-strp711/scripts/oocd.sh similarity index 100% rename from boards/olimex-strp711/scripts/oocd.sh rename to boards/arm/olimex-strp711/scripts/oocd.sh diff --git a/boards/olimex-strp711/scripts/oocd_flash.script b/boards/arm/olimex-strp711/scripts/oocd_flash.script similarity index 100% rename from boards/olimex-strp711/scripts/oocd_flash.script rename to boards/arm/olimex-strp711/scripts/oocd_flash.script diff --git a/boards/olimex-strp711/scripts/oocd_ft2xx.cfg b/boards/arm/olimex-strp711/scripts/oocd_ft2xx.cfg similarity index 100% rename from boards/olimex-strp711/scripts/oocd_ft2xx.cfg rename to boards/arm/olimex-strp711/scripts/oocd_ft2xx.cfg diff --git a/boards/olimex-strp711/scripts/oocd_wiggler.cfg b/boards/arm/olimex-strp711/scripts/oocd_wiggler.cfg similarity index 100% rename from boards/olimex-strp711/scripts/oocd_wiggler.cfg rename to boards/arm/olimex-strp711/scripts/oocd_wiggler.cfg diff --git a/boards/olimex-strp711/scripts/usb-driver.txt b/boards/arm/olimex-strp711/scripts/usb-driver.txt similarity index 100% rename from boards/olimex-strp711/scripts/usb-driver.txt rename to boards/arm/olimex-strp711/scripts/usb-driver.txt diff --git a/boards/nucleo-h743zi/src/.gitignore b/boards/arm/olimex-strp711/src/.gitignore similarity index 100% rename from boards/nucleo-h743zi/src/.gitignore rename to boards/arm/olimex-strp711/src/.gitignore diff --git a/boards/olimex-strp711/src/Makefile b/boards/arm/olimex-strp711/src/Makefile similarity index 100% rename from boards/olimex-strp711/src/Makefile rename to boards/arm/olimex-strp711/src/Makefile diff --git a/boards/olimex-strp711/src/str71_appinit.c b/boards/arm/olimex-strp711/src/str71_appinit.c similarity index 100% rename from boards/olimex-strp711/src/str71_appinit.c rename to boards/arm/olimex-strp711/src/str71_appinit.c diff --git a/boards/olimex-strp711/src/str71_buttons.c b/boards/arm/olimex-strp711/src/str71_buttons.c similarity index 100% rename from boards/olimex-strp711/src/str71_buttons.c rename to boards/arm/olimex-strp711/src/str71_buttons.c diff --git a/boards/olimex-strp711/src/str71_enc28j60.c b/boards/arm/olimex-strp711/src/str71_enc28j60.c similarity index 100% rename from boards/olimex-strp711/src/str71_enc28j60.c rename to boards/arm/olimex-strp711/src/str71_enc28j60.c diff --git a/boards/olimex-strp711/src/str71_leds.c b/boards/arm/olimex-strp711/src/str71_leds.c similarity index 100% rename from boards/olimex-strp711/src/str71_leds.c rename to boards/arm/olimex-strp711/src/str71_leds.c diff --git a/boards/olimex-strp711/src/str71_spi.c b/boards/arm/olimex-strp711/src/str71_spi.c similarity index 100% rename from boards/olimex-strp711/src/str71_spi.c rename to boards/arm/olimex-strp711/src/str71_spi.c diff --git a/boards/olimexino-stm32/Kconfig b/boards/arm/olimexino-stm32/Kconfig similarity index 100% rename from boards/olimexino-stm32/Kconfig rename to boards/arm/olimexino-stm32/Kconfig diff --git a/boards/olimexino-stm32/configs/can/defconfig b/boards/arm/olimexino-stm32/configs/can/defconfig similarity index 100% rename from boards/olimexino-stm32/configs/can/defconfig rename to boards/arm/olimexino-stm32/configs/can/defconfig diff --git a/boards/olimexino-stm32/configs/composite/defconfig b/boards/arm/olimexino-stm32/configs/composite/defconfig similarity index 100% rename from boards/olimexino-stm32/configs/composite/defconfig rename to boards/arm/olimexino-stm32/configs/composite/defconfig diff --git a/boards/olimexino-stm32/configs/nsh/defconfig b/boards/arm/olimexino-stm32/configs/nsh/defconfig similarity index 100% rename from boards/olimexino-stm32/configs/nsh/defconfig rename to boards/arm/olimexino-stm32/configs/nsh/defconfig diff --git a/boards/olimexino-stm32/configs/smallnsh/defconfig b/boards/arm/olimexino-stm32/configs/smallnsh/defconfig similarity index 100% rename from boards/olimexino-stm32/configs/smallnsh/defconfig rename to boards/arm/olimexino-stm32/configs/smallnsh/defconfig diff --git a/boards/olimexino-stm32/configs/tiny/defconfig b/boards/arm/olimexino-stm32/configs/tiny/defconfig similarity index 100% rename from boards/olimexino-stm32/configs/tiny/defconfig rename to boards/arm/olimexino-stm32/configs/tiny/defconfig diff --git a/boards/olimexino-stm32/include/board.h b/boards/arm/olimexino-stm32/include/board.h similarity index 97% rename from boards/olimexino-stm32/include/board.h rename to boards/arm/olimexino-stm32/include/board.h index 3958e3a296..32f635f39d 100644 --- a/boards/olimexino-stm32/include/board.h +++ b/boards/arm/olimexino-stm32/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_OLIMEXINO_STM32_INCLUDE_BOARD_H -#define __BOARDS_OLIMEXINO_STM32_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_OLIMEXINO_STM32_INCLUDE_BOARD_H +#define __BOARDS_ARM_OLIMEXINO_STM32_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -174,4 +174,4 @@ * be used by other board-specific logic. */ -#endif /* __BOARDS_OLIMEXINO_STM32_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_OLIMEXINO_STM32_INCLUDE_BOARD_H */ diff --git a/boards/olimexino-stm32/scripts/Make.defs b/boards/arm/olimexino-stm32/scripts/Make.defs similarity index 95% rename from boards/olimexino-stm32/scripts/Make.defs rename to boards/arm/olimexino-stm32/scripts/Make.defs index b753c8a002..e12a0b4acd 100644 --- a/boards/olimexino-stm32/scripts/Make.defs +++ b/boards/arm/olimexino-stm32/scripts/Make.defs @@ -50,7 +50,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y) MKDEP = $(TOPDIR)\tools\mkdeps.exe ARCHINCLUDES = -I. -isystem $(TOPDIR)\include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)\include -isystem $(TOPDIR)\include\cxx - ARCHSCRIPT = -T$(TOPDIR)\boards\$(CONFIG_ARCH_BOARD)\scripts\$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)\boards\$(CONFIG_ARCH)\$(CONFIG_ARCH_BOARD)\scripts\$(LDSCRIPT) else ifeq ($(WINTOOL),y) # Windows-native toolchains @@ -59,13 +59,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif endif diff --git a/boards/olimexino-stm32/scripts/ld.script b/boards/arm/olimexino-stm32/scripts/ld.script similarity index 100% rename from boards/olimexino-stm32/scripts/ld.script rename to boards/arm/olimexino-stm32/scripts/ld.script diff --git a/boards/olimexino-stm32/scripts/ld.script.dfu b/boards/arm/olimexino-stm32/scripts/ld.script.dfu similarity index 100% rename from boards/olimexino-stm32/scripts/ld.script.dfu rename to boards/arm/olimexino-stm32/scripts/ld.script.dfu diff --git a/boards/nucleo-l452re/src/.gitignore b/boards/arm/olimexino-stm32/src/.gitignore similarity index 100% rename from boards/nucleo-l452re/src/.gitignore rename to boards/arm/olimexino-stm32/src/.gitignore diff --git a/boards/olimexino-stm32/src/Makefile b/boards/arm/olimexino-stm32/src/Makefile similarity index 100% rename from boards/olimexino-stm32/src/Makefile rename to boards/arm/olimexino-stm32/src/Makefile diff --git a/boards/olimexino-stm32/src/olimexino-stm32.h b/boards/arm/olimexino-stm32/src/olimexino-stm32.h similarity index 98% rename from boards/olimexino-stm32/src/olimexino-stm32.h rename to boards/arm/olimexino-stm32/src/olimexino-stm32.h index 79a8fc07f0..3b0e03dccc 100644 --- a/boards/olimexino-stm32/src/olimexino-stm32.h +++ b/boards/arm/olimexino-stm32/src/olimexino-stm32.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_OLIMEXINO_STM32_SRC_OLIMEXINO_STM32_H -#define __BOARDS_OLIMEXINO_STM32_SRC_OLIMEXINO_STM32_H +#ifndef __BOARDS_ARM_OLIMEXINO_STM32_SRC_OLIMEXINO_STM32_H +#define __BOARDS_ARM_OLIMEXINO_STM32_SRC_OLIMEXINO_STM32_H /************************************************************************************ * Included Files @@ -229,4 +229,4 @@ int stm32_can_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_OLIMEXINO_STM32_SRC_OLIMEXINO_STM32_H */ +#endif /* __BOARDS_ARM_OLIMEXINO_STM32_SRC_OLIMEXINO_STM32_H */ diff --git a/boards/olimexino-stm32/src/stm32_appinit.c b/boards/arm/olimexino-stm32/src/stm32_appinit.c similarity index 100% rename from boards/olimexino-stm32/src/stm32_appinit.c rename to boards/arm/olimexino-stm32/src/stm32_appinit.c diff --git a/boards/olimexino-stm32/src/stm32_boot.c b/boards/arm/olimexino-stm32/src/stm32_boot.c similarity index 100% rename from boards/olimexino-stm32/src/stm32_boot.c rename to boards/arm/olimexino-stm32/src/stm32_boot.c diff --git a/boards/olimexino-stm32/src/stm32_buttons.c b/boards/arm/olimexino-stm32/src/stm32_buttons.c similarity index 100% rename from boards/olimexino-stm32/src/stm32_buttons.c rename to boards/arm/olimexino-stm32/src/stm32_buttons.c diff --git a/boards/olimexino-stm32/src/stm32_can.c b/boards/arm/olimexino-stm32/src/stm32_can.c similarity index 100% rename from boards/olimexino-stm32/src/stm32_can.c rename to boards/arm/olimexino-stm32/src/stm32_can.c diff --git a/boards/olimexino-stm32/src/stm32_composite.c b/boards/arm/olimexino-stm32/src/stm32_composite.c similarity index 100% rename from boards/olimexino-stm32/src/stm32_composite.c rename to boards/arm/olimexino-stm32/src/stm32_composite.c diff --git a/boards/olimexino-stm32/src/stm32_leds.c b/boards/arm/olimexino-stm32/src/stm32_leds.c similarity index 100% rename from boards/olimexino-stm32/src/stm32_leds.c rename to boards/arm/olimexino-stm32/src/stm32_leds.c diff --git a/boards/olimexino-stm32/src/stm32_spi.c b/boards/arm/olimexino-stm32/src/stm32_spi.c similarity index 100% rename from boards/olimexino-stm32/src/stm32_spi.c rename to boards/arm/olimexino-stm32/src/stm32_spi.c diff --git a/boards/olimexino-stm32/src/stm32_usbdev.c b/boards/arm/olimexino-stm32/src/stm32_usbdev.c similarity index 100% rename from boards/olimexino-stm32/src/stm32_usbdev.c rename to boards/arm/olimexino-stm32/src/stm32_usbdev.c diff --git a/boards/olimexino-stm32/src/stm32_usbmsc.c b/boards/arm/olimexino-stm32/src/stm32_usbmsc.c similarity index 100% rename from boards/olimexino-stm32/src/stm32_usbmsc.c rename to boards/arm/olimexino-stm32/src/stm32_usbmsc.c diff --git a/boards/omnibusf4/Kconfig b/boards/arm/omnibusf4/Kconfig similarity index 100% rename from boards/omnibusf4/Kconfig rename to boards/arm/omnibusf4/Kconfig diff --git a/boards/omnibusf4/README.txt b/boards/arm/omnibusf4/README.txt similarity index 100% rename from boards/omnibusf4/README.txt rename to boards/arm/omnibusf4/README.txt diff --git a/boards/omnibusf4/configs/nsh/defconfig b/boards/arm/omnibusf4/configs/nsh/defconfig similarity index 100% rename from boards/omnibusf4/configs/nsh/defconfig rename to boards/arm/omnibusf4/configs/nsh/defconfig diff --git a/boards/omnibusf4/include/board.h b/boards/arm/omnibusf4/include/board.h similarity index 98% rename from boards/omnibusf4/include/board.h rename to boards/arm/omnibusf4/include/board.h index 74d394475a..4d18efe2a7 100644 --- a/boards/omnibusf4/include/board.h +++ b/boards/arm/omnibusf4/include/board.h @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_OMNIBUSF4_INCLUDE_BOARD_H -#define __CONFIG_OMNIBUSF4_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_OMNIBUSF4_INCLUDE_BOARD_H +#define __BOARDS_ARM_OMNIBUSF4_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -265,4 +265,4 @@ #define GPIO_I2C1_SDA GPIO_I2C1_SDA_2 #endif -#endif /* __CONFIG_OMNIBUSF4_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_OMNIBUSF4_INCLUDE_BOARD_H */ diff --git a/boards/omnibusf4/kernel/.gitignore b/boards/arm/omnibusf4/kernel/.gitignore similarity index 100% rename from boards/omnibusf4/kernel/.gitignore rename to boards/arm/omnibusf4/kernel/.gitignore diff --git a/boards/omnibusf4/kernel/Makefile b/boards/arm/omnibusf4/kernel/Makefile similarity index 100% rename from boards/omnibusf4/kernel/Makefile rename to boards/arm/omnibusf4/kernel/Makefile diff --git a/boards/omnibusf4/kernel/stm32_userspace.c b/boards/arm/omnibusf4/kernel/stm32_userspace.c similarity index 100% rename from boards/omnibusf4/kernel/stm32_userspace.c rename to boards/arm/omnibusf4/kernel/stm32_userspace.c diff --git a/boards/omnibusf4/scripts/Make.defs b/boards/arm/omnibusf4/scripts/Make.defs similarity index 94% rename from boards/omnibusf4/scripts/Make.defs rename to boards/arm/omnibusf4/scripts/Make.defs index a9ef16b702..9709a42c3f 100644 --- a/boards/omnibusf4/scripts/Make.defs +++ b/boards/arm/omnibusf4/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc @@ -112,9 +112,9 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif diff --git a/boards/omnibusf4/scripts/gnu-elf.ld b/boards/arm/omnibusf4/scripts/gnu-elf.ld similarity index 100% rename from boards/omnibusf4/scripts/gnu-elf.ld rename to boards/arm/omnibusf4/scripts/gnu-elf.ld diff --git a/boards/omnibusf4/scripts/kernel-space.ld b/boards/arm/omnibusf4/scripts/kernel-space.ld similarity index 100% rename from boards/omnibusf4/scripts/kernel-space.ld rename to boards/arm/omnibusf4/scripts/kernel-space.ld diff --git a/boards/omnibusf4/scripts/ld.script b/boards/arm/omnibusf4/scripts/ld.script similarity index 100% rename from boards/omnibusf4/scripts/ld.script rename to boards/arm/omnibusf4/scripts/ld.script diff --git a/boards/omnibusf4/scripts/memory.ld b/boards/arm/omnibusf4/scripts/memory.ld similarity index 100% rename from boards/omnibusf4/scripts/memory.ld rename to boards/arm/omnibusf4/scripts/memory.ld diff --git a/boards/omnibusf4/scripts/user-space.ld b/boards/arm/omnibusf4/scripts/user-space.ld similarity index 100% rename from boards/omnibusf4/scripts/user-space.ld rename to boards/arm/omnibusf4/scripts/user-space.ld diff --git a/boards/nucleo-l496zg/src/.gitignore b/boards/arm/omnibusf4/src/.gitignore similarity index 100% rename from boards/nucleo-l496zg/src/.gitignore rename to boards/arm/omnibusf4/src/.gitignore diff --git a/boards/omnibusf4/src/Makefile b/boards/arm/omnibusf4/src/Makefile similarity index 100% rename from boards/omnibusf4/src/Makefile rename to boards/arm/omnibusf4/src/Makefile diff --git a/boards/omnibusf4/src/omnibusf4.h b/boards/arm/omnibusf4/src/omnibusf4.h similarity index 98% rename from boards/omnibusf4/src/omnibusf4.h rename to boards/arm/omnibusf4/src/omnibusf4.h index 6a7a2dc2be..4bb23ea046 100644 --- a/boards/omnibusf4/src/omnibusf4.h +++ b/boards/arm/omnibusf4/src/omnibusf4.h @@ -36,8 +36,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_OMNIBUSF4_SRC_OMNIBUSF4_H -#define __BOARDS_OMNIBUSF4_SRC_OMNIBUSF4_H +#ifndef __BOARDS_ARM_OMNIBUSF4_SRC_OMNIBUSF4_H +#define __BOARDS_ARM_OMNIBUSF4_SRC_OMNIBUSF4_H /**************************************************************************** * Included Files @@ -211,4 +211,4 @@ int stm32_timer_driver_setup(FAR const char *devpath, int timer); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_OMNIBUSF4_SRC_OMNIBUSF4_H */ +#endif /* __BOARDS_ARM_OMNIBUSF4_SRC_OMNIBUSF4_H */ diff --git a/boards/omnibusf4/src/stm32_appinit.c b/boards/arm/omnibusf4/src/stm32_appinit.c similarity index 100% rename from boards/omnibusf4/src/stm32_appinit.c rename to boards/arm/omnibusf4/src/stm32_appinit.c diff --git a/boards/omnibusf4/src/stm32_boot.c b/boards/arm/omnibusf4/src/stm32_boot.c similarity index 100% rename from boards/omnibusf4/src/stm32_boot.c rename to boards/arm/omnibusf4/src/stm32_boot.c diff --git a/boards/omnibusf4/src/stm32_bringup.c b/boards/arm/omnibusf4/src/stm32_bringup.c similarity index 100% rename from boards/omnibusf4/src/stm32_bringup.c rename to boards/arm/omnibusf4/src/stm32_bringup.c diff --git a/boards/omnibusf4/src/stm32_critmon.c b/boards/arm/omnibusf4/src/stm32_critmon.c similarity index 100% rename from boards/omnibusf4/src/stm32_critmon.c rename to boards/arm/omnibusf4/src/stm32_critmon.c diff --git a/boards/omnibusf4/src/stm32_idle.c b/boards/arm/omnibusf4/src/stm32_idle.c similarity index 100% rename from boards/omnibusf4/src/stm32_idle.c rename to boards/arm/omnibusf4/src/stm32_idle.c diff --git a/boards/omnibusf4/src/stm32_ioctl.c b/boards/arm/omnibusf4/src/stm32_ioctl.c similarity index 100% rename from boards/omnibusf4/src/stm32_ioctl.c rename to boards/arm/omnibusf4/src/stm32_ioctl.c diff --git a/boards/omnibusf4/src/stm32_max7456.c b/boards/arm/omnibusf4/src/stm32_max7456.c similarity index 100% rename from boards/omnibusf4/src/stm32_max7456.c rename to boards/arm/omnibusf4/src/stm32_max7456.c diff --git a/boards/omnibusf4/src/stm32_mmcsd.c b/boards/arm/omnibusf4/src/stm32_mmcsd.c similarity index 100% rename from boards/omnibusf4/src/stm32_mmcsd.c rename to boards/arm/omnibusf4/src/stm32_mmcsd.c diff --git a/boards/omnibusf4/src/stm32_mpu6000.c b/boards/arm/omnibusf4/src/stm32_mpu6000.c similarity index 100% rename from boards/omnibusf4/src/stm32_mpu6000.c rename to boards/arm/omnibusf4/src/stm32_mpu6000.c diff --git a/boards/omnibusf4/src/stm32_netinit.c b/boards/arm/omnibusf4/src/stm32_netinit.c similarity index 100% rename from boards/omnibusf4/src/stm32_netinit.c rename to boards/arm/omnibusf4/src/stm32_netinit.c diff --git a/boards/omnibusf4/src/stm32_ostest.c b/boards/arm/omnibusf4/src/stm32_ostest.c similarity index 100% rename from boards/omnibusf4/src/stm32_ostest.c rename to boards/arm/omnibusf4/src/stm32_ostest.c diff --git a/boards/omnibusf4/src/stm32_pm.c b/boards/arm/omnibusf4/src/stm32_pm.c similarity index 100% rename from boards/omnibusf4/src/stm32_pm.c rename to boards/arm/omnibusf4/src/stm32_pm.c diff --git a/boards/omnibusf4/src/stm32_pwm.c b/boards/arm/omnibusf4/src/stm32_pwm.c similarity index 100% rename from boards/omnibusf4/src/stm32_pwm.c rename to boards/arm/omnibusf4/src/stm32_pwm.c diff --git a/boards/omnibusf4/src/stm32_reset.c b/boards/arm/omnibusf4/src/stm32_reset.c similarity index 100% rename from boards/omnibusf4/src/stm32_reset.c rename to boards/arm/omnibusf4/src/stm32_reset.c diff --git a/boards/omnibusf4/src/stm32_romfs.h b/boards/arm/omnibusf4/src/stm32_romfs.h similarity index 94% rename from boards/omnibusf4/src/stm32_romfs.h rename to boards/arm/omnibusf4/src/stm32_romfs.h index b2b29da9f8..fbd4f5a174 100644 --- a/boards/omnibusf4/src/stm32_romfs.h +++ b/boards/arm/omnibusf4/src/stm32_romfs.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_STM32F4DISCOVERY_SRC_STM32_ROMFS_H -#define __BOARDS_STM32F4DISCOVERY_SRC_STM32_ROMFS_H +#ifndef __BOARDS_ARM_STM32F4DISCOVERY_SRC_STM32_ROMFS_H +#define __BOARDS_ARM_STM32F4DISCOVERY_SRC_STM32_ROMFS_H /**************************************************************************** * Included Files @@ -73,4 +73,4 @@ int stm32_romfs_initialize(void); #endif /* CONFIG_STM32_ROMFS */ -#endif /* __BOARDS_STM32F4DISCOVERY_SRC_STM32_ROMFS_H */ +#endif /* __BOARDS_ARM_STM32F4DISCOVERY_SRC_STM32_ROMFS_H */ diff --git a/boards/omnibusf4/src/stm32_romfs_initialize.c b/boards/arm/omnibusf4/src/stm32_romfs_initialize.c similarity index 100% rename from boards/omnibusf4/src/stm32_romfs_initialize.c rename to boards/arm/omnibusf4/src/stm32_romfs_initialize.c diff --git a/boards/omnibusf4/src/stm32_spi.c b/boards/arm/omnibusf4/src/stm32_spi.c similarity index 100% rename from boards/omnibusf4/src/stm32_spi.c rename to boards/arm/omnibusf4/src/stm32_spi.c diff --git a/boards/omnibusf4/src/stm32_timer.c b/boards/arm/omnibusf4/src/stm32_timer.c similarity index 100% rename from boards/omnibusf4/src/stm32_timer.c rename to boards/arm/omnibusf4/src/stm32_timer.c diff --git a/boards/omnibusf4/src/stm32_uid.c b/boards/arm/omnibusf4/src/stm32_uid.c similarity index 100% rename from boards/omnibusf4/src/stm32_uid.c rename to boards/arm/omnibusf4/src/stm32_uid.c diff --git a/boards/omnibusf4/src/stm32_usb.c b/boards/arm/omnibusf4/src/stm32_usb.c similarity index 100% rename from boards/omnibusf4/src/stm32_usb.c rename to boards/arm/omnibusf4/src/stm32_usb.c diff --git a/boards/omnibusf4/src/stm32_usbmsc.c b/boards/arm/omnibusf4/src/stm32_usbmsc.c similarity index 100% rename from boards/omnibusf4/src/stm32_usbmsc.c rename to boards/arm/omnibusf4/src/stm32_usbmsc.c diff --git a/boards/omnibusf4/src/stm32_userleds.c b/boards/arm/omnibusf4/src/stm32_userleds.c similarity index 100% rename from boards/omnibusf4/src/stm32_userleds.c rename to boards/arm/omnibusf4/src/stm32_userleds.c diff --git a/boards/open1788/Kconfig b/boards/arm/open1788/Kconfig similarity index 100% rename from boards/open1788/Kconfig rename to boards/arm/open1788/Kconfig diff --git a/boards/open1788/README.txt b/boards/arm/open1788/README.txt similarity index 100% rename from boards/open1788/README.txt rename to boards/arm/open1788/README.txt diff --git a/boards/open1788/configs/fb/defconfig b/boards/arm/open1788/configs/fb/defconfig similarity index 100% rename from boards/open1788/configs/fb/defconfig rename to boards/arm/open1788/configs/fb/defconfig diff --git a/boards/open1788/configs/knsh/Make.defs b/boards/arm/open1788/configs/knsh/Make.defs similarity index 91% rename from boards/open1788/configs/knsh/Make.defs rename to boards/arm/open1788/configs/knsh/Make.defs index 21e2f6f4ac..d3c9af85e0 100644 --- a/boards/open1788/configs/knsh/Make.defs +++ b/boards/arm/open1788/configs/knsh/Make.defs @@ -44,15 +44,15 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/open1788/configs/knsh/defconfig b/boards/arm/open1788/configs/knsh/defconfig similarity index 100% rename from boards/open1788/configs/knsh/defconfig rename to boards/arm/open1788/configs/knsh/defconfig diff --git a/boards/open1788/configs/knxterm/Make.defs b/boards/arm/open1788/configs/knxterm/Make.defs similarity index 91% rename from boards/open1788/configs/knxterm/Make.defs rename to boards/arm/open1788/configs/knxterm/Make.defs index 6b1d4520ec..73f6619517 100644 --- a/boards/open1788/configs/knxterm/Make.defs +++ b/boards/arm/open1788/configs/knxterm/Make.defs @@ -44,15 +44,15 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/open1788/configs/knxterm/defconfig b/boards/arm/open1788/configs/knxterm/defconfig similarity index 100% rename from boards/open1788/configs/knxterm/defconfig rename to boards/arm/open1788/configs/knxterm/defconfig diff --git a/boards/open1788/configs/nsh/defconfig b/boards/arm/open1788/configs/nsh/defconfig similarity index 100% rename from boards/open1788/configs/nsh/defconfig rename to boards/arm/open1788/configs/nsh/defconfig diff --git a/boards/open1788/configs/nxlines/defconfig b/boards/arm/open1788/configs/nxlines/defconfig similarity index 100% rename from boards/open1788/configs/nxlines/defconfig rename to boards/arm/open1788/configs/nxlines/defconfig diff --git a/boards/open1788/configs/pdcurses/defconfig b/boards/arm/open1788/configs/pdcurses/defconfig similarity index 100% rename from boards/open1788/configs/pdcurses/defconfig rename to boards/arm/open1788/configs/pdcurses/defconfig diff --git a/boards/open1788/configs/pwfb/defconfig b/boards/arm/open1788/configs/pwfb/defconfig similarity index 100% rename from boards/open1788/configs/pwfb/defconfig rename to boards/arm/open1788/configs/pwfb/defconfig diff --git a/boards/open1788/include/board.h b/boards/arm/open1788/include/board.h similarity index 99% rename from boards/open1788/include/board.h rename to boards/arm/open1788/include/board.h index 25ef288f4c..a844bab29b 100644 --- a/boards/open1788/include/board.h +++ b/boards/arm/open1788/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_OPEN1788_INCLUDE_BOARD_H -#define __CONFIG_OPEN1788_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_OPEN1788_INCLUDE_BOARD_H +#define __BOARDS_ARM_OPEN1788_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -434,4 +434,4 @@ #define GPIO_SSP1_MOSI GPIO_SSP1_MOSI_2 #define GPIO_SSP1_SCK GPIO_SSP1_SCK_2 -#endif /* __CONFIG_OPEN1788_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_OPEN1788_INCLUDE_BOARD_H */ diff --git a/boards/open1788/kernel/.gitignore b/boards/arm/open1788/kernel/.gitignore similarity index 100% rename from boards/open1788/kernel/.gitignore rename to boards/arm/open1788/kernel/.gitignore diff --git a/boards/open1788/kernel/Makefile b/boards/arm/open1788/kernel/Makefile similarity index 100% rename from boards/open1788/kernel/Makefile rename to boards/arm/open1788/kernel/Makefile diff --git a/boards/open1788/kernel/lpc17_40_userspace.c b/boards/arm/open1788/kernel/lpc17_40_userspace.c similarity index 100% rename from boards/open1788/kernel/lpc17_40_userspace.c rename to boards/arm/open1788/kernel/lpc17_40_userspace.c diff --git a/boards/open1788/scripts/Make.defs b/boards/arm/open1788/scripts/Make.defs similarity index 95% rename from boards/open1788/scripts/Make.defs rename to boards/arm/open1788/scripts/Make.defs index 19ae878d9a..197a7145b3 100644 --- a/boards/open1788/scripts/Make.defs +++ b/boards/arm/open1788/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/open1788/scripts/kernel-space.ld b/boards/arm/open1788/scripts/kernel-space.ld similarity index 100% rename from boards/open1788/scripts/kernel-space.ld rename to boards/arm/open1788/scripts/kernel-space.ld diff --git a/boards/open1788/scripts/ld.script b/boards/arm/open1788/scripts/ld.script similarity index 100% rename from boards/open1788/scripts/ld.script rename to boards/arm/open1788/scripts/ld.script diff --git a/boards/open1788/scripts/memory.ld b/boards/arm/open1788/scripts/memory.ld similarity index 100% rename from boards/open1788/scripts/memory.ld rename to boards/arm/open1788/scripts/memory.ld diff --git a/boards/open1788/scripts/user-space.ld b/boards/arm/open1788/scripts/user-space.ld similarity index 100% rename from boards/open1788/scripts/user-space.ld rename to boards/arm/open1788/scripts/user-space.ld diff --git a/boards/nutiny-nuc120/src/.gitignore b/boards/arm/open1788/src/.gitignore similarity index 100% rename from boards/nutiny-nuc120/src/.gitignore rename to boards/arm/open1788/src/.gitignore diff --git a/boards/open1788/src/Makefile b/boards/arm/open1788/src/Makefile similarity index 100% rename from boards/open1788/src/Makefile rename to boards/arm/open1788/src/Makefile diff --git a/boards/open1788/src/lpc17_40_appinit.c b/boards/arm/open1788/src/lpc17_40_appinit.c similarity index 100% rename from boards/open1788/src/lpc17_40_appinit.c rename to boards/arm/open1788/src/lpc17_40_appinit.c diff --git a/boards/open1788/src/lpc17_40_autoleds.c b/boards/arm/open1788/src/lpc17_40_autoleds.c similarity index 100% rename from boards/open1788/src/lpc17_40_autoleds.c rename to boards/arm/open1788/src/lpc17_40_autoleds.c diff --git a/boards/open1788/src/lpc17_40_boardinitialize.c b/boards/arm/open1788/src/lpc17_40_boardinitialize.c similarity index 100% rename from boards/open1788/src/lpc17_40_boardinitialize.c rename to boards/arm/open1788/src/lpc17_40_boardinitialize.c diff --git a/boards/open1788/src/lpc17_40_bringup.c b/boards/arm/open1788/src/lpc17_40_bringup.c similarity index 100% rename from boards/open1788/src/lpc17_40_bringup.c rename to boards/arm/open1788/src/lpc17_40_bringup.c diff --git a/boards/open1788/src/lpc17_40_buttons.c b/boards/arm/open1788/src/lpc17_40_buttons.c similarity index 100% rename from boards/open1788/src/lpc17_40_buttons.c rename to boards/arm/open1788/src/lpc17_40_buttons.c diff --git a/boards/open1788/src/lpc17_40_djoystick.c b/boards/arm/open1788/src/lpc17_40_djoystick.c similarity index 100% rename from boards/open1788/src/lpc17_40_djoystick.c rename to boards/arm/open1788/src/lpc17_40_djoystick.c diff --git a/boards/open1788/src/lpc17_40_lcd.c b/boards/arm/open1788/src/lpc17_40_lcd.c similarity index 100% rename from boards/open1788/src/lpc17_40_lcd.c rename to boards/arm/open1788/src/lpc17_40_lcd.c diff --git a/boards/open1788/src/lpc17_40_nandinitialize.c b/boards/arm/open1788/src/lpc17_40_nandinitialize.c similarity index 100% rename from boards/open1788/src/lpc17_40_nandinitialize.c rename to boards/arm/open1788/src/lpc17_40_nandinitialize.c diff --git a/boards/open1788/src/lpc17_40_norinitialize.c b/boards/arm/open1788/src/lpc17_40_norinitialize.c similarity index 100% rename from boards/open1788/src/lpc17_40_norinitialize.c rename to boards/arm/open1788/src/lpc17_40_norinitialize.c diff --git a/boards/open1788/src/lpc17_40_sdraminitialize.c b/boards/arm/open1788/src/lpc17_40_sdraminitialize.c similarity index 100% rename from boards/open1788/src/lpc17_40_sdraminitialize.c rename to boards/arm/open1788/src/lpc17_40_sdraminitialize.c diff --git a/boards/open1788/src/lpc17_40_ssp.c b/boards/arm/open1788/src/lpc17_40_ssp.c similarity index 100% rename from boards/open1788/src/lpc17_40_ssp.c rename to boards/arm/open1788/src/lpc17_40_ssp.c diff --git a/boards/open1788/src/lpc17_40_touchscreen.c b/boards/arm/open1788/src/lpc17_40_touchscreen.c similarity index 100% rename from boards/open1788/src/lpc17_40_touchscreen.c rename to boards/arm/open1788/src/lpc17_40_touchscreen.c diff --git a/boards/open1788/src/lpc17_40_userleds.c b/boards/arm/open1788/src/lpc17_40_userleds.c similarity index 100% rename from boards/open1788/src/lpc17_40_userleds.c rename to boards/arm/open1788/src/lpc17_40_userleds.c diff --git a/boards/open1788/src/open1788.h b/boards/arm/open1788/src/open1788.h similarity index 100% rename from boards/open1788/src/open1788.h rename to boards/arm/open1788/src/open1788.h diff --git a/boards/open1788/tools/oocd.sh b/boards/arm/open1788/tools/oocd.sh similarity index 100% rename from boards/open1788/tools/oocd.sh rename to boards/arm/open1788/tools/oocd.sh diff --git a/boards/open1788/tools/open1788.cfg b/boards/arm/open1788/tools/open1788.cfg similarity index 100% rename from boards/open1788/tools/open1788.cfg rename to boards/arm/open1788/tools/open1788.cfg diff --git a/boards/amber/Kconfig b/boards/arm/p112/Kconfig similarity index 100% rename from boards/amber/Kconfig rename to boards/arm/p112/Kconfig diff --git a/boards/p112/README.txt b/boards/arm/p112/README.txt similarity index 100% rename from boards/p112/README.txt rename to boards/arm/p112/README.txt diff --git a/boards/p112/configs/ostest/defconfig b/boards/arm/p112/configs/ostest/defconfig similarity index 100% rename from boards/p112/configs/ostest/defconfig rename to boards/arm/p112/configs/ostest/defconfig diff --git a/boards/p112/include/board.h b/boards/arm/p112/include/board.h similarity index 95% rename from boards/p112/include/board.h rename to boards/arm/p112/include/board.h index 91ff2eeca8..aff9da4fe8 100644 --- a/boards/p112/include/board.h +++ b/boards/arm/p112/include/board.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_P112_INCLUDE_BOARD_H -#define __BOARDS_P112_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_P112_INCLUDE_BOARD_H +#define __BOARDS_ARM_P112_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -63,4 +63,4 @@ extern "C" } #endif -#endif /* __BOARDS_P112_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_P112_INCLUDE_BOARD_H */ diff --git a/boards/p112/scripts/Make.defs b/boards/arm/p112/scripts/Make.defs similarity index 100% rename from boards/p112/scripts/Make.defs rename to boards/arm/p112/scripts/Make.defs diff --git a/boards/or1k/src/.gitignore b/boards/arm/p112/src/.gitignore similarity index 100% rename from boards/or1k/src/.gitignore rename to boards/arm/p112/src/.gitignore diff --git a/boards/p112/src/Makefile b/boards/arm/p112/src/Makefile similarity index 100% rename from boards/p112/src/Makefile rename to boards/arm/p112/src/Makefile diff --git a/boards/pcduino-a10/Kconfig b/boards/arm/pcduino-a10/Kconfig similarity index 100% rename from boards/pcduino-a10/Kconfig rename to boards/arm/pcduino-a10/Kconfig diff --git a/boards/pcduino-a10/README.txt b/boards/arm/pcduino-a10/README.txt similarity index 100% rename from boards/pcduino-a10/README.txt rename to boards/arm/pcduino-a10/README.txt diff --git a/boards/pcduino-a10/configs/nsh/defconfig b/boards/arm/pcduino-a10/configs/nsh/defconfig similarity index 100% rename from boards/pcduino-a10/configs/nsh/defconfig rename to boards/arm/pcduino-a10/configs/nsh/defconfig diff --git a/boards/pcduino-a10/configs/nsh/pcduino-140107.patch b/boards/arm/pcduino-a10/configs/nsh/pcduino-140107.patch similarity index 100% rename from boards/pcduino-a10/configs/nsh/pcduino-140107.patch rename to boards/arm/pcduino-a10/configs/nsh/pcduino-140107.patch diff --git a/boards/pcduino-a10/include/board.h b/boards/arm/pcduino-a10/include/board.h similarity index 97% rename from boards/pcduino-a10/include/board.h rename to boards/arm/pcduino-a10/include/board.h index e1f17f0bfb..1f7537dc66 100644 --- a/boards/pcduino-a10/include/board.h +++ b/boards/arm/pcduino-a10/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_PCDUINO_A10_INCLUDE_BOARD_H -#define __BOARDS_PCDUINO_A10_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_PCDUINO_A10_INCLUDE_BOARD_H +#define __BOARDS_ARM_PCDUINO_A10_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -157,4 +157,4 @@ .endm #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_PCDUINO_A10_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_PCDUINO_A10_INCLUDE_BOARD_H */ diff --git a/boards/pcduino-a10/include/board_memorymap.h b/boards/arm/pcduino-a10/include/board_memorymap.h similarity index 93% rename from boards/pcduino-a10/include/board_memorymap.h rename to boards/arm/pcduino-a10/include/board_memorymap.h index b11390e823..d5d2051c73 100644 --- a/boards/pcduino-a10/include/board_memorymap.h +++ b/boards/arm/pcduino-a10/include/board_memorymap.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_PCDUINO_A10_INCLUDE_BOARD_MEMORYMAP_H -#define __BOARDS_PCDUINO_A10_INCLUDE_BOARD_MEMORYMAP_H +#ifndef __BOARDS_ARM_PCDUINO_A10_INCLUDE_BOARD_MEMORYMAP_H +#define __BOARDS_ARM_PCDUINO_A10_INCLUDE_BOARD_MEMORYMAP_H /************************************************************************************ * Included Files @@ -70,4 +70,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_PCDUINO_A10_INCLUDE_BOARD_MEMORYMAP_H */ +#endif /* __BOARDS_ARM_PCDUINO_A10_INCLUDE_BOARD_MEMORYMAP_H */ diff --git a/boards/pcduino-a10/scripts/Make.defs b/boards/arm/pcduino-a10/scripts/Make.defs similarity index 95% rename from boards/pcduino-a10/scripts/Make.defs rename to boards/arm/pcduino-a10/scripts/Make.defs index b1f861d95b..3dbefb487e 100644 --- a/boards/pcduino-a10/scripts/Make.defs +++ b/boards/arm/pcduino-a10/scripts/Make.defs @@ -43,12 +43,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/pcduino-a10/scripts/sdram.ld b/boards/arm/pcduino-a10/scripts/sdram.ld similarity index 100% rename from boards/pcduino-a10/scripts/sdram.ld rename to boards/arm/pcduino-a10/scripts/sdram.ld diff --git a/boards/pcduino-a10/src/Makefile b/boards/arm/pcduino-a10/src/Makefile similarity index 100% rename from boards/pcduino-a10/src/Makefile rename to boards/arm/pcduino-a10/src/Makefile diff --git a/boards/pcduino-a10/src/a1x_boot.c b/boards/arm/pcduino-a10/src/a1x_boot.c similarity index 100% rename from boards/pcduino-a10/src/a1x_boot.c rename to boards/arm/pcduino-a10/src/a1x_boot.c diff --git a/boards/pcduino-a10/src/a1x_buttons.c b/boards/arm/pcduino-a10/src/a1x_buttons.c similarity index 100% rename from boards/pcduino-a10/src/a1x_buttons.c rename to boards/arm/pcduino-a10/src/a1x_buttons.c diff --git a/boards/pcduino-a10/src/a1x_leds.c b/boards/arm/pcduino-a10/src/a1x_leds.c similarity index 100% rename from boards/pcduino-a10/src/a1x_leds.c rename to boards/arm/pcduino-a10/src/a1x_leds.c diff --git a/boards/pcduino-a10/src/pcduino_a10.h b/boards/arm/pcduino-a10/src/pcduino_a10.h similarity index 97% rename from boards/pcduino-a10/src/pcduino_a10.h rename to boards/arm/pcduino-a10/src/pcduino_a10.h index c588d0eb45..4fa4183dfc 100644 --- a/boards/pcduino-a10/src/pcduino_a10.h +++ b/boards/arm/pcduino-a10/src/pcduino_a10.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_PCDUINO_A10_PCDUINO_A10_H -#define __BOARDS_PCDUINO_A10_PCDUINO_A10_H +#ifndef __BOARDS_ARM_PCDUINO_A10_PCDUINO_A10_H +#define __BOARDS_ARM_PCDUINO_A10_PCDUINO_A10_H /************************************************************************************ * Included Files @@ -156,4 +156,4 @@ void a1x_led_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_PCDUINO_A10_PCDUINO_A10_H */ +#endif /* __BOARDS_ARM_PCDUINO_A10_PCDUINO_A10_H */ diff --git a/boards/photon/Kconfig b/boards/arm/photon/Kconfig similarity index 100% rename from boards/photon/Kconfig rename to boards/arm/photon/Kconfig diff --git a/boards/photon/README.txt b/boards/arm/photon/README.txt similarity index 100% rename from boards/photon/README.txt rename to boards/arm/photon/README.txt diff --git a/boards/photon/configs/nsh/defconfig b/boards/arm/photon/configs/nsh/defconfig similarity index 100% rename from boards/photon/configs/nsh/defconfig rename to boards/arm/photon/configs/nsh/defconfig diff --git a/boards/photon/configs/rgbled/defconfig b/boards/arm/photon/configs/rgbled/defconfig similarity index 100% rename from boards/photon/configs/rgbled/defconfig rename to boards/arm/photon/configs/rgbled/defconfig diff --git a/boards/photon/configs/usbnsh/defconfig b/boards/arm/photon/configs/usbnsh/defconfig similarity index 100% rename from boards/photon/configs/usbnsh/defconfig rename to boards/arm/photon/configs/usbnsh/defconfig diff --git a/boards/photon/configs/wlan/defconfig b/boards/arm/photon/configs/wlan/defconfig similarity index 100% rename from boards/photon/configs/wlan/defconfig rename to boards/arm/photon/configs/wlan/defconfig diff --git a/boards/photon/include/board.h b/boards/arm/photon/include/board.h similarity index 98% rename from boards/photon/include/board.h rename to boards/arm/photon/include/board.h index 2728b9a20c..5bb1558675 100644 --- a/boards/photon/include/board.h +++ b/boards/arm/photon/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_PHOTON_INCLUDE_BOARD_H -#define __CONFIG_PHOTON_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_PHOTON_INCLUDE_BOARD_H +#define __BOARDS_ARM_PHOTON_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -294,4 +294,4 @@ #define DMAMAP_SDIO DMAMAP_SDIO_1 -#endif /* __CONFIG_PHOTON_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_PHOTON_INCLUDE_BOARD_H */ diff --git a/boards/photon/scripts/Make.defs b/boards/arm/photon/scripts/Make.defs similarity index 97% rename from boards/photon/scripts/Make.defs rename to boards/arm/photon/scripts/Make.defs index 0bfe303a2d..1efeadf2fa 100644 --- a/boards/photon/scripts/Make.defs +++ b/boards/arm/photon/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/photon/scripts/photon_dfu.ld b/boards/arm/photon/scripts/photon_dfu.ld similarity index 100% rename from boards/photon/scripts/photon_dfu.ld rename to boards/arm/photon/scripts/photon_dfu.ld diff --git a/boards/photon/scripts/photon_jtag.ld b/boards/arm/photon/scripts/photon_jtag.ld similarity index 100% rename from boards/photon/scripts/photon_jtag.ld rename to boards/arm/photon/scripts/photon_jtag.ld diff --git a/boards/photon/src/Makefile b/boards/arm/photon/src/Makefile similarity index 100% rename from boards/photon/src/Makefile rename to boards/arm/photon/src/Makefile diff --git a/boards/photon/src/dfu_signature.c b/boards/arm/photon/src/dfu_signature.c similarity index 100% rename from boards/photon/src/dfu_signature.c rename to boards/arm/photon/src/dfu_signature.c diff --git a/boards/photon/src/photon.h b/boards/arm/photon/src/photon.h similarity index 98% rename from boards/photon/src/photon.h rename to boards/arm/photon/src/photon.h index ee8c6c5ebe..7afe53dd2f 100644 --- a/boards/photon/src/photon.h +++ b/boards/arm/photon/src/photon.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_PHOTON_SRC_PHOTON_H -#define __BOARDS_PHOTON_SRC_PHOTON_H +#ifndef __BOARDS_ARM_PHOTON_SRC_PHOTON_H +#define __BOARDS_ARM_PHOTON_SRC_PHOTON_H /**************************************************************************** * Included Files @@ -184,4 +184,4 @@ void weak_function stm32_usbinitialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_PHOTON_SRC_PHOTON_H */ +#endif /* __BOARDS_ARM_PHOTON_SRC_PHOTON_H */ diff --git a/boards/photon/src/stm32_appinit.c b/boards/arm/photon/src/stm32_appinit.c similarity index 100% rename from boards/photon/src/stm32_appinit.c rename to boards/arm/photon/src/stm32_appinit.c diff --git a/boards/photon/src/stm32_autoleds.c b/boards/arm/photon/src/stm32_autoleds.c similarity index 100% rename from boards/photon/src/stm32_autoleds.c rename to boards/arm/photon/src/stm32_autoleds.c diff --git a/boards/photon/src/stm32_boot.c b/boards/arm/photon/src/stm32_boot.c similarity index 100% rename from boards/photon/src/stm32_boot.c rename to boards/arm/photon/src/stm32_boot.c diff --git a/boards/photon/src/stm32_bringup.c b/boards/arm/photon/src/stm32_bringup.c similarity index 100% rename from boards/photon/src/stm32_bringup.c rename to boards/arm/photon/src/stm32_bringup.c diff --git a/boards/photon/src/stm32_buttons.c b/boards/arm/photon/src/stm32_buttons.c similarity index 100% rename from boards/photon/src/stm32_buttons.c rename to boards/arm/photon/src/stm32_buttons.c diff --git a/boards/photon/src/stm32_rgbled.c b/boards/arm/photon/src/stm32_rgbled.c similarity index 100% rename from boards/photon/src/stm32_rgbled.c rename to boards/arm/photon/src/stm32_rgbled.c diff --git a/boards/photon/src/stm32_spi.c b/boards/arm/photon/src/stm32_spi.c similarity index 100% rename from boards/photon/src/stm32_spi.c rename to boards/arm/photon/src/stm32_spi.c diff --git a/boards/photon/src/stm32_usb.c b/boards/arm/photon/src/stm32_usb.c similarity index 100% rename from boards/photon/src/stm32_usb.c rename to boards/arm/photon/src/stm32_usb.c diff --git a/boards/photon/src/stm32_userleds.c b/boards/arm/photon/src/stm32_userleds.c similarity index 100% rename from boards/photon/src/stm32_userleds.c rename to boards/arm/photon/src/stm32_userleds.c diff --git a/boards/photon/src/stm32_wdt.c b/boards/arm/photon/src/stm32_wdt.c similarity index 100% rename from boards/photon/src/stm32_wdt.c rename to boards/arm/photon/src/stm32_wdt.c diff --git a/boards/photon/src/stm32_wlan.c b/boards/arm/photon/src/stm32_wlan.c similarity index 100% rename from boards/photon/src/stm32_wlan.c rename to boards/arm/photon/src/stm32_wlan.c diff --git a/boards/photon/src/stm32_wlan_firmware.c b/boards/arm/photon/src/stm32_wlan_firmware.c similarity index 100% rename from boards/photon/src/stm32_wlan_firmware.c rename to boards/arm/photon/src/stm32_wlan_firmware.c diff --git a/boards/pnev5180b/Kconfig b/boards/arm/pnev5180b/Kconfig similarity index 100% rename from boards/pnev5180b/Kconfig rename to boards/arm/pnev5180b/Kconfig diff --git a/boards/pnev5180b/README.txt b/boards/arm/pnev5180b/README.txt similarity index 100% rename from boards/pnev5180b/README.txt rename to boards/arm/pnev5180b/README.txt diff --git a/boards/pnev5180b/configs/knsh/Make.defs b/boards/arm/pnev5180b/configs/knsh/Make.defs similarity index 92% rename from boards/pnev5180b/configs/knsh/Make.defs rename to boards/arm/pnev5180b/configs/knsh/Make.defs index a9e58d4e8d..890c407d42 100644 --- a/boards/pnev5180b/configs/knsh/Make.defs +++ b/boards/arm/pnev5180b/configs/knsh/Make.defs @@ -49,15 +49,15 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/pnev5180b/configs/knsh/defconfig b/boards/arm/pnev5180b/configs/knsh/defconfig similarity index 100% rename from boards/pnev5180b/configs/knsh/defconfig rename to boards/arm/pnev5180b/configs/knsh/defconfig diff --git a/boards/pnev5180b/configs/nsh-cdcecm/defconfig b/boards/arm/pnev5180b/configs/nsh-cdcecm/defconfig similarity index 100% rename from boards/pnev5180b/configs/nsh-cdcecm/defconfig rename to boards/arm/pnev5180b/configs/nsh-cdcecm/defconfig diff --git a/boards/pnev5180b/configs/nsh/defconfig b/boards/arm/pnev5180b/configs/nsh/defconfig similarity index 100% rename from boards/pnev5180b/configs/nsh/defconfig rename to boards/arm/pnev5180b/configs/nsh/defconfig diff --git a/boards/pnev5180b/configs/usbnsh-cdcecm/defconfig b/boards/arm/pnev5180b/configs/usbnsh-cdcecm/defconfig similarity index 100% rename from boards/pnev5180b/configs/usbnsh-cdcecm/defconfig rename to boards/arm/pnev5180b/configs/usbnsh-cdcecm/defconfig diff --git a/boards/pnev5180b/configs/usbnsh/defconfig b/boards/arm/pnev5180b/configs/usbnsh/defconfig similarity index 100% rename from boards/pnev5180b/configs/usbnsh/defconfig rename to boards/arm/pnev5180b/configs/usbnsh/defconfig diff --git a/boards/pnev5180b/include/board.h b/boards/arm/pnev5180b/include/board.h similarity index 98% rename from boards/pnev5180b/include/board.h rename to boards/arm/pnev5180b/include/board.h index 2e793f05c9..51a854c19b 100644 --- a/boards/pnev5180b/include/board.h +++ b/boards/arm/pnev5180b/include/board.h @@ -38,8 +38,8 @@ * *****************************************************************************/ -#ifndef __BOARDS_PNEV5180B_INCLUDE_BOARD_H -#define __BOARDS_PNEV5180B_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_PNEV5180B_INCLUDE_BOARD_H +#define __BOARDS_ARM_PNEV5180B_INCLUDE_BOARD_H /***************************************************************************** * Included Files @@ -234,4 +234,4 @@ void lpc17_40_led(int lednum, int state); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_PNEV5180_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_PNEV5180_INCLUDE_BOARD_H */ diff --git a/boards/pnev5180b/kernel/.gitignore b/boards/arm/pnev5180b/kernel/.gitignore similarity index 100% rename from boards/pnev5180b/kernel/.gitignore rename to boards/arm/pnev5180b/kernel/.gitignore diff --git a/boards/pnev5180b/kernel/Makefile b/boards/arm/pnev5180b/kernel/Makefile similarity index 100% rename from boards/pnev5180b/kernel/Makefile rename to boards/arm/pnev5180b/kernel/Makefile diff --git a/boards/pnev5180b/kernel/lpc17_40_userspace.c b/boards/arm/pnev5180b/kernel/lpc17_40_userspace.c similarity index 100% rename from boards/pnev5180b/kernel/lpc17_40_userspace.c rename to boards/arm/pnev5180b/kernel/lpc17_40_userspace.c diff --git a/boards/pnev5180b/scripts/Make.defs b/boards/arm/pnev5180b/scripts/Make.defs similarity index 96% rename from boards/pnev5180b/scripts/Make.defs rename to boards/arm/pnev5180b/scripts/Make.defs index 6d68934991..b3caa04886 100644 --- a/boards/pnev5180b/scripts/Make.defs +++ b/boards/arm/pnev5180b/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)flash.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)flash.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)flash.ld + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)flash.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/pnev5180b/scripts/flash.ld b/boards/arm/pnev5180b/scripts/flash.ld similarity index 100% rename from boards/pnev5180b/scripts/flash.ld rename to boards/arm/pnev5180b/scripts/flash.ld diff --git a/boards/pnev5180b/scripts/kernel-space.ld b/boards/arm/pnev5180b/scripts/kernel-space.ld similarity index 100% rename from boards/pnev5180b/scripts/kernel-space.ld rename to boards/arm/pnev5180b/scripts/kernel-space.ld diff --git a/boards/pnev5180b/scripts/memory.ld b/boards/arm/pnev5180b/scripts/memory.ld similarity index 100% rename from boards/pnev5180b/scripts/memory.ld rename to boards/arm/pnev5180b/scripts/memory.ld diff --git a/boards/pnev5180b/scripts/user-space.ld b/boards/arm/pnev5180b/scripts/user-space.ld similarity index 100% rename from boards/pnev5180b/scripts/user-space.ld rename to boards/arm/pnev5180b/scripts/user-space.ld diff --git a/boards/olimex-efm32g880f128-stk/src/.gitignore b/boards/arm/pnev5180b/src/.gitignore similarity index 100% rename from boards/olimex-efm32g880f128-stk/src/.gitignore rename to boards/arm/pnev5180b/src/.gitignore diff --git a/boards/pnev5180b/src/Makefile b/boards/arm/pnev5180b/src/Makefile similarity index 100% rename from boards/pnev5180b/src/Makefile rename to boards/arm/pnev5180b/src/Makefile diff --git a/boards/pnev5180b/src/lpc17_40_appinit.c b/boards/arm/pnev5180b/src/lpc17_40_appinit.c similarity index 100% rename from boards/pnev5180b/src/lpc17_40_appinit.c rename to boards/arm/pnev5180b/src/lpc17_40_appinit.c diff --git a/boards/pnev5180b/src/lpc17_40_boot.c b/boards/arm/pnev5180b/src/lpc17_40_boot.c similarity index 100% rename from boards/pnev5180b/src/lpc17_40_boot.c rename to boards/arm/pnev5180b/src/lpc17_40_boot.c diff --git a/boards/pnev5180b/src/lpc17_40_bringup.c b/boards/arm/pnev5180b/src/lpc17_40_bringup.c similarity index 100% rename from boards/pnev5180b/src/lpc17_40_bringup.c rename to boards/arm/pnev5180b/src/lpc17_40_bringup.c diff --git a/boards/pnev5180b/src/lpc17_40_composite.c b/boards/arm/pnev5180b/src/lpc17_40_composite.c similarity index 100% rename from boards/pnev5180b/src/lpc17_40_composite.c rename to boards/arm/pnev5180b/src/lpc17_40_composite.c diff --git a/boards/pnev5180b/src/lpc17_40_leds.c b/boards/arm/pnev5180b/src/lpc17_40_leds.c similarity index 100% rename from boards/pnev5180b/src/lpc17_40_leds.c rename to boards/arm/pnev5180b/src/lpc17_40_leds.c diff --git a/boards/pnev5180b/src/lpc17_40_romfs.c b/boards/arm/pnev5180b/src/lpc17_40_romfs.c similarity index 100% rename from boards/pnev5180b/src/lpc17_40_romfs.c rename to boards/arm/pnev5180b/src/lpc17_40_romfs.c diff --git a/boards/pnev5180b/src/lpc17_40_romfs.h b/boards/arm/pnev5180b/src/lpc17_40_romfs.h similarity index 95% rename from boards/pnev5180b/src/lpc17_40_romfs.h rename to boards/arm/pnev5180b/src/lpc17_40_romfs.h index 0dc9f7994f..a0a5b2f126 100644 --- a/boards/pnev5180b/src/lpc17_40_romfs.h +++ b/boards/arm/pnev5180b/src/lpc17_40_romfs.h @@ -38,8 +38,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_PNEV5180B_SRC_LPC17_40_ROMFS_H -#define __BOARDS_PNEV5180B_SRC_LPC17_40_ROMFS_H +#ifndef __BOARDS_ARM_PNEV5180B_SRC_LPC17_40_ROMFS_H +#define __BOARDS_ARM_PNEV5180B_SRC_LPC17_40_ROMFS_H /**************************************************************************** * Included Files @@ -79,4 +79,4 @@ int lpc17_40_romfs_initialize(void); #endif /* CONFIG_LPC17_40_ROMFS */ -#endif /* __BOARDS_PNEV5180B_SRC_LPC17_40_ROMFS_H */ +#endif /* __BOARDS_ARM_PNEV5180B_SRC_LPC17_40_ROMFS_H */ diff --git a/boards/pnev5180b/src/lpc17_40_spi.c b/boards/arm/pnev5180b/src/lpc17_40_spi.c similarity index 100% rename from boards/pnev5180b/src/lpc17_40_spi.c rename to boards/arm/pnev5180b/src/lpc17_40_spi.c diff --git a/boards/pnev5180b/src/lpc17_40_symtab.c b/boards/arm/pnev5180b/src/lpc17_40_symtab.c similarity index 100% rename from boards/pnev5180b/src/lpc17_40_symtab.c rename to boards/arm/pnev5180b/src/lpc17_40_symtab.c diff --git a/boards/pnev5180b/src/lpc17_40_symtab.h b/boards/arm/pnev5180b/src/lpc17_40_symtab.h similarity index 93% rename from boards/pnev5180b/src/lpc17_40_symtab.h rename to boards/arm/pnev5180b/src/lpc17_40_symtab.h index c2b24899b6..140b7d9999 100644 --- a/boards/pnev5180b/src/lpc17_40_symtab.h +++ b/boards/arm/pnev5180b/src/lpc17_40_symtab.h @@ -33,8 +33,8 @@ * *****************************************************************************/ -#ifndef __BOARDS_PNEV5180B_SRC_LPC17_40_SYMTAB_H -#define __BOARDS_PNEV5180B_SRC_LPC17_40_SYMTAB_H +#ifndef __BOARDS_ARM_PNEV5180B_SRC_LPC17_40_SYMTAB_H +#define __BOARDS_ARM_PNEV5180B_SRC_LPC17_40_SYMTAB_H /***************************************************************************** * Included Files @@ -53,4 +53,4 @@ extern const struct symtab_s lpc17_40_exports[]; extern const int lpc17_40_nexports; #endif -#endif /* __BOARDS_PNEV5180B_SRC_LPC17_40_SYMTAB_H */ +#endif /* __BOARDS_ARM_PNEV5180B_SRC_LPC17_40_SYMTAB_H */ diff --git a/boards/pnev5180b/src/pnev5180b.h b/boards/arm/pnev5180b/src/pnev5180b.h similarity index 100% rename from boards/pnev5180b/src/pnev5180b.h rename to boards/arm/pnev5180b/src/pnev5180b.h diff --git a/boards/sabre-6quad/Kconfig b/boards/arm/sabre-6quad/Kconfig similarity index 100% rename from boards/sabre-6quad/Kconfig rename to boards/arm/sabre-6quad/Kconfig diff --git a/boards/sabre-6quad/README.txt b/boards/arm/sabre-6quad/README.txt similarity index 100% rename from boards/sabre-6quad/README.txt rename to boards/arm/sabre-6quad/README.txt diff --git a/boards/sabre-6quad/configs/nsh/defconfig b/boards/arm/sabre-6quad/configs/nsh/defconfig similarity index 100% rename from boards/sabre-6quad/configs/nsh/defconfig rename to boards/arm/sabre-6quad/configs/nsh/defconfig diff --git a/boards/sabre-6quad/configs/smp/defconfig b/boards/arm/sabre-6quad/configs/smp/defconfig similarity index 100% rename from boards/sabre-6quad/configs/smp/defconfig rename to boards/arm/sabre-6quad/configs/smp/defconfig diff --git a/boards/sabre-6quad/include/board.h b/boards/arm/sabre-6quad/include/board.h similarity index 97% rename from boards/sabre-6quad/include/board.h rename to boards/arm/sabre-6quad/include/board.h index c80866bc3a..6d249c638d 100644 --- a/boards/sabre-6quad/include/board.h +++ b/boards/arm/sabre-6quad/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SABRE_6QUAD_INCLUDE_BOARD_H -#define __BOARDS_SABRE_6QUAD_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_SABRE_6QUAD_INCLUDE_BOARD_H +#define __BOARDS_ARM_SABRE_6QUAD_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -163,4 +163,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SABRE_6QUAD_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_SABRE_6QUAD_INCLUDE_BOARD_H */ diff --git a/boards/sabre-6quad/include/board_memorymap.h b/boards/arm/sabre-6quad/include/board_memorymap.h similarity index 93% rename from boards/sabre-6quad/include/board_memorymap.h rename to boards/arm/sabre-6quad/include/board_memorymap.h index cd0547a0ac..ed4604724f 100644 --- a/boards/sabre-6quad/include/board_memorymap.h +++ b/boards/arm/sabre-6quad/include/board_memorymap.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SABRE_6QUAD_INCLUDE_BOARD_MEMORYMAP_H -#define __BOARDS_SABRE_6QUAD_INCLUDE_BOARD_MEMORYMAP_H +#ifndef __BOARDS_ARM_SABRE_6QUAD_INCLUDE_BOARD_MEMORYMAP_H +#define __BOARDS_ARM_SABRE_6QUAD_INCLUDE_BOARD_MEMORYMAP_H /************************************************************************************ * Included Files @@ -71,4 +71,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SABRE_6QUAD_INCLUDE_BOARD_MEMORYMAP_H */ +#endif /* __BOARDS_ARM_SABRE_6QUAD_INCLUDE_BOARD_MEMORYMAP_H */ diff --git a/boards/sabre-6quad/scripts/Make.defs b/boards/arm/sabre-6quad/scripts/Make.defs similarity index 93% rename from boards/sabre-6quad/scripts/Make.defs rename to boards/arm/sabre-6quad/scripts/Make.defs index 8d1a348fe1..70379b2e1d 100644 --- a/boards/sabre-6quad/scripts/Make.defs +++ b/boards/arm/sabre-6quad/scripts/Make.defs @@ -43,12 +43,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) endif CC = $(CROSSDEV)gcc @@ -97,9 +97,9 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/sabre-6quad/scripts/dramboot.ld b/boards/arm/sabre-6quad/scripts/dramboot.ld similarity index 100% rename from boards/sabre-6quad/scripts/dramboot.ld rename to boards/arm/sabre-6quad/scripts/dramboot.ld diff --git a/boards/sabre-6quad/src/Makefile b/boards/arm/sabre-6quad/src/Makefile similarity index 100% rename from boards/sabre-6quad/src/Makefile rename to boards/arm/sabre-6quad/src/Makefile diff --git a/boards/sabre-6quad/src/imx_appinit.c b/boards/arm/sabre-6quad/src/imx_appinit.c similarity index 100% rename from boards/sabre-6quad/src/imx_appinit.c rename to boards/arm/sabre-6quad/src/imx_appinit.c diff --git a/boards/sabre-6quad/src/imx_autoleds.c b/boards/arm/sabre-6quad/src/imx_autoleds.c similarity index 100% rename from boards/sabre-6quad/src/imx_autoleds.c rename to boards/arm/sabre-6quad/src/imx_autoleds.c diff --git a/boards/sabre-6quad/src/imx_boardinit.c b/boards/arm/sabre-6quad/src/imx_boardinit.c similarity index 100% rename from boards/sabre-6quad/src/imx_boardinit.c rename to boards/arm/sabre-6quad/src/imx_boardinit.c diff --git a/boards/sabre-6quad/src/imx_bringup.c b/boards/arm/sabre-6quad/src/imx_bringup.c similarity index 100% rename from boards/sabre-6quad/src/imx_bringup.c rename to boards/arm/sabre-6quad/src/imx_bringup.c diff --git a/boards/sabre-6quad/src/imx_userleds.c b/boards/arm/sabre-6quad/src/imx_userleds.c similarity index 100% rename from boards/sabre-6quad/src/imx_userleds.c rename to boards/arm/sabre-6quad/src/imx_userleds.c diff --git a/boards/sabre-6quad/src/sabre-6quad.h b/boards/arm/sabre-6quad/src/sabre-6quad.h similarity index 96% rename from boards/sabre-6quad/src/sabre-6quad.h rename to boards/arm/sabre-6quad/src/sabre-6quad.h index 5ae004116f..a2e5b451b9 100644 --- a/boards/sabre-6quad/src/sabre-6quad.h +++ b/boards/arm/sabre-6quad/src/sabre-6quad.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SABRE_6QUAD_SRC_SABRE_6QUAD_H -#define __BOARDS_SABRE_6QUAD_SRC_SABRE_6QUAD_H +#ifndef __BOARDS_ARM_SABRE_6QUAD_SRC_SABRE_6QUAD_H +#define __BOARDS_ARM_SABRE_6QUAD_SRC_SABRE_6QUAD_H /************************************************************************************ * Included Files @@ -92,4 +92,4 @@ int imx_bringup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SABRE_6QUAD_SRC_SABRE_6QUAD_H */ +#endif /* __BOARDS_ARM_SABRE_6QUAD_SRC_SABRE_6QUAD_H */ diff --git a/boards/sam3u-ek/Kconfig b/boards/arm/sam3u-ek/Kconfig similarity index 100% rename from boards/sam3u-ek/Kconfig rename to boards/arm/sam3u-ek/Kconfig diff --git a/boards/sam3u-ek/README.txt b/boards/arm/sam3u-ek/README.txt similarity index 100% rename from boards/sam3u-ek/README.txt rename to boards/arm/sam3u-ek/README.txt diff --git a/boards/sam3u-ek/configs/knsh/Make.defs b/boards/arm/sam3u-ek/configs/knsh/Make.defs similarity index 91% rename from boards/sam3u-ek/configs/knsh/Make.defs rename to boards/arm/sam3u-ek/configs/knsh/Make.defs index fa766d87b8..ba15cea14a 100644 --- a/boards/sam3u-ek/configs/knsh/Make.defs +++ b/boards/arm/sam3u-ek/configs/knsh/Make.defs @@ -44,15 +44,15 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/sam3u-ek/configs/knsh/defconfig b/boards/arm/sam3u-ek/configs/knsh/defconfig similarity index 100% rename from boards/sam3u-ek/configs/knsh/defconfig rename to boards/arm/sam3u-ek/configs/knsh/defconfig diff --git a/boards/sam3u-ek/configs/nsh/defconfig b/boards/arm/sam3u-ek/configs/nsh/defconfig similarity index 100% rename from boards/sam3u-ek/configs/nsh/defconfig rename to boards/arm/sam3u-ek/configs/nsh/defconfig diff --git a/boards/sam3u-ek/configs/nx/defconfig b/boards/arm/sam3u-ek/configs/nx/defconfig similarity index 100% rename from boards/sam3u-ek/configs/nx/defconfig rename to boards/arm/sam3u-ek/configs/nx/defconfig diff --git a/boards/sam3u-ek/configs/nxwm/defconfig b/boards/arm/sam3u-ek/configs/nxwm/defconfig similarity index 100% rename from boards/sam3u-ek/configs/nxwm/defconfig rename to boards/arm/sam3u-ek/configs/nxwm/defconfig diff --git a/boards/sam3u-ek/include/board.h b/boards/arm/sam3u-ek/include/board.h similarity index 100% rename from boards/sam3u-ek/include/board.h rename to boards/arm/sam3u-ek/include/board.h diff --git a/boards/sam3u-ek/kernel/.gitignore b/boards/arm/sam3u-ek/kernel/.gitignore similarity index 100% rename from boards/sam3u-ek/kernel/.gitignore rename to boards/arm/sam3u-ek/kernel/.gitignore diff --git a/boards/sam3u-ek/kernel/Makefile b/boards/arm/sam3u-ek/kernel/Makefile similarity index 100% rename from boards/sam3u-ek/kernel/Makefile rename to boards/arm/sam3u-ek/kernel/Makefile diff --git a/boards/sam3u-ek/kernel/sam_userspace.c b/boards/arm/sam3u-ek/kernel/sam_userspace.c similarity index 100% rename from boards/sam3u-ek/kernel/sam_userspace.c rename to boards/arm/sam3u-ek/kernel/sam_userspace.c diff --git a/boards/sam3u-ek/scripts/Make.defs b/boards/arm/sam3u-ek/scripts/Make.defs similarity index 96% rename from boards/sam3u-ek/scripts/Make.defs rename to boards/arm/sam3u-ek/scripts/Make.defs index 17ad4ab9c9..811049d468 100644 --- a/boards/sam3u-ek/scripts/Make.defs +++ b/boards/arm/sam3u-ek/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/sam3u-ek/scripts/kernel-space.ld b/boards/arm/sam3u-ek/scripts/kernel-space.ld similarity index 100% rename from boards/sam3u-ek/scripts/kernel-space.ld rename to boards/arm/sam3u-ek/scripts/kernel-space.ld diff --git a/boards/sam3u-ek/scripts/ld.script b/boards/arm/sam3u-ek/scripts/ld.script similarity index 100% rename from boards/sam3u-ek/scripts/ld.script rename to boards/arm/sam3u-ek/scripts/ld.script diff --git a/boards/sam3u-ek/scripts/memory.ld b/boards/arm/sam3u-ek/scripts/memory.ld similarity index 100% rename from boards/sam3u-ek/scripts/memory.ld rename to boards/arm/sam3u-ek/scripts/memory.ld diff --git a/boards/sam3u-ek/scripts/user-space.ld b/boards/arm/sam3u-ek/scripts/user-space.ld similarity index 100% rename from boards/sam3u-ek/scripts/user-space.ld rename to boards/arm/sam3u-ek/scripts/user-space.ld diff --git a/boards/olimex-lpc-h3131/src/.gitignore b/boards/arm/sam3u-ek/src/.gitignore similarity index 100% rename from boards/olimex-lpc-h3131/src/.gitignore rename to boards/arm/sam3u-ek/src/.gitignore diff --git a/boards/sam3u-ek/src/Makefile b/boards/arm/sam3u-ek/src/Makefile similarity index 100% rename from boards/sam3u-ek/src/Makefile rename to boards/arm/sam3u-ek/src/Makefile diff --git a/boards/sam3u-ek/src/sam3u-ek.h b/boards/arm/sam3u-ek/src/sam3u-ek.h similarity index 98% rename from boards/sam3u-ek/src/sam3u-ek.h rename to boards/arm/sam3u-ek/src/sam3u-ek.h index 425827d889..a3d416a791 100644 --- a/boards/sam3u-ek/src/sam3u-ek.h +++ b/boards/arm/sam3u-ek/src/sam3u-ek.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAM3U_EK_SRC_SAM3U_EK_H -#define __BOARDS_SAM3U_EK_SRC_SAM3U_EK_H +#ifndef __BOARDS_ARM_SAM3U_EK_SRC_SAM3U_EK_H +#define __BOARDS_ARM_SAM3U_EK_SRC_SAM3U_EK_H /************************************************************************************ * Included Files @@ -285,4 +285,4 @@ int sam_tsc_setup(int minor); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAM3U_EK_SRC_SAM3U_EK_H */ +#endif /* __BOARDS_ARM_SAM3U_EK_SRC_SAM3U_EK_H */ diff --git a/boards/sam3u-ek/src/sam_appinit.c b/boards/arm/sam3u-ek/src/sam_appinit.c similarity index 100% rename from boards/sam3u-ek/src/sam_appinit.c rename to boards/arm/sam3u-ek/src/sam_appinit.c diff --git a/boards/sam3u-ek/src/sam_boot.c b/boards/arm/sam3u-ek/src/sam_boot.c similarity index 100% rename from boards/sam3u-ek/src/sam_boot.c rename to boards/arm/sam3u-ek/src/sam_boot.c diff --git a/boards/sam3u-ek/src/sam_buttons.c b/boards/arm/sam3u-ek/src/sam_buttons.c similarity index 100% rename from boards/sam3u-ek/src/sam_buttons.c rename to boards/arm/sam3u-ek/src/sam_buttons.c diff --git a/boards/sam3u-ek/src/sam_lcd.c b/boards/arm/sam3u-ek/src/sam_lcd.c similarity index 100% rename from boards/sam3u-ek/src/sam_lcd.c rename to boards/arm/sam3u-ek/src/sam_lcd.c diff --git a/boards/sam3u-ek/src/sam_leds.c b/boards/arm/sam3u-ek/src/sam_leds.c similarity index 100% rename from boards/sam3u-ek/src/sam_leds.c rename to boards/arm/sam3u-ek/src/sam_leds.c diff --git a/boards/sam3u-ek/src/sam_mmcsd.c b/boards/arm/sam3u-ek/src/sam_mmcsd.c similarity index 100% rename from boards/sam3u-ek/src/sam_mmcsd.c rename to boards/arm/sam3u-ek/src/sam_mmcsd.c diff --git a/boards/sam3u-ek/src/sam_spi.c b/boards/arm/sam3u-ek/src/sam_spi.c similarity index 100% rename from boards/sam3u-ek/src/sam_spi.c rename to boards/arm/sam3u-ek/src/sam_spi.c diff --git a/boards/sam3u-ek/src/sam_touchscreen.c b/boards/arm/sam3u-ek/src/sam_touchscreen.c similarity index 100% rename from boards/sam3u-ek/src/sam_touchscreen.c rename to boards/arm/sam3u-ek/src/sam_touchscreen.c diff --git a/boards/sam3u-ek/src/sam_usbdev.c b/boards/arm/sam3u-ek/src/sam_usbdev.c similarity index 100% rename from boards/sam3u-ek/src/sam_usbdev.c rename to boards/arm/sam3u-ek/src/sam_usbdev.c diff --git a/boards/sam3u-ek/src/sam_usbmsc.c b/boards/arm/sam3u-ek/src/sam_usbmsc.c similarity index 100% rename from boards/sam3u-ek/src/sam_usbmsc.c rename to boards/arm/sam3u-ek/src/sam_usbmsc.c diff --git a/boards/sam4cmp-db/Kconfig b/boards/arm/sam4cmp-db/Kconfig similarity index 100% rename from boards/sam4cmp-db/Kconfig rename to boards/arm/sam4cmp-db/Kconfig diff --git a/boards/sam4cmp-db/README.txt b/boards/arm/sam4cmp-db/README.txt similarity index 100% rename from boards/sam4cmp-db/README.txt rename to boards/arm/sam4cmp-db/README.txt diff --git a/boards/sam4cmp-db/configs/nsh/defconfig b/boards/arm/sam4cmp-db/configs/nsh/defconfig similarity index 100% rename from boards/sam4cmp-db/configs/nsh/defconfig rename to boards/arm/sam4cmp-db/configs/nsh/defconfig diff --git a/boards/sam4cmp-db/include/board.h b/boards/arm/sam4cmp-db/include/board.h similarity index 97% rename from boards/sam4cmp-db/include/board.h rename to boards/arm/sam4cmp-db/include/board.h index 9c8ae09bb3..9692faf08d 100644 --- a/boards/sam4cmp-db/include/board.h +++ b/boards/arm/sam4cmp-db/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAM4CMP_DB_INCLUDE_BOARD_H -#define __BOARDS_SAM4CMP_DB_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_SAM4CMP_DB_INCLUDE_BOARD_H +#define __BOARDS_ARM_SAM4CMP_DB_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -139,4 +139,4 @@ #define BOARD_FWS 5 -#endif /* __BOARDS_SAM4CMP_DB_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_SAM4CMP_DB_INCLUDE_BOARD_H */ diff --git a/boards/sam4cmp-db/scripts/Make.defs b/boards/arm/sam4cmp-db/scripts/Make.defs similarity index 96% rename from boards/sam4cmp-db/scripts/Make.defs rename to boards/arm/sam4cmp-db/scripts/Make.defs index 786bdb2545..7587501c4d 100644 --- a/boards/sam4cmp-db/scripts/Make.defs +++ b/boards/arm/sam4cmp-db/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/sam4cmp-db.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/sam4cmp-db.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/sam4cmp-db.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/sam4cmp-db.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/sam4cmp-db/scripts/sam4cmp-db.ld b/boards/arm/sam4cmp-db/scripts/sam4cmp-db.ld similarity index 100% rename from boards/sam4cmp-db/scripts/sam4cmp-db.ld rename to boards/arm/sam4cmp-db/scripts/sam4cmp-db.ld diff --git a/boards/sam4cmp-db/src/Makefile b/boards/arm/sam4cmp-db/src/Makefile similarity index 100% rename from boards/sam4cmp-db/src/Makefile rename to boards/arm/sam4cmp-db/src/Makefile diff --git a/boards/sam4cmp-db/src/sam4cmp-db.h b/boards/arm/sam4cmp-db/src/sam4cmp-db.h similarity index 95% rename from boards/sam4cmp-db/src/sam4cmp-db.h rename to boards/arm/sam4cmp-db/src/sam4cmp-db.h index d3a762a9e6..b2cafd8a11 100644 --- a/boards/sam4cmp-db/src/sam4cmp-db.h +++ b/boards/arm/sam4cmp-db/src/sam4cmp-db.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAM4CMP_DB_SRC_SAM4CMP_DB_H -#define __BOARDS_SAM4CMP_DB_SRC_SAM4CMP_DB_H +#ifndef __BOARDS_ARM_SAM4CMP_DB_SRC_SAM4CMP_DB_H +#define __BOARDS_ARM_SAM4CMP_DB_SRC_SAM4CMP_DB_H /************************************************************************************ * Included Files @@ -77,4 +77,4 @@ int sam_bringup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAM4CMP_DB_SRC_SAM4CMP_DB_H */ +#endif /* __BOARDS_ARM_SAM4CMP_DB_SRC_SAM4CMP_DB_H */ diff --git a/boards/sam4cmp-db/src/sam_appinit.c b/boards/arm/sam4cmp-db/src/sam_appinit.c similarity index 100% rename from boards/sam4cmp-db/src/sam_appinit.c rename to boards/arm/sam4cmp-db/src/sam_appinit.c diff --git a/boards/sam4cmp-db/src/sam_boot.c b/boards/arm/sam4cmp-db/src/sam_boot.c similarity index 100% rename from boards/sam4cmp-db/src/sam_boot.c rename to boards/arm/sam4cmp-db/src/sam_boot.c diff --git a/boards/sam4cmp-db/src/sam_bringup.c b/boards/arm/sam4cmp-db/src/sam_bringup.c similarity index 100% rename from boards/sam4cmp-db/src/sam_bringup.c rename to boards/arm/sam4cmp-db/src/sam_bringup.c diff --git a/boards/sam4e-ek/Kconfig b/boards/arm/sam4e-ek/Kconfig similarity index 100% rename from boards/sam4e-ek/Kconfig rename to boards/arm/sam4e-ek/Kconfig diff --git a/boards/sam4e-ek/README.txt b/boards/arm/sam4e-ek/README.txt similarity index 100% rename from boards/sam4e-ek/README.txt rename to boards/arm/sam4e-ek/README.txt diff --git a/boards/sam4e-ek/configs/nsh/defconfig b/boards/arm/sam4e-ek/configs/nsh/defconfig similarity index 100% rename from boards/sam4e-ek/configs/nsh/defconfig rename to boards/arm/sam4e-ek/configs/nsh/defconfig diff --git a/boards/sam4e-ek/configs/nxwm/defconfig b/boards/arm/sam4e-ek/configs/nxwm/defconfig similarity index 100% rename from boards/sam4e-ek/configs/nxwm/defconfig rename to boards/arm/sam4e-ek/configs/nxwm/defconfig diff --git a/boards/sam4e-ek/configs/usbnsh/defconfig b/boards/arm/sam4e-ek/configs/usbnsh/defconfig similarity index 100% rename from boards/sam4e-ek/configs/usbnsh/defconfig rename to boards/arm/sam4e-ek/configs/usbnsh/defconfig diff --git a/boards/sam4e-ek/include/board.h b/boards/arm/sam4e-ek/include/board.h similarity index 100% rename from boards/sam4e-ek/include/board.h rename to boards/arm/sam4e-ek/include/board.h diff --git a/boards/sam4e-ek/scripts/Make.defs b/boards/arm/sam4e-ek/scripts/Make.defs similarity index 97% rename from boards/sam4e-ek/scripts/Make.defs rename to boards/arm/sam4e-ek/scripts/Make.defs index c1fe67daf4..7b041bda5e 100644 --- a/boards/sam4e-ek/scripts/Make.defs +++ b/boards/arm/sam4e-ek/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/flash.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/flash.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/sam4e-ek/scripts/flash.ld b/boards/arm/sam4e-ek/scripts/flash.ld similarity index 100% rename from boards/sam4e-ek/scripts/flash.ld rename to boards/arm/sam4e-ek/scripts/flash.ld diff --git a/boards/olimex-lpc1766stk/src/.gitignore b/boards/arm/sam4e-ek/src/.gitignore similarity index 100% rename from boards/olimex-lpc1766stk/src/.gitignore rename to boards/arm/sam4e-ek/src/.gitignore diff --git a/boards/sam4e-ek/src/Makefile b/boards/arm/sam4e-ek/src/Makefile similarity index 100% rename from boards/sam4e-ek/src/Makefile rename to boards/arm/sam4e-ek/src/Makefile diff --git a/boards/sam4e-ek/src/sam4e-ek.h b/boards/arm/sam4e-ek/src/sam4e-ek.h similarity index 99% rename from boards/sam4e-ek/src/sam4e-ek.h rename to boards/arm/sam4e-ek/src/sam4e-ek.h index 2c8715c533..9b9086cd65 100644 --- a/boards/sam4e-ek/src/sam4e-ek.h +++ b/boards/arm/sam4e-ek/src/sam4e-ek.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAM4E_EK_SRC_SAM4E_EK_H -#define __BOARDS_SAM4E_EK_SRC_SAM4E_EK_H +#ifndef __BOARDS_ARM_SAM4E_EK_SRC_SAM4E_EK_H +#define __BOARDS_ARM_SAM4E_EK_SRC_SAM4E_EK_H /************************************************************************************ * Included Files @@ -477,4 +477,4 @@ int sam_tsc_setup(int minor); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAM4E_EK_SRC_SAM4E_EK_H */ +#endif /* __BOARDS_ARM_SAM4E_EK_SRC_SAM4E_EK_H */ diff --git a/boards/sam4e-ek/src/sam_ads7843e.c b/boards/arm/sam4e-ek/src/sam_ads7843e.c similarity index 100% rename from boards/sam4e-ek/src/sam_ads7843e.c rename to boards/arm/sam4e-ek/src/sam_ads7843e.c diff --git a/boards/sam4e-ek/src/sam_appinit.c b/boards/arm/sam4e-ek/src/sam_appinit.c similarity index 100% rename from boards/sam4e-ek/src/sam_appinit.c rename to boards/arm/sam4e-ek/src/sam_appinit.c diff --git a/boards/sam4e-ek/src/sam_at25.c b/boards/arm/sam4e-ek/src/sam_at25.c similarity index 100% rename from boards/sam4e-ek/src/sam_at25.c rename to boards/arm/sam4e-ek/src/sam_at25.c diff --git a/boards/sam4e-ek/src/sam_boot.c b/boards/arm/sam4e-ek/src/sam_boot.c similarity index 100% rename from boards/sam4e-ek/src/sam_boot.c rename to boards/arm/sam4e-ek/src/sam_boot.c diff --git a/boards/sam4e-ek/src/sam_buttons.c b/boards/arm/sam4e-ek/src/sam_buttons.c similarity index 100% rename from boards/sam4e-ek/src/sam_buttons.c rename to boards/arm/sam4e-ek/src/sam_buttons.c diff --git a/boards/sam4e-ek/src/sam_ethernet.c b/boards/arm/sam4e-ek/src/sam_ethernet.c similarity index 100% rename from boards/sam4e-ek/src/sam_ethernet.c rename to boards/arm/sam4e-ek/src/sam_ethernet.c diff --git a/boards/sam4e-ek/src/sam_hsmci.c b/boards/arm/sam4e-ek/src/sam_hsmci.c similarity index 100% rename from boards/sam4e-ek/src/sam_hsmci.c rename to boards/arm/sam4e-ek/src/sam_hsmci.c diff --git a/boards/sam4e-ek/src/sam_ili9325.c b/boards/arm/sam4e-ek/src/sam_ili9325.c similarity index 100% rename from boards/sam4e-ek/src/sam_ili9325.c rename to boards/arm/sam4e-ek/src/sam_ili9325.c diff --git a/boards/sam4e-ek/src/sam_ili9341.c b/boards/arm/sam4e-ek/src/sam_ili9341.c similarity index 100% rename from boards/sam4e-ek/src/sam_ili9341.c rename to boards/arm/sam4e-ek/src/sam_ili9341.c diff --git a/boards/sam4e-ek/src/sam_leds.c b/boards/arm/sam4e-ek/src/sam_leds.c similarity index 100% rename from boards/sam4e-ek/src/sam_leds.c rename to boards/arm/sam4e-ek/src/sam_leds.c diff --git a/boards/sam4e-ek/src/sam_spi.c b/boards/arm/sam4e-ek/src/sam_spi.c similarity index 100% rename from boards/sam4e-ek/src/sam_spi.c rename to boards/arm/sam4e-ek/src/sam_spi.c diff --git a/boards/sam4e-ek/src/sam_udp.c b/boards/arm/sam4e-ek/src/sam_udp.c similarity index 100% rename from boards/sam4e-ek/src/sam_udp.c rename to boards/arm/sam4e-ek/src/sam_udp.c diff --git a/boards/sam4e-ek/src/sam_usbmsc.c b/boards/arm/sam4e-ek/src/sam_usbmsc.c similarity index 100% rename from boards/sam4e-ek/src/sam_usbmsc.c rename to boards/arm/sam4e-ek/src/sam_usbmsc.c diff --git a/boards/sam4e-ek/tools/gdb.ini b/boards/arm/sam4e-ek/tools/gdb.ini similarity index 100% rename from boards/sam4e-ek/tools/gdb.ini rename to boards/arm/sam4e-ek/tools/gdb.ini diff --git a/boards/sam4e-ek/tools/openocd.cfg b/boards/arm/sam4e-ek/tools/openocd.cfg similarity index 100% rename from boards/sam4e-ek/tools/openocd.cfg rename to boards/arm/sam4e-ek/tools/openocd.cfg diff --git a/boards/sam4l-xplained/Kconfig b/boards/arm/sam4l-xplained/Kconfig similarity index 100% rename from boards/sam4l-xplained/Kconfig rename to boards/arm/sam4l-xplained/Kconfig diff --git a/boards/sam4l-xplained/README.txt b/boards/arm/sam4l-xplained/README.txt similarity index 100% rename from boards/sam4l-xplained/README.txt rename to boards/arm/sam4l-xplained/README.txt diff --git a/boards/sam4l-xplained/configs/nsh/defconfig b/boards/arm/sam4l-xplained/configs/nsh/defconfig similarity index 100% rename from boards/sam4l-xplained/configs/nsh/defconfig rename to boards/arm/sam4l-xplained/configs/nsh/defconfig diff --git a/boards/sam4l-xplained/include/board.h b/boards/arm/sam4l-xplained/include/board.h similarity index 98% rename from boards/sam4l-xplained/include/board.h rename to boards/arm/sam4l-xplained/include/board.h index d5a0415d2c..29fec0e92c 100644 --- a/boards/sam4l-xplained/include/board.h +++ b/boards/arm/sam4l-xplained/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAM4L_XPLAINED_INCLUDE_BOARD_H -#define __BOARDS_SAM4L_XPLAINED_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_SAM4L_XPLAINED_INCLUDE_BOARD_H +#define __BOARDS_ARM_SAM4L_XPLAINED_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -287,4 +287,4 @@ #define GPIO_SPI0_MOSI GPIO_SPI0_MOSI_1 #define GPIO_SPI0_SPCK GPIO_SPI0_SPCK_4 -#endif /* __BOARDS_SAM4L_XPLAINED_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_SAM4L_XPLAINED_INCLUDE_BOARD_H */ diff --git a/boards/sam4l-xplained/scripts/Make.defs b/boards/arm/sam4l-xplained/scripts/Make.defs similarity index 96% rename from boards/sam4l-xplained/scripts/Make.defs rename to boards/arm/sam4l-xplained/scripts/Make.defs index d3a8d2028a..326db05c56 100644 --- a/boards/sam4l-xplained/scripts/Make.defs +++ b/boards/arm/sam4l-xplained/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/sam4l-xplained.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/sam4l-xplained.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/sam4l-xplained.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/sam4l-xplained.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/sam4l-xplained/scripts/sam4l-xplained.ld b/boards/arm/sam4l-xplained/scripts/sam4l-xplained.ld similarity index 100% rename from boards/sam4l-xplained/scripts/sam4l-xplained.ld rename to boards/arm/sam4l-xplained/scripts/sam4l-xplained.ld diff --git a/boards/olimex-lpc2378/src/.gitignore b/boards/arm/sam4l-xplained/src/.gitignore similarity index 100% rename from boards/olimex-lpc2378/src/.gitignore rename to boards/arm/sam4l-xplained/src/.gitignore diff --git a/boards/sam4l-xplained/src/Makefile b/boards/arm/sam4l-xplained/src/Makefile similarity index 100% rename from boards/sam4l-xplained/src/Makefile rename to boards/arm/sam4l-xplained/src/Makefile diff --git a/boards/sam4l-xplained/src/sam4l-xplained.h b/boards/arm/sam4l-xplained/src/sam4l-xplained.h similarity index 98% rename from boards/sam4l-xplained/src/sam4l-xplained.h rename to boards/arm/sam4l-xplained/src/sam4l-xplained.h index 2b0e82d70b..0a4ef1e153 100644 --- a/boards/sam4l-xplained/src/sam4l-xplained.h +++ b/boards/arm/sam4l-xplained/src/sam4l-xplained.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAM4L_XPLAINED_SRC_SAM4L_XPLAINED_H -#define __BOARDS_SAM4L_XPLAINED_SRC_SAM4L_XPLAINED_H +#ifndef __BOARDS_ARM_SAM4L_XPLAINED_SRC_SAM4L_XPLAINED_H +#define __BOARDS_ARM_SAM4L_XPLAINED_SRC_SAM4L_XPLAINED_H /************************************************************************************ * Included Files @@ -359,5 +359,5 @@ int sam_slcd_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAM4L_XPLAINED_SRC_SAM4L_XPLAINED_H */ +#endif /* __BOARDS_ARM_SAM4L_XPLAINED_SRC_SAM4L_XPLAINED_H */ diff --git a/boards/sam4l-xplained/src/sam_appinit.c b/boards/arm/sam4l-xplained/src/sam_appinit.c similarity index 100% rename from boards/sam4l-xplained/src/sam_appinit.c rename to boards/arm/sam4l-xplained/src/sam_appinit.c diff --git a/boards/sam4l-xplained/src/sam_autoleds.c b/boards/arm/sam4l-xplained/src/sam_autoleds.c similarity index 100% rename from boards/sam4l-xplained/src/sam_autoleds.c rename to boards/arm/sam4l-xplained/src/sam_autoleds.c diff --git a/boards/sam4l-xplained/src/sam_boot.c b/boards/arm/sam4l-xplained/src/sam_boot.c similarity index 100% rename from boards/sam4l-xplained/src/sam_boot.c rename to boards/arm/sam4l-xplained/src/sam_boot.c diff --git a/boards/sam4l-xplained/src/sam_buttons.c b/boards/arm/sam4l-xplained/src/sam_buttons.c similarity index 100% rename from boards/sam4l-xplained/src/sam_buttons.c rename to boards/arm/sam4l-xplained/src/sam_buttons.c diff --git a/boards/sam4l-xplained/src/sam_mmcsd.c b/boards/arm/sam4l-xplained/src/sam_mmcsd.c similarity index 100% rename from boards/sam4l-xplained/src/sam_mmcsd.c rename to boards/arm/sam4l-xplained/src/sam_mmcsd.c diff --git a/boards/sam4l-xplained/src/sam_slcd.c b/boards/arm/sam4l-xplained/src/sam_slcd.c similarity index 100% rename from boards/sam4l-xplained/src/sam_slcd.c rename to boards/arm/sam4l-xplained/src/sam_slcd.c diff --git a/boards/sam4l-xplained/src/sam_spi.c b/boards/arm/sam4l-xplained/src/sam_spi.c similarity index 100% rename from boards/sam4l-xplained/src/sam_spi.c rename to boards/arm/sam4l-xplained/src/sam_spi.c diff --git a/boards/sam4l-xplained/src/sam_ug2832hsweg04.c b/boards/arm/sam4l-xplained/src/sam_ug2832hsweg04.c similarity index 100% rename from boards/sam4l-xplained/src/sam_ug2832hsweg04.c rename to boards/arm/sam4l-xplained/src/sam_ug2832hsweg04.c diff --git a/boards/sam4l-xplained/src/sam_userleds.c b/boards/arm/sam4l-xplained/src/sam_userleds.c similarity index 100% rename from boards/sam4l-xplained/src/sam_userleds.c rename to boards/arm/sam4l-xplained/src/sam_userleds.c diff --git a/boards/sam4s-xplained-pro/Kconfig b/boards/arm/sam4s-xplained-pro/Kconfig similarity index 100% rename from boards/sam4s-xplained-pro/Kconfig rename to boards/arm/sam4s-xplained-pro/Kconfig diff --git a/boards/sam4s-xplained-pro/README.txt b/boards/arm/sam4s-xplained-pro/README.txt similarity index 100% rename from boards/sam4s-xplained-pro/README.txt rename to boards/arm/sam4s-xplained-pro/README.txt diff --git a/boards/sam4s-xplained-pro/configs/nsh/defconfig b/boards/arm/sam4s-xplained-pro/configs/nsh/defconfig similarity index 100% rename from boards/sam4s-xplained-pro/configs/nsh/defconfig rename to boards/arm/sam4s-xplained-pro/configs/nsh/defconfig diff --git a/boards/sam4s-xplained-pro/include/board.h b/boards/arm/sam4s-xplained-pro/include/board.h similarity index 98% rename from boards/sam4s-xplained-pro/include/board.h rename to boards/arm/sam4s-xplained-pro/include/board.h index 5fad88d2e5..480f8d0666 100644 --- a/boards/sam4s-xplained-pro/include/board.h +++ b/boards/arm/sam4s-xplained-pro/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAM4S_XPLAINED_PRO_INCLUDE_BOARD_H -#define __BOARDS_SAM4S_XPLAINED_PRO_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_SAM4S_XPLAINED_PRO_INCLUDE_BOARD_H +#define __BOARDS_ARM_SAM4S_XPLAINED_PRO_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -251,4 +251,4 @@ #define BUTTON_SW0_BIT (1 << BUTTON_SW0) -#endif /* __BOARDS_SAM4S_XPLAINED_PRO_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_SAM4S_XPLAINED_PRO_INCLUDE_BOARD_H */ diff --git a/boards/sam4s-xplained-pro/scripts/Make.defs b/boards/arm/sam4s-xplained-pro/scripts/Make.defs similarity index 96% rename from boards/sam4s-xplained-pro/scripts/Make.defs rename to boards/arm/sam4s-xplained-pro/scripts/Make.defs index 1959f145e5..9908c5a2f1 100644 --- a/boards/sam4s-xplained-pro/scripts/Make.defs +++ b/boards/arm/sam4s-xplained-pro/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained-pro.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained-pro.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained-pro.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained-pro.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/sam4s-xplained-pro/scripts/sam4s-xplained-pro.ld b/boards/arm/sam4s-xplained-pro/scripts/sam4s-xplained-pro.ld similarity index 100% rename from boards/sam4s-xplained-pro/scripts/sam4s-xplained-pro.ld rename to boards/arm/sam4s-xplained-pro/scripts/sam4s-xplained-pro.ld diff --git a/boards/sam4s-xplained-pro/src/Makefile b/boards/arm/sam4s-xplained-pro/src/Makefile similarity index 100% rename from boards/sam4s-xplained-pro/src/Makefile rename to boards/arm/sam4s-xplained-pro/src/Makefile diff --git a/boards/sam4s-xplained-pro/src/sam4s-xplained-pro.h b/boards/arm/sam4s-xplained-pro/src/sam4s-xplained-pro.h similarity index 97% rename from boards/sam4s-xplained-pro/src/sam4s-xplained-pro.h rename to boards/arm/sam4s-xplained-pro/src/sam4s-xplained-pro.h index 7f9882eea1..339ea18afc 100644 --- a/boards/sam4s-xplained-pro/src/sam4s-xplained-pro.h +++ b/boards/arm/sam4s-xplained-pro/src/sam4s-xplained-pro.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H -#define __BOARDS_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H +#ifndef __BOARDS_ARM_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H +#define __BOARDS_ARM_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H /************************************************************************************ * Included Files @@ -232,4 +232,4 @@ bool sam_writeprotected(int slotno); int sam_watchdog_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H */ +#endif /* __BOARDS_ARM_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H */ diff --git a/boards/sam4s-xplained-pro/src/sam_appinit.c b/boards/arm/sam4s-xplained-pro/src/sam_appinit.c similarity index 100% rename from boards/sam4s-xplained-pro/src/sam_appinit.c rename to boards/arm/sam4s-xplained-pro/src/sam_appinit.c diff --git a/boards/sam4s-xplained-pro/src/sam_autoleds.c b/boards/arm/sam4s-xplained-pro/src/sam_autoleds.c similarity index 100% rename from boards/sam4s-xplained-pro/src/sam_autoleds.c rename to boards/arm/sam4s-xplained-pro/src/sam_autoleds.c diff --git a/boards/sam4s-xplained-pro/src/sam_boot.c b/boards/arm/sam4s-xplained-pro/src/sam_boot.c similarity index 100% rename from boards/sam4s-xplained-pro/src/sam_boot.c rename to boards/arm/sam4s-xplained-pro/src/sam_boot.c diff --git a/boards/sam4s-xplained-pro/src/sam_buttons.c b/boards/arm/sam4s-xplained-pro/src/sam_buttons.c similarity index 100% rename from boards/sam4s-xplained-pro/src/sam_buttons.c rename to boards/arm/sam4s-xplained-pro/src/sam_buttons.c diff --git a/boards/sam4s-xplained-pro/src/sam_hsmci.c b/boards/arm/sam4s-xplained-pro/src/sam_hsmci.c similarity index 100% rename from boards/sam4s-xplained-pro/src/sam_hsmci.c rename to boards/arm/sam4s-xplained-pro/src/sam_hsmci.c diff --git a/boards/sam4s-xplained-pro/src/sam_udp.c b/boards/arm/sam4s-xplained-pro/src/sam_udp.c similarity index 100% rename from boards/sam4s-xplained-pro/src/sam_udp.c rename to boards/arm/sam4s-xplained-pro/src/sam_udp.c diff --git a/boards/sam4s-xplained-pro/src/sam_userleds.c b/boards/arm/sam4s-xplained-pro/src/sam_userleds.c similarity index 100% rename from boards/sam4s-xplained-pro/src/sam_userleds.c rename to boards/arm/sam4s-xplained-pro/src/sam_userleds.c diff --git a/boards/sam4s-xplained-pro/src/sam_wdt.c b/boards/arm/sam4s-xplained-pro/src/sam_wdt.c similarity index 100% rename from boards/sam4s-xplained-pro/src/sam_wdt.c rename to boards/arm/sam4s-xplained-pro/src/sam_wdt.c diff --git a/boards/sam4s-xplained/Kconfig b/boards/arm/sam4s-xplained/Kconfig similarity index 100% rename from boards/sam4s-xplained/Kconfig rename to boards/arm/sam4s-xplained/Kconfig diff --git a/boards/sam4s-xplained/README.txt b/boards/arm/sam4s-xplained/README.txt similarity index 100% rename from boards/sam4s-xplained/README.txt rename to boards/arm/sam4s-xplained/README.txt diff --git a/boards/sam4s-xplained/configs/nsh/defconfig b/boards/arm/sam4s-xplained/configs/nsh/defconfig similarity index 100% rename from boards/sam4s-xplained/configs/nsh/defconfig rename to boards/arm/sam4s-xplained/configs/nsh/defconfig diff --git a/boards/sam4s-xplained/include/board.h b/boards/arm/sam4s-xplained/include/board.h similarity index 98% rename from boards/sam4s-xplained/include/board.h rename to boards/arm/sam4s-xplained/include/board.h index d6cf67f496..14517bd690 100644 --- a/boards/sam4s-xplained/include/board.h +++ b/boards/arm/sam4s-xplained/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAM4L_XPLAINED_INCLUDE_BOARD_H -#define __BOARDS_SAM4L_XPLAINED_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_SAM4L_XPLAINED_INCLUDE_BOARD_H +#define __BOARDS_ARM_SAM4L_XPLAINED_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -210,4 +210,4 @@ #define BUTTON_BP2_BIT (1 << BUTTON_BP2) -#endif /* __BOARDS_SAM4L_XPLAINED_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_SAM4L_XPLAINED_INCLUDE_BOARD_H */ diff --git a/boards/sam4s-xplained/scripts/Make.defs b/boards/arm/sam4s-xplained/scripts/Make.defs similarity index 96% rename from boards/sam4s-xplained/scripts/Make.defs rename to boards/arm/sam4s-xplained/scripts/Make.defs index 35cd0df488..db3b994427 100644 --- a/boards/sam4s-xplained/scripts/Make.defs +++ b/boards/arm/sam4s-xplained/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/sam4s-xplained/scripts/sam4s-xplained.ld b/boards/arm/sam4s-xplained/scripts/sam4s-xplained.ld similarity index 100% rename from boards/sam4s-xplained/scripts/sam4s-xplained.ld rename to boards/arm/sam4s-xplained/scripts/sam4s-xplained.ld diff --git a/boards/sam4s-xplained/src/Makefile b/boards/arm/sam4s-xplained/src/Makefile similarity index 100% rename from boards/sam4s-xplained/src/Makefile rename to boards/arm/sam4s-xplained/src/Makefile diff --git a/boards/sam4s-xplained/src/sam4s-xplained.h b/boards/arm/sam4s-xplained/src/sam4s-xplained.h similarity index 97% rename from boards/sam4s-xplained/src/sam4s-xplained.h rename to boards/arm/sam4s-xplained/src/sam4s-xplained.h index 299c71932a..cb27370012 100644 --- a/boards/sam4s-xplained/src/sam4s-xplained.h +++ b/boards/arm/sam4s-xplained/src/sam4s-xplained.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H -#define __BOARDS_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H +#ifndef __BOARDS_ARM_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H +#define __BOARDS_ARM_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H /************************************************************************************ * Included Files @@ -136,5 +136,5 @@ void sam_sram_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H */ +#endif /* __BOARDS_ARM_SAM4S_XPLAINED_SRC_SAM4S_XPLAINED_H */ diff --git a/boards/sam4s-xplained/src/sam_autoleds.c b/boards/arm/sam4s-xplained/src/sam_autoleds.c similarity index 100% rename from boards/sam4s-xplained/src/sam_autoleds.c rename to boards/arm/sam4s-xplained/src/sam_autoleds.c diff --git a/boards/sam4s-xplained/src/sam_boot.c b/boards/arm/sam4s-xplained/src/sam_boot.c similarity index 100% rename from boards/sam4s-xplained/src/sam_boot.c rename to boards/arm/sam4s-xplained/src/sam_boot.c diff --git a/boards/sam4s-xplained/src/sam_buttons.c b/boards/arm/sam4s-xplained/src/sam_buttons.c similarity index 100% rename from boards/sam4s-xplained/src/sam_buttons.c rename to boards/arm/sam4s-xplained/src/sam_buttons.c diff --git a/boards/sam4s-xplained/src/sam_sram.c b/boards/arm/sam4s-xplained/src/sam_sram.c similarity index 100% rename from boards/sam4s-xplained/src/sam_sram.c rename to boards/arm/sam4s-xplained/src/sam_sram.c diff --git a/boards/sam4s-xplained/src/sam_userleds.c b/boards/arm/sam4s-xplained/src/sam_userleds.c similarity index 100% rename from boards/sam4s-xplained/src/sam_userleds.c rename to boards/arm/sam4s-xplained/src/sam_userleds.c diff --git a/boards/sama5d2-xult/Kconfig b/boards/arm/sama5d2-xult/Kconfig similarity index 100% rename from boards/sama5d2-xult/Kconfig rename to boards/arm/sama5d2-xult/Kconfig diff --git a/boards/sama5d2-xult/README.txt b/boards/arm/sama5d2-xult/README.txt similarity index 100% rename from boards/sama5d2-xult/README.txt rename to boards/arm/sama5d2-xult/README.txt diff --git a/boards/sama5d2-xult/configs/nsh/defconfig b/boards/arm/sama5d2-xult/configs/nsh/defconfig similarity index 100% rename from boards/sama5d2-xult/configs/nsh/defconfig rename to boards/arm/sama5d2-xult/configs/nsh/defconfig diff --git a/boards/sama5d2-xult/include/.gitignore b/boards/arm/sama5d2-xult/include/.gitignore similarity index 100% rename from boards/sama5d2-xult/include/.gitignore rename to boards/arm/sama5d2-xult/include/.gitignore diff --git a/boards/sama5d2-xult/include/board.h b/boards/arm/sama5d2-xult/include/board.h similarity index 98% rename from boards/sama5d2-xult/include/board.h rename to boards/arm/sama5d2-xult/include/board.h index a51c513799..0725a0c6b4 100644 --- a/boards/sama5d2-xult/include/board.h +++ b/boards/arm/sama5d2-xult/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_H -#define __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_H +#define __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -270,4 +270,4 @@ .endm #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_H */ diff --git a/boards/sama5d2-xult/include/board_384mhz.h b/boards/arm/sama5d2-xult/include/board_384mhz.h similarity index 98% rename from boards/sama5d2-xult/include/board_384mhz.h rename to boards/arm/sama5d2-xult/include/board_384mhz.h index bb241fc5d2..80372a40aa 100644 --- a/boards/sama5d2-xult/include/board_384mhz.h +++ b/boards/arm/sama5d2-xult/include/board_384mhz.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_384MHZ_H -#define __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_384MHZ_H +#ifndef __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_384MHZ_H +#define __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_384MHZ_H /************************************************************************************ * Included Files @@ -221,4 +221,4 @@ extern "C" { #endif #endif /* !__ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_384MHZ_H */ +#endif /* __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_384MHZ_H */ diff --git a/boards/sama5d2-xult/include/board_396mhz.h b/boards/arm/sama5d2-xult/include/board_396mhz.h similarity index 97% rename from boards/sama5d2-xult/include/board_396mhz.h rename to boards/arm/sama5d2-xult/include/board_396mhz.h index b5f9ef7d4a..5078b9360c 100644 --- a/boards/sama5d2-xult/include/board_396mhz.h +++ b/boards/arm/sama5d2-xult/include/board_396mhz.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_396MHZ_H -#define __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_396MHZ_H +#ifndef __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_396MHZ_H +#define __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_396MHZ_H /************************************************************************************ * Included Files @@ -213,4 +213,4 @@ extern "C" { #endif #endif /* !__ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_396MHZ_H */ +#endif /* __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_396MHZ_H */ diff --git a/boards/sama5d2-xult/include/board_528mhz.h b/boards/arm/sama5d2-xult/include/board_528mhz.h similarity index 97% rename from boards/sama5d2-xult/include/board_528mhz.h rename to boards/arm/sama5d2-xult/include/board_528mhz.h index 9bc29d7822..ca7f112a20 100644 --- a/boards/sama5d2-xult/include/board_528mhz.h +++ b/boards/arm/sama5d2-xult/include/board_528mhz.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_528MHZ_H -#define __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_528MHZ_H +#ifndef __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_528MHZ_H +#define __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_528MHZ_H /************************************************************************************ * Included Files @@ -212,4 +212,4 @@ extern "C" { #endif #endif /* !__ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_528MHZ_H */ +#endif /* __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_528MHZ_H */ diff --git a/boards/sama5d2-xult/include/board_memorymap.h b/boards/arm/sama5d2-xult/include/board_memorymap.h similarity index 93% rename from boards/sama5d2-xult/include/board_memorymap.h rename to boards/arm/sama5d2-xult/include/board_memorymap.h index cef9f62fe2..98757096df 100644 --- a/boards/sama5d2-xult/include/board_memorymap.h +++ b/boards/arm/sama5d2-xult/include/board_memorymap.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_MEMORYMAP_H -#define __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_MEMORYMAP_H +#ifndef __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_MEMORYMAP_H +#define __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_MEMORYMAP_H /************************************************************************************ * Included Files @@ -70,4 +70,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_MEMORYMAP_H */ +#endif /* __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_MEMORYMAP_H */ diff --git a/boards/sama5d2-xult/include/board_sdram.h b/boards/arm/sama5d2-xult/include/board_sdram.h similarity index 97% rename from boards/sama5d2-xult/include/board_sdram.h rename to boards/arm/sama5d2-xult/include/board_sdram.h index bb991b8897..28942b157a 100644 --- a/boards/sama5d2-xult/include/board_sdram.h +++ b/boards/arm/sama5d2-xult/include/board_sdram.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_SDRAM_H -#define __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_SDRAM_H +#ifndef __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_SDRAM_H +#define __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_SDRAM_H /************************************************************************************ * Included Files @@ -174,4 +174,4 @@ extern "C" { #endif #endif /* !__ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D2_XULT_INCLUDE_BOARD_SDRAM_H */ +#endif /* __BOARDS_ARM_SAMA5D2_XULT_INCLUDE_BOARD_SDRAM_H */ diff --git a/boards/sama5d2-xult/scripts/Make.defs b/boards/arm/sama5d2-xult/scripts/Make.defs similarity index 93% rename from boards/sama5d2-xult/scripts/Make.defs rename to boards/arm/sama5d2-xult/scripts/Make.defs index 4ce46ef4dc..0388598deb 100644 --- a/boards/sama5d2-xult/scripts/Make.defs +++ b/boards/arm/sama5d2-xult/scripts/Make.defs @@ -53,12 +53,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) endif CC = $(CROSSDEV)gcc @@ -107,9 +107,9 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/sama5d2-xult/scripts/dramboot.ld b/boards/arm/sama5d2-xult/scripts/dramboot.ld similarity index 100% rename from boards/sama5d2-xult/scripts/dramboot.ld rename to boards/arm/sama5d2-xult/scripts/dramboot.ld diff --git a/boards/sama5d2-xult/scripts/gnu-elf.ld b/boards/arm/sama5d2-xult/scripts/gnu-elf.ld similarity index 100% rename from boards/sama5d2-xult/scripts/gnu-elf.ld rename to boards/arm/sama5d2-xult/scripts/gnu-elf.ld diff --git a/boards/sama5d2-xult/scripts/isram.ld b/boards/arm/sama5d2-xult/scripts/isram.ld similarity index 100% rename from boards/sama5d2-xult/scripts/isram.ld rename to boards/arm/sama5d2-xult/scripts/isram.ld diff --git a/boards/sama5d2-xult/scripts/uboot.ld b/boards/arm/sama5d2-xult/scripts/uboot.ld similarity index 100% rename from boards/sama5d2-xult/scripts/uboot.ld rename to boards/arm/sama5d2-xult/scripts/uboot.ld diff --git a/boards/sama5d2-xult/src/Makefile b/boards/arm/sama5d2-xult/src/Makefile similarity index 100% rename from boards/sama5d2-xult/src/Makefile rename to boards/arm/sama5d2-xult/src/Makefile diff --git a/boards/sama5d2-xult/src/sam_appinit.c b/boards/arm/sama5d2-xult/src/sam_appinit.c similarity index 100% rename from boards/sama5d2-xult/src/sam_appinit.c rename to boards/arm/sama5d2-xult/src/sam_appinit.c diff --git a/boards/sama5d2-xult/src/sam_autoleds.c b/boards/arm/sama5d2-xult/src/sam_autoleds.c similarity index 100% rename from boards/sama5d2-xult/src/sam_autoleds.c rename to boards/arm/sama5d2-xult/src/sam_autoleds.c diff --git a/boards/sama5d2-xult/src/sam_boot.c b/boards/arm/sama5d2-xult/src/sam_boot.c similarity index 100% rename from boards/sama5d2-xult/src/sam_boot.c rename to boards/arm/sama5d2-xult/src/sam_boot.c diff --git a/boards/sama5d2-xult/src/sam_bringup.c b/boards/arm/sama5d2-xult/src/sam_bringup.c similarity index 100% rename from boards/sama5d2-xult/src/sam_bringup.c rename to boards/arm/sama5d2-xult/src/sam_bringup.c diff --git a/boards/sama5d2-xult/src/sam_buttons.c b/boards/arm/sama5d2-xult/src/sam_buttons.c similarity index 100% rename from boards/sama5d2-xult/src/sam_buttons.c rename to boards/arm/sama5d2-xult/src/sam_buttons.c diff --git a/boards/sama5d2-xult/src/sam_userleds.c b/boards/arm/sama5d2-xult/src/sam_userleds.c similarity index 100% rename from boards/sama5d2-xult/src/sam_userleds.c rename to boards/arm/sama5d2-xult/src/sam_userleds.c diff --git a/boards/sama5d2-xult/src/sama5d2-xult.h b/boards/arm/sama5d2-xult/src/sama5d2-xult.h similarity index 97% rename from boards/sama5d2-xult/src/sama5d2-xult.h rename to boards/arm/sama5d2-xult/src/sama5d2-xult.h index 6477c8954c..ea9cafd158 100644 --- a/boards/sama5d2-xult/src/sama5d2-xult.h +++ b/boards/arm/sama5d2-xult/src/sama5d2-xult.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D2_XULT_SRC_SAMA5D2_XULT_H -#define __BOARDS_SAMA5D2_XULT_SRC_SAMA5D2_XULT_H +#ifndef __BOARDS_ARM_SAMA5D2_XULT_SRC_SAMA5D2_XULT_H +#define __BOARDS_ARM_SAMA5D2_XULT_SRC_SAMA5D2_XULT_H /************************************************************************************ * Included Files @@ -127,5 +127,5 @@ int sam_bringup(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D2_XULT_SRC_SAMA5D2_XULT_H */ +#endif /* __BOARDS_ARM_SAMA5D2_XULT_SRC_SAMA5D2_XULT_H */ diff --git a/boards/sama5d3-xplained/Kconfig b/boards/arm/sama5d3-xplained/Kconfig similarity index 100% rename from boards/sama5d3-xplained/Kconfig rename to boards/arm/sama5d3-xplained/Kconfig diff --git a/boards/sama5d3-xplained/README.txt b/boards/arm/sama5d3-xplained/README.txt similarity index 100% rename from boards/sama5d3-xplained/README.txt rename to boards/arm/sama5d3-xplained/README.txt diff --git a/boards/sama5d3-xplained/configs/bridge/defconfig b/boards/arm/sama5d3-xplained/configs/bridge/defconfig similarity index 100% rename from boards/sama5d3-xplained/configs/bridge/defconfig rename to boards/arm/sama5d3-xplained/configs/bridge/defconfig diff --git a/boards/sama5d3-xplained/configs/nsh/defconfig b/boards/arm/sama5d3-xplained/configs/nsh/defconfig similarity index 100% rename from boards/sama5d3-xplained/configs/nsh/defconfig rename to boards/arm/sama5d3-xplained/configs/nsh/defconfig diff --git a/boards/sama5d3-xplained/include/board.h b/boards/arm/sama5d3-xplained/include/board.h similarity index 98% rename from boards/sama5d3-xplained/include/board.h rename to boards/arm/sama5d3-xplained/include/board.h index 52e12719cd..ab98e704a8 100644 --- a/boards/sama5d3-xplained/include/board.h +++ b/boards/arm/sama5d3-xplained/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_H -#define __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_H +#define __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -302,4 +302,4 @@ .endm #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_H */ diff --git a/boards/sama5d3-xplained/include/board_384mhz.h b/boards/arm/sama5d3-xplained/include/board_384mhz.h similarity index 97% rename from boards/sama5d3-xplained/include/board_384mhz.h rename to boards/arm/sama5d3-xplained/include/board_384mhz.h index 551a4b3c3e..290419ca17 100644 --- a/boards/sama5d3-xplained/include/board_384mhz.h +++ b/boards/arm/sama5d3-xplained/include/board_384mhz.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_384MHZ_H -#define __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_384MHZ_H +#ifndef __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_384MHZ_H +#define __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_384MHZ_H /************************************************************************************ * Included Files @@ -221,4 +221,4 @@ extern "C" { #endif #endif /* !__ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_384MHZ_H */ +#endif /* __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_384MHZ_H */ diff --git a/boards/sama5d3-xplained/include/board_396mhz.h b/boards/arm/sama5d3-xplained/include/board_396mhz.h similarity index 97% rename from boards/sama5d3-xplained/include/board_396mhz.h rename to boards/arm/sama5d3-xplained/include/board_396mhz.h index 4f7917b0fe..49a40ca02a 100644 --- a/boards/sama5d3-xplained/include/board_396mhz.h +++ b/boards/arm/sama5d3-xplained/include/board_396mhz.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_396MHZ_H -#define __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_396MHZ_H +#ifndef __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_396MHZ_H +#define __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_396MHZ_H /************************************************************************************ * Included Files @@ -218,4 +218,4 @@ extern "C" { #endif #endif /* !__ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_396MHZ_H */ +#endif /* __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_396MHZ_H */ diff --git a/boards/sama5d3-xplained/include/board_528mhz.h b/boards/arm/sama5d3-xplained/include/board_528mhz.h similarity index 97% rename from boards/sama5d3-xplained/include/board_528mhz.h rename to boards/arm/sama5d3-xplained/include/board_528mhz.h index a6b92862f4..2780c358b8 100644 --- a/boards/sama5d3-xplained/include/board_528mhz.h +++ b/boards/arm/sama5d3-xplained/include/board_528mhz.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_528MHZ_H -#define __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_528MHZ_H +#ifndef __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_528MHZ_H +#define __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_528MHZ_H /************************************************************************************ * Included Files @@ -217,4 +217,4 @@ extern "C" { #endif #endif /* !__ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_528MHZ_H */ +#endif /* __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_528MHZ_H */ diff --git a/boards/sama5d3-xplained/include/board_memorymap.h b/boards/arm/sama5d3-xplained/include/board_memorymap.h similarity index 93% rename from boards/sama5d3-xplained/include/board_memorymap.h rename to boards/arm/sama5d3-xplained/include/board_memorymap.h index ae2b3a346c..68423e77a7 100644 --- a/boards/sama5d3-xplained/include/board_memorymap.h +++ b/boards/arm/sama5d3-xplained/include/board_memorymap.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_MEMORYMAP_H -#define __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_MEMORYMAP_H +#ifndef __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_MEMORYMAP_H +#define __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_MEMORYMAP_H /************************************************************************************ * Included Files @@ -70,4 +70,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_MEMORYMAP_H */ +#endif /* __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_MEMORYMAP_H */ diff --git a/boards/sama5d3-xplained/include/board_sdram.h b/boards/arm/sama5d3-xplained/include/board_sdram.h similarity index 97% rename from boards/sama5d3-xplained/include/board_sdram.h rename to boards/arm/sama5d3-xplained/include/board_sdram.h index 53939d91e5..97cc07b0a4 100644 --- a/boards/sama5d3-xplained/include/board_sdram.h +++ b/boards/arm/sama5d3-xplained/include/board_sdram.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_SDRAM_H -#define __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_SDRAM_H +#ifndef __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_SDRAM_H +#define __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_SDRAM_H /************************************************************************************ * Included Files @@ -177,4 +177,4 @@ extern "C" { #endif #endif /* !__ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D3_XPLAINED_INCLUDE_BOARD_SDRAM_H */ +#endif /* __BOARDS_ARM_SAMA5D3_XPLAINED_INCLUDE_BOARD_SDRAM_H */ diff --git a/boards/sama5d3-xplained/scripts/Make.defs b/boards/arm/sama5d3-xplained/scripts/Make.defs similarity index 93% rename from boards/sama5d3-xplained/scripts/Make.defs rename to boards/arm/sama5d3-xplained/scripts/Make.defs index ee3e1d7d0f..66620564b4 100644 --- a/boards/sama5d3-xplained/scripts/Make.defs +++ b/boards/arm/sama5d3-xplained/scripts/Make.defs @@ -49,12 +49,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) endif CC = $(CROSSDEV)gcc @@ -103,9 +103,9 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/sama5d3-xplained/scripts/ddram.ld b/boards/arm/sama5d3-xplained/scripts/ddram.ld similarity index 100% rename from boards/sama5d3-xplained/scripts/ddram.ld rename to boards/arm/sama5d3-xplained/scripts/ddram.ld diff --git a/boards/sama5d3-xplained/scripts/gnu-elf.ld b/boards/arm/sama5d3-xplained/scripts/gnu-elf.ld similarity index 100% rename from boards/sama5d3-xplained/scripts/gnu-elf.ld rename to boards/arm/sama5d3-xplained/scripts/gnu-elf.ld diff --git a/boards/sama5d3-xplained/scripts/isram.ld b/boards/arm/sama5d3-xplained/scripts/isram.ld similarity index 100% rename from boards/sama5d3-xplained/scripts/isram.ld rename to boards/arm/sama5d3-xplained/scripts/isram.ld diff --git a/boards/sama5d3-xplained/src/Makefile b/boards/arm/sama5d3-xplained/src/Makefile similarity index 100% rename from boards/sama5d3-xplained/src/Makefile rename to boards/arm/sama5d3-xplained/src/Makefile diff --git a/boards/sama5d3-xplained/src/sam_adc.c b/boards/arm/sama5d3-xplained/src/sam_adc.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_adc.c rename to boards/arm/sama5d3-xplained/src/sam_adc.c diff --git a/boards/sama5d3-xplained/src/sam_ajoystick.c b/boards/arm/sama5d3-xplained/src/sam_ajoystick.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_ajoystick.c rename to boards/arm/sama5d3-xplained/src/sam_ajoystick.c diff --git a/boards/sama5d3-xplained/src/sam_appinit.c b/boards/arm/sama5d3-xplained/src/sam_appinit.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_appinit.c rename to boards/arm/sama5d3-xplained/src/sam_appinit.c diff --git a/boards/sama5d3-xplained/src/sam_at25.c b/boards/arm/sama5d3-xplained/src/sam_at25.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_at25.c rename to boards/arm/sama5d3-xplained/src/sam_at25.c diff --git a/boards/sama5d3-xplained/src/sam_autoleds.c b/boards/arm/sama5d3-xplained/src/sam_autoleds.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_autoleds.c rename to boards/arm/sama5d3-xplained/src/sam_autoleds.c diff --git a/boards/sama5d3-xplained/src/sam_boot.c b/boards/arm/sama5d3-xplained/src/sam_boot.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_boot.c rename to boards/arm/sama5d3-xplained/src/sam_boot.c diff --git a/boards/sama5d3-xplained/src/sam_buttons.c b/boards/arm/sama5d3-xplained/src/sam_buttons.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_buttons.c rename to boards/arm/sama5d3-xplained/src/sam_buttons.c diff --git a/boards/sama5d3-xplained/src/sam_can.c b/boards/arm/sama5d3-xplained/src/sam_can.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_can.c rename to boards/arm/sama5d3-xplained/src/sam_can.c diff --git a/boards/sama5d3-xplained/src/sam_ethernet.c b/boards/arm/sama5d3-xplained/src/sam_ethernet.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_ethernet.c rename to boards/arm/sama5d3-xplained/src/sam_ethernet.c diff --git a/boards/sama5d3-xplained/src/sam_hsmci.c b/boards/arm/sama5d3-xplained/src/sam_hsmci.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_hsmci.c rename to boards/arm/sama5d3-xplained/src/sam_hsmci.c diff --git a/boards/sama5d3-xplained/src/sam_i2schar.c b/boards/arm/sama5d3-xplained/src/sam_i2schar.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_i2schar.c rename to boards/arm/sama5d3-xplained/src/sam_i2schar.c diff --git a/boards/sama5d3-xplained/src/sam_nandflash.c b/boards/arm/sama5d3-xplained/src/sam_nandflash.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_nandflash.c rename to boards/arm/sama5d3-xplained/src/sam_nandflash.c diff --git a/boards/sama5d3-xplained/src/sam_ostest.c b/boards/arm/sama5d3-xplained/src/sam_ostest.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_ostest.c rename to boards/arm/sama5d3-xplained/src/sam_ostest.c diff --git a/boards/sama5d3-xplained/src/sam_pwm.c b/boards/arm/sama5d3-xplained/src/sam_pwm.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_pwm.c rename to boards/arm/sama5d3-xplained/src/sam_pwm.c diff --git a/boards/sama5d3-xplained/src/sam_sdram.c b/boards/arm/sama5d3-xplained/src/sam_sdram.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_sdram.c rename to boards/arm/sama5d3-xplained/src/sam_sdram.c diff --git a/boards/sama5d3-xplained/src/sam_spi.c b/boards/arm/sama5d3-xplained/src/sam_spi.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_spi.c rename to boards/arm/sama5d3-xplained/src/sam_spi.c diff --git a/boards/sama5d3-xplained/src/sam_usb.c b/boards/arm/sama5d3-xplained/src/sam_usb.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_usb.c rename to boards/arm/sama5d3-xplained/src/sam_usb.c diff --git a/boards/sama5d3-xplained/src/sam_usbmsc.c b/boards/arm/sama5d3-xplained/src/sam_usbmsc.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_usbmsc.c rename to boards/arm/sama5d3-xplained/src/sam_usbmsc.c diff --git a/boards/sama5d3-xplained/src/sam_userleds.c b/boards/arm/sama5d3-xplained/src/sam_userleds.c similarity index 100% rename from boards/sama5d3-xplained/src/sam_userleds.c rename to boards/arm/sama5d3-xplained/src/sam_userleds.c diff --git a/boards/sama5d3-xplained/src/sama5d3-xplained.h b/boards/arm/sama5d3-xplained/src/sama5d3-xplained.h similarity index 99% rename from boards/sama5d3-xplained/src/sama5d3-xplained.h rename to boards/arm/sama5d3-xplained/src/sama5d3-xplained.h index 6aca4ecb41..5ec0a8767f 100644 --- a/boards/sama5d3-xplained/src/sama5d3-xplained.h +++ b/boards/arm/sama5d3-xplained/src/sama5d3-xplained.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D3_XPLAINED_SRC_SAMA5D3_XPLAINED_H -#define __BOARDS_SAMA5D3_XPLAINED_SRC_SAMA5D3_XPLAINED_H +#ifndef __BOARDS_ARM_SAMA5D3_XPLAINED_SRC_SAMA5D3_XPLAINED_H +#define __BOARDS_ARM_SAMA5D3_XPLAINED_SRC_SAMA5D3_XPLAINED_H /************************************************************************************ * Included Files @@ -788,5 +788,5 @@ void weak_function sam_netinitialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D3_XPLAINED_SRC_SAMA5D3_XPLAINED_H */ +#endif /* __BOARDS_ARM_SAMA5D3_XPLAINED_SRC_SAMA5D3_XPLAINED_H */ diff --git a/boards/sama5d3x-ek/Kconfig b/boards/arm/sama5d3x-ek/Kconfig similarity index 100% rename from boards/sama5d3x-ek/Kconfig rename to boards/arm/sama5d3x-ek/Kconfig diff --git a/boards/sama5d3x-ek/README.txt b/boards/arm/sama5d3x-ek/README.txt similarity index 100% rename from boards/sama5d3x-ek/README.txt rename to boards/arm/sama5d3x-ek/README.txt diff --git a/boards/sama5d3x-ek/Using-NxPlayer.txt b/boards/arm/sama5d3x-ek/Using-NxPlayer.txt similarity index 100% rename from boards/sama5d3x-ek/Using-NxPlayer.txt rename to boards/arm/sama5d3x-ek/Using-NxPlayer.txt diff --git a/boards/sama5d3x-ek/configs/demo/defconfig b/boards/arm/sama5d3x-ek/configs/demo/defconfig similarity index 100% rename from boards/sama5d3x-ek/configs/demo/defconfig rename to boards/arm/sama5d3x-ek/configs/demo/defconfig diff --git a/boards/sama5d3x-ek/configs/hello/defconfig b/boards/arm/sama5d3x-ek/configs/hello/defconfig similarity index 100% rename from boards/sama5d3x-ek/configs/hello/defconfig rename to boards/arm/sama5d3x-ek/configs/hello/defconfig diff --git a/boards/sama5d3x-ek/configs/norboot/defconfig b/boards/arm/sama5d3x-ek/configs/norboot/defconfig similarity index 100% rename from boards/sama5d3x-ek/configs/norboot/defconfig rename to boards/arm/sama5d3x-ek/configs/norboot/defconfig diff --git a/boards/sama5d3x-ek/configs/nsh/defconfig b/boards/arm/sama5d3x-ek/configs/nsh/defconfig similarity index 100% rename from boards/sama5d3x-ek/configs/nsh/defconfig rename to boards/arm/sama5d3x-ek/configs/nsh/defconfig diff --git a/boards/sama5d3x-ek/configs/nx/defconfig b/boards/arm/sama5d3x-ek/configs/nx/defconfig similarity index 100% rename from boards/sama5d3x-ek/configs/nx/defconfig rename to boards/arm/sama5d3x-ek/configs/nx/defconfig diff --git a/boards/sama5d3x-ek/configs/nxplayer/defconfig b/boards/arm/sama5d3x-ek/configs/nxplayer/defconfig similarity index 100% rename from boards/sama5d3x-ek/configs/nxplayer/defconfig rename to boards/arm/sama5d3x-ek/configs/nxplayer/defconfig diff --git a/boards/sama5d3x-ek/configs/nxwm/defconfig b/boards/arm/sama5d3x-ek/configs/nxwm/defconfig similarity index 100% rename from boards/sama5d3x-ek/configs/nxwm/defconfig rename to boards/arm/sama5d3x-ek/configs/nxwm/defconfig diff --git a/boards/sama5d3x-ek/configs/ov2640/defconfig b/boards/arm/sama5d3x-ek/configs/ov2640/defconfig similarity index 100% rename from boards/sama5d3x-ek/configs/ov2640/defconfig rename to boards/arm/sama5d3x-ek/configs/ov2640/defconfig diff --git a/boards/sama5d3x-ek/include/board.h b/boards/arm/sama5d3x-ek/include/board.h similarity index 98% rename from boards/sama5d3x-ek/include/board.h rename to boards/arm/sama5d3x-ek/include/board.h index 9ac5ddc5b6..dbb3f4c2f9 100644 --- a/boards/sama5d3x-ek/include/board.h +++ b/boards/arm/sama5d3x-ek/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_H -#define __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_H +#define __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -343,4 +343,4 @@ .endm #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_H */ diff --git a/boards/sama5d3x-ek/include/board_384mhz.h b/boards/arm/sama5d3x-ek/include/board_384mhz.h similarity index 98% rename from boards/sama5d3x-ek/include/board_384mhz.h rename to boards/arm/sama5d3x-ek/include/board_384mhz.h index 1a9de839b3..0aea9f1f2f 100644 --- a/boards/sama5d3x-ek/include/board_384mhz.h +++ b/boards/arm/sama5d3x-ek/include/board_384mhz.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_384MHZ_H -#define __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_384MHZ_H +#ifndef __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_384MHZ_H +#define __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_384MHZ_H /************************************************************************************ * Included Files @@ -221,4 +221,4 @@ extern "C" { #endif #endif /* !__ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_384MHZ_H */ +#endif /* __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_384MHZ_H */ diff --git a/boards/sama5d3x-ek/include/board_396mhz.h b/boards/arm/sama5d3x-ek/include/board_396mhz.h similarity index 97% rename from boards/sama5d3x-ek/include/board_396mhz.h rename to boards/arm/sama5d3x-ek/include/board_396mhz.h index 2219314a3a..0bbaf3e4cc 100644 --- a/boards/sama5d3x-ek/include/board_396mhz.h +++ b/boards/arm/sama5d3x-ek/include/board_396mhz.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_396MHZ_H -#define __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_396MHZ_H +#ifndef __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_396MHZ_H +#define __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_396MHZ_H /************************************************************************************ * Included Files @@ -218,4 +218,4 @@ extern "C" { #endif #endif /* !__ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_396MHZ_H */ +#endif /* __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_396MHZ_H */ diff --git a/boards/sama5d3x-ek/include/board_528mhz.h b/boards/arm/sama5d3x-ek/include/board_528mhz.h similarity index 97% rename from boards/sama5d3x-ek/include/board_528mhz.h rename to boards/arm/sama5d3x-ek/include/board_528mhz.h index 72700e6b28..4bf3e1fb5e 100644 --- a/boards/sama5d3x-ek/include/board_528mhz.h +++ b/boards/arm/sama5d3x-ek/include/board_528mhz.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_528MHZ_H -#define __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_528MHZ_H +#ifndef __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_528MHZ_H +#define __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_528MHZ_H /************************************************************************************ * Included Files @@ -217,4 +217,4 @@ extern "C" { #endif #endif /* !__ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_528MHZ_H */ +#endif /* __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_528MHZ_H */ diff --git a/boards/sama5d3x-ek/include/board_memorymap.h b/boards/arm/sama5d3x-ek/include/board_memorymap.h similarity index 93% rename from boards/sama5d3x-ek/include/board_memorymap.h rename to boards/arm/sama5d3x-ek/include/board_memorymap.h index 17431fe8d5..9d7d6daa5a 100644 --- a/boards/sama5d3x-ek/include/board_memorymap.h +++ b/boards/arm/sama5d3x-ek/include/board_memorymap.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_MEMORYMAP_H -#define __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_MEMORYMAP_H +#ifndef __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_MEMORYMAP_H +#define __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_MEMORYMAP_H /************************************************************************************ * Included Files @@ -70,4 +70,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_MEMORYMAP_H */ +#endif /* __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_MEMORYMAP_H */ diff --git a/boards/sama5d3x-ek/include/board_sdram.h b/boards/arm/sama5d3x-ek/include/board_sdram.h similarity index 97% rename from boards/sama5d3x-ek/include/board_sdram.h rename to boards/arm/sama5d3x-ek/include/board_sdram.h index 6a45c3cc17..d97bd85afe 100644 --- a/boards/sama5d3x-ek/include/board_sdram.h +++ b/boards/arm/sama5d3x-ek/include/board_sdram.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_SDRAM_H -#define __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_SDRAM_H +#ifndef __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_SDRAM_H +#define __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_SDRAM_H /************************************************************************************ * Included Files @@ -177,4 +177,4 @@ extern "C" { #endif #endif /* !__ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D3X_EK_INCLUDE_BOARD_SDRAM_H */ +#endif /* __BOARDS_ARM_SAMA5D3X_EK_INCLUDE_BOARD_SDRAM_H */ diff --git a/boards/sama5d3x-ek/scripts/Make.defs b/boards/arm/sama5d3x-ek/scripts/Make.defs similarity index 93% rename from boards/sama5d3x-ek/scripts/Make.defs rename to boards/arm/sama5d3x-ek/scripts/Make.defs index 7e153f861d..6dd2df3116 100644 --- a/boards/sama5d3x-ek/scripts/Make.defs +++ b/boards/arm/sama5d3x-ek/scripts/Make.defs @@ -69,12 +69,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) endif CC = $(CROSSDEV)gcc @@ -123,9 +123,9 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/sama5d3x-ek/scripts/ddram.ld b/boards/arm/sama5d3x-ek/scripts/ddram.ld similarity index 100% rename from boards/sama5d3x-ek/scripts/ddram.ld rename to boards/arm/sama5d3x-ek/scripts/ddram.ld diff --git a/boards/sama5d3x-ek/scripts/gnu-elf.ld b/boards/arm/sama5d3x-ek/scripts/gnu-elf.ld similarity index 100% rename from boards/sama5d3x-ek/scripts/gnu-elf.ld rename to boards/arm/sama5d3x-ek/scripts/gnu-elf.ld diff --git a/boards/sama5d3x-ek/scripts/isram.ld b/boards/arm/sama5d3x-ek/scripts/isram.ld similarity index 100% rename from boards/sama5d3x-ek/scripts/isram.ld rename to boards/arm/sama5d3x-ek/scripts/isram.ld diff --git a/boards/sama5d3x-ek/scripts/nor-ddram.ld b/boards/arm/sama5d3x-ek/scripts/nor-ddram.ld similarity index 100% rename from boards/sama5d3x-ek/scripts/nor-ddram.ld rename to boards/arm/sama5d3x-ek/scripts/nor-ddram.ld diff --git a/boards/sama5d3x-ek/scripts/nor-isram.ld b/boards/arm/sama5d3x-ek/scripts/nor-isram.ld similarity index 100% rename from boards/sama5d3x-ek/scripts/nor-isram.ld rename to boards/arm/sama5d3x-ek/scripts/nor-isram.ld diff --git a/boards/sama5d3x-ek/scripts/pg-sram.ld b/boards/arm/sama5d3x-ek/scripts/pg-sram.ld similarity index 100% rename from boards/sama5d3x-ek/scripts/pg-sram.ld rename to boards/arm/sama5d3x-ek/scripts/pg-sram.ld diff --git a/boards/sama5d3x-ek/src/Makefile b/boards/arm/sama5d3x-ek/src/Makefile similarity index 100% rename from boards/sama5d3x-ek/src/Makefile rename to boards/arm/sama5d3x-ek/src/Makefile diff --git a/boards/sama5d3x-ek/src/nor_main.c b/boards/arm/sama5d3x-ek/src/nor_main.c similarity index 100% rename from boards/sama5d3x-ek/src/nor_main.c rename to boards/arm/sama5d3x-ek/src/nor_main.c diff --git a/boards/sama5d3x-ek/src/sam_adc.c b/boards/arm/sama5d3x-ek/src/sam_adc.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_adc.c rename to boards/arm/sama5d3x-ek/src/sam_adc.c diff --git a/boards/sama5d3x-ek/src/sam_appinit.c b/boards/arm/sama5d3x-ek/src/sam_appinit.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_appinit.c rename to boards/arm/sama5d3x-ek/src/sam_appinit.c diff --git a/boards/sama5d3x-ek/src/sam_at24.c b/boards/arm/sama5d3x-ek/src/sam_at24.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_at24.c rename to boards/arm/sama5d3x-ek/src/sam_at24.c diff --git a/boards/sama5d3x-ek/src/sam_at25.c b/boards/arm/sama5d3x-ek/src/sam_at25.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_at25.c rename to boards/arm/sama5d3x-ek/src/sam_at25.c diff --git a/boards/sama5d3x-ek/src/sam_autoleds.c b/boards/arm/sama5d3x-ek/src/sam_autoleds.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_autoleds.c rename to boards/arm/sama5d3x-ek/src/sam_autoleds.c diff --git a/boards/sama5d3x-ek/src/sam_boot.c b/boards/arm/sama5d3x-ek/src/sam_boot.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_boot.c rename to boards/arm/sama5d3x-ek/src/sam_boot.c diff --git a/boards/sama5d3x-ek/src/sam_buttons.c b/boards/arm/sama5d3x-ek/src/sam_buttons.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_buttons.c rename to boards/arm/sama5d3x-ek/src/sam_buttons.c diff --git a/boards/sama5d3x-ek/src/sam_can.c b/boards/arm/sama5d3x-ek/src/sam_can.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_can.c rename to boards/arm/sama5d3x-ek/src/sam_can.c diff --git a/boards/sama5d3x-ek/src/sam_ethernet.c b/boards/arm/sama5d3x-ek/src/sam_ethernet.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_ethernet.c rename to boards/arm/sama5d3x-ek/src/sam_ethernet.c diff --git a/boards/sama5d3x-ek/src/sam_hsmci.c b/boards/arm/sama5d3x-ek/src/sam_hsmci.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_hsmci.c rename to boards/arm/sama5d3x-ek/src/sam_hsmci.c diff --git a/boards/sama5d3x-ek/src/sam_i2schar.c b/boards/arm/sama5d3x-ek/src/sam_i2schar.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_i2schar.c rename to boards/arm/sama5d3x-ek/src/sam_i2schar.c diff --git a/boards/sama5d3x-ek/src/sam_nandflash.c b/boards/arm/sama5d3x-ek/src/sam_nandflash.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_nandflash.c rename to boards/arm/sama5d3x-ek/src/sam_nandflash.c diff --git a/boards/sama5d3x-ek/src/sam_norflash.c b/boards/arm/sama5d3x-ek/src/sam_norflash.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_norflash.c rename to boards/arm/sama5d3x-ek/src/sam_norflash.c diff --git a/boards/sama5d3x-ek/src/sam_ostest.c b/boards/arm/sama5d3x-ek/src/sam_ostest.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_ostest.c rename to boards/arm/sama5d3x-ek/src/sam_ostest.c diff --git a/boards/sama5d3x-ek/src/sam_ov2640.c b/boards/arm/sama5d3x-ek/src/sam_ov2640.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_ov2640.c rename to boards/arm/sama5d3x-ek/src/sam_ov2640.c diff --git a/boards/sama5d3x-ek/src/sam_pwm.c b/boards/arm/sama5d3x-ek/src/sam_pwm.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_pwm.c rename to boards/arm/sama5d3x-ek/src/sam_pwm.c diff --git a/boards/sama5d3x-ek/src/sam_sdram.c b/boards/arm/sama5d3x-ek/src/sam_sdram.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_sdram.c rename to boards/arm/sama5d3x-ek/src/sam_sdram.c diff --git a/boards/sama5d3x-ek/src/sam_spi.c b/boards/arm/sama5d3x-ek/src/sam_spi.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_spi.c rename to boards/arm/sama5d3x-ek/src/sam_spi.c diff --git a/boards/sama5d3x-ek/src/sam_touchscreen.c b/boards/arm/sama5d3x-ek/src/sam_touchscreen.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_touchscreen.c rename to boards/arm/sama5d3x-ek/src/sam_touchscreen.c diff --git a/boards/sama5d3x-ek/src/sam_usb.c b/boards/arm/sama5d3x-ek/src/sam_usb.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_usb.c rename to boards/arm/sama5d3x-ek/src/sam_usb.c diff --git a/boards/sama5d3x-ek/src/sam_usbmsc.c b/boards/arm/sama5d3x-ek/src/sam_usbmsc.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_usbmsc.c rename to boards/arm/sama5d3x-ek/src/sam_usbmsc.c diff --git a/boards/sama5d3x-ek/src/sam_userleds.c b/boards/arm/sama5d3x-ek/src/sam_userleds.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_userleds.c rename to boards/arm/sama5d3x-ek/src/sam_userleds.c diff --git a/boards/sama5d3x-ek/src/sam_wm8904.c b/boards/arm/sama5d3x-ek/src/sam_wm8904.c similarity index 100% rename from boards/sama5d3x-ek/src/sam_wm8904.c rename to boards/arm/sama5d3x-ek/src/sam_wm8904.c diff --git a/boards/sama5d3x-ek/src/sama5d3x-ek.h b/boards/arm/sama5d3x-ek/src/sama5d3x-ek.h similarity index 99% rename from boards/sama5d3x-ek/src/sama5d3x-ek.h rename to boards/arm/sama5d3x-ek/src/sama5d3x-ek.h index bd4e16b3f2..43a155a017 100644 --- a/boards/sama5d3x-ek/src/sama5d3x-ek.h +++ b/boards/arm/sama5d3x-ek/src/sama5d3x-ek.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D3X_EK_SRC_SAMA5D3X_EK_H -#define __BOARDS_SAMA5D3X_EK_SRC_SAMA5D3X_EK_H +#ifndef __BOARDS_ARM_SAMA5D3X_EK_SRC_SAMA5D3X_EK_H +#define __BOARDS_ARM_SAMA5D3X_EK_SRC_SAMA5D3X_EK_H /************************************************************************************ * Included Files @@ -912,5 +912,5 @@ int sam_wm8904_initialize(int minor); #endif /* HAVE_WM8904 */ #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D3X_EK_SRC_SAMA5D3X_EK_H */ +#endif /* __BOARDS_ARM_SAMA5D3X_EK_SRC_SAMA5D3X_EK_H */ diff --git a/boards/sama5d4-ek/Kconfig b/boards/arm/sama5d4-ek/Kconfig similarity index 100% rename from boards/sama5d4-ek/Kconfig rename to boards/arm/sama5d4-ek/Kconfig diff --git a/boards/sama5d4-ek/README.txt b/boards/arm/sama5d4-ek/README.txt similarity index 100% rename from boards/sama5d4-ek/README.txt rename to boards/arm/sama5d4-ek/README.txt diff --git a/boards/sama5d4-ek/RunningNxWM.txt b/boards/arm/sama5d4-ek/RunningNxWM.txt similarity index 100% rename from boards/sama5d4-ek/RunningNxWM.txt rename to boards/arm/sama5d4-ek/RunningNxWM.txt diff --git a/boards/sama5d4-ek/configs/at25boot/defconfig b/boards/arm/sama5d4-ek/configs/at25boot/defconfig similarity index 100% rename from boards/sama5d4-ek/configs/at25boot/defconfig rename to boards/arm/sama5d4-ek/configs/at25boot/defconfig diff --git a/boards/sama5d4-ek/configs/bridge/defconfig b/boards/arm/sama5d4-ek/configs/bridge/defconfig similarity index 100% rename from boards/sama5d4-ek/configs/bridge/defconfig rename to boards/arm/sama5d4-ek/configs/bridge/defconfig diff --git a/boards/sama5d4-ek/configs/dramboot/defconfig b/boards/arm/sama5d4-ek/configs/dramboot/defconfig similarity index 100% rename from boards/sama5d4-ek/configs/dramboot/defconfig rename to boards/arm/sama5d4-ek/configs/dramboot/defconfig diff --git a/boards/sama5d4-ek/configs/elf/defconfig b/boards/arm/sama5d4-ek/configs/elf/defconfig similarity index 100% rename from boards/sama5d4-ek/configs/elf/defconfig rename to boards/arm/sama5d4-ek/configs/elf/defconfig diff --git a/boards/sama5d4-ek/configs/ipv6/defconfig b/boards/arm/sama5d4-ek/configs/ipv6/defconfig similarity index 100% rename from boards/sama5d4-ek/configs/ipv6/defconfig rename to boards/arm/sama5d4-ek/configs/ipv6/defconfig diff --git a/boards/sama5d4-ek/configs/knsh/Make.defs b/boards/arm/sama5d4-ek/configs/knsh/Make.defs similarity index 93% rename from boards/sama5d4-ek/configs/knsh/Make.defs rename to boards/arm/sama5d4-ek/configs/knsh/Make.defs index 6a98716378..ed3cd5565d 100644 --- a/boards/sama5d4-ek/configs/knsh/Make.defs +++ b/boards/arm/sama5d4-ek/configs/knsh/Make.defs @@ -53,12 +53,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) endif CC = $(CROSSDEV)gcc @@ -112,9 +112,9 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/sama5d4-ek/configs/knsh/defconfig b/boards/arm/sama5d4-ek/configs/knsh/defconfig similarity index 100% rename from boards/sama5d4-ek/configs/knsh/defconfig rename to boards/arm/sama5d4-ek/configs/knsh/defconfig diff --git a/boards/sama5d4-ek/configs/nsh/defconfig b/boards/arm/sama5d4-ek/configs/nsh/defconfig similarity index 100% rename from boards/sama5d4-ek/configs/nsh/defconfig rename to boards/arm/sama5d4-ek/configs/nsh/defconfig diff --git a/boards/sama5d4-ek/configs/nxwm/defconfig b/boards/arm/sama5d4-ek/configs/nxwm/defconfig similarity index 100% rename from boards/sama5d4-ek/configs/nxwm/defconfig rename to boards/arm/sama5d4-ek/configs/nxwm/defconfig diff --git a/boards/sama5d4-ek/configs/ramtest/defconfig b/boards/arm/sama5d4-ek/configs/ramtest/defconfig similarity index 100% rename from boards/sama5d4-ek/configs/ramtest/defconfig rename to boards/arm/sama5d4-ek/configs/ramtest/defconfig diff --git a/boards/sama5d4-ek/include/.gitignore b/boards/arm/sama5d4-ek/include/.gitignore similarity index 100% rename from boards/sama5d4-ek/include/.gitignore rename to boards/arm/sama5d4-ek/include/.gitignore diff --git a/boards/sama5d4-ek/include/board.h b/boards/arm/sama5d4-ek/include/board.h similarity index 98% rename from boards/sama5d4-ek/include/board.h rename to boards/arm/sama5d4-ek/include/board.h index 6b9e6a1248..ee1d713d7f 100644 --- a/boards/sama5d4-ek/include/board.h +++ b/boards/arm/sama5d4-ek/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_H -#define __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_H +#define __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -273,4 +273,4 @@ .endm #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_H */ diff --git a/boards/sama5d4-ek/include/board_384mhz.h b/boards/arm/sama5d4-ek/include/board_384mhz.h similarity index 98% rename from boards/sama5d4-ek/include/board_384mhz.h rename to boards/arm/sama5d4-ek/include/board_384mhz.h index 3fb0710d9e..15570e19fc 100644 --- a/boards/sama5d4-ek/include/board_384mhz.h +++ b/boards/arm/sama5d4-ek/include/board_384mhz.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_384MHZ_H -#define __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_384MHZ_H +#ifndef __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_384MHZ_H +#define __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_384MHZ_H /************************************************************************************ * Included Files @@ -220,4 +220,4 @@ extern "C" { #endif #endif /* !__ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_384MHZ_H */ +#endif /* __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_384MHZ_H */ diff --git a/boards/sama5d4-ek/include/board_396mhz.h b/boards/arm/sama5d4-ek/include/board_396mhz.h similarity index 97% rename from boards/sama5d4-ek/include/board_396mhz.h rename to boards/arm/sama5d4-ek/include/board_396mhz.h index 4c0072c418..c806075d8b 100644 --- a/boards/sama5d4-ek/include/board_396mhz.h +++ b/boards/arm/sama5d4-ek/include/board_396mhz.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_396MHZ_H -#define __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_396MHZ_H +#ifndef __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_396MHZ_H +#define __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_396MHZ_H /************************************************************************************ * Included Files @@ -212,4 +212,4 @@ extern "C" { #endif #endif /* !__ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_396MHZ_H */ +#endif /* __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_396MHZ_H */ diff --git a/boards/sama5d4-ek/include/board_528mhz.h b/boards/arm/sama5d4-ek/include/board_528mhz.h similarity index 97% rename from boards/sama5d4-ek/include/board_528mhz.h rename to boards/arm/sama5d4-ek/include/board_528mhz.h index 53bf19f05a..de55002fbe 100644 --- a/boards/sama5d4-ek/include/board_528mhz.h +++ b/boards/arm/sama5d4-ek/include/board_528mhz.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_528MHZ_H -#define __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_528MHZ_H +#ifndef __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_528MHZ_H +#define __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_528MHZ_H /************************************************************************************ * Included Files @@ -211,4 +211,4 @@ extern "C" { #endif #endif /* !__ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_528MHZ_H */ +#endif /* __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_528MHZ_H */ diff --git a/boards/sama5d4-ek/include/board_memorymap.h b/boards/arm/sama5d4-ek/include/board_memorymap.h similarity index 94% rename from boards/sama5d4-ek/include/board_memorymap.h rename to boards/arm/sama5d4-ek/include/board_memorymap.h index 27f83adc52..b0ed47d48f 100644 --- a/boards/sama5d4-ek/include/board_memorymap.h +++ b/boards/arm/sama5d4-ek/include/board_memorymap.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_MEMORYMAP_H -#define __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_MEMORYMAP_H +#ifndef __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_MEMORYMAP_H +#define __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_MEMORYMAP_H /************************************************************************************ * Included Files @@ -70,4 +70,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_MEMORYMAP_H */ +#endif /* __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_MEMORYMAP_H */ diff --git a/boards/sama5d4-ek/include/board_sdram.h b/boards/arm/sama5d4-ek/include/board_sdram.h similarity index 97% rename from boards/sama5d4-ek/include/board_sdram.h rename to boards/arm/sama5d4-ek/include/board_sdram.h index 0dab93568c..0d6a153041 100644 --- a/boards/sama5d4-ek/include/board_sdram.h +++ b/boards/arm/sama5d4-ek/include/board_sdram.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_SDRAM_H -#define __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_SDRAM_H +#ifndef __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_SDRAM_H +#define __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_SDRAM_H /************************************************************************************ * Included Files @@ -173,4 +173,4 @@ extern "C" { #endif #endif /* !__ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D4_EK_INCLUDE_BOARD_SDRAM_H */ +#endif /* __BOARDS_ARM_SAMA5D4_EK_INCLUDE_BOARD_SDRAM_H */ diff --git a/boards/sama5d4-ek/include/nsh_romfsimg.h b/boards/arm/sama5d4-ek/include/nsh_romfsimg.h similarity index 100% rename from boards/sama5d4-ek/include/nsh_romfsimg.h rename to boards/arm/sama5d4-ek/include/nsh_romfsimg.h diff --git a/boards/sama5d4-ek/include/rcS.template b/boards/arm/sama5d4-ek/include/rcS.template similarity index 100% rename from boards/sama5d4-ek/include/rcS.template rename to boards/arm/sama5d4-ek/include/rcS.template diff --git a/boards/sama5d4-ek/scripts/Make.defs b/boards/arm/sama5d4-ek/scripts/Make.defs similarity index 93% rename from boards/sama5d4-ek/scripts/Make.defs rename to boards/arm/sama5d4-ek/scripts/Make.defs index 04e35df4e1..1383efda00 100644 --- a/boards/sama5d4-ek/scripts/Make.defs +++ b/boards/arm/sama5d4-ek/scripts/Make.defs @@ -53,12 +53,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) endif CC = $(CROSSDEV)gcc @@ -107,9 +107,9 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/sama5d4-ek/scripts/dramboot.ld b/boards/arm/sama5d4-ek/scripts/dramboot.ld similarity index 100% rename from boards/sama5d4-ek/scripts/dramboot.ld rename to boards/arm/sama5d4-ek/scripts/dramboot.ld diff --git a/boards/sama5d4-ek/scripts/gnu-elf.ld b/boards/arm/sama5d4-ek/scripts/gnu-elf.ld similarity index 100% rename from boards/sama5d4-ek/scripts/gnu-elf.ld rename to boards/arm/sama5d4-ek/scripts/gnu-elf.ld diff --git a/boards/sama5d4-ek/scripts/isram.ld b/boards/arm/sama5d4-ek/scripts/isram.ld similarity index 100% rename from boards/sama5d4-ek/scripts/isram.ld rename to boards/arm/sama5d4-ek/scripts/isram.ld diff --git a/boards/sama5d4-ek/scripts/uboot.ld b/boards/arm/sama5d4-ek/scripts/uboot.ld similarity index 100% rename from boards/sama5d4-ek/scripts/uboot.ld rename to boards/arm/sama5d4-ek/scripts/uboot.ld diff --git a/boards/sama5d4-ek/src/Makefile b/boards/arm/sama5d4-ek/src/Makefile similarity index 100% rename from boards/sama5d4-ek/src/Makefile rename to boards/arm/sama5d4-ek/src/Makefile diff --git a/boards/sama5d4-ek/src/at25_main.c b/boards/arm/sama5d4-ek/src/at25_main.c similarity index 100% rename from boards/sama5d4-ek/src/at25_main.c rename to boards/arm/sama5d4-ek/src/at25_main.c diff --git a/boards/sama5d4-ek/src/dram_main.c b/boards/arm/sama5d4-ek/src/dram_main.c similarity index 100% rename from boards/sama5d4-ek/src/dram_main.c rename to boards/arm/sama5d4-ek/src/dram_main.c diff --git a/boards/sama5d4-ek/src/sam_adc.c b/boards/arm/sama5d4-ek/src/sam_adc.c similarity index 100% rename from boards/sama5d4-ek/src/sam_adc.c rename to boards/arm/sama5d4-ek/src/sam_adc.c diff --git a/boards/sama5d4-ek/src/sam_appinit.c b/boards/arm/sama5d4-ek/src/sam_appinit.c similarity index 100% rename from boards/sama5d4-ek/src/sam_appinit.c rename to boards/arm/sama5d4-ek/src/sam_appinit.c diff --git a/boards/sama5d4-ek/src/sam_at25.c b/boards/arm/sama5d4-ek/src/sam_at25.c similarity index 100% rename from boards/sama5d4-ek/src/sam_at25.c rename to boards/arm/sama5d4-ek/src/sam_at25.c diff --git a/boards/sama5d4-ek/src/sam_audio_null.c b/boards/arm/sama5d4-ek/src/sam_audio_null.c similarity index 100% rename from boards/sama5d4-ek/src/sam_audio_null.c rename to boards/arm/sama5d4-ek/src/sam_audio_null.c diff --git a/boards/sama5d4-ek/src/sam_autoleds.c b/boards/arm/sama5d4-ek/src/sam_autoleds.c similarity index 100% rename from boards/sama5d4-ek/src/sam_autoleds.c rename to boards/arm/sama5d4-ek/src/sam_autoleds.c diff --git a/boards/sama5d4-ek/src/sam_automount.c b/boards/arm/sama5d4-ek/src/sam_automount.c similarity index 100% rename from boards/sama5d4-ek/src/sam_automount.c rename to boards/arm/sama5d4-ek/src/sam_automount.c diff --git a/boards/sama5d4-ek/src/sam_boot.c b/boards/arm/sama5d4-ek/src/sam_boot.c similarity index 100% rename from boards/sama5d4-ek/src/sam_boot.c rename to boards/arm/sama5d4-ek/src/sam_boot.c diff --git a/boards/sama5d4-ek/src/sam_bringup.c b/boards/arm/sama5d4-ek/src/sam_bringup.c similarity index 100% rename from boards/sama5d4-ek/src/sam_bringup.c rename to boards/arm/sama5d4-ek/src/sam_bringup.c diff --git a/boards/sama5d4-ek/src/sam_buttons.c b/boards/arm/sama5d4-ek/src/sam_buttons.c similarity index 100% rename from boards/sama5d4-ek/src/sam_buttons.c rename to boards/arm/sama5d4-ek/src/sam_buttons.c diff --git a/boards/sama5d4-ek/src/sam_ethernet.c b/boards/arm/sama5d4-ek/src/sam_ethernet.c similarity index 100% rename from boards/sama5d4-ek/src/sam_ethernet.c rename to boards/arm/sama5d4-ek/src/sam_ethernet.c diff --git a/boards/sama5d4-ek/src/sam_hsmci.c b/boards/arm/sama5d4-ek/src/sam_hsmci.c similarity index 100% rename from boards/sama5d4-ek/src/sam_hsmci.c rename to boards/arm/sama5d4-ek/src/sam_hsmci.c diff --git a/boards/sama5d4-ek/src/sam_maxtouch.c b/boards/arm/sama5d4-ek/src/sam_maxtouch.c similarity index 100% rename from boards/sama5d4-ek/src/sam_maxtouch.c rename to boards/arm/sama5d4-ek/src/sam_maxtouch.c diff --git a/boards/sama5d4-ek/src/sam_nandflash.c b/boards/arm/sama5d4-ek/src/sam_nandflash.c similarity index 100% rename from boards/sama5d4-ek/src/sam_nandflash.c rename to boards/arm/sama5d4-ek/src/sam_nandflash.c diff --git a/boards/sama5d4-ek/src/sam_ostest.c b/boards/arm/sama5d4-ek/src/sam_ostest.c similarity index 100% rename from boards/sama5d4-ek/src/sam_ostest.c rename to boards/arm/sama5d4-ek/src/sam_ostest.c diff --git a/boards/sama5d4-ek/src/sam_pmic.c b/boards/arm/sama5d4-ek/src/sam_pmic.c similarity index 100% rename from boards/sama5d4-ek/src/sam_pmic.c rename to boards/arm/sama5d4-ek/src/sam_pmic.c diff --git a/boards/sama5d4-ek/src/sam_pwm.c b/boards/arm/sama5d4-ek/src/sam_pwm.c similarity index 100% rename from boards/sama5d4-ek/src/sam_pwm.c rename to boards/arm/sama5d4-ek/src/sam_pwm.c diff --git a/boards/sama5d4-ek/src/sam_sdram.c b/boards/arm/sama5d4-ek/src/sam_sdram.c similarity index 100% rename from boards/sama5d4-ek/src/sam_sdram.c rename to boards/arm/sama5d4-ek/src/sam_sdram.c diff --git a/boards/sama5d4-ek/src/sam_spi.c b/boards/arm/sama5d4-ek/src/sam_spi.c similarity index 100% rename from boards/sama5d4-ek/src/sam_spi.c rename to boards/arm/sama5d4-ek/src/sam_spi.c diff --git a/boards/sama5d4-ek/src/sam_usb.c b/boards/arm/sama5d4-ek/src/sam_usb.c similarity index 100% rename from boards/sama5d4-ek/src/sam_usb.c rename to boards/arm/sama5d4-ek/src/sam_usb.c diff --git a/boards/sama5d4-ek/src/sam_usbmsc.c b/boards/arm/sama5d4-ek/src/sam_usbmsc.c similarity index 100% rename from boards/sama5d4-ek/src/sam_usbmsc.c rename to boards/arm/sama5d4-ek/src/sam_usbmsc.c diff --git a/boards/sama5d4-ek/src/sam_userleds.c b/boards/arm/sama5d4-ek/src/sam_userleds.c similarity index 100% rename from boards/sama5d4-ek/src/sam_userleds.c rename to boards/arm/sama5d4-ek/src/sam_userleds.c diff --git a/boards/sama5d4-ek/src/sam_wm8904.c b/boards/arm/sama5d4-ek/src/sam_wm8904.c similarity index 100% rename from boards/sama5d4-ek/src/sam_wm8904.c rename to boards/arm/sama5d4-ek/src/sam_wm8904.c diff --git a/boards/sama5d4-ek/src/sama5d4-ek.h b/boards/arm/sama5d4-ek/src/sama5d4-ek.h similarity index 99% rename from boards/sama5d4-ek/src/sama5d4-ek.h rename to boards/arm/sama5d4-ek/src/sama5d4-ek.h index 1bdb4fcd5d..3005eeb8d6 100644 --- a/boards/sama5d4-ek/src/sama5d4-ek.h +++ b/boards/arm/sama5d4-ek/src/sama5d4-ek.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMA5D4_EK_SRC_SAMA5D4_EK_H -#define __BOARDS_SAMA5D4_EK_SRC_SAMA5D4_EK_H +#ifndef __BOARDS_ARM_SAMA5D4_EK_SRC_SAMA5D4_EK_H +#define __BOARDS_ARM_SAMA5D4_EK_SRC_SAMA5D4_EK_H /************************************************************************************ * Included Files @@ -1185,5 +1185,5 @@ void sam_pmic_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAMA5D4_EK_SRC_SAMA5D4_EK_H */ +#endif /* __BOARDS_ARM_SAMA5D4_EK_SRC_SAMA5D4_EK_H */ diff --git a/boards/samd20-xplained/Kconfig b/boards/arm/samd20-xplained/Kconfig similarity index 100% rename from boards/samd20-xplained/Kconfig rename to boards/arm/samd20-xplained/Kconfig diff --git a/boards/samd20-xplained/README.txt b/boards/arm/samd20-xplained/README.txt similarity index 100% rename from boards/samd20-xplained/README.txt rename to boards/arm/samd20-xplained/README.txt diff --git a/boards/samd20-xplained/configs/nsh/defconfig b/boards/arm/samd20-xplained/configs/nsh/defconfig similarity index 100% rename from boards/samd20-xplained/configs/nsh/defconfig rename to boards/arm/samd20-xplained/configs/nsh/defconfig diff --git a/boards/samd20-xplained/include/board.h b/boards/arm/samd20-xplained/include/board.h similarity index 99% rename from boards/samd20-xplained/include/board.h rename to boards/arm/samd20-xplained/include/board.h index e001dbb356..42680b6213 100644 --- a/boards/samd20-xplained/include/board.h +++ b/boards/arm/samd20-xplained/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMD20_XPLAINED_INCLUDE_BOARD_H -#define __BOARDS_SAMD20_XPLAINED_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_SAMD20_XPLAINED_INCLUDE_BOARD_H +#define __BOARDS_ARM_SAMD20_XPLAINED_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -521,4 +521,4 @@ #define BUTTON_SW0_BIT (1 << BUTTON_SW0) -#endif /* __BOARDS_SAMD20_XPLAINED_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_SAMD20_XPLAINED_INCLUDE_BOARD_H */ diff --git a/boards/samd20-xplained/scripts/Make.defs b/boards/arm/samd20-xplained/scripts/Make.defs similarity index 97% rename from boards/samd20-xplained/scripts/Make.defs rename to boards/arm/samd20-xplained/scripts/Make.defs index 8be13e4044..33d723d316 100644 --- a/boards/samd20-xplained/scripts/Make.defs +++ b/boards/arm/samd20-xplained/scripts/Make.defs @@ -43,12 +43,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/samd20-xplained/scripts/flash.ld b/boards/arm/samd20-xplained/scripts/flash.ld similarity index 100% rename from boards/samd20-xplained/scripts/flash.ld rename to boards/arm/samd20-xplained/scripts/flash.ld diff --git a/boards/olimex-stm32-h407/src/.gitignore b/boards/arm/samd20-xplained/src/.gitignore similarity index 100% rename from boards/olimex-stm32-h407/src/.gitignore rename to boards/arm/samd20-xplained/src/.gitignore diff --git a/boards/samd20-xplained/src/Makefile b/boards/arm/samd20-xplained/src/Makefile similarity index 100% rename from boards/samd20-xplained/src/Makefile rename to boards/arm/samd20-xplained/src/Makefile diff --git a/boards/samd20-xplained/src/sam_appinit.c b/boards/arm/samd20-xplained/src/sam_appinit.c similarity index 100% rename from boards/samd20-xplained/src/sam_appinit.c rename to boards/arm/samd20-xplained/src/sam_appinit.c diff --git a/boards/samd20-xplained/src/sam_autoleds.c b/boards/arm/samd20-xplained/src/sam_autoleds.c similarity index 100% rename from boards/samd20-xplained/src/sam_autoleds.c rename to boards/arm/samd20-xplained/src/sam_autoleds.c diff --git a/boards/samd20-xplained/src/sam_boot.c b/boards/arm/samd20-xplained/src/sam_boot.c similarity index 100% rename from boards/samd20-xplained/src/sam_boot.c rename to boards/arm/samd20-xplained/src/sam_boot.c diff --git a/boards/samd20-xplained/src/sam_buttons.c b/boards/arm/samd20-xplained/src/sam_buttons.c similarity index 100% rename from boards/samd20-xplained/src/sam_buttons.c rename to boards/arm/samd20-xplained/src/sam_buttons.c diff --git a/boards/samd20-xplained/src/sam_mmcsd.c b/boards/arm/samd20-xplained/src/sam_mmcsd.c similarity index 100% rename from boards/samd20-xplained/src/sam_mmcsd.c rename to boards/arm/samd20-xplained/src/sam_mmcsd.c diff --git a/boards/samd20-xplained/src/sam_spi.c b/boards/arm/samd20-xplained/src/sam_spi.c similarity index 100% rename from boards/samd20-xplained/src/sam_spi.c rename to boards/arm/samd20-xplained/src/sam_spi.c diff --git a/boards/samd20-xplained/src/sam_ug2832hsweg04.c b/boards/arm/samd20-xplained/src/sam_ug2832hsweg04.c similarity index 100% rename from boards/samd20-xplained/src/sam_ug2832hsweg04.c rename to boards/arm/samd20-xplained/src/sam_ug2832hsweg04.c diff --git a/boards/samd20-xplained/src/sam_userleds.c b/boards/arm/samd20-xplained/src/sam_userleds.c similarity index 100% rename from boards/samd20-xplained/src/sam_userleds.c rename to boards/arm/samd20-xplained/src/sam_userleds.c diff --git a/boards/samd20-xplained/src/samd20-xplained.h b/boards/arm/samd20-xplained/src/samd20-xplained.h similarity index 98% rename from boards/samd20-xplained/src/samd20-xplained.h rename to boards/arm/samd20-xplained/src/samd20-xplained.h index e381bb4259..ca051dc2db 100644 --- a/boards/samd20-xplained/src/samd20-xplained.h +++ b/boards/arm/samd20-xplained/src/samd20-xplained.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMD20_XPLAINED_SRC_SAMD20_XPLAINED_H -#define __BOARDS_SAMD20_XPLAINED_SRC_SAMD20_XPLAINED_H +#ifndef __BOARDS_ARM_SAMD20_XPLAINED_SRC_SAMD20_XPLAINED_H +#define __BOARDS_ARM_SAMD20_XPLAINED_SRC_SAMD20_XPLAINED_H /************************************************************************************ * Included Files @@ -260,5 +260,5 @@ int sam_sdinitialize(int port, int minor); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAMD20_XPLAINED_SRC_SAMD20_XPLAINED_H */ +#endif /* __BOARDS_ARM_SAMD20_XPLAINED_SRC_SAMD20_XPLAINED_H */ diff --git a/boards/samd21-xplained/Kconfig b/boards/arm/samd21-xplained/Kconfig similarity index 100% rename from boards/samd21-xplained/Kconfig rename to boards/arm/samd21-xplained/Kconfig diff --git a/boards/samd21-xplained/README.txt b/boards/arm/samd21-xplained/README.txt similarity index 100% rename from boards/samd21-xplained/README.txt rename to boards/arm/samd21-xplained/README.txt diff --git a/boards/samd21-xplained/configs/nsh/defconfig b/boards/arm/samd21-xplained/configs/nsh/defconfig similarity index 100% rename from boards/samd21-xplained/configs/nsh/defconfig rename to boards/arm/samd21-xplained/configs/nsh/defconfig diff --git a/boards/samd21-xplained/include/board.h b/boards/arm/samd21-xplained/include/board.h similarity index 99% rename from boards/samd21-xplained/include/board.h rename to boards/arm/samd21-xplained/include/board.h index be4ca1771c..f3fb24c8f2 100644 --- a/boards/samd21-xplained/include/board.h +++ b/boards/arm/samd21-xplained/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMD21_XPLAINED_INCLUDE_BOARD_H -#define __BOARDS_SAMD21_XPLAINED_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_SAMD21_XPLAINED_INCLUDE_BOARD_H +#define __BOARDS_ARM_SAMD21_XPLAINED_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -534,4 +534,4 @@ #define BUTTON_SW0_BIT (1 << BUTTON_SW0) -#endif /* __BOARDS_SAMD21_XPLAINED_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_SAMD21_XPLAINED_INCLUDE_BOARD_H */ diff --git a/boards/samd21-xplained/scripts/Make.defs b/boards/arm/samd21-xplained/scripts/Make.defs similarity index 97% rename from boards/samd21-xplained/scripts/Make.defs rename to boards/arm/samd21-xplained/scripts/Make.defs index 793a69250e..eebd183069 100644 --- a/boards/samd21-xplained/scripts/Make.defs +++ b/boards/arm/samd21-xplained/scripts/Make.defs @@ -43,12 +43,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/samd21-xplained/scripts/flash.ld b/boards/arm/samd21-xplained/scripts/flash.ld similarity index 100% rename from boards/samd21-xplained/scripts/flash.ld rename to boards/arm/samd21-xplained/scripts/flash.ld diff --git a/boards/olimex-stm32-p107/src/.gitignore b/boards/arm/samd21-xplained/src/.gitignore similarity index 100% rename from boards/olimex-stm32-p107/src/.gitignore rename to boards/arm/samd21-xplained/src/.gitignore diff --git a/boards/samd21-xplained/src/Makefile b/boards/arm/samd21-xplained/src/Makefile similarity index 100% rename from boards/samd21-xplained/src/Makefile rename to boards/arm/samd21-xplained/src/Makefile diff --git a/boards/samd21-xplained/src/sam_appinit.c b/boards/arm/samd21-xplained/src/sam_appinit.c similarity index 100% rename from boards/samd21-xplained/src/sam_appinit.c rename to boards/arm/samd21-xplained/src/sam_appinit.c diff --git a/boards/samd21-xplained/src/sam_autoleds.c b/boards/arm/samd21-xplained/src/sam_autoleds.c similarity index 100% rename from boards/samd21-xplained/src/sam_autoleds.c rename to boards/arm/samd21-xplained/src/sam_autoleds.c diff --git a/boards/samd21-xplained/src/sam_boot.c b/boards/arm/samd21-xplained/src/sam_boot.c similarity index 100% rename from boards/samd21-xplained/src/sam_boot.c rename to boards/arm/samd21-xplained/src/sam_boot.c diff --git a/boards/samd21-xplained/src/sam_buttons.c b/boards/arm/samd21-xplained/src/sam_buttons.c similarity index 100% rename from boards/samd21-xplained/src/sam_buttons.c rename to boards/arm/samd21-xplained/src/sam_buttons.c diff --git a/boards/samd21-xplained/src/sam_mmcsd.c b/boards/arm/samd21-xplained/src/sam_mmcsd.c similarity index 100% rename from boards/samd21-xplained/src/sam_mmcsd.c rename to boards/arm/samd21-xplained/src/sam_mmcsd.c diff --git a/boards/samd21-xplained/src/sam_spi.c b/boards/arm/samd21-xplained/src/sam_spi.c similarity index 100% rename from boards/samd21-xplained/src/sam_spi.c rename to boards/arm/samd21-xplained/src/sam_spi.c diff --git a/boards/samd21-xplained/src/sam_ug2832hsweg04.c b/boards/arm/samd21-xplained/src/sam_ug2832hsweg04.c similarity index 100% rename from boards/samd21-xplained/src/sam_ug2832hsweg04.c rename to boards/arm/samd21-xplained/src/sam_ug2832hsweg04.c diff --git a/boards/samd21-xplained/src/sam_userleds.c b/boards/arm/samd21-xplained/src/sam_userleds.c similarity index 100% rename from boards/samd21-xplained/src/sam_userleds.c rename to boards/arm/samd21-xplained/src/sam_userleds.c diff --git a/boards/samd21-xplained/src/samd21-xplained.h b/boards/arm/samd21-xplained/src/samd21-xplained.h similarity index 98% rename from boards/samd21-xplained/src/samd21-xplained.h rename to boards/arm/samd21-xplained/src/samd21-xplained.h index 2e9fb3799c..77b26013e4 100644 --- a/boards/samd21-xplained/src/samd21-xplained.h +++ b/boards/arm/samd21-xplained/src/samd21-xplained.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMD21_XPLAINED_SRC_SAMD21_XPLAINED_H -#define __BOARDS_SAMD21_XPLAINED_SRC_SAMD21_XPLAINED_H +#ifndef __BOARDS_ARM_SAMD21_XPLAINED_SRC_SAMD21_XPLAINED_H +#define __BOARDS_ARM_SAMD21_XPLAINED_SRC_SAMD21_XPLAINED_H /************************************************************************************ * Included Files @@ -260,5 +260,5 @@ int sam_sdinitialize(int port, int minor); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAMD21_XPLAINED_SRC_SAMD21_XPLAINED_H */ +#endif /* __BOARDS_ARM_SAMD21_XPLAINED_SRC_SAMD21_XPLAINED_H */ diff --git a/boards/same70-xplained/Kconfig b/boards/arm/same70-xplained/Kconfig similarity index 100% rename from boards/same70-xplained/Kconfig rename to boards/arm/same70-xplained/Kconfig diff --git a/boards/same70-xplained/README.txt b/boards/arm/same70-xplained/README.txt similarity index 100% rename from boards/same70-xplained/README.txt rename to boards/arm/same70-xplained/README.txt diff --git a/boards/same70-xplained/configs/mrf24j40-starhub/defconfig b/boards/arm/same70-xplained/configs/mrf24j40-starhub/defconfig similarity index 100% rename from boards/same70-xplained/configs/mrf24j40-starhub/defconfig rename to boards/arm/same70-xplained/configs/mrf24j40-starhub/defconfig diff --git a/boards/same70-xplained/configs/netnsh/defconfig b/boards/arm/same70-xplained/configs/netnsh/defconfig similarity index 100% rename from boards/same70-xplained/configs/netnsh/defconfig rename to boards/arm/same70-xplained/configs/netnsh/defconfig diff --git a/boards/same70-xplained/configs/nsh/defconfig b/boards/arm/same70-xplained/configs/nsh/defconfig similarity index 100% rename from boards/same70-xplained/configs/nsh/defconfig rename to boards/arm/same70-xplained/configs/nsh/defconfig diff --git a/boards/same70-xplained/configs/twm4nx/defconfig b/boards/arm/same70-xplained/configs/twm4nx/defconfig similarity index 100% rename from boards/same70-xplained/configs/twm4nx/defconfig rename to boards/arm/same70-xplained/configs/twm4nx/defconfig diff --git a/boards/same70-xplained/include/board.h b/boards/arm/same70-xplained/include/board.h similarity index 98% rename from boards/same70-xplained/include/board.h rename to boards/arm/same70-xplained/include/board.h index 5f0404480a..54c5de25d0 100644 --- a/boards/same70-xplained/include/board.h +++ b/boards/arm/same70-xplained/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAME70_XPLAINED_INCLUDE_BOARD_H -#define __BOARDS_SAME70_XPLAINED_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_SAME70_XPLAINED_INCLUDE_BOARD_H +#define __BOARDS_ARM_SAME70_XPLAINED_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -383,4 +383,4 @@ void sam_lcdclear(uint16_t color); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAME70_XPLAINED_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_SAME70_XPLAINED_INCLUDE_BOARD_H */ diff --git a/boards/same70-xplained/kernel/.gitignore b/boards/arm/same70-xplained/kernel/.gitignore similarity index 100% rename from boards/same70-xplained/kernel/.gitignore rename to boards/arm/same70-xplained/kernel/.gitignore diff --git a/boards/same70-xplained/kernel/Makefile b/boards/arm/same70-xplained/kernel/Makefile similarity index 100% rename from boards/same70-xplained/kernel/Makefile rename to boards/arm/same70-xplained/kernel/Makefile diff --git a/boards/same70-xplained/kernel/sam_userspace.c b/boards/arm/same70-xplained/kernel/sam_userspace.c similarity index 100% rename from boards/same70-xplained/kernel/sam_userspace.c rename to boards/arm/same70-xplained/kernel/sam_userspace.c diff --git a/boards/same70-xplained/scripts/Make.defs b/boards/arm/same70-xplained/scripts/Make.defs similarity index 97% rename from boards/same70-xplained/scripts/Make.defs rename to boards/arm/same70-xplained/scripts/Make.defs index 6cfbadd883..49c53e70a5 100644 --- a/boards/same70-xplained/scripts/Make.defs +++ b/boards/arm/same70-xplained/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/same70-xplained/scripts/atmel_same70_xplained.cfg b/boards/arm/same70-xplained/scripts/atmel_same70_xplained.cfg similarity index 100% rename from boards/same70-xplained/scripts/atmel_same70_xplained.cfg rename to boards/arm/same70-xplained/scripts/atmel_same70_xplained.cfg diff --git a/boards/same70-xplained/scripts/flash-dtcm.ld b/boards/arm/same70-xplained/scripts/flash-dtcm.ld similarity index 100% rename from boards/same70-xplained/scripts/flash-dtcm.ld rename to boards/arm/same70-xplained/scripts/flash-dtcm.ld diff --git a/boards/same70-xplained/scripts/flash-sram.ld b/boards/arm/same70-xplained/scripts/flash-sram.ld similarity index 100% rename from boards/same70-xplained/scripts/flash-sram.ld rename to boards/arm/same70-xplained/scripts/flash-sram.ld diff --git a/boards/same70-xplained/scripts/gnu-elf.ld b/boards/arm/same70-xplained/scripts/gnu-elf.ld similarity index 100% rename from boards/same70-xplained/scripts/gnu-elf.ld rename to boards/arm/same70-xplained/scripts/gnu-elf.ld diff --git a/boards/same70-xplained/scripts/kernel-space.ld b/boards/arm/same70-xplained/scripts/kernel-space.ld similarity index 100% rename from boards/same70-xplained/scripts/kernel-space.ld rename to boards/arm/same70-xplained/scripts/kernel-space.ld diff --git a/boards/same70-xplained/scripts/memory.ld b/boards/arm/same70-xplained/scripts/memory.ld similarity index 100% rename from boards/same70-xplained/scripts/memory.ld rename to boards/arm/same70-xplained/scripts/memory.ld diff --git a/boards/same70-xplained/scripts/user-space.ld b/boards/arm/same70-xplained/scripts/user-space.ld similarity index 100% rename from boards/same70-xplained/scripts/user-space.ld rename to boards/arm/same70-xplained/scripts/user-space.ld diff --git a/boards/same70-xplained/src/Makefile b/boards/arm/same70-xplained/src/Makefile similarity index 100% rename from boards/same70-xplained/src/Makefile rename to boards/arm/same70-xplained/src/Makefile diff --git a/boards/same70-xplained/src/sam_appinit.c b/boards/arm/same70-xplained/src/sam_appinit.c similarity index 100% rename from boards/same70-xplained/src/sam_appinit.c rename to boards/arm/same70-xplained/src/sam_appinit.c diff --git a/boards/same70-xplained/src/sam_at24config.c b/boards/arm/same70-xplained/src/sam_at24config.c similarity index 100% rename from boards/same70-xplained/src/sam_at24config.c rename to boards/arm/same70-xplained/src/sam_at24config.c diff --git a/boards/same70-xplained/src/sam_autoleds.c b/boards/arm/same70-xplained/src/sam_autoleds.c similarity index 100% rename from boards/same70-xplained/src/sam_autoleds.c rename to boards/arm/same70-xplained/src/sam_autoleds.c diff --git a/boards/same70-xplained/src/sam_boot.c b/boards/arm/same70-xplained/src/sam_boot.c similarity index 100% rename from boards/same70-xplained/src/sam_boot.c rename to boards/arm/same70-xplained/src/sam_boot.c diff --git a/boards/same70-xplained/src/sam_bringup.c b/boards/arm/same70-xplained/src/sam_bringup.c similarity index 100% rename from boards/same70-xplained/src/sam_bringup.c rename to boards/arm/same70-xplained/src/sam_bringup.c diff --git a/boards/same70-xplained/src/sam_buttons.c b/boards/arm/same70-xplained/src/sam_buttons.c similarity index 100% rename from boards/same70-xplained/src/sam_buttons.c rename to boards/arm/same70-xplained/src/sam_buttons.c diff --git a/boards/same70-xplained/src/sam_dac.c b/boards/arm/same70-xplained/src/sam_dac.c similarity index 100% rename from boards/same70-xplained/src/sam_dac.c rename to boards/arm/same70-xplained/src/sam_dac.c diff --git a/boards/same70-xplained/src/sam_ethernet.c b/boards/arm/same70-xplained/src/sam_ethernet.c similarity index 100% rename from boards/same70-xplained/src/sam_ethernet.c rename to boards/arm/same70-xplained/src/sam_ethernet.c diff --git a/boards/same70-xplained/src/sam_hsmci.c b/boards/arm/same70-xplained/src/sam_hsmci.c similarity index 100% rename from boards/same70-xplained/src/sam_hsmci.c rename to boards/arm/same70-xplained/src/sam_hsmci.c diff --git a/boards/same70-xplained/src/sam_mcan.c b/boards/arm/same70-xplained/src/sam_mcan.c similarity index 100% rename from boards/same70-xplained/src/sam_mcan.c rename to boards/arm/same70-xplained/src/sam_mcan.c diff --git a/boards/same70-xplained/src/sam_mrf24j40.c b/boards/arm/same70-xplained/src/sam_mrf24j40.c similarity index 100% rename from boards/same70-xplained/src/sam_mrf24j40.c rename to boards/arm/same70-xplained/src/sam_mrf24j40.c diff --git a/boards/same70-xplained/src/sam_sdram.c b/boards/arm/same70-xplained/src/sam_sdram.c similarity index 100% rename from boards/same70-xplained/src/sam_sdram.c rename to boards/arm/same70-xplained/src/sam_sdram.c diff --git a/boards/same70-xplained/src/sam_spi.c b/boards/arm/same70-xplained/src/sam_spi.c similarity index 100% rename from boards/same70-xplained/src/sam_spi.c rename to boards/arm/same70-xplained/src/sam_spi.c diff --git a/boards/same70-xplained/src/sam_usbdev.c b/boards/arm/same70-xplained/src/sam_usbdev.c similarity index 100% rename from boards/same70-xplained/src/sam_usbdev.c rename to boards/arm/same70-xplained/src/sam_usbdev.c diff --git a/boards/same70-xplained/src/sam_userleds.c b/boards/arm/same70-xplained/src/sam_userleds.c similarity index 100% rename from boards/same70-xplained/src/sam_userleds.c rename to boards/arm/same70-xplained/src/sam_userleds.c diff --git a/boards/same70-xplained/src/sam_xbee.c b/boards/arm/same70-xplained/src/sam_xbee.c similarity index 100% rename from boards/same70-xplained/src/sam_xbee.c rename to boards/arm/same70-xplained/src/sam_xbee.c diff --git a/boards/same70-xplained/src/same70-xplained.h b/boards/arm/same70-xplained/src/same70-xplained.h similarity index 99% rename from boards/same70-xplained/src/same70-xplained.h rename to boards/arm/same70-xplained/src/same70-xplained.h index e67135ed8d..cf3dac1c66 100644 --- a/boards/same70-xplained/src/same70-xplained.h +++ b/boards/arm/same70-xplained/src/same70-xplained.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAME70_XPLAINED_SRC_SAME70_XPLAINED_H -#define __BOARDS_SAME70_XPLAINED_SRC_SAME70_XPLAINED_H +#ifndef __BOARDS_ARM_SAME70_XPLAINED_SRC_SAME70_XPLAINED_H +#define __BOARDS_ARM_SAME70_XPLAINED_SRC_SAME70_XPLAINED_H /************************************************************************************ * Included Files @@ -672,4 +672,4 @@ int sam_xbee_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAME70_XPLAINED_SRC_SAME70_XPLAINED_H */ +#endif /* __BOARDS_ARM_SAME70_XPLAINED_SRC_SAME70_XPLAINED_H */ diff --git a/boards/same70-xplained/tools/atmel_same70_xplained.cfg b/boards/arm/same70-xplained/tools/atmel_same70_xplained.cfg similarity index 100% rename from boards/same70-xplained/tools/atmel_same70_xplained.cfg rename to boards/arm/same70-xplained/tools/atmel_same70_xplained.cfg diff --git a/boards/same70-xplained/tools/oocd.sh b/boards/arm/same70-xplained/tools/oocd.sh similarity index 100% rename from boards/same70-xplained/tools/oocd.sh rename to boards/arm/same70-xplained/tools/oocd.sh diff --git a/boards/saml21-xplained/Kconfig b/boards/arm/saml21-xplained/Kconfig similarity index 100% rename from boards/saml21-xplained/Kconfig rename to boards/arm/saml21-xplained/Kconfig diff --git a/boards/saml21-xplained/README.txt b/boards/arm/saml21-xplained/README.txt similarity index 100% rename from boards/saml21-xplained/README.txt rename to boards/arm/saml21-xplained/README.txt diff --git a/boards/saml21-xplained/configs/nsh/defconfig b/boards/arm/saml21-xplained/configs/nsh/defconfig similarity index 100% rename from boards/saml21-xplained/configs/nsh/defconfig rename to boards/arm/saml21-xplained/configs/nsh/defconfig diff --git a/boards/saml21-xplained/include/board.h b/boards/arm/saml21-xplained/include/board.h similarity index 99% rename from boards/saml21-xplained/include/board.h rename to boards/arm/saml21-xplained/include/board.h index 4c44ffb421..fbbf29d099 100644 --- a/boards/saml21-xplained/include/board.h +++ b/boards/arm/saml21-xplained/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAML21_XPLAINED_INCLUDE_BOARD_H -#define __BOARDS_SAML21_XPLAINED_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_SAML21_XPLAINED_INCLUDE_BOARD_H +#define __BOARDS_ARM_SAML21_XPLAINED_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -658,4 +658,4 @@ #define BUTTON_SW0_BIT (1 << BUTTON_SW0) -#endif /* __BOARDS_SAML21_XPLAINED_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_SAML21_XPLAINED_INCLUDE_BOARD_H */ diff --git a/boards/saml21-xplained/scripts/Make.defs b/boards/arm/saml21-xplained/scripts/Make.defs similarity index 97% rename from boards/saml21-xplained/scripts/Make.defs rename to boards/arm/saml21-xplained/scripts/Make.defs index ab040f2fa9..be9506c3bd 100644 --- a/boards/saml21-xplained/scripts/Make.defs +++ b/boards/arm/saml21-xplained/scripts/Make.defs @@ -43,12 +43,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/saml21-xplained/scripts/flash.ld b/boards/arm/saml21-xplained/scripts/flash.ld similarity index 100% rename from boards/saml21-xplained/scripts/flash.ld rename to boards/arm/saml21-xplained/scripts/flash.ld diff --git a/boards/olimex-strp711/src/.gitignore b/boards/arm/saml21-xplained/src/.gitignore similarity index 100% rename from boards/olimex-strp711/src/.gitignore rename to boards/arm/saml21-xplained/src/.gitignore diff --git a/boards/saml21-xplained/src/Makefile b/boards/arm/saml21-xplained/src/Makefile similarity index 100% rename from boards/saml21-xplained/src/Makefile rename to boards/arm/saml21-xplained/src/Makefile diff --git a/boards/saml21-xplained/src/sam_appinit.c b/boards/arm/saml21-xplained/src/sam_appinit.c similarity index 100% rename from boards/saml21-xplained/src/sam_appinit.c rename to boards/arm/saml21-xplained/src/sam_appinit.c diff --git a/boards/saml21-xplained/src/sam_autoleds.c b/boards/arm/saml21-xplained/src/sam_autoleds.c similarity index 100% rename from boards/saml21-xplained/src/sam_autoleds.c rename to boards/arm/saml21-xplained/src/sam_autoleds.c diff --git a/boards/saml21-xplained/src/sam_boot.c b/boards/arm/saml21-xplained/src/sam_boot.c similarity index 100% rename from boards/saml21-xplained/src/sam_boot.c rename to boards/arm/saml21-xplained/src/sam_boot.c diff --git a/boards/saml21-xplained/src/sam_buttons.c b/boards/arm/saml21-xplained/src/sam_buttons.c similarity index 100% rename from boards/saml21-xplained/src/sam_buttons.c rename to boards/arm/saml21-xplained/src/sam_buttons.c diff --git a/boards/saml21-xplained/src/sam_mmcsd.c b/boards/arm/saml21-xplained/src/sam_mmcsd.c similarity index 100% rename from boards/saml21-xplained/src/sam_mmcsd.c rename to boards/arm/saml21-xplained/src/sam_mmcsd.c diff --git a/boards/saml21-xplained/src/sam_spi.c b/boards/arm/saml21-xplained/src/sam_spi.c similarity index 100% rename from boards/saml21-xplained/src/sam_spi.c rename to boards/arm/saml21-xplained/src/sam_spi.c diff --git a/boards/saml21-xplained/src/sam_ug2832hsweg04.c b/boards/arm/saml21-xplained/src/sam_ug2832hsweg04.c similarity index 100% rename from boards/saml21-xplained/src/sam_ug2832hsweg04.c rename to boards/arm/saml21-xplained/src/sam_ug2832hsweg04.c diff --git a/boards/saml21-xplained/src/sam_userleds.c b/boards/arm/saml21-xplained/src/sam_userleds.c similarity index 100% rename from boards/saml21-xplained/src/sam_userleds.c rename to boards/arm/saml21-xplained/src/sam_userleds.c diff --git a/boards/saml21-xplained/src/saml21-xplained.h b/boards/arm/saml21-xplained/src/saml21-xplained.h similarity index 98% rename from boards/saml21-xplained/src/saml21-xplained.h rename to boards/arm/saml21-xplained/src/saml21-xplained.h index cdd143e1c0..8735b4f29b 100644 --- a/boards/saml21-xplained/src/saml21-xplained.h +++ b/boards/arm/saml21-xplained/src/saml21-xplained.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAML21_XPLAINED_SRC_SAML21_XPLAINED_H -#define __BOARDS_SAML21_XPLAINED_SRC_SAML21_XPLAINED_H +#ifndef __BOARDS_ARM_SAML21_XPLAINED_SRC_SAML21_XPLAINED_H +#define __BOARDS_ARM_SAML21_XPLAINED_SRC_SAML21_XPLAINED_H /************************************************************************************ * Included Files @@ -261,4 +261,4 @@ int sam_sdinitialize(int port, int minor); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAML21_XPLAINED_SRC_SAML21_XPLAINED_H */ +#endif /* __BOARDS_ARM_SAML21_XPLAINED_SRC_SAML21_XPLAINED_H */ diff --git a/boards/samv71-xult/Kconfig b/boards/arm/samv71-xult/Kconfig similarity index 100% rename from boards/samv71-xult/Kconfig rename to boards/arm/samv71-xult/Kconfig diff --git a/boards/samv71-xult/README.txt b/boards/arm/samv71-xult/README.txt similarity index 100% rename from boards/samv71-xult/README.txt rename to boards/arm/samv71-xult/README.txt diff --git a/boards/samv71-xult/configs/knsh/Make.defs b/boards/arm/samv71-xult/configs/knsh/Make.defs similarity index 94% rename from boards/samv71-xult/configs/knsh/Make.defs rename to boards/arm/samv71-xult/configs/knsh/Make.defs index 80319861f0..6e8e10e12c 100644 --- a/boards/samv71-xult/configs/knsh/Make.defs +++ b/boards/arm/samv71-xult/configs/knsh/Make.defs @@ -1,3 +1,4 @@ + ############################################################################ # boards/samv71-xult/configs/knsh/Make.defs # @@ -47,15 +48,15 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) - ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) + ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) endif CC = $(CROSSDEV)gcc diff --git a/boards/samv71-xult/configs/knsh/defconfig b/boards/arm/samv71-xult/configs/knsh/defconfig similarity index 100% rename from boards/samv71-xult/configs/knsh/defconfig rename to boards/arm/samv71-xult/configs/knsh/defconfig diff --git a/boards/samv71-xult/configs/module/defconfig b/boards/arm/samv71-xult/configs/module/defconfig similarity index 100% rename from boards/samv71-xult/configs/module/defconfig rename to boards/arm/samv71-xult/configs/module/defconfig diff --git a/boards/samv71-xult/configs/mrf24j40-starhub/defconfig b/boards/arm/samv71-xult/configs/mrf24j40-starhub/defconfig similarity index 100% rename from boards/samv71-xult/configs/mrf24j40-starhub/defconfig rename to boards/arm/samv71-xult/configs/mrf24j40-starhub/defconfig diff --git a/boards/samv71-xult/configs/mxtxplnd/defconfig b/boards/arm/samv71-xult/configs/mxtxplnd/defconfig similarity index 100% rename from boards/samv71-xult/configs/mxtxplnd/defconfig rename to boards/arm/samv71-xult/configs/mxtxplnd/defconfig diff --git a/boards/samv71-xult/configs/netnsh/defconfig b/boards/arm/samv71-xult/configs/netnsh/defconfig similarity index 100% rename from boards/samv71-xult/configs/netnsh/defconfig rename to boards/arm/samv71-xult/configs/netnsh/defconfig diff --git a/boards/samv71-xult/configs/nsh/defconfig b/boards/arm/samv71-xult/configs/nsh/defconfig similarity index 100% rename from boards/samv71-xult/configs/nsh/defconfig rename to boards/arm/samv71-xult/configs/nsh/defconfig diff --git a/boards/samv71-xult/configs/nxwm/defconfig b/boards/arm/samv71-xult/configs/nxwm/defconfig similarity index 100% rename from boards/samv71-xult/configs/nxwm/defconfig rename to boards/arm/samv71-xult/configs/nxwm/defconfig diff --git a/boards/samv71-xult/configs/vnc/defconfig b/boards/arm/samv71-xult/configs/vnc/defconfig similarity index 100% rename from boards/samv71-xult/configs/vnc/defconfig rename to boards/arm/samv71-xult/configs/vnc/defconfig diff --git a/boards/samv71-xult/configs/vnxwm/defconfig b/boards/arm/samv71-xult/configs/vnxwm/defconfig similarity index 100% rename from boards/samv71-xult/configs/vnxwm/defconfig rename to boards/arm/samv71-xult/configs/vnxwm/defconfig diff --git a/boards/samv71-xult/include/board.h b/boards/arm/samv71-xult/include/board.h similarity index 99% rename from boards/samv71-xult/include/board.h rename to boards/arm/samv71-xult/include/board.h index 0db1fdac97..fb1610d726 100644 --- a/boards/samv71-xult/include/board.h +++ b/boards/arm/samv71-xult/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMV71_XULT_INCLUDE_BOARD_H -#define __BOARDS_SAMV71_XULT_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_SAMV71_XULT_INCLUDE_BOARD_H +#define __BOARDS_ARM_SAMV71_XULT_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -564,4 +564,4 @@ void sam_lcdclear(uint16_t color); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAMV71_XULT_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_SAMV71_XULT_INCLUDE_BOARD_H */ diff --git a/boards/samv71-xult/kernel/.gitignore b/boards/arm/samv71-xult/kernel/.gitignore similarity index 100% rename from boards/samv71-xult/kernel/.gitignore rename to boards/arm/samv71-xult/kernel/.gitignore diff --git a/boards/samv71-xult/kernel/Makefile b/boards/arm/samv71-xult/kernel/Makefile similarity index 100% rename from boards/samv71-xult/kernel/Makefile rename to boards/arm/samv71-xult/kernel/Makefile diff --git a/boards/samv71-xult/kernel/sam_userspace.c b/boards/arm/samv71-xult/kernel/sam_userspace.c similarity index 100% rename from boards/samv71-xult/kernel/sam_userspace.c rename to boards/arm/samv71-xult/kernel/sam_userspace.c diff --git a/boards/samv71-xult/scripts/Make.defs b/boards/arm/samv71-xult/scripts/Make.defs similarity index 97% rename from boards/samv71-xult/scripts/Make.defs rename to boards/arm/samv71-xult/scripts/Make.defs index 6792a50913..5a3617fdbd 100644 --- a/boards/samv71-xult/scripts/Make.defs +++ b/boards/arm/samv71-xult/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/samv71-xult/scripts/flash-dtcm.ld b/boards/arm/samv71-xult/scripts/flash-dtcm.ld similarity index 100% rename from boards/samv71-xult/scripts/flash-dtcm.ld rename to boards/arm/samv71-xult/scripts/flash-dtcm.ld diff --git a/boards/samv71-xult/scripts/flash-sram.ld b/boards/arm/samv71-xult/scripts/flash-sram.ld similarity index 100% rename from boards/samv71-xult/scripts/flash-sram.ld rename to boards/arm/samv71-xult/scripts/flash-sram.ld diff --git a/boards/samv71-xult/scripts/gnu-elf.ld b/boards/arm/samv71-xult/scripts/gnu-elf.ld similarity index 100% rename from boards/samv71-xult/scripts/gnu-elf.ld rename to boards/arm/samv71-xult/scripts/gnu-elf.ld diff --git a/boards/samv71-xult/scripts/kernel-space.ld b/boards/arm/samv71-xult/scripts/kernel-space.ld similarity index 100% rename from boards/samv71-xult/scripts/kernel-space.ld rename to boards/arm/samv71-xult/scripts/kernel-space.ld diff --git a/boards/samv71-xult/scripts/memory.ld b/boards/arm/samv71-xult/scripts/memory.ld similarity index 100% rename from boards/samv71-xult/scripts/memory.ld rename to boards/arm/samv71-xult/scripts/memory.ld diff --git a/boards/samv71-xult/scripts/user-space.ld b/boards/arm/samv71-xult/scripts/user-space.ld similarity index 100% rename from boards/samv71-xult/scripts/user-space.ld rename to boards/arm/samv71-xult/scripts/user-space.ld diff --git a/boards/samv71-xult/src/Makefile b/boards/arm/samv71-xult/src/Makefile similarity index 100% rename from boards/samv71-xult/src/Makefile rename to boards/arm/samv71-xult/src/Makefile diff --git a/boards/samv71-xult/src/atmxt-xpro.h b/boards/arm/samv71-xult/src/atmxt-xpro.h similarity index 99% rename from boards/samv71-xult/src/atmxt-xpro.h rename to boards/arm/samv71-xult/src/atmxt-xpro.h index 3d1058839c..7a8e193537 100644 --- a/boards/samv71-xult/src/atmxt-xpro.h +++ b/boards/arm/samv71-xult/src/atmxt-xpro.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_ATMXT_XPRO_SRC_ATMXT_XPRO_H -#define __BOARDS_ATMXT_XPRO_SRC_ATMXT_XPRO_H +#ifndef __BOARDS_ARM_ATMXT_XPRO_SRC_ATMXT_XPRO_H +#define __BOARDS_ARM_ATMXT_XPRO_SRC_ATMXT_XPRO_H /************************************************************************************ * Included Files @@ -374,4 +374,4 @@ extern const struct atmxt_config_s g_atmxt_config[]; ************************************************************************************/ #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ATMXT_XPRO_SRC_ATMXT_XPRO_H */ +#endif /* __BOARDS_ARM_ATMXT_XPRO_SRC_ATMXT_XPRO_H */ diff --git a/boards/samv71-xult/src/sam_appinit.c b/boards/arm/samv71-xult/src/sam_appinit.c similarity index 100% rename from boards/samv71-xult/src/sam_appinit.c rename to boards/arm/samv71-xult/src/sam_appinit.c diff --git a/boards/samv71-xult/src/sam_at24config.c b/boards/arm/samv71-xult/src/sam_at24config.c similarity index 100% rename from boards/samv71-xult/src/sam_at24config.c rename to boards/arm/samv71-xult/src/sam_at24config.c diff --git a/boards/samv71-xult/src/sam_atmxtconfig.c b/boards/arm/samv71-xult/src/sam_atmxtconfig.c similarity index 100% rename from boards/samv71-xult/src/sam_atmxtconfig.c rename to boards/arm/samv71-xult/src/sam_atmxtconfig.c diff --git a/boards/samv71-xult/src/sam_audio_null.c b/boards/arm/samv71-xult/src/sam_audio_null.c similarity index 100% rename from boards/samv71-xult/src/sam_audio_null.c rename to boards/arm/samv71-xult/src/sam_audio_null.c diff --git a/boards/samv71-xult/src/sam_autoleds.c b/boards/arm/samv71-xult/src/sam_autoleds.c similarity index 100% rename from boards/samv71-xult/src/sam_autoleds.c rename to boards/arm/samv71-xult/src/sam_autoleds.c diff --git a/boards/samv71-xult/src/sam_boot.c b/boards/arm/samv71-xult/src/sam_boot.c similarity index 100% rename from boards/samv71-xult/src/sam_boot.c rename to boards/arm/samv71-xult/src/sam_boot.c diff --git a/boards/samv71-xult/src/sam_bringup.c b/boards/arm/samv71-xult/src/sam_bringup.c similarity index 100% rename from boards/samv71-xult/src/sam_bringup.c rename to boards/arm/samv71-xult/src/sam_bringup.c diff --git a/boards/samv71-xult/src/sam_buttons.c b/boards/arm/samv71-xult/src/sam_buttons.c similarity index 100% rename from boards/samv71-xult/src/sam_buttons.c rename to boards/arm/samv71-xult/src/sam_buttons.c diff --git a/boards/samv71-xult/src/sam_composite.c b/boards/arm/samv71-xult/src/sam_composite.c similarity index 100% rename from boards/samv71-xult/src/sam_composite.c rename to boards/arm/samv71-xult/src/sam_composite.c diff --git a/boards/samv71-xult/src/sam_ethernet.c b/boards/arm/samv71-xult/src/sam_ethernet.c similarity index 100% rename from boards/samv71-xult/src/sam_ethernet.c rename to boards/arm/samv71-xult/src/sam_ethernet.c diff --git a/boards/samv71-xult/src/sam_hsmci.c b/boards/arm/samv71-xult/src/sam_hsmci.c similarity index 100% rename from boards/samv71-xult/src/sam_hsmci.c rename to boards/arm/samv71-xult/src/sam_hsmci.c diff --git a/boards/samv71-xult/src/sam_ili9488.c b/boards/arm/samv71-xult/src/sam_ili9488.c similarity index 100% rename from boards/samv71-xult/src/sam_ili9488.c rename to boards/arm/samv71-xult/src/sam_ili9488.c diff --git a/boards/samv71-xult/src/sam_maxtouch.c b/boards/arm/samv71-xult/src/sam_maxtouch.c similarity index 100% rename from boards/samv71-xult/src/sam_maxtouch.c rename to boards/arm/samv71-xult/src/sam_maxtouch.c diff --git a/boards/samv71-xult/src/sam_mcan.c b/boards/arm/samv71-xult/src/sam_mcan.c similarity index 100% rename from boards/samv71-xult/src/sam_mcan.c rename to boards/arm/samv71-xult/src/sam_mcan.c diff --git a/boards/samv71-xult/src/sam_mrf24j40.c b/boards/arm/samv71-xult/src/sam_mrf24j40.c similarity index 100% rename from boards/samv71-xult/src/sam_mrf24j40.c rename to boards/arm/samv71-xult/src/sam_mrf24j40.c diff --git a/boards/samv71-xult/src/sam_sdram.c b/boards/arm/samv71-xult/src/sam_sdram.c similarity index 100% rename from boards/samv71-xult/src/sam_sdram.c rename to boards/arm/samv71-xult/src/sam_sdram.c diff --git a/boards/samv71-xult/src/sam_spi.c b/boards/arm/samv71-xult/src/sam_spi.c similarity index 100% rename from boards/samv71-xult/src/sam_spi.c rename to boards/arm/samv71-xult/src/sam_spi.c diff --git a/boards/samv71-xult/src/sam_usbdev.c b/boards/arm/samv71-xult/src/sam_usbdev.c similarity index 100% rename from boards/samv71-xult/src/sam_usbdev.c rename to boards/arm/samv71-xult/src/sam_usbdev.c diff --git a/boards/samv71-xult/src/sam_usbmsc.c b/boards/arm/samv71-xult/src/sam_usbmsc.c similarity index 100% rename from boards/samv71-xult/src/sam_usbmsc.c rename to boards/arm/samv71-xult/src/sam_usbmsc.c diff --git a/boards/samv71-xult/src/sam_userleds.c b/boards/arm/samv71-xult/src/sam_userleds.c similarity index 100% rename from boards/samv71-xult/src/sam_userleds.c rename to boards/arm/samv71-xult/src/sam_userleds.c diff --git a/boards/samv71-xult/src/sam_wm8904.c b/boards/arm/samv71-xult/src/sam_wm8904.c similarity index 100% rename from boards/samv71-xult/src/sam_wm8904.c rename to boards/arm/samv71-xult/src/sam_wm8904.c diff --git a/boards/samv71-xult/src/samv71-xult.h b/boards/arm/samv71-xult/src/samv71-xult.h similarity index 99% rename from boards/samv71-xult/src/samv71-xult.h rename to boards/arm/samv71-xult/src/samv71-xult.h index e947483d4a..ac408843e0 100644 --- a/boards/samv71-xult/src/samv71-xult.h +++ b/boards/arm/samv71-xult/src/samv71-xult.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SAMV71_XULT_SRC_SAMV71_XULT_H -#define __BOARDS_SAMV71_XULT_SRC_SAMV71_XULT_H +#ifndef __BOARDS_ARM_SAMV71_XULT_SRC_SAMV71_XULT_H +#define __BOARDS_ARM_SAMV71_XULT_SRC_SAMV71_XULT_H /************************************************************************************ * Included Files @@ -924,4 +924,4 @@ int sam_mrf24j40_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SAMV71_XULT_SRC_SAMV71_XULT_H */ +#endif /* __BOARDS_ARM_SAMV71_XULT_SRC_SAMV71_XULT_H */ diff --git a/boards/shenzhou/Kconfig b/boards/arm/shenzhou/Kconfig similarity index 100% rename from boards/shenzhou/Kconfig rename to boards/arm/shenzhou/Kconfig diff --git a/boards/shenzhou/README.txt b/boards/arm/shenzhou/README.txt similarity index 100% rename from boards/shenzhou/README.txt rename to boards/arm/shenzhou/README.txt diff --git a/boards/shenzhou/configs/nsh/defconfig b/boards/arm/shenzhou/configs/nsh/defconfig similarity index 100% rename from boards/shenzhou/configs/nsh/defconfig rename to boards/arm/shenzhou/configs/nsh/defconfig diff --git a/boards/shenzhou/configs/nxwm/defconfig b/boards/arm/shenzhou/configs/nxwm/defconfig similarity index 100% rename from boards/shenzhou/configs/nxwm/defconfig rename to boards/arm/shenzhou/configs/nxwm/defconfig diff --git a/boards/shenzhou/configs/thttpd/defconfig b/boards/arm/shenzhou/configs/thttpd/defconfig similarity index 100% rename from boards/shenzhou/configs/thttpd/defconfig rename to boards/arm/shenzhou/configs/thttpd/defconfig diff --git a/boards/shenzhou/include/board.h b/boards/arm/shenzhou/include/board.h similarity index 99% rename from boards/shenzhou/include/board.h rename to boards/arm/shenzhou/include/board.h index f47c441e52..912ffa0782 100644 --- a/boards/shenzhou/include/board.h +++ b/boards/arm/shenzhou/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SHENZHOU_INCLUDE_BOARD_H -#define __BOARDS_SHENZHOU_INCLUDE_BOARD_H 1 +#ifndef __BOARDS_ARM_SHENZHOU_INCLUDE_BOARD_H +#define __BOARDS_ARM_SHENZHOU_INCLUDE_BOARD_H 1 /************************************************************************************ * Included Files @@ -411,4 +411,4 @@ const char *stm32_getchipid_string(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SHENZHOU_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_SHENZHOU_INCLUDE_BOARD_H */ diff --git a/boards/shenzhou/scripts/Make.defs b/boards/arm/shenzhou/scripts/Make.defs similarity index 97% rename from boards/shenzhou/scripts/Make.defs rename to boards/arm/shenzhou/scripts/Make.defs index 447834d89f..843e64875d 100644 --- a/boards/shenzhou/scripts/Make.defs +++ b/boards/arm/shenzhou/scripts/Make.defs @@ -52,13 +52,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/shenzhou/scripts/ld.script b/boards/arm/shenzhou/scripts/ld.script similarity index 100% rename from boards/shenzhou/scripts/ld.script rename to boards/arm/shenzhou/scripts/ld.script diff --git a/boards/shenzhou/scripts/ld.script.dfu b/boards/arm/shenzhou/scripts/ld.script.dfu similarity index 100% rename from boards/shenzhou/scripts/ld.script.dfu rename to boards/arm/shenzhou/scripts/ld.script.dfu diff --git a/boards/olimexino-stm32/src/.gitignore b/boards/arm/shenzhou/src/.gitignore similarity index 100% rename from boards/olimexino-stm32/src/.gitignore rename to boards/arm/shenzhou/src/.gitignore diff --git a/boards/shenzhou/src/Makefile b/boards/arm/shenzhou/src/Makefile similarity index 100% rename from boards/shenzhou/src/Makefile rename to boards/arm/shenzhou/src/Makefile diff --git a/boards/shenzhou/src/shenzhou.h b/boards/arm/shenzhou/src/shenzhou.h similarity index 99% rename from boards/shenzhou/src/shenzhou.h rename to boards/arm/shenzhou/src/shenzhou.h index 8133fb3a06..9b089408a3 100644 --- a/boards/shenzhou/src/shenzhou.h +++ b/boards/arm/shenzhou/src/shenzhou.h @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __BOARDS_SHENZHOUL_SRC_SHENZHOU_H -#define __BOARDS_SHENZHOUL_SRC_SHENZHOU_H +#ifndef __BOARDS_ARM_SHENZHOUL_SRC_SHENZHOU_H +#define __BOARDS_ARM_SHENZHOUL_SRC_SHENZHOU_H /**************************************************************************************************** * Included Files @@ -517,4 +517,4 @@ int stm32_w25initialize(int minor); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SHENZHOUL_SRC_SHENZHOU_H */ +#endif /* __BOARDS_ARM_SHENZHOUL_SRC_SHENZHOU_H */ diff --git a/boards/shenzhou/src/stm32_adc.c b/boards/arm/shenzhou/src/stm32_adc.c similarity index 100% rename from boards/shenzhou/src/stm32_adc.c rename to boards/arm/shenzhou/src/stm32_adc.c diff --git a/boards/shenzhou/src/stm32_appinit.c b/boards/arm/shenzhou/src/stm32_appinit.c similarity index 100% rename from boards/shenzhou/src/stm32_appinit.c rename to boards/arm/shenzhou/src/stm32_appinit.c diff --git a/boards/shenzhou/src/stm32_autoleds.c b/boards/arm/shenzhou/src/stm32_autoleds.c similarity index 100% rename from boards/shenzhou/src/stm32_autoleds.c rename to boards/arm/shenzhou/src/stm32_autoleds.c diff --git a/boards/shenzhou/src/stm32_boot.c b/boards/arm/shenzhou/src/stm32_boot.c similarity index 100% rename from boards/shenzhou/src/stm32_boot.c rename to boards/arm/shenzhou/src/stm32_boot.c diff --git a/boards/shenzhou/src/stm32_buttons.c b/boards/arm/shenzhou/src/stm32_buttons.c similarity index 100% rename from boards/shenzhou/src/stm32_buttons.c rename to boards/arm/shenzhou/src/stm32_buttons.c diff --git a/boards/shenzhou/src/stm32_can.c b/boards/arm/shenzhou/src/stm32_can.c similarity index 100% rename from boards/shenzhou/src/stm32_can.c rename to boards/arm/shenzhou/src/stm32_can.c diff --git a/boards/shenzhou/src/stm32_chipid.c b/boards/arm/shenzhou/src/stm32_chipid.c similarity index 100% rename from boards/shenzhou/src/stm32_chipid.c rename to boards/arm/shenzhou/src/stm32_chipid.c diff --git a/boards/shenzhou/src/stm32_ili93xx.c b/boards/arm/shenzhou/src/stm32_ili93xx.c similarity index 100% rename from boards/shenzhou/src/stm32_ili93xx.c rename to boards/arm/shenzhou/src/stm32_ili93xx.c diff --git a/boards/shenzhou/src/stm32_mmcsd.c b/boards/arm/shenzhou/src/stm32_mmcsd.c similarity index 100% rename from boards/shenzhou/src/stm32_mmcsd.c rename to boards/arm/shenzhou/src/stm32_mmcsd.c diff --git a/boards/shenzhou/src/stm32_relays.c b/boards/arm/shenzhou/src/stm32_relays.c similarity index 100% rename from boards/shenzhou/src/stm32_relays.c rename to boards/arm/shenzhou/src/stm32_relays.c diff --git a/boards/shenzhou/src/stm32_spi.c b/boards/arm/shenzhou/src/stm32_spi.c similarity index 100% rename from boards/shenzhou/src/stm32_spi.c rename to boards/arm/shenzhou/src/stm32_spi.c diff --git a/boards/shenzhou/src/stm32_ssd1289.c b/boards/arm/shenzhou/src/stm32_ssd1289.c similarity index 100% rename from boards/shenzhou/src/stm32_ssd1289.c rename to boards/arm/shenzhou/src/stm32_ssd1289.c diff --git a/boards/shenzhou/src/stm32_touchscreen.c b/boards/arm/shenzhou/src/stm32_touchscreen.c similarity index 100% rename from boards/shenzhou/src/stm32_touchscreen.c rename to boards/arm/shenzhou/src/stm32_touchscreen.c diff --git a/boards/shenzhou/src/stm32_usb.c b/boards/arm/shenzhou/src/stm32_usb.c similarity index 100% rename from boards/shenzhou/src/stm32_usb.c rename to boards/arm/shenzhou/src/stm32_usb.c diff --git a/boards/shenzhou/src/stm32_usbmsc.c b/boards/arm/shenzhou/src/stm32_usbmsc.c similarity index 100% rename from boards/shenzhou/src/stm32_usbmsc.c rename to boards/arm/shenzhou/src/stm32_usbmsc.c diff --git a/boards/shenzhou/src/stm32_userleds.c b/boards/arm/shenzhou/src/stm32_userleds.c similarity index 100% rename from boards/shenzhou/src/stm32_userleds.c rename to boards/arm/shenzhou/src/stm32_userleds.c diff --git a/boards/shenzhou/src/stm32_w25.c b/boards/arm/shenzhou/src/stm32_w25.c similarity index 100% rename from boards/shenzhou/src/stm32_w25.c rename to boards/arm/shenzhou/src/stm32_w25.c diff --git a/boards/shenzhou/tools/olimex-arm-usb-ocd.cfg b/boards/arm/shenzhou/tools/olimex-arm-usb-ocd.cfg similarity index 100% rename from boards/shenzhou/tools/olimex-arm-usb-ocd.cfg rename to boards/arm/shenzhou/tools/olimex-arm-usb-ocd.cfg diff --git a/boards/shenzhou/tools/oocd.sh b/boards/arm/shenzhou/tools/oocd.sh similarity index 100% rename from boards/shenzhou/tools/oocd.sh rename to boards/arm/shenzhou/tools/oocd.sh diff --git a/boards/shenzhou/tools/stm32.cfg b/boards/arm/shenzhou/tools/stm32.cfg similarity index 100% rename from boards/shenzhou/tools/stm32.cfg rename to boards/arm/shenzhou/tools/stm32.cfg diff --git a/boards/shenzhou/tools/usb-driver.txt b/boards/arm/shenzhou/tools/usb-driver.txt similarity index 100% rename from boards/shenzhou/tools/usb-driver.txt rename to boards/arm/shenzhou/tools/usb-driver.txt diff --git a/boards/spresense/Kconfig b/boards/arm/spresense/Kconfig similarity index 100% rename from boards/spresense/Kconfig rename to boards/arm/spresense/Kconfig diff --git a/boards/spresense/README.txt b/boards/arm/spresense/README.txt similarity index 100% rename from boards/spresense/README.txt rename to boards/arm/spresense/README.txt diff --git a/boards/spresense/configs/lcd/defconfig b/boards/arm/spresense/configs/lcd/defconfig similarity index 100% rename from boards/spresense/configs/lcd/defconfig rename to boards/arm/spresense/configs/lcd/defconfig diff --git a/boards/spresense/configs/mpy/defconfig b/boards/arm/spresense/configs/mpy/defconfig similarity index 100% rename from boards/spresense/configs/mpy/defconfig rename to boards/arm/spresense/configs/mpy/defconfig diff --git a/boards/spresense/configs/nsh/defconfig b/boards/arm/spresense/configs/nsh/defconfig similarity index 100% rename from boards/spresense/configs/nsh/defconfig rename to boards/arm/spresense/configs/nsh/defconfig diff --git a/boards/spresense/configs/rndis/defconfig b/boards/arm/spresense/configs/rndis/defconfig similarity index 100% rename from boards/spresense/configs/rndis/defconfig rename to boards/arm/spresense/configs/rndis/defconfig diff --git a/boards/spresense/configs/usbmsc/defconfig b/boards/arm/spresense/configs/usbmsc/defconfig similarity index 100% rename from boards/spresense/configs/usbmsc/defconfig rename to boards/arm/spresense/configs/usbmsc/defconfig diff --git a/boards/spresense/configs/usbnsh/defconfig b/boards/arm/spresense/configs/usbnsh/defconfig similarity index 100% rename from boards/spresense/configs/usbnsh/defconfig rename to boards/arm/spresense/configs/usbnsh/defconfig diff --git a/boards/spresense/configs/wifi/defconfig b/boards/arm/spresense/configs/wifi/defconfig similarity index 100% rename from boards/spresense/configs/wifi/defconfig rename to boards/arm/spresense/configs/wifi/defconfig diff --git a/boards/spresense/include/board.h b/boards/arm/spresense/include/board.h similarity index 100% rename from boards/spresense/include/board.h rename to boards/arm/spresense/include/board.h diff --git a/boards/spresense/include/cxd56_bmi160.h b/boards/arm/spresense/include/cxd56_bmi160.h similarity index 100% rename from boards/spresense/include/cxd56_bmi160.h rename to boards/arm/spresense/include/cxd56_bmi160.h diff --git a/boards/spresense/include/cxd56_charger.h b/boards/arm/spresense/include/cxd56_charger.h similarity index 100% rename from boards/spresense/include/cxd56_charger.h rename to boards/arm/spresense/include/cxd56_charger.h diff --git a/boards/spresense/include/cxd56_clock.h b/boards/arm/spresense/include/cxd56_clock.h similarity index 100% rename from boards/spresense/include/cxd56_clock.h rename to boards/arm/spresense/include/cxd56_clock.h diff --git a/boards/spresense/include/cxd56_flash.h b/boards/arm/spresense/include/cxd56_flash.h similarity index 100% rename from boards/spresense/include/cxd56_flash.h rename to boards/arm/spresense/include/cxd56_flash.h diff --git a/boards/spresense/include/cxd56_gauge.h b/boards/arm/spresense/include/cxd56_gauge.h similarity index 100% rename from boards/spresense/include/cxd56_gauge.h rename to boards/arm/spresense/include/cxd56_gauge.h diff --git a/boards/spresense/include/cxd56_gpioif.h b/boards/arm/spresense/include/cxd56_gpioif.h similarity index 100% rename from boards/spresense/include/cxd56_gpioif.h rename to boards/arm/spresense/include/cxd56_gpioif.h diff --git a/boards/spresense/include/cxd56_gs2200m.h b/boards/arm/spresense/include/cxd56_gs2200m.h similarity index 94% rename from boards/spresense/include/cxd56_gs2200m.h rename to boards/arm/spresense/include/cxd56_gs2200m.h index 175a2417c9..bc6c616070 100644 --- a/boards/spresense/include/cxd56_gs2200m.h +++ b/boards/arm/spresense/include/cxd56_gs2200m.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_SPRESENSE_INCLUDE_CXD56_GS2200M_H -#define __BOARDS_SPRESENSE_INCLUDE_CXD56_GS2200M_H +#ifndef __BOARDS_ARM_SPRESENSE_INCLUDE_CXD56_GS2200M_H +#define __BOARDS_ARM_SPRESENSE_INCLUDE_CXD56_GS2200M_H /**************************************************************************** @@ -84,4 +84,4 @@ int board_gs2200m_initialize(FAR const char *devpath, int bus); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SPRESENSE_INCLUDE_CXD56_GS2200M_H */ +#endif /* __BOARDS_ARM_SPRESENSE_INCLUDE_CXD56_GS2200M_H */ diff --git a/boards/spresense/include/cxd56_i2cdev.h b/boards/arm/spresense/include/cxd56_i2cdev.h similarity index 100% rename from boards/spresense/include/cxd56_i2cdev.h rename to boards/arm/spresense/include/cxd56_i2cdev.h diff --git a/boards/spresense/include/cxd56_power.h b/boards/arm/spresense/include/cxd56_power.h similarity index 100% rename from boards/spresense/include/cxd56_power.h rename to boards/arm/spresense/include/cxd56_power.h diff --git a/boards/spresense/include/cxd56_pwm.h b/boards/arm/spresense/include/cxd56_pwm.h similarity index 100% rename from boards/spresense/include/cxd56_pwm.h rename to boards/arm/spresense/include/cxd56_pwm.h diff --git a/boards/spresense/include/cxd56_sdcard.h b/boards/arm/spresense/include/cxd56_sdcard.h similarity index 100% rename from boards/spresense/include/cxd56_sdcard.h rename to boards/arm/spresense/include/cxd56_sdcard.h diff --git a/boards/spresense/include/cxd56_wdt.h b/boards/arm/spresense/include/cxd56_wdt.h similarity index 100% rename from boards/spresense/include/cxd56_wdt.h rename to boards/arm/spresense/include/cxd56_wdt.h diff --git a/boards/spresense/scripts/Make.defs b/boards/arm/spresense/scripts/Make.defs similarity index 94% rename from boards/spresense/scripts/Make.defs rename to boards/arm/spresense/scripts/Make.defs index 7fbd569771..48a1029b7e 100644 --- a/boards/spresense/scripts/Make.defs +++ b/boards/arm/spresense/scripts/Make.defs @@ -48,13 +48,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc @@ -117,9 +117,9 @@ CXXELFFLAGS = $(CXXFLAGS) LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/spresense/scripts/ramconfig.ld b/boards/arm/spresense/scripts/ramconfig.ld similarity index 100% rename from boards/spresense/scripts/ramconfig.ld rename to boards/arm/spresense/scripts/ramconfig.ld diff --git a/boards/omnibusf4/src/.gitignore b/boards/arm/spresense/src/.gitignore similarity index 100% rename from boards/omnibusf4/src/.gitignore rename to boards/arm/spresense/src/.gitignore diff --git a/boards/spresense/src/Makefile b/boards/arm/spresense/src/Makefile similarity index 100% rename from boards/spresense/src/Makefile rename to boards/arm/spresense/src/Makefile diff --git a/boards/spresense/src/cxd56_appinit.c b/boards/arm/spresense/src/cxd56_appinit.c similarity index 100% rename from boards/spresense/src/cxd56_appinit.c rename to boards/arm/spresense/src/cxd56_appinit.c diff --git a/boards/spresense/src/cxd56_bmi160_i2c.c b/boards/arm/spresense/src/cxd56_bmi160_i2c.c similarity index 100% rename from boards/spresense/src/cxd56_bmi160_i2c.c rename to boards/arm/spresense/src/cxd56_bmi160_i2c.c diff --git a/boards/spresense/src/cxd56_boot.c b/boards/arm/spresense/src/cxd56_boot.c similarity index 100% rename from boards/spresense/src/cxd56_boot.c rename to boards/arm/spresense/src/cxd56_boot.c diff --git a/boards/spresense/src/cxd56_bringup.c b/boards/arm/spresense/src/cxd56_bringup.c similarity index 100% rename from boards/spresense/src/cxd56_bringup.c rename to boards/arm/spresense/src/cxd56_bringup.c diff --git a/boards/spresense/src/cxd56_buttons.c b/boards/arm/spresense/src/cxd56_buttons.c similarity index 100% rename from boards/spresense/src/cxd56_buttons.c rename to boards/arm/spresense/src/cxd56_buttons.c diff --git a/boards/spresense/src/cxd56_charger.c b/boards/arm/spresense/src/cxd56_charger.c similarity index 100% rename from boards/spresense/src/cxd56_charger.c rename to boards/arm/spresense/src/cxd56_charger.c diff --git a/boards/spresense/src/cxd56_clock.c b/boards/arm/spresense/src/cxd56_clock.c similarity index 100% rename from boards/spresense/src/cxd56_clock.c rename to boards/arm/spresense/src/cxd56_clock.c diff --git a/boards/spresense/src/cxd56_composite.c b/boards/arm/spresense/src/cxd56_composite.c similarity index 100% rename from boards/spresense/src/cxd56_composite.c rename to boards/arm/spresense/src/cxd56_composite.c diff --git a/boards/spresense/src/cxd56_flash.c b/boards/arm/spresense/src/cxd56_flash.c similarity index 100% rename from boards/spresense/src/cxd56_flash.c rename to boards/arm/spresense/src/cxd56_flash.c diff --git a/boards/spresense/src/cxd56_gauge.c b/boards/arm/spresense/src/cxd56_gauge.c similarity index 100% rename from boards/spresense/src/cxd56_gauge.c rename to boards/arm/spresense/src/cxd56_gauge.c diff --git a/boards/spresense/src/cxd56_gpioif.c b/boards/arm/spresense/src/cxd56_gpioif.c similarity index 100% rename from boards/spresense/src/cxd56_gpioif.c rename to boards/arm/spresense/src/cxd56_gpioif.c diff --git a/boards/spresense/src/cxd56_gs2200m.c b/boards/arm/spresense/src/cxd56_gs2200m.c similarity index 100% rename from boards/spresense/src/cxd56_gs2200m.c rename to boards/arm/spresense/src/cxd56_gs2200m.c diff --git a/boards/spresense/src/cxd56_i2cdev.c b/boards/arm/spresense/src/cxd56_i2cdev.c similarity index 100% rename from boards/spresense/src/cxd56_i2cdev.c rename to boards/arm/spresense/src/cxd56_i2cdev.c diff --git a/boards/spresense/src/cxd56_ili9340.c b/boards/arm/spresense/src/cxd56_ili9340.c similarity index 100% rename from boards/spresense/src/cxd56_ili9340.c rename to boards/arm/spresense/src/cxd56_ili9340.c diff --git a/boards/spresense/src/cxd56_ioctl.c b/boards/arm/spresense/src/cxd56_ioctl.c similarity index 100% rename from boards/spresense/src/cxd56_ioctl.c rename to boards/arm/spresense/src/cxd56_ioctl.c diff --git a/boards/spresense/src/cxd56_leds.c b/boards/arm/spresense/src/cxd56_leds.c similarity index 100% rename from boards/spresense/src/cxd56_leds.c rename to boards/arm/spresense/src/cxd56_leds.c diff --git a/boards/spresense/src/cxd56_lpm013m091a.c b/boards/arm/spresense/src/cxd56_lpm013m091a.c similarity index 100% rename from boards/spresense/src/cxd56_lpm013m091a.c rename to boards/arm/spresense/src/cxd56_lpm013m091a.c diff --git a/boards/spresense/src/cxd56_main.c b/boards/arm/spresense/src/cxd56_main.c similarity index 100% rename from boards/spresense/src/cxd56_main.c rename to boards/arm/spresense/src/cxd56_main.c diff --git a/boards/spresense/src/cxd56_netinit.c b/boards/arm/spresense/src/cxd56_netinit.c similarity index 100% rename from boards/spresense/src/cxd56_netinit.c rename to boards/arm/spresense/src/cxd56_netinit.c diff --git a/boards/spresense/src/cxd56_ostest.c b/boards/arm/spresense/src/cxd56_ostest.c similarity index 100% rename from boards/spresense/src/cxd56_ostest.c rename to boards/arm/spresense/src/cxd56_ostest.c diff --git a/boards/spresense/src/cxd56_power.c b/boards/arm/spresense/src/cxd56_power.c similarity index 100% rename from boards/spresense/src/cxd56_power.c rename to boards/arm/spresense/src/cxd56_power.c diff --git a/boards/spresense/src/cxd56_pwm.c b/boards/arm/spresense/src/cxd56_pwm.c similarity index 100% rename from boards/spresense/src/cxd56_pwm.c rename to boards/arm/spresense/src/cxd56_pwm.c diff --git a/boards/spresense/src/cxd56_sdcard.c b/boards/arm/spresense/src/cxd56_sdcard.c similarity index 100% rename from boards/spresense/src/cxd56_sdcard.c rename to boards/arm/spresense/src/cxd56_sdcard.c diff --git a/boards/spresense/src/cxd56_spi.c b/boards/arm/spresense/src/cxd56_spi.c similarity index 100% rename from boards/spresense/src/cxd56_spi.c rename to boards/arm/spresense/src/cxd56_spi.c diff --git a/boards/spresense/src/cxd56_uid.c b/boards/arm/spresense/src/cxd56_uid.c similarity index 100% rename from boards/spresense/src/cxd56_uid.c rename to boards/arm/spresense/src/cxd56_uid.c diff --git a/boards/spresense/src/cxd56_usbmsc.c b/boards/arm/spresense/src/cxd56_usbmsc.c similarity index 100% rename from boards/spresense/src/cxd56_usbmsc.c rename to boards/arm/spresense/src/cxd56_usbmsc.c diff --git a/boards/spresense/src/cxd56_userleds.c b/boards/arm/spresense/src/cxd56_userleds.c similarity index 100% rename from boards/spresense/src/cxd56_userleds.c rename to boards/arm/spresense/src/cxd56_userleds.c diff --git a/boards/spresense/src/spresense.h b/boards/arm/spresense/src/spresense.h similarity index 95% rename from boards/spresense/src/spresense.h rename to boards/arm/spresense/src/spresense.h index 9146440573..5627d32028 100644 --- a/boards/spresense/src/spresense.h +++ b/boards/arm/spresense/src/spresense.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_SPRESENSE_SRC_SPRESENSE_H -#define __BOARDS_SPRESENSE_SRC_SPRESENSE_H +#ifndef __BOARDS_ARM_SPRESENSE_SRC_SPRESENSE_H +#define __BOARDS_ARM_SPRESENSE_SRC_SPRESENSE_H /**************************************************************************** * Included Files @@ -77,4 +77,4 @@ int cxd56_bringup(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SPRESENSE_SRC_SPRESENSE_H */ +#endif /* __BOARDS_ARM_SPRESENSE_SRC_SPRESENSE_H */ diff --git a/boards/stm3210e-eval/Kconfig b/boards/arm/stm3210e-eval/Kconfig similarity index 100% rename from boards/stm3210e-eval/Kconfig rename to boards/arm/stm3210e-eval/Kconfig diff --git a/boards/stm3210e-eval/README.txt b/boards/arm/stm3210e-eval/README.txt similarity index 100% rename from boards/stm3210e-eval/README.txt rename to boards/arm/stm3210e-eval/README.txt diff --git a/boards/stm3210e-eval/configs/composite/defconfig b/boards/arm/stm3210e-eval/configs/composite/defconfig similarity index 100% rename from boards/stm3210e-eval/configs/composite/defconfig rename to boards/arm/stm3210e-eval/configs/composite/defconfig diff --git a/boards/stm3210e-eval/configs/nsh/defconfig b/boards/arm/stm3210e-eval/configs/nsh/defconfig similarity index 100% rename from boards/stm3210e-eval/configs/nsh/defconfig rename to boards/arm/stm3210e-eval/configs/nsh/defconfig diff --git a/boards/stm3210e-eval/configs/nsh2/defconfig b/boards/arm/stm3210e-eval/configs/nsh2/defconfig similarity index 100% rename from boards/stm3210e-eval/configs/nsh2/defconfig rename to boards/arm/stm3210e-eval/configs/nsh2/defconfig diff --git a/boards/stm3210e-eval/configs/nx/defconfig b/boards/arm/stm3210e-eval/configs/nx/defconfig similarity index 100% rename from boards/stm3210e-eval/configs/nx/defconfig rename to boards/arm/stm3210e-eval/configs/nx/defconfig diff --git a/boards/stm3210e-eval/configs/nxterm/defconfig b/boards/arm/stm3210e-eval/configs/nxterm/defconfig similarity index 100% rename from boards/stm3210e-eval/configs/nxterm/defconfig rename to boards/arm/stm3210e-eval/configs/nxterm/defconfig diff --git a/boards/stm3210e-eval/configs/pm/defconfig b/boards/arm/stm3210e-eval/configs/pm/defconfig similarity index 100% rename from boards/stm3210e-eval/configs/pm/defconfig rename to boards/arm/stm3210e-eval/configs/pm/defconfig diff --git a/boards/stm3210e-eval/configs/usbmsc/defconfig b/boards/arm/stm3210e-eval/configs/usbmsc/defconfig similarity index 100% rename from boards/stm3210e-eval/configs/usbmsc/defconfig rename to boards/arm/stm3210e-eval/configs/usbmsc/defconfig diff --git a/boards/stm3210e-eval/configs/usbserial/defconfig b/boards/arm/stm3210e-eval/configs/usbserial/defconfig similarity index 100% rename from boards/stm3210e-eval/configs/usbserial/defconfig rename to boards/arm/stm3210e-eval/configs/usbserial/defconfig diff --git a/boards/stm3210e-eval/include/board.h b/boards/arm/stm3210e-eval/include/board.h similarity index 100% rename from boards/stm3210e-eval/include/board.h rename to boards/arm/stm3210e-eval/include/board.h diff --git a/boards/stm3210e-eval/scripts/Make.defs b/boards/arm/stm3210e-eval/scripts/Make.defs similarity index 96% rename from boards/stm3210e-eval/scripts/Make.defs rename to boards/arm/stm3210e-eval/scripts/Make.defs index 8f9148d699..5b3e149148 100644 --- a/boards/stm3210e-eval/scripts/Make.defs +++ b/boards/arm/stm3210e-eval/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm3210e-eval/scripts/ld.script b/boards/arm/stm3210e-eval/scripts/ld.script similarity index 100% rename from boards/stm3210e-eval/scripts/ld.script rename to boards/arm/stm3210e-eval/scripts/ld.script diff --git a/boards/stm3210e-eval/scripts/ld.script.dfu b/boards/arm/stm3210e-eval/scripts/ld.script.dfu similarity index 100% rename from boards/stm3210e-eval/scripts/ld.script.dfu rename to boards/arm/stm3210e-eval/scripts/ld.script.dfu diff --git a/boards/open1788/src/.gitignore b/boards/arm/stm3210e-eval/src/.gitignore similarity index 100% rename from boards/open1788/src/.gitignore rename to boards/arm/stm3210e-eval/src/.gitignore diff --git a/boards/stm3210e-eval/src/Makefile b/boards/arm/stm3210e-eval/src/Makefile similarity index 100% rename from boards/stm3210e-eval/src/Makefile rename to boards/arm/stm3210e-eval/src/Makefile diff --git a/boards/stm3210e-eval/src/stm3210e-eval.h b/boards/arm/stm3210e-eval/src/stm3210e-eval.h similarity index 98% rename from boards/stm3210e-eval/src/stm3210e-eval.h rename to boards/arm/stm3210e-eval/src/stm3210e-eval.h index 453a56b257..7fb882b736 100644 --- a/boards/stm3210e-eval/src/stm3210e-eval.h +++ b/boards/arm/stm3210e-eval/src/stm3210e-eval.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM3210E_EVAL_SRC_STM3210E_EVAL_H -#define __BOARDS_STM3210E_EVAL_SRC_STM3210E_EVAL_H +#ifndef __BOARDS_ARM_STM3210E_EVAL_SRC_STM3210E_EVAL_H +#define __BOARDS_ARM_STM3210E_EVAL_SRC_STM3210E_EVAL_H /************************************************************************************ * Included Files @@ -368,4 +368,4 @@ int stm32_djoy_initialization(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM3210E_EVAL_SRC_STM3210E_EVAL_H */ +#endif /* __BOARDS_ARM_STM3210E_EVAL_SRC_STM3210E_EVAL_H */ diff --git a/boards/stm3210e-eval/src/stm32_adc.c b/boards/arm/stm3210e-eval/src/stm32_adc.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_adc.c rename to boards/arm/stm3210e-eval/src/stm32_adc.c diff --git a/boards/stm3210e-eval/src/stm32_appinit.c b/boards/arm/stm3210e-eval/src/stm32_appinit.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_appinit.c rename to boards/arm/stm3210e-eval/src/stm32_appinit.c diff --git a/boards/stm3210e-eval/src/stm32_boot.c b/boards/arm/stm3210e-eval/src/stm32_boot.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_boot.c rename to boards/arm/stm3210e-eval/src/stm32_boot.c diff --git a/boards/stm3210e-eval/src/stm32_bringup.c b/boards/arm/stm3210e-eval/src/stm32_bringup.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_bringup.c rename to boards/arm/stm3210e-eval/src/stm32_bringup.c diff --git a/boards/stm3210e-eval/src/stm32_buttons.c b/boards/arm/stm3210e-eval/src/stm32_buttons.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_buttons.c rename to boards/arm/stm3210e-eval/src/stm32_buttons.c diff --git a/boards/stm3210e-eval/src/stm32_can.c b/boards/arm/stm3210e-eval/src/stm32_can.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_can.c rename to boards/arm/stm3210e-eval/src/stm32_can.c diff --git a/boards/stm3210e-eval/src/stm32_composite.c b/boards/arm/stm3210e-eval/src/stm32_composite.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_composite.c rename to boards/arm/stm3210e-eval/src/stm32_composite.c diff --git a/boards/stm3210e-eval/src/stm32_deselectlcd.c b/boards/arm/stm3210e-eval/src/stm32_deselectlcd.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_deselectlcd.c rename to boards/arm/stm3210e-eval/src/stm32_deselectlcd.c diff --git a/boards/stm3210e-eval/src/stm32_deselectnor.c b/boards/arm/stm3210e-eval/src/stm32_deselectnor.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_deselectnor.c rename to boards/arm/stm3210e-eval/src/stm32_deselectnor.c diff --git a/boards/stm3210e-eval/src/stm32_deselectsram.c b/boards/arm/stm3210e-eval/src/stm32_deselectsram.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_deselectsram.c rename to boards/arm/stm3210e-eval/src/stm32_deselectsram.c diff --git a/boards/stm3210e-eval/src/stm32_djoystick.c b/boards/arm/stm3210e-eval/src/stm32_djoystick.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_djoystick.c rename to boards/arm/stm3210e-eval/src/stm32_djoystick.c diff --git a/boards/stm3210e-eval/src/stm32_extcontext.c b/boards/arm/stm3210e-eval/src/stm32_extcontext.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_extcontext.c rename to boards/arm/stm3210e-eval/src/stm32_extcontext.c diff --git a/boards/stm3210e-eval/src/stm32_extmem.c b/boards/arm/stm3210e-eval/src/stm32_extmem.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_extmem.c rename to boards/arm/stm3210e-eval/src/stm32_extmem.c diff --git a/boards/stm3210e-eval/src/stm32_idle.c b/boards/arm/stm3210e-eval/src/stm32_idle.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_idle.c rename to boards/arm/stm3210e-eval/src/stm32_idle.c diff --git a/boards/stm3210e-eval/src/stm32_lcd.c b/boards/arm/stm3210e-eval/src/stm32_lcd.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_lcd.c rename to boards/arm/stm3210e-eval/src/stm32_lcd.c diff --git a/boards/stm3210e-eval/src/stm32_leds.c b/boards/arm/stm3210e-eval/src/stm32_leds.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_leds.c rename to boards/arm/stm3210e-eval/src/stm32_leds.c diff --git a/boards/stm3210e-eval/src/stm32_lm75.c b/boards/arm/stm3210e-eval/src/stm32_lm75.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_lm75.c rename to boards/arm/stm3210e-eval/src/stm32_lm75.c diff --git a/boards/stm3210e-eval/src/stm32_pm.c b/boards/arm/stm3210e-eval/src/stm32_pm.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_pm.c rename to boards/arm/stm3210e-eval/src/stm32_pm.c diff --git a/boards/stm3210e-eval/src/stm32_pmbuttons.c b/boards/arm/stm3210e-eval/src/stm32_pmbuttons.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_pmbuttons.c rename to boards/arm/stm3210e-eval/src/stm32_pmbuttons.c diff --git a/boards/stm3210e-eval/src/stm32_selectlcd.c b/boards/arm/stm3210e-eval/src/stm32_selectlcd.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_selectlcd.c rename to boards/arm/stm3210e-eval/src/stm32_selectlcd.c diff --git a/boards/stm3210e-eval/src/stm32_selectnor.c b/boards/arm/stm3210e-eval/src/stm32_selectnor.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_selectnor.c rename to boards/arm/stm3210e-eval/src/stm32_selectnor.c diff --git a/boards/stm3210e-eval/src/stm32_selectsram.c b/boards/arm/stm3210e-eval/src/stm32_selectsram.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_selectsram.c rename to boards/arm/stm3210e-eval/src/stm32_selectsram.c diff --git a/boards/stm3210e-eval/src/stm32_spi.c b/boards/arm/stm3210e-eval/src/stm32_spi.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_spi.c rename to boards/arm/stm3210e-eval/src/stm32_spi.c diff --git a/boards/stm3210e-eval/src/stm32_usbdev.c b/boards/arm/stm3210e-eval/src/stm32_usbdev.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_usbdev.c rename to boards/arm/stm3210e-eval/src/stm32_usbdev.c diff --git a/boards/stm3210e-eval/src/stm32_usbmsc.c b/boards/arm/stm3210e-eval/src/stm32_usbmsc.c similarity index 100% rename from boards/stm3210e-eval/src/stm32_usbmsc.c rename to boards/arm/stm3210e-eval/src/stm32_usbmsc.c diff --git a/boards/stm3210e-eval/tools/olimex-arm-usb-ocd.cfg b/boards/arm/stm3210e-eval/tools/olimex-arm-usb-ocd.cfg similarity index 100% rename from boards/stm3210e-eval/tools/olimex-arm-usb-ocd.cfg rename to boards/arm/stm3210e-eval/tools/olimex-arm-usb-ocd.cfg diff --git a/boards/stm3210e-eval/tools/oocd.sh b/boards/arm/stm3210e-eval/tools/oocd.sh similarity index 100% rename from boards/stm3210e-eval/tools/oocd.sh rename to boards/arm/stm3210e-eval/tools/oocd.sh diff --git a/boards/stm3210e-eval/tools/stm32.cfg b/boards/arm/stm3210e-eval/tools/stm32.cfg similarity index 100% rename from boards/stm3210e-eval/tools/stm32.cfg rename to boards/arm/stm3210e-eval/tools/stm32.cfg diff --git a/boards/stm3210e-eval/tools/usb-driver.txt b/boards/arm/stm3210e-eval/tools/usb-driver.txt similarity index 100% rename from boards/stm3210e-eval/tools/usb-driver.txt rename to boards/arm/stm3210e-eval/tools/usb-driver.txt diff --git a/boards/stm3220g-eval/Kconfig b/boards/arm/stm3220g-eval/Kconfig similarity index 100% rename from boards/stm3220g-eval/Kconfig rename to boards/arm/stm3220g-eval/Kconfig diff --git a/boards/stm3220g-eval/README.txt b/boards/arm/stm3220g-eval/README.txt similarity index 100% rename from boards/stm3220g-eval/README.txt rename to boards/arm/stm3220g-eval/README.txt diff --git a/boards/stm3220g-eval/configs/dhcpd/defconfig b/boards/arm/stm3220g-eval/configs/dhcpd/defconfig similarity index 100% rename from boards/stm3220g-eval/configs/dhcpd/defconfig rename to boards/arm/stm3220g-eval/configs/dhcpd/defconfig diff --git a/boards/stm3220g-eval/configs/nettest/defconfig b/boards/arm/stm3220g-eval/configs/nettest/defconfig similarity index 100% rename from boards/stm3220g-eval/configs/nettest/defconfig rename to boards/arm/stm3220g-eval/configs/nettest/defconfig diff --git a/boards/stm3220g-eval/configs/nsh/defconfig b/boards/arm/stm3220g-eval/configs/nsh/defconfig similarity index 100% rename from boards/stm3220g-eval/configs/nsh/defconfig rename to boards/arm/stm3220g-eval/configs/nsh/defconfig diff --git a/boards/stm3220g-eval/configs/nsh2/defconfig b/boards/arm/stm3220g-eval/configs/nsh2/defconfig similarity index 100% rename from boards/stm3220g-eval/configs/nsh2/defconfig rename to boards/arm/stm3220g-eval/configs/nsh2/defconfig diff --git a/boards/stm3220g-eval/configs/nxwm/defconfig b/boards/arm/stm3220g-eval/configs/nxwm/defconfig similarity index 100% rename from boards/stm3220g-eval/configs/nxwm/defconfig rename to boards/arm/stm3220g-eval/configs/nxwm/defconfig diff --git a/boards/stm3220g-eval/configs/telnetd/defconfig b/boards/arm/stm3220g-eval/configs/telnetd/defconfig similarity index 100% rename from boards/stm3220g-eval/configs/telnetd/defconfig rename to boards/arm/stm3220g-eval/configs/telnetd/defconfig diff --git a/boards/stm3220g-eval/include/board.h b/boards/arm/stm3220g-eval/include/board.h similarity index 99% rename from boards/stm3220g-eval/include/board.h rename to boards/arm/stm3220g-eval/include/board.h index e229f8d154..0bfa784547 100644 --- a/boards/stm3220g-eval/include/board.h +++ b/boards/arm/stm3220g-eval/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM3220G_EVAL_INCLUDE_BOARD_H -#define __BOARDS_STM3220G_EVAL_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM3220G_EVAL_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM3220G_EVAL_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -481,4 +481,4 @@ void stm3220g_lcdclear(uint16_t color); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM3220G_EVAL_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM3220G_EVAL_INCLUDE_BOARD_H */ diff --git a/boards/stm3220g-eval/scripts/Make.defs b/boards/arm/stm3220g-eval/scripts/Make.defs similarity index 96% rename from boards/stm3220g-eval/scripts/Make.defs rename to boards/arm/stm3220g-eval/scripts/Make.defs index cae801c180..bd3d2ace29 100644 --- a/boards/stm3220g-eval/scripts/Make.defs +++ b/boards/arm/stm3220g-eval/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm3220g-eval/scripts/ld.script b/boards/arm/stm3220g-eval/scripts/ld.script similarity index 100% rename from boards/stm3220g-eval/scripts/ld.script rename to boards/arm/stm3220g-eval/scripts/ld.script diff --git a/boards/pic32mx-starterkit/src/.gitignore b/boards/arm/stm3220g-eval/src/.gitignore similarity index 100% rename from boards/pic32mx-starterkit/src/.gitignore rename to boards/arm/stm3220g-eval/src/.gitignore diff --git a/boards/stm3220g-eval/src/Makefile b/boards/arm/stm3220g-eval/src/Makefile similarity index 100% rename from boards/stm3220g-eval/src/Makefile rename to boards/arm/stm3220g-eval/src/Makefile diff --git a/boards/stm3220g-eval/src/stm3220g-eval.h b/boards/arm/stm3220g-eval/src/stm3220g-eval.h similarity index 99% rename from boards/stm3220g-eval/src/stm3220g-eval.h rename to boards/arm/stm3220g-eval/src/stm3220g-eval.h index 2f1f0e0cdd..69b41b0b50 100644 --- a/boards/stm3220g-eval/src/stm3220g-eval.h +++ b/boards/arm/stm3220g-eval/src/stm3220g-eval.h @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __BOARDS_STM3220G_EVAL_SRC_STM3220G_H -#define __BOARDS_STM3220G_EVAL_SRC_STM3220G_H +#ifndef __BOARDS_ARM_STM3220G_EVAL_SRC_STM3220G_H +#define __BOARDS_ARM_STM3220G_EVAL_SRC_STM3220G_H /**************************************************************************************************** * Included Files @@ -408,4 +408,4 @@ void stm32_deselectlcd(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM3220G_EVAL_SRC_STM3220G_H */ +#endif /* __BOARDS_ARM_STM3220G_EVAL_SRC_STM3220G_H */ diff --git a/boards/stm3220g-eval/src/stm32_adc.c b/boards/arm/stm3220g-eval/src/stm32_adc.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_adc.c rename to boards/arm/stm3220g-eval/src/stm32_adc.c diff --git a/boards/stm3220g-eval/src/stm32_appinit.c b/boards/arm/stm3220g-eval/src/stm32_appinit.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_appinit.c rename to boards/arm/stm3220g-eval/src/stm32_appinit.c diff --git a/boards/stm3220g-eval/src/stm32_autoleds.c b/boards/arm/stm3220g-eval/src/stm32_autoleds.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_autoleds.c rename to boards/arm/stm3220g-eval/src/stm32_autoleds.c diff --git a/boards/stm3220g-eval/src/stm32_boot.c b/boards/arm/stm3220g-eval/src/stm32_boot.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_boot.c rename to boards/arm/stm3220g-eval/src/stm32_boot.c diff --git a/boards/stm3220g-eval/src/stm32_buttons.c b/boards/arm/stm3220g-eval/src/stm32_buttons.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_buttons.c rename to boards/arm/stm3220g-eval/src/stm32_buttons.c diff --git a/boards/stm3220g-eval/src/stm32_can.c b/boards/arm/stm3220g-eval/src/stm32_can.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_can.c rename to boards/arm/stm3220g-eval/src/stm32_can.c diff --git a/boards/stm3220g-eval/src/stm32_deselectlcd.c b/boards/arm/stm3220g-eval/src/stm32_deselectlcd.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_deselectlcd.c rename to boards/arm/stm3220g-eval/src/stm32_deselectlcd.c diff --git a/boards/stm3220g-eval/src/stm32_deselectsram.c b/boards/arm/stm3220g-eval/src/stm32_deselectsram.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_deselectsram.c rename to boards/arm/stm3220g-eval/src/stm32_deselectsram.c diff --git a/boards/stm3220g-eval/src/stm32_extmem.c b/boards/arm/stm3220g-eval/src/stm32_extmem.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_extmem.c rename to boards/arm/stm3220g-eval/src/stm32_extmem.c diff --git a/boards/stm3220g-eval/src/stm32_lcd.c b/boards/arm/stm3220g-eval/src/stm32_lcd.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_lcd.c rename to boards/arm/stm3220g-eval/src/stm32_lcd.c diff --git a/boards/stm3220g-eval/src/stm32_pwm.c b/boards/arm/stm3220g-eval/src/stm32_pwm.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_pwm.c rename to boards/arm/stm3220g-eval/src/stm32_pwm.c diff --git a/boards/stm3220g-eval/src/stm32_selectlcd.c b/boards/arm/stm3220g-eval/src/stm32_selectlcd.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_selectlcd.c rename to boards/arm/stm3220g-eval/src/stm32_selectlcd.c diff --git a/boards/stm3220g-eval/src/stm32_selectsram.c b/boards/arm/stm3220g-eval/src/stm32_selectsram.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_selectsram.c rename to boards/arm/stm3220g-eval/src/stm32_selectsram.c diff --git a/boards/stm3220g-eval/src/stm32_spi.c b/boards/arm/stm3220g-eval/src/stm32_spi.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_spi.c rename to boards/arm/stm3220g-eval/src/stm32_spi.c diff --git a/boards/stm3220g-eval/src/stm32_stmpe811.c b/boards/arm/stm3220g-eval/src/stm32_stmpe811.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_stmpe811.c rename to boards/arm/stm3220g-eval/src/stm32_stmpe811.c diff --git a/boards/stm3220g-eval/src/stm32_usb.c b/boards/arm/stm3220g-eval/src/stm32_usb.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_usb.c rename to boards/arm/stm3220g-eval/src/stm32_usb.c diff --git a/boards/stm3220g-eval/src/stm32_userleds.c b/boards/arm/stm3220g-eval/src/stm32_userleds.c similarity index 100% rename from boards/stm3220g-eval/src/stm32_userleds.c rename to boards/arm/stm3220g-eval/src/stm32_userleds.c diff --git a/boards/stm3220g-eval/tools/olimex-arm-usb-ocd.cfg b/boards/arm/stm3220g-eval/tools/olimex-arm-usb-ocd.cfg similarity index 100% rename from boards/stm3220g-eval/tools/olimex-arm-usb-ocd.cfg rename to boards/arm/stm3220g-eval/tools/olimex-arm-usb-ocd.cfg diff --git a/boards/stm3220g-eval/tools/oocd.sh b/boards/arm/stm3220g-eval/tools/oocd.sh similarity index 100% rename from boards/stm3220g-eval/tools/oocd.sh rename to boards/arm/stm3220g-eval/tools/oocd.sh diff --git a/boards/stm3220g-eval/tools/stm32.cfg b/boards/arm/stm3220g-eval/tools/stm32.cfg similarity index 100% rename from boards/stm3220g-eval/tools/stm32.cfg rename to boards/arm/stm3220g-eval/tools/stm32.cfg diff --git a/boards/stm3220g-eval/tools/usb-driver.txt b/boards/arm/stm3220g-eval/tools/usb-driver.txt similarity index 100% rename from boards/stm3220g-eval/tools/usb-driver.txt rename to boards/arm/stm3220g-eval/tools/usb-driver.txt diff --git a/boards/stm3240g-eval/Kconfig b/boards/arm/stm3240g-eval/Kconfig similarity index 100% rename from boards/stm3240g-eval/Kconfig rename to boards/arm/stm3240g-eval/Kconfig diff --git a/boards/stm3240g-eval/README.txt b/boards/arm/stm3240g-eval/README.txt similarity index 100% rename from boards/stm3240g-eval/README.txt rename to boards/arm/stm3240g-eval/README.txt diff --git a/boards/stm3240g-eval/configs/dhcpd/defconfig b/boards/arm/stm3240g-eval/configs/dhcpd/defconfig similarity index 100% rename from boards/stm3240g-eval/configs/dhcpd/defconfig rename to boards/arm/stm3240g-eval/configs/dhcpd/defconfig diff --git a/boards/stm3240g-eval/configs/discover/defconfig b/boards/arm/stm3240g-eval/configs/discover/defconfig similarity index 100% rename from boards/stm3240g-eval/configs/discover/defconfig rename to boards/arm/stm3240g-eval/configs/discover/defconfig diff --git a/boards/stm3240g-eval/configs/fb/defconfig b/boards/arm/stm3240g-eval/configs/fb/defconfig similarity index 100% rename from boards/stm3240g-eval/configs/fb/defconfig rename to boards/arm/stm3240g-eval/configs/fb/defconfig diff --git a/boards/stm3240g-eval/configs/knxwm/Make.defs b/boards/arm/stm3240g-eval/configs/knxwm/Make.defs similarity index 91% rename from boards/stm3240g-eval/configs/knxwm/Make.defs rename to boards/arm/stm3240g-eval/configs/knxwm/Make.defs index 31b354bf73..18b4b40ee9 100644 --- a/boards/stm3240g-eval/configs/knxwm/Make.defs +++ b/boards/arm/stm3240g-eval/configs/knxwm/Make.defs @@ -44,15 +44,15 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/stm3240g-eval/configs/knxwm/defconfig b/boards/arm/stm3240g-eval/configs/knxwm/defconfig similarity index 100% rename from boards/stm3240g-eval/configs/knxwm/defconfig rename to boards/arm/stm3240g-eval/configs/knxwm/defconfig diff --git a/boards/stm3240g-eval/configs/nettest/defconfig b/boards/arm/stm3240g-eval/configs/nettest/defconfig similarity index 100% rename from boards/stm3240g-eval/configs/nettest/defconfig rename to boards/arm/stm3240g-eval/configs/nettest/defconfig diff --git a/boards/stm3240g-eval/configs/nsh/defconfig b/boards/arm/stm3240g-eval/configs/nsh/defconfig similarity index 100% rename from boards/stm3240g-eval/configs/nsh/defconfig rename to boards/arm/stm3240g-eval/configs/nsh/defconfig diff --git a/boards/stm3240g-eval/configs/nsh2/defconfig b/boards/arm/stm3240g-eval/configs/nsh2/defconfig similarity index 100% rename from boards/stm3240g-eval/configs/nsh2/defconfig rename to boards/arm/stm3240g-eval/configs/nsh2/defconfig diff --git a/boards/stm3240g-eval/configs/nxterm/defconfig b/boards/arm/stm3240g-eval/configs/nxterm/defconfig similarity index 100% rename from boards/stm3240g-eval/configs/nxterm/defconfig rename to boards/arm/stm3240g-eval/configs/nxterm/defconfig diff --git a/boards/stm3240g-eval/configs/nxwm/defconfig b/boards/arm/stm3240g-eval/configs/nxwm/defconfig similarity index 100% rename from boards/stm3240g-eval/configs/nxwm/defconfig rename to boards/arm/stm3240g-eval/configs/nxwm/defconfig diff --git a/boards/stm3240g-eval/configs/telnetd/defconfig b/boards/arm/stm3240g-eval/configs/telnetd/defconfig similarity index 100% rename from boards/stm3240g-eval/configs/telnetd/defconfig rename to boards/arm/stm3240g-eval/configs/telnetd/defconfig diff --git a/boards/stm3240g-eval/configs/webserver/defconfig b/boards/arm/stm3240g-eval/configs/webserver/defconfig similarity index 100% rename from boards/stm3240g-eval/configs/webserver/defconfig rename to boards/arm/stm3240g-eval/configs/webserver/defconfig diff --git a/boards/stm3240g-eval/configs/xmlrpc/defconfig b/boards/arm/stm3240g-eval/configs/xmlrpc/defconfig similarity index 100% rename from boards/stm3240g-eval/configs/xmlrpc/defconfig rename to boards/arm/stm3240g-eval/configs/xmlrpc/defconfig diff --git a/boards/stm3240g-eval/include/board.h b/boards/arm/stm3240g-eval/include/board.h similarity index 100% rename from boards/stm3240g-eval/include/board.h rename to boards/arm/stm3240g-eval/include/board.h diff --git a/boards/stm3240g-eval/kernel/.gitignore b/boards/arm/stm3240g-eval/kernel/.gitignore similarity index 100% rename from boards/stm3240g-eval/kernel/.gitignore rename to boards/arm/stm3240g-eval/kernel/.gitignore diff --git a/boards/stm3240g-eval/kernel/Makefile b/boards/arm/stm3240g-eval/kernel/Makefile similarity index 100% rename from boards/stm3240g-eval/kernel/Makefile rename to boards/arm/stm3240g-eval/kernel/Makefile diff --git a/boards/stm3240g-eval/kernel/stm32_userspace.c b/boards/arm/stm3240g-eval/kernel/stm32_userspace.c similarity index 100% rename from boards/stm3240g-eval/kernel/stm32_userspace.c rename to boards/arm/stm3240g-eval/kernel/stm32_userspace.c diff --git a/boards/stm3240g-eval/scripts/Make.defs b/boards/arm/stm3240g-eval/scripts/Make.defs similarity index 96% rename from boards/stm3240g-eval/scripts/Make.defs rename to boards/arm/stm3240g-eval/scripts/Make.defs index bb6dad9817..29c9110a4f 100644 --- a/boards/stm3240g-eval/scripts/Make.defs +++ b/boards/arm/stm3240g-eval/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm3240g-eval/scripts/kernel-space.ld b/boards/arm/stm3240g-eval/scripts/kernel-space.ld similarity index 100% rename from boards/stm3240g-eval/scripts/kernel-space.ld rename to boards/arm/stm3240g-eval/scripts/kernel-space.ld diff --git a/boards/stm3240g-eval/scripts/ld.script b/boards/arm/stm3240g-eval/scripts/ld.script similarity index 100% rename from boards/stm3240g-eval/scripts/ld.script rename to boards/arm/stm3240g-eval/scripts/ld.script diff --git a/boards/stm3240g-eval/scripts/memory.ld b/boards/arm/stm3240g-eval/scripts/memory.ld similarity index 100% rename from boards/stm3240g-eval/scripts/memory.ld rename to boards/arm/stm3240g-eval/scripts/memory.ld diff --git a/boards/stm3240g-eval/scripts/user-space.ld b/boards/arm/stm3240g-eval/scripts/user-space.ld similarity index 100% rename from boards/stm3240g-eval/scripts/user-space.ld rename to boards/arm/stm3240g-eval/scripts/user-space.ld diff --git a/boards/pic32mx7mmb/src/.gitignore b/boards/arm/stm3240g-eval/src/.gitignore similarity index 100% rename from boards/pic32mx7mmb/src/.gitignore rename to boards/arm/stm3240g-eval/src/.gitignore diff --git a/boards/stm3240g-eval/src/Makefile b/boards/arm/stm3240g-eval/src/Makefile similarity index 100% rename from boards/stm3240g-eval/src/Makefile rename to boards/arm/stm3240g-eval/src/Makefile diff --git a/boards/stm3240g-eval/src/stm3240g-eval.h b/boards/arm/stm3240g-eval/src/stm3240g-eval.h similarity index 98% rename from boards/stm3240g-eval/src/stm3240g-eval.h rename to boards/arm/stm3240g-eval/src/stm3240g-eval.h index f5e625c87f..d3868f348f 100644 --- a/boards/stm3240g-eval/src/stm3240g-eval.h +++ b/boards/arm/stm3240g-eval/src/stm3240g-eval.h @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __BOARDS_STM3240G_EVAL_SRC_STM3240G_EVAL_H -#define __BOARDS_STM3240G_EVAL_SRC_STM3240G_EVAL_H +#ifndef __BOARDS_ARM_STM3240G_EVAL_SRC_STM3240G_EVAL_H +#define __BOARDS_ARM_STM3240G_EVAL_SRC_STM3240G_EVAL_H /**************************************************************************************************** * Included Files @@ -437,4 +437,4 @@ void stm32_deselectlcd(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM3240G_EVAL_SRC_STM3240G_EVAL_H */ +#endif /* __BOARDS_ARM_STM3240G_EVAL_SRC_STM3240G_EVAL_H */ diff --git a/boards/stm3240g-eval/src/stm32_adc.c b/boards/arm/stm3240g-eval/src/stm32_adc.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_adc.c rename to boards/arm/stm3240g-eval/src/stm32_adc.c diff --git a/boards/stm3240g-eval/src/stm32_appinit.c b/boards/arm/stm3240g-eval/src/stm32_appinit.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_appinit.c rename to boards/arm/stm3240g-eval/src/stm32_appinit.c diff --git a/boards/stm3240g-eval/src/stm32_autoleds.c b/boards/arm/stm3240g-eval/src/stm32_autoleds.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_autoleds.c rename to boards/arm/stm3240g-eval/src/stm32_autoleds.c diff --git a/boards/stm3240g-eval/src/stm32_boot.c b/boards/arm/stm3240g-eval/src/stm32_boot.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_boot.c rename to boards/arm/stm3240g-eval/src/stm32_boot.c diff --git a/boards/stm3240g-eval/src/stm32_bringup.c b/boards/arm/stm3240g-eval/src/stm32_bringup.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_bringup.c rename to boards/arm/stm3240g-eval/src/stm32_bringup.c diff --git a/boards/stm3240g-eval/src/stm32_buttons.c b/boards/arm/stm3240g-eval/src/stm32_buttons.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_buttons.c rename to boards/arm/stm3240g-eval/src/stm32_buttons.c diff --git a/boards/stm3240g-eval/src/stm32_can.c b/boards/arm/stm3240g-eval/src/stm32_can.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_can.c rename to boards/arm/stm3240g-eval/src/stm32_can.c diff --git a/boards/stm3240g-eval/src/stm32_deselectlcd.c b/boards/arm/stm3240g-eval/src/stm32_deselectlcd.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_deselectlcd.c rename to boards/arm/stm3240g-eval/src/stm32_deselectlcd.c diff --git a/boards/stm3240g-eval/src/stm32_deselectsram.c b/boards/arm/stm3240g-eval/src/stm32_deselectsram.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_deselectsram.c rename to boards/arm/stm3240g-eval/src/stm32_deselectsram.c diff --git a/boards/stm3240g-eval/src/stm32_extmem.c b/boards/arm/stm3240g-eval/src/stm32_extmem.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_extmem.c rename to boards/arm/stm3240g-eval/src/stm32_extmem.c diff --git a/boards/stm3240g-eval/src/stm32_lcd.c b/boards/arm/stm3240g-eval/src/stm32_lcd.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_lcd.c rename to boards/arm/stm3240g-eval/src/stm32_lcd.c diff --git a/boards/stm3240g-eval/src/stm32_ostest.c b/boards/arm/stm3240g-eval/src/stm32_ostest.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_ostest.c rename to boards/arm/stm3240g-eval/src/stm32_ostest.c diff --git a/boards/stm3240g-eval/src/stm32_pwm.c b/boards/arm/stm3240g-eval/src/stm32_pwm.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_pwm.c rename to boards/arm/stm3240g-eval/src/stm32_pwm.c diff --git a/boards/stm3240g-eval/src/stm32_selectlcd.c b/boards/arm/stm3240g-eval/src/stm32_selectlcd.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_selectlcd.c rename to boards/arm/stm3240g-eval/src/stm32_selectlcd.c diff --git a/boards/stm3240g-eval/src/stm32_selectsram.c b/boards/arm/stm3240g-eval/src/stm32_selectsram.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_selectsram.c rename to boards/arm/stm3240g-eval/src/stm32_selectsram.c diff --git a/boards/stm3240g-eval/src/stm32_spi.c b/boards/arm/stm3240g-eval/src/stm32_spi.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_spi.c rename to boards/arm/stm3240g-eval/src/stm32_spi.c diff --git a/boards/stm3240g-eval/src/stm32_stmpe811.c b/boards/arm/stm3240g-eval/src/stm32_stmpe811.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_stmpe811.c rename to boards/arm/stm3240g-eval/src/stm32_stmpe811.c diff --git a/boards/stm3240g-eval/src/stm32_usb.c b/boards/arm/stm3240g-eval/src/stm32_usb.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_usb.c rename to boards/arm/stm3240g-eval/src/stm32_usb.c diff --git a/boards/stm3240g-eval/src/stm32_userleds.c b/boards/arm/stm3240g-eval/src/stm32_userleds.c similarity index 100% rename from boards/stm3240g-eval/src/stm32_userleds.c rename to boards/arm/stm3240g-eval/src/stm32_userleds.c diff --git a/boards/stm32_tiny/Kconfig b/boards/arm/stm32_tiny/Kconfig similarity index 100% rename from boards/stm32_tiny/Kconfig rename to boards/arm/stm32_tiny/Kconfig diff --git a/boards/stm32_tiny/README.txt b/boards/arm/stm32_tiny/README.txt similarity index 100% rename from boards/stm32_tiny/README.txt rename to boards/arm/stm32_tiny/README.txt diff --git a/boards/stm32_tiny/configs/nsh/defconfig b/boards/arm/stm32_tiny/configs/nsh/defconfig similarity index 100% rename from boards/stm32_tiny/configs/nsh/defconfig rename to boards/arm/stm32_tiny/configs/nsh/defconfig diff --git a/boards/stm32_tiny/configs/usbnsh/defconfig b/boards/arm/stm32_tiny/configs/usbnsh/defconfig similarity index 100% rename from boards/stm32_tiny/configs/usbnsh/defconfig rename to boards/arm/stm32_tiny/configs/usbnsh/defconfig diff --git a/boards/stm32_tiny/include/board.h b/boards/arm/stm32_tiny/include/board.h similarity index 100% rename from boards/stm32_tiny/include/board.h rename to boards/arm/stm32_tiny/include/board.h diff --git a/boards/stm32_tiny/scripts/Make.defs b/boards/arm/stm32_tiny/scripts/Make.defs similarity index 96% rename from boards/stm32_tiny/scripts/Make.defs rename to boards/arm/stm32_tiny/scripts/Make.defs index ea29355c48..1373b9b54d 100644 --- a/boards/stm32_tiny/scripts/Make.defs +++ b/boards/arm/stm32_tiny/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32_tiny/scripts/ld.script b/boards/arm/stm32_tiny/scripts/ld.script similarity index 100% rename from boards/stm32_tiny/scripts/ld.script rename to boards/arm/stm32_tiny/scripts/ld.script diff --git a/boards/pic32mz-starterkit/src/.gitignore b/boards/arm/stm32_tiny/src/.gitignore similarity index 100% rename from boards/pic32mz-starterkit/src/.gitignore rename to boards/arm/stm32_tiny/src/.gitignore diff --git a/boards/stm32_tiny/src/Makefile b/boards/arm/stm32_tiny/src/Makefile similarity index 100% rename from boards/stm32_tiny/src/Makefile rename to boards/arm/stm32_tiny/src/Makefile diff --git a/boards/stm32_tiny/src/stm32_appinit.c b/boards/arm/stm32_tiny/src/stm32_appinit.c similarity index 100% rename from boards/stm32_tiny/src/stm32_appinit.c rename to boards/arm/stm32_tiny/src/stm32_appinit.c diff --git a/boards/stm32_tiny/src/stm32_boot.c b/boards/arm/stm32_tiny/src/stm32_boot.c similarity index 100% rename from boards/stm32_tiny/src/stm32_boot.c rename to boards/arm/stm32_tiny/src/stm32_boot.c diff --git a/boards/stm32_tiny/src/stm32_leds.c b/boards/arm/stm32_tiny/src/stm32_leds.c similarity index 100% rename from boards/stm32_tiny/src/stm32_leds.c rename to boards/arm/stm32_tiny/src/stm32_leds.c diff --git a/boards/stm32_tiny/src/stm32_nrf24l01.c b/boards/arm/stm32_tiny/src/stm32_nrf24l01.c similarity index 100% rename from boards/stm32_tiny/src/stm32_nrf24l01.c rename to boards/arm/stm32_tiny/src/stm32_nrf24l01.c diff --git a/boards/stm32_tiny/src/stm32_pwm.c b/boards/arm/stm32_tiny/src/stm32_pwm.c similarity index 100% rename from boards/stm32_tiny/src/stm32_pwm.c rename to boards/arm/stm32_tiny/src/stm32_pwm.c diff --git a/boards/stm32_tiny/src/stm32_spi.c b/boards/arm/stm32_tiny/src/stm32_spi.c similarity index 100% rename from boards/stm32_tiny/src/stm32_spi.c rename to boards/arm/stm32_tiny/src/stm32_spi.c diff --git a/boards/stm32_tiny/src/stm32_tiny.h b/boards/arm/stm32_tiny/src/stm32_tiny.h similarity index 98% rename from boards/stm32_tiny/src/stm32_tiny.h rename to boards/arm/stm32_tiny/src/stm32_tiny.h index 19c1a9d090..07779cc9e6 100644 --- a/boards/stm32_tiny/src/stm32_tiny.h +++ b/boards/arm/stm32_tiny/src/stm32_tiny.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM32_TINY_H -#define __BOARDS_STM32_TINY_H +#ifndef __BOARDS_ARM_STM32_TINY_H +#define __BOARDS_ARM_STM32_TINY_H /************************************************************************************ * Included Files @@ -156,5 +156,5 @@ int stm32_pwm_setup(void); void stm32_wlinitialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_HYMINI_STM32V_H */ +#endif /* __BOARDS_ARM_HYMINI_STM32V_H */ diff --git a/boards/stm32_tiny/src/stm32_usbdev.c b/boards/arm/stm32_tiny/src/stm32_usbdev.c similarity index 100% rename from boards/stm32_tiny/src/stm32_usbdev.c rename to boards/arm/stm32_tiny/src/stm32_usbdev.c diff --git a/boards/stm32butterfly2/Kconfig b/boards/arm/stm32butterfly2/Kconfig similarity index 100% rename from boards/stm32butterfly2/Kconfig rename to boards/arm/stm32butterfly2/Kconfig diff --git a/boards/stm32butterfly2/configs/nsh/defconfig b/boards/arm/stm32butterfly2/configs/nsh/defconfig similarity index 100% rename from boards/stm32butterfly2/configs/nsh/defconfig rename to boards/arm/stm32butterfly2/configs/nsh/defconfig diff --git a/boards/stm32butterfly2/configs/nshnet/defconfig b/boards/arm/stm32butterfly2/configs/nshnet/defconfig similarity index 100% rename from boards/stm32butterfly2/configs/nshnet/defconfig rename to boards/arm/stm32butterfly2/configs/nshnet/defconfig diff --git a/boards/stm32butterfly2/configs/nshusbdev/defconfig b/boards/arm/stm32butterfly2/configs/nshusbdev/defconfig similarity index 100% rename from boards/stm32butterfly2/configs/nshusbdev/defconfig rename to boards/arm/stm32butterfly2/configs/nshusbdev/defconfig diff --git a/boards/stm32butterfly2/configs/nshusbhost/defconfig b/boards/arm/stm32butterfly2/configs/nshusbhost/defconfig similarity index 100% rename from boards/stm32butterfly2/configs/nshusbhost/defconfig rename to boards/arm/stm32butterfly2/configs/nshusbhost/defconfig diff --git a/boards/stm32butterfly2/include/board.h b/boards/arm/stm32butterfly2/include/board.h similarity index 97% rename from boards/stm32butterfly2/include/board.h rename to boards/arm/stm32butterfly2/include/board.h index 24ac6f22c5..4e02e48e6b 100644 --- a/boards/stm32butterfly2/include/board.h +++ b/boards/arm/stm32butterfly2/include/board.h @@ -33,8 +33,8 @@ * ******************************************************************************/ -#ifndef __BOARDS_STM32_BUTTERFLY2_INCLUDE_BOARD_H -#define __BOARDS_STM32_BUTTERFLY2_INCLUDE_BOARD_H 1 +#ifndef __BOARDS_ARM_STM32_BUTTERFLY2_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32_BUTTERFLY2_INCLUDE_BOARD_H 1 /******************************************************************************* * Included Files @@ -164,4 +164,4 @@ # error "CONFIG_STM32_SPI2 is not supported" #endif -#endif /* __BOARDS_STM32_BUTTERFLY2_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32_BUTTERFLY2_INCLUDE_BOARD_H */ diff --git a/boards/stm32butterfly2/scripts/Make.defs b/boards/arm/stm32butterfly2/scripts/Make.defs similarity index 96% rename from boards/stm32butterfly2/scripts/Make.defs rename to boards/arm/stm32butterfly2/scripts/Make.defs index 74146b214b..21d7b0848e 100644 --- a/boards/stm32butterfly2/scripts/Make.defs +++ b/boards/arm/stm32butterfly2/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32butterfly2/scripts/dfu.ld b/boards/arm/stm32butterfly2/scripts/dfu.ld similarity index 100% rename from boards/stm32butterfly2/scripts/dfu.ld rename to boards/arm/stm32butterfly2/scripts/dfu.ld diff --git a/boards/stm32butterfly2/scripts/flash.ld b/boards/arm/stm32butterfly2/scripts/flash.ld similarity index 100% rename from boards/stm32butterfly2/scripts/flash.ld rename to boards/arm/stm32butterfly2/scripts/flash.ld diff --git a/boards/stm32butterfly2/src/Makefile b/boards/arm/stm32butterfly2/src/Makefile similarity index 100% rename from boards/stm32butterfly2/src/Makefile rename to boards/arm/stm32butterfly2/src/Makefile diff --git a/boards/stm32butterfly2/src/stm32_adc.c b/boards/arm/stm32butterfly2/src/stm32_adc.c similarity index 100% rename from boards/stm32butterfly2/src/stm32_adc.c rename to boards/arm/stm32butterfly2/src/stm32_adc.c diff --git a/boards/stm32butterfly2/src/stm32_boot.c b/boards/arm/stm32butterfly2/src/stm32_boot.c similarity index 100% rename from boards/stm32butterfly2/src/stm32_boot.c rename to boards/arm/stm32butterfly2/src/stm32_boot.c diff --git a/boards/stm32butterfly2/src/stm32_butterfly2.h b/boards/arm/stm32butterfly2/src/stm32_butterfly2.h similarity index 96% rename from boards/stm32butterfly2/src/stm32_butterfly2.h rename to boards/arm/stm32butterfly2/src/stm32_butterfly2.h index 3b2a68be98..f7b3522ff0 100644 --- a/boards/stm32butterfly2/src/stm32_butterfly2.h +++ b/boards/arm/stm32butterfly2/src/stm32_butterfly2.h @@ -32,8 +32,8 @@ * POSSIBILITY OF SUCH DAMAGE. ****************************************************************************/ -#ifndef __BOARDS_STM32_BUTTERFLY2_SRC_STM32_BUTTERFLY2_H -#define __BOARDS_STM32_BUTTERFLY2_SRC_STM32_BUTTERFLY2_H 1 +#ifndef __BOARDS_ARM_STM32_BUTTERFLY2_SRC_STM32_BUTTERFLY2_H +#define __BOARDS_ARM_STM32_BUTTERFLY2_SRC_STM32_BUTTERFLY2_H 1 /***************************************************************************** * Included Files @@ -141,5 +141,5 @@ int stm32_adc_setup(void); static inline int stm32_adc_setup(void) { return 0; } #endif -#endif /* __BOARDS_STM32_BUTTERFLY2_SRC_STM32_BUTTERFLY2_H */ +#endif /* __BOARDS_ARM_STM32_BUTTERFLY2_SRC_STM32_BUTTERFLY2_H */ diff --git a/boards/stm32butterfly2/src/stm32_buttons.c b/boards/arm/stm32butterfly2/src/stm32_buttons.c similarity index 100% rename from boards/stm32butterfly2/src/stm32_buttons.c rename to boards/arm/stm32butterfly2/src/stm32_buttons.c diff --git a/boards/stm32butterfly2/src/stm32_leds.c b/boards/arm/stm32butterfly2/src/stm32_leds.c similarity index 100% rename from boards/stm32butterfly2/src/stm32_leds.c rename to boards/arm/stm32butterfly2/src/stm32_leds.c diff --git a/boards/stm32butterfly2/src/stm32_mmcsd.c b/boards/arm/stm32butterfly2/src/stm32_mmcsd.c similarity index 100% rename from boards/stm32butterfly2/src/stm32_mmcsd.c rename to boards/arm/stm32butterfly2/src/stm32_mmcsd.c diff --git a/boards/stm32butterfly2/src/stm32_spi.c b/boards/arm/stm32butterfly2/src/stm32_spi.c similarity index 100% rename from boards/stm32butterfly2/src/stm32_spi.c rename to boards/arm/stm32butterfly2/src/stm32_spi.c diff --git a/boards/stm32butterfly2/src/stm32_usb.c b/boards/arm/stm32butterfly2/src/stm32_usb.c similarity index 100% rename from boards/stm32butterfly2/src/stm32_usb.c rename to boards/arm/stm32butterfly2/src/stm32_usb.c diff --git a/boards/stm32butterfly2/src/stm32_usbdev.c b/boards/arm/stm32butterfly2/src/stm32_usbdev.c similarity index 100% rename from boards/stm32butterfly2/src/stm32_usbdev.c rename to boards/arm/stm32butterfly2/src/stm32_usbdev.c diff --git a/boards/stm32butterfly2/src/stm32_usbhost.c b/boards/arm/stm32butterfly2/src/stm32_usbhost.c similarity index 100% rename from boards/stm32butterfly2/src/stm32_usbhost.c rename to boards/arm/stm32butterfly2/src/stm32_usbhost.c diff --git a/boards/stm32f051-discovery/Kconfig b/boards/arm/stm32f051-discovery/Kconfig similarity index 100% rename from boards/stm32f051-discovery/Kconfig rename to boards/arm/stm32f051-discovery/Kconfig diff --git a/boards/stm32f051-discovery/README.txt b/boards/arm/stm32f051-discovery/README.txt similarity index 100% rename from boards/stm32f051-discovery/README.txt rename to boards/arm/stm32f051-discovery/README.txt diff --git a/boards/stm32f051-discovery/configs/nsh/defconfig b/boards/arm/stm32f051-discovery/configs/nsh/defconfig similarity index 100% rename from boards/stm32f051-discovery/configs/nsh/defconfig rename to boards/arm/stm32f051-discovery/configs/nsh/defconfig diff --git a/boards/stm32f051-discovery/include/board.h b/boards/arm/stm32f051-discovery/include/board.h similarity index 98% rename from boards/stm32f051-discovery/include/board.h rename to boards/arm/stm32f051-discovery/include/board.h index b5399080bf..850babe3ff 100644 --- a/boards/stm32f051-discovery/include/board.h +++ b/boards/arm/stm32f051-discovery/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_STM32F051_DISCOVERY_INCLUDE_BOARD_H -#define __CONFIG_STM32F051_DISCOVERY_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32F051_DISCOVERY_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32F051_DISCOVERY_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -244,4 +244,4 @@ #define GPIO_I2C1_SCL GPIO_I2C1_SCL_1 #define GPIO_I2C1_SDA GPIO_I2C1_SDA_1 -#endif /* __CONFIG_STM32F051_DISCOVERY_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32F051_DISCOVERY_INCLUDE_BOARD_H */ diff --git a/boards/stm32f051-discovery/scripts/Make.defs b/boards/arm/stm32f051-discovery/scripts/Make.defs similarity index 96% rename from boards/stm32f051-discovery/scripts/Make.defs rename to boards/arm/stm32f051-discovery/scripts/Make.defs index dab38e69de..412592cb89 100644 --- a/boards/stm32f051-discovery/scripts/Make.defs +++ b/boards/arm/stm32f051-discovery/scripts/Make.defs @@ -47,13 +47,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32f051-discovery/scripts/flash.ld b/boards/arm/stm32f051-discovery/scripts/flash.ld similarity index 100% rename from boards/stm32f051-discovery/scripts/flash.ld rename to boards/arm/stm32f051-discovery/scripts/flash.ld diff --git a/boards/stm32f051-discovery/scripts/gnu-elf.ld b/boards/arm/stm32f051-discovery/scripts/gnu-elf.ld similarity index 100% rename from boards/stm32f051-discovery/scripts/gnu-elf.ld rename to boards/arm/stm32f051-discovery/scripts/gnu-elf.ld diff --git a/boards/pnev5180b/src/.gitignore b/boards/arm/stm32f051-discovery/src/.gitignore similarity index 100% rename from boards/pnev5180b/src/.gitignore rename to boards/arm/stm32f051-discovery/src/.gitignore diff --git a/boards/stm32f051-discovery/src/Makefile b/boards/arm/stm32f051-discovery/src/Makefile similarity index 100% rename from boards/stm32f051-discovery/src/Makefile rename to boards/arm/stm32f051-discovery/src/Makefile diff --git a/boards/stm32f051-discovery/src/stm32_appinit.c b/boards/arm/stm32f051-discovery/src/stm32_appinit.c similarity index 100% rename from boards/stm32f051-discovery/src/stm32_appinit.c rename to boards/arm/stm32f051-discovery/src/stm32_appinit.c diff --git a/boards/stm32f051-discovery/src/stm32_autoleds.c b/boards/arm/stm32f051-discovery/src/stm32_autoleds.c similarity index 100% rename from boards/stm32f051-discovery/src/stm32_autoleds.c rename to boards/arm/stm32f051-discovery/src/stm32_autoleds.c diff --git a/boards/stm32f051-discovery/src/stm32_boot.c b/boards/arm/stm32f051-discovery/src/stm32_boot.c similarity index 100% rename from boards/stm32f051-discovery/src/stm32_boot.c rename to boards/arm/stm32f051-discovery/src/stm32_boot.c diff --git a/boards/stm32f051-discovery/src/stm32_bringup.c b/boards/arm/stm32f051-discovery/src/stm32_bringup.c similarity index 100% rename from boards/stm32f051-discovery/src/stm32_bringup.c rename to boards/arm/stm32f051-discovery/src/stm32_bringup.c diff --git a/boards/stm32f051-discovery/src/stm32_buttons.c b/boards/arm/stm32f051-discovery/src/stm32_buttons.c similarity index 100% rename from boards/stm32f051-discovery/src/stm32_buttons.c rename to boards/arm/stm32f051-discovery/src/stm32_buttons.c diff --git a/boards/stm32f051-discovery/src/stm32_userleds.c b/boards/arm/stm32f051-discovery/src/stm32_userleds.c similarity index 100% rename from boards/stm32f051-discovery/src/stm32_userleds.c rename to boards/arm/stm32f051-discovery/src/stm32_userleds.c diff --git a/boards/stm32f051-discovery/src/stm32f051-discovery.h b/boards/arm/stm32f051-discovery/src/stm32f051-discovery.h similarity index 96% rename from boards/stm32f051-discovery/src/stm32f051-discovery.h rename to boards/arm/stm32f051-discovery/src/stm32f051-discovery.h index bca581dd54..5de0f67f10 100644 --- a/boards/stm32f051-discovery/src/stm32f051-discovery.h +++ b/boards/arm/stm32f051-discovery/src/stm32f051-discovery.h @@ -34,8 +34,8 @@ * ****************************************************************************************************/ -#ifndef __BOARDS_STM32F051_DISCOVERY_SRC_STM32F051_DISCOVERY_H -#define __BOARDS_STM32F051_DISCOVERY_SRC_STM32F051_DISCOVERY_H +#ifndef __BOARDS_ARM_STM32F051_DISCOVERY_SRC_STM32F051_DISCOVERY_H +#define __BOARDS_ARM_STM32F051_DISCOVERY_SRC_STM32F051_DISCOVERY_H /**************************************************************************************************** * Included Files @@ -132,4 +132,4 @@ int stm32_bringup(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32F051_DISCOVERY_SRC_STM32F051_DISCOVERY_H */ +#endif /* __BOARDS_ARM_STM32F051_DISCOVERY_SRC_STM32F051_DISCOVERY_H */ diff --git a/boards/stm32f072-discovery/Kconfig b/boards/arm/stm32f072-discovery/Kconfig similarity index 100% rename from boards/stm32f072-discovery/Kconfig rename to boards/arm/stm32f072-discovery/Kconfig diff --git a/boards/stm32f072-discovery/README.txt b/boards/arm/stm32f072-discovery/README.txt similarity index 100% rename from boards/stm32f072-discovery/README.txt rename to boards/arm/stm32f072-discovery/README.txt diff --git a/boards/stm32f072-discovery/configs/nsh/defconfig b/boards/arm/stm32f072-discovery/configs/nsh/defconfig similarity index 100% rename from boards/stm32f072-discovery/configs/nsh/defconfig rename to boards/arm/stm32f072-discovery/configs/nsh/defconfig diff --git a/boards/stm32f072-discovery/include/board.h b/boards/arm/stm32f072-discovery/include/board.h similarity index 98% rename from boards/stm32f072-discovery/include/board.h rename to boards/arm/stm32f072-discovery/include/board.h index 61cb92cc92..49f1dd1380 100644 --- a/boards/stm32f072-discovery/include/board.h +++ b/boards/arm/stm32f072-discovery/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_STM32F072_DISCOVERY_INCLUDE_BOARD_H -#define __CONFIG_STM32F072_DISCOVERY_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32F072_DISCOVERY_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32F072_DISCOVERY_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -248,4 +248,4 @@ #define GPIO_I2C1_SCL GPIO_I2C1_SCL_1 #define GPIO_I2C1_SDA GPIO_I2C1_SDA_1 -#endif /* __CONFIG_STM32F072_DISCOVERY_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32F072_DISCOVERY_INCLUDE_BOARD_H */ diff --git a/boards/stm32f072-discovery/scripts/Make.defs b/boards/arm/stm32f072-discovery/scripts/Make.defs similarity index 96% rename from boards/stm32f072-discovery/scripts/Make.defs rename to boards/arm/stm32f072-discovery/scripts/Make.defs index 272a09b2fa..ac4fd4b361 100644 --- a/boards/stm32f072-discovery/scripts/Make.defs +++ b/boards/arm/stm32f072-discovery/scripts/Make.defs @@ -47,13 +47,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32f072-discovery/scripts/flash.ld b/boards/arm/stm32f072-discovery/scripts/flash.ld similarity index 100% rename from boards/stm32f072-discovery/scripts/flash.ld rename to boards/arm/stm32f072-discovery/scripts/flash.ld diff --git a/boards/stm32f072-discovery/scripts/gnu-elf.ld b/boards/arm/stm32f072-discovery/scripts/gnu-elf.ld similarity index 100% rename from boards/stm32f072-discovery/scripts/gnu-elf.ld rename to boards/arm/stm32f072-discovery/scripts/gnu-elf.ld diff --git a/boards/qemu-i486/src/.gitignore b/boards/arm/stm32f072-discovery/src/.gitignore similarity index 100% rename from boards/qemu-i486/src/.gitignore rename to boards/arm/stm32f072-discovery/src/.gitignore diff --git a/boards/stm32f072-discovery/src/Makefile b/boards/arm/stm32f072-discovery/src/Makefile similarity index 100% rename from boards/stm32f072-discovery/src/Makefile rename to boards/arm/stm32f072-discovery/src/Makefile diff --git a/boards/stm32f072-discovery/src/stm32_appinit.c b/boards/arm/stm32f072-discovery/src/stm32_appinit.c similarity index 100% rename from boards/stm32f072-discovery/src/stm32_appinit.c rename to boards/arm/stm32f072-discovery/src/stm32_appinit.c diff --git a/boards/stm32f072-discovery/src/stm32_autoleds.c b/boards/arm/stm32f072-discovery/src/stm32_autoleds.c similarity index 100% rename from boards/stm32f072-discovery/src/stm32_autoleds.c rename to boards/arm/stm32f072-discovery/src/stm32_autoleds.c diff --git a/boards/stm32f072-discovery/src/stm32_boot.c b/boards/arm/stm32f072-discovery/src/stm32_boot.c similarity index 100% rename from boards/stm32f072-discovery/src/stm32_boot.c rename to boards/arm/stm32f072-discovery/src/stm32_boot.c diff --git a/boards/stm32f072-discovery/src/stm32_bringup.c b/boards/arm/stm32f072-discovery/src/stm32_bringup.c similarity index 100% rename from boards/stm32f072-discovery/src/stm32_bringup.c rename to boards/arm/stm32f072-discovery/src/stm32_bringup.c diff --git a/boards/stm32f072-discovery/src/stm32_buttons.c b/boards/arm/stm32f072-discovery/src/stm32_buttons.c similarity index 100% rename from boards/stm32f072-discovery/src/stm32_buttons.c rename to boards/arm/stm32f072-discovery/src/stm32_buttons.c diff --git a/boards/stm32f072-discovery/src/stm32_userleds.c b/boards/arm/stm32f072-discovery/src/stm32_userleds.c similarity index 100% rename from boards/stm32f072-discovery/src/stm32_userleds.c rename to boards/arm/stm32f072-discovery/src/stm32_userleds.c diff --git a/boards/stm32f072-discovery/src/stm32f072-discovery.h b/boards/arm/stm32f072-discovery/src/stm32f072-discovery.h similarity index 96% rename from boards/stm32f072-discovery/src/stm32f072-discovery.h rename to boards/arm/stm32f072-discovery/src/stm32f072-discovery.h index 20f1adeadd..efc86cc3a9 100644 --- a/boards/stm32f072-discovery/src/stm32f072-discovery.h +++ b/boards/arm/stm32f072-discovery/src/stm32f072-discovery.h @@ -34,8 +34,8 @@ * ****************************************************************************************************/ -#ifndef __BOARDS_STM32F072_DISCOVERY_SRC_STM32F072_DISCOVERY_H -#define __BOARDS_STM32F072_DISCOVERY_SRC_STM32F072_DISCOVERY_H +#ifndef __BOARDS_ARM_STM32F072_DISCOVERY_SRC_STM32F072_DISCOVERY_H +#define __BOARDS_ARM_STM32F072_DISCOVERY_SRC_STM32F072_DISCOVERY_H /**************************************************************************************************** * Included Files @@ -138,4 +138,4 @@ int stm32_bringup(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32F072_DISCOVERY_SRC_STM32F072_DISCOVERY_H */ +#endif /* __BOARDS_ARM_STM32F072_DISCOVERY_SRC_STM32F072_DISCOVERY_H */ diff --git a/boards/stm32f103-minimum/Kconfig b/boards/arm/stm32f103-minimum/Kconfig similarity index 100% rename from boards/stm32f103-minimum/Kconfig rename to boards/arm/stm32f103-minimum/Kconfig diff --git a/boards/stm32f103-minimum/README.txt b/boards/arm/stm32f103-minimum/README.txt similarity index 100% rename from boards/stm32f103-minimum/README.txt rename to boards/arm/stm32f103-minimum/README.txt diff --git a/boards/stm32f103-minimum/configs/apds9960/defconfig b/boards/arm/stm32f103-minimum/configs/apds9960/defconfig similarity index 100% rename from boards/stm32f103-minimum/configs/apds9960/defconfig rename to boards/arm/stm32f103-minimum/configs/apds9960/defconfig diff --git a/boards/stm32f103-minimum/configs/audio_tone/defconfig b/boards/arm/stm32f103-minimum/configs/audio_tone/defconfig similarity index 100% rename from boards/stm32f103-minimum/configs/audio_tone/defconfig rename to boards/arm/stm32f103-minimum/configs/audio_tone/defconfig diff --git a/boards/stm32f103-minimum/configs/buttons/defconfig b/boards/arm/stm32f103-minimum/configs/buttons/defconfig similarity index 100% rename from boards/stm32f103-minimum/configs/buttons/defconfig rename to boards/arm/stm32f103-minimum/configs/buttons/defconfig diff --git a/boards/stm32f103-minimum/configs/hello/defconfig b/boards/arm/stm32f103-minimum/configs/hello/defconfig similarity index 100% rename from boards/stm32f103-minimum/configs/hello/defconfig rename to boards/arm/stm32f103-minimum/configs/hello/defconfig diff --git a/boards/stm32f103-minimum/configs/jlx12864g/defconfig b/boards/arm/stm32f103-minimum/configs/jlx12864g/defconfig similarity index 100% rename from boards/stm32f103-minimum/configs/jlx12864g/defconfig rename to boards/arm/stm32f103-minimum/configs/jlx12864g/defconfig diff --git a/boards/stm32f103-minimum/configs/mcp2515/defconfig b/boards/arm/stm32f103-minimum/configs/mcp2515/defconfig similarity index 100% rename from boards/stm32f103-minimum/configs/mcp2515/defconfig rename to boards/arm/stm32f103-minimum/configs/mcp2515/defconfig diff --git a/boards/stm32f103-minimum/configs/nrf24/defconfig b/boards/arm/stm32f103-minimum/configs/nrf24/defconfig similarity index 100% rename from boards/stm32f103-minimum/configs/nrf24/defconfig rename to boards/arm/stm32f103-minimum/configs/nrf24/defconfig diff --git a/boards/stm32f103-minimum/configs/nsh/defconfig b/boards/arm/stm32f103-minimum/configs/nsh/defconfig similarity index 100% rename from boards/stm32f103-minimum/configs/nsh/defconfig rename to boards/arm/stm32f103-minimum/configs/nsh/defconfig diff --git a/boards/stm32f103-minimum/configs/pwm/defconfig b/boards/arm/stm32f103-minimum/configs/pwm/defconfig similarity index 100% rename from boards/stm32f103-minimum/configs/pwm/defconfig rename to boards/arm/stm32f103-minimum/configs/pwm/defconfig diff --git a/boards/stm32f103-minimum/configs/rfid-rc522/defconfig b/boards/arm/stm32f103-minimum/configs/rfid-rc522/defconfig similarity index 100% rename from boards/stm32f103-minimum/configs/rfid-rc522/defconfig rename to boards/arm/stm32f103-minimum/configs/rfid-rc522/defconfig diff --git a/boards/stm32f103-minimum/configs/rgbled/defconfig b/boards/arm/stm32f103-minimum/configs/rgbled/defconfig similarity index 100% rename from boards/stm32f103-minimum/configs/rgbled/defconfig rename to boards/arm/stm32f103-minimum/configs/rgbled/defconfig diff --git a/boards/stm32f103-minimum/configs/usbnsh/defconfig b/boards/arm/stm32f103-minimum/configs/usbnsh/defconfig similarity index 100% rename from boards/stm32f103-minimum/configs/usbnsh/defconfig rename to boards/arm/stm32f103-minimum/configs/usbnsh/defconfig diff --git a/boards/stm32f103-minimum/configs/userled/defconfig b/boards/arm/stm32f103-minimum/configs/userled/defconfig similarity index 100% rename from boards/stm32f103-minimum/configs/userled/defconfig rename to boards/arm/stm32f103-minimum/configs/userled/defconfig diff --git a/boards/stm32f103-minimum/configs/veml6070/defconfig b/boards/arm/stm32f103-minimum/configs/veml6070/defconfig similarity index 100% rename from boards/stm32f103-minimum/configs/veml6070/defconfig rename to boards/arm/stm32f103-minimum/configs/veml6070/defconfig diff --git a/boards/stm32f103-minimum/include/board.h b/boards/arm/stm32f103-minimum/include/board.h similarity index 97% rename from boards/stm32f103-minimum/include/board.h rename to boards/arm/stm32f103-minimum/include/board.h index d75683bf7d..5696b8701a 100644 --- a/boards/stm32f103-minimum/include/board.h +++ b/boards/arm/stm32f103-minimum/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM32F103_MINIMUM_INCLUDE_BOARD_H -#define __BOARDS_STM32F103_MINIMUM_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32F103_MINIMUM_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32F103_MINIMUM_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -194,4 +194,4 @@ #define RGBLED_BPWMTIMER 4 #define RGBLED_BPWMCHANNEL 4 -#endif /* __BOARDS_STM32F103_MINIMUM_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32F103_MINIMUM_INCLUDE_BOARD_H */ diff --git a/boards/stm32f103-minimum/scripts/Make.defs b/boards/arm/stm32f103-minimum/scripts/Make.defs similarity index 96% rename from boards/stm32f103-minimum/scripts/Make.defs rename to boards/arm/stm32f103-minimum/scripts/Make.defs index 625f02d56e..056dd41d98 100644 --- a/boards/stm32f103-minimum/scripts/Make.defs +++ b/boards/arm/stm32f103-minimum/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32f103-minimum/scripts/ld.script b/boards/arm/stm32f103-minimum/scripts/ld.script similarity index 100% rename from boards/stm32f103-minimum/scripts/ld.script rename to boards/arm/stm32f103-minimum/scripts/ld.script diff --git a/boards/stm32f103-minimum/scripts/ld.script.dfu b/boards/arm/stm32f103-minimum/scripts/ld.script.dfu similarity index 100% rename from boards/stm32f103-minimum/scripts/ld.script.dfu rename to boards/arm/stm32f103-minimum/scripts/ld.script.dfu diff --git a/boards/sam3u-ek/src/.gitignore b/boards/arm/stm32f103-minimum/src/.gitignore similarity index 100% rename from boards/sam3u-ek/src/.gitignore rename to boards/arm/stm32f103-minimum/src/.gitignore diff --git a/boards/stm32f103-minimum/src/Makefile b/boards/arm/stm32f103-minimum/src/Makefile similarity index 100% rename from boards/stm32f103-minimum/src/Makefile rename to boards/arm/stm32f103-minimum/src/Makefile diff --git a/boards/stm32f103-minimum/src/stm32_adc.c b/boards/arm/stm32f103-minimum/src/stm32_adc.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_adc.c rename to boards/arm/stm32f103-minimum/src/stm32_adc.c diff --git a/boards/stm32f103-minimum/src/stm32_apa102.c b/boards/arm/stm32f103-minimum/src/stm32_apa102.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_apa102.c rename to boards/arm/stm32f103-minimum/src/stm32_apa102.c diff --git a/boards/stm32f103-minimum/src/stm32_apds9960.c b/boards/arm/stm32f103-minimum/src/stm32_apds9960.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_apds9960.c rename to boards/arm/stm32f103-minimum/src/stm32_apds9960.c diff --git a/boards/stm32f103-minimum/src/stm32_appinit.c b/boards/arm/stm32f103-minimum/src/stm32_appinit.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_appinit.c rename to boards/arm/stm32f103-minimum/src/stm32_appinit.c diff --git a/boards/stm32f103-minimum/src/stm32_at24.c b/boards/arm/stm32f103-minimum/src/stm32_at24.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_at24.c rename to boards/arm/stm32f103-minimum/src/stm32_at24.c diff --git a/boards/stm32f103-minimum/src/stm32_autoleds.c b/boards/arm/stm32f103-minimum/src/stm32_autoleds.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_autoleds.c rename to boards/arm/stm32f103-minimum/src/stm32_autoleds.c diff --git a/boards/stm32f103-minimum/src/stm32_bmp180.c b/boards/arm/stm32f103-minimum/src/stm32_bmp180.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_bmp180.c rename to boards/arm/stm32f103-minimum/src/stm32_bmp180.c diff --git a/boards/stm32f103-minimum/src/stm32_boot.c b/boards/arm/stm32f103-minimum/src/stm32_boot.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_boot.c rename to boards/arm/stm32f103-minimum/src/stm32_boot.c diff --git a/boards/stm32f103-minimum/src/stm32_bringup.c b/boards/arm/stm32f103-minimum/src/stm32_bringup.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_bringup.c rename to boards/arm/stm32f103-minimum/src/stm32_bringup.c diff --git a/boards/stm32f103-minimum/src/stm32_buttons.c b/boards/arm/stm32f103-minimum/src/stm32_buttons.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_buttons.c rename to boards/arm/stm32f103-minimum/src/stm32_buttons.c diff --git a/boards/stm32f103-minimum/src/stm32_gpio.c b/boards/arm/stm32f103-minimum/src/stm32_gpio.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_gpio.c rename to boards/arm/stm32f103-minimum/src/stm32_gpio.c diff --git a/boards/stm32f103-minimum/src/stm32_hcsr04.c b/boards/arm/stm32f103-minimum/src/stm32_hcsr04.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_hcsr04.c rename to boards/arm/stm32f103-minimum/src/stm32_hcsr04.c diff --git a/boards/stm32f103-minimum/src/stm32_lcd.c b/boards/arm/stm32f103-minimum/src/stm32_lcd.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_lcd.c rename to boards/arm/stm32f103-minimum/src/stm32_lcd.c diff --git a/boards/stm32f103-minimum/src/stm32_lm75.c b/boards/arm/stm32f103-minimum/src/stm32_lm75.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_lm75.c rename to boards/arm/stm32f103-minimum/src/stm32_lm75.c diff --git a/boards/stm32f103-minimum/src/stm32_max6675.c b/boards/arm/stm32f103-minimum/src/stm32_max6675.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_max6675.c rename to boards/arm/stm32f103-minimum/src/stm32_max6675.c diff --git a/boards/stm32f103-minimum/src/stm32_max7219.c b/boards/arm/stm32f103-minimum/src/stm32_max7219.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_max7219.c rename to boards/arm/stm32f103-minimum/src/stm32_max7219.c diff --git a/boards/stm32f103-minimum/src/stm32_mcp2515.c b/boards/arm/stm32f103-minimum/src/stm32_mcp2515.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_mcp2515.c rename to boards/arm/stm32f103-minimum/src/stm32_mcp2515.c diff --git a/boards/stm32f103-minimum/src/stm32_mfrc522.c b/boards/arm/stm32f103-minimum/src/stm32_mfrc522.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_mfrc522.c rename to boards/arm/stm32f103-minimum/src/stm32_mfrc522.c diff --git a/boards/stm32f103-minimum/src/stm32_mmcsd.c b/boards/arm/stm32f103-minimum/src/stm32_mmcsd.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_mmcsd.c rename to boards/arm/stm32f103-minimum/src/stm32_mmcsd.c diff --git a/boards/stm32f103-minimum/src/stm32_nrf24l01.c b/boards/arm/stm32f103-minimum/src/stm32_nrf24l01.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_nrf24l01.c rename to boards/arm/stm32f103-minimum/src/stm32_nrf24l01.c diff --git a/boards/stm32f103-minimum/src/stm32_nunchuck.c b/boards/arm/stm32f103-minimum/src/stm32_nunchuck.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_nunchuck.c rename to boards/arm/stm32f103-minimum/src/stm32_nunchuck.c diff --git a/boards/stm32f103-minimum/src/stm32_pcd8544.c b/boards/arm/stm32f103-minimum/src/stm32_pcd8544.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_pcd8544.c rename to boards/arm/stm32f103-minimum/src/stm32_pcd8544.c diff --git a/boards/stm32f103-minimum/src/stm32_pwm.c b/boards/arm/stm32f103-minimum/src/stm32_pwm.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_pwm.c rename to boards/arm/stm32f103-minimum/src/stm32_pwm.c diff --git a/boards/stm32f103-minimum/src/stm32_qencoder.c b/boards/arm/stm32f103-minimum/src/stm32_qencoder.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_qencoder.c rename to boards/arm/stm32f103-minimum/src/stm32_qencoder.c diff --git a/boards/stm32f103-minimum/src/stm32_rgbled.c b/boards/arm/stm32f103-minimum/src/stm32_rgbled.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_rgbled.c rename to boards/arm/stm32f103-minimum/src/stm32_rgbled.c diff --git a/boards/stm32f103-minimum/src/stm32_spi.c b/boards/arm/stm32f103-minimum/src/stm32_spi.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_spi.c rename to boards/arm/stm32f103-minimum/src/stm32_spi.c diff --git a/boards/stm32f103-minimum/src/stm32_ssd1306.c b/boards/arm/stm32f103-minimum/src/stm32_ssd1306.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_ssd1306.c rename to boards/arm/stm32f103-minimum/src/stm32_ssd1306.c diff --git a/boards/stm32f103-minimum/src/stm32_tone.c b/boards/arm/stm32f103-minimum/src/stm32_tone.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_tone.c rename to boards/arm/stm32f103-minimum/src/stm32_tone.c diff --git a/boards/stm32f103-minimum/src/stm32_usbdev.c b/boards/arm/stm32f103-minimum/src/stm32_usbdev.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_usbdev.c rename to boards/arm/stm32f103-minimum/src/stm32_usbdev.c diff --git a/boards/stm32f103-minimum/src/stm32_usbmsc.c b/boards/arm/stm32f103-minimum/src/stm32_usbmsc.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_usbmsc.c rename to boards/arm/stm32f103-minimum/src/stm32_usbmsc.c diff --git a/boards/stm32f103-minimum/src/stm32_userleds.c b/boards/arm/stm32f103-minimum/src/stm32_userleds.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_userleds.c rename to boards/arm/stm32f103-minimum/src/stm32_userleds.c diff --git a/boards/stm32f103-minimum/src/stm32_veml6070.c b/boards/arm/stm32f103-minimum/src/stm32_veml6070.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_veml6070.c rename to boards/arm/stm32f103-minimum/src/stm32_veml6070.c diff --git a/boards/stm32f103-minimum/src/stm32_w25.c b/boards/arm/stm32f103-minimum/src/stm32_w25.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_w25.c rename to boards/arm/stm32f103-minimum/src/stm32_w25.c diff --git a/boards/stm32f103-minimum/src/stm32_zerocross.c b/boards/arm/stm32f103-minimum/src/stm32_zerocross.c similarity index 100% rename from boards/stm32f103-minimum/src/stm32_zerocross.c rename to boards/arm/stm32f103-minimum/src/stm32_zerocross.c diff --git a/boards/stm32f103-minimum/src/stm32f103_minimum.h b/boards/arm/stm32f103-minimum/src/stm32f103_minimum.h similarity index 98% rename from boards/stm32f103-minimum/src/stm32f103_minimum.h rename to boards/arm/stm32f103-minimum/src/stm32f103_minimum.h index ee8ebdb22e..d7af54c961 100644 --- a/boards/stm32f103-minimum/src/stm32f103_minimum.h +++ b/boards/arm/stm32f103-minimum/src/stm32f103_minimum.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM32F103_MINIMUM_SRC_STM32F103_MINIMUM_H -#define __BOARDS_STM32F103_MINIMUM_SRC_STM32F103_MINIMUM_H +#ifndef __BOARDS_ARM_STM32F103_MINIMUM_SRC_STM32F103_MINIMUM_H +#define __BOARDS_ARM_STM32F103_MINIMUM_SRC_STM32F103_MINIMUM_H /************************************************************************************ * Included Files @@ -518,4 +518,4 @@ int stm32_veml6070initialize(FAR const char *devpath); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32F103_MINIMUM_SRC_STM32F103_MINIMUM_H */ +#endif /* __BOARDS_ARM_STM32F103_MINIMUM_SRC_STM32F103_MINIMUM_H */ diff --git a/boards/stm32f334-disco/Kconfig b/boards/arm/stm32f334-disco/Kconfig similarity index 100% rename from boards/stm32f334-disco/Kconfig rename to boards/arm/stm32f334-disco/Kconfig diff --git a/boards/stm32f334-disco/README.txt b/boards/arm/stm32f334-disco/README.txt similarity index 100% rename from boards/stm32f334-disco/README.txt rename to boards/arm/stm32f334-disco/README.txt diff --git a/boards/stm32f334-disco/configs/buckboost/defconfig b/boards/arm/stm32f334-disco/configs/buckboost/defconfig similarity index 100% rename from boards/stm32f334-disco/configs/buckboost/defconfig rename to boards/arm/stm32f334-disco/configs/buckboost/defconfig diff --git a/boards/stm32f334-disco/configs/nsh/defconfig b/boards/arm/stm32f334-disco/configs/nsh/defconfig similarity index 100% rename from boards/stm32f334-disco/configs/nsh/defconfig rename to boards/arm/stm32f334-disco/configs/nsh/defconfig diff --git a/boards/stm32f334-disco/configs/powerled/defconfig b/boards/arm/stm32f334-disco/configs/powerled/defconfig similarity index 100% rename from boards/stm32f334-disco/configs/powerled/defconfig rename to boards/arm/stm32f334-disco/configs/powerled/defconfig diff --git a/boards/stm32f334-disco/include/board.h b/boards/arm/stm32f334-disco/include/board.h similarity index 98% rename from boards/stm32f334-disco/include/board.h rename to boards/arm/stm32f334-disco/include/board.h index 1b672c8d20..90514f77a8 100644 --- a/boards/stm32f334-disco/include/board.h +++ b/boards/arm/stm32f334-disco/include/board.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __CONFIG_STM32F334_DISCO_INCLUDE_BOARD_H -#define __CONFIG_STM32F334_DISCO_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32F334_DISCO_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32F334_DISCO_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -316,4 +316,4 @@ #endif /* CONFIG_EXAMPLES_SMPS */ -#endif /* __CONFIG_STM32F334_DISCO_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32F334_DISCO_INCLUDE_BOARD_H */ diff --git a/boards/stm32f334-disco/scripts/Make.defs b/boards/arm/stm32f334-disco/scripts/Make.defs similarity index 96% rename from boards/stm32f334-disco/scripts/Make.defs rename to boards/arm/stm32f334-disco/scripts/Make.defs index f9662d81bf..5013bbff50 100644 --- a/boards/stm32f334-disco/scripts/Make.defs +++ b/boards/arm/stm32f334-disco/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32f334-disco/scripts/ld.script b/boards/arm/stm32f334-disco/scripts/ld.script similarity index 100% rename from boards/stm32f334-disco/scripts/ld.script rename to boards/arm/stm32f334-disco/scripts/ld.script diff --git a/boards/stm32f334-disco/src/Makefile b/boards/arm/stm32f334-disco/src/Makefile similarity index 100% rename from boards/stm32f334-disco/src/Makefile rename to boards/arm/stm32f334-disco/src/Makefile diff --git a/boards/stm32f334-disco/src/stm32_adc.c b/boards/arm/stm32f334-disco/src/stm32_adc.c similarity index 100% rename from boards/stm32f334-disco/src/stm32_adc.c rename to boards/arm/stm32f334-disco/src/stm32_adc.c diff --git a/boards/stm32f334-disco/src/stm32_appinit.c b/boards/arm/stm32f334-disco/src/stm32_appinit.c similarity index 100% rename from boards/stm32f334-disco/src/stm32_appinit.c rename to boards/arm/stm32f334-disco/src/stm32_appinit.c diff --git a/boards/stm32f334-disco/src/stm32_autoleds.c b/boards/arm/stm32f334-disco/src/stm32_autoleds.c similarity index 100% rename from boards/stm32f334-disco/src/stm32_autoleds.c rename to boards/arm/stm32f334-disco/src/stm32_autoleds.c diff --git a/boards/stm32f334-disco/src/stm32_boot.c b/boards/arm/stm32f334-disco/src/stm32_boot.c similarity index 100% rename from boards/stm32f334-disco/src/stm32_boot.c rename to boards/arm/stm32f334-disco/src/stm32_boot.c diff --git a/boards/stm32f334-disco/src/stm32_buttons.c b/boards/arm/stm32f334-disco/src/stm32_buttons.c similarity index 100% rename from boards/stm32f334-disco/src/stm32_buttons.c rename to boards/arm/stm32f334-disco/src/stm32_buttons.c diff --git a/boards/stm32f334-disco/src/stm32_comp.c b/boards/arm/stm32f334-disco/src/stm32_comp.c similarity index 100% rename from boards/stm32f334-disco/src/stm32_comp.c rename to boards/arm/stm32f334-disco/src/stm32_comp.c diff --git a/boards/stm32f334-disco/src/stm32_hrtim.c b/boards/arm/stm32f334-disco/src/stm32_hrtim.c similarity index 100% rename from boards/stm32f334-disco/src/stm32_hrtim.c rename to boards/arm/stm32f334-disco/src/stm32_hrtim.c diff --git a/boards/stm32f334-disco/src/stm32_opamp.c b/boards/arm/stm32f334-disco/src/stm32_opamp.c similarity index 100% rename from boards/stm32f334-disco/src/stm32_opamp.c rename to boards/arm/stm32f334-disco/src/stm32_opamp.c diff --git a/boards/stm32f334-disco/src/stm32_powerled.c b/boards/arm/stm32f334-disco/src/stm32_powerled.c similarity index 100% rename from boards/stm32f334-disco/src/stm32_powerled.c rename to boards/arm/stm32f334-disco/src/stm32_powerled.c diff --git a/boards/stm32f334-disco/src/stm32_smps.c b/boards/arm/stm32f334-disco/src/stm32_smps.c similarity index 100% rename from boards/stm32f334-disco/src/stm32_smps.c rename to boards/arm/stm32f334-disco/src/stm32_smps.c diff --git a/boards/stm32f334-disco/src/stm32f334-disco.h b/boards/arm/stm32f334-disco/src/stm32f334-disco.h similarity index 97% rename from boards/stm32f334-disco/src/stm32f334-disco.h rename to boards/arm/stm32f334-disco/src/stm32f334-disco.h index ba263be667..7c134dba27 100644 --- a/boards/stm32f334-disco/src/stm32f334-disco.h +++ b/boards/arm/stm32f334-disco/src/stm32f334-disco.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_STM32F334_DISCO_SRC_STM32F334_DISCO_H -#define __BOARDS_STM32F334_DISCO_SRC_STM32F334_DISCO_H +#ifndef __BOARDS_ARM_STM32F334_DISCO_SRC_STM32F334_DISCO_H +#define __BOARDS_ARM_STM32F334_DISCO_SRC_STM32F334_DISCO_H /**************************************************************************** * Included Files @@ -219,4 +219,4 @@ int stm32_powerled_setup(void); int stm32_smps_setup(void); #endif -#endif /* __BOARDS_STM32F334_DISCO_SRC_STM32F334_DISCO_H */ +#endif /* __BOARDS_ARM_STM32F334_DISCO_SRC_STM32F334_DISCO_H */ diff --git a/boards/stm32f3discovery/Kconfig b/boards/arm/stm32f3discovery/Kconfig similarity index 100% rename from boards/stm32f3discovery/Kconfig rename to boards/arm/stm32f3discovery/Kconfig diff --git a/boards/stm32f3discovery/README.txt b/boards/arm/stm32f3discovery/README.txt similarity index 100% rename from boards/stm32f3discovery/README.txt rename to boards/arm/stm32f3discovery/README.txt diff --git a/boards/stm32f3discovery/configs/nsh/defconfig b/boards/arm/stm32f3discovery/configs/nsh/defconfig similarity index 100% rename from boards/stm32f3discovery/configs/nsh/defconfig rename to boards/arm/stm32f3discovery/configs/nsh/defconfig diff --git a/boards/stm32f3discovery/configs/usbnsh/defconfig b/boards/arm/stm32f3discovery/configs/usbnsh/defconfig similarity index 100% rename from boards/stm32f3discovery/configs/usbnsh/defconfig rename to boards/arm/stm32f3discovery/configs/usbnsh/defconfig diff --git a/boards/stm32f3discovery/include/board.h b/boards/arm/stm32f3discovery/include/board.h similarity index 98% rename from boards/stm32f3discovery/include/board.h rename to boards/arm/stm32f3discovery/include/board.h index da96890d77..9724f0c96c 100644 --- a/boards/stm32f3discovery/include/board.h +++ b/boards/arm/stm32f3discovery/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_STM32F3DISCOVERY_INCLUDE_BOARD_H -#define __CONFIG_STM32F3DISCOVERY_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32F3DISCOVERY_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32F3DISCOVERY_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -272,4 +272,4 @@ #define GPIO_I2C2_SDA GPIO_I2C2_SDA_1 #endif -#endif /* __CONFIG_STM32F3DISCOVERY_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32F3DISCOVERY_INCLUDE_BOARD_H */ diff --git a/boards/stm32f3discovery/scripts/Make.defs b/boards/arm/stm32f3discovery/scripts/Make.defs similarity index 96% rename from boards/stm32f3discovery/scripts/Make.defs rename to boards/arm/stm32f3discovery/scripts/Make.defs index 2c11837044..dcc066f64b 100644 --- a/boards/stm32f3discovery/scripts/Make.defs +++ b/boards/arm/stm32f3discovery/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32f3discovery/scripts/gnu-elf.ld b/boards/arm/stm32f3discovery/scripts/gnu-elf.ld similarity index 100% rename from boards/stm32f3discovery/scripts/gnu-elf.ld rename to boards/arm/stm32f3discovery/scripts/gnu-elf.ld diff --git a/boards/stm32f3discovery/scripts/ld.script b/boards/arm/stm32f3discovery/scripts/ld.script similarity index 100% rename from boards/stm32f3discovery/scripts/ld.script rename to boards/arm/stm32f3discovery/scripts/ld.script diff --git a/boards/sam4e-ek/src/.gitignore b/boards/arm/stm32f3discovery/src/.gitignore similarity index 100% rename from boards/sam4e-ek/src/.gitignore rename to boards/arm/stm32f3discovery/src/.gitignore diff --git a/boards/stm32f3discovery/src/Makefile b/boards/arm/stm32f3discovery/src/Makefile similarity index 100% rename from boards/stm32f3discovery/src/Makefile rename to boards/arm/stm32f3discovery/src/Makefile diff --git a/boards/stm32f3discovery/src/stm32_appinit.c b/boards/arm/stm32f3discovery/src/stm32_appinit.c similarity index 100% rename from boards/stm32f3discovery/src/stm32_appinit.c rename to boards/arm/stm32f3discovery/src/stm32_appinit.c diff --git a/boards/stm32f3discovery/src/stm32_autoleds.c b/boards/arm/stm32f3discovery/src/stm32_autoleds.c similarity index 100% rename from boards/stm32f3discovery/src/stm32_autoleds.c rename to boards/arm/stm32f3discovery/src/stm32_autoleds.c diff --git a/boards/stm32f3discovery/src/stm32_boot.c b/boards/arm/stm32f3discovery/src/stm32_boot.c similarity index 100% rename from boards/stm32f3discovery/src/stm32_boot.c rename to boards/arm/stm32f3discovery/src/stm32_boot.c diff --git a/boards/stm32f3discovery/src/stm32_bringup.c b/boards/arm/stm32f3discovery/src/stm32_bringup.c similarity index 100% rename from boards/stm32f3discovery/src/stm32_bringup.c rename to boards/arm/stm32f3discovery/src/stm32_bringup.c diff --git a/boards/stm32f3discovery/src/stm32_buttons.c b/boards/arm/stm32f3discovery/src/stm32_buttons.c similarity index 100% rename from boards/stm32f3discovery/src/stm32_buttons.c rename to boards/arm/stm32f3discovery/src/stm32_buttons.c diff --git a/boards/stm32f3discovery/src/stm32_pwm.c b/boards/arm/stm32f3discovery/src/stm32_pwm.c similarity index 100% rename from boards/stm32f3discovery/src/stm32_pwm.c rename to boards/arm/stm32f3discovery/src/stm32_pwm.c diff --git a/boards/stm32f3discovery/src/stm32_qencoder.c b/boards/arm/stm32f3discovery/src/stm32_qencoder.c similarity index 100% rename from boards/stm32f3discovery/src/stm32_qencoder.c rename to boards/arm/stm32f3discovery/src/stm32_qencoder.c diff --git a/boards/stm32f3discovery/src/stm32_spi.c b/boards/arm/stm32f3discovery/src/stm32_spi.c similarity index 100% rename from boards/stm32f3discovery/src/stm32_spi.c rename to boards/arm/stm32f3discovery/src/stm32_spi.c diff --git a/boards/stm32f3discovery/src/stm32_usb.c b/boards/arm/stm32f3discovery/src/stm32_usb.c similarity index 100% rename from boards/stm32f3discovery/src/stm32_usb.c rename to boards/arm/stm32f3discovery/src/stm32_usb.c diff --git a/boards/stm32f3discovery/src/stm32_userleds.c b/boards/arm/stm32f3discovery/src/stm32_userleds.c similarity index 100% rename from boards/stm32f3discovery/src/stm32_userleds.c rename to boards/arm/stm32f3discovery/src/stm32_userleds.c diff --git a/boards/stm32f3discovery/src/stm32f3discovery.h b/boards/arm/stm32f3discovery/src/stm32f3discovery.h similarity index 97% rename from boards/stm32f3discovery/src/stm32f3discovery.h rename to boards/arm/stm32f3discovery/src/stm32f3discovery.h index a894286687..155c4decc9 100644 --- a/boards/stm32f3discovery/src/stm32f3discovery.h +++ b/boards/arm/stm32f3discovery/src/stm32f3discovery.h @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __BOARDS_STM32F3DISCOVERY_SRC_STM32F3DISCOVERY_H -#define __BOARDS_STM32F3DISCOVERY_SRC_STM32F3DISCOVERY_H +#ifndef __BOARDS_ARM_STM32F3DISCOVERY_SRC_STM32F3DISCOVERY_H +#define __BOARDS_ARM_STM32F3DISCOVERY_SRC_STM32F3DISCOVERY_H /**************************************************************************************************** * Included Files @@ -206,5 +206,5 @@ int stm32_qencoder_initialize(FAR const char *devpath, int timer); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32F3DISCOVERY_SRC_STM32F3DISCOVERY_H */ +#endif /* __BOARDS_ARM_STM32F3DISCOVERY_SRC_STM32F3DISCOVERY_H */ diff --git a/boards/stm32f411e-disco/Kconfig b/boards/arm/stm32f411e-disco/Kconfig similarity index 100% rename from boards/stm32f411e-disco/Kconfig rename to boards/arm/stm32f411e-disco/Kconfig diff --git a/boards/stm32f411e-disco/README.txt b/boards/arm/stm32f411e-disco/README.txt similarity index 100% rename from boards/stm32f411e-disco/README.txt rename to boards/arm/stm32f411e-disco/README.txt diff --git a/boards/stm32f411e-disco/configs/nsh/defconfig b/boards/arm/stm32f411e-disco/configs/nsh/defconfig similarity index 100% rename from boards/stm32f411e-disco/configs/nsh/defconfig rename to boards/arm/stm32f411e-disco/configs/nsh/defconfig diff --git a/boards/stm32f411e-disco/include/board.h b/boards/arm/stm32f411e-disco/include/board.h similarity index 98% rename from boards/stm32f411e-disco/include/board.h rename to boards/arm/stm32f411e-disco/include/board.h index 1995cc8369..83b7110f48 100644 --- a/boards/stm32f411e-disco/include/board.h +++ b/boards/arm/stm32f411e-disco/include/board.h @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM32F411E_DISCO_INCLUDE_BOARD_H -#define __BOARDS_STM32F411E_DISCO_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32F411E_DISCO_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32F411E_DISCO_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -327,4 +327,4 @@ #define BUTTON_USER_BIT (1 << BUTTON_USER) -#endif /* __BOARDS_STM32F411E_DISCO_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32F411E_DISCO_INCLUDE_BOARD_H */ diff --git a/boards/stm32f411e-disco/scripts/Make.defs b/boards/arm/stm32f411e-disco/scripts/Make.defs similarity index 96% rename from boards/stm32f411e-disco/scripts/Make.defs rename to boards/arm/stm32f411e-disco/scripts/Make.defs index eb002a6258..e9aa3a249c 100644 --- a/boards/stm32f411e-disco/scripts/Make.defs +++ b/boards/arm/stm32f411e-disco/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32f411e-disco/scripts/f411ve.ld b/boards/arm/stm32f411e-disco/scripts/f411ve.ld similarity index 100% rename from boards/stm32f411e-disco/scripts/f411ve.ld rename to boards/arm/stm32f411e-disco/scripts/f411ve.ld diff --git a/boards/stm32f411e-disco/src/Makefile b/boards/arm/stm32f411e-disco/src/Makefile similarity index 100% rename from boards/stm32f411e-disco/src/Makefile rename to boards/arm/stm32f411e-disco/src/Makefile diff --git a/boards/stm32f411e-disco/src/stm32_appinit.c b/boards/arm/stm32f411e-disco/src/stm32_appinit.c similarity index 100% rename from boards/stm32f411e-disco/src/stm32_appinit.c rename to boards/arm/stm32f411e-disco/src/stm32_appinit.c diff --git a/boards/stm32f411e-disco/src/stm32_boot.c b/boards/arm/stm32f411e-disco/src/stm32_boot.c similarity index 100% rename from boards/stm32f411e-disco/src/stm32_boot.c rename to boards/arm/stm32f411e-disco/src/stm32_boot.c diff --git a/boards/stm32f411e-disco/src/stm32_bringup.c b/boards/arm/stm32f411e-disco/src/stm32_bringup.c similarity index 100% rename from boards/stm32f411e-disco/src/stm32_bringup.c rename to boards/arm/stm32f411e-disco/src/stm32_bringup.c diff --git a/boards/stm32f411e-disco/src/stm32_usb.c b/boards/arm/stm32f411e-disco/src/stm32_usb.c similarity index 100% rename from boards/stm32f411e-disco/src/stm32_usb.c rename to boards/arm/stm32f411e-disco/src/stm32_usb.c diff --git a/boards/stm32f411e-disco/src/stm32f411e-disco.h b/boards/arm/stm32f411e-disco/src/stm32f411e-disco.h similarity index 97% rename from boards/stm32f411e-disco/src/stm32f411e-disco.h rename to boards/arm/stm32f411e-disco/src/stm32f411e-disco.h index b82d2d0fe5..feb6dda976 100644 --- a/boards/stm32f411e-disco/src/stm32f411e-disco.h +++ b/boards/arm/stm32f411e-disco/src/stm32f411e-disco.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_STM32F411E_DISCO_SRC_STM32F411E_DISCO_H -#define __BOARDS_STM32F411E_DISCO_SRC_STM32F411E_DISCO_H +#ifndef __BOARDS_ARM_STM32F411E_DISCO_SRC_STM32F411E_DISCO_H +#define __BOARDS_ARM_STM32F411E_DISCO_SRC_STM32F411E_DISCO_H /**************************************************************************** * Included Files @@ -187,4 +187,4 @@ int stm32_usbhost_initialize(void); int stm32_bringup(void); -#endif /* __BOARDS_STM32F411E_DISCO_SRC_STM32F411E_DISCO_H */ +#endif /* __BOARDS_ARM_STM32F411E_DISCO_SRC_STM32F411E_DISCO_H */ diff --git a/boards/stm32f429i-disco/Kconfig b/boards/arm/stm32f429i-disco/Kconfig similarity index 100% rename from boards/stm32f429i-disco/Kconfig rename to boards/arm/stm32f429i-disco/Kconfig diff --git a/boards/stm32f429i-disco/README.txt b/boards/arm/stm32f429i-disco/README.txt similarity index 100% rename from boards/stm32f429i-disco/README.txt rename to boards/arm/stm32f429i-disco/README.txt diff --git a/boards/stm32f429i-disco/configs/adc/defconfig b/boards/arm/stm32f429i-disco/configs/adc/defconfig similarity index 100% rename from boards/stm32f429i-disco/configs/adc/defconfig rename to boards/arm/stm32f429i-disco/configs/adc/defconfig diff --git a/boards/stm32f429i-disco/configs/extflash/defconfig b/boards/arm/stm32f429i-disco/configs/extflash/defconfig similarity index 100% rename from boards/stm32f429i-disco/configs/extflash/defconfig rename to boards/arm/stm32f429i-disco/configs/extflash/defconfig diff --git a/boards/stm32f429i-disco/configs/fb/README.txt b/boards/arm/stm32f429i-disco/configs/fb/README.txt similarity index 100% rename from boards/stm32f429i-disco/configs/fb/README.txt rename to boards/arm/stm32f429i-disco/configs/fb/README.txt diff --git a/boards/stm32f429i-disco/configs/fb/defconfig b/boards/arm/stm32f429i-disco/configs/fb/defconfig similarity index 100% rename from boards/stm32f429i-disco/configs/fb/defconfig rename to boards/arm/stm32f429i-disco/configs/fb/defconfig diff --git a/boards/stm32f429i-disco/configs/highpri/defconfig b/boards/arm/stm32f429i-disco/configs/highpri/defconfig similarity index 100% rename from boards/stm32f429i-disco/configs/highpri/defconfig rename to boards/arm/stm32f429i-disco/configs/highpri/defconfig diff --git a/boards/stm32f429i-disco/configs/lcd/defconfig b/boards/arm/stm32f429i-disco/configs/lcd/defconfig similarity index 100% rename from boards/stm32f429i-disco/configs/lcd/defconfig rename to boards/arm/stm32f429i-disco/configs/lcd/defconfig diff --git a/boards/stm32f429i-disco/configs/lvgl/defconfig b/boards/arm/stm32f429i-disco/configs/lvgl/defconfig similarity index 100% rename from boards/stm32f429i-disco/configs/lvgl/defconfig rename to boards/arm/stm32f429i-disco/configs/lvgl/defconfig diff --git a/boards/stm32f429i-disco/configs/nsh/defconfig b/boards/arm/stm32f429i-disco/configs/nsh/defconfig similarity index 100% rename from boards/stm32f429i-disco/configs/nsh/defconfig rename to boards/arm/stm32f429i-disco/configs/nsh/defconfig diff --git a/boards/stm32f429i-disco/configs/nxhello/defconfig b/boards/arm/stm32f429i-disco/configs/nxhello/defconfig similarity index 100% rename from boards/stm32f429i-disco/configs/nxhello/defconfig rename to boards/arm/stm32f429i-disco/configs/nxhello/defconfig diff --git a/boards/stm32f429i-disco/configs/nxwm/defconfig b/boards/arm/stm32f429i-disco/configs/nxwm/defconfig similarity index 100% rename from boards/stm32f429i-disco/configs/nxwm/defconfig rename to boards/arm/stm32f429i-disco/configs/nxwm/defconfig diff --git a/boards/stm32f429i-disco/configs/usbmsc/defconfig b/boards/arm/stm32f429i-disco/configs/usbmsc/defconfig similarity index 100% rename from boards/stm32f429i-disco/configs/usbmsc/defconfig rename to boards/arm/stm32f429i-disco/configs/usbmsc/defconfig diff --git a/boards/stm32f429i-disco/configs/usbnsh/defconfig b/boards/arm/stm32f429i-disco/configs/usbnsh/defconfig similarity index 100% rename from boards/stm32f429i-disco/configs/usbnsh/defconfig rename to boards/arm/stm32f429i-disco/configs/usbnsh/defconfig diff --git a/boards/stm32f429i-disco/include/board.h b/boards/arm/stm32f429i-disco/include/board.h similarity index 99% rename from boards/stm32f429i-disco/include/board.h rename to boards/arm/stm32f429i-disco/include/board.h index 13bbafb252..2668de6db4 100644 --- a/boards/stm32f429i-disco/include/board.h +++ b/boards/arm/stm32f429i-disco/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_STM32F429I_DISCO_INCLUDE_BOARD_H -#define __CONFIG_STM32F429I_DISCO_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32F429I_DISCO_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32F429I_DISCO_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -464,4 +464,4 @@ #define ADC1_DMA_CHAN DMAMAP_ADC1_1 -#endif /* __CONFIG_STM32F429I_DISCO_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32F429I_DISCO_INCLUDE_BOARD_H */ diff --git a/boards/stm32f429i-disco/scripts/Make.defs b/boards/arm/stm32f429i-disco/scripts/Make.defs similarity index 96% rename from boards/stm32f429i-disco/scripts/Make.defs rename to boards/arm/stm32f429i-disco/scripts/Make.defs index b0feff9982..a01799600e 100644 --- a/boards/stm32f429i-disco/scripts/Make.defs +++ b/boards/arm/stm32f429i-disco/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32f429i-disco/scripts/gnu-elf.ld b/boards/arm/stm32f429i-disco/scripts/gnu-elf.ld similarity index 100% rename from boards/stm32f429i-disco/scripts/gnu-elf.ld rename to boards/arm/stm32f429i-disco/scripts/gnu-elf.ld diff --git a/boards/stm32f429i-disco/scripts/kernel-space.ld b/boards/arm/stm32f429i-disco/scripts/kernel-space.ld similarity index 100% rename from boards/stm32f429i-disco/scripts/kernel-space.ld rename to boards/arm/stm32f429i-disco/scripts/kernel-space.ld diff --git a/boards/stm32f429i-disco/scripts/ld.script b/boards/arm/stm32f429i-disco/scripts/ld.script similarity index 100% rename from boards/stm32f429i-disco/scripts/ld.script rename to boards/arm/stm32f429i-disco/scripts/ld.script diff --git a/boards/stm32f429i-disco/scripts/memory.ld b/boards/arm/stm32f429i-disco/scripts/memory.ld similarity index 100% rename from boards/stm32f429i-disco/scripts/memory.ld rename to boards/arm/stm32f429i-disco/scripts/memory.ld diff --git a/boards/stm32f429i-disco/scripts/user-space.ld b/boards/arm/stm32f429i-disco/scripts/user-space.ld similarity index 100% rename from boards/stm32f429i-disco/scripts/user-space.ld rename to boards/arm/stm32f429i-disco/scripts/user-space.ld diff --git a/boards/sam4l-xplained/src/.gitignore b/boards/arm/stm32f429i-disco/src/.gitignore similarity index 100% rename from boards/sam4l-xplained/src/.gitignore rename to boards/arm/stm32f429i-disco/src/.gitignore diff --git a/boards/stm32f429i-disco/src/Makefile b/boards/arm/stm32f429i-disco/src/Makefile similarity index 100% rename from boards/stm32f429i-disco/src/Makefile rename to boards/arm/stm32f429i-disco/src/Makefile diff --git a/boards/stm32f429i-disco/src/stm32_adc.c b/boards/arm/stm32f429i-disco/src/stm32_adc.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_adc.c rename to boards/arm/stm32f429i-disco/src/stm32_adc.c diff --git a/boards/stm32f429i-disco/src/stm32_appinit.c b/boards/arm/stm32f429i-disco/src/stm32_appinit.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_appinit.c rename to boards/arm/stm32f429i-disco/src/stm32_appinit.c diff --git a/boards/stm32f429i-disco/src/stm32_autoleds.c b/boards/arm/stm32f429i-disco/src/stm32_autoleds.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_autoleds.c rename to boards/arm/stm32f429i-disco/src/stm32_autoleds.c diff --git a/boards/stm32f429i-disco/src/stm32_boot.c b/boards/arm/stm32f429i-disco/src/stm32_boot.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_boot.c rename to boards/arm/stm32f429i-disco/src/stm32_boot.c diff --git a/boards/stm32f429i-disco/src/stm32_bringup.c b/boards/arm/stm32f429i-disco/src/stm32_bringup.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_bringup.c rename to boards/arm/stm32f429i-disco/src/stm32_bringup.c diff --git a/boards/stm32f429i-disco/src/stm32_buttons.c b/boards/arm/stm32f429i-disco/src/stm32_buttons.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_buttons.c rename to boards/arm/stm32f429i-disco/src/stm32_buttons.c diff --git a/boards/stm32f429i-disco/src/stm32_extmem.c b/boards/arm/stm32f429i-disco/src/stm32_extmem.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_extmem.c rename to boards/arm/stm32f429i-disco/src/stm32_extmem.c diff --git a/boards/stm32f429i-disco/src/stm32_highpri.c b/boards/arm/stm32f429i-disco/src/stm32_highpri.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_highpri.c rename to boards/arm/stm32f429i-disco/src/stm32_highpri.c diff --git a/boards/stm32f429i-disco/src/stm32_idle.c b/boards/arm/stm32f429i-disco/src/stm32_idle.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_idle.c rename to boards/arm/stm32f429i-disco/src/stm32_idle.c diff --git a/boards/stm32f429i-disco/src/stm32_ili93414ws.c b/boards/arm/stm32f429i-disco/src/stm32_ili93414ws.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_ili93414ws.c rename to boards/arm/stm32f429i-disco/src/stm32_ili93414ws.c diff --git a/boards/stm32f429i-disco/src/stm32_l3gd20.c b/boards/arm/stm32f429i-disco/src/stm32_l3gd20.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_l3gd20.c rename to boards/arm/stm32f429i-disco/src/stm32_l3gd20.c diff --git a/boards/stm32f429i-disco/src/stm32_lcd.c b/boards/arm/stm32f429i-disco/src/stm32_lcd.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_lcd.c rename to boards/arm/stm32f429i-disco/src/stm32_lcd.c diff --git a/boards/stm32f429i-disco/src/stm32_ostest.c b/boards/arm/stm32f429i-disco/src/stm32_ostest.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_ostest.c rename to boards/arm/stm32f429i-disco/src/stm32_ostest.c diff --git a/boards/stm32f429i-disco/src/stm32_pwm.c b/boards/arm/stm32f429i-disco/src/stm32_pwm.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_pwm.c rename to boards/arm/stm32f429i-disco/src/stm32_pwm.c diff --git a/boards/stm32f429i-disco/src/stm32_spi.c b/boards/arm/stm32f429i-disco/src/stm32_spi.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_spi.c rename to boards/arm/stm32f429i-disco/src/stm32_spi.c diff --git a/boards/stm32f429i-disco/src/stm32_stmpe811.c b/boards/arm/stm32f429i-disco/src/stm32_stmpe811.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_stmpe811.c rename to boards/arm/stm32f429i-disco/src/stm32_stmpe811.c diff --git a/boards/stm32f429i-disco/src/stm32_usb.c b/boards/arm/stm32f429i-disco/src/stm32_usb.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_usb.c rename to boards/arm/stm32f429i-disco/src/stm32_usb.c diff --git a/boards/stm32f429i-disco/src/stm32_userleds.c b/boards/arm/stm32f429i-disco/src/stm32_userleds.c similarity index 100% rename from boards/stm32f429i-disco/src/stm32_userleds.c rename to boards/arm/stm32f429i-disco/src/stm32_userleds.c diff --git a/boards/stm32f429i-disco/src/stm32f429i-disco.h b/boards/arm/stm32f429i-disco/src/stm32f429i-disco.h similarity index 98% rename from boards/stm32f429i-disco/src/stm32f429i-disco.h rename to boards/arm/stm32f429i-disco/src/stm32f429i-disco.h index 55e2480952..178f394465 100644 --- a/boards/stm32f429i-disco/src/stm32f429i-disco.h +++ b/boards/arm/stm32f429i-disco/src/stm32f429i-disco.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_STM32F429I_DISCO_SRC_STM32F429I_DISCO__H -#define __BOARDS_STM32F429I_DISCO_SRC_STM32F429I_DISCO__H +#ifndef __BOARDS_ARM_STM32F429I_DISCO_SRC_STM32F429I_DISCO__H +#define __BOARDS_ARM_STM32F429I_DISCO_SRC_STM32F429I_DISCO__H /**************************************************************************** * Included Files @@ -402,4 +402,4 @@ int stm32_adc_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32F429I_DISCO_SRC_STM32F429I_DISCO_H */ +#endif /* __BOARDS_ARM_STM32F429I_DISCO_SRC_STM32F429I_DISCO_H */ diff --git a/boards/stm32f429i-disco/tools/fbcalc.sh b/boards/arm/stm32f429i-disco/tools/fbcalc.sh similarity index 100% rename from boards/stm32f429i-disco/tools/fbcalc.sh rename to boards/arm/stm32f429i-disco/tools/fbcalc.sh diff --git a/boards/stm32f4discovery/Kconfig b/boards/arm/stm32f4discovery/Kconfig similarity index 100% rename from boards/stm32f4discovery/Kconfig rename to boards/arm/stm32f4discovery/Kconfig diff --git a/boards/stm32f4discovery/README.txt b/boards/arm/stm32f4discovery/README.txt similarity index 100% rename from boards/stm32f4discovery/README.txt rename to boards/arm/stm32f4discovery/README.txt diff --git a/boards/stm32f4discovery/configs/audio/defconfig b/boards/arm/stm32f4discovery/configs/audio/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/audio/defconfig rename to boards/arm/stm32f4discovery/configs/audio/defconfig diff --git a/boards/stm32f4discovery/configs/canard/defconfig b/boards/arm/stm32f4discovery/configs/canard/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/canard/defconfig rename to boards/arm/stm32f4discovery/configs/canard/defconfig diff --git a/boards/stm32f4discovery/configs/cxxtest/Make.defs b/boards/arm/stm32f4discovery/configs/cxxtest/Make.defs similarity index 97% rename from boards/stm32f4discovery/configs/cxxtest/Make.defs rename to boards/arm/stm32f4discovery/configs/cxxtest/Make.defs index d81cacb851..3fc0c5417f 100644 --- a/boards/stm32f4discovery/configs/cxxtest/Make.defs +++ b/boards/arm/stm32f4discovery/configs/cxxtest/Make.defs @@ -64,14 +64,14 @@ ifeq ($(WINTOOL),y) ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" \ -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" \ -isystem "${shell cygpath -w $(TOPDIR)/include/uClibc++}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include \ -isystem $(TOPDIR)/include/cxx -isystem $(TOPDIR)/include/uClibc++ - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) diff --git a/boards/stm32f4discovery/configs/cxxtest/defconfig b/boards/arm/stm32f4discovery/configs/cxxtest/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/cxxtest/defconfig rename to boards/arm/stm32f4discovery/configs/cxxtest/defconfig diff --git a/boards/stm32f4discovery/configs/elf/Make.defs b/boards/arm/stm32f4discovery/configs/elf/Make.defs similarity index 94% rename from boards/stm32f4discovery/configs/elf/Make.defs rename to boards/arm/stm32f4discovery/configs/elf/Make.defs index d59e95d357..fffd18c6f4 100644 --- a/boards/stm32f4discovery/configs/elf/Make.defs +++ b/boards/arm/stm32f4discovery/configs/elf/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc @@ -103,9 +103,9 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif # File extensions diff --git a/boards/stm32f4discovery/configs/elf/defconfig b/boards/arm/stm32f4discovery/configs/elf/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/elf/defconfig rename to boards/arm/stm32f4discovery/configs/elf/defconfig diff --git a/boards/stm32f4discovery/configs/hciuart/defconfig b/boards/arm/stm32f4discovery/configs/hciuart/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/hciuart/defconfig rename to boards/arm/stm32f4discovery/configs/hciuart/defconfig diff --git a/boards/stm32f4discovery/configs/ipv6/defconfig b/boards/arm/stm32f4discovery/configs/ipv6/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/ipv6/defconfig rename to boards/arm/stm32f4discovery/configs/ipv6/defconfig diff --git a/boards/stm32f4discovery/configs/kostest/defconfig b/boards/arm/stm32f4discovery/configs/kostest/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/kostest/defconfig rename to boards/arm/stm32f4discovery/configs/kostest/defconfig diff --git a/boards/stm32f4discovery/configs/max31855/defconfig b/boards/arm/stm32f4discovery/configs/max31855/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/max31855/defconfig rename to boards/arm/stm32f4discovery/configs/max31855/defconfig diff --git a/boards/stm32f4discovery/configs/max7219/defconfig b/boards/arm/stm32f4discovery/configs/max7219/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/max7219/defconfig rename to boards/arm/stm32f4discovery/configs/max7219/defconfig diff --git a/boards/stm32f4discovery/configs/module/defconfig b/boards/arm/stm32f4discovery/configs/module/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/module/defconfig rename to boards/arm/stm32f4discovery/configs/module/defconfig diff --git a/boards/stm32f4discovery/configs/netnsh/defconfig b/boards/arm/stm32f4discovery/configs/netnsh/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/netnsh/defconfig rename to boards/arm/stm32f4discovery/configs/netnsh/defconfig diff --git a/boards/stm32f4discovery/configs/nsh/defconfig b/boards/arm/stm32f4discovery/configs/nsh/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/nsh/defconfig rename to boards/arm/stm32f4discovery/configs/nsh/defconfig diff --git a/boards/stm32f4discovery/configs/nxlines/defconfig b/boards/arm/stm32f4discovery/configs/nxlines/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/nxlines/defconfig rename to boards/arm/stm32f4discovery/configs/nxlines/defconfig diff --git a/boards/stm32f4discovery/configs/pm/defconfig b/boards/arm/stm32f4discovery/configs/pm/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/pm/defconfig rename to boards/arm/stm32f4discovery/configs/pm/defconfig diff --git a/boards/stm32f4discovery/configs/posix_spawn/Make.defs b/boards/arm/stm32f4discovery/configs/posix_spawn/Make.defs similarity index 94% rename from boards/stm32f4discovery/configs/posix_spawn/Make.defs rename to boards/arm/stm32f4discovery/configs/posix_spawn/Make.defs index a569649eb1..f85a19ba15 100644 --- a/boards/stm32f4discovery/configs/posix_spawn/Make.defs +++ b/boards/arm/stm32f4discovery/configs/posix_spawn/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc @@ -103,9 +103,9 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif # File extensions diff --git a/boards/stm32f4discovery/configs/posix_spawn/defconfig b/boards/arm/stm32f4discovery/configs/posix_spawn/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/posix_spawn/defconfig rename to boards/arm/stm32f4discovery/configs/posix_spawn/defconfig diff --git a/boards/stm32f4discovery/configs/pseudoterm/defconfig b/boards/arm/stm32f4discovery/configs/pseudoterm/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/pseudoterm/defconfig rename to boards/arm/stm32f4discovery/configs/pseudoterm/defconfig diff --git a/boards/stm32f4discovery/configs/rgbled/defconfig b/boards/arm/stm32f4discovery/configs/rgbled/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/rgbled/defconfig rename to boards/arm/stm32f4discovery/configs/rgbled/defconfig diff --git a/boards/stm32f4discovery/configs/rndis/defconfig b/boards/arm/stm32f4discovery/configs/rndis/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/rndis/defconfig rename to boards/arm/stm32f4discovery/configs/rndis/defconfig diff --git a/boards/stm32f4discovery/configs/testlibcxx/Make.defs b/boards/arm/stm32f4discovery/configs/testlibcxx/Make.defs similarity index 96% rename from boards/stm32f4discovery/configs/testlibcxx/Make.defs rename to boards/arm/stm32f4discovery/configs/testlibcxx/Make.defs index 40698b8f09..fd29e1e652 100644 --- a/boards/stm32f4discovery/configs/testlibcxx/Make.defs +++ b/boards/arm/stm32f4discovery/configs/testlibcxx/Make.defs @@ -66,14 +66,14 @@ ifeq ($(WINTOOL),y) -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" \ -isystem "${shell cygpath -w $(TOPDIR)/include/libcxx}" ARCHSCRIPT = -T "${shell cygpath -w \ - $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include \ -isystem $(TOPDIR)/include/cxx -isystem $(TOPDIR)/include/libcxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) diff --git a/boards/stm32f4discovery/configs/testlibcxx/defconfig b/boards/arm/stm32f4discovery/configs/testlibcxx/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/testlibcxx/defconfig rename to boards/arm/stm32f4discovery/configs/testlibcxx/defconfig diff --git a/boards/stm32f4discovery/configs/usbmsc/defconfig b/boards/arm/stm32f4discovery/configs/usbmsc/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/usbmsc/defconfig rename to boards/arm/stm32f4discovery/configs/usbmsc/defconfig diff --git a/boards/stm32f4discovery/configs/usbnsh/defconfig b/boards/arm/stm32f4discovery/configs/usbnsh/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/usbnsh/defconfig rename to boards/arm/stm32f4discovery/configs/usbnsh/defconfig diff --git a/boards/stm32f4discovery/configs/winbuild/Make.defs b/boards/arm/stm32f4discovery/configs/winbuild/Make.defs similarity index 97% rename from boards/stm32f4discovery/configs/winbuild/Make.defs rename to boards/arm/stm32f4discovery/configs/winbuild/Make.defs index 17f8106250..f2622e9c34 100644 --- a/boards/stm32f4discovery/configs/winbuild/Make.defs +++ b/boards/arm/stm32f4discovery/configs/winbuild/Make.defs @@ -41,7 +41,7 @@ LDSCRIPT = ld.script ARCHINCLUDES = -I. -isystem $(TOPDIR)\include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)\include -isystem $(TOPDIR)\include\cxx -ARCHSCRIPT = -T$(TOPDIR)\boards\$(CONFIG_ARCH_BOARD)\scripts\$(LDSCRIPT) +ARCHSCRIPT = -T$(TOPDIR)\boards\$(CONFIG_ARCH)\$(CONFIG_ARCH_BOARD)\scripts\$(LDSCRIPT) CC = $(CROSSDEV)gcc.exe CXX = $(CROSSDEV)g++.exe diff --git a/boards/stm32f4discovery/configs/winbuild/defconfig b/boards/arm/stm32f4discovery/configs/winbuild/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/winbuild/defconfig rename to boards/arm/stm32f4discovery/configs/winbuild/defconfig diff --git a/boards/stm32f4discovery/configs/xen1210/defconfig b/boards/arm/stm32f4discovery/configs/xen1210/defconfig similarity index 100% rename from boards/stm32f4discovery/configs/xen1210/defconfig rename to boards/arm/stm32f4discovery/configs/xen1210/defconfig diff --git a/boards/stm32f4discovery/include/board.h b/boards/arm/stm32f4discovery/include/board.h similarity index 98% rename from boards/stm32f4discovery/include/board.h rename to boards/arm/stm32f4discovery/include/board.h index e1d3616b41..9c23a9d06a 100644 --- a/boards/stm32f4discovery/include/board.h +++ b/boards/arm/stm32f4discovery/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_STM32F4DISCOVERY_INCLUDE_BOARD_H -#define __CONFIG_STM32F4DISCOVERY_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32F4DISCOVERY_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32F4DISCOVERY_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -400,4 +400,4 @@ #define DMAMAP_SDIO DMAMAP_SDIO_1 -#endif /* __CONFIG_STM32F4DISCOVERY_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32F4DISCOVERY_INCLUDE_BOARD_H */ diff --git a/boards/stm32f4discovery/kernel/.gitignore b/boards/arm/stm32f4discovery/kernel/.gitignore similarity index 100% rename from boards/stm32f4discovery/kernel/.gitignore rename to boards/arm/stm32f4discovery/kernel/.gitignore diff --git a/boards/stm32f4discovery/kernel/Makefile b/boards/arm/stm32f4discovery/kernel/Makefile similarity index 100% rename from boards/stm32f4discovery/kernel/Makefile rename to boards/arm/stm32f4discovery/kernel/Makefile diff --git a/boards/stm32f4discovery/kernel/stm32_userspace.c b/boards/arm/stm32f4discovery/kernel/stm32_userspace.c similarity index 100% rename from boards/stm32f4discovery/kernel/stm32_userspace.c rename to boards/arm/stm32f4discovery/kernel/stm32_userspace.c diff --git a/boards/stm32f4discovery/scripts/Make.defs b/boards/arm/stm32f4discovery/scripts/Make.defs similarity index 94% rename from boards/stm32f4discovery/scripts/Make.defs rename to boards/arm/stm32f4discovery/scripts/Make.defs index 0a1554154d..f4ee938653 100644 --- a/boards/stm32f4discovery/scripts/Make.defs +++ b/boards/arm/stm32f4discovery/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc @@ -112,9 +112,9 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif diff --git a/boards/stm32f4discovery/scripts/gnu-elf.ld b/boards/arm/stm32f4discovery/scripts/gnu-elf.ld similarity index 100% rename from boards/stm32f4discovery/scripts/gnu-elf.ld rename to boards/arm/stm32f4discovery/scripts/gnu-elf.ld diff --git a/boards/stm32f4discovery/scripts/kernel-space.ld b/boards/arm/stm32f4discovery/scripts/kernel-space.ld similarity index 100% rename from boards/stm32f4discovery/scripts/kernel-space.ld rename to boards/arm/stm32f4discovery/scripts/kernel-space.ld diff --git a/boards/stm32f4discovery/scripts/ld.script b/boards/arm/stm32f4discovery/scripts/ld.script similarity index 100% rename from boards/stm32f4discovery/scripts/ld.script rename to boards/arm/stm32f4discovery/scripts/ld.script diff --git a/boards/stm32f4discovery/scripts/memory.ld b/boards/arm/stm32f4discovery/scripts/memory.ld similarity index 100% rename from boards/stm32f4discovery/scripts/memory.ld rename to boards/arm/stm32f4discovery/scripts/memory.ld diff --git a/boards/stm32f4discovery/scripts/user-space.ld b/boards/arm/stm32f4discovery/scripts/user-space.ld similarity index 100% rename from boards/stm32f4discovery/scripts/user-space.ld rename to boards/arm/stm32f4discovery/scripts/user-space.ld diff --git a/boards/samd20-xplained/src/.gitignore b/boards/arm/stm32f4discovery/src/.gitignore similarity index 100% rename from boards/samd20-xplained/src/.gitignore rename to boards/arm/stm32f4discovery/src/.gitignore diff --git a/boards/stm32f4discovery/src/Makefile b/boards/arm/stm32f4discovery/src/Makefile similarity index 100% rename from boards/stm32f4discovery/src/Makefile rename to boards/arm/stm32f4discovery/src/Makefile diff --git a/boards/stm32f4discovery/src/stm32_appinit.c b/boards/arm/stm32f4discovery/src/stm32_appinit.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_appinit.c rename to boards/arm/stm32f4discovery/src/stm32_appinit.c diff --git a/boards/stm32f4discovery/src/stm32_autoleds.c b/boards/arm/stm32f4discovery/src/stm32_autoleds.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_autoleds.c rename to boards/arm/stm32f4discovery/src/stm32_autoleds.c diff --git a/boards/stm32f4discovery/src/stm32_bh1750fvi.c b/boards/arm/stm32f4discovery/src/stm32_bh1750fvi.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_bh1750fvi.c rename to boards/arm/stm32f4discovery/src/stm32_bh1750fvi.c diff --git a/boards/stm32f4discovery/src/stm32_bmp180.c b/boards/arm/stm32f4discovery/src/stm32_bmp180.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_bmp180.c rename to boards/arm/stm32f4discovery/src/stm32_bmp180.c diff --git a/boards/stm32f4discovery/src/stm32_boot.c b/boards/arm/stm32f4discovery/src/stm32_boot.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_boot.c rename to boards/arm/stm32f4discovery/src/stm32_boot.c diff --git a/boards/stm32f4discovery/src/stm32_bringup.c b/boards/arm/stm32f4discovery/src/stm32_bringup.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_bringup.c rename to boards/arm/stm32f4discovery/src/stm32_bringup.c diff --git a/boards/stm32f4discovery/src/stm32_buttons.c b/boards/arm/stm32f4discovery/src/stm32_buttons.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_buttons.c rename to boards/arm/stm32f4discovery/src/stm32_buttons.c diff --git a/boards/stm32f4discovery/src/stm32_can.c b/boards/arm/stm32f4discovery/src/stm32_can.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_can.c rename to boards/arm/stm32f4discovery/src/stm32_can.c diff --git a/boards/stm32f4discovery/src/stm32_critmon.c b/boards/arm/stm32f4discovery/src/stm32_critmon.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_critmon.c rename to boards/arm/stm32f4discovery/src/stm32_critmon.c diff --git a/boards/stm32f4discovery/src/stm32_cs43l22.c b/boards/arm/stm32f4discovery/src/stm32_cs43l22.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_cs43l22.c rename to boards/arm/stm32f4discovery/src/stm32_cs43l22.c diff --git a/boards/stm32f4discovery/src/stm32_ethernet.c b/boards/arm/stm32f4discovery/src/stm32_ethernet.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_ethernet.c rename to boards/arm/stm32f4discovery/src/stm32_ethernet.c diff --git a/boards/stm32f4discovery/src/stm32_extmem.c b/boards/arm/stm32f4discovery/src/stm32_extmem.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_extmem.c rename to boards/arm/stm32f4discovery/src/stm32_extmem.c diff --git a/boards/stm32f4discovery/src/stm32_hciuart.c b/boards/arm/stm32f4discovery/src/stm32_hciuart.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_hciuart.c rename to boards/arm/stm32f4discovery/src/stm32_hciuart.c diff --git a/boards/stm32f4discovery/src/stm32_idle.c b/boards/arm/stm32f4discovery/src/stm32_idle.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_idle.c rename to boards/arm/stm32f4discovery/src/stm32_idle.c diff --git a/boards/stm32f4discovery/src/stm32_lis3dsh.c b/boards/arm/stm32f4discovery/src/stm32_lis3dsh.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_lis3dsh.c rename to boards/arm/stm32f4discovery/src/stm32_lis3dsh.c diff --git a/boards/stm32f4discovery/src/stm32_max31855.c b/boards/arm/stm32f4discovery/src/stm32_max31855.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_max31855.c rename to boards/arm/stm32f4discovery/src/stm32_max31855.c diff --git a/boards/stm32f4discovery/src/stm32_max6675.c b/boards/arm/stm32f4discovery/src/stm32_max6675.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_max6675.c rename to boards/arm/stm32f4discovery/src/stm32_max6675.c diff --git a/boards/stm32f4discovery/src/stm32_max7219.c b/boards/arm/stm32f4discovery/src/stm32_max7219.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_max7219.c rename to boards/arm/stm32f4discovery/src/stm32_max7219.c diff --git a/boards/stm32f4discovery/src/stm32_max7219_leds.c b/boards/arm/stm32f4discovery/src/stm32_max7219_leds.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_max7219_leds.c rename to boards/arm/stm32f4discovery/src/stm32_max7219_leds.c diff --git a/boards/stm32f4discovery/src/stm32_mlx90614.c b/boards/arm/stm32f4discovery/src/stm32_mlx90614.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_mlx90614.c rename to boards/arm/stm32f4discovery/src/stm32_mlx90614.c diff --git a/boards/stm32f4discovery/src/stm32_netinit.c b/boards/arm/stm32f4discovery/src/stm32_netinit.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_netinit.c rename to boards/arm/stm32f4discovery/src/stm32_netinit.c diff --git a/boards/stm32f4discovery/src/stm32_nunchuck.c b/boards/arm/stm32f4discovery/src/stm32_nunchuck.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_nunchuck.c rename to boards/arm/stm32f4discovery/src/stm32_nunchuck.c diff --git a/boards/stm32f4discovery/src/stm32_ostest.c b/boards/arm/stm32f4discovery/src/stm32_ostest.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_ostest.c rename to boards/arm/stm32f4discovery/src/stm32_ostest.c diff --git a/boards/stm32f4discovery/src/stm32_pca9635.c b/boards/arm/stm32f4discovery/src/stm32_pca9635.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_pca9635.c rename to boards/arm/stm32f4discovery/src/stm32_pca9635.c diff --git a/boards/stm32f4discovery/src/stm32_pm.c b/boards/arm/stm32f4discovery/src/stm32_pm.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_pm.c rename to boards/arm/stm32f4discovery/src/stm32_pm.c diff --git a/boards/stm32f4discovery/src/stm32_pmbuttons.c b/boards/arm/stm32f4discovery/src/stm32_pmbuttons.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_pmbuttons.c rename to boards/arm/stm32f4discovery/src/stm32_pmbuttons.c diff --git a/boards/stm32f4discovery/src/stm32_pwm.c b/boards/arm/stm32f4discovery/src/stm32_pwm.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_pwm.c rename to boards/arm/stm32f4discovery/src/stm32_pwm.c diff --git a/boards/stm32f4discovery/src/stm32_qencoder.c b/boards/arm/stm32f4discovery/src/stm32_qencoder.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_qencoder.c rename to boards/arm/stm32f4discovery/src/stm32_qencoder.c diff --git a/boards/stm32f4discovery/src/stm32_reset.c b/boards/arm/stm32f4discovery/src/stm32_reset.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_reset.c rename to boards/arm/stm32f4discovery/src/stm32_reset.c diff --git a/boards/stm32f4discovery/src/stm32_rgbled.c b/boards/arm/stm32f4discovery/src/stm32_rgbled.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_rgbled.c rename to boards/arm/stm32f4discovery/src/stm32_rgbled.c diff --git a/boards/stm32f4discovery/src/stm32_romfs.h b/boards/arm/stm32f4discovery/src/stm32_romfs.h similarity index 94% rename from boards/stm32f4discovery/src/stm32_romfs.h rename to boards/arm/stm32f4discovery/src/stm32_romfs.h index 929ff8adc1..960d5442d3 100644 --- a/boards/stm32f4discovery/src/stm32_romfs.h +++ b/boards/arm/stm32f4discovery/src/stm32_romfs.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_STM32F4DISCOVERY_SRC_STM32_ROMFS_H -#define __BOARDS_STM32F4DISCOVERY_SRC_STM32_ROMFS_H +#ifndef __BOARDS_ARM_STM32F4DISCOVERY_SRC_STM32_ROMFS_H +#define __BOARDS_ARM_STM32F4DISCOVERY_SRC_STM32_ROMFS_H /**************************************************************************** * Included Files @@ -73,4 +73,4 @@ int stm32_romfs_initialize(void); #endif /* CONFIG_STM32_ROMFS */ -#endif /* __BOARDS_STM32F4DISCOVERY_SRC_STM32_ROMFS_H */ +#endif /* __BOARDS_ARM_STM32F4DISCOVERY_SRC_STM32_ROMFS_H */ diff --git a/boards/stm32f4discovery/src/stm32_romfs_initialize.c b/boards/arm/stm32f4discovery/src/stm32_romfs_initialize.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_romfs_initialize.c rename to boards/arm/stm32f4discovery/src/stm32_romfs_initialize.c diff --git a/boards/stm32f4discovery/src/stm32_sdio.c b/boards/arm/stm32f4discovery/src/stm32_sdio.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_sdio.c rename to boards/arm/stm32f4discovery/src/stm32_sdio.c diff --git a/boards/stm32f4discovery/src/stm32_spi.c b/boards/arm/stm32f4discovery/src/stm32_spi.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_spi.c rename to boards/arm/stm32f4discovery/src/stm32_spi.c diff --git a/boards/stm32f4discovery/src/stm32_ssd1289.c b/boards/arm/stm32f4discovery/src/stm32_ssd1289.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_ssd1289.c rename to boards/arm/stm32f4discovery/src/stm32_ssd1289.c diff --git a/boards/stm32f4discovery/src/stm32_ssd1351.c b/boards/arm/stm32f4discovery/src/stm32_ssd1351.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_ssd1351.c rename to boards/arm/stm32f4discovery/src/stm32_ssd1351.c diff --git a/boards/stm32f4discovery/src/stm32_st7032.c b/boards/arm/stm32f4discovery/src/stm32_st7032.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_st7032.c rename to boards/arm/stm32f4discovery/src/stm32_st7032.c diff --git a/boards/stm32f4discovery/src/stm32_st7567.c b/boards/arm/stm32f4discovery/src/stm32_st7567.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_st7567.c rename to boards/arm/stm32f4discovery/src/stm32_st7567.c diff --git a/boards/stm32f4discovery/src/stm32_timer.c b/boards/arm/stm32f4discovery/src/stm32_timer.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_timer.c rename to boards/arm/stm32f4discovery/src/stm32_timer.c diff --git a/boards/stm32f4discovery/src/stm32_ug2864ambag01.c b/boards/arm/stm32f4discovery/src/stm32_ug2864ambag01.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_ug2864ambag01.c rename to boards/arm/stm32f4discovery/src/stm32_ug2864ambag01.c diff --git a/boards/stm32f4discovery/src/stm32_ug2864hsweg01.c b/boards/arm/stm32f4discovery/src/stm32_ug2864hsweg01.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_ug2864hsweg01.c rename to boards/arm/stm32f4discovery/src/stm32_ug2864hsweg01.c diff --git a/boards/stm32f4discovery/src/stm32_uid.c b/boards/arm/stm32f4discovery/src/stm32_uid.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_uid.c rename to boards/arm/stm32f4discovery/src/stm32_uid.c diff --git a/boards/stm32f4discovery/src/stm32_usb.c b/boards/arm/stm32f4discovery/src/stm32_usb.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_usb.c rename to boards/arm/stm32f4discovery/src/stm32_usb.c diff --git a/boards/stm32f4discovery/src/stm32_usbmsc.c b/boards/arm/stm32f4discovery/src/stm32_usbmsc.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_usbmsc.c rename to boards/arm/stm32f4discovery/src/stm32_usbmsc.c diff --git a/boards/stm32f4discovery/src/stm32_userleds.c b/boards/arm/stm32f4discovery/src/stm32_userleds.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_userleds.c rename to boards/arm/stm32f4discovery/src/stm32_userleds.c diff --git a/boards/stm32f4discovery/src/stm32_xen1210.c b/boards/arm/stm32f4discovery/src/stm32_xen1210.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_xen1210.c rename to boards/arm/stm32f4discovery/src/stm32_xen1210.c diff --git a/boards/stm32f4discovery/src/stm32_zerocross.c b/boards/arm/stm32f4discovery/src/stm32_zerocross.c similarity index 100% rename from boards/stm32f4discovery/src/stm32_zerocross.c rename to boards/arm/stm32f4discovery/src/stm32_zerocross.c diff --git a/boards/stm32f4discovery/src/stm32f4discovery.h b/boards/arm/stm32f4discovery/src/stm32f4discovery.h similarity index 99% rename from boards/stm32f4discovery/src/stm32f4discovery.h rename to boards/arm/stm32f4discovery/src/stm32f4discovery.h index 09617fd0cc..0692af3636 100644 --- a/boards/stm32f4discovery/src/stm32f4discovery.h +++ b/boards/arm/stm32f4discovery/src/stm32f4discovery.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_STM32F4DISCOVERY_SRC_STM32F4DISCOVERY_H -#define __BOARDS_STM32F4DISCOVERY_SRC_STM32F4DISCOVERY_H +#ifndef __BOARDS_ARM_STM32F4DISCOVERY_SRC_STM32F4DISCOVERY_H +#define __BOARDS_ARM_STM32F4DISCOVERY_SRC_STM32F4DISCOVERY_H /**************************************************************************** * Included Files @@ -841,4 +841,4 @@ int hciuart_dev_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32F4DISCOVERY_SRC_STM32F4DISCOVERY_H */ +#endif /* __BOARDS_ARM_STM32F4DISCOVERY_SRC_STM32F4DISCOVERY_H */ diff --git a/boards/stm32f746-ws/Kconfig b/boards/arm/stm32f746-ws/Kconfig similarity index 100% rename from boards/stm32f746-ws/Kconfig rename to boards/arm/stm32f746-ws/Kconfig diff --git a/boards/stm32f746-ws/configs/nsh/defconfig b/boards/arm/stm32f746-ws/configs/nsh/defconfig similarity index 100% rename from boards/stm32f746-ws/configs/nsh/defconfig rename to boards/arm/stm32f746-ws/configs/nsh/defconfig diff --git a/boards/stm32f746-ws/include/board.h b/boards/arm/stm32f746-ws/include/board.h similarity index 98% rename from boards/stm32f746-ws/include/board.h rename to boards/arm/stm32f746-ws/include/board.h index c2893bfc56..4d4a21cdf7 100644 --- a/boards/stm32f746-ws/include/board.h +++ b/boards/arm/stm32f746-ws/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_STM32F746_WS_INCLUDE_BOARD_H -#define __CONFIG_STM32F746_WS_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32F746_WS_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32F746_WS_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -293,4 +293,4 @@ # define STM32_SDMMC_SDXFR_CLKDIV (2 << STM32_SDMMC_CLKCR_CLKDIV_SHIFT) #endif -#endif /* __CONFIG_STM32F746_WS_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32F746_WS_INCLUDE_BOARD_H */ diff --git a/boards/stm32f746-ws/scripts/Make.defs b/boards/arm/stm32f746-ws/scripts/Make.defs similarity index 96% rename from boards/stm32f746-ws/scripts/Make.defs rename to boards/arm/stm32f746-ws/scripts/Make.defs index 5316f67730..e6191a8054 100644 --- a/boards/stm32f746-ws/scripts/Make.defs +++ b/boards/arm/stm32f746-ws/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32f746-ws/scripts/flash.ld b/boards/arm/stm32f746-ws/scripts/flash.ld similarity index 100% rename from boards/stm32f746-ws/scripts/flash.ld rename to boards/arm/stm32f746-ws/scripts/flash.ld diff --git a/boards/stm32f746-ws/scripts/kernel-space.ld b/boards/arm/stm32f746-ws/scripts/kernel-space.ld similarity index 100% rename from boards/stm32f746-ws/scripts/kernel-space.ld rename to boards/arm/stm32f746-ws/scripts/kernel-space.ld diff --git a/boards/stm32f746-ws/scripts/memory.ld b/boards/arm/stm32f746-ws/scripts/memory.ld similarity index 100% rename from boards/stm32f746-ws/scripts/memory.ld rename to boards/arm/stm32f746-ws/scripts/memory.ld diff --git a/boards/stm32f746-ws/scripts/user-space.ld b/boards/arm/stm32f746-ws/scripts/user-space.ld similarity index 100% rename from boards/stm32f746-ws/scripts/user-space.ld rename to boards/arm/stm32f746-ws/scripts/user-space.ld diff --git a/boards/samd21-xplained/src/.gitignore b/boards/arm/stm32f746-ws/src/.gitignore similarity index 100% rename from boards/samd21-xplained/src/.gitignore rename to boards/arm/stm32f746-ws/src/.gitignore diff --git a/boards/stm32f746-ws/src/Makefile b/boards/arm/stm32f746-ws/src/Makefile similarity index 100% rename from boards/stm32f746-ws/src/Makefile rename to boards/arm/stm32f746-ws/src/Makefile diff --git a/boards/stm32f746-ws/src/stm32_appinitialize.c b/boards/arm/stm32f746-ws/src/stm32_appinitialize.c similarity index 100% rename from boards/stm32f746-ws/src/stm32_appinitialize.c rename to boards/arm/stm32f746-ws/src/stm32_appinitialize.c diff --git a/boards/stm32f746-ws/src/stm32_boot.c b/boards/arm/stm32f746-ws/src/stm32_boot.c similarity index 100% rename from boards/stm32f746-ws/src/stm32_boot.c rename to boards/arm/stm32f746-ws/src/stm32_boot.c diff --git a/boards/stm32f746-ws/src/stm32_dma_alloc.c b/boards/arm/stm32f746-ws/src/stm32_dma_alloc.c similarity index 100% rename from boards/stm32f746-ws/src/stm32_dma_alloc.c rename to boards/arm/stm32f746-ws/src/stm32_dma_alloc.c diff --git a/boards/stm32f746-ws/src/stm32_sdmmc.c b/boards/arm/stm32f746-ws/src/stm32_sdmmc.c similarity index 100% rename from boards/stm32f746-ws/src/stm32_sdmmc.c rename to boards/arm/stm32f746-ws/src/stm32_sdmmc.c diff --git a/boards/stm32f746-ws/src/stm32_spi.c b/boards/arm/stm32f746-ws/src/stm32_spi.c similarity index 100% rename from boards/stm32f746-ws/src/stm32_spi.c rename to boards/arm/stm32f746-ws/src/stm32_spi.c diff --git a/boards/stm32f746-ws/src/stm32_usb.c b/boards/arm/stm32f746-ws/src/stm32_usb.c similarity index 100% rename from boards/stm32f746-ws/src/stm32_usb.c rename to boards/arm/stm32f746-ws/src/stm32_usb.c diff --git a/boards/stm32f746-ws/src/stm32f746-ws.h b/boards/arm/stm32f746-ws/src/stm32f746-ws.h similarity index 97% rename from boards/stm32f746-ws/src/stm32f746-ws.h rename to boards/arm/stm32f746-ws/src/stm32f746-ws.h index adedc9b33f..5b0b45d0fc 100644 --- a/boards/stm32f746-ws/src/stm32f746-ws.h +++ b/boards/arm/stm32f746-ws/src/stm32f746-ws.h @@ -34,8 +34,8 @@ * ****************************************************************************************************/ -#ifndef __BOARDS_STM32F746_WS_SRC_STM32F746_WS_H -#define __BOARDS_STM32F746_WS_SRC_STM32F746_WS_H +#ifndef __BOARDS_ARM_STM32F746_WS_SRC_STM32F746_WS_H +#define __BOARDS_ARM_STM32F746_WS_SRC_STM32F746_WS_H /**************************************************************************************************** * Included Files @@ -136,4 +136,4 @@ int stm32_dma_alloc_init(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32F746_WS_SRC_STM32F746_WS_H */ +#endif /* __BOARDS_ARM_STM32F746_WS_SRC_STM32F746_WS_H */ diff --git a/boards/stm32f746g-disco/Kconfig b/boards/arm/stm32f746g-disco/Kconfig similarity index 100% rename from boards/stm32f746g-disco/Kconfig rename to boards/arm/stm32f746g-disco/Kconfig diff --git a/boards/stm32f746g-disco/README.txt b/boards/arm/stm32f746g-disco/README.txt similarity index 100% rename from boards/stm32f746g-disco/README.txt rename to boards/arm/stm32f746g-disco/README.txt diff --git a/boards/stm32f746g-disco/configs/fb/README.txt b/boards/arm/stm32f746g-disco/configs/fb/README.txt similarity index 100% rename from boards/stm32f746g-disco/configs/fb/README.txt rename to boards/arm/stm32f746g-disco/configs/fb/README.txt diff --git a/boards/stm32f746g-disco/configs/fb/defconfig b/boards/arm/stm32f746g-disco/configs/fb/defconfig similarity index 100% rename from boards/stm32f746g-disco/configs/fb/defconfig rename to boards/arm/stm32f746g-disco/configs/fb/defconfig diff --git a/boards/stm32f746g-disco/configs/lvgl/defconfig b/boards/arm/stm32f746g-disco/configs/lvgl/defconfig similarity index 100% rename from boards/stm32f746g-disco/configs/lvgl/defconfig rename to boards/arm/stm32f746g-disco/configs/lvgl/defconfig diff --git a/boards/stm32f746g-disco/configs/netnsh/defconfig b/boards/arm/stm32f746g-disco/configs/netnsh/defconfig similarity index 100% rename from boards/stm32f746g-disco/configs/netnsh/defconfig rename to boards/arm/stm32f746g-disco/configs/netnsh/defconfig diff --git a/boards/stm32f746g-disco/configs/nsh/defconfig b/boards/arm/stm32f746g-disco/configs/nsh/defconfig similarity index 100% rename from boards/stm32f746g-disco/configs/nsh/defconfig rename to boards/arm/stm32f746g-disco/configs/nsh/defconfig diff --git a/boards/stm32f746g-disco/configs/nxdemo/README.txt b/boards/arm/stm32f746g-disco/configs/nxdemo/README.txt similarity index 100% rename from boards/stm32f746g-disco/configs/nxdemo/README.txt rename to boards/arm/stm32f746g-disco/configs/nxdemo/README.txt diff --git a/boards/stm32f746g-disco/configs/nxdemo/defconfig b/boards/arm/stm32f746g-disco/configs/nxdemo/defconfig similarity index 100% rename from boards/stm32f746g-disco/configs/nxdemo/defconfig rename to boards/arm/stm32f746g-disco/configs/nxdemo/defconfig diff --git a/boards/stm32f746g-disco/configs/nxterm/README.txt b/boards/arm/stm32f746g-disco/configs/nxterm/README.txt similarity index 100% rename from boards/stm32f746g-disco/configs/nxterm/README.txt rename to boards/arm/stm32f746g-disco/configs/nxterm/README.txt diff --git a/boards/stm32f746g-disco/configs/nxterm/defconfig b/boards/arm/stm32f746g-disco/configs/nxterm/defconfig similarity index 100% rename from boards/stm32f746g-disco/configs/nxterm/defconfig rename to boards/arm/stm32f746g-disco/configs/nxterm/defconfig diff --git a/boards/stm32f746g-disco/include/board.h b/boards/arm/stm32f746g-disco/include/board.h similarity index 99% rename from boards/stm32f746g-disco/include/board.h rename to boards/arm/stm32f746g-disco/include/board.h index 5333db85d6..8f2cb67c6d 100644 --- a/boards/stm32f746g-disco/include/board.h +++ b/boards/arm/stm32f746g-disco/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_STM32F746G_DISCO_INCLUDE_BOARD_H -#define __CONFIG_STM32F746G_DISCO_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32F746G_DISCO_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32F746G_DISCO_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -451,4 +451,4 @@ #define GPIO_LTDC_DE GPIO_LTDC_DE_3 #define GPIO_LTDC_CLK GPIO_LTDC_CLK_3 -#endif /* __CONFIG_STM32F746G_DISCO_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32F746G_DISCO_INCLUDE_BOARD_H */ diff --git a/boards/stm32f746g-disco/kernel/.gitignore b/boards/arm/stm32f746g-disco/kernel/.gitignore similarity index 100% rename from boards/stm32f746g-disco/kernel/.gitignore rename to boards/arm/stm32f746g-disco/kernel/.gitignore diff --git a/boards/stm32f746g-disco/kernel/Makefile b/boards/arm/stm32f746g-disco/kernel/Makefile similarity index 100% rename from boards/stm32f746g-disco/kernel/Makefile rename to boards/arm/stm32f746g-disco/kernel/Makefile diff --git a/boards/stm32f746g-disco/kernel/stm32_userspace.c b/boards/arm/stm32f746g-disco/kernel/stm32_userspace.c similarity index 100% rename from boards/stm32f746g-disco/kernel/stm32_userspace.c rename to boards/arm/stm32f746g-disco/kernel/stm32_userspace.c diff --git a/boards/stm32f746g-disco/scripts/Make.defs b/boards/arm/stm32f746g-disco/scripts/Make.defs similarity index 97% rename from boards/stm32f746g-disco/scripts/Make.defs rename to boards/arm/stm32f746g-disco/scripts/Make.defs index cd4f38ba70..32f0742dbd 100644 --- a/boards/stm32f746g-disco/scripts/Make.defs +++ b/boards/arm/stm32f746g-disco/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32f746g-disco/scripts/flash.ld b/boards/arm/stm32f746g-disco/scripts/flash.ld similarity index 100% rename from boards/stm32f746g-disco/scripts/flash.ld rename to boards/arm/stm32f746g-disco/scripts/flash.ld diff --git a/boards/stm32f746g-disco/scripts/kernel-space.ld b/boards/arm/stm32f746g-disco/scripts/kernel-space.ld similarity index 100% rename from boards/stm32f746g-disco/scripts/kernel-space.ld rename to boards/arm/stm32f746g-disco/scripts/kernel-space.ld diff --git a/boards/stm32f746g-disco/scripts/memory.ld b/boards/arm/stm32f746g-disco/scripts/memory.ld similarity index 100% rename from boards/stm32f746g-disco/scripts/memory.ld rename to boards/arm/stm32f746g-disco/scripts/memory.ld diff --git a/boards/stm32f746g-disco/scripts/user-space.ld b/boards/arm/stm32f746g-disco/scripts/user-space.ld similarity index 100% rename from boards/stm32f746g-disco/scripts/user-space.ld rename to boards/arm/stm32f746g-disco/scripts/user-space.ld diff --git a/boards/saml21-xplained/src/.gitignore b/boards/arm/stm32f746g-disco/src/.gitignore similarity index 100% rename from boards/saml21-xplained/src/.gitignore rename to boards/arm/stm32f746g-disco/src/.gitignore diff --git a/boards/stm32f746g-disco/src/Makefile b/boards/arm/stm32f746g-disco/src/Makefile similarity index 100% rename from boards/stm32f746g-disco/src/Makefile rename to boards/arm/stm32f746g-disco/src/Makefile diff --git a/boards/stm32f746g-disco/src/stm32_adc.c b/boards/arm/stm32f746g-disco/src/stm32_adc.c similarity index 100% rename from boards/stm32f746g-disco/src/stm32_adc.c rename to boards/arm/stm32f746g-disco/src/stm32_adc.c diff --git a/boards/stm32f746g-disco/src/stm32_appinitialize.c b/boards/arm/stm32f746g-disco/src/stm32_appinitialize.c similarity index 100% rename from boards/stm32f746g-disco/src/stm32_appinitialize.c rename to boards/arm/stm32f746g-disco/src/stm32_appinitialize.c diff --git a/boards/stm32f746g-disco/src/stm32_autoleds.c b/boards/arm/stm32f746g-disco/src/stm32_autoleds.c similarity index 100% rename from boards/stm32f746g-disco/src/stm32_autoleds.c rename to boards/arm/stm32f746g-disco/src/stm32_autoleds.c diff --git a/boards/stm32f746g-disco/src/stm32_boot.c b/boards/arm/stm32f746g-disco/src/stm32_boot.c similarity index 100% rename from boards/stm32f746g-disco/src/stm32_boot.c rename to boards/arm/stm32f746g-disco/src/stm32_boot.c diff --git a/boards/stm32f746g-disco/src/stm32_bringup.c b/boards/arm/stm32f746g-disco/src/stm32_bringup.c similarity index 100% rename from boards/stm32f746g-disco/src/stm32_bringup.c rename to boards/arm/stm32f746g-disco/src/stm32_bringup.c diff --git a/boards/stm32f746g-disco/src/stm32_buttons.c b/boards/arm/stm32f746g-disco/src/stm32_buttons.c similarity index 100% rename from boards/stm32f746g-disco/src/stm32_buttons.c rename to boards/arm/stm32f746g-disco/src/stm32_buttons.c diff --git a/boards/stm32f746g-disco/src/stm32_extmem.c b/boards/arm/stm32f746g-disco/src/stm32_extmem.c similarity index 100% rename from boards/stm32f746g-disco/src/stm32_extmem.c rename to boards/arm/stm32f746g-disco/src/stm32_extmem.c diff --git a/boards/stm32f746g-disco/src/stm32_lcd.c b/boards/arm/stm32f746g-disco/src/stm32_lcd.c similarity index 100% rename from boards/stm32f746g-disco/src/stm32_lcd.c rename to boards/arm/stm32f746g-disco/src/stm32_lcd.c diff --git a/boards/stm32f746g-disco/src/stm32_ostest.c b/boards/arm/stm32f746g-disco/src/stm32_ostest.c similarity index 100% rename from boards/stm32f746g-disco/src/stm32_ostest.c rename to boards/arm/stm32f746g-disco/src/stm32_ostest.c diff --git a/boards/stm32f746g-disco/src/stm32_spi.c b/boards/arm/stm32f746g-disco/src/stm32_spi.c similarity index 100% rename from boards/stm32f746g-disco/src/stm32_spi.c rename to boards/arm/stm32f746g-disco/src/stm32_spi.c diff --git a/boards/stm32f746g-disco/src/stm32_sporadic.c b/boards/arm/stm32f746g-disco/src/stm32_sporadic.c similarity index 100% rename from boards/stm32f746g-disco/src/stm32_sporadic.c rename to boards/arm/stm32f746g-disco/src/stm32_sporadic.c diff --git a/boards/stm32f746g-disco/src/stm32_touchscreen.c b/boards/arm/stm32f746g-disco/src/stm32_touchscreen.c similarity index 100% rename from boards/stm32f746g-disco/src/stm32_touchscreen.c rename to boards/arm/stm32f746g-disco/src/stm32_touchscreen.c diff --git a/boards/stm32f746g-disco/src/stm32_userleds.c b/boards/arm/stm32f746g-disco/src/stm32_userleds.c similarity index 100% rename from boards/stm32f746g-disco/src/stm32_userleds.c rename to boards/arm/stm32f746g-disco/src/stm32_userleds.c diff --git a/boards/stm32f746g-disco/src/stm32f746g-disco.h b/boards/arm/stm32f746g-disco/src/stm32f746g-disco.h similarity index 97% rename from boards/stm32f746g-disco/src/stm32f746g-disco.h rename to boards/arm/stm32f746g-disco/src/stm32f746g-disco.h index 50a3522a12..fafcaea83a 100644 --- a/boards/stm32f746g-disco/src/stm32f746g-disco.h +++ b/boards/arm/stm32f746g-disco/src/stm32f746g-disco.h @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __BOARDS_STM32F746G_DISCO_SRC_STM32F746G_DISCO__H -#define __BOARDS_STM32F746G_DISCO_SRC_STM32F746G_DISCO__H +#ifndef __BOARDS_ARM_STM32F746G_DISCO_SRC_STM32F746G_DISCO__H +#define __BOARDS_ARM_STM32F746G_DISCO_SRC_STM32F746G_DISCO__H /**************************************************************************************************** * Included Files @@ -207,4 +207,4 @@ int stm32_tsc_setup(int minor); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32F746G_DISCO_SRC_STM32F746G_DISCO_H */ +#endif /* __BOARDS_ARM_STM32F746G_DISCO_SRC_STM32F746G_DISCO_H */ diff --git a/boards/stm32f769i-disco/Kconfig b/boards/arm/stm32f769i-disco/Kconfig similarity index 100% rename from boards/stm32f769i-disco/Kconfig rename to boards/arm/stm32f769i-disco/Kconfig diff --git a/boards/stm32f769i-disco/README.txt b/boards/arm/stm32f769i-disco/README.txt similarity index 100% rename from boards/stm32f769i-disco/README.txt rename to boards/arm/stm32f769i-disco/README.txt diff --git a/boards/stm32f769i-disco/configs/netnsh/defconfig b/boards/arm/stm32f769i-disco/configs/netnsh/defconfig similarity index 100% rename from boards/stm32f769i-disco/configs/netnsh/defconfig rename to boards/arm/stm32f769i-disco/configs/netnsh/defconfig diff --git a/boards/stm32f769i-disco/configs/nsh/defconfig b/boards/arm/stm32f769i-disco/configs/nsh/defconfig similarity index 100% rename from boards/stm32f769i-disco/configs/nsh/defconfig rename to boards/arm/stm32f769i-disco/configs/nsh/defconfig diff --git a/boards/stm32f769i-disco/include/board.h b/boards/arm/stm32f769i-disco/include/board.h similarity index 99% rename from boards/stm32f769i-disco/include/board.h rename to boards/arm/stm32f769i-disco/include/board.h index 25c163908b..7df14d1da4 100644 --- a/boards/stm32f769i-disco/include/board.h +++ b/boards/arm/stm32f769i-disco/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_STM32F769I_DISCO_INCLUDE_BOARD_H -#define __CONFIG_STM32F769I_DISCO_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32F769I_DISCO_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32F769I_DISCO_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -481,4 +481,4 @@ #define BOARD_LTDC_GCR_VSPOL 0 #define BOARD_LTDC_GCR_HSPOL 0 -#endif /* __CONFIG_STM32F769I_DISCO_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32F769I_DISCO_INCLUDE_BOARD_H */ diff --git a/boards/stm32f769i-disco/kernel/.gitignore b/boards/arm/stm32f769i-disco/kernel/.gitignore similarity index 100% rename from boards/stm32f769i-disco/kernel/.gitignore rename to boards/arm/stm32f769i-disco/kernel/.gitignore diff --git a/boards/stm32f769i-disco/kernel/Makefile b/boards/arm/stm32f769i-disco/kernel/Makefile similarity index 100% rename from boards/stm32f769i-disco/kernel/Makefile rename to boards/arm/stm32f769i-disco/kernel/Makefile diff --git a/boards/stm32f769i-disco/kernel/stm32_userspace.c b/boards/arm/stm32f769i-disco/kernel/stm32_userspace.c similarity index 100% rename from boards/stm32f769i-disco/kernel/stm32_userspace.c rename to boards/arm/stm32f769i-disco/kernel/stm32_userspace.c diff --git a/boards/stm32f769i-disco/scripts/Make.defs b/boards/arm/stm32f769i-disco/scripts/Make.defs similarity index 96% rename from boards/stm32f769i-disco/scripts/Make.defs rename to boards/arm/stm32f769i-disco/scripts/Make.defs index 93c7193752..d4fda25da8 100644 --- a/boards/stm32f769i-disco/scripts/Make.defs +++ b/boards/arm/stm32f769i-disco/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32f769i-disco/scripts/flash.ld b/boards/arm/stm32f769i-disco/scripts/flash.ld similarity index 100% rename from boards/stm32f769i-disco/scripts/flash.ld rename to boards/arm/stm32f769i-disco/scripts/flash.ld diff --git a/boards/stm32f769i-disco/scripts/kernel-space.ld b/boards/arm/stm32f769i-disco/scripts/kernel-space.ld similarity index 100% rename from boards/stm32f769i-disco/scripts/kernel-space.ld rename to boards/arm/stm32f769i-disco/scripts/kernel-space.ld diff --git a/boards/stm32f769i-disco/scripts/memory.ld b/boards/arm/stm32f769i-disco/scripts/memory.ld similarity index 100% rename from boards/stm32f769i-disco/scripts/memory.ld rename to boards/arm/stm32f769i-disco/scripts/memory.ld diff --git a/boards/stm32f769i-disco/scripts/user-space.ld b/boards/arm/stm32f769i-disco/scripts/user-space.ld similarity index 100% rename from boards/stm32f769i-disco/scripts/user-space.ld rename to boards/arm/stm32f769i-disco/scripts/user-space.ld diff --git a/boards/shenzhou/src/.gitignore b/boards/arm/stm32f769i-disco/src/.gitignore similarity index 100% rename from boards/shenzhou/src/.gitignore rename to boards/arm/stm32f769i-disco/src/.gitignore diff --git a/boards/stm32f769i-disco/src/Makefile b/boards/arm/stm32f769i-disco/src/Makefile similarity index 100% rename from boards/stm32f769i-disco/src/Makefile rename to boards/arm/stm32f769i-disco/src/Makefile diff --git a/boards/stm32f769i-disco/src/stm32_appinitialize.c b/boards/arm/stm32f769i-disco/src/stm32_appinitialize.c similarity index 100% rename from boards/stm32f769i-disco/src/stm32_appinitialize.c rename to boards/arm/stm32f769i-disco/src/stm32_appinitialize.c diff --git a/boards/stm32f769i-disco/src/stm32_autoleds.c b/boards/arm/stm32f769i-disco/src/stm32_autoleds.c similarity index 100% rename from boards/stm32f769i-disco/src/stm32_autoleds.c rename to boards/arm/stm32f769i-disco/src/stm32_autoleds.c diff --git a/boards/stm32f769i-disco/src/stm32_boot.c b/boards/arm/stm32f769i-disco/src/stm32_boot.c similarity index 100% rename from boards/stm32f769i-disco/src/stm32_boot.c rename to boards/arm/stm32f769i-disco/src/stm32_boot.c diff --git a/boards/stm32f769i-disco/src/stm32_bringup.c b/boards/arm/stm32f769i-disco/src/stm32_bringup.c similarity index 100% rename from boards/stm32f769i-disco/src/stm32_bringup.c rename to boards/arm/stm32f769i-disco/src/stm32_bringup.c diff --git a/boards/stm32f769i-disco/src/stm32_buttons.c b/boards/arm/stm32f769i-disco/src/stm32_buttons.c similarity index 100% rename from boards/stm32f769i-disco/src/stm32_buttons.c rename to boards/arm/stm32f769i-disco/src/stm32_buttons.c diff --git a/boards/stm32f769i-disco/src/stm32_ostest.c b/boards/arm/stm32f769i-disco/src/stm32_ostest.c similarity index 100% rename from boards/stm32f769i-disco/src/stm32_ostest.c rename to boards/arm/stm32f769i-disco/src/stm32_ostest.c diff --git a/boards/stm32f769i-disco/src/stm32_pwm.c b/boards/arm/stm32f769i-disco/src/stm32_pwm.c similarity index 100% rename from boards/stm32f769i-disco/src/stm32_pwm.c rename to boards/arm/stm32f769i-disco/src/stm32_pwm.c diff --git a/boards/stm32f769i-disco/src/stm32_spi.c b/boards/arm/stm32f769i-disco/src/stm32_spi.c similarity index 100% rename from boards/stm32f769i-disco/src/stm32_spi.c rename to boards/arm/stm32f769i-disco/src/stm32_spi.c diff --git a/boards/stm32f769i-disco/src/stm32_sporadic.c b/boards/arm/stm32f769i-disco/src/stm32_sporadic.c similarity index 100% rename from boards/stm32f769i-disco/src/stm32_sporadic.c rename to boards/arm/stm32f769i-disco/src/stm32_sporadic.c diff --git a/boards/stm32f769i-disco/src/stm32_userleds.c b/boards/arm/stm32f769i-disco/src/stm32_userleds.c similarity index 100% rename from boards/stm32f769i-disco/src/stm32_userleds.c rename to boards/arm/stm32f769i-disco/src/stm32_userleds.c diff --git a/boards/stm32f769i-disco/src/stm32f769i-disco.h b/boards/arm/stm32f769i-disco/src/stm32f769i-disco.h similarity index 97% rename from boards/stm32f769i-disco/src/stm32f769i-disco.h rename to boards/arm/stm32f769i-disco/src/stm32f769i-disco.h index e6392c7a9b..16f512dab9 100644 --- a/boards/stm32f769i-disco/src/stm32f769i-disco.h +++ b/boards/arm/stm32f769i-disco/src/stm32f769i-disco.h @@ -33,8 +33,8 @@ * ****************************************************************************************************/ -#ifndef __BOARDS_STM32F769I_DISCO_SRC_STM32F769I_DISCO__H -#define __BOARDS_STM32F769I_DISCO_SRC_STM32F769I_DISCO__H +#ifndef __BOARDS_ARM_STM32F769I_DISCO_SRC_STM32F769I_DISCO__H +#define __BOARDS_ARM_STM32F769I_DISCO_SRC_STM32F769I_DISCO__H /**************************************************************************************************** * Included Files @@ -157,5 +157,5 @@ void arch_sporadic_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32F769I_DISCO_SRC_STM32F769I_DISCO_H */ +#endif /* __BOARDS_ARM_STM32F769I_DISCO_SRC_STM32F769I_DISCO_H */ diff --git a/boards/stm32l476-mdk/Kconfig b/boards/arm/stm32l476-mdk/Kconfig similarity index 100% rename from boards/stm32l476-mdk/Kconfig rename to boards/arm/stm32l476-mdk/Kconfig diff --git a/boards/stm32l476-mdk/README.txt b/boards/arm/stm32l476-mdk/README.txt similarity index 100% rename from boards/stm32l476-mdk/README.txt rename to boards/arm/stm32l476-mdk/README.txt diff --git a/boards/stm32l476-mdk/configs/nsh/defconfig b/boards/arm/stm32l476-mdk/configs/nsh/defconfig similarity index 100% rename from boards/stm32l476-mdk/configs/nsh/defconfig rename to boards/arm/stm32l476-mdk/configs/nsh/defconfig diff --git a/boards/stm32l476-mdk/include/board.h b/boards/arm/stm32l476-mdk/include/board.h similarity index 98% rename from boards/stm32l476-mdk/include/board.h rename to boards/arm/stm32l476-mdk/include/board.h index 5cdfc2ec91..442d19d6d1 100644 --- a/boards/stm32l476-mdk/include/board.h +++ b/boards/arm/stm32l476-mdk/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM32L476_MDK_INCLUDE_BOARD_H -#define __BOARDS_STM32L476_MDK_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32L476_MDK_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32L476_MDK_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -209,4 +209,4 @@ void stm32l4_board_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32L476_MDK_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32L476_MDK_INCLUDE_BOARD_H */ diff --git a/boards/stm32l476-mdk/include/stm32l476-mdk-clocking.h b/boards/arm/stm32l476-mdk/include/stm32l476-mdk-clocking.h similarity index 98% rename from boards/stm32l476-mdk/include/stm32l476-mdk-clocking.h rename to boards/arm/stm32l476-mdk/include/stm32l476-mdk-clocking.h index 50ea163240..5a6d7965c1 100644 --- a/boards/stm32l476-mdk/include/stm32l476-mdk-clocking.h +++ b/boards/arm/stm32l476-mdk/include/stm32l476-mdk-clocking.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM32L476_MDK_INCLUDE_STM32L476_MDK_CLOCKING_H -#define __BOARDS_STM32L476_MDK_INCLUDE_STM32L476_MDK_CLOCKING_H +#ifndef __BOARDS_ARM_STM32L476_MDK_INCLUDE_STM32L476_MDK_CLOCKING_H +#define __BOARDS_ARM_STM32L476_MDK_INCLUDE_STM32L476_MDK_CLOCKING_H /************************************************************************************ * Included Files @@ -299,4 +299,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32L476_MDK_INCLUDE_STM32L476_MDK_CLOCKING_H */ +#endif /* __BOARDS_ARM_STM32L476_MDK_INCLUDE_STM32L476_MDK_CLOCKING_H */ diff --git a/boards/stm32l476-mdk/scripts/Make.defs b/boards/arm/stm32l476-mdk/scripts/Make.defs similarity index 96% rename from boards/stm32l476-mdk/scripts/Make.defs rename to boards/arm/stm32l476-mdk/scripts/Make.defs index e592b22435..c2e36b701c 100644 --- a/boards/stm32l476-mdk/scripts/Make.defs +++ b/boards/arm/stm32l476-mdk/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mknulldeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32l476-mdk/scripts/stm32l476-mdk.ld b/boards/arm/stm32l476-mdk/scripts/stm32l476-mdk.ld similarity index 100% rename from boards/stm32l476-mdk/scripts/stm32l476-mdk.ld rename to boards/arm/stm32l476-mdk/scripts/stm32l476-mdk.ld diff --git a/boards/stm32l476-mdk/src/Makefile b/boards/arm/stm32l476-mdk/src/Makefile similarity index 100% rename from boards/stm32l476-mdk/src/Makefile rename to boards/arm/stm32l476-mdk/src/Makefile diff --git a/boards/stm32l476-mdk/src/stm32_appinit.c b/boards/arm/stm32l476-mdk/src/stm32_appinit.c similarity index 100% rename from boards/stm32l476-mdk/src/stm32_appinit.c rename to boards/arm/stm32l476-mdk/src/stm32_appinit.c diff --git a/boards/stm32l476-mdk/src/stm32_autoleds.c b/boards/arm/stm32l476-mdk/src/stm32_autoleds.c similarity index 100% rename from boards/stm32l476-mdk/src/stm32_autoleds.c rename to boards/arm/stm32l476-mdk/src/stm32_autoleds.c diff --git a/boards/stm32l476-mdk/src/stm32_boot.c b/boards/arm/stm32l476-mdk/src/stm32_boot.c similarity index 100% rename from boards/stm32l476-mdk/src/stm32_boot.c rename to boards/arm/stm32l476-mdk/src/stm32_boot.c diff --git a/boards/stm32l476-mdk/src/stm32_bringup.c b/boards/arm/stm32l476-mdk/src/stm32_bringup.c similarity index 100% rename from boards/stm32l476-mdk/src/stm32_bringup.c rename to boards/arm/stm32l476-mdk/src/stm32_bringup.c diff --git a/boards/stm32l476-mdk/src/stm32_buttons.c b/boards/arm/stm32l476-mdk/src/stm32_buttons.c similarity index 100% rename from boards/stm32l476-mdk/src/stm32_buttons.c rename to boards/arm/stm32l476-mdk/src/stm32_buttons.c diff --git a/boards/stm32l476-mdk/src/stm32_clockconfig.c b/boards/arm/stm32l476-mdk/src/stm32_clockconfig.c similarity index 100% rename from boards/stm32l476-mdk/src/stm32_clockconfig.c rename to boards/arm/stm32l476-mdk/src/stm32_clockconfig.c diff --git a/boards/stm32l476-mdk/src/stm32_spi.c b/boards/arm/stm32l476-mdk/src/stm32_spi.c similarity index 100% rename from boards/stm32l476-mdk/src/stm32_spi.c rename to boards/arm/stm32l476-mdk/src/stm32_spi.c diff --git a/boards/stm32l476-mdk/src/stm32_userleds.c b/boards/arm/stm32l476-mdk/src/stm32_userleds.c similarity index 100% rename from boards/stm32l476-mdk/src/stm32_userleds.c rename to boards/arm/stm32l476-mdk/src/stm32_userleds.c diff --git a/boards/stm32l476-mdk/src/stm32l476-mdk.h b/boards/arm/stm32l476-mdk/src/stm32l476-mdk.h similarity index 97% rename from boards/stm32l476-mdk/src/stm32l476-mdk.h rename to boards/arm/stm32l476-mdk/src/stm32l476-mdk.h index 2da5acbaf8..343db3b096 100644 --- a/boards/stm32l476-mdk/src/stm32l476-mdk.h +++ b/boards/arm/stm32l476-mdk/src/stm32l476-mdk.h @@ -36,8 +36,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM32L476_MDK_SRC_STM32L476_MDK_H -#define __BOARDS_STM32L476_MDK_SRC_STM32L476_MDK_H +#ifndef __BOARDS_ARM_STM32L476_MDK_SRC_STM32L476_MDK_H +#define __BOARDS_ARM_STM32L476_MDK_SRC_STM32L476_MDK_H /************************************************************************************ * Included Files @@ -170,4 +170,4 @@ int stm32_bringup(void); void stm32_spiinitialize(void); -#endif /* __BOARDS_STM32L476_MDK_SRC_STM32L476_MDK_H */ +#endif /* __BOARDS_ARM_STM32L476_MDK_SRC_STM32L476_MDK_H */ diff --git a/boards/stm32l476vg-disco/Kconfig b/boards/arm/stm32l476vg-disco/Kconfig similarity index 100% rename from boards/stm32l476vg-disco/Kconfig rename to boards/arm/stm32l476vg-disco/Kconfig diff --git a/boards/stm32l476vg-disco/README.txt b/boards/arm/stm32l476vg-disco/README.txt similarity index 100% rename from boards/stm32l476vg-disco/README.txt rename to boards/arm/stm32l476vg-disco/README.txt diff --git a/boards/stm32l476vg-disco/configs/knsh/Make.defs b/boards/arm/stm32l476vg-disco/configs/knsh/Make.defs similarity index 94% rename from boards/stm32l476vg-disco/configs/knsh/Make.defs rename to boards/arm/stm32l476vg-disco/configs/knsh/Make.defs index 5c5a597f8e..410c507a30 100644 --- a/boards/stm32l476vg-disco/configs/knsh/Make.defs +++ b/boards/arm/stm32l476vg-disco/configs/knsh/Make.defs @@ -47,15 +47,15 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mknulldeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) - ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) + ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32l476vg-disco/configs/knsh/defconfig b/boards/arm/stm32l476vg-disco/configs/knsh/defconfig similarity index 100% rename from boards/stm32l476vg-disco/configs/knsh/defconfig rename to boards/arm/stm32l476vg-disco/configs/knsh/defconfig diff --git a/boards/stm32l476vg-disco/configs/nsh/defconfig b/boards/arm/stm32l476vg-disco/configs/nsh/defconfig similarity index 100% rename from boards/stm32l476vg-disco/configs/nsh/defconfig rename to boards/arm/stm32l476vg-disco/configs/nsh/defconfig diff --git a/boards/stm32l476vg-disco/include/board.h b/boards/arm/stm32l476vg-disco/include/board.h similarity index 98% rename from boards/stm32l476vg-disco/include/board.h rename to boards/arm/stm32l476vg-disco/include/board.h index fc25893106..b2e9aacd8e 100644 --- a/boards/stm32l476vg-disco/include/board.h +++ b/boards/arm/stm32l476vg-disco/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM32L476VG_DISCO_INCLUDE_BOARD_H -#define __BOARDS_STM32L476VG_DISCO_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32L476VG_DISCO_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32L476VG_DISCO_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -310,4 +310,4 @@ void stm32l4_board_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32L476VG_DISCO_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32L476VG_DISCO_INCLUDE_BOARD_H */ diff --git a/boards/stm32l476vg-disco/include/boardctl.h b/boards/arm/stm32l476vg-disco/include/boardctl.h similarity index 92% rename from boards/stm32l476vg-disco/include/boardctl.h rename to boards/arm/stm32l476vg-disco/include/boardctl.h index 1d16942c8c..68a254880f 100644 --- a/boards/stm32l476vg-disco/include/boardctl.h +++ b/boards/arm/stm32l476vg-disco/include/boardctl.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM32L476VG_DISCO_INCLUDE_BOARDCTL_H -#define __BOARDS_STM32L476VG_DISCO_INCLUDE_BOARDCTL_H +#ifndef __BOARDS_ARM_STM32L476VG_DISCO_INCLUDE_BOARDCTL_H +#define __BOARDS_ARM_STM32L476VG_DISCO_INCLUDE_BOARDCTL_H /**************************************************************************** * Included Files @@ -49,4 +49,4 @@ #define BIOC_ENTER_MEMMAP BOARDIOC_USER+1 #define BIOC_EXIT_MEMMAP BOARDIOC_USER+2 -#endif /* __BOARDS_STM32L476VG_DISCO_INCLUDE_BOARDCTL_H */ +#endif /* __BOARDS_ARM_STM32L476VG_DISCO_INCLUDE_BOARDCTL_H */ diff --git a/boards/stm32l476vg-disco/include/nsh_romfsimg.h b/boards/arm/stm32l476vg-disco/include/nsh_romfsimg.h similarity index 100% rename from boards/stm32l476vg-disco/include/nsh_romfsimg.h rename to boards/arm/stm32l476vg-disco/include/nsh_romfsimg.h diff --git a/boards/stm32l476vg-disco/include/rcS.template b/boards/arm/stm32l476vg-disco/include/rcS.template similarity index 100% rename from boards/stm32l476vg-disco/include/rcS.template rename to boards/arm/stm32l476vg-disco/include/rcS.template diff --git a/boards/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h b/boards/arm/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h similarity index 98% rename from boards/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h rename to boards/arm/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h index a556465fe5..359c2e2222 100644 --- a/boards/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h +++ b/boards/arm/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM32L476VG_DISCO_INCLUDE_STM32L476VG_DISCO_CLOCKING_H -#define __BOARDS_STM32L476VG_DISCO_INCLUDE_STM32L476VG_DISCO_CLOCKING_H +#ifndef __BOARDS_ARM_STM32L476VG_DISCO_INCLUDE_STM32L476VG_DISCO_CLOCKING_H +#define __BOARDS_ARM_STM32L476VG_DISCO_INCLUDE_STM32L476VG_DISCO_CLOCKING_H /************************************************************************************ * Included Files @@ -395,4 +395,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32L476VG_DISCO_INCLUDE_STM32L476VG_DISCO_CLOCKING_H */ +#endif /* __BOARDS_ARM_STM32L476VG_DISCO_INCLUDE_STM32L476VG_DISCO_CLOCKING_H */ diff --git a/boards/stm32l476vg-disco/kernel/.gitignore b/boards/arm/stm32l476vg-disco/kernel/.gitignore similarity index 100% rename from boards/stm32l476vg-disco/kernel/.gitignore rename to boards/arm/stm32l476vg-disco/kernel/.gitignore diff --git a/boards/stm32l476vg-disco/kernel/Makefile b/boards/arm/stm32l476vg-disco/kernel/Makefile similarity index 100% rename from boards/stm32l476vg-disco/kernel/Makefile rename to boards/arm/stm32l476vg-disco/kernel/Makefile diff --git a/boards/stm32l476vg-disco/kernel/stm32l4_userspace.c b/boards/arm/stm32l476vg-disco/kernel/stm32l4_userspace.c similarity index 100% rename from boards/stm32l476vg-disco/kernel/stm32l4_userspace.c rename to boards/arm/stm32l476vg-disco/kernel/stm32l4_userspace.c diff --git a/boards/stm32l476vg-disco/scripts/Make.defs b/boards/arm/stm32l476vg-disco/scripts/Make.defs similarity index 96% rename from boards/stm32l476vg-disco/scripts/Make.defs rename to boards/arm/stm32l476vg-disco/scripts/Make.defs index 27828a37ba..e9dd100463 100644 --- a/boards/stm32l476vg-disco/scripts/Make.defs +++ b/boards/arm/stm32l476vg-disco/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mknulldeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32l476vg-disco/scripts/kernel-space.ld b/boards/arm/stm32l476vg-disco/scripts/kernel-space.ld similarity index 100% rename from boards/stm32l476vg-disco/scripts/kernel-space.ld rename to boards/arm/stm32l476vg-disco/scripts/kernel-space.ld diff --git a/boards/stm32l476vg-disco/scripts/memory.ld b/boards/arm/stm32l476vg-disco/scripts/memory.ld similarity index 100% rename from boards/stm32l476vg-disco/scripts/memory.ld rename to boards/arm/stm32l476vg-disco/scripts/memory.ld diff --git a/boards/stm32l476vg-disco/scripts/stm32l476vg-disco.ld b/boards/arm/stm32l476vg-disco/scripts/stm32l476vg-disco.ld similarity index 100% rename from boards/stm32l476vg-disco/scripts/stm32l476vg-disco.ld rename to boards/arm/stm32l476vg-disco/scripts/stm32l476vg-disco.ld diff --git a/boards/stm32l476vg-disco/scripts/user-space.ld b/boards/arm/stm32l476vg-disco/scripts/user-space.ld similarity index 100% rename from boards/stm32l476vg-disco/scripts/user-space.ld rename to boards/arm/stm32l476vg-disco/scripts/user-space.ld diff --git a/boards/stm32l476vg-disco/src/Makefile b/boards/arm/stm32l476vg-disco/src/Makefile similarity index 100% rename from boards/stm32l476vg-disco/src/Makefile rename to boards/arm/stm32l476vg-disco/src/Makefile diff --git a/boards/stm32l476vg-disco/src/stm32_appinit.c b/boards/arm/stm32l476vg-disco/src/stm32_appinit.c similarity index 100% rename from boards/stm32l476vg-disco/src/stm32_appinit.c rename to boards/arm/stm32l476vg-disco/src/stm32_appinit.c diff --git a/boards/stm32l476vg-disco/src/stm32_autoleds.c b/boards/arm/stm32l476vg-disco/src/stm32_autoleds.c similarity index 100% rename from boards/stm32l476vg-disco/src/stm32_autoleds.c rename to boards/arm/stm32l476vg-disco/src/stm32_autoleds.c diff --git a/boards/stm32l476vg-disco/src/stm32_boot.c b/boards/arm/stm32l476vg-disco/src/stm32_boot.c similarity index 100% rename from boards/stm32l476vg-disco/src/stm32_boot.c rename to boards/arm/stm32l476vg-disco/src/stm32_boot.c diff --git a/boards/stm32l476vg-disco/src/stm32_buttons.c b/boards/arm/stm32l476vg-disco/src/stm32_buttons.c similarity index 100% rename from boards/stm32l476vg-disco/src/stm32_buttons.c rename to boards/arm/stm32l476vg-disco/src/stm32_buttons.c diff --git a/boards/stm32l476vg-disco/src/stm32_clockconfig.c b/boards/arm/stm32l476vg-disco/src/stm32_clockconfig.c similarity index 100% rename from boards/stm32l476vg-disco/src/stm32_clockconfig.c rename to boards/arm/stm32l476vg-disco/src/stm32_clockconfig.c diff --git a/boards/stm32l476vg-disco/src/stm32_spi.c b/boards/arm/stm32l476vg-disco/src/stm32_spi.c similarity index 100% rename from boards/stm32l476vg-disco/src/stm32_spi.c rename to boards/arm/stm32l476vg-disco/src/stm32_spi.c diff --git a/boards/stm32l476vg-disco/src/stm32_usb.c b/boards/arm/stm32l476vg-disco/src/stm32_usb.c similarity index 100% rename from boards/stm32l476vg-disco/src/stm32_usb.c rename to boards/arm/stm32l476vg-disco/src/stm32_usb.c diff --git a/boards/stm32l476vg-disco/src/stm32_userleds.c b/boards/arm/stm32l476vg-disco/src/stm32_userleds.c similarity index 100% rename from boards/stm32l476vg-disco/src/stm32_userleds.c rename to boards/arm/stm32l476vg-disco/src/stm32_userleds.c diff --git a/boards/stm32l476vg-disco/src/stm32l476vg-disco.h b/boards/arm/stm32l476vg-disco/src/stm32l476vg-disco.h similarity index 97% rename from boards/stm32l476vg-disco/src/stm32l476vg-disco.h rename to boards/arm/stm32l476vg-disco/src/stm32l476vg-disco.h index 8a406ec874..6bfe4f6d69 100644 --- a/boards/stm32l476vg-disco/src/stm32l476vg-disco.h +++ b/boards/arm/stm32l476vg-disco/src/stm32l476vg-disco.h @@ -36,8 +36,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM32L476VG_DISCO_SRC_STM32L476VG_DISCO_H -#define __BOARDS_STM32L476VG_DISCO_SRC_STM32L476VG_DISCO_H +#ifndef __BOARDS_ARM_STM32L476VG_DISCO_SRC_STM32L476VG_DISCO_H +#define __BOARDS_ARM_STM32L476VG_DISCO_SRC_STM32L476VG_DISCO_H /************************************************************************************ * Included Files @@ -272,4 +272,4 @@ void stm32_spiinitialize(void); void stm32l4_usbinitialize(void); -#endif /* __BOARDS_STM32L476VG_DISCO_SRC_STM32L476VG_DISCO_H */ +#endif /* __BOARDS_ARM_STM32L476VG_DISCO_SRC_STM32L476VG_DISCO_H */ diff --git a/boards/stm32l4r9ai-disco/Kconfig b/boards/arm/stm32l4r9ai-disco/Kconfig similarity index 100% rename from boards/stm32l4r9ai-disco/Kconfig rename to boards/arm/stm32l4r9ai-disco/Kconfig diff --git a/boards/stm32l4r9ai-disco/README.txt b/boards/arm/stm32l4r9ai-disco/README.txt similarity index 100% rename from boards/stm32l4r9ai-disco/README.txt rename to boards/arm/stm32l4r9ai-disco/README.txt diff --git a/boards/stm32l4r9ai-disco/configs/knsh/Make.defs b/boards/arm/stm32l4r9ai-disco/configs/knsh/Make.defs similarity index 94% rename from boards/stm32l4r9ai-disco/configs/knsh/Make.defs rename to boards/arm/stm32l4r9ai-disco/configs/knsh/Make.defs index 212673d231..17feb3dfba 100644 --- a/boards/stm32l4r9ai-disco/configs/knsh/Make.defs +++ b/boards/arm/stm32l4r9ai-disco/configs/knsh/Make.defs @@ -47,15 +47,15 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mknulldeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) - ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) + ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32l4r9ai-disco/configs/knsh/defconfig b/boards/arm/stm32l4r9ai-disco/configs/knsh/defconfig similarity index 100% rename from boards/stm32l4r9ai-disco/configs/knsh/defconfig rename to boards/arm/stm32l4r9ai-disco/configs/knsh/defconfig diff --git a/boards/stm32l4r9ai-disco/configs/nsh/defconfig b/boards/arm/stm32l4r9ai-disco/configs/nsh/defconfig similarity index 100% rename from boards/stm32l4r9ai-disco/configs/nsh/defconfig rename to boards/arm/stm32l4r9ai-disco/configs/nsh/defconfig diff --git a/boards/stm32l4r9ai-disco/include/board.h b/boards/arm/stm32l4r9ai-disco/include/board.h similarity index 98% rename from boards/stm32l4r9ai-disco/include/board.h rename to boards/arm/stm32l4r9ai-disco/include/board.h index 59607c99b6..08e1433a8d 100644 --- a/boards/stm32l4r9ai-disco/include/board.h +++ b/boards/arm/stm32l4r9ai-disco/include/board.h @@ -32,8 +32,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM32L4R9AI_DISCO_INCLUDE_BOARD_H -#define __BOARDS_STM32L4R9AI_DISCO_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32L4R9AI_DISCO_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32L4R9AI_DISCO_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -300,4 +300,4 @@ void stm32l4_board_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32L4R9AI_DISCO_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32L4R9AI_DISCO_INCLUDE_BOARD_H */ diff --git a/boards/stm32l4r9ai-disco/include/boardctl.h b/boards/arm/stm32l4r9ai-disco/include/boardctl.h similarity index 92% rename from boards/stm32l4r9ai-disco/include/boardctl.h rename to boards/arm/stm32l4r9ai-disco/include/boardctl.h index 82a6d35ed0..994695e7cd 100644 --- a/boards/stm32l4r9ai-disco/include/boardctl.h +++ b/boards/arm/stm32l4r9ai-disco/include/boardctl.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM32L4R9AI_DISCO_INCLUDE_BOARDCTL_H -#define __BOARDS_STM32L4R9AI_DISCO_INCLUDE_BOARDCTL_H +#ifndef __BOARDS_ARM_STM32L4R9AI_DISCO_INCLUDE_BOARDCTL_H +#define __BOARDS_ARM_STM32L4R9AI_DISCO_INCLUDE_BOARDCTL_H /**************************************************************************** * Included Files @@ -49,4 +49,4 @@ #define BIOC_ENTER_MEMMAP BOARDIOC_USER+1 #define BIOC_EXIT_MEMMAP BOARDIOC_USER+2 -#endif /* __BOARDS_STM32L4R9AI_DISCO_INCLUDE_BOARDCTL_H */ +#endif /* __BOARDS_ARM_STM32L4R9AI_DISCO_INCLUDE_BOARDCTL_H */ diff --git a/boards/stm32l4r9ai-disco/include/nsh_romfsimg.h b/boards/arm/stm32l4r9ai-disco/include/nsh_romfsimg.h similarity index 100% rename from boards/stm32l4r9ai-disco/include/nsh_romfsimg.h rename to boards/arm/stm32l4r9ai-disco/include/nsh_romfsimg.h diff --git a/boards/stm32l4r9ai-disco/include/rcS.template b/boards/arm/stm32l4r9ai-disco/include/rcS.template similarity index 100% rename from boards/stm32l4r9ai-disco/include/rcS.template rename to boards/arm/stm32l4r9ai-disco/include/rcS.template diff --git a/boards/stm32l4r9ai-disco/include/stm32l4r9ai-disco-clocking.h b/boards/arm/stm32l4r9ai-disco/include/stm32l4r9ai-disco-clocking.h similarity index 98% rename from boards/stm32l4r9ai-disco/include/stm32l4r9ai-disco-clocking.h rename to boards/arm/stm32l4r9ai-disco/include/stm32l4r9ai-disco-clocking.h index d8c67a34c2..8c3dc16ae5 100644 --- a/boards/stm32l4r9ai-disco/include/stm32l4r9ai-disco-clocking.h +++ b/boards/arm/stm32l4r9ai-disco/include/stm32l4r9ai-disco-clocking.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM32L4R9AI_DISCO_INCLUDE_STM32L4R9AI_DISCO_CLOCKING_H -#define __BOARDS_STM32L4R9AI_DISCO_INCLUDE_STM32L4R9AI_DISCO_CLOCKING_H +#ifndef __BOARDS_ARM_STM32L4R9AI_DISCO_INCLUDE_STM32L4R9AI_DISCO_CLOCKING_H +#define __BOARDS_ARM_STM32L4R9AI_DISCO_INCLUDE_STM32L4R9AI_DISCO_CLOCKING_H /************************************************************************************ * Included Files @@ -439,4 +439,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32L4R9AI_DISCO_INCLUDE_STM32L4R9AI_DISCO_CLOCKING_H */ +#endif /* __BOARDS_ARM_STM32L4R9AI_DISCO_INCLUDE_STM32L4R9AI_DISCO_CLOCKING_H */ diff --git a/boards/stm32l4r9ai-disco/kernel/.gitignore b/boards/arm/stm32l4r9ai-disco/kernel/.gitignore similarity index 100% rename from boards/stm32l4r9ai-disco/kernel/.gitignore rename to boards/arm/stm32l4r9ai-disco/kernel/.gitignore diff --git a/boards/stm32l4r9ai-disco/kernel/Makefile b/boards/arm/stm32l4r9ai-disco/kernel/Makefile similarity index 100% rename from boards/stm32l4r9ai-disco/kernel/Makefile rename to boards/arm/stm32l4r9ai-disco/kernel/Makefile diff --git a/boards/stm32l4r9ai-disco/kernel/stm32l4_userspace.c b/boards/arm/stm32l4r9ai-disco/kernel/stm32l4_userspace.c similarity index 100% rename from boards/stm32l4r9ai-disco/kernel/stm32l4_userspace.c rename to boards/arm/stm32l4r9ai-disco/kernel/stm32l4_userspace.c diff --git a/boards/stm32l4r9ai-disco/scripts/Make.defs b/boards/arm/stm32l4r9ai-disco/scripts/Make.defs similarity index 96% rename from boards/stm32l4r9ai-disco/scripts/Make.defs rename to boards/arm/stm32l4r9ai-disco/scripts/Make.defs index 8b47f69796..997389e53d 100644 --- a/boards/stm32l4r9ai-disco/scripts/Make.defs +++ b/boards/arm/stm32l4r9ai-disco/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mknulldeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32l4r9ai-disco/scripts/kernel-space.ld b/boards/arm/stm32l4r9ai-disco/scripts/kernel-space.ld similarity index 100% rename from boards/stm32l4r9ai-disco/scripts/kernel-space.ld rename to boards/arm/stm32l4r9ai-disco/scripts/kernel-space.ld diff --git a/boards/stm32l4r9ai-disco/scripts/memory.ld b/boards/arm/stm32l4r9ai-disco/scripts/memory.ld similarity index 100% rename from boards/stm32l4r9ai-disco/scripts/memory.ld rename to boards/arm/stm32l4r9ai-disco/scripts/memory.ld diff --git a/boards/stm32l4r9ai-disco/scripts/stm32l4r9ai-disco.ld b/boards/arm/stm32l4r9ai-disco/scripts/stm32l4r9ai-disco.ld similarity index 100% rename from boards/stm32l4r9ai-disco/scripts/stm32l4r9ai-disco.ld rename to boards/arm/stm32l4r9ai-disco/scripts/stm32l4r9ai-disco.ld diff --git a/boards/stm32l4r9ai-disco/scripts/user-space.ld b/boards/arm/stm32l4r9ai-disco/scripts/user-space.ld similarity index 100% rename from boards/stm32l4r9ai-disco/scripts/user-space.ld rename to boards/arm/stm32l4r9ai-disco/scripts/user-space.ld diff --git a/boards/sim/src/.gitignore b/boards/arm/stm32l4r9ai-disco/src/.gitignore similarity index 100% rename from boards/sim/src/.gitignore rename to boards/arm/stm32l4r9ai-disco/src/.gitignore diff --git a/boards/stm32l4r9ai-disco/src/Makefile b/boards/arm/stm32l4r9ai-disco/src/Makefile similarity index 100% rename from boards/stm32l4r9ai-disco/src/Makefile rename to boards/arm/stm32l4r9ai-disco/src/Makefile diff --git a/boards/stm32l4r9ai-disco/src/stm32_adc.c b/boards/arm/stm32l4r9ai-disco/src/stm32_adc.c similarity index 100% rename from boards/stm32l4r9ai-disco/src/stm32_adc.c rename to boards/arm/stm32l4r9ai-disco/src/stm32_adc.c diff --git a/boards/stm32l4r9ai-disco/src/stm32_appinit.c b/boards/arm/stm32l4r9ai-disco/src/stm32_appinit.c similarity index 100% rename from boards/stm32l4r9ai-disco/src/stm32_appinit.c rename to boards/arm/stm32l4r9ai-disco/src/stm32_appinit.c diff --git a/boards/stm32l4r9ai-disco/src/stm32_autoleds.c b/boards/arm/stm32l4r9ai-disco/src/stm32_autoleds.c similarity index 100% rename from boards/stm32l4r9ai-disco/src/stm32_autoleds.c rename to boards/arm/stm32l4r9ai-disco/src/stm32_autoleds.c diff --git a/boards/stm32l4r9ai-disco/src/stm32_boot.c b/boards/arm/stm32l4r9ai-disco/src/stm32_boot.c similarity index 100% rename from boards/stm32l4r9ai-disco/src/stm32_boot.c rename to boards/arm/stm32l4r9ai-disco/src/stm32_boot.c diff --git a/boards/stm32l4r9ai-disco/src/stm32_buttons.c b/boards/arm/stm32l4r9ai-disco/src/stm32_buttons.c similarity index 100% rename from boards/stm32l4r9ai-disco/src/stm32_buttons.c rename to boards/arm/stm32l4r9ai-disco/src/stm32_buttons.c diff --git a/boards/stm32l4r9ai-disco/src/stm32_clockconfig.c b/boards/arm/stm32l4r9ai-disco/src/stm32_clockconfig.c similarity index 100% rename from boards/stm32l4r9ai-disco/src/stm32_clockconfig.c rename to boards/arm/stm32l4r9ai-disco/src/stm32_clockconfig.c diff --git a/boards/stm32l4r9ai-disco/src/stm32_dac.c b/boards/arm/stm32l4r9ai-disco/src/stm32_dac.c similarity index 100% rename from boards/stm32l4r9ai-disco/src/stm32_dac.c rename to boards/arm/stm32l4r9ai-disco/src/stm32_dac.c diff --git a/boards/stm32l4r9ai-disco/src/stm32_dfsdm.c b/boards/arm/stm32l4r9ai-disco/src/stm32_dfsdm.c similarity index 100% rename from boards/stm32l4r9ai-disco/src/stm32_dfsdm.c rename to boards/arm/stm32l4r9ai-disco/src/stm32_dfsdm.c diff --git a/boards/stm32l4r9ai-disco/src/stm32_spi.c b/boards/arm/stm32l4r9ai-disco/src/stm32_spi.c similarity index 100% rename from boards/stm32l4r9ai-disco/src/stm32_spi.c rename to boards/arm/stm32l4r9ai-disco/src/stm32_spi.c diff --git a/boards/stm32l4r9ai-disco/src/stm32_usb.c b/boards/arm/stm32l4r9ai-disco/src/stm32_usb.c similarity index 100% rename from boards/stm32l4r9ai-disco/src/stm32_usb.c rename to boards/arm/stm32l4r9ai-disco/src/stm32_usb.c diff --git a/boards/stm32l4r9ai-disco/src/stm32_userleds.c b/boards/arm/stm32l4r9ai-disco/src/stm32_userleds.c similarity index 100% rename from boards/stm32l4r9ai-disco/src/stm32_userleds.c rename to boards/arm/stm32l4r9ai-disco/src/stm32_userleds.c diff --git a/boards/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h b/boards/arm/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h similarity index 97% rename from boards/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h rename to boards/arm/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h index 2e9bfbead2..6379d6719d 100644 --- a/boards/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h +++ b/boards/arm/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h @@ -36,8 +36,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM32L4R9AI_DISCO_SRC_STM32L4R9AI_DISCO_H -#define __BOARDS_STM32L4R9AI_DISCO_SRC_STM32L4R9AI_DISCO_H +#ifndef __BOARDS_ARM_STM32L4R9AI_DISCO_SRC_STM32L4R9AI_DISCO_H +#define __BOARDS_ARM_STM32L4R9AI_DISCO_SRC_STM32L4R9AI_DISCO_H /************************************************************************************ * Included Files @@ -263,4 +263,4 @@ void stm32_spiinitialize(void); void stm32l4_usbinitialize(void); -#endif /* __BOARDS_STM32L4R9AI_DISCO_SRC_STM32L4R9AI_DISCO_H */ +#endif /* __BOARDS_ARM_STM32L4R9AI_DISCO_SRC_STM32L4R9AI_DISCO_H */ diff --git a/boards/stm32ldiscovery/Kconfig b/boards/arm/stm32ldiscovery/Kconfig similarity index 100% rename from boards/stm32ldiscovery/Kconfig rename to boards/arm/stm32ldiscovery/Kconfig diff --git a/boards/stm32ldiscovery/README.txt b/boards/arm/stm32ldiscovery/README.txt similarity index 100% rename from boards/stm32ldiscovery/README.txt rename to boards/arm/stm32ldiscovery/README.txt diff --git a/boards/stm32ldiscovery/configs/chrono/defconfig b/boards/arm/stm32ldiscovery/configs/chrono/defconfig similarity index 100% rename from boards/stm32ldiscovery/configs/chrono/defconfig rename to boards/arm/stm32ldiscovery/configs/chrono/defconfig diff --git a/boards/stm32ldiscovery/configs/nsh/defconfig b/boards/arm/stm32ldiscovery/configs/nsh/defconfig similarity index 100% rename from boards/stm32ldiscovery/configs/nsh/defconfig rename to boards/arm/stm32ldiscovery/configs/nsh/defconfig diff --git a/boards/stm32ldiscovery/include/board.h b/boards/arm/stm32ldiscovery/include/board.h similarity index 98% rename from boards/stm32ldiscovery/include/board.h rename to boards/arm/stm32ldiscovery/include/board.h index 25a6dbba37..350005e0f9 100644 --- a/boards/stm32ldiscovery/include/board.h +++ b/boards/arm/stm32ldiscovery/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_STM32LDISCOVERY_INCLUDE_BOARD_H -#define __BOARDS_STM32LDISCOVERY_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32LDISCOVERY_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32LDISCOVERY_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -307,4 +307,4 @@ int stm32_slcd_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32LDISCOVERY_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32LDISCOVERY_INCLUDE_BOARD_H */ diff --git a/boards/stm32ldiscovery/scripts/Make.defs b/boards/arm/stm32ldiscovery/scripts/Make.defs similarity index 97% rename from boards/stm32ldiscovery/scripts/Make.defs rename to boards/arm/stm32ldiscovery/scripts/Make.defs index 7b8c57186a..590cd74759 100644 --- a/boards/stm32ldiscovery/scripts/Make.defs +++ b/boards/arm/stm32ldiscovery/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32ldiscovery/scripts/gnu-elf.ld b/boards/arm/stm32ldiscovery/scripts/gnu-elf.ld similarity index 100% rename from boards/stm32ldiscovery/scripts/gnu-elf.ld rename to boards/arm/stm32ldiscovery/scripts/gnu-elf.ld diff --git a/boards/stm32ldiscovery/scripts/stm32l152rb.ld b/boards/arm/stm32ldiscovery/scripts/stm32l152rb.ld similarity index 100% rename from boards/stm32ldiscovery/scripts/stm32l152rb.ld rename to boards/arm/stm32ldiscovery/scripts/stm32l152rb.ld diff --git a/boards/stm32ldiscovery/scripts/stm32l152rc.ld b/boards/arm/stm32ldiscovery/scripts/stm32l152rc.ld similarity index 100% rename from boards/stm32ldiscovery/scripts/stm32l152rc.ld rename to boards/arm/stm32ldiscovery/scripts/stm32l152rc.ld diff --git a/boards/skp16c26/src/.gitignore b/boards/arm/stm32ldiscovery/src/.gitignore similarity index 100% rename from boards/skp16c26/src/.gitignore rename to boards/arm/stm32ldiscovery/src/.gitignore diff --git a/boards/stm32ldiscovery/src/Makefile b/boards/arm/stm32ldiscovery/src/Makefile similarity index 100% rename from boards/stm32ldiscovery/src/Makefile rename to boards/arm/stm32ldiscovery/src/Makefile diff --git a/boards/stm32ldiscovery/src/stm32_appinit.c b/boards/arm/stm32ldiscovery/src/stm32_appinit.c similarity index 100% rename from boards/stm32ldiscovery/src/stm32_appinit.c rename to boards/arm/stm32ldiscovery/src/stm32_appinit.c diff --git a/boards/stm32ldiscovery/src/stm32_autoleds.c b/boards/arm/stm32ldiscovery/src/stm32_autoleds.c similarity index 100% rename from boards/stm32ldiscovery/src/stm32_autoleds.c rename to boards/arm/stm32ldiscovery/src/stm32_autoleds.c diff --git a/boards/stm32ldiscovery/src/stm32_boot.c b/boards/arm/stm32ldiscovery/src/stm32_boot.c similarity index 100% rename from boards/stm32ldiscovery/src/stm32_boot.c rename to boards/arm/stm32ldiscovery/src/stm32_boot.c diff --git a/boards/stm32ldiscovery/src/stm32_bringup.c b/boards/arm/stm32ldiscovery/src/stm32_bringup.c similarity index 100% rename from boards/stm32ldiscovery/src/stm32_bringup.c rename to boards/arm/stm32ldiscovery/src/stm32_bringup.c diff --git a/boards/stm32ldiscovery/src/stm32_buttons.c b/boards/arm/stm32ldiscovery/src/stm32_buttons.c similarity index 100% rename from boards/stm32ldiscovery/src/stm32_buttons.c rename to boards/arm/stm32ldiscovery/src/stm32_buttons.c diff --git a/boards/stm32ldiscovery/src/stm32_lcd.c b/boards/arm/stm32ldiscovery/src/stm32_lcd.c similarity index 100% rename from boards/stm32ldiscovery/src/stm32_lcd.c rename to boards/arm/stm32ldiscovery/src/stm32_lcd.c diff --git a/boards/stm32ldiscovery/src/stm32_pwm.c b/boards/arm/stm32ldiscovery/src/stm32_pwm.c similarity index 100% rename from boards/stm32ldiscovery/src/stm32_pwm.c rename to boards/arm/stm32ldiscovery/src/stm32_pwm.c diff --git a/boards/stm32ldiscovery/src/stm32_qencoder.c b/boards/arm/stm32ldiscovery/src/stm32_qencoder.c similarity index 100% rename from boards/stm32ldiscovery/src/stm32_qencoder.c rename to boards/arm/stm32ldiscovery/src/stm32_qencoder.c diff --git a/boards/stm32ldiscovery/src/stm32_spi.c b/boards/arm/stm32ldiscovery/src/stm32_spi.c similarity index 100% rename from boards/stm32ldiscovery/src/stm32_spi.c rename to boards/arm/stm32ldiscovery/src/stm32_spi.c diff --git a/boards/stm32ldiscovery/src/stm32_userleds.c b/boards/arm/stm32ldiscovery/src/stm32_userleds.c similarity index 100% rename from boards/stm32ldiscovery/src/stm32_userleds.c rename to boards/arm/stm32ldiscovery/src/stm32_userleds.c diff --git a/boards/stm32ldiscovery/src/stm32ldiscovery.h b/boards/arm/stm32ldiscovery/src/stm32ldiscovery.h similarity index 98% rename from boards/stm32ldiscovery/src/stm32ldiscovery.h rename to boards/arm/stm32ldiscovery/src/stm32ldiscovery.h index 122b24ac60..103b2be414 100644 --- a/boards/stm32ldiscovery/src/stm32ldiscovery.h +++ b/boards/arm/stm32ldiscovery/src/stm32ldiscovery.h @@ -34,8 +34,8 @@ * ****************************************************************************************************/ -#ifndef __BOARDS_STM32F3DISCOVERY_SRC_STM32F3DISCOVERY_H -#define __BOARDS_STM32F3DISCOVERY_SRC_STM32F3DISCOVERY_H +#ifndef __BOARDS_ARM_STM32F3DISCOVERY_SRC_STM32F3DISCOVERY_H +#define __BOARDS_ARM_STM32F3DISCOVERY_SRC_STM32F3DISCOVERY_H /**************************************************************************************************** * Included Files @@ -290,5 +290,5 @@ int stm32_qencoder_initialize(FAR const char *devpath, int timer); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_STM32F3DISCOVERY_SRC_STM32F3DISCOVERY_H */ +#endif /* __BOARDS_ARM_STM32F3DISCOVERY_SRC_STM32F3DISCOVERY_H */ diff --git a/boards/stm32vldiscovery/Kconfig b/boards/arm/stm32vldiscovery/Kconfig similarity index 100% rename from boards/stm32vldiscovery/Kconfig rename to boards/arm/stm32vldiscovery/Kconfig diff --git a/boards/stm32vldiscovery/README.txt b/boards/arm/stm32vldiscovery/README.txt similarity index 100% rename from boards/stm32vldiscovery/README.txt rename to boards/arm/stm32vldiscovery/README.txt diff --git a/boards/stm32vldiscovery/configs/nsh/defconfig b/boards/arm/stm32vldiscovery/configs/nsh/defconfig similarity index 100% rename from boards/stm32vldiscovery/configs/nsh/defconfig rename to boards/arm/stm32vldiscovery/configs/nsh/defconfig diff --git a/boards/stm32vldiscovery/include/board.h b/boards/arm/stm32vldiscovery/include/board.h similarity index 97% rename from boards/stm32vldiscovery/include/board.h rename to boards/arm/stm32vldiscovery/include/board.h index d40f3573b1..4a8d2967f7 100644 --- a/boards/stm32vldiscovery/include/board.h +++ b/boards/arm/stm32vldiscovery/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_STM32VLDISCOVERY_INCLUDE_BOARD_H -#define __CONFIG_STM32VLDISCOVERY_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_STM32VLDISCOVERY_INCLUDE_BOARD_H +#define __BOARDS_ARM_STM32VLDISCOVERY_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -144,4 +144,4 @@ #define BUTTON_0_BIT (1 << BUTTON_0) -#endif /* __CONFIG_STM32VLDISCOVERY_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_STM32VLDISCOVERY_INCLUDE_BOARD_H */ diff --git a/boards/stm32vldiscovery/scripts/Make.defs b/boards/arm/stm32vldiscovery/scripts/Make.defs similarity index 96% rename from boards/stm32vldiscovery/scripts/Make.defs rename to boards/arm/stm32vldiscovery/scripts/Make.defs index 10fe491899..b278d6387f 100644 --- a/boards/stm32vldiscovery/scripts/Make.defs +++ b/boards/arm/stm32vldiscovery/scripts/Make.defs @@ -47,13 +47,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/stm32vldiscovery/scripts/stm32vldiscovery.ld b/boards/arm/stm32vldiscovery/scripts/stm32vldiscovery.ld similarity index 100% rename from boards/stm32vldiscovery/scripts/stm32vldiscovery.ld rename to boards/arm/stm32vldiscovery/scripts/stm32vldiscovery.ld diff --git a/boards/spresense/src/.gitignore b/boards/arm/stm32vldiscovery/src/.gitignore similarity index 100% rename from boards/spresense/src/.gitignore rename to boards/arm/stm32vldiscovery/src/.gitignore diff --git a/boards/stm32vldiscovery/src/Makefile b/boards/arm/stm32vldiscovery/src/Makefile similarity index 100% rename from boards/stm32vldiscovery/src/Makefile rename to boards/arm/stm32vldiscovery/src/Makefile diff --git a/boards/stm32vldiscovery/src/stm32_boot.c b/boards/arm/stm32vldiscovery/src/stm32_boot.c similarity index 100% rename from boards/stm32vldiscovery/src/stm32_boot.c rename to boards/arm/stm32vldiscovery/src/stm32_boot.c diff --git a/boards/stm32vldiscovery/src/stm32_buttons.c b/boards/arm/stm32vldiscovery/src/stm32_buttons.c similarity index 100% rename from boards/stm32vldiscovery/src/stm32_buttons.c rename to boards/arm/stm32vldiscovery/src/stm32_buttons.c diff --git a/boards/stm32vldiscovery/src/stm32_leds.c b/boards/arm/stm32vldiscovery/src/stm32_leds.c similarity index 100% rename from boards/stm32vldiscovery/src/stm32_leds.c rename to boards/arm/stm32vldiscovery/src/stm32_leds.c diff --git a/boards/stm32vldiscovery/src/stm32vldiscovery.h b/boards/arm/stm32vldiscovery/src/stm32vldiscovery.h similarity index 93% rename from boards/stm32vldiscovery/src/stm32vldiscovery.h rename to boards/arm/stm32vldiscovery/src/stm32vldiscovery.h index d9ee44628c..2e9d00fcd3 100644 --- a/boards/stm32vldiscovery/src/stm32vldiscovery.h +++ b/boards/arm/stm32vldiscovery/src/stm32vldiscovery.h @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_STM32VL_DISCOVERY_SRC_STM32VLDISCOVERY_H -#define __BOARDS_STM32VL_DISCOVERY_SRC_STM32VLDISCOVERY_H +#ifndef __BOARDS_ARM_STM32VL_DISCOVERY_SRC_STM32VLDISCOVERY_H +#define __BOARDS_ARM_STM32VL_DISCOVERY_SRC_STM32VLDISCOVERY_H /**************************************************************************** * Pre-processor Definitions @@ -63,4 +63,4 @@ void stm32_led_initialize(void); #endif -#endif /* __BOARDS_STM32VL_DISCOVERY_SRC_STM32VLDISCOVERY_H */ +#endif /* __BOARDS_ARM_STM32VL_DISCOVERY_SRC_STM32VLDISCOVERY_H */ diff --git a/boards/teensy-3.x/Kconfig b/boards/arm/teensy-3.x/Kconfig similarity index 100% rename from boards/teensy-3.x/Kconfig rename to boards/arm/teensy-3.x/Kconfig diff --git a/boards/teensy-3.x/README.txt b/boards/arm/teensy-3.x/README.txt similarity index 100% rename from boards/teensy-3.x/README.txt rename to boards/arm/teensy-3.x/README.txt diff --git a/boards/teensy-3.x/configs/nsh/defconfig b/boards/arm/teensy-3.x/configs/nsh/defconfig similarity index 100% rename from boards/teensy-3.x/configs/nsh/defconfig rename to boards/arm/teensy-3.x/configs/nsh/defconfig diff --git a/boards/teensy-3.x/configs/usbnsh/defconfig b/boards/arm/teensy-3.x/configs/usbnsh/defconfig similarity index 100% rename from boards/teensy-3.x/configs/usbnsh/defconfig rename to boards/arm/teensy-3.x/configs/usbnsh/defconfig diff --git a/boards/teensy-3.x/include/board.h b/boards/arm/teensy-3.x/include/board.h similarity index 98% rename from boards/teensy-3.x/include/board.h rename to boards/arm/teensy-3.x/include/board.h index 393673590b..79f5987d84 100644 --- a/boards/teensy-3.x/include/board.h +++ b/boards/arm/teensy-3.x/include/board.h @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_TEENSY_3X_INCLUDE_BOARD_H -#define __BOARDS_TEENSY_3X_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_TEENSY_3X_INCLUDE_BOARD_H +#define __BOARDS_ARM_TEENSY_3X_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -296,4 +296,4 @@ #endif #endif -#endif /* __BOARDS_TEENSY_3X_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_TEENSY_3X_INCLUDE_BOARD_H */ diff --git a/boards/teensy-3.x/scripts/Make.defs b/boards/arm/teensy-3.x/scripts/Make.defs similarity index 97% rename from boards/teensy-3.x/scripts/Make.defs rename to boards/arm/teensy-3.x/scripts/Make.defs index 50d5f6a4cc..78b0bcee8b 100644 --- a/boards/teensy-3.x/scripts/Make.defs +++ b/boards/arm/teensy-3.x/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/teensy-3.x/scripts/mk20dx128vlh5.ld b/boards/arm/teensy-3.x/scripts/mk20dx128vlh5.ld similarity index 100% rename from boards/teensy-3.x/scripts/mk20dx128vlh5.ld rename to boards/arm/teensy-3.x/scripts/mk20dx128vlh5.ld diff --git a/boards/teensy-3.x/scripts/mk20dx256vlh7.ld b/boards/arm/teensy-3.x/scripts/mk20dx256vlh7.ld similarity index 100% rename from boards/teensy-3.x/scripts/mk20dx256vlh7.ld rename to boards/arm/teensy-3.x/scripts/mk20dx256vlh7.ld diff --git a/boards/stm3210e-eval/src/.gitignore b/boards/arm/teensy-3.x/src/.gitignore similarity index 100% rename from boards/stm3210e-eval/src/.gitignore rename to boards/arm/teensy-3.x/src/.gitignore diff --git a/boards/teensy-3.x/src/Makefile b/boards/arm/teensy-3.x/src/Makefile similarity index 100% rename from boards/teensy-3.x/src/Makefile rename to boards/arm/teensy-3.x/src/Makefile diff --git a/boards/teensy-3.x/src/k20_appinit.c b/boards/arm/teensy-3.x/src/k20_appinit.c similarity index 100% rename from boards/teensy-3.x/src/k20_appinit.c rename to boards/arm/teensy-3.x/src/k20_appinit.c diff --git a/boards/teensy-3.x/src/k20_autoleds.c b/boards/arm/teensy-3.x/src/k20_autoleds.c similarity index 100% rename from boards/teensy-3.x/src/k20_autoleds.c rename to boards/arm/teensy-3.x/src/k20_autoleds.c diff --git a/boards/teensy-3.x/src/k20_boot.c b/boards/arm/teensy-3.x/src/k20_boot.c similarity index 100% rename from boards/teensy-3.x/src/k20_boot.c rename to boards/arm/teensy-3.x/src/k20_boot.c diff --git a/boards/teensy-3.x/src/k20_i2c.c b/boards/arm/teensy-3.x/src/k20_i2c.c similarity index 100% rename from boards/teensy-3.x/src/k20_i2c.c rename to boards/arm/teensy-3.x/src/k20_i2c.c diff --git a/boards/teensy-3.x/src/k20_pwm.c b/boards/arm/teensy-3.x/src/k20_pwm.c similarity index 100% rename from boards/teensy-3.x/src/k20_pwm.c rename to boards/arm/teensy-3.x/src/k20_pwm.c diff --git a/boards/teensy-3.x/src/k20_spi.c b/boards/arm/teensy-3.x/src/k20_spi.c similarity index 100% rename from boards/teensy-3.x/src/k20_spi.c rename to boards/arm/teensy-3.x/src/k20_spi.c diff --git a/boards/teensy-3.x/src/k20_usbdev.c b/boards/arm/teensy-3.x/src/k20_usbdev.c similarity index 100% rename from boards/teensy-3.x/src/k20_usbdev.c rename to boards/arm/teensy-3.x/src/k20_usbdev.c diff --git a/boards/teensy-3.x/src/k20_userleds.c b/boards/arm/teensy-3.x/src/k20_userleds.c similarity index 100% rename from boards/teensy-3.x/src/k20_userleds.c rename to boards/arm/teensy-3.x/src/k20_userleds.c diff --git a/boards/teensy-3.x/src/teensy-3x.h b/boards/arm/teensy-3.x/src/teensy-3x.h similarity index 97% rename from boards/teensy-3.x/src/teensy-3x.h rename to boards/arm/teensy-3.x/src/teensy-3x.h index 33e0fa3734..ea61591128 100644 --- a/boards/teensy-3.x/src/teensy-3x.h +++ b/boards/arm/teensy-3.x/src/teensy-3x.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_TEENSY_3X_SRC_TEENSY_3X_H -#define __BOARDS_TEENSY_3X_SRC_TEENSY_3X_H +#ifndef __BOARDS_ARM_TEENSY_3X_SRC_TEENSY_3X_H +#define __BOARDS_ARM_TEENSY_3X_SRC_TEENSY_3X_H /************************************************************************************ * Included Files @@ -128,5 +128,5 @@ int kinetis_pwm_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_TEENSY_3X_SRC_TEENSY_3X_H */ +#endif /* __BOARDS_ARM_TEENSY_3X_SRC_TEENSY_3X_H */ diff --git a/boards/teensy-lc/Kconfig b/boards/arm/teensy-lc/Kconfig similarity index 100% rename from boards/teensy-lc/Kconfig rename to boards/arm/teensy-lc/Kconfig diff --git a/boards/teensy-lc/README.txt b/boards/arm/teensy-lc/README.txt similarity index 100% rename from boards/teensy-lc/README.txt rename to boards/arm/teensy-lc/README.txt diff --git a/boards/teensy-lc/configs/nsh/defconfig b/boards/arm/teensy-lc/configs/nsh/defconfig similarity index 100% rename from boards/teensy-lc/configs/nsh/defconfig rename to boards/arm/teensy-lc/configs/nsh/defconfig diff --git a/boards/teensy-lc/include/board.h b/boards/arm/teensy-lc/include/board.h similarity index 100% rename from boards/teensy-lc/include/board.h rename to boards/arm/teensy-lc/include/board.h diff --git a/boards/teensy-lc/scripts/Make.defs b/boards/arm/teensy-lc/scripts/Make.defs similarity index 97% rename from boards/teensy-lc/scripts/Make.defs rename to boards/arm/teensy-lc/scripts/Make.defs index 9bb2d6e849..078f03e12b 100644 --- a/boards/teensy-lc/scripts/Make.defs +++ b/boards/arm/teensy-lc/scripts/Make.defs @@ -43,12 +43,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/teensy-lc/scripts/teensy-lc.ld b/boards/arm/teensy-lc/scripts/teensy-lc.ld similarity index 100% rename from boards/teensy-lc/scripts/teensy-lc.ld rename to boards/arm/teensy-lc/scripts/teensy-lc.ld diff --git a/boards/stm3220g-eval/src/.gitignore b/boards/arm/teensy-lc/src/.gitignore similarity index 100% rename from boards/stm3220g-eval/src/.gitignore rename to boards/arm/teensy-lc/src/.gitignore diff --git a/boards/teensy-lc/src/Makefile b/boards/arm/teensy-lc/src/Makefile similarity index 100% rename from boards/teensy-lc/src/Makefile rename to boards/arm/teensy-lc/src/Makefile diff --git a/boards/teensy-lc/src/kl_appinit.c b/boards/arm/teensy-lc/src/kl_appinit.c similarity index 100% rename from boards/teensy-lc/src/kl_appinit.c rename to boards/arm/teensy-lc/src/kl_appinit.c diff --git a/boards/teensy-lc/src/kl_boardinitialize.c b/boards/arm/teensy-lc/src/kl_boardinitialize.c similarity index 100% rename from boards/teensy-lc/src/kl_boardinitialize.c rename to boards/arm/teensy-lc/src/kl_boardinitialize.c diff --git a/boards/teensy-lc/src/kl_led.c b/boards/arm/teensy-lc/src/kl_led.c similarity index 100% rename from boards/teensy-lc/src/kl_led.c rename to boards/arm/teensy-lc/src/kl_led.c diff --git a/boards/teensy-lc/src/kl_pwm.c b/boards/arm/teensy-lc/src/kl_pwm.c similarity index 100% rename from boards/teensy-lc/src/kl_pwm.c rename to boards/arm/teensy-lc/src/kl_pwm.c diff --git a/boards/teensy-lc/src/kl_spi.c b/boards/arm/teensy-lc/src/kl_spi.c similarity index 100% rename from boards/teensy-lc/src/kl_spi.c rename to boards/arm/teensy-lc/src/kl_spi.c diff --git a/boards/teensy-lc/src/teensy-lc.h b/boards/arm/teensy-lc/src/teensy-lc.h similarity index 96% rename from boards/teensy-lc/src/teensy-lc.h rename to boards/arm/teensy-lc/src/teensy-lc.h index 92b1843cc4..52fd26439c 100644 --- a/boards/teensy-lc/src/teensy-lc.h +++ b/boards/arm/teensy-lc/src/teensy-lc.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_TEENSY_LC_SRC_TEENSY_LC_H -#define __BOARDS_TEENSY_LC_SRC_TEENSY_LC_H +#ifndef __BOARDS_ARM_TEENSY_LC_SRC_TEENSY_LC_H +#define __BOARDS_ARM_TEENSY_LC_SRC_TEENSY_LC_H /**************************************************************************** * Included Files @@ -104,5 +104,5 @@ void kl_led_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_TEENSY_LC_SRC_TEENSY_LC_H */ +#endif /* __BOARDS_ARM_TEENSY_LC_SRC_TEENSY_LC_H */ diff --git a/boards/tm4c123g-launchpad/Kconfig b/boards/arm/tm4c123g-launchpad/Kconfig similarity index 100% rename from boards/tm4c123g-launchpad/Kconfig rename to boards/arm/tm4c123g-launchpad/Kconfig diff --git a/boards/tm4c123g-launchpad/README.txt b/boards/arm/tm4c123g-launchpad/README.txt similarity index 100% rename from boards/tm4c123g-launchpad/README.txt rename to boards/arm/tm4c123g-launchpad/README.txt diff --git a/boards/tm4c123g-launchpad/configs/nsh/defconfig b/boards/arm/tm4c123g-launchpad/configs/nsh/defconfig similarity index 100% rename from boards/tm4c123g-launchpad/configs/nsh/defconfig rename to boards/arm/tm4c123g-launchpad/configs/nsh/defconfig diff --git a/boards/tm4c123g-launchpad/include/board.h b/boards/arm/tm4c123g-launchpad/include/board.h similarity index 97% rename from boards/tm4c123g-launchpad/include/board.h rename to boards/arm/tm4c123g-launchpad/include/board.h index 3eb783d266..028f4e457f 100644 --- a/boards/tm4c123g-launchpad/include/board.h +++ b/boards/arm/tm4c123g-launchpad/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_TMC4C123G_LAUNCHPAD_INCLUDE_BOARD_H -#define __BOARDS_TMC4C123G_LAUNCHPAD_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_TMC4C123G_LAUNCHPAD_INCLUDE_BOARD_H +#define __BOARDS_ARM_TMC4C123G_LAUNCHPAD_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -191,4 +191,4 @@ #define GPIO_UART1_RX GPIO_UART1_RX_1 #define GPIO_UART1_TX GPIO_UART1_TX_1 -#endif /* __BOARDS_TMC4C123G_LAUNCHPAD_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_TMC4C123G_LAUNCHPAD_INCLUDE_BOARD_H */ diff --git a/boards/tm4c123g-launchpad/scripts/Make.defs b/boards/arm/tm4c123g-launchpad/scripts/Make.defs similarity index 96% rename from boards/tm4c123g-launchpad/scripts/Make.defs rename to boards/arm/tm4c123g-launchpad/scripts/Make.defs index 9e3c600dd9..35d9df3a0a 100644 --- a/boards/tm4c123g-launchpad/scripts/Make.defs +++ b/boards/arm/tm4c123g-launchpad/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/tm4c123g-launchpad.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/tm4c123g-launchpad.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/tm4c123g-launchpad.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/tm4c123g-launchpad.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/tm4c123g-launchpad/scripts/tm4c123g-launchpad.ld b/boards/arm/tm4c123g-launchpad/scripts/tm4c123g-launchpad.ld similarity index 100% rename from boards/tm4c123g-launchpad/scripts/tm4c123g-launchpad.ld rename to boards/arm/tm4c123g-launchpad/scripts/tm4c123g-launchpad.ld diff --git a/boards/stm3240g-eval/src/.gitignore b/boards/arm/tm4c123g-launchpad/src/.gitignore similarity index 100% rename from boards/stm3240g-eval/src/.gitignore rename to boards/arm/tm4c123g-launchpad/src/.gitignore diff --git a/boards/tm4c123g-launchpad/src/Makefile b/boards/arm/tm4c123g-launchpad/src/Makefile similarity index 100% rename from boards/tm4c123g-launchpad/src/Makefile rename to boards/arm/tm4c123g-launchpad/src/Makefile diff --git a/boards/tm4c123g-launchpad/src/tm4c123g-launchpad.h b/boards/arm/tm4c123g-launchpad/src/tm4c123g-launchpad.h similarity index 97% rename from boards/tm4c123g-launchpad/src/tm4c123g-launchpad.h rename to boards/arm/tm4c123g-launchpad/src/tm4c123g-launchpad.h index 17c304a897..f474392fcb 100644 --- a/boards/tm4c123g-launchpad/src/tm4c123g-launchpad.h +++ b/boards/arm/tm4c123g-launchpad/src/tm4c123g-launchpad.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_TM4C123G_LAUNCHPAD_TM4C123G_LAUNCHPAD_H -#define __BOARDS_TM4C123G_LAUNCHPAD_TM4C123G_LAUNCHPAD_H +#ifndef __BOARDS_ARM_TM4C123G_LAUNCHPAD_TM4C123G_LAUNCHPAD_H +#define __BOARDS_ARM_TM4C123G_LAUNCHPAD_TM4C123G_LAUNCHPAD_H /************************************************************************************ * Included Files @@ -250,4 +250,4 @@ int tiva_timer_configure(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_TM4C123G_LAUNCHPAD_TM4C123G_LAUNCHPAD_H */ +#endif /* __BOARDS_ARM_TM4C123G_LAUNCHPAD_TM4C123G_LAUNCHPAD_H */ diff --git a/boards/tm4c123g-launchpad/src/tm4c_adc.c b/boards/arm/tm4c123g-launchpad/src/tm4c_adc.c similarity index 100% rename from boards/tm4c123g-launchpad/src/tm4c_adc.c rename to boards/arm/tm4c123g-launchpad/src/tm4c_adc.c diff --git a/boards/tm4c123g-launchpad/src/tm4c_appinit.c b/boards/arm/tm4c123g-launchpad/src/tm4c_appinit.c similarity index 100% rename from boards/tm4c123g-launchpad/src/tm4c_appinit.c rename to boards/arm/tm4c123g-launchpad/src/tm4c_appinit.c diff --git a/boards/tm4c123g-launchpad/src/tm4c_at24.c b/boards/arm/tm4c123g-launchpad/src/tm4c_at24.c similarity index 100% rename from boards/tm4c123g-launchpad/src/tm4c_at24.c rename to boards/arm/tm4c123g-launchpad/src/tm4c_at24.c diff --git a/boards/tm4c123g-launchpad/src/tm4c_autoleds.c b/boards/arm/tm4c123g-launchpad/src/tm4c_autoleds.c similarity index 100% rename from boards/tm4c123g-launchpad/src/tm4c_autoleds.c rename to boards/arm/tm4c123g-launchpad/src/tm4c_autoleds.c diff --git a/boards/tm4c123g-launchpad/src/tm4c_boot.c b/boards/arm/tm4c123g-launchpad/src/tm4c_boot.c similarity index 100% rename from boards/tm4c123g-launchpad/src/tm4c_boot.c rename to boards/arm/tm4c123g-launchpad/src/tm4c_boot.c diff --git a/boards/tm4c123g-launchpad/src/tm4c_bringup.c b/boards/arm/tm4c123g-launchpad/src/tm4c_bringup.c similarity index 100% rename from boards/tm4c123g-launchpad/src/tm4c_bringup.c rename to boards/arm/tm4c123g-launchpad/src/tm4c_bringup.c diff --git a/boards/tm4c123g-launchpad/src/tm4c_buttons.c b/boards/arm/tm4c123g-launchpad/src/tm4c_buttons.c similarity index 100% rename from boards/tm4c123g-launchpad/src/tm4c_buttons.c rename to boards/arm/tm4c123g-launchpad/src/tm4c_buttons.c diff --git a/boards/tm4c123g-launchpad/src/tm4c_ssi.c b/boards/arm/tm4c123g-launchpad/src/tm4c_ssi.c similarity index 100% rename from boards/tm4c123g-launchpad/src/tm4c_ssi.c rename to boards/arm/tm4c123g-launchpad/src/tm4c_ssi.c diff --git a/boards/tm4c123g-launchpad/src/tm4c_timer.c b/boards/arm/tm4c123g-launchpad/src/tm4c_timer.c similarity index 100% rename from boards/tm4c123g-launchpad/src/tm4c_timer.c rename to boards/arm/tm4c123g-launchpad/src/tm4c_timer.c diff --git a/boards/tm4c123g-launchpad/tools/oocd.sh b/boards/arm/tm4c123g-launchpad/tools/oocd.sh similarity index 100% rename from boards/tm4c123g-launchpad/tools/oocd.sh rename to boards/arm/tm4c123g-launchpad/tools/oocd.sh diff --git a/boards/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg b/boards/arm/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg similarity index 100% rename from boards/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg rename to boards/arm/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg diff --git a/boards/tm4c1294-launchpad/Kconfig b/boards/arm/tm4c1294-launchpad/Kconfig similarity index 100% rename from boards/tm4c1294-launchpad/Kconfig rename to boards/arm/tm4c1294-launchpad/Kconfig diff --git a/boards/tm4c1294-launchpad/README.txt b/boards/arm/tm4c1294-launchpad/README.txt similarity index 100% rename from boards/tm4c1294-launchpad/README.txt rename to boards/arm/tm4c1294-launchpad/README.txt diff --git a/boards/tm4c1294-launchpad/configs/ipv6/defconfig b/boards/arm/tm4c1294-launchpad/configs/ipv6/defconfig similarity index 100% rename from boards/tm4c1294-launchpad/configs/ipv6/defconfig rename to boards/arm/tm4c1294-launchpad/configs/ipv6/defconfig diff --git a/boards/tm4c1294-launchpad/configs/nsh/defconfig b/boards/arm/tm4c1294-launchpad/configs/nsh/defconfig similarity index 100% rename from boards/tm4c1294-launchpad/configs/nsh/defconfig rename to boards/arm/tm4c1294-launchpad/configs/nsh/defconfig diff --git a/boards/tm4c1294-launchpad/include/board.h b/boards/arm/tm4c1294-launchpad/include/board.h similarity index 97% rename from boards/tm4c1294-launchpad/include/board.h rename to boards/arm/tm4c1294-launchpad/include/board.h index 80927ed020..b144ff0ce1 100644 --- a/boards/tm4c1294-launchpad/include/board.h +++ b/boards/arm/tm4c1294-launchpad/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_TM4C1294_LAUNCHPAD_INCLUDE_BOARD_H -#define __BOARDS_TM4C1294_LAUNCHPAD_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_TM4C1294_LAUNCHPAD_INCLUDE_BOARD_H +#define __BOARDS_ARM_TM4C1294_LAUNCHPAD_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -210,4 +210,4 @@ #define UART7_GPIO_RTS (GPIO_FUNC_OUTPUT | GPIO_PORTG | GPIO_PIN_0) #define UART7_GPIO_CTS (GPIO_FUNC_INPUT | GPIO_PORTL | GPIO_PIN_4) -#endif /* __BOARDS_TM4C1294_LAUNCHPAD_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_TM4C1294_LAUNCHPAD_INCLUDE_BOARD_H */ diff --git a/boards/tm4c1294-launchpad/scripts/Make.defs b/boards/arm/tm4c1294-launchpad/scripts/Make.defs similarity index 96% rename from boards/tm4c1294-launchpad/scripts/Make.defs rename to boards/arm/tm4c1294-launchpad/scripts/Make.defs index 3ce237f4aa..ad51c31ea4 100644 --- a/boards/tm4c1294-launchpad/scripts/Make.defs +++ b/boards/arm/tm4c1294-launchpad/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/tm4c1294-launchpad/scripts/ld.script b/boards/arm/tm4c1294-launchpad/scripts/ld.script similarity index 100% rename from boards/tm4c1294-launchpad/scripts/ld.script rename to boards/arm/tm4c1294-launchpad/scripts/ld.script diff --git a/boards/stm32_tiny/src/.gitignore b/boards/arm/tm4c1294-launchpad/src/.gitignore similarity index 100% rename from boards/stm32_tiny/src/.gitignore rename to boards/arm/tm4c1294-launchpad/src/.gitignore diff --git a/boards/tm4c1294-launchpad/src/Makefile b/boards/arm/tm4c1294-launchpad/src/Makefile similarity index 100% rename from boards/tm4c1294-launchpad/src/Makefile rename to boards/arm/tm4c1294-launchpad/src/Makefile diff --git a/boards/tm4c1294-launchpad/src/tm4c1294-launchpad.h b/boards/arm/tm4c1294-launchpad/src/tm4c1294-launchpad.h similarity index 97% rename from boards/tm4c1294-launchpad/src/tm4c1294-launchpad.h rename to boards/arm/tm4c1294-launchpad/src/tm4c1294-launchpad.h index b7a852ab68..c8d4daa8f0 100644 --- a/boards/tm4c1294-launchpad/src/tm4c1294-launchpad.h +++ b/boards/arm/tm4c1294-launchpad/src/tm4c1294-launchpad.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_TM4C1294_LAUNCHPAD_TM4C1294_LAUNCHPAD_H -#define __BOARDS_TM4C1294_LAUNCHPAD_TM4C1294_LAUNCHPAD_H +#ifndef __BOARDS_ARM_TM4C1294_LAUNCHPAD_TM4C1294_LAUNCHPAD_H +#define __BOARDS_ARM_TM4C1294_LAUNCHPAD_TM4C1294_LAUNCHPAD_H /************************************************************************************ * Included Files @@ -239,4 +239,4 @@ int hciuart_dev_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_TM4C1294_LAUNCHPAD_TM4C1294_LAUNCHPAD_H */ +#endif /* __BOARDS_ARM_TM4C1294_LAUNCHPAD_TM4C1294_LAUNCHPAD_H */ diff --git a/boards/tm4c1294-launchpad/src/tm4c_appinit.c b/boards/arm/tm4c1294-launchpad/src/tm4c_appinit.c similarity index 100% rename from boards/tm4c1294-launchpad/src/tm4c_appinit.c rename to boards/arm/tm4c1294-launchpad/src/tm4c_appinit.c diff --git a/boards/tm4c1294-launchpad/src/tm4c_autoleds.c b/boards/arm/tm4c1294-launchpad/src/tm4c_autoleds.c similarity index 100% rename from boards/tm4c1294-launchpad/src/tm4c_autoleds.c rename to boards/arm/tm4c1294-launchpad/src/tm4c_autoleds.c diff --git a/boards/tm4c1294-launchpad/src/tm4c_boot.c b/boards/arm/tm4c1294-launchpad/src/tm4c_boot.c similarity index 100% rename from boards/tm4c1294-launchpad/src/tm4c_boot.c rename to boards/arm/tm4c1294-launchpad/src/tm4c_boot.c diff --git a/boards/tm4c1294-launchpad/src/tm4c_bringup.c b/boards/arm/tm4c1294-launchpad/src/tm4c_bringup.c similarity index 100% rename from boards/tm4c1294-launchpad/src/tm4c_bringup.c rename to boards/arm/tm4c1294-launchpad/src/tm4c_bringup.c diff --git a/boards/tm4c1294-launchpad/src/tm4c_buttons.c b/boards/arm/tm4c1294-launchpad/src/tm4c_buttons.c similarity index 100% rename from boards/tm4c1294-launchpad/src/tm4c_buttons.c rename to boards/arm/tm4c1294-launchpad/src/tm4c_buttons.c diff --git a/boards/tm4c1294-launchpad/src/tm4c_ethernet.c b/boards/arm/tm4c1294-launchpad/src/tm4c_ethernet.c similarity index 100% rename from boards/tm4c1294-launchpad/src/tm4c_ethernet.c rename to boards/arm/tm4c1294-launchpad/src/tm4c_ethernet.c diff --git a/boards/tm4c1294-launchpad/src/tm4c_hciuart.c b/boards/arm/tm4c1294-launchpad/src/tm4c_hciuart.c similarity index 100% rename from boards/tm4c1294-launchpad/src/tm4c_hciuart.c rename to boards/arm/tm4c1294-launchpad/src/tm4c_hciuart.c diff --git a/boards/tm4c1294-launchpad/src/tm4c_timer.c b/boards/arm/tm4c1294-launchpad/src/tm4c_timer.c similarity index 100% rename from boards/tm4c1294-launchpad/src/tm4c_timer.c rename to boards/arm/tm4c1294-launchpad/src/tm4c_timer.c diff --git a/boards/tm4c1294-launchpad/src/tm4c_userleds.c b/boards/arm/tm4c1294-launchpad/src/tm4c_userleds.c similarity index 100% rename from boards/tm4c1294-launchpad/src/tm4c_userleds.c rename to boards/arm/tm4c1294-launchpad/src/tm4c_userleds.c diff --git a/boards/tm4c1294-launchpad/tools/ek-tm4c1294xl.cfg b/boards/arm/tm4c1294-launchpad/tools/ek-tm4c1294xl.cfg similarity index 100% rename from boards/tm4c1294-launchpad/tools/ek-tm4c1294xl.cfg rename to boards/arm/tm4c1294-launchpad/tools/ek-tm4c1294xl.cfg diff --git a/boards/tm4c1294-launchpad/tools/oocd.sh b/boards/arm/tm4c1294-launchpad/tools/oocd.sh similarity index 100% rename from boards/tm4c1294-launchpad/tools/oocd.sh rename to boards/arm/tm4c1294-launchpad/tools/oocd.sh diff --git a/boards/tms570ls31x-usb-kit/Kconfig b/boards/arm/tms570ls31x-usb-kit/Kconfig similarity index 100% rename from boards/tms570ls31x-usb-kit/Kconfig rename to boards/arm/tms570ls31x-usb-kit/Kconfig diff --git a/boards/tms570ls31x-usb-kit/README.txt b/boards/arm/tms570ls31x-usb-kit/README.txt similarity index 100% rename from boards/tms570ls31x-usb-kit/README.txt rename to boards/arm/tms570ls31x-usb-kit/README.txt diff --git a/boards/tms570ls31x-usb-kit/configs/nsh/defconfig b/boards/arm/tms570ls31x-usb-kit/configs/nsh/defconfig similarity index 100% rename from boards/tms570ls31x-usb-kit/configs/nsh/defconfig rename to boards/arm/tms570ls31x-usb-kit/configs/nsh/defconfig diff --git a/boards/tms570ls31x-usb-kit/include/board.h b/boards/arm/tms570ls31x-usb-kit/include/board.h similarity index 98% rename from boards/tms570ls31x-usb-kit/include/board.h rename to boards/arm/tms570ls31x-usb-kit/include/board.h index e43af3d518..00e741ae6e 100644 --- a/boards/tms570ls31x-usb-kit/include/board.h +++ b/boards/arm/tms570ls31x-usb-kit/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_TMX570LS31X_USB_KIT_INCLUDE_BOARD_H -#define __BOARDS_TMX570LS31X_USB_KIT_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_TMX570LS31X_USB_KIT_INCLUDE_BOARD_H +#define __BOARDS_ARM_TMX570LS31X_USB_KIT_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -287,4 +287,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_LAUNCHXL_TMS57004_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_LAUNCHXL_TMS57004_INCLUDE_BOARD_H */ diff --git a/boards/tms570ls31x-usb-kit/include/nsh_romfsimg.h b/boards/arm/tms570ls31x-usb-kit/include/nsh_romfsimg.h similarity index 100% rename from boards/tms570ls31x-usb-kit/include/nsh_romfsimg.h rename to boards/arm/tms570ls31x-usb-kit/include/nsh_romfsimg.h diff --git a/boards/tms570ls31x-usb-kit/scripts/Make.defs b/boards/arm/tms570ls31x-usb-kit/scripts/Make.defs similarity index 93% rename from boards/tms570ls31x-usb-kit/scripts/Make.defs rename to boards/arm/tms570ls31x-usb-kit/scripts/Make.defs index a2d910552c..6bb6825b3f 100644 --- a/boards/tms570ls31x-usb-kit/scripts/Make.defs +++ b/boards/arm/tms570ls31x-usb-kit/scripts/Make.defs @@ -43,12 +43,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx - ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) endif CC = $(CROSSDEV)gcc @@ -96,9 +96,9 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/tms570ls31x-usb-kit/scripts/flash-sram.ld b/boards/arm/tms570ls31x-usb-kit/scripts/flash-sram.ld similarity index 100% rename from boards/tms570ls31x-usb-kit/scripts/flash-sram.ld rename to boards/arm/tms570ls31x-usb-kit/scripts/flash-sram.ld diff --git a/boards/tms570ls31x-usb-kit/src/Makefile b/boards/arm/tms570ls31x-usb-kit/src/Makefile similarity index 100% rename from boards/tms570ls31x-usb-kit/src/Makefile rename to boards/arm/tms570ls31x-usb-kit/src/Makefile diff --git a/boards/tms570ls31x-usb-kit/src/tms570_appinit.c b/boards/arm/tms570ls31x-usb-kit/src/tms570_appinit.c similarity index 100% rename from boards/tms570ls31x-usb-kit/src/tms570_appinit.c rename to boards/arm/tms570ls31x-usb-kit/src/tms570_appinit.c diff --git a/boards/tms570ls31x-usb-kit/src/tms570_autoleds.c b/boards/arm/tms570ls31x-usb-kit/src/tms570_autoleds.c similarity index 100% rename from boards/tms570ls31x-usb-kit/src/tms570_autoleds.c rename to boards/arm/tms570ls31x-usb-kit/src/tms570_autoleds.c diff --git a/boards/tms570ls31x-usb-kit/src/tms570_bringup.c b/boards/arm/tms570ls31x-usb-kit/src/tms570_bringup.c similarity index 100% rename from boards/tms570ls31x-usb-kit/src/tms570_bringup.c rename to boards/arm/tms570ls31x-usb-kit/src/tms570_bringup.c diff --git a/boards/tms570ls31x-usb-kit/src/tms570_buttons.c b/boards/arm/tms570ls31x-usb-kit/src/tms570_buttons.c similarity index 100% rename from boards/tms570ls31x-usb-kit/src/tms570_buttons.c rename to boards/arm/tms570ls31x-usb-kit/src/tms570_buttons.c diff --git a/boards/tms570ls31x-usb-kit/src/tms570_initialize.c b/boards/arm/tms570ls31x-usb-kit/src/tms570_initialize.c similarity index 100% rename from boards/tms570ls31x-usb-kit/src/tms570_initialize.c rename to boards/arm/tms570ls31x-usb-kit/src/tms570_initialize.c diff --git a/boards/tms570ls31x-usb-kit/src/tms570_sdmmc.c b/boards/arm/tms570ls31x-usb-kit/src/tms570_sdmmc.c similarity index 100% rename from boards/tms570ls31x-usb-kit/src/tms570_sdmmc.c rename to boards/arm/tms570ls31x-usb-kit/src/tms570_sdmmc.c diff --git a/boards/tms570ls31x-usb-kit/src/tms570_spi.c b/boards/arm/tms570ls31x-usb-kit/src/tms570_spi.c similarity index 100% rename from boards/tms570ls31x-usb-kit/src/tms570_spi.c rename to boards/arm/tms570ls31x-usb-kit/src/tms570_spi.c diff --git a/boards/tms570ls31x-usb-kit/src/tms570_userleds.c b/boards/arm/tms570ls31x-usb-kit/src/tms570_userleds.c similarity index 100% rename from boards/tms570ls31x-usb-kit/src/tms570_userleds.c rename to boards/arm/tms570ls31x-usb-kit/src/tms570_userleds.c diff --git a/boards/tms570ls31x-usb-kit/src/tms570ls31x_usb_kit.h b/boards/arm/tms570ls31x-usb-kit/src/tms570ls31x_usb_kit.h similarity index 95% rename from boards/tms570ls31x-usb-kit/src/tms570ls31x_usb_kit.h rename to boards/arm/tms570ls31x-usb-kit/src/tms570ls31x_usb_kit.h index 3d27f5f5e0..7eecdf46d6 100644 --- a/boards/tms570ls31x-usb-kit/src/tms570ls31x_usb_kit.h +++ b/boards/arm/tms570ls31x-usb-kit/src/tms570ls31x_usb_kit.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_LAUNCHXL_TMS57004_SRC_LAUNCHXL_TMS57004_H -#define __BOARDS_LAUNCHXL_TMS57004_SRC_LAUNCHXL_TMS57004_H +#ifndef __BOARDS_ARM_LAUNCHXL_TMS57004_SRC_LAUNCHXL_TMS57004_H +#define __BOARDS_ARM_LAUNCHXL_TMS57004_SRC_LAUNCHXL_TMS57004_H /**************************************************************************** * Included Files @@ -107,4 +107,4 @@ int tms570_bringup(void); int tms570_mmcsd_initialize(int minor); #endif -#endif /* __BOARDS_LAUNCHXL_TMS57004_SRC_LAUNCHXL_TMS57004_H */ +#endif /* __BOARDS_ARM_LAUNCHXL_TMS57004_SRC_LAUNCHXL_TMS57004_H */ diff --git a/boards/twr-k60n512/Kconfig b/boards/arm/twr-k60n512/Kconfig similarity index 100% rename from boards/twr-k60n512/Kconfig rename to boards/arm/twr-k60n512/Kconfig diff --git a/boards/twr-k60n512/README.txt b/boards/arm/twr-k60n512/README.txt similarity index 100% rename from boards/twr-k60n512/README.txt rename to boards/arm/twr-k60n512/README.txt diff --git a/boards/twr-k60n512/configs/nsh/defconfig b/boards/arm/twr-k60n512/configs/nsh/defconfig similarity index 100% rename from boards/twr-k60n512/configs/nsh/defconfig rename to boards/arm/twr-k60n512/configs/nsh/defconfig diff --git a/boards/twr-k60n512/include/board.h b/boards/arm/twr-k60n512/include/board.h similarity index 100% rename from boards/twr-k60n512/include/board.h rename to boards/arm/twr-k60n512/include/board.h diff --git a/boards/twr-k60n512/scripts/Make.defs b/boards/arm/twr-k60n512/scripts/Make.defs similarity index 96% rename from boards/twr-k60n512/scripts/Make.defs rename to boards/arm/twr-k60n512/scripts/Make.defs index c3f22c728c..1351011c6c 100644 --- a/boards/twr-k60n512/scripts/Make.defs +++ b/boards/arm/twr-k60n512/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/twr-k60n512.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/twr-k60n512.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/twr-k60n512.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/twr-k60n512.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/twr-k60n512/scripts/twr-k60n512.ld b/boards/arm/twr-k60n512/scripts/twr-k60n512.ld similarity index 100% rename from boards/twr-k60n512/scripts/twr-k60n512.ld rename to boards/arm/twr-k60n512/scripts/twr-k60n512.ld diff --git a/boards/stm32f051-discovery/src/.gitignore b/boards/arm/twr-k60n512/src/.gitignore similarity index 100% rename from boards/stm32f051-discovery/src/.gitignore rename to boards/arm/twr-k60n512/src/.gitignore diff --git a/boards/twr-k60n512/src/Makefile b/boards/arm/twr-k60n512/src/Makefile similarity index 100% rename from boards/twr-k60n512/src/Makefile rename to boards/arm/twr-k60n512/src/Makefile diff --git a/boards/twr-k60n512/src/k60_appinit.c b/boards/arm/twr-k60n512/src/k60_appinit.c similarity index 100% rename from boards/twr-k60n512/src/k60_appinit.c rename to boards/arm/twr-k60n512/src/k60_appinit.c diff --git a/boards/twr-k60n512/src/k60_boot.c b/boards/arm/twr-k60n512/src/k60_boot.c similarity index 100% rename from boards/twr-k60n512/src/k60_boot.c rename to boards/arm/twr-k60n512/src/k60_boot.c diff --git a/boards/twr-k60n512/src/k60_buttons.c b/boards/arm/twr-k60n512/src/k60_buttons.c similarity index 100% rename from boards/twr-k60n512/src/k60_buttons.c rename to boards/arm/twr-k60n512/src/k60_buttons.c diff --git a/boards/twr-k60n512/src/k60_leds.c b/boards/arm/twr-k60n512/src/k60_leds.c similarity index 100% rename from boards/twr-k60n512/src/k60_leds.c rename to boards/arm/twr-k60n512/src/k60_leds.c diff --git a/boards/twr-k60n512/src/k60_spi.c b/boards/arm/twr-k60n512/src/k60_spi.c similarity index 100% rename from boards/twr-k60n512/src/k60_spi.c rename to boards/arm/twr-k60n512/src/k60_spi.c diff --git a/boards/twr-k60n512/src/k60_usbdev.c b/boards/arm/twr-k60n512/src/k60_usbdev.c similarity index 100% rename from boards/twr-k60n512/src/k60_usbdev.c rename to boards/arm/twr-k60n512/src/k60_usbdev.c diff --git a/boards/twr-k60n512/src/k60_usbmsc.c b/boards/arm/twr-k60n512/src/k60_usbmsc.c similarity index 100% rename from boards/twr-k60n512/src/k60_usbmsc.c rename to boards/arm/twr-k60n512/src/k60_usbmsc.c diff --git a/boards/twr-k60n512/src/twr-k60n512.h b/boards/arm/twr-k60n512/src/twr-k60n512.h similarity index 98% rename from boards/twr-k60n512/src/twr-k60n512.h rename to boards/arm/twr-k60n512/src/twr-k60n512.h index 7daf9434db..a932d5d20a 100644 --- a/boards/twr-k60n512/src/twr-k60n512.h +++ b/boards/arm/twr-k60n512/src/twr-k60n512.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_TWR_K60N512_SRC_TWRK60_H -#define __BOARDS_TWR_K60N512_SRC_TWRK60_H +#ifndef __BOARDS_ARM_TWR_K60N512_SRC_TWRK60_H +#define __BOARDS_ARM_TWR_K60N512_SRC_TWRK60_H /************************************************************************************ * Included Files @@ -293,4 +293,4 @@ void weak_function kinetis_spidev_initialize(void); void weak_function kinetis_usbinitialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_TWR_K60N512_SRC_TWRK60_H */ +#endif /* __BOARDS_ARM_TWR_K60N512_SRC_TWRK60_H */ diff --git a/boards/twr-k64f120m/Kconfig b/boards/arm/twr-k64f120m/Kconfig similarity index 100% rename from boards/twr-k64f120m/Kconfig rename to boards/arm/twr-k64f120m/Kconfig diff --git a/boards/twr-k64f120m/README.txt b/boards/arm/twr-k64f120m/README.txt similarity index 100% rename from boards/twr-k64f120m/README.txt rename to boards/arm/twr-k64f120m/README.txt diff --git a/boards/twr-k64f120m/configs/netnsh/defconfig b/boards/arm/twr-k64f120m/configs/netnsh/defconfig similarity index 100% rename from boards/twr-k64f120m/configs/netnsh/defconfig rename to boards/arm/twr-k64f120m/configs/netnsh/defconfig diff --git a/boards/twr-k64f120m/configs/nsh/defconfig b/boards/arm/twr-k64f120m/configs/nsh/defconfig similarity index 100% rename from boards/twr-k64f120m/configs/nsh/defconfig rename to boards/arm/twr-k64f120m/configs/nsh/defconfig diff --git a/boards/twr-k64f120m/include/board.h b/boards/arm/twr-k64f120m/include/board.h similarity index 97% rename from boards/twr-k64f120m/include/board.h rename to boards/arm/twr-k64f120m/include/board.h index d969f9d780..c84ccf03e0 100644 --- a/boards/twr-k64f120m/include/board.h +++ b/boards/arm/twr-k64f120m/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_TWR_K64F120M_INCLUDE_BOARCH_H -#define __BOARDS_TWR_K64F120M_INCLUDE_BOARCH_H +#ifndef __BOARDS_ARM_TWR_K64F120M_INCLUDE_BOARCH_H +#define __BOARDS_ARM_TWR_K64F120M_INCLUDE_BOARCH_H /************************************************************************************ * Included Files @@ -161,4 +161,4 @@ # define CONFIG_KINETIS_NENET 1 #endif -#endif /* __BOARDS_TWR_K64F120M_INCLUDE_BOARCH_H */ +#endif /* __BOARDS_ARM_TWR_K64F120M_INCLUDE_BOARCH_H */ diff --git a/boards/twr-k64f120m/scripts/Make.defs b/boards/arm/twr-k64f120m/scripts/Make.defs similarity index 96% rename from boards/twr-k64f120m/scripts/Make.defs rename to boards/arm/twr-k64f120m/scripts/Make.defs index 5f7488324e..7663228ac0 100644 --- a/boards/twr-k64f120m/scripts/Make.defs +++ b/boards/arm/twr-k64f120m/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/twr-k64f120m/scripts/ld.script b/boards/arm/twr-k64f120m/scripts/ld.script similarity index 100% rename from boards/twr-k64f120m/scripts/ld.script rename to boards/arm/twr-k64f120m/scripts/ld.script diff --git a/boards/twr-k64f120m/src/Makefile b/boards/arm/twr-k64f120m/src/Makefile similarity index 100% rename from boards/twr-k64f120m/src/Makefile rename to boards/arm/twr-k64f120m/src/Makefile diff --git a/boards/twr-k64f120m/src/k64_appinit.c b/boards/arm/twr-k64f120m/src/k64_appinit.c similarity index 100% rename from boards/twr-k64f120m/src/k64_appinit.c rename to boards/arm/twr-k64f120m/src/k64_appinit.c diff --git a/boards/twr-k64f120m/src/k64_automount.c b/boards/arm/twr-k64f120m/src/k64_automount.c similarity index 100% rename from boards/twr-k64f120m/src/k64_automount.c rename to boards/arm/twr-k64f120m/src/k64_automount.c diff --git a/boards/twr-k64f120m/src/k64_boot.c b/boards/arm/twr-k64f120m/src/k64_boot.c similarity index 100% rename from boards/twr-k64f120m/src/k64_boot.c rename to boards/arm/twr-k64f120m/src/k64_boot.c diff --git a/boards/twr-k64f120m/src/k64_leds.c b/boards/arm/twr-k64f120m/src/k64_leds.c similarity index 100% rename from boards/twr-k64f120m/src/k64_leds.c rename to boards/arm/twr-k64f120m/src/k64_leds.c diff --git a/boards/twr-k64f120m/src/k64_sdhc.c b/boards/arm/twr-k64f120m/src/k64_sdhc.c similarity index 100% rename from boards/twr-k64f120m/src/k64_sdhc.c rename to boards/arm/twr-k64f120m/src/k64_sdhc.c diff --git a/boards/twr-k64f120m/src/twrk64.h b/boards/arm/twr-k64f120m/src/twrk64.h similarity index 98% rename from boards/twr-k64f120m/src/twrk64.h rename to boards/arm/twr-k64f120m/src/twrk64.h index 280ad28456..733e6dc038 100644 --- a/boards/twr-k64f120m/src/twrk64.h +++ b/boards/arm/twr-k64f120m/src/twrk64.h @@ -36,8 +36,8 @@ * For /arch/arm/src accessibilty use ../include/board.h instead. ************************************************************************************/ -#ifndef __BOARDS_TWR_K64F120M_SRC_TWRK64_H -#define __BOARDS_TWR_K64F120M_SRC_TWRK64_H +#ifndef __BOARDS_ARM_TWR_K64F120M_SRC_TWRK64_H +#define __BOARDS_ARM_TWR_K64F120M_SRC_TWRK64_H /************************************************************************************ * Included Files @@ -385,4 +385,4 @@ int k64_pwm_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_TWR_K64F120M_SRC_TWRK64_H */ +#endif /* __BOARDS_ARM_TWR_K64F120M_SRC_TWRK64_H */ diff --git a/boards/u-blox-c027/Kconfig b/boards/arm/u-blox-c027/Kconfig similarity index 100% rename from boards/u-blox-c027/Kconfig rename to boards/arm/u-blox-c027/Kconfig diff --git a/boards/u-blox-c027/README.txt b/boards/arm/u-blox-c027/README.txt similarity index 100% rename from boards/u-blox-c027/README.txt rename to boards/arm/u-blox-c027/README.txt diff --git a/boards/u-blox-c027/configs/nsh/defconfig b/boards/arm/u-blox-c027/configs/nsh/defconfig similarity index 100% rename from boards/u-blox-c027/configs/nsh/defconfig rename to boards/arm/u-blox-c027/configs/nsh/defconfig diff --git a/boards/u-blox-c027/include/board.h b/boards/arm/u-blox-c027/include/board.h similarity index 98% rename from boards/u-blox-c027/include/board.h rename to boards/arm/u-blox-c027/include/board.h index 80a928a6f0..b77037cdb8 100644 --- a/boards/u-blox-c027/include/board.h +++ b/boards/arm/u-blox-c027/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_U_BLOX_C027_INCLUDE_BOARD_H -#define __BOARDS_U_BLOX_C027_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_U_BLOX_C027_INCLUDE_BOARD_H +#define __BOARDS_ARM_U_BLOX_C027_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -252,4 +252,4 @@ #define GPIO_PWM1p5 GPIO_PWM1p5_2 #define GPIO_PWM1p6 GPIO_PWM1p6_2 -#endif /* __BOARDS_U_BLOX_C027_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_U_BLOX_C027_INCLUDE_BOARD_H */ diff --git a/boards/u-blox-c027/scripts/Make.defs b/boards/arm/u-blox-c027/scripts/Make.defs similarity index 96% rename from boards/u-blox-c027/scripts/Make.defs rename to boards/arm/u-blox-c027/scripts/Make.defs index fbf77449f5..9a17595a31 100644 --- a/boards/u-blox-c027/scripts/Make.defs +++ b/boards/arm/u-blox-c027/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mknulldeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/u-blox-c027.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/u-blox-c027.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/u-blox-c027.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/u-blox-c027.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/u-blox-c027/scripts/u-blox-c027.ld b/boards/arm/u-blox-c027/scripts/u-blox-c027.ld similarity index 100% rename from boards/u-blox-c027/scripts/u-blox-c027.ld rename to boards/arm/u-blox-c027/scripts/u-blox-c027.ld diff --git a/boards/stm32f072-discovery/src/.gitignore b/boards/arm/u-blox-c027/src/.gitignore similarity index 100% rename from boards/stm32f072-discovery/src/.gitignore rename to boards/arm/u-blox-c027/src/.gitignore diff --git a/boards/u-blox-c027/src/Makefile b/boards/arm/u-blox-c027/src/Makefile similarity index 100% rename from boards/u-blox-c027/src/Makefile rename to boards/arm/u-blox-c027/src/Makefile diff --git a/boards/u-blox-c027/src/lpc17_40_adc.c b/boards/arm/u-blox-c027/src/lpc17_40_adc.c similarity index 100% rename from boards/u-blox-c027/src/lpc17_40_adc.c rename to boards/arm/u-blox-c027/src/lpc17_40_adc.c diff --git a/boards/u-blox-c027/src/lpc17_40_appinit.c b/boards/arm/u-blox-c027/src/lpc17_40_appinit.c similarity index 100% rename from boards/u-blox-c027/src/lpc17_40_appinit.c rename to boards/arm/u-blox-c027/src/lpc17_40_appinit.c diff --git a/boards/u-blox-c027/src/lpc17_40_boot.c b/boards/arm/u-blox-c027/src/lpc17_40_boot.c similarity index 100% rename from boards/u-blox-c027/src/lpc17_40_boot.c rename to boards/arm/u-blox-c027/src/lpc17_40_boot.c diff --git a/boards/u-blox-c027/src/lpc17_40_dac.c b/boards/arm/u-blox-c027/src/lpc17_40_dac.c similarity index 100% rename from boards/u-blox-c027/src/lpc17_40_dac.c rename to boards/arm/u-blox-c027/src/lpc17_40_dac.c diff --git a/boards/u-blox-c027/src/lpc17_40_leds.c b/boards/arm/u-blox-c027/src/lpc17_40_leds.c similarity index 100% rename from boards/u-blox-c027/src/lpc17_40_leds.c rename to boards/arm/u-blox-c027/src/lpc17_40_leds.c diff --git a/boards/u-blox-c027/src/lpc17_40_pwm.c b/boards/arm/u-blox-c027/src/lpc17_40_pwm.c similarity index 100% rename from boards/u-blox-c027/src/lpc17_40_pwm.c rename to boards/arm/u-blox-c027/src/lpc17_40_pwm.c diff --git a/boards/u-blox-c027/src/lpc17_40_ssp.c b/boards/arm/u-blox-c027/src/lpc17_40_ssp.c similarity index 100% rename from boards/u-blox-c027/src/lpc17_40_ssp.c rename to boards/arm/u-blox-c027/src/lpc17_40_ssp.c diff --git a/boards/u-blox-c027/src/lpc17_40_ubxmdm.c b/boards/arm/u-blox-c027/src/lpc17_40_ubxmdm.c similarity index 100% rename from boards/u-blox-c027/src/lpc17_40_ubxmdm.c rename to boards/arm/u-blox-c027/src/lpc17_40_ubxmdm.c diff --git a/boards/u-blox-c027/src/lpc17_40_usbmsc.c b/boards/arm/u-blox-c027/src/lpc17_40_usbmsc.c similarity index 100% rename from boards/u-blox-c027/src/lpc17_40_usbmsc.c rename to boards/arm/u-blox-c027/src/lpc17_40_usbmsc.c diff --git a/boards/u-blox-c027/src/u-blox-c027.h b/boards/arm/u-blox-c027/src/u-blox-c027.h similarity index 97% rename from boards/u-blox-c027/src/u-blox-c027.h rename to boards/arm/u-blox-c027/src/u-blox-c027.h index 1cd84086e8..1c1bb72148 100644 --- a/boards/u-blox-c027/src/u-blox-c027.h +++ b/boards/arm/u-blox-c027/src/u-blox-c027.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_U_BLOX_C027_SRC_U_BLOX_C027_H -#define __BOARDS_U_BLOX_C027_SRC_U_BLOX_C027_H +#ifndef __BOARDS_ARM_U_BLOX_C027_SRC_U_BLOX_C027_H +#define __BOARDS_ARM_U_BLOX_C027_SRC_U_BLOX_C027_H /************************************************************************************ * Included Files @@ -127,4 +127,4 @@ int lpc17_40_adc_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_U_BLOX_C027_SRC_U_BLOX_C027_H */ +#endif /* __BOARDS_ARM_U_BLOX_C027_SRC_U_BLOX_C027_H */ diff --git a/boards/u-blox-c027/tools/flash.sh b/boards/arm/u-blox-c027/tools/flash.sh similarity index 100% rename from boards/u-blox-c027/tools/flash.sh rename to boards/arm/u-blox-c027/tools/flash.sh diff --git a/boards/viewtool-stm32f107/Kconfig b/boards/arm/viewtool-stm32f107/Kconfig similarity index 100% rename from boards/viewtool-stm32f107/Kconfig rename to boards/arm/viewtool-stm32f107/Kconfig diff --git a/boards/viewtool-stm32f107/README.txt b/boards/arm/viewtool-stm32f107/README.txt similarity index 100% rename from boards/viewtool-stm32f107/README.txt rename to boards/arm/viewtool-stm32f107/README.txt diff --git a/boards/viewtool-stm32f107/configs/ft80x/defconfig b/boards/arm/viewtool-stm32f107/configs/ft80x/defconfig similarity index 100% rename from boards/viewtool-stm32f107/configs/ft80x/defconfig rename to boards/arm/viewtool-stm32f107/configs/ft80x/defconfig diff --git a/boards/viewtool-stm32f107/configs/highpri/defconfig b/boards/arm/viewtool-stm32f107/configs/highpri/defconfig similarity index 100% rename from boards/viewtool-stm32f107/configs/highpri/defconfig rename to boards/arm/viewtool-stm32f107/configs/highpri/defconfig diff --git a/boards/viewtool-stm32f107/configs/netnsh/defconfig b/boards/arm/viewtool-stm32f107/configs/netnsh/defconfig similarity index 100% rename from boards/viewtool-stm32f107/configs/netnsh/defconfig rename to boards/arm/viewtool-stm32f107/configs/netnsh/defconfig diff --git a/boards/viewtool-stm32f107/configs/nsh/defconfig b/boards/arm/viewtool-stm32f107/configs/nsh/defconfig similarity index 100% rename from boards/viewtool-stm32f107/configs/nsh/defconfig rename to boards/arm/viewtool-stm32f107/configs/nsh/defconfig diff --git a/boards/viewtool-stm32f107/configs/tcpblaster/defconfig b/boards/arm/viewtool-stm32f107/configs/tcpblaster/defconfig similarity index 100% rename from boards/viewtool-stm32f107/configs/tcpblaster/defconfig rename to boards/arm/viewtool-stm32f107/configs/tcpblaster/defconfig diff --git a/boards/viewtool-stm32f107/include/board-stm32f103vct6.h b/boards/arm/viewtool-stm32f107/include/board-stm32f103vct6.h similarity index 96% rename from boards/viewtool-stm32f107/include/board-stm32f103vct6.h rename to boards/arm/viewtool-stm32f107/include/board-stm32f103vct6.h index c470e400c7..ad61e32d52 100644 --- a/boards/viewtool-stm32f107/include/board-stm32f103vct6.h +++ b/boards/arm/viewtool-stm32f107/include/board-stm32f103vct6.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_VIEWTOOL_STM32F107_INCLUDE_BOARD_STM32F103VCT6_H -#define __BOARDS_VIEWTOOL_STM32F107_INCLUDE_BOARD_STM32F103VCT6_H 1 +#ifndef __BOARDS_ARM_VIEWTOOL_STM32F107_INCLUDE_BOARD_STM32F103VCT6_H +#define __BOARDS_ARM_VIEWTOOL_STM32F107_INCLUDE_BOARD_STM32F103VCT6_H 1 /************************************************************************************ * Included Files @@ -146,4 +146,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_VIEWTOOL_STM32F107_INCLUDE_BOARD_STM32F103VCT6_H */ +#endif /* __BOARDS_ARM_VIEWTOOL_STM32F107_INCLUDE_BOARD_STM32F103VCT6_H */ diff --git a/boards/viewtool-stm32f107/include/board-stm32f107vct6.h b/boards/arm/viewtool-stm32f107/include/board-stm32f107vct6.h similarity index 96% rename from boards/viewtool-stm32f107/include/board-stm32f107vct6.h rename to boards/arm/viewtool-stm32f107/include/board-stm32f107vct6.h index e2d99f537a..08ce4f5071 100644 --- a/boards/viewtool-stm32f107/include/board-stm32f107vct6.h +++ b/boards/arm/viewtool-stm32f107/include/board-stm32f107vct6.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_VIEWTOOL_STM32F107_INCLUDE_BOARD_STM32F107VCT6_H -#define __BOARDS_VIEWTOOL_STM32F107_INCLUDE_BOARD_STM32F107VCT6_H 1 +#ifndef __BOARDS_ARM_VIEWTOOL_STM32F107_INCLUDE_BOARD_STM32F107VCT6_H +#define __BOARDS_ARM_VIEWTOOL_STM32F107_INCLUDE_BOARD_STM32F107VCT6_H 1 /************************************************************************************ * Included Files @@ -150,4 +150,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_VIEWTOOL_STM32F107_INCLUDE_BOARD_STM32F107VCT6_H */ +#endif /* __BOARDS_ARM_VIEWTOOL_STM32F107_INCLUDE_BOARD_STM32F107VCT6_H */ diff --git a/boards/viewtool-stm32f107/include/board.h b/boards/arm/viewtool-stm32f107/include/board.h similarity index 96% rename from boards/viewtool-stm32f107/include/board.h rename to boards/arm/viewtool-stm32f107/include/board.h index afeb40c978..7551f5b19f 100644 --- a/boards/viewtool-stm32f107/include/board.h +++ b/boards/arm/viewtool-stm32f107/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_VIEWTOOL_STM32F107_INCLUDE_BOARD_H -#define __BOARDS_VIEWTOOL_STM32F107_INCLUDE_BOARD_H 1 +#ifndef __BOARDS_ARM_VIEWTOOL_STM32F107_INCLUDE_BOARD_H +#define __BOARDS_ARM_VIEWTOOL_STM32F107_INCLUDE_BOARD_H 1 /************************************************************************************ * Included Files @@ -130,4 +130,4 @@ #define BUTTON_SW3_BIT (1 << BUTTON_SW3) #define BUTTON_SW4_BIT (1 << BUTTON_SW4) -#endif /* __BOARDS_VIEWTOOL_STM32F107_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_VIEWTOOL_STM32F107_INCLUDE_BOARD_H */ diff --git a/boards/viewtool-stm32f107/scripts/Make.defs b/boards/arm/viewtool-stm32f107/scripts/Make.defs similarity index 96% rename from boards/viewtool-stm32f107/scripts/Make.defs rename to boards/arm/viewtool-stm32f107/scripts/Make.defs index 21c90e59fa..2b9d7d1ea1 100644 --- a/boards/viewtool-stm32f107/scripts/Make.defs +++ b/boards/arm/viewtool-stm32f107/scripts/Make.defs @@ -50,13 +50,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/viewtool-stm32f107/scripts/dfu.ld b/boards/arm/viewtool-stm32f107/scripts/dfu.ld similarity index 100% rename from boards/viewtool-stm32f107/scripts/dfu.ld rename to boards/arm/viewtool-stm32f107/scripts/dfu.ld diff --git a/boards/viewtool-stm32f107/scripts/flash.ld b/boards/arm/viewtool-stm32f107/scripts/flash.ld similarity index 100% rename from boards/viewtool-stm32f107/scripts/flash.ld rename to boards/arm/viewtool-stm32f107/scripts/flash.ld diff --git a/boards/stm32f103-minimum/src/.gitignore b/boards/arm/viewtool-stm32f107/src/.gitignore similarity index 100% rename from boards/stm32f103-minimum/src/.gitignore rename to boards/arm/viewtool-stm32f107/src/.gitignore diff --git a/boards/viewtool-stm32f107/src/Makefile b/boards/arm/viewtool-stm32f107/src/Makefile similarity index 100% rename from boards/viewtool-stm32f107/src/Makefile rename to boards/arm/viewtool-stm32f107/src/Makefile diff --git a/boards/viewtool-stm32f107/src/stm32_ads7843e.c b/boards/arm/viewtool-stm32f107/src/stm32_ads7843e.c similarity index 100% rename from boards/viewtool-stm32f107/src/stm32_ads7843e.c rename to boards/arm/viewtool-stm32f107/src/stm32_ads7843e.c diff --git a/boards/viewtool-stm32f107/src/stm32_appinit.c b/boards/arm/viewtool-stm32f107/src/stm32_appinit.c similarity index 100% rename from boards/viewtool-stm32f107/src/stm32_appinit.c rename to boards/arm/viewtool-stm32f107/src/stm32_appinit.c diff --git a/boards/viewtool-stm32f107/src/stm32_boot.c b/boards/arm/viewtool-stm32f107/src/stm32_boot.c similarity index 100% rename from boards/viewtool-stm32f107/src/stm32_boot.c rename to boards/arm/viewtool-stm32f107/src/stm32_boot.c diff --git a/boards/viewtool-stm32f107/src/stm32_bringup.c b/boards/arm/viewtool-stm32f107/src/stm32_bringup.c similarity index 100% rename from boards/viewtool-stm32f107/src/stm32_bringup.c rename to boards/arm/viewtool-stm32f107/src/stm32_bringup.c diff --git a/boards/viewtool-stm32f107/src/stm32_buttons.c b/boards/arm/viewtool-stm32f107/src/stm32_buttons.c similarity index 100% rename from boards/viewtool-stm32f107/src/stm32_buttons.c rename to boards/arm/viewtool-stm32f107/src/stm32_buttons.c diff --git a/boards/viewtool-stm32f107/src/stm32_can.c b/boards/arm/viewtool-stm32f107/src/stm32_can.c similarity index 100% rename from boards/viewtool-stm32f107/src/stm32_can.c rename to boards/arm/viewtool-stm32f107/src/stm32_can.c diff --git a/boards/viewtool-stm32f107/src/stm32_ft80x.c b/boards/arm/viewtool-stm32f107/src/stm32_ft80x.c similarity index 100% rename from boards/viewtool-stm32f107/src/stm32_ft80x.c rename to boards/arm/viewtool-stm32f107/src/stm32_ft80x.c diff --git a/boards/viewtool-stm32f107/src/stm32_highpri.c b/boards/arm/viewtool-stm32f107/src/stm32_highpri.c similarity index 100% rename from boards/viewtool-stm32f107/src/stm32_highpri.c rename to boards/arm/viewtool-stm32f107/src/stm32_highpri.c diff --git a/boards/viewtool-stm32f107/src/stm32_leds.c b/boards/arm/viewtool-stm32f107/src/stm32_leds.c similarity index 100% rename from boards/viewtool-stm32f107/src/stm32_leds.c rename to boards/arm/viewtool-stm32f107/src/stm32_leds.c diff --git a/boards/viewtool-stm32f107/src/stm32_max3421e.c b/boards/arm/viewtool-stm32f107/src/stm32_max3421e.c similarity index 100% rename from boards/viewtool-stm32f107/src/stm32_max3421e.c rename to boards/arm/viewtool-stm32f107/src/stm32_max3421e.c diff --git a/boards/viewtool-stm32f107/src/stm32_mmcsd.c b/boards/arm/viewtool-stm32f107/src/stm32_mmcsd.c similarity index 100% rename from boards/viewtool-stm32f107/src/stm32_mmcsd.c rename to boards/arm/viewtool-stm32f107/src/stm32_mmcsd.c diff --git a/boards/viewtool-stm32f107/src/stm32_mpl115a.c b/boards/arm/viewtool-stm32f107/src/stm32_mpl115a.c similarity index 100% rename from boards/viewtool-stm32f107/src/stm32_mpl115a.c rename to boards/arm/viewtool-stm32f107/src/stm32_mpl115a.c diff --git a/boards/viewtool-stm32f107/src/stm32_spi.c b/boards/arm/viewtool-stm32f107/src/stm32_spi.c similarity index 100% rename from boards/viewtool-stm32f107/src/stm32_spi.c rename to boards/arm/viewtool-stm32f107/src/stm32_spi.c diff --git a/boards/viewtool-stm32f107/src/stm32_ssd1289.c b/boards/arm/viewtool-stm32f107/src/stm32_ssd1289.c similarity index 100% rename from boards/viewtool-stm32f107/src/stm32_ssd1289.c rename to boards/arm/viewtool-stm32f107/src/stm32_ssd1289.c diff --git a/boards/viewtool-stm32f107/src/stm32_usbdev.c b/boards/arm/viewtool-stm32f107/src/stm32_usbdev.c similarity index 100% rename from boards/viewtool-stm32f107/src/stm32_usbdev.c rename to boards/arm/viewtool-stm32f107/src/stm32_usbdev.c diff --git a/boards/viewtool-stm32f107/src/stm32_usbmsc.c b/boards/arm/viewtool-stm32f107/src/stm32_usbmsc.c similarity index 100% rename from boards/viewtool-stm32f107/src/stm32_usbmsc.c rename to boards/arm/viewtool-stm32f107/src/stm32_usbmsc.c diff --git a/boards/viewtool-stm32f107/src/viewtool_stm32f107.h b/boards/arm/viewtool-stm32f107/src/viewtool_stm32f107.h similarity index 99% rename from boards/viewtool-stm32f107/src/viewtool_stm32f107.h rename to boards/arm/viewtool-stm32f107/src/viewtool_stm32f107.h index 5c269df6c4..d94e3c6de4 100644 --- a/boards/viewtool-stm32f107/src/viewtool_stm32f107.h +++ b/boards/arm/viewtool-stm32f107/src/viewtool_stm32f107.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_VIEWTOOL_STM32F107_SRC_H -#define __BOARDS_VIEWTOOL_STM32F107_SRC_H +#ifndef __BOARDS_ARM_VIEWTOOL_STM32F107_SRC_H +#define __BOARDS_ARM_VIEWTOOL_STM32F107_SRC_H /**************************************************************************** * Included Files @@ -512,4 +512,4 @@ int stm32_max3421e_setup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_VIEWTOOL_STM32F107_SRC_H */ +#endif /* __BOARDS_ARM_VIEWTOOL_STM32F107_SRC_H */ diff --git a/boards/ez80f910200kitg/Kconfig b/boards/arm/xmc4500-relax/Kconfig similarity index 100% rename from boards/ez80f910200kitg/Kconfig rename to boards/arm/xmc4500-relax/Kconfig diff --git a/boards/xmc4500-relax/README.txt b/boards/arm/xmc4500-relax/README.txt similarity index 100% rename from boards/xmc4500-relax/README.txt rename to boards/arm/xmc4500-relax/README.txt diff --git a/boards/xmc4500-relax/configs/nsh/defconfig b/boards/arm/xmc4500-relax/configs/nsh/defconfig similarity index 100% rename from boards/xmc4500-relax/configs/nsh/defconfig rename to boards/arm/xmc4500-relax/configs/nsh/defconfig diff --git a/boards/xmc4500-relax/include/board.h b/boards/arm/xmc4500-relax/include/board.h similarity index 98% rename from boards/xmc4500-relax/include/board.h rename to boards/arm/xmc4500-relax/include/board.h index 4f1aa05622..973d48ebc4 100644 --- a/boards/xmc4500-relax/include/board.h +++ b/boards/arm/xmc4500-relax/include/board.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_XMC4500_RELAX_INCLUDE_BOARD_H -#define __CONFIG_XMC4500_RELAX_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_XMC4500_RELAX_INCLUDE_BOARD_H +#define __BOARDS_ARM_XMC4500_RELAX_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -372,4 +372,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __CONFIG_XMC4500_RELAX_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_XMC4500_RELAX_INCLUDE_BOARD_H */ diff --git a/boards/xmc4500-relax/scripts/Make.defs b/boards/arm/xmc4500-relax/scripts/Make.defs similarity index 97% rename from boards/xmc4500-relax/scripts/Make.defs rename to boards/arm/xmc4500-relax/scripts/Make.defs index c2d341deca..0539c95543 100644 --- a/boards/xmc4500-relax/scripts/Make.defs +++ b/boards/arm/xmc4500-relax/scripts/Make.defs @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/xmc4500-relax/scripts/flash.ld b/boards/arm/xmc4500-relax/scripts/flash.ld similarity index 100% rename from boards/xmc4500-relax/scripts/flash.ld rename to boards/arm/xmc4500-relax/scripts/flash.ld diff --git a/boards/xmc4500-relax/src/Makefile b/boards/arm/xmc4500-relax/src/Makefile similarity index 100% rename from boards/xmc4500-relax/src/Makefile rename to boards/arm/xmc4500-relax/src/Makefile diff --git a/boards/xmc4500-relax/src/xmc4500-relax.h b/boards/arm/xmc4500-relax/src/xmc4500-relax.h similarity index 96% rename from boards/xmc4500-relax/src/xmc4500-relax.h rename to boards/arm/xmc4500-relax/src/xmc4500-relax.h index adb869243a..1f99d2f422 100644 --- a/boards/xmc4500-relax/src/xmc4500-relax.h +++ b/boards/arm/xmc4500-relax/src/xmc4500-relax.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_XMC4500_RELAX_SRC_XMC4500_RELAX_H -#define __BOARDS_XMC4500_RELAX_SRC_XMC4500_RELAX_H +#ifndef __BOARDS_ARM_XMC4500_RELAX_SRC_XMC4500_RELAX_H +#define __BOARDS_ARM_XMC4500_RELAX_SRC_XMC4500_RELAX_H /**************************************************************************** * Included Files @@ -107,4 +107,4 @@ int xmc4_bringup(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_XMC4500_RELAX_SRC_XMC4500_RELAX_H */ +#endif /* __BOARDS_ARM_XMC4500_RELAX_SRC_XMC4500_RELAX_H */ diff --git a/boards/xmc4500-relax/src/xmc4_appinit.c b/boards/arm/xmc4500-relax/src/xmc4_appinit.c similarity index 100% rename from boards/xmc4500-relax/src/xmc4_appinit.c rename to boards/arm/xmc4500-relax/src/xmc4_appinit.c diff --git a/boards/xmc4500-relax/src/xmc4_autoleds.c b/boards/arm/xmc4500-relax/src/xmc4_autoleds.c similarity index 100% rename from boards/xmc4500-relax/src/xmc4_autoleds.c rename to boards/arm/xmc4500-relax/src/xmc4_autoleds.c diff --git a/boards/xmc4500-relax/src/xmc4_boot.c b/boards/arm/xmc4500-relax/src/xmc4_boot.c similarity index 100% rename from boards/xmc4500-relax/src/xmc4_boot.c rename to boards/arm/xmc4500-relax/src/xmc4_boot.c diff --git a/boards/xmc4500-relax/src/xmc4_bringup.c b/boards/arm/xmc4500-relax/src/xmc4_bringup.c similarity index 100% rename from boards/xmc4500-relax/src/xmc4_bringup.c rename to boards/arm/xmc4500-relax/src/xmc4_bringup.c diff --git a/boards/xmc4500-relax/src/xmc4_buttons.c b/boards/arm/xmc4500-relax/src/xmc4_buttons.c similarity index 100% rename from boards/xmc4500-relax/src/xmc4_buttons.c rename to boards/arm/xmc4500-relax/src/xmc4_buttons.c diff --git a/boards/xmc4500-relax/src/xmc4_max6675.c b/boards/arm/xmc4500-relax/src/xmc4_max6675.c similarity index 100% rename from boards/xmc4500-relax/src/xmc4_max6675.c rename to boards/arm/xmc4500-relax/src/xmc4_max6675.c diff --git a/boards/xmc4500-relax/src/xmc4_ostest.c b/boards/arm/xmc4500-relax/src/xmc4_ostest.c similarity index 100% rename from boards/xmc4500-relax/src/xmc4_ostest.c rename to boards/arm/xmc4500-relax/src/xmc4_ostest.c diff --git a/boards/xmc4500-relax/src/xmc4_spi.c b/boards/arm/xmc4500-relax/src/xmc4_spi.c similarity index 100% rename from boards/xmc4500-relax/src/xmc4_spi.c rename to boards/arm/xmc4500-relax/src/xmc4_spi.c diff --git a/boards/xmc4500-relax/src/xmc4_userleds.c b/boards/arm/xmc4500-relax/src/xmc4_userleds.c similarity index 100% rename from boards/xmc4500-relax/src/xmc4_userleds.c rename to boards/arm/xmc4500-relax/src/xmc4_userleds.c diff --git a/boards/zkit-arm-1769/Kconfig b/boards/arm/zkit-arm-1769/Kconfig similarity index 100% rename from boards/zkit-arm-1769/Kconfig rename to boards/arm/zkit-arm-1769/Kconfig diff --git a/boards/zkit-arm-1769/README.txt b/boards/arm/zkit-arm-1769/README.txt similarity index 100% rename from boards/zkit-arm-1769/README.txt rename to boards/arm/zkit-arm-1769/README.txt diff --git a/boards/zkit-arm-1769/configs/hello/defconfig b/boards/arm/zkit-arm-1769/configs/hello/defconfig similarity index 100% rename from boards/zkit-arm-1769/configs/hello/defconfig rename to boards/arm/zkit-arm-1769/configs/hello/defconfig diff --git a/boards/zkit-arm-1769/configs/nsh/defconfig b/boards/arm/zkit-arm-1769/configs/nsh/defconfig similarity index 100% rename from boards/zkit-arm-1769/configs/nsh/defconfig rename to boards/arm/zkit-arm-1769/configs/nsh/defconfig diff --git a/boards/zkit-arm-1769/configs/nxhello/defconfig b/boards/arm/zkit-arm-1769/configs/nxhello/defconfig similarity index 100% rename from boards/zkit-arm-1769/configs/nxhello/defconfig rename to boards/arm/zkit-arm-1769/configs/nxhello/defconfig diff --git a/boards/zkit-arm-1769/configs/thttpd/defconfig b/boards/arm/zkit-arm-1769/configs/thttpd/defconfig similarity index 100% rename from boards/zkit-arm-1769/configs/thttpd/defconfig rename to boards/arm/zkit-arm-1769/configs/thttpd/defconfig diff --git a/boards/zkit-arm-1769/include/board.h b/boards/arm/zkit-arm-1769/include/board.h similarity index 98% rename from boards/zkit-arm-1769/include/board.h rename to boards/arm/zkit-arm-1769/include/board.h index ca334d9923..2e4a56f974 100644 --- a/boards/zkit-arm-1769/include/board.h +++ b/boards/arm/zkit-arm-1769/include/board.h @@ -39,8 +39,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_ZKIT_ARM_1769_INCLUDE_BOARD_H -#define __BOARDS_ZKIT_ARM_1769_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_ZKIT_ARM_1769_INCLUDE_BOARD_H +#define __BOARDS_ARM_ZKIT_ARM_1769_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -349,4 +349,4 @@ void lpc17_40_led(int lednum, int state); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ZKIT_ARM_1769_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_ZKIT_ARM_1769_INCLUDE_BOARD_H */ diff --git a/boards/zkit-arm-1769/scripts/Make.defs b/boards/arm/zkit-arm-1769/scripts/Make.defs similarity index 97% rename from boards/zkit-arm-1769/scripts/Make.defs rename to boards/arm/zkit-arm-1769/scripts/Make.defs index ccc803e2e7..e982685c29 100644 --- a/boards/zkit-arm-1769/scripts/Make.defs +++ b/boards/arm/zkit-arm-1769/scripts/Make.defs @@ -50,14 +50,14 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" NXFLATLDSCRIPT = -T "${shell cygpath -w $(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script NXFLATLDSCRIPT = -T"$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld" endif diff --git a/boards/zkit-arm-1769/scripts/ld.script b/boards/arm/zkit-arm-1769/scripts/ld.script similarity index 100% rename from boards/zkit-arm-1769/scripts/ld.script rename to boards/arm/zkit-arm-1769/scripts/ld.script diff --git a/boards/stm32f3discovery/src/.gitignore b/boards/arm/zkit-arm-1769/src/.gitignore similarity index 100% rename from boards/stm32f3discovery/src/.gitignore rename to boards/arm/zkit-arm-1769/src/.gitignore diff --git a/boards/zkit-arm-1769/src/Makefile b/boards/arm/zkit-arm-1769/src/Makefile similarity index 100% rename from boards/zkit-arm-1769/src/Makefile rename to boards/arm/zkit-arm-1769/src/Makefile diff --git a/boards/zkit-arm-1769/src/lpc17_40_adc.c b/boards/arm/zkit-arm-1769/src/lpc17_40_adc.c similarity index 100% rename from boards/zkit-arm-1769/src/lpc17_40_adc.c rename to boards/arm/zkit-arm-1769/src/lpc17_40_adc.c diff --git a/boards/zkit-arm-1769/src/lpc17_40_appinit.c b/boards/arm/zkit-arm-1769/src/lpc17_40_appinit.c similarity index 100% rename from boards/zkit-arm-1769/src/lpc17_40_appinit.c rename to boards/arm/zkit-arm-1769/src/lpc17_40_appinit.c diff --git a/boards/zkit-arm-1769/src/lpc17_40_boot.c b/boards/arm/zkit-arm-1769/src/lpc17_40_boot.c similarity index 100% rename from boards/zkit-arm-1769/src/lpc17_40_boot.c rename to boards/arm/zkit-arm-1769/src/lpc17_40_boot.c diff --git a/boards/zkit-arm-1769/src/lpc17_40_buttons.c b/boards/arm/zkit-arm-1769/src/lpc17_40_buttons.c similarity index 100% rename from boards/zkit-arm-1769/src/lpc17_40_buttons.c rename to boards/arm/zkit-arm-1769/src/lpc17_40_buttons.c diff --git a/boards/zkit-arm-1769/src/lpc17_40_can.c b/boards/arm/zkit-arm-1769/src/lpc17_40_can.c similarity index 100% rename from boards/zkit-arm-1769/src/lpc17_40_can.c rename to boards/arm/zkit-arm-1769/src/lpc17_40_can.c diff --git a/boards/zkit-arm-1769/src/lpc17_40_dac.c b/boards/arm/zkit-arm-1769/src/lpc17_40_dac.c similarity index 100% rename from boards/zkit-arm-1769/src/lpc17_40_dac.c rename to boards/arm/zkit-arm-1769/src/lpc17_40_dac.c diff --git a/boards/zkit-arm-1769/src/lpc17_40_lcd.c b/boards/arm/zkit-arm-1769/src/lpc17_40_lcd.c similarity index 100% rename from boards/zkit-arm-1769/src/lpc17_40_lcd.c rename to boards/arm/zkit-arm-1769/src/lpc17_40_lcd.c diff --git a/boards/zkit-arm-1769/src/lpc17_40_leds.c b/boards/arm/zkit-arm-1769/src/lpc17_40_leds.c similarity index 100% rename from boards/zkit-arm-1769/src/lpc17_40_leds.c rename to boards/arm/zkit-arm-1769/src/lpc17_40_leds.c diff --git a/boards/zkit-arm-1769/src/lpc17_40_spi.c b/boards/arm/zkit-arm-1769/src/lpc17_40_spi.c similarity index 100% rename from boards/zkit-arm-1769/src/lpc17_40_spi.c rename to boards/arm/zkit-arm-1769/src/lpc17_40_spi.c diff --git a/boards/zkit-arm-1769/src/lpc17_40_ssp.c b/boards/arm/zkit-arm-1769/src/lpc17_40_ssp.c similarity index 100% rename from boards/zkit-arm-1769/src/lpc17_40_ssp.c rename to boards/arm/zkit-arm-1769/src/lpc17_40_ssp.c diff --git a/boards/zkit-arm-1769/src/lpc17_40_usbmsc.c b/boards/arm/zkit-arm-1769/src/lpc17_40_usbmsc.c similarity index 100% rename from boards/zkit-arm-1769/src/lpc17_40_usbmsc.c rename to boards/arm/zkit-arm-1769/src/lpc17_40_usbmsc.c diff --git a/boards/zkit-arm-1769/src/zkit-arm-1769.h b/boards/arm/zkit-arm-1769/src/zkit-arm-1769.h similarity index 100% rename from boards/zkit-arm-1769/src/zkit-arm-1769.h rename to boards/arm/zkit-arm-1769/src/zkit-arm-1769.h diff --git a/boards/zp214xpa/Kconfig b/boards/arm/zp214xpa/Kconfig similarity index 100% rename from boards/zp214xpa/Kconfig rename to boards/arm/zp214xpa/Kconfig diff --git a/boards/zp214xpa/README.txt b/boards/arm/zp214xpa/README.txt similarity index 100% rename from boards/zp214xpa/README.txt rename to boards/arm/zp214xpa/README.txt diff --git a/boards/zp214xpa/configs/nsh/defconfig b/boards/arm/zp214xpa/configs/nsh/defconfig similarity index 100% rename from boards/zp214xpa/configs/nsh/defconfig rename to boards/arm/zp214xpa/configs/nsh/defconfig diff --git a/boards/zp214xpa/configs/nxlines/defconfig b/boards/arm/zp214xpa/configs/nxlines/defconfig similarity index 100% rename from boards/zp214xpa/configs/nxlines/defconfig rename to boards/arm/zp214xpa/configs/nxlines/defconfig diff --git a/boards/zp214xpa/include/board.h b/boards/arm/zp214xpa/include/board.h similarity index 95% rename from boards/zp214xpa/include/board.h rename to boards/arm/zp214xpa/include/board.h index 9cc20a6f33..6d17f0b87d 100644 --- a/boards/zp214xpa/include/board.h +++ b/boards/arm/zp214xpa/include/board.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ZP214XPA_INCLUDE_BOARD_H -#define __BOARDS_ZP214XPA_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_ZP214XPA_INCLUDE_BOARD_H +#define __BOARDS_ARM_ZP214XPA_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -65,4 +65,4 @@ * Inline Functions ****************************************************************************/ -#endif /* __BOARDS_ZP214XPA_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_ZP214XPA_INCLUDE_BOARD_H */ diff --git a/boards/zp214xpa/scripts/Make.defs b/boards/arm/zp214xpa/scripts/Make.defs similarity index 97% rename from boards/zp214xpa/scripts/Make.defs rename to boards/arm/zp214xpa/scripts/Make.defs index 94f1f335c4..f0bc668f0a 100644 --- a/boards/zp214xpa/scripts/Make.defs +++ b/boards/arm/zp214xpa/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/zp214xpa/scripts/ld.script b/boards/arm/zp214xpa/scripts/ld.script similarity index 100% rename from boards/zp214xpa/scripts/ld.script rename to boards/arm/zp214xpa/scripts/ld.script diff --git a/boards/stm32f429i-disco/src/.gitignore b/boards/arm/zp214xpa/src/.gitignore similarity index 100% rename from boards/stm32f429i-disco/src/.gitignore rename to boards/arm/zp214xpa/src/.gitignore diff --git a/boards/zp214xpa/src/Makefile b/boards/arm/zp214xpa/src/Makefile similarity index 100% rename from boards/zp214xpa/src/Makefile rename to boards/arm/zp214xpa/src/Makefile diff --git a/boards/zp214xpa/src/lpc2148_appinit.c b/boards/arm/zp214xpa/src/lpc2148_appinit.c similarity index 100% rename from boards/zp214xpa/src/lpc2148_appinit.c rename to boards/arm/zp214xpa/src/lpc2148_appinit.c diff --git a/boards/zp214xpa/src/lpc2148_spi1.c b/boards/arm/zp214xpa/src/lpc2148_spi1.c similarity index 100% rename from boards/zp214xpa/src/lpc2148_spi1.c rename to boards/arm/zp214xpa/src/lpc2148_spi1.c diff --git a/boards/zp214xpa/src/lpc2148_ug2864ambag01.c b/boards/arm/zp214xpa/src/lpc2148_ug2864ambag01.c similarity index 100% rename from boards/zp214xpa/src/lpc2148_ug2864ambag01.c rename to boards/arm/zp214xpa/src/lpc2148_ug2864ambag01.c diff --git a/boards/zp214xpa/tools/olimex.cfg b/boards/arm/zp214xpa/tools/olimex.cfg similarity index 100% rename from boards/zp214xpa/tools/olimex.cfg rename to boards/arm/zp214xpa/tools/olimex.cfg diff --git a/boards/zp214xpa/tools/oocd.sh b/boards/arm/zp214xpa/tools/oocd.sh similarity index 100% rename from boards/zp214xpa/tools/oocd.sh rename to boards/arm/zp214xpa/tools/oocd.sh diff --git a/boards/zp214xpa/tools/usb-repair.txt b/boards/arm/zp214xpa/tools/usb-repair.txt similarity index 100% rename from boards/zp214xpa/tools/usb-repair.txt rename to boards/arm/zp214xpa/tools/usb-repair.txt diff --git a/boards/ez80f910200zco/Kconfig b/boards/avr/amber/Kconfig similarity index 100% rename from boards/ez80f910200zco/Kconfig rename to boards/avr/amber/Kconfig diff --git a/boards/amber/README.txt b/boards/avr/amber/README.txt similarity index 100% rename from boards/amber/README.txt rename to boards/avr/amber/README.txt diff --git a/boards/amber/configs/hello/defconfig b/boards/avr/amber/configs/hello/defconfig similarity index 100% rename from boards/amber/configs/hello/defconfig rename to boards/avr/amber/configs/hello/defconfig diff --git a/boards/amber/include/board.h b/boards/avr/amber/include/board.h similarity index 95% rename from boards/amber/include/board.h rename to boards/avr/amber/include/board.h index 0f2f098b11..ef2bc97cbd 100644 --- a/boards/amber/include/board.h +++ b/boards/avr/amber/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/amber/include/board.h + * boards/avr/amber/include/board.h * include/arch/board/board.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_AMBER_INCLUDE_BOARD_H -#define __BOARDS_AMBER_INCLUDE_BOARD_H +#ifndef __BOARDS_AVR_AMBER_INCLUDE_BOARD_H +#define __BOARDS_AVR_AMBER_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -97,4 +97,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_AMBER_INCLUDE_BOARD_H */ +#endif /* __BOARDS_AVR_AMBER_INCLUDE_BOARD_H */ diff --git a/boards/teensy-2.0/scripts/Make.defs b/boards/avr/amber/scripts/Make.defs similarity index 95% rename from boards/teensy-2.0/scripts/Make.defs rename to boards/avr/amber/scripts/Make.defs index 84c4b71971..0566dae369 100644 --- a/boards/teensy-2.0/scripts/Make.defs +++ b/boards/avr/amber/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/teensy-2.0/scripts/Make.defs +# boards/avr/amber/scripts/Make.defs # # Copyright (C) 2011-2012, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -37,8 +37,6 @@ include ${TOPDIR}/.config include ${TOPDIR}/tools/Config.mk include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs -LDSCRIPT = flash.ld - ifeq ($(WINTOOL),y) # Windows-native toolchains DIRLINK = $(TOPDIR)/tools/copydir.sh @@ -46,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/amber.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include" ARCHXXINCLUDES = $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx" - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/amber.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/amber/scripts/amber.ld b/boards/avr/amber/scripts/amber.ld similarity index 99% rename from boards/amber/scripts/amber.ld rename to boards/avr/amber/scripts/amber.ld index 354bfe6636..cb04703f02 100644 --- a/boards/amber/scripts/amber.ld +++ b/boards/avr/amber/scripts/amber.ld @@ -1,5 +1,5 @@ /************************************************************************************** - * boards/amber/scripts/amber.ld + * boards/avr/amber/scripts/amber.ld * * Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/stm32f4discovery/src/.gitignore b/boards/avr/amber/src/.gitignore similarity index 100% rename from boards/stm32f4discovery/src/.gitignore rename to boards/avr/amber/src/.gitignore diff --git a/boards/amber/src/Makefile b/boards/avr/amber/src/Makefile similarity index 98% rename from boards/amber/src/Makefile rename to boards/avr/amber/src/Makefile index 4be08a5de3..1ea72fa49f 100644 --- a/boards/amber/src/Makefile +++ b/boards/avr/amber/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/amber/src/Makefile +# boards/avr/amber/src/Makefile # # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/amber/src/amber.h b/boards/avr/amber/src/amber.h similarity index 96% rename from boards/amber/src/amber.h rename to boards/avr/amber/src/amber.h index 3b654b8d85..772bf4a547 100644 --- a/boards/amber/src/amber.h +++ b/boards/avr/amber/src/amber.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/amber/src/amber.h + * boards/avr/amber/src/amber.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_AMBER_SRC_AMBER_H -#define __BOARDS_AMBER_SRC_AMBER_H +#ifndef __BOARDS_AVR_AMBER_SRC_AMBER_H +#define __BOARDS_AVR_AMBER_SRC_AMBER_H /**************************************************************************** * Included Files @@ -99,4 +99,4 @@ void atmega_led_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_AMBER_SRC_AMBER_H */ +#endif /* __BOARDS_AVR_AMBER_SRC_AMBER_H */ diff --git a/boards/amber/src/atmega_boot.c b/boards/avr/amber/src/atmega_boot.c similarity index 98% rename from boards/amber/src/atmega_boot.c rename to boards/avr/amber/src/atmega_boot.c index 7aea93ab2c..669aabc6ea 100644 --- a/boards/amber/src/atmega_boot.c +++ b/boards/avr/amber/src/atmega_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/amber/src/atmega_boot.c + * boards/avr/amber/src/atmega_boot.c * * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arduino-mega2560/Kconfig b/boards/avr/arduino-mega2560/Kconfig similarity index 100% rename from boards/arduino-mega2560/Kconfig rename to boards/avr/arduino-mega2560/Kconfig diff --git a/boards/arduino-mega2560/README.txt b/boards/avr/arduino-mega2560/README.txt similarity index 100% rename from boards/arduino-mega2560/README.txt rename to boards/avr/arduino-mega2560/README.txt diff --git a/boards/arduino-mega2560/configs/hello/defconfig b/boards/avr/arduino-mega2560/configs/hello/defconfig similarity index 100% rename from boards/arduino-mega2560/configs/hello/defconfig rename to boards/avr/arduino-mega2560/configs/hello/defconfig diff --git a/boards/arduino-mega2560/configs/nsh/defconfig b/boards/avr/arduino-mega2560/configs/nsh/defconfig similarity index 100% rename from boards/arduino-mega2560/configs/nsh/defconfig rename to boards/avr/arduino-mega2560/configs/nsh/defconfig diff --git a/boards/arduino-mega2560/include/board.h b/boards/avr/arduino-mega2560/include/board.h similarity index 94% rename from boards/arduino-mega2560/include/board.h rename to boards/avr/arduino-mega2560/include/board.h index 238e0e3862..1a138d276d 100644 --- a/boards/arduino-mega2560/include/board.h +++ b/boards/avr/arduino-mega2560/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/arduino-mega2560/include/board.h + * boards/avr/arduino-mega2560/include/board.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARDUINO_MEGA2560_INCLUDE_BOARD_H -#define __BOARDS_ARDUINO_MEGA2560_INCLUDE_BOARD_H +#ifndef __BOARDS_AVR_ARDUINO_MEGA2560_INCLUDE_BOARD_H +#define __BOARDS_AVR_ARDUINO_MEGA2560_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -82,4 +82,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARDUINO_MEGA2560_INCLUDE_BOARD_H */ +#endif /* __BOARDS_AVR_ARDUINO_MEGA2560_INCLUDE_BOARD_H */ diff --git a/boards/arduino-mega2560/scripts/Make.defs b/boards/avr/arduino-mega2560/scripts/Make.defs similarity index 95% rename from boards/arduino-mega2560/scripts/Make.defs rename to boards/avr/arduino-mega2560/scripts/Make.defs index 10f1519330..a567195afa 100644 --- a/boards/arduino-mega2560/scripts/Make.defs +++ b/boards/avr/arduino-mega2560/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/arduino-mega2560/scripts/Make.defs +# boards/avr/arduino-mega2560/scripts/Make.defs # # Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include" ARCHXXINCLUDES = $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx" - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards)/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arduino-mega2560/scripts/flash.ld b/boards/avr/arduino-mega2560/scripts/flash.ld similarity index 99% rename from boards/arduino-mega2560/scripts/flash.ld rename to boards/avr/arduino-mega2560/scripts/flash.ld index 4f087d31d1..50746099b0 100644 --- a/boards/arduino-mega2560/scripts/flash.ld +++ b/boards/avr/arduino-mega2560/scripts/flash.ld @@ -1,5 +1,5 @@ /******************************************************************************* - * boards/arduino-mega2560/scripts/flash.ld + * boards/avr/arduino-mega2560/scripts/flash.ld * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arduino-mega2560/src/Makefile b/boards/avr/arduino-mega2560/src/Makefile similarity index 98% rename from boards/arduino-mega2560/src/Makefile rename to boards/avr/arduino-mega2560/src/Makefile index a4cbaf6f2b..a33b61cc31 100644 --- a/boards/arduino-mega2560/src/Makefile +++ b/boards/avr/arduino-mega2560/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/arduino-mega2560/src/Makefile +# boards/avr/arduino-mega2560/src/Makefile # # Copyright (C) 2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arduino-mega2560/src/arduino_mega2560.h b/boards/avr/arduino-mega2560/src/arduino_mega2560.h similarity index 92% rename from boards/arduino-mega2560/src/arduino_mega2560.h rename to boards/avr/arduino-mega2560/src/arduino_mega2560.h index 75a5805ef3..6f4eac534f 100644 --- a/boards/arduino-mega2560/src/arduino_mega2560.h +++ b/boards/avr/arduino-mega2560/src/arduino_mega2560.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/arduino-mega2560/src/arduino-mega2560.h + * boards/avr/arduino-mega2560/src/arduino-mega2560.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_H -#define __BOARDS_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_H +#ifndef __BOARDS_AVR_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_H +#define __BOARDS_AVR_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_H /**************************************************************************** * Included Files @@ -74,4 +74,4 @@ void atmega_led_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_H */ +#endif /* __BOARDS_AVR_ARDUINO_MEGA2560_SRC_ARDUINO_MEGA2560_H */ diff --git a/boards/arduino-mega2560/src/avr_boot.c b/boards/avr/arduino-mega2560/src/avr_boot.c similarity index 98% rename from boards/arduino-mega2560/src/avr_boot.c rename to boards/avr/arduino-mega2560/src/avr_boot.c index d77034c2d3..1966b2b337 100644 --- a/boards/arduino-mega2560/src/avr_boot.c +++ b/boards/avr/arduino-mega2560/src/avr_boot.c @@ -1,5 +1,5 @@ /****************************************************************************** - * boards/arduino-mega2560/src/avr_boot.c + * boards/avr/arduino-mega2560/src/avr_boot.c * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arduino-mega2560/src/avr_leds.c b/boards/avr/arduino-mega2560/src/avr_leds.c similarity index 98% rename from boards/arduino-mega2560/src/avr_leds.c rename to boards/avr/arduino-mega2560/src/avr_leds.c index 1c4481b3d2..34cb59d941 100644 --- a/boards/arduino-mega2560/src/avr_leds.c +++ b/boards/avr/arduino-mega2560/src/avr_leds.c @@ -1,5 +1,5 @@ /****************************************************************************** - * boards/arduino-mega2560/src/avr_leds.c + * boards/avr/arduino-mega2560/src/avr_leds.c * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/avr32dev1/Kconfig b/boards/avr/avr32dev1/Kconfig similarity index 100% rename from boards/avr32dev1/Kconfig rename to boards/avr/avr32dev1/Kconfig diff --git a/boards/avr32dev1/README.txt b/boards/avr/avr32dev1/README.txt similarity index 100% rename from boards/avr32dev1/README.txt rename to boards/avr/avr32dev1/README.txt diff --git a/boards/avr32dev1/configs/nsh/defconfig b/boards/avr/avr32dev1/configs/nsh/defconfig similarity index 100% rename from boards/avr32dev1/configs/nsh/defconfig rename to boards/avr/avr32dev1/configs/nsh/defconfig diff --git a/boards/avr32dev1/configs/ostest/defconfig b/boards/avr/avr32dev1/configs/ostest/defconfig similarity index 100% rename from boards/avr32dev1/configs/ostest/defconfig rename to boards/avr/avr32dev1/configs/ostest/defconfig diff --git a/boards/avr32dev1/include/board.h b/boards/avr/avr32dev1/include/board.h similarity index 97% rename from boards/avr32dev1/include/board.h rename to boards/avr/avr32dev1/include/board.h index 16e2e484c7..799d961ef9 100644 --- a/boards/avr32dev1/include/board.h +++ b/boards/avr/avr32dev1/include/board.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/avr32dev1/include/board.h + * boards/avr/avr32dev1/include/board.h * * Copyright (C) 2010-2011, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_AVR32DEV1_INCLUDE_BOARD_H -#define __BOARDS_AVR32DEV1_INCLUDE_BOARD_H +#ifndef __BOARDS_AVR_AVR32DEV1_INCLUDE_BOARD_H +#define __BOARDS_AVR_AVR32DEV1_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -160,5 +160,5 @@ #define BUTTON1 1 /* Bit 0: Button 1 */ #define BUTTON2 2 /* Bit 1: Button 2 */ -#endif /* __BOARDS_AVR32DEV1_INCLUDE_BOARD_H */ +#endif /* __BOARDS_AVR_AVR32DEV1_INCLUDE_BOARD_H */ diff --git a/boards/avr32dev1/scripts/Make.defs b/boards/avr/avr32dev1/scripts/Make.defs similarity index 95% rename from boards/avr32dev1/scripts/Make.defs rename to boards/avr/avr32dev1/scripts/Make.defs index 1389a8dc8b..612dee409a 100644 --- a/boards/avr32dev1/scripts/Make.defs +++ b/boards/avr/avr32dev1/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/avr32dev1/scripts/Make.defs +# boards/avr/avr32dev1/scripts/Make.defs # # Copyright (C) 2010, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/avr32dev1.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/avr32dev1.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/avr32dev1.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/avr32dev1.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/avr32dev1/scripts/avr32dev1.ld b/boards/avr/avr32dev1/scripts/avr32dev1.ld similarity index 98% rename from boards/avr32dev1/scripts/avr32dev1.ld rename to boards/avr/avr32dev1/scripts/avr32dev1.ld index ceb5e1cf64..91245262a7 100644 --- a/boards/avr32dev1/scripts/avr32dev1.ld +++ b/boards/avr/avr32dev1/scripts/avr32dev1.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/avr32dev1/scripts/avr32dev1.ld + * boards/avr/avr32dev1/scripts/avr32dev1.ld * * Copyright (C) 2010, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/stm32f746-ws/src/.gitignore b/boards/avr/avr32dev1/src/.gitignore similarity index 100% rename from boards/stm32f746-ws/src/.gitignore rename to boards/avr/avr32dev1/src/.gitignore diff --git a/boards/avr32dev1/src/Makefile b/boards/avr/avr32dev1/src/Makefile similarity index 98% rename from boards/avr32dev1/src/Makefile rename to boards/avr/avr32dev1/src/Makefile index 6a9531c3fe..88750362fd 100644 --- a/boards/avr32dev1/src/Makefile +++ b/boards/avr/avr32dev1/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/avr32dev1/src/Makefile +# boards/avr/avr32dev1/src/Makefile # # Copyright (C) 2010 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/avr32dev1/src/avr32_boot.c b/boards/avr/avr32dev1/src/avr32_boot.c similarity index 98% rename from boards/avr32dev1/src/avr32_boot.c rename to boards/avr/avr32dev1/src/avr32_boot.c index ac63859e8c..32564b4614 100644 --- a/boards/avr32dev1/src/avr32_boot.c +++ b/boards/avr/avr32dev1/src/avr32_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/avr32dev1/src/avr32_boot.c + * boards/avr/avr32dev1/src/avr32_boot.c * * Copyright (C) 2010, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/avr32dev1/src/avr32_buttons.c b/boards/avr/avr32dev1/src/avr32_buttons.c similarity index 99% rename from boards/avr32dev1/src/avr32_buttons.c rename to boards/avr/avr32dev1/src/avr32_buttons.c index 3dfbc3e3af..1bd37b51e6 100644 --- a/boards/avr32dev1/src/avr32_buttons.c +++ b/boards/avr/avr32dev1/src/avr32_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/avr32dev1/src/avr32_buttons.c + * boards/avr/avr32dev1/src/avr32_buttons.c * * Copyright (C) 2010-2011, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/avr32dev1/src/avr32_leds.c b/boards/avr/avr32dev1/src/avr32_leds.c similarity index 98% rename from boards/avr32dev1/src/avr32_leds.c rename to boards/avr/avr32dev1/src/avr32_leds.c index 77abd43d41..ef368ed613 100644 --- a/boards/avr32dev1/src/avr32_leds.c +++ b/boards/avr/avr32dev1/src/avr32_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/avr32dev1/src/avr32_leds.c + * boards/avr/avr32dev1/src/avr32_leds.c * * Copyright (C) 2010, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/avr32dev1/src/avr32dev1.h b/boards/avr/avr32dev1/src/avr32dev1.h similarity index 99% rename from boards/avr32dev1/src/avr32dev1.h rename to boards/avr/avr32dev1/src/avr32dev1.h index 2e4593624c..246f5fadb0 100644 --- a/boards/avr32dev1/src/avr32dev1.h +++ b/boards/avr/avr32dev1/src/avr32dev1.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/avr32dev1/src/avr32dev1.h + * boards/avr/avr32dev1/src/avr32dev1.h * * Copyright (C) 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/avr32dev1/tools/doisp.sh b/boards/avr/avr32dev1/tools/doisp.sh similarity index 100% rename from boards/avr32dev1/tools/doisp.sh rename to boards/avr/avr32dev1/tools/doisp.sh diff --git a/boards/micropendous3/Kconfig b/boards/avr/micropendous3/Kconfig similarity index 100% rename from boards/micropendous3/Kconfig rename to boards/avr/micropendous3/Kconfig diff --git a/boards/micropendous3/README.txt b/boards/avr/micropendous3/README.txt similarity index 100% rename from boards/micropendous3/README.txt rename to boards/avr/micropendous3/README.txt diff --git a/boards/micropendous3/configs/hello/defconfig b/boards/avr/micropendous3/configs/hello/defconfig similarity index 100% rename from boards/micropendous3/configs/hello/defconfig rename to boards/avr/micropendous3/configs/hello/defconfig diff --git a/boards/micropendous3/include/board.h b/boards/avr/micropendous3/include/board.h similarity index 95% rename from boards/micropendous3/include/board.h rename to boards/avr/micropendous3/include/board.h index 69982f9980..d3e20baf74 100644 --- a/boards/micropendous3/include/board.h +++ b/boards/avr/micropendous3/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/micropendous3/include/board.h + * boards/avr/micropendous3/include/board.h * include/arch/board/board.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_MICROPENDOUS3_INCLUDE_BOARD_H -#define __BOARDS_MICROPENDOUS3_INCLUDE_BOARD_H +#ifndef __BOARDS_AVR_MICROPENDOUS3_INCLUDE_BOARD_H +#define __BOARDS_AVR_MICROPENDOUS3_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -98,4 +98,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_MICROPENDOUS3_INCLUDE_BOARD_H */ +#endif /* __BOARDS_AVR_MICROPENDOUS3_INCLUDE_BOARD_H */ diff --git a/boards/amber/scripts/Make.defs b/boards/avr/micropendous3/scripts/Make.defs similarity index 95% rename from boards/amber/scripts/Make.defs rename to boards/avr/micropendous3/scripts/Make.defs index 00ebb10665..b74270720a 100644 --- a/boards/amber/scripts/Make.defs +++ b/boards/avr/micropendous3/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/amber/scripts/Make.defs +# boards/avr/micropendous3/scripts/Make.defs # # Copyright (C) 2011-2012, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/amber.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/micropendous3.ld" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include" ARCHXXINCLUDES = $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx" - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/amber.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/micropendous3.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/micropendous3/scripts/micropendous3.ld b/boards/avr/micropendous3/scripts/micropendous3.ld similarity index 99% rename from boards/micropendous3/scripts/micropendous3.ld rename to boards/avr/micropendous3/scripts/micropendous3.ld index 247d1e64c4..2a23e5faed 100644 --- a/boards/micropendous3/scripts/micropendous3.ld +++ b/boards/avr/micropendous3/scripts/micropendous3.ld @@ -1,5 +1,5 @@ /************************************************************************************** - * boards/micropendous3/scripts/micropendous3.ld + * boards/avr/micropendous3/scripts/micropendous3.ld * * Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/stm32f746g-disco/src/.gitignore b/boards/avr/micropendous3/src/.gitignore similarity index 100% rename from boards/stm32f746g-disco/src/.gitignore rename to boards/avr/micropendous3/src/.gitignore diff --git a/boards/micropendous3/src/Makefile b/boards/avr/micropendous3/src/Makefile similarity index 97% rename from boards/micropendous3/src/Makefile rename to boards/avr/micropendous3/src/Makefile index 5103006f94..efe7d8b07d 100644 --- a/boards/micropendous3/src/Makefile +++ b/boards/avr/micropendous3/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/micropendous3/src/Makefile +# boards/avr/micropendous3/src/Makefile # # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/micropendous3/src/at90usb_boot.c b/boards/avr/micropendous3/src/at90usb_boot.c similarity index 98% rename from boards/micropendous3/src/at90usb_boot.c rename to boards/avr/micropendous3/src/at90usb_boot.c index 1bb32b49a1..c21f4a535c 100644 --- a/boards/micropendous3/src/at90usb_boot.c +++ b/boards/avr/micropendous3/src/at90usb_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/micropendous3/src/at90usb_boot.c + * boards/avr/micropendous3/src/at90usb_boot.c * * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/micropendous3/src/micropendous3.h b/boards/avr/micropendous3/src/micropendous3.h similarity index 94% rename from boards/micropendous3/src/micropendous3.h rename to boards/avr/micropendous3/src/micropendous3.h index 146d990fe6..cc3e38b96f 100644 --- a/boards/micropendous3/src/micropendous3.h +++ b/boards/avr/micropendous3/src/micropendous3.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/micropendous3/src/micropendous3.h + * boards/avr/micropendous3/src/micropendous3.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_MICROPENDOUS3_SRC_MICROPENDOUS3_H -#define __BOARDS_MICROPENDOUS3_SRC_MICROPENDOUS3_H +#ifndef __BOARDS_AVR_MICROPENDOUS3_SRC_MICROPENDOUS3_H +#define __BOARDS_AVR_MICROPENDOUS3_SRC_MICROPENDOUS3_H /**************************************************************************** * Included Files @@ -98,4 +98,4 @@ EXTERN void at90usb_led_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_MICROPENDOUS3_SRC_MICROPENDOUS3_H */ +#endif /* __BOARDS_AVR_MICROPENDOUS3_SRC_MICROPENDOUS3_H */ diff --git a/boards/misoc/Kconfig b/boards/avr/moteino-mega/Kconfig similarity index 100% rename from boards/misoc/Kconfig rename to boards/avr/moteino-mega/Kconfig diff --git a/boards/moteino-mega/README.txt b/boards/avr/moteino-mega/README.txt similarity index 100% rename from boards/moteino-mega/README.txt rename to boards/avr/moteino-mega/README.txt diff --git a/boards/moteino-mega/configs/hello/defconfig b/boards/avr/moteino-mega/configs/hello/defconfig similarity index 100% rename from boards/moteino-mega/configs/hello/defconfig rename to boards/avr/moteino-mega/configs/hello/defconfig diff --git a/boards/moteino-mega/configs/nsh/defconfig b/boards/avr/moteino-mega/configs/nsh/defconfig similarity index 100% rename from boards/moteino-mega/configs/nsh/defconfig rename to boards/avr/moteino-mega/configs/nsh/defconfig diff --git a/boards/moteino-mega/include/board.h b/boards/avr/moteino-mega/include/board.h similarity index 95% rename from boards/moteino-mega/include/board.h rename to boards/avr/moteino-mega/include/board.h index 8951f29538..524618fb1d 100644 --- a/boards/moteino-mega/include/board.h +++ b/boards/avr/moteino-mega/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/moteino-mega/include/board.h + * boards/avr/moteino-mega/include/board.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_MOTEINO_MEGA_INCLUDE_BOARD_H -#define __BOARDS_MOTEINO_MEGA_INCLUDE_BOARD_H +#ifndef __BOARDS_AVR_MOTEINO_MEGA_INCLUDE_BOARD_H +#define __BOARDS_AVR_MOTEINO_MEGA_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -94,4 +94,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_MOTEINO_MEGA_INCLUDE_BOARD_H */ +#endif /* __BOARDS_AVR_MOTEINO_MEGA_INCLUDE_BOARD_H */ diff --git a/boards/moteino-mega/scripts/Make.defs b/boards/avr/moteino-mega/scripts/Make.defs similarity index 95% rename from boards/moteino-mega/scripts/Make.defs rename to boards/avr/moteino-mega/scripts/Make.defs index b989b92921..4b66f3f87e 100644 --- a/boards/moteino-mega/scripts/Make.defs +++ b/boards/avr/moteino-mega/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/moteino-mega/scripts/Make.defs +# boards/avr/moteino-mega/scripts/Make.defs # # Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include" ARCHXXINCLUDES = $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx" - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards)/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/moteino-mega/scripts/ld.script b/boards/avr/moteino-mega/scripts/ld.script similarity index 99% rename from boards/moteino-mega/scripts/ld.script rename to boards/avr/moteino-mega/scripts/ld.script index ab1225bef8..f3c3fe1f37 100644 --- a/boards/moteino-mega/scripts/ld.script +++ b/boards/avr/moteino-mega/scripts/ld.script @@ -1,5 +1,5 @@ /************************************************************************************** - * boards/moteino-mega/scripts/ld.script + * boards/avr/moteino-mega/scripts/ld.script * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/stm32f769i-disco/src/.gitignore b/boards/avr/moteino-mega/src/.gitignore similarity index 100% rename from boards/stm32f769i-disco/src/.gitignore rename to boards/avr/moteino-mega/src/.gitignore diff --git a/boards/moteino-mega/src/Makefile b/boards/avr/moteino-mega/src/Makefile similarity index 97% rename from boards/moteino-mega/src/Makefile rename to boards/avr/moteino-mega/src/Makefile index 50e0b93355..1707ed7b3f 100644 --- a/boards/moteino-mega/src/Makefile +++ b/boards/avr/moteino-mega/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/moteino-mega/src/Makefile +# boards/avr/moteino-mega/src/Makefile # # Copyright (C) 2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/moteino-mega/src/avr_boot.c b/boards/avr/moteino-mega/src/avr_boot.c similarity index 98% rename from boards/moteino-mega/src/avr_boot.c rename to boards/avr/moteino-mega/src/avr_boot.c index 25f79fe09d..f7f33016c8 100644 --- a/boards/moteino-mega/src/avr_boot.c +++ b/boards/avr/moteino-mega/src/avr_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/moteino-mega/src/avr_boot.c + * boards/avr/moteino-mega/src/avr_boot.c * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/moteino-mega/src/avr_leds.c b/boards/avr/moteino-mega/src/avr_leds.c similarity index 99% rename from boards/moteino-mega/src/avr_leds.c rename to boards/avr/moteino-mega/src/avr_leds.c index 4d46bf6f2d..95c307a79a 100644 --- a/boards/moteino-mega/src/avr_leds.c +++ b/boards/avr/moteino-mega/src/avr_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/moteino-mega/src/avr_leds.c + * boards/avr/moteino-mega/src/avr_leds.c * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/moteino-mega/src/moteino_mega.h b/boards/avr/moteino-mega/src/moteino_mega.h similarity index 94% rename from boards/moteino-mega/src/moteino_mega.h rename to boards/avr/moteino-mega/src/moteino_mega.h index 26bf60621a..7208c60d63 100644 --- a/boards/moteino-mega/src/moteino_mega.h +++ b/boards/avr/moteino-mega/src/moteino_mega.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/moteino-mega/src/moteino-mega.h + * boards/avr/moteino-mega/src/moteino-mega.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_MOTEINO_MEGA_SRC_MOTEINO_MEGA_H -#define __BOARDS_MOTEINO_MEGA_SRC_MOTEINO_MEGA_H +#ifndef __BOARDS_AVR_MOTEINO_MEGA_SRC_MOTEINO_MEGA_H +#define __BOARDS_AVR_MOTEINO_MEGA_SRC_MOTEINO_MEGA_H /**************************************************************************** * Included Files @@ -99,4 +99,4 @@ void atmega_led_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_MOTEINO_MEGA_SRC_MOTEINO_MEGA_H */ +#endif /* __BOARDS_AVR_MOTEINO_MEGA_SRC_MOTEINO_MEGA_H */ diff --git a/boards/teensy-2.0/Kconfig b/boards/avr/teensy-2.0/Kconfig similarity index 100% rename from boards/teensy-2.0/Kconfig rename to boards/avr/teensy-2.0/Kconfig diff --git a/boards/teensy-2.0/README.txt b/boards/avr/teensy-2.0/README.txt similarity index 100% rename from boards/teensy-2.0/README.txt rename to boards/avr/teensy-2.0/README.txt diff --git a/boards/teensy-2.0/configs/hello/defconfig b/boards/avr/teensy-2.0/configs/hello/defconfig similarity index 100% rename from boards/teensy-2.0/configs/hello/defconfig rename to boards/avr/teensy-2.0/configs/hello/defconfig diff --git a/boards/teensy-2.0/configs/nsh/defconfig b/boards/avr/teensy-2.0/configs/nsh/defconfig similarity index 100% rename from boards/teensy-2.0/configs/nsh/defconfig rename to boards/avr/teensy-2.0/configs/nsh/defconfig diff --git a/boards/teensy-2.0/configs/usbmsc/defconfig b/boards/avr/teensy-2.0/configs/usbmsc/defconfig similarity index 100% rename from boards/teensy-2.0/configs/usbmsc/defconfig rename to boards/avr/teensy-2.0/configs/usbmsc/defconfig diff --git a/boards/teensy-2.0/include/board.h b/boards/avr/teensy-2.0/include/board.h similarity index 95% rename from boards/teensy-2.0/include/board.h rename to boards/avr/teensy-2.0/include/board.h index 25cc2382a7..e21e5ccefe 100644 --- a/boards/teensy-2.0/include/board.h +++ b/boards/avr/teensy-2.0/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/teensy-2.0/include/board.h + * boards/avr/teensy-2.0/include/board.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_TEENSY_20_INCLUDE_BOARD_H -#define __BOARDS_TEENSY_20_INCLUDE_BOARD_H +#ifndef __BOARDS_AVR_TEENSY_20_INCLUDE_BOARD_H +#define __BOARDS_AVR_TEENSY_20_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -96,4 +96,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_TEENSY_20_INCLUDE_BOARD_H */ +#endif /* __BOARDS_AVR_TEENSY_20_INCLUDE_BOARD_H */ diff --git a/boards/micropendous3/scripts/Make.defs b/boards/avr/teensy-2.0/scripts/Make.defs similarity index 94% rename from boards/micropendous3/scripts/Make.defs rename to boards/avr/teensy-2.0/scripts/Make.defs index 91ad033dc0..a8e38d105d 100644 --- a/boards/micropendous3/scripts/Make.defs +++ b/boards/avr/teensy-2.0/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/micropendous3/scripts/Make.defs +# boards/avr/teensy-2.0/scripts/Make.defs # # Copyright (C) 2011-2012, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -37,6 +37,8 @@ include ${TOPDIR}/.config include ${TOPDIR}/tools/Config.mk include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs +LDSCRIPT = flash.ld + ifeq ($(WINTOOL),y) # Windows-native toolchains DIRLINK = $(TOPDIR)/tools/copydir.sh @@ -44,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/micropendous3.ld" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include" ARCHXXINCLUDES = $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx" - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/micropendous3.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/teensy-2.0/scripts/flash.ld b/boards/avr/teensy-2.0/scripts/flash.ld similarity index 99% rename from boards/teensy-2.0/scripts/flash.ld rename to boards/avr/teensy-2.0/scripts/flash.ld index ba9953bd2b..58de14cff2 100644 --- a/boards/teensy-2.0/scripts/flash.ld +++ b/boards/avr/teensy-2.0/scripts/flash.ld @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/teensy-2.0/scripts/flash.ld + * boards/avr/teensy-2.0/scripts/flash.ld * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/stm32l4r9ai-disco/src/.gitignore b/boards/avr/teensy-2.0/src/.gitignore similarity index 100% rename from boards/stm32l4r9ai-disco/src/.gitignore rename to boards/avr/teensy-2.0/src/.gitignore diff --git a/boards/teensy-2.0/src/Makefile b/boards/avr/teensy-2.0/src/Makefile similarity index 98% rename from boards/teensy-2.0/src/Makefile rename to boards/avr/teensy-2.0/src/Makefile index efba98d5bf..bcd9b42a3e 100644 --- a/boards/teensy-2.0/src/Makefile +++ b/boards/avr/teensy-2.0/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/teensy-2.0/src/Makefile +# boards/avr/teensy-2.0/src/Makefile # # Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/teensy-2.0/src/at90usb_appinit.c b/boards/avr/teensy-2.0/src/at90usb_appinit.c similarity index 98% rename from boards/teensy-2.0/src/at90usb_appinit.c rename to boards/avr/teensy-2.0/src/at90usb_appinit.c index 8aad2b665c..b59e2ff8b8 100644 --- a/boards/teensy-2.0/src/at90usb_appinit.c +++ b/boards/avr/teensy-2.0/src/at90usb_appinit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/teensy-2.0/src/at90usb_appinit.c + * boards/avr/teensy-2.0/src/at90usb_appinit.c * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/teensy-2.0/src/at90usb_boot.c b/boards/avr/teensy-2.0/src/at90usb_boot.c similarity index 98% rename from boards/teensy-2.0/src/at90usb_boot.c rename to boards/avr/teensy-2.0/src/at90usb_boot.c index 89697651f2..7d83c365ca 100644 --- a/boards/teensy-2.0/src/at90usb_boot.c +++ b/boards/avr/teensy-2.0/src/at90usb_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/teensy-2.0/src/at90usb_boot.c + * boards/avr/teensy-2.0/src/at90usb_boot.c * * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/teensy-2.0/src/at90usb_leds.c b/boards/avr/teensy-2.0/src/at90usb_leds.c similarity index 99% rename from boards/teensy-2.0/src/at90usb_leds.c rename to boards/avr/teensy-2.0/src/at90usb_leds.c index 29cd9891c4..e90456ac6b 100644 --- a/boards/teensy-2.0/src/at90usb_leds.c +++ b/boards/avr/teensy-2.0/src/at90usb_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/teensy-2.0/src/at90usb_leds.c + * boards/avr/teensy-2.0/src/at90usb_leds.c * * Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/teensy-2.0/src/at90usb_spi.c b/boards/avr/teensy-2.0/src/at90usb_spi.c similarity index 99% rename from boards/teensy-2.0/src/at90usb_spi.c rename to boards/avr/teensy-2.0/src/at90usb_spi.c index e011bc5f89..9edec08596 100644 --- a/boards/teensy-2.0/src/at90usb_spi.c +++ b/boards/avr/teensy-2.0/src/at90usb_spi.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/teensy-2.0/src/at90usb_spi.c + * boards/avr/teensy-2.0/src/at90usb_spi.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/teensy-2.0/src/at90usb_usbmsc.c b/boards/avr/teensy-2.0/src/at90usb_usbmsc.c similarity index 98% rename from boards/teensy-2.0/src/at90usb_usbmsc.c rename to boards/avr/teensy-2.0/src/at90usb_usbmsc.c index e157adf949..0702d8ff24 100644 --- a/boards/teensy-2.0/src/at90usb_usbmsc.c +++ b/boards/avr/teensy-2.0/src/at90usb_usbmsc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/teens-2.0/src/at90usb_usbmsc.c + * boards/avr/teens-2.0/src/at90usb_usbmsc.c * * Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/teensy-2.0/src/teensy-20.h b/boards/avr/teensy-2.0/src/teensy-20.h similarity index 94% rename from boards/teensy-2.0/src/teensy-20.h rename to boards/avr/teensy-2.0/src/teensy-20.h index cd0b11eb33..8bb2fc3822 100644 --- a/boards/teensy-2.0/src/teensy-20.h +++ b/boards/avr/teensy-2.0/src/teensy-20.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/teensy-2.0/src/teensy-20.h + * boards/avr/teensy-2.0/src/teensy-20.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_TEENSY_20_SRC_TEENSY_H -#define __BOARDS_TEENSY_20_SRC_TEENSY_H +#ifndef __BOARDS_AVR_TEENSY_20_SRC_TEENSY_H +#define __BOARDS_AVR_TEENSY_20_SRC_TEENSY_H /**************************************************************************** * Included Files @@ -86,4 +86,4 @@ void at90usb_led_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_TEENSY_20_SRC_TEENSY_H */ +#endif /* __BOARDS_AVR_TEENSY_20_SRC_TEENSY_H */ diff --git a/boards/demo9s12ne64/Kconfig b/boards/hc/demo9s12ne64/Kconfig similarity index 100% rename from boards/demo9s12ne64/Kconfig rename to boards/hc/demo9s12ne64/Kconfig diff --git a/boards/demo9s12ne64/README.txt b/boards/hc/demo9s12ne64/README.txt similarity index 100% rename from boards/demo9s12ne64/README.txt rename to boards/hc/demo9s12ne64/README.txt diff --git a/boards/demo9s12ne64/configs/ostest/defconfig b/boards/hc/demo9s12ne64/configs/ostest/defconfig similarity index 100% rename from boards/demo9s12ne64/configs/ostest/defconfig rename to boards/hc/demo9s12ne64/configs/ostest/defconfig diff --git a/boards/demo9s12ne64/include/board.h b/boards/hc/demo9s12ne64/include/board.h similarity index 98% rename from boards/demo9s12ne64/include/board.h rename to boards/hc/demo9s12ne64/include/board.h index c0fec1f93f..54043e0c38 100644 --- a/boards/demo9s12ne64/include/board.h +++ b/boards/hc/demo9s12ne64/include/board.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/demo9s12ne64/include/board.h + * boards/hc/demo9s12ne64/include/board.h * include/arch/board/board.h * * Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved. diff --git a/boards/demo9s12ne64/scripts/Make.defs b/boards/hc/demo9s12ne64/scripts/Make.defs similarity index 96% rename from boards/demo9s12ne64/scripts/Make.defs rename to boards/hc/demo9s12ne64/scripts/Make.defs index a6148318d4..50b6f0b720 100644 --- a/boards/demo9s12ne64/scripts/Make.defs +++ b/boards/hc/demo9s12ne64/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/demo9s12ne64/scripts/Make.defs +# boards/hc/demo9s12ne64/scripts/Make.defs # # Copyright (C) 2009,2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -62,14 +62,14 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/ostest/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/ostest/$(LDSCRIPT)}" MAXOPTIMIZATION = -O2 else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/ostest/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/ostest/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/demo9s12ne64/scripts/demo9s12ne64-banked.ld b/boards/hc/demo9s12ne64/scripts/demo9s12ne64-banked.ld similarity index 98% rename from boards/demo9s12ne64/scripts/demo9s12ne64-banked.ld rename to boards/hc/demo9s12ne64/scripts/demo9s12ne64-banked.ld index 2c42493d89..8f1d9f6fc2 100644 --- a/boards/demo9s12ne64/scripts/demo9s12ne64-banked.ld +++ b/boards/hc/demo9s12ne64/scripts/demo9s12ne64-banked.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/demo9s12ne64/ostest/demo9s12ne64-banked.ld + * boards/hc/demo9s12ne64/ostest/demo9s12ne64-banked.ld * * Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld b/boards/hc/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld similarity index 98% rename from boards/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld rename to boards/hc/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld index bc507652fb..874aeca4a9 100644 --- a/boards/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld +++ b/boards/hc/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/demo9s12ne64/ostest/demo9s12ne64-banked.ld + * boards/hc/demo9s12ne64/ostest/demo9s12ne64-banked.ld * * Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/stm32ldiscovery/src/.gitignore b/boards/hc/demo9s12ne64/src/.gitignore similarity index 100% rename from boards/stm32ldiscovery/src/.gitignore rename to boards/hc/demo9s12ne64/src/.gitignore diff --git a/boards/demo9s12ne64/src/Makefile b/boards/hc/demo9s12ne64/src/Makefile similarity index 98% rename from boards/demo9s12ne64/src/Makefile rename to boards/hc/demo9s12ne64/src/Makefile index a5efd35b50..4e8a820353 100644 --- a/boards/demo9s12ne64/src/Makefile +++ b/boards/hc/demo9s12ne64/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/demo9s12ne64/src/Makefile +# boards/hc/demo9s12ne64/src/Makefile # # Copyright (C) 2009 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/demo9s12ne64/src/demo9s12ne64.h b/boards/hc/demo9s12ne64/src/demo9s12ne64.h similarity index 94% rename from boards/demo9s12ne64/src/demo9s12ne64.h rename to boards/hc/demo9s12ne64/src/demo9s12ne64.h index 03865d8c11..928a4ce7c6 100644 --- a/boards/demo9s12ne64/src/demo9s12ne64.h +++ b/boards/hc/demo9s12ne64/src/demo9s12ne64.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/demo9s12ne64/src/demo9s12ne64.h + * boards/hc/demo9s12ne64/src/demo9s12ne64.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_DEMO9S12NE64_SRC_DEMO9S12NE64_H -#define __BOARDS_DEMO9S12NE64_SRC_DEMO9S12NE64_H +#ifndef __BOARDS_HC_DEMO9S12NE64_SRC_DEMO9S12NE64_H +#define __BOARDS_HC_DEMO9S12NE64_SRC_DEMO9S12NE64_H /************************************************************************************ * Included Files @@ -74,4 +74,4 @@ void weak_function hcs12_spidev_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_DEMO9S12NE64_SRC_DEMO9S12NE64_H */ +#endif /* __BOARDS_HC_DEMO9S12NE64_SRC_DEMO9S12NE64_H */ diff --git a/boards/demo9s12ne64/src/m9s12_appinit.c b/boards/hc/demo9s12ne64/src/m9s12_appinit.c similarity index 100% rename from boards/demo9s12ne64/src/m9s12_appinit.c rename to boards/hc/demo9s12ne64/src/m9s12_appinit.c diff --git a/boards/demo9s12ne64/src/m9s12_boot.c b/boards/hc/demo9s12ne64/src/m9s12_boot.c similarity index 98% rename from boards/demo9s12ne64/src/m9s12_boot.c rename to boards/hc/demo9s12ne64/src/m9s12_boot.c index b673c449df..3441c8f854 100644 --- a/boards/demo9s12ne64/src/m9s12_boot.c +++ b/boards/hc/demo9s12ne64/src/m9s12_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/demo9s12ne64/src/m9s12_boot.c + * boards/hc/demo9s12ne64/src/m9s12_boot.c * * Copyright (C) 2009, 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/demo9s12ne64/src/m9s12_buttons.c b/boards/hc/demo9s12ne64/src/m9s12_buttons.c similarity index 98% rename from boards/demo9s12ne64/src/m9s12_buttons.c rename to boards/hc/demo9s12ne64/src/m9s12_buttons.c index 4fd590cda4..97e998320e 100644 --- a/boards/demo9s12ne64/src/m9s12_buttons.c +++ b/boards/hc/demo9s12ne64/src/m9s12_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/demo9s12ne64/src/m9s12_buttons.c + * boards/hc/demo9s12ne64/src/m9s12_buttons.c * * Copyright (C) 2009, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/demo9s12ne64/src/m9s12_leds.c b/boards/hc/demo9s12ne64/src/m9s12_leds.c similarity index 98% rename from boards/demo9s12ne64/src/m9s12_leds.c rename to boards/hc/demo9s12ne64/src/m9s12_leds.c index fbf1c7ea0e..de2dcc2228 100644 --- a/boards/demo9s12ne64/src/m9s12_leds.c +++ b/boards/hc/demo9s12ne64/src/m9s12_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/demo9s12ne64/src/m9s12_leds.c + * boards/hc/demo9s12ne64/src/m9s12_leds.c * * Copyright (C) 2009, 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/demo9s12ne64/src/m9s12_spi.c b/boards/hc/demo9s12ne64/src/m9s12_spi.c similarity index 99% rename from boards/demo9s12ne64/src/m9s12_spi.c rename to boards/hc/demo9s12ne64/src/m9s12_spi.c index 9ea70a7894..aa76226d37 100644 --- a/boards/demo9s12ne64/src/m9s12_spi.c +++ b/boards/hc/demo9s12ne64/src/m9s12_spi.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/demo9s12ne64/src/m9s12_spi.c + * boards/hc/demo9s12ne64/src/m9s12_spi.c * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/ne64badge/Kconfig b/boards/hc/ne64badge/Kconfig similarity index 100% rename from boards/ne64badge/Kconfig rename to boards/hc/ne64badge/Kconfig diff --git a/boards/ne64badge/README.txt b/boards/hc/ne64badge/README.txt similarity index 100% rename from boards/ne64badge/README.txt rename to boards/hc/ne64badge/README.txt diff --git a/boards/ne64badge/configs/ostest/defconfig b/boards/hc/ne64badge/configs/ostest/defconfig similarity index 100% rename from boards/ne64badge/configs/ostest/defconfig rename to boards/hc/ne64badge/configs/ostest/defconfig diff --git a/boards/ne64badge/include/board.h b/boards/hc/ne64badge/include/board.h similarity index 99% rename from boards/ne64badge/include/board.h rename to boards/hc/ne64badge/include/board.h index 151b751056..5ef9741eb0 100644 --- a/boards/ne64badge/include/board.h +++ b/boards/hc/ne64badge/include/board.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/ne64badge/include/board.h + * boards/hc/ne64badge/include/board.h * include/arch/board/board.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. diff --git a/boards/ne64badge/scripts/Make.defs b/boards/hc/ne64badge/scripts/Make.defs similarity index 96% rename from boards/ne64badge/scripts/Make.defs rename to boards/hc/ne64badge/scripts/Make.defs index fb18775b15..9eb34457f7 100644 --- a/boards/ne64badge/scripts/Make.defs +++ b/boards/hc/ne64badge/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/ne64badge/scripts/Make.defs +# boards/hc/ne64badge/scripts/Make.defs # # Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -62,14 +62,14 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" MAXOPTIMIZATION = -O2 else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/ne64badge/scripts/ne64badge-banked.ld b/boards/hc/ne64badge/scripts/ne64badge-banked.ld similarity index 99% rename from boards/ne64badge/scripts/ne64badge-banked.ld rename to boards/hc/ne64badge/scripts/ne64badge-banked.ld index 5a73a641a2..9882ee6f04 100644 --- a/boards/ne64badge/scripts/ne64badge-banked.ld +++ b/boards/hc/ne64badge/scripts/ne64badge-banked.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/ne64badge/ostest/ne64badge-banked.ld + * boards/hc/ne64badge/ostest/ne64badge-banked.ld * * Copyright (C) 2011m, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/ne64badge/scripts/ne64badge-nonbanked.ld b/boards/hc/ne64badge/scripts/ne64badge-nonbanked.ld similarity index 98% rename from boards/ne64badge/scripts/ne64badge-nonbanked.ld rename to boards/hc/ne64badge/scripts/ne64badge-nonbanked.ld index 5c6b8bab0f..fa5a2116c8 100644 --- a/boards/ne64badge/scripts/ne64badge-nonbanked.ld +++ b/boards/hc/ne64badge/scripts/ne64badge-nonbanked.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/ne64badge/ostest/ne64badge-nonbanked.ld + * boards/hc/ne64badge/ostest/ne64badge-nonbanked.ld * * Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/stm32vldiscovery/src/.gitignore b/boards/hc/ne64badge/src/.gitignore similarity index 100% rename from boards/stm32vldiscovery/src/.gitignore rename to boards/hc/ne64badge/src/.gitignore diff --git a/boards/ne64badge/src/Makefile b/boards/hc/ne64badge/src/Makefile similarity index 98% rename from boards/ne64badge/src/Makefile rename to boards/hc/ne64badge/src/Makefile index 604f081f0b..0495c712d1 100644 --- a/boards/ne64badge/src/Makefile +++ b/boards/hc/ne64badge/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/ne64badge/src/Makefile +# boards/hc/ne64badge/src/Makefile # # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/ne64badge/src/m9s12_appinit.c b/boards/hc/ne64badge/src/m9s12_appinit.c similarity index 100% rename from boards/ne64badge/src/m9s12_appinit.c rename to boards/hc/ne64badge/src/m9s12_appinit.c diff --git a/boards/ne64badge/src/m9s12_boot.c b/boards/hc/ne64badge/src/m9s12_boot.c similarity index 98% rename from boards/ne64badge/src/m9s12_boot.c rename to boards/hc/ne64badge/src/m9s12_boot.c index 9ad3eaca9a..c58452aa60 100644 --- a/boards/ne64badge/src/m9s12_boot.c +++ b/boards/hc/ne64badge/src/m9s12_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/ne64badge/src/m9s12_boot.c + * boards/hc/ne64badge/src/m9s12_boot.c * * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/ne64badge/src/m9s12_buttons.c b/boards/hc/ne64badge/src/m9s12_buttons.c similarity index 98% rename from boards/ne64badge/src/m9s12_buttons.c rename to boards/hc/ne64badge/src/m9s12_buttons.c index e3f2065034..afaec43c9d 100644 --- a/boards/ne64badge/src/m9s12_buttons.c +++ b/boards/hc/ne64badge/src/m9s12_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/ne64badge/src/m9s12_buttons.c + * boards/hc/ne64badge/src/m9s12_buttons.c * * Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/ne64badge/src/m9s12_leds.c b/boards/hc/ne64badge/src/m9s12_leds.c similarity index 99% rename from boards/ne64badge/src/m9s12_leds.c rename to boards/hc/ne64badge/src/m9s12_leds.c index 1321b1c497..0ec4cfb0a2 100644 --- a/boards/ne64badge/src/m9s12_leds.c +++ b/boards/hc/ne64badge/src/m9s12_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/ne64badge/src/m9s12_leds.c + * boards/hc/ne64badge/src/m9s12_leds.c * * Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/ne64badge/src/m9s12_spi.c b/boards/hc/ne64badge/src/m9s12_spi.c similarity index 99% rename from boards/ne64badge/src/m9s12_spi.c rename to boards/hc/ne64badge/src/m9s12_spi.c index c3211b35a4..a9de0706a7 100644 --- a/boards/ne64badge/src/m9s12_spi.c +++ b/boards/hc/ne64badge/src/m9s12_spi.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/ne64badge/src/m9s12_spi.c + * boards/hc/ne64badge/src/m9s12_spi.c * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/ne64badge/src/ne64badge.h b/boards/hc/ne64badge/src/ne64badge.h similarity index 97% rename from boards/ne64badge/src/ne64badge.h rename to boards/hc/ne64badge/src/ne64badge.h index c8ae80aa88..a57a9ed620 100644 --- a/boards/ne64badge/src/ne64badge.h +++ b/boards/hc/ne64badge/src/ne64badge.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/ne64badge/src/ne64badge.h + * boards/hc/ne64badge/src/ne64badge.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_NE64BADGE_SRC_NE64BADGE_H -#define __BOARDS_NE64BADGE_SRC_NE64BADGE_H +#ifndef __BOARDS_HC_NE64BADGE_SRC_NE64BADGE_H +#define __BOARDS_HC_NE64BADGE_SRC_NE64BADGE_H /************************************************************************************ * Included Files @@ -188,4 +188,4 @@ void weak_function hcs12_spidev_initialize(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_NE64BADGE_SRC_NE64BADGE_H */ +#endif /* __BOARDS_HC_NE64BADGE_SRC_NE64BADGE_H */ diff --git a/boards/flipnclick-pic32mz/Kconfig b/boards/mips/flipnclick-pic32mz/Kconfig similarity index 100% rename from boards/flipnclick-pic32mz/Kconfig rename to boards/mips/flipnclick-pic32mz/Kconfig diff --git a/boards/flipnclick-pic32mz/README.txt b/boards/mips/flipnclick-pic32mz/README.txt similarity index 100% rename from boards/flipnclick-pic32mz/README.txt rename to boards/mips/flipnclick-pic32mz/README.txt diff --git a/boards/flipnclick-pic32mz/configs/nsh/defconfig b/boards/mips/flipnclick-pic32mz/configs/nsh/defconfig similarity index 100% rename from boards/flipnclick-pic32mz/configs/nsh/defconfig rename to boards/mips/flipnclick-pic32mz/configs/nsh/defconfig diff --git a/boards/flipnclick-pic32mz/configs/nxlines/defconfig b/boards/mips/flipnclick-pic32mz/configs/nxlines/defconfig similarity index 100% rename from boards/flipnclick-pic32mz/configs/nxlines/defconfig rename to boards/mips/flipnclick-pic32mz/configs/nxlines/defconfig diff --git a/boards/flipnclick-pic32mz/include/board.h b/boards/mips/flipnclick-pic32mz/include/board.h similarity index 97% rename from boards/flipnclick-pic32mz/include/board.h rename to boards/mips/flipnclick-pic32mz/include/board.h index 0a83a02f3b..fa1b8c3eeb 100644 --- a/boards/flipnclick-pic32mz/include/board.h +++ b/boards/mips/flipnclick-pic32mz/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/flipnclick-pic32mz/include/board.h + * boards/mips/flipnclick-pic32mz/include/board.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_FLIPNCLICK_PIC32MZ_INCLUDE_BOARD_H -#define __BOARDS_FLIPNCLICK_PIC32MZ_INCLUDE_BOARD_H +#ifndef __BOARDS_MIPS_FLIPNCLICK_PIC32MZ_INCLUDE_BOARD_H +#define __BOARDS_MIPS_FLIPNCLICK_PIC32MZ_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -335,7 +335,7 @@ * MOSI SPI1_MOSI RD3 MOSI SPI1_MOSI RD3 * * Chip select pin definitions are provided in - * boards/flipnclick-pic32mz/src/flipnclick-pic32mz.h. + * boards/mips/flipnclick-pic32mz/src/flipnclick-pic32mz.h. * * CLK (output) pins have no alternative pin configurations. */ @@ -377,4 +377,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_FLIPNCLICK_PIC32MZ_INCLUDE_BOARD_H */ +#endif /* __BOARDS_MIPS_FLIPNCLICK_PIC32MZ_INCLUDE_BOARD_H */ diff --git a/boards/flipnclick-pic32mz/scripts/Make.defs b/boards/mips/flipnclick-pic32mz/scripts/Make.defs similarity index 97% rename from boards/flipnclick-pic32mz/scripts/Make.defs rename to boards/mips/flipnclick-pic32mz/scripts/Make.defs index ff93c61932..7412d0a361 100644 --- a/boards/flipnclick-pic32mz/scripts/Make.defs +++ b/boards/mips/flipnclick-pic32mz/scripts/Make.defs @@ -70,13 +70,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/flipnclick-pic32mz/scripts/c32-debug.ld b/boards/mips/flipnclick-pic32mz/scripts/c32-debug.ld similarity index 99% rename from boards/flipnclick-pic32mz/scripts/c32-debug.ld rename to boards/mips/flipnclick-pic32mz/scripts/c32-debug.ld index e4c94d1b6a..6805c0228d 100644 --- a/boards/flipnclick-pic32mz/scripts/c32-debug.ld +++ b/boards/mips/flipnclick-pic32mz/scripts/c32-debug.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/flipnclick-pic32mz/nsh/c32-debug.ld + * boards/mips/flipnclick-pic32mz/nsh/c32-debug.ld * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/flipnclick-pic32mz/scripts/mips-debug.ld b/boards/mips/flipnclick-pic32mz/scripts/mips-debug.ld similarity index 99% rename from boards/flipnclick-pic32mz/scripts/mips-debug.ld rename to boards/mips/flipnclick-pic32mz/scripts/mips-debug.ld index 0cea856d2f..bd41e6c3f6 100644 --- a/boards/flipnclick-pic32mz/scripts/mips-debug.ld +++ b/boards/mips/flipnclick-pic32mz/scripts/mips-debug.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/flipnclick-pic32mz/nsh/mips-debug.ld + * boards/mips/flipnclick-pic32mz/nsh/mips-debug.ld * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/flipnclick-pic32mz/scripts/pinguino-debug.ld b/boards/mips/flipnclick-pic32mz/scripts/pinguino-debug.ld similarity index 99% rename from boards/flipnclick-pic32mz/scripts/pinguino-debug.ld rename to boards/mips/flipnclick-pic32mz/scripts/pinguino-debug.ld index 5fb8eba050..1f04ea0946 100644 --- a/boards/flipnclick-pic32mz/scripts/pinguino-debug.ld +++ b/boards/mips/flipnclick-pic32mz/scripts/pinguino-debug.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/flipnclick-pic32mz/nsh/mips-debug.ld + * boards/mips/flipnclick-pic32mz/nsh/mips-debug.ld * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/flipnclick-pic32mz/scripts/xc32-debug.ld b/boards/mips/flipnclick-pic32mz/scripts/xc32-debug.ld similarity index 99% rename from boards/flipnclick-pic32mz/scripts/xc32-debug.ld rename to boards/mips/flipnclick-pic32mz/scripts/xc32-debug.ld index 25e08a6dbf..a62dbe37bd 100644 --- a/boards/flipnclick-pic32mz/scripts/xc32-debug.ld +++ b/boards/mips/flipnclick-pic32mz/scripts/xc32-debug.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/flipnclick-pic32mz/nsh/mips-debug.ld + * boards/mips/flipnclick-pic32mz/nsh/mips-debug.ld * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/sure-pic32mx/src/.gitignore b/boards/mips/flipnclick-pic32mz/src/.gitignore similarity index 100% rename from boards/sure-pic32mx/src/.gitignore rename to boards/mips/flipnclick-pic32mz/src/.gitignore diff --git a/boards/flipnclick-pic32mz/src/Makefile b/boards/mips/flipnclick-pic32mz/src/Makefile similarity index 100% rename from boards/flipnclick-pic32mz/src/Makefile rename to boards/mips/flipnclick-pic32mz/src/Makefile diff --git a/boards/flipnclick-pic32mz/src/flipnclick-pic32mz.h b/boards/mips/flipnclick-pic32mz/src/flipnclick-pic32mz.h similarity index 97% rename from boards/flipnclick-pic32mz/src/flipnclick-pic32mz.h rename to boards/mips/flipnclick-pic32mz/src/flipnclick-pic32mz.h index e1d5fdbe21..994ec07e69 100644 --- a/boards/flipnclick-pic32mz/src/flipnclick-pic32mz.h +++ b/boards/mips/flipnclick-pic32mz/src/flipnclick-pic32mz.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/flipnclick-pic32mz/src/flipnclick-pic32mz.h + * boards/mips/flipnclick-pic32mz/src/flipnclick-pic32mz.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_FLIPNCLICK_PIC32MZ_SRC_FLIPNCLICK_PIC32MZ_H -#define __BOARDS_FLIPNCLICK_PIC32MZ_SRC_FLIPNCLICK_PIC32MZ_H +#ifndef __BOARDS_MIPS_FLIPNCLICK_PIC32MZ_SRC_FLIPNCLICK_PIC32MZ_H +#define __BOARDS_MIPS_FLIPNCLICK_PIC32MZ_SRC_FLIPNCLICK_PIC32MZ_H /**************************************************************************** * Included Files @@ -291,4 +291,4 @@ FAR struct lcd_dev_s *pic32mz_graphics_setup(unsigned int devno); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_FLIPNCLICK_PIC32MZ_SRC_FLIPNCLICK_PIC32MZ_H */ +#endif /* __BOARDS_MIPS_FLIPNCLICK_PIC32MZ_SRC_FLIPNCLICK_PIC32MZ_H */ diff --git a/boards/flipnclick-pic32mz/src/pic32mz_appinit.c b/boards/mips/flipnclick-pic32mz/src/pic32mz_appinit.c similarity index 100% rename from boards/flipnclick-pic32mz/src/pic32mz_appinit.c rename to boards/mips/flipnclick-pic32mz/src/pic32mz_appinit.c diff --git a/boards/flipnclick-pic32mz/src/pic32mz_autoleds.c b/boards/mips/flipnclick-pic32mz/src/pic32mz_autoleds.c similarity index 99% rename from boards/flipnclick-pic32mz/src/pic32mz_autoleds.c rename to boards/mips/flipnclick-pic32mz/src/pic32mz_autoleds.c index d3191ad7f8..eb44e72d48 100644 --- a/boards/flipnclick-pic32mz/src/pic32mz_autoleds.c +++ b/boards/mips/flipnclick-pic32mz/src/pic32mz_autoleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/flipnclick-pic32mz/src/pic32mz_leds.c + * boards/mips/flipnclick-pic32mz/src/pic32mz_leds.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/flipnclick-pic32mz/src/pic32mz_boot.c b/boards/mips/flipnclick-pic32mz/src/pic32mz_boot.c similarity index 98% rename from boards/flipnclick-pic32mz/src/pic32mz_boot.c rename to boards/mips/flipnclick-pic32mz/src/pic32mz_boot.c index c093b95dfe..657e79bbe2 100644 --- a/boards/flipnclick-pic32mz/src/pic32mz_boot.c +++ b/boards/mips/flipnclick-pic32mz/src/pic32mz_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/flipnclick-pic32mz/src/pic32mz_boot.c + * boards/mips/flipnclick-pic32mz/src/pic32mz_boot.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/flipnclick-pic32mz/src/pic32mz_bringup.c b/boards/mips/flipnclick-pic32mz/src/pic32mz_bringup.c similarity index 100% rename from boards/flipnclick-pic32mz/src/pic32mz_bringup.c rename to boards/mips/flipnclick-pic32mz/src/pic32mz_bringup.c diff --git a/boards/flipnclick-pic32mz/src/pic32mz_buttons.c b/boards/mips/flipnclick-pic32mz/src/pic32mz_buttons.c similarity index 99% rename from boards/flipnclick-pic32mz/src/pic32mz_buttons.c rename to boards/mips/flipnclick-pic32mz/src/pic32mz_buttons.c index 7ee4f889fa..ff87c37456 100644 --- a/boards/flipnclick-pic32mz/src/pic32mz_buttons.c +++ b/boards/mips/flipnclick-pic32mz/src/pic32mz_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/flipnclick-pic32mz/src/pic32mz_buttons.c + * boards/mips/flipnclick-pic32mz/src/pic32mz_buttons.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/flipnclick-pic32mz/src/pic32mz_spi.c b/boards/mips/flipnclick-pic32mz/src/pic32mz_spi.c similarity index 99% rename from boards/flipnclick-pic32mz/src/pic32mz_spi.c rename to boards/mips/flipnclick-pic32mz/src/pic32mz_spi.c index 6339e94c58..3340261ddf 100644 --- a/boards/flipnclick-pic32mz/src/pic32mz_spi.c +++ b/boards/mips/flipnclick-pic32mz/src/pic32mz_spi.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/flipnclick-pic32mz/src/pic32mz_spi.c + * boards/mips/flipnclick-pic32mz/src/pic32mz_spi.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/flipnclick-pic32mz/src/pic32mz_ssd1306.c b/boards/mips/flipnclick-pic32mz/src/pic32mz_ssd1306.c similarity index 100% rename from boards/flipnclick-pic32mz/src/pic32mz_ssd1306.c rename to boards/mips/flipnclick-pic32mz/src/pic32mz_ssd1306.c diff --git a/boards/flipnclick-pic32mz/src/pic32mz_userleds.c b/boards/mips/flipnclick-pic32mz/src/pic32mz_userleds.c similarity index 98% rename from boards/flipnclick-pic32mz/src/pic32mz_userleds.c rename to boards/mips/flipnclick-pic32mz/src/pic32mz_userleds.c index 0e98194073..b16a8ddbd4 100644 --- a/boards/flipnclick-pic32mz/src/pic32mz_userleds.c +++ b/boards/mips/flipnclick-pic32mz/src/pic32mz_userleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/flipnclick-pic32mz/src/pic32mz_userleds.c + * boards/mips/flipnclick-pic32mz/src/pic32mz_userleds.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/mirtoo/Kconfig b/boards/mips/mirtoo/Kconfig similarity index 100% rename from boards/mirtoo/Kconfig rename to boards/mips/mirtoo/Kconfig diff --git a/boards/mirtoo/README.txt b/boards/mips/mirtoo/README.txt similarity index 100% rename from boards/mirtoo/README.txt rename to boards/mips/mirtoo/README.txt diff --git a/boards/mirtoo/configs/nsh/defconfig b/boards/mips/mirtoo/configs/nsh/defconfig similarity index 100% rename from boards/mirtoo/configs/nsh/defconfig rename to boards/mips/mirtoo/configs/nsh/defconfig diff --git a/boards/mirtoo/configs/nxffs/defconfig b/boards/mips/mirtoo/configs/nxffs/defconfig similarity index 100% rename from boards/mirtoo/configs/nxffs/defconfig rename to boards/mips/mirtoo/configs/nxffs/defconfig diff --git a/boards/mirtoo/include/board.h b/boards/mips/mirtoo/include/board.h similarity index 97% rename from boards/mirtoo/include/board.h rename to boards/mips/mirtoo/include/board.h index 5be8d18e12..76c6ffa5e9 100644 --- a/boards/mirtoo/include/board.h +++ b/boards/mips/mirtoo/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/mirtoo/include/board.h + * boards/mips/mirtoo/include/board.h * include/arch/board/board.h * * Copyright (C) 2012 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_MIRTOO_INCLUDE_BOARD_H -#define __BOARDS_MIRTOO_INCLUDE_BOARD_H +#ifndef __BOARDS_MIPS_MIRTOO_INCLUDE_BOARD_H +#define __BOARDS_MIPS_MIRTOO_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -172,4 +172,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_MIRTOO_INCLUDE_BOARD_H */ +#endif /* __BOARDS_MIPS_MIRTOO_INCLUDE_BOARD_H */ diff --git a/boards/mirtoo/scripts/Make.defs b/boards/mips/mirtoo/scripts/Make.defs similarity index 96% rename from boards/mirtoo/scripts/Make.defs rename to boards/mips/mirtoo/scripts/Make.defs index c9616d349b..8c408ac5e8 100644 --- a/boards/mirtoo/scripts/Make.defs +++ b/boards/mips/mirtoo/scripts/Make.defs @@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/mirtoo/scripts/c32-debug.ld b/boards/mips/mirtoo/scripts/c32-debug.ld similarity index 99% rename from boards/mirtoo/scripts/c32-debug.ld rename to boards/mips/mirtoo/scripts/c32-debug.ld index b3f4dccf92..f3894cbda1 100644 --- a/boards/mirtoo/scripts/c32-debug.ld +++ b/boards/mips/mirtoo/scripts/c32-debug.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/mirtoo/scripts/c32-debug.ld + * boards/mips/mirtoo/scripts/c32-debug.ld * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/mirtoo/scripts/c32-release.ld b/boards/mips/mirtoo/scripts/c32-release.ld similarity index 99% rename from boards/mirtoo/scripts/c32-release.ld rename to boards/mips/mirtoo/scripts/c32-release.ld index 03b38810be..e9a6d8caa9 100644 --- a/boards/mirtoo/scripts/c32-release.ld +++ b/boards/mips/mirtoo/scripts/c32-release.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/mirtoo/scripts/c32-release.ld + * boards/mips/mirtoo/scripts/c32-release.ld * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/mirtoo/scripts/mips-elf-debug.ld b/boards/mips/mirtoo/scripts/mips-elf-debug.ld similarity index 99% rename from boards/mirtoo/scripts/mips-elf-debug.ld rename to boards/mips/mirtoo/scripts/mips-elf-debug.ld index 931822c62a..848d92308c 100644 --- a/boards/mirtoo/scripts/mips-elf-debug.ld +++ b/boards/mips/mirtoo/scripts/mips-elf-debug.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/mirtoo/scripts/mips-elf-debug.ld + * boards/mips/mirtoo/scripts/mips-elf-debug.ld * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/mirtoo/scripts/mips-elf-release.ld b/boards/mips/mirtoo/scripts/mips-elf-release.ld similarity index 99% rename from boards/mirtoo/scripts/mips-elf-release.ld rename to boards/mips/mirtoo/scripts/mips-elf-release.ld index 05468374b9..912b978fe4 100644 --- a/boards/mirtoo/scripts/mips-elf-release.ld +++ b/boards/mips/mirtoo/scripts/mips-elf-release.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/mirtoo/scripts/mips-elf-release.ld + * boards/mips/mirtoo/scripts/mips-elf-release.ld * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/mirtoo/scripts/xc32-debug.ld b/boards/mips/mirtoo/scripts/xc32-debug.ld similarity index 99% rename from boards/mirtoo/scripts/xc32-debug.ld rename to boards/mips/mirtoo/scripts/xc32-debug.ld index 04dbb24d42..3cc72400d5 100644 --- a/boards/mirtoo/scripts/xc32-debug.ld +++ b/boards/mips/mirtoo/scripts/xc32-debug.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/mirtoo/scripts/xc32-debug.ld + * boards/mips/mirtoo/scripts/xc32-debug.ld * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/mirtoo/scripts/xc32-release.ld b/boards/mips/mirtoo/scripts/xc32-release.ld similarity index 99% rename from boards/mirtoo/scripts/xc32-release.ld rename to boards/mips/mirtoo/scripts/xc32-release.ld index e88b31cf9a..24af81c053 100644 --- a/boards/mirtoo/scripts/xc32-release.ld +++ b/boards/mips/mirtoo/scripts/xc32-release.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/mirtoo/scripts/xc32-release.ld + * boards/mips/mirtoo/scripts/xc32-release.ld * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/teensy-2.0/src/.gitignore b/boards/mips/mirtoo/src/.gitignore similarity index 100% rename from boards/teensy-2.0/src/.gitignore rename to boards/mips/mirtoo/src/.gitignore diff --git a/boards/mirtoo/src/Makefile b/boards/mips/mirtoo/src/Makefile similarity index 100% rename from boards/mirtoo/src/Makefile rename to boards/mips/mirtoo/src/Makefile diff --git a/boards/mirtoo/src/mirtoo.h b/boards/mips/mirtoo/src/mirtoo.h similarity index 96% rename from boards/mirtoo/src/mirtoo.h rename to boards/mips/mirtoo/src/mirtoo.h index 42e707dddc..fba9ab8bce 100644 --- a/boards/mirtoo/src/mirtoo.h +++ b/boards/mips/mirtoo/src/mirtoo.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/mirtoo/src/mirtoo.h + * boards/mips/mirtoo/src/mirtoo.h * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_MIRTOO_SRC_MIRTOO_H -#define __BOARDS_MIRTOO_SRC_MIRTOO_H +#ifndef __BOARDS_MIPS_MIRTOO_SRC_MIRTOO_H +#define __BOARDS_MIPS_MIRTOO_SRC_MIRTOO_H /**************************************************************************** * Included Files @@ -111,4 +111,4 @@ void pic32mx_led_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_MIRTOO_SRC_MIRTOO_H */ +#endif /* __BOARDS_MIPS_MIRTOO_SRC_MIRTOO_H */ diff --git a/boards/mirtoo/src/pic32_adc.c b/boards/mips/mirtoo/src/pic32_adc.c similarity index 100% rename from boards/mirtoo/src/pic32_adc.c rename to boards/mips/mirtoo/src/pic32_adc.c diff --git a/boards/mirtoo/src/pic32_appinit.c b/boards/mips/mirtoo/src/pic32_appinit.c similarity index 100% rename from boards/mirtoo/src/pic32_appinit.c rename to boards/mips/mirtoo/src/pic32_appinit.c diff --git a/boards/mirtoo/src/pic32_boot.c b/boards/mips/mirtoo/src/pic32_boot.c similarity index 99% rename from boards/mirtoo/src/pic32_boot.c rename to boards/mips/mirtoo/src/pic32_boot.c index d04671585e..a08fa88748 100644 --- a/boards/mirtoo/src/pic32_boot.c +++ b/boards/mips/mirtoo/src/pic32_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/mirtoo/src/pic32_boot.c + * boards/mips/mirtoo/src/pic32_boot.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/mirtoo/src/pic32_leds.c b/boards/mips/mirtoo/src/pic32_leds.c similarity index 99% rename from boards/mirtoo/src/pic32_leds.c rename to boards/mips/mirtoo/src/pic32_leds.c index ebe38dce68..0dde766719 100644 --- a/boards/mirtoo/src/pic32_leds.c +++ b/boards/mips/mirtoo/src/pic32_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/mirtoo/src/pic32_leds.c + * boards/mips/mirtoo/src/pic32_leds.c * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/mirtoo/src/pic32_spi2.c b/boards/mips/mirtoo/src/pic32_spi2.c similarity index 99% rename from boards/mirtoo/src/pic32_spi2.c rename to boards/mips/mirtoo/src/pic32_spi2.c index e6e45dda1f..41571248db 100644 --- a/boards/mirtoo/src/pic32_spi2.c +++ b/boards/mips/mirtoo/src/pic32_spi2.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/mirtoo/src/pic32_spi2.c + * boards/mips/mirtoo/src/pic32_spi2.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mx-starterkit/Kconfig b/boards/mips/pic32mx-starterkit/Kconfig similarity index 100% rename from boards/pic32mx-starterkit/Kconfig rename to boards/mips/pic32mx-starterkit/Kconfig diff --git a/boards/pic32mx-starterkit/README.txt b/boards/mips/pic32mx-starterkit/README.txt similarity index 100% rename from boards/pic32mx-starterkit/README.txt rename to boards/mips/pic32mx-starterkit/README.txt diff --git a/boards/pic32mx-starterkit/configs/nsh/defconfig b/boards/mips/pic32mx-starterkit/configs/nsh/defconfig similarity index 100% rename from boards/pic32mx-starterkit/configs/nsh/defconfig rename to boards/mips/pic32mx-starterkit/configs/nsh/defconfig diff --git a/boards/pic32mx-starterkit/configs/nsh2/defconfig b/boards/mips/pic32mx-starterkit/configs/nsh2/defconfig similarity index 100% rename from boards/pic32mx-starterkit/configs/nsh2/defconfig rename to boards/mips/pic32mx-starterkit/configs/nsh2/defconfig diff --git a/boards/pic32mx-starterkit/include/board.h b/boards/mips/pic32mx-starterkit/include/board.h similarity index 97% rename from boards/pic32mx-starterkit/include/board.h rename to boards/mips/pic32mx-starterkit/include/board.h index 910500a094..2dede21bd2 100644 --- a/boards/pic32mx-starterkit/include/board.h +++ b/boards/mips/pic32mx-starterkit/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mx-starterkit/include/board.h + * boards/mips/pic32mx-starterkit/include/board.h * include/arch/board/board.h * * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_SURE_PIC32MX_INCLUDE_BOARD_H -#define __BOARDS_SURE_PIC32MX_INCLUDE_BOARD_H +#ifndef __BOARDS_MIPS_SURE_PIC32MX_INCLUDE_BOARD_H +#define __BOARDS_MIPS_SURE_PIC32MX_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -203,4 +203,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SURE_PIC32MX_INCLUDE_BOARD_H */ +#endif /* __BOARDS_MIPS_SURE_PIC32MX_INCLUDE_BOARD_H */ diff --git a/boards/pic32mx-starterkit/scripts/Make.defs b/boards/mips/pic32mx-starterkit/scripts/Make.defs similarity index 96% rename from boards/pic32mx-starterkit/scripts/Make.defs rename to boards/mips/pic32mx-starterkit/scripts/Make.defs index d6275d4813..36483e6d9c 100644 --- a/boards/pic32mx-starterkit/scripts/Make.defs +++ b/boards/mips/pic32mx-starterkit/scripts/Make.defs @@ -60,13 +60,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/pic32mx-starterkit/scripts/c32-release.ld b/boards/mips/pic32mx-starterkit/scripts/c32-release.ld similarity index 99% rename from boards/pic32mx-starterkit/scripts/c32-release.ld rename to boards/mips/pic32mx-starterkit/scripts/c32-release.ld index 5b68db0e0a..5609fb1469 100644 --- a/boards/pic32mx-starterkit/scripts/c32-release.ld +++ b/boards/mips/pic32mx-starterkit/scripts/c32-release.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mx-starterkit/nsh/c32-release.script + * boards/mips/pic32mx-starterkit/nsh/c32-release.script * * Copyright (C) 2012i, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mx-starterkit/scripts/mips-release.ld b/boards/mips/pic32mx-starterkit/scripts/mips-release.ld similarity index 99% rename from boards/pic32mx-starterkit/scripts/mips-release.ld rename to boards/mips/pic32mx-starterkit/scripts/mips-release.ld index ed8b87f854..cd9325761b 100644 --- a/boards/pic32mx-starterkit/scripts/mips-release.ld +++ b/boards/mips/pic32mx-starterkit/scripts/mips-release.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mx-starterkit/nsh/mips-release.script + * boards/mips/pic32mx-starterkit/nsh/mips-release.script * * Copyright (C) 2012, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/teensy-3.x/src/.gitignore b/boards/mips/pic32mx-starterkit/src/.gitignore similarity index 100% rename from boards/teensy-3.x/src/.gitignore rename to boards/mips/pic32mx-starterkit/src/.gitignore diff --git a/boards/pic32mx-starterkit/src/Makefile b/boards/mips/pic32mx-starterkit/src/Makefile similarity index 100% rename from boards/pic32mx-starterkit/src/Makefile rename to boards/mips/pic32mx-starterkit/src/Makefile diff --git a/boards/pic32mx-starterkit/src/pic32mx-starterkit.h b/boards/mips/pic32mx-starterkit/src/pic32mx-starterkit.h similarity index 94% rename from boards/pic32mx-starterkit/src/pic32mx-starterkit.h rename to boards/mips/pic32mx-starterkit/src/pic32mx-starterkit.h index b3adb44f97..ba803531b0 100644 --- a/boards/pic32mx-starterkit/src/pic32mx-starterkit.h +++ b/boards/mips/pic32mx-starterkit/src/pic32mx-starterkit.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mx-starterkit/src/pic32mx-starterkit.h + * boards/mips/pic32mx-starterkit/src/pic32mx-starterkit.h * * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_PIC32MX_STARTERKIT_SRC_PIC32MX_STARTERKIT_H -#define __BOARDS_PIC32MX_STARTERKIT_SRC_PIC32MX_STARTERKIT_H +#ifndef __BOARDS_MIPS_PIC32MX_STARTERKIT_SRC_PIC32MX_STARTERKIT_H +#define __BOARDS_MIPS_PIC32MX_STARTERKIT_SRC_PIC32MX_STARTERKIT_H /**************************************************************************** * Included Files @@ -120,4 +120,4 @@ void pic32mx_led_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_PIC32MX_STARTERKIT_SRC_PIC32MX_STARTERKIT_H */ +#endif /* __BOARDS_MIPS_PIC32MX_STARTERKIT_SRC_PIC32MX_STARTERKIT_H */ diff --git a/boards/pic32mx-starterkit/src/pic32mx_appinit.c b/boards/mips/pic32mx-starterkit/src/pic32mx_appinit.c similarity index 100% rename from boards/pic32mx-starterkit/src/pic32mx_appinit.c rename to boards/mips/pic32mx-starterkit/src/pic32mx_appinit.c diff --git a/boards/pic32mx-starterkit/src/pic32mx_boot.c b/boards/mips/pic32mx-starterkit/src/pic32mx_boot.c similarity index 98% rename from boards/pic32mx-starterkit/src/pic32mx_boot.c rename to boards/mips/pic32mx-starterkit/src/pic32mx_boot.c index 8cc93bf963..c944dda13b 100644 --- a/boards/pic32mx-starterkit/src/pic32mx_boot.c +++ b/boards/mips/pic32mx-starterkit/src/pic32mx_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/pic32mx-starterkit/src/pic32mx_boot.c + * boards/mips/pic32mx-starterkit/src/pic32mx_boot.c * * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mx-starterkit/src/pic32mx_leds.c b/boards/mips/pic32mx-starterkit/src/pic32mx_leds.c similarity index 99% rename from boards/pic32mx-starterkit/src/pic32mx_leds.c rename to boards/mips/pic32mx-starterkit/src/pic32mx_leds.c index f40e9a7c33..b7f841ff83 100644 --- a/boards/pic32mx-starterkit/src/pic32mx_leds.c +++ b/boards/mips/pic32mx-starterkit/src/pic32mx_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mx-starterkit/src/pic32mx_leds.c + * boards/mips/pic32mx-starterkit/src/pic32mx_leds.c * * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mx-starterkit/src/pic32mx_spi.c b/boards/mips/pic32mx-starterkit/src/pic32mx_spi.c similarity index 99% rename from boards/pic32mx-starterkit/src/pic32mx_spi.c rename to boards/mips/pic32mx-starterkit/src/pic32mx_spi.c index e4969b8838..5cfaa051f3 100644 --- a/boards/pic32mx-starterkit/src/pic32mx_spi.c +++ b/boards/mips/pic32mx-starterkit/src/pic32mx_spi.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/pic32mx-starterkit/src/pic32mx_spi.c + * boards/mips/pic32mx-starterkit/src/pic32mx_spi.c * * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mx-starterkit/src/pic32mx_usbdev.c b/boards/mips/pic32mx-starterkit/src/pic32mx_usbdev.c similarity index 99% rename from boards/pic32mx-starterkit/src/pic32mx_usbdev.c rename to boards/mips/pic32mx-starterkit/src/pic32mx_usbdev.c index 8417d56ebc..4d353650ea 100644 --- a/boards/pic32mx-starterkit/src/pic32mx_usbdev.c +++ b/boards/mips/pic32mx-starterkit/src/pic32mx_usbdev.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/pic32mx-starterkit/src/pic32mx_usbdev.c + * boards/mips/pic32mx-starterkit/src/pic32mx_usbdev.c * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mx-starterkit/src/pic32mx_usbmsc.c b/boards/mips/pic32mx-starterkit/src/pic32mx_usbmsc.c similarity index 98% rename from boards/pic32mx-starterkit/src/pic32mx_usbmsc.c rename to boards/mips/pic32mx-starterkit/src/pic32mx_usbmsc.c index b9ad354aba..7475ccb536 100644 --- a/boards/pic32mx-starterkit/src/pic32mx_usbmsc.c +++ b/boards/mips/pic32mx-starterkit/src/pic32mx_usbmsc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mx-starterkit/src/up_usbmsc.c + * boards/mips/pic32mx-starterkit/src/up_usbmsc.c * * Copyright (C) 2012, 2013, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mx7mmb/Kconfig b/boards/mips/pic32mx7mmb/Kconfig similarity index 100% rename from boards/pic32mx7mmb/Kconfig rename to boards/mips/pic32mx7mmb/Kconfig diff --git a/boards/pic32mx7mmb/README.txt b/boards/mips/pic32mx7mmb/README.txt similarity index 100% rename from boards/pic32mx7mmb/README.txt rename to boards/mips/pic32mx7mmb/README.txt diff --git a/boards/pic32mx7mmb/configs/nsh/defconfig b/boards/mips/pic32mx7mmb/configs/nsh/defconfig similarity index 100% rename from boards/pic32mx7mmb/configs/nsh/defconfig rename to boards/mips/pic32mx7mmb/configs/nsh/defconfig diff --git a/boards/pic32mx7mmb/include/board.h b/boards/mips/pic32mx7mmb/include/board.h similarity index 97% rename from boards/pic32mx7mmb/include/board.h rename to boards/mips/pic32mx7mmb/include/board.h index e29fd13dd4..3ae511a691 100644 --- a/boards/pic32mx7mmb/include/board.h +++ b/boards/mips/pic32mx7mmb/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mx7mmb/include/board.h + * boards/mips/pic32mx7mmb/include/board.h * include/arch/board/board.h * * Copyright (C) 2012 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_MIKROELEKTRONIKA_PIC32MX7MMB_INCLUDE_BOARD_H -#define __BOARDS_MIKROELEKTRONIKA_PIC32MX7MMB_INCLUDE_BOARD_H +#ifndef __BOARDS_MIPS_MIKROELEKTRONIKA_PIC32MX7MMB_INCLUDE_BOARD_H +#define __BOARDS_MIPS_MIKROELEKTRONIKA_PIC32MX7MMB_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -209,4 +209,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_MIKROELEKTRONIKA_PIC32MX7MMB_INCLUDE_BOARD_H */ +#endif /* __BOARDS_MIPS_MIKROELEKTRONIKA_PIC32MX7MMB_INCLUDE_BOARD_H */ diff --git a/boards/pic32mx7mmb/scripts/Make.defs b/boards/mips/pic32mx7mmb/scripts/Make.defs similarity index 96% rename from boards/pic32mx7mmb/scripts/Make.defs rename to boards/mips/pic32mx7mmb/scripts/Make.defs index feb33e8f9a..9aaf346d04 100644 --- a/boards/pic32mx7mmb/scripts/Make.defs +++ b/boards/mips/pic32mx7mmb/scripts/Make.defs @@ -60,13 +60,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/pic32mx7mmb/scripts/c32-release.ld b/boards/mips/pic32mx7mmb/scripts/c32-release.ld similarity index 99% rename from boards/pic32mx7mmb/scripts/c32-release.ld rename to boards/mips/pic32mx7mmb/scripts/c32-release.ld index ff88877cf0..d3335e25f6 100644 --- a/boards/pic32mx7mmb/scripts/c32-release.ld +++ b/boards/mips/pic32mx7mmb/scripts/c32-release.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mx7mmb/scripts/c32-release.ld + * boards/mips/pic32mx7mmb/scripts/c32-release.ld * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mx7mmb/scripts/mips-release.ld b/boards/mips/pic32mx7mmb/scripts/mips-release.ld similarity index 99% rename from boards/pic32mx7mmb/scripts/mips-release.ld rename to boards/mips/pic32mx7mmb/scripts/mips-release.ld index 87840d5c8c..93e280829d 100644 --- a/boards/pic32mx7mmb/scripts/mips-release.ld +++ b/boards/mips/pic32mx7mmb/scripts/mips-release.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mx7mmb/scripts/mips-release.ld + * boards/mips/pic32mx7mmb/scripts/mips-release.ld * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/teensy-lc/src/.gitignore b/boards/mips/pic32mx7mmb/src/.gitignore similarity index 100% rename from boards/teensy-lc/src/.gitignore rename to boards/mips/pic32mx7mmb/src/.gitignore diff --git a/boards/pic32mx7mmb/src/Makefile b/boards/mips/pic32mx7mmb/src/Makefile similarity index 100% rename from boards/pic32mx7mmb/src/Makefile rename to boards/mips/pic32mx7mmb/src/Makefile diff --git a/boards/pic32mx7mmb/src/pic32_appinit.c b/boards/mips/pic32mx7mmb/src/pic32_appinit.c similarity index 100% rename from boards/pic32mx7mmb/src/pic32_appinit.c rename to boards/mips/pic32mx7mmb/src/pic32_appinit.c diff --git a/boards/pic32mx7mmb/src/pic32_boot.c b/boards/mips/pic32mx7mmb/src/pic32_boot.c similarity index 99% rename from boards/pic32mx7mmb/src/pic32_boot.c rename to boards/mips/pic32mx7mmb/src/pic32_boot.c index a360cbbe65..106b78b4cd 100644 --- a/boards/pic32mx7mmb/src/pic32_boot.c +++ b/boards/mips/pic32mx7mmb/src/pic32_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/pic32mx7mmb/src/pic32_boot.c + * boards/mips/pic32mx7mmb/src/pic32_boot.c * * Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mx7mmb/src/pic32_bringup.c b/boards/mips/pic32mx7mmb/src/pic32_bringup.c similarity index 100% rename from boards/pic32mx7mmb/src/pic32_bringup.c rename to boards/mips/pic32mx7mmb/src/pic32_bringup.c diff --git a/boards/pic32mx7mmb/src/pic32_leds.c b/boards/mips/pic32mx7mmb/src/pic32_leds.c similarity index 99% rename from boards/pic32mx7mmb/src/pic32_leds.c rename to boards/mips/pic32mx7mmb/src/pic32_leds.c index b77c5a55d5..ec732a0544 100644 --- a/boards/pic32mx7mmb/src/pic32_leds.c +++ b/boards/mips/pic32mx7mmb/src/pic32_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mx7mmb/src/pic32_leds.c + * boards/mips/pic32mx7mmb/src/pic32_leds.c * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mx7mmb/src/pic32_mio283qt2.c b/boards/mips/pic32mx7mmb/src/pic32_mio283qt2.c similarity index 99% rename from boards/pic32mx7mmb/src/pic32_mio283qt2.c rename to boards/mips/pic32mx7mmb/src/pic32_mio283qt2.c index 8f54c17222..f3932c28e4 100644 --- a/boards/pic32mx7mmb/src/pic32_mio283qt2.c +++ b/boards/mips/pic32mx7mmb/src/pic32_mio283qt2.c @@ -1,5 +1,5 @@ /************************************************************************************** - * boards/pic32mx7mmb/src/pic32_mio283qt2.c + * boards/mips/pic32mx7mmb/src/pic32_mio283qt2.c * * Interface definition for the MI0283QT-2 LCD from Multi-Inno Technology Co., Ltd. * This LCD is based on the Himax HX8347-D LCD controller. diff --git a/boards/pic32mx7mmb/src/pic32_spi.c b/boards/mips/pic32mx7mmb/src/pic32_spi.c similarity index 99% rename from boards/pic32mx7mmb/src/pic32_spi.c rename to boards/mips/pic32mx7mmb/src/pic32_spi.c index f0bb6997eb..e24a023923 100644 --- a/boards/pic32mx7mmb/src/pic32_spi.c +++ b/boards/mips/pic32mx7mmb/src/pic32_spi.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/pic32mx7mmb/src/pic32_spi.c + * boards/mips/pic32mx7mmb/src/pic32_spi.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mx7mmb/src/pic32_touchscreen.c b/boards/mips/pic32mx7mmb/src/pic32_touchscreen.c similarity index 99% rename from boards/pic32mx7mmb/src/pic32_touchscreen.c rename to boards/mips/pic32mx7mmb/src/pic32_touchscreen.c index 064c300cb4..e452c50cfa 100644 --- a/boards/pic32mx7mmb/src/pic32_touchscreen.c +++ b/boards/mips/pic32mx7mmb/src/pic32_touchscreen.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/pic32mx7mmb/src/pic32_touchscreen.c + * boards/mips/pic32mx7mmb/src/pic32_touchscreen.c * * Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mx7mmb/src/pic32_usbdev.c b/boards/mips/pic32mx7mmb/src/pic32_usbdev.c similarity index 99% rename from boards/pic32mx7mmb/src/pic32_usbdev.c rename to boards/mips/pic32mx7mmb/src/pic32_usbdev.c index aa778d37d8..52926a6f7d 100644 --- a/boards/pic32mx7mmb/src/pic32_usbdev.c +++ b/boards/mips/pic32mx7mmb/src/pic32_usbdev.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/pic32mx7mmb/src/pic32_usbdev.c + * boards/mips/pic32mx7mmb/src/pic32_usbdev.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mx7mmb/src/pic32_usbmsc.c b/boards/mips/pic32mx7mmb/src/pic32_usbmsc.c similarity index 98% rename from boards/pic32mx7mmb/src/pic32_usbmsc.c rename to boards/mips/pic32mx7mmb/src/pic32_usbmsc.c index 6728e9f942..5e2df7e823 100644 --- a/boards/pic32mx7mmb/src/pic32_usbmsc.c +++ b/boards/mips/pic32mx7mmb/src/pic32_usbmsc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mx7mmb/src/pic32_usbmsc.c + * boards/mips/pic32mx7mmb/src/pic32_usbmsc.c * * Copyright (C) 2012, 2013, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mx7mmb/src/pic32mx7mmb.h b/boards/mips/pic32mx7mmb/src/pic32mx7mmb.h similarity index 96% rename from boards/pic32mx7mmb/src/pic32mx7mmb.h rename to boards/mips/pic32mx7mmb/src/pic32mx7mmb.h index c094705ae1..58386db4af 100644 --- a/boards/pic32mx7mmb/src/pic32mx7mmb.h +++ b/boards/mips/pic32mx7mmb/src/pic32mx7mmb.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mx7mmb/src/pic32mx7mmb.h + * boards/mips/pic32mx7mmb/src/pic32mx7mmb.h * * Copyright (C) 2012, 2017-2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_MIKROELEKTRONIKA_PIC32MX7MMB_SRC_PIC32MX7MMB_H -#define __BOARDS_MIKROELEKTRONIKA_PIC32MX7MMB_SRC_PIC32MX7MMB_H +#ifndef __BOARDS_MIPS_MIKROELEKTRONIKA_PIC32MX7MMB_SRC_PIC32MX7MMB_H +#define __BOARDS_MIPS_MIKROELEKTRONIKA_PIC32MX7MMB_SRC_PIC32MX7MMB_H /**************************************************************************** * Included Files @@ -200,4 +200,4 @@ int pic32mx_tsc_setup(int minor); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_MIKROELEKTRONIKA_PIC32MX7MMB_SRC_PIC32MX7MMB_H */ +#endif /* __BOARDS_MIPS_MIKROELEKTRONIKA_PIC32MX7MMB_SRC_PIC32MX7MMB_H */ diff --git a/boards/pic32mz-starterkit/Kconfig b/boards/mips/pic32mz-starterkit/Kconfig similarity index 100% rename from boards/pic32mz-starterkit/Kconfig rename to boards/mips/pic32mz-starterkit/Kconfig diff --git a/boards/pic32mz-starterkit/README.txt b/boards/mips/pic32mz-starterkit/README.txt similarity index 100% rename from boards/pic32mz-starterkit/README.txt rename to boards/mips/pic32mz-starterkit/README.txt diff --git a/boards/pic32mz-starterkit/configs/nsh/defconfig b/boards/mips/pic32mz-starterkit/configs/nsh/defconfig similarity index 100% rename from boards/pic32mz-starterkit/configs/nsh/defconfig rename to boards/mips/pic32mz-starterkit/configs/nsh/defconfig diff --git a/boards/pic32mz-starterkit/include/board.h b/boards/mips/pic32mz-starterkit/include/board.h similarity index 97% rename from boards/pic32mz-starterkit/include/board.h rename to boards/mips/pic32mz-starterkit/include/board.h index e2d490cef0..d9397e215d 100644 --- a/boards/pic32mz-starterkit/include/board.h +++ b/boards/mips/pic32mz-starterkit/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mz-starterkit/include/board.h + * boards/mips/pic32mz-starterkit/include/board.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_PIC32MZ_STARTERKIT_INCLUDE_BOARD_H -#define __BOARDS_PIC32MZ_STARTERKIT_INCLUDE_BOARD_H +#ifndef __BOARDS_MIPS_PIC32MZ_STARTERKIT_INCLUDE_BOARD_H +#define __BOARDS_MIPS_PIC32MZ_STARTERKIT_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -312,4 +312,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_PIC32MZ_STARTERKIT_INCLUDE_BOARD_H */ +#endif /* __BOARDS_MIPS_PIC32MZ_STARTERKIT_INCLUDE_BOARD_H */ diff --git a/boards/pic32mz-starterkit/scripts/Make.defs b/boards/mips/pic32mz-starterkit/scripts/Make.defs similarity index 96% rename from boards/pic32mz-starterkit/scripts/Make.defs rename to boards/mips/pic32mz-starterkit/scripts/Make.defs index 036632fbc3..dc373f52e8 100644 --- a/boards/pic32mz-starterkit/scripts/Make.defs +++ b/boards/mips/pic32mz-starterkit/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/pic32mz-starterkit/scripts/Make.defs +# boards/mips/pic32mz-starterkit/scripts/Make.defs # # Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -70,13 +70,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/pic32mz-starterkit/scripts/c32-debug.ld b/boards/mips/pic32mz-starterkit/scripts/c32-debug.ld similarity index 99% rename from boards/pic32mz-starterkit/scripts/c32-debug.ld rename to boards/mips/pic32mz-starterkit/scripts/c32-debug.ld index 3b682a2624..dcdac5b199 100644 --- a/boards/pic32mz-starterkit/scripts/c32-debug.ld +++ b/boards/mips/pic32mz-starterkit/scripts/c32-debug.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mz-starterkit/nsh/c32-debug.ld + * boards/mips/pic32mz-starterkit/nsh/c32-debug.ld * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mz-starterkit/scripts/mips-debug.ld b/boards/mips/pic32mz-starterkit/scripts/mips-debug.ld similarity index 99% rename from boards/pic32mz-starterkit/scripts/mips-debug.ld rename to boards/mips/pic32mz-starterkit/scripts/mips-debug.ld index 04076a3607..5886f23cac 100644 --- a/boards/pic32mz-starterkit/scripts/mips-debug.ld +++ b/boards/mips/pic32mz-starterkit/scripts/mips-debug.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mz-starterkit/nsh/mips-debug.ld + * boards/mips/pic32mz-starterkit/nsh/mips-debug.ld * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mz-starterkit/scripts/pinguino-debug.ld b/boards/mips/pic32mz-starterkit/scripts/pinguino-debug.ld similarity index 99% rename from boards/pic32mz-starterkit/scripts/pinguino-debug.ld rename to boards/mips/pic32mz-starterkit/scripts/pinguino-debug.ld index c1184e8903..21ecb8682a 100644 --- a/boards/pic32mz-starterkit/scripts/pinguino-debug.ld +++ b/boards/mips/pic32mz-starterkit/scripts/pinguino-debug.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mz-starterkit/nsh/mips-debug.ld + * boards/mips/pic32mz-starterkit/nsh/mips-debug.ld * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mz-starterkit/scripts/xc32-debug.ld b/boards/mips/pic32mz-starterkit/scripts/xc32-debug.ld similarity index 99% rename from boards/pic32mz-starterkit/scripts/xc32-debug.ld rename to boards/mips/pic32mz-starterkit/scripts/xc32-debug.ld index e18184e760..d6c8e85537 100644 --- a/boards/pic32mz-starterkit/scripts/xc32-debug.ld +++ b/boards/mips/pic32mz-starterkit/scripts/xc32-debug.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mz-starterkit/nsh/mips-debug.ld + * boards/mips/pic32mz-starterkit/nsh/mips-debug.ld * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/tm4c123g-launchpad/src/.gitignore b/boards/mips/pic32mz-starterkit/src/.gitignore similarity index 100% rename from boards/tm4c123g-launchpad/src/.gitignore rename to boards/mips/pic32mz-starterkit/src/.gitignore diff --git a/boards/pic32mz-starterkit/src/Makefile b/boards/mips/pic32mz-starterkit/src/Makefile similarity index 100% rename from boards/pic32mz-starterkit/src/Makefile rename to boards/mips/pic32mz-starterkit/src/Makefile diff --git a/boards/pic32mz-starterkit/src/pic32mz-starterkit.h b/boards/mips/pic32mz-starterkit/src/pic32mz-starterkit.h similarity index 96% rename from boards/pic32mz-starterkit/src/pic32mz-starterkit.h rename to boards/mips/pic32mz-starterkit/src/pic32mz-starterkit.h index b8f6623417..b3e1f0efd8 100644 --- a/boards/pic32mz-starterkit/src/pic32mz-starterkit.h +++ b/boards/mips/pic32mz-starterkit/src/pic32mz-starterkit.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mz-starterkit/src/pic32mz-starterkit.h + * boards/mips/pic32mz-starterkit/src/pic32mz-starterkit.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_PIC32MZ_STARTERKIT_SRC_PIC32MZ_STARTERKIT_H -#define __BOARDS_PIC32MZ_STARTERKIT_SRC_PIC32MZ_STARTERKIT_H +#ifndef __BOARDS_MIPS_PIC32MZ_STARTERKIT_SRC_PIC32MZ_STARTERKIT_H +#define __BOARDS_MIPS_PIC32MZ_STARTERKIT_SRC_PIC32MZ_STARTERKIT_H /**************************************************************************** * Included Files @@ -218,4 +218,4 @@ int pic32mz_bringup(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_PIC32MZ_STARTERKIT_SRC_PIC32MZ_STARTERKIT_H */ +#endif /* __BOARDS_MIPS_PIC32MZ_STARTERKIT_SRC_PIC32MZ_STARTERKIT_H */ diff --git a/boards/pic32mz-starterkit/src/pic32mz_appinit.c b/boards/mips/pic32mz-starterkit/src/pic32mz_appinit.c similarity index 100% rename from boards/pic32mz-starterkit/src/pic32mz_appinit.c rename to boards/mips/pic32mz-starterkit/src/pic32mz_appinit.c diff --git a/boards/pic32mz-starterkit/src/pic32mz_autoleds.c b/boards/mips/pic32mz-starterkit/src/pic32mz_autoleds.c similarity index 99% rename from boards/pic32mz-starterkit/src/pic32mz_autoleds.c rename to boards/mips/pic32mz-starterkit/src/pic32mz_autoleds.c index 71840ac4cd..2a9158cda0 100644 --- a/boards/pic32mz-starterkit/src/pic32mz_autoleds.c +++ b/boards/mips/pic32mz-starterkit/src/pic32mz_autoleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mz-starterkit/src/pic32mz_leds.c + * boards/mips/pic32mz-starterkit/src/pic32mz_leds.c * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mz-starterkit/src/pic32mz_boot.c b/boards/mips/pic32mz-starterkit/src/pic32mz_boot.c similarity index 98% rename from boards/pic32mz-starterkit/src/pic32mz_boot.c rename to boards/mips/pic32mz-starterkit/src/pic32mz_boot.c index 54920b61d5..9accdeabe0 100644 --- a/boards/pic32mz-starterkit/src/pic32mz_boot.c +++ b/boards/mips/pic32mz-starterkit/src/pic32mz_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/pic32mz-starterkit/src/pic32mz_boot.c + * boards/mips/pic32mz-starterkit/src/pic32mz_boot.c * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mz-starterkit/src/pic32mz_bringup.c b/boards/mips/pic32mz-starterkit/src/pic32mz_bringup.c similarity index 100% rename from boards/pic32mz-starterkit/src/pic32mz_bringup.c rename to boards/mips/pic32mz-starterkit/src/pic32mz_bringup.c diff --git a/boards/pic32mz-starterkit/src/pic32mz_buttons.c b/boards/mips/pic32mz-starterkit/src/pic32mz_buttons.c similarity index 99% rename from boards/pic32mz-starterkit/src/pic32mz_buttons.c rename to boards/mips/pic32mz-starterkit/src/pic32mz_buttons.c index 5ce82a13ef..0235e30c21 100644 --- a/boards/pic32mz-starterkit/src/pic32mz_buttons.c +++ b/boards/mips/pic32mz-starterkit/src/pic32mz_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mz-starterkit/src/pic32mz_buttons.c + * boards/mips/pic32mz-starterkit/src/pic32mz_buttons.c * * Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mz-starterkit/src/pic32mz_spi.c b/boards/mips/pic32mz-starterkit/src/pic32mz_spi.c similarity index 99% rename from boards/pic32mz-starterkit/src/pic32mz_spi.c rename to boards/mips/pic32mz-starterkit/src/pic32mz_spi.c index 79e13947ac..98b11c2a20 100644 --- a/boards/pic32mz-starterkit/src/pic32mz_spi.c +++ b/boards/mips/pic32mz-starterkit/src/pic32mz_spi.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/pic32mz-starterkit/src/pic32mz_spi.c + * boards/mips/pic32mz-starterkit/src/pic32mz_spi.c * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/pic32mz-starterkit/src/pic32mz_userleds.c b/boards/mips/pic32mz-starterkit/src/pic32mz_userleds.c similarity index 98% rename from boards/pic32mz-starterkit/src/pic32mz_userleds.c rename to boards/mips/pic32mz-starterkit/src/pic32mz_userleds.c index f6699ac3ed..71ad7f3c87 100644 --- a/boards/pic32mz-starterkit/src/pic32mz_userleds.c +++ b/boards/mips/pic32mz-starterkit/src/pic32mz_userleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/pic32mz-starterkit/src/pic32mz_userleds.c + * boards/mips/pic32mz-starterkit/src/pic32mz_userleds.c * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/sure-pic32mx/Kconfig b/boards/mips/sure-pic32mx/Kconfig similarity index 100% rename from boards/sure-pic32mx/Kconfig rename to boards/mips/sure-pic32mx/Kconfig diff --git a/boards/sure-pic32mx/README.txt b/boards/mips/sure-pic32mx/README.txt similarity index 100% rename from boards/sure-pic32mx/README.txt rename to boards/mips/sure-pic32mx/README.txt diff --git a/boards/sure-pic32mx/configs/nsh/defconfig b/boards/mips/sure-pic32mx/configs/nsh/defconfig similarity index 100% rename from boards/sure-pic32mx/configs/nsh/defconfig rename to boards/mips/sure-pic32mx/configs/nsh/defconfig diff --git a/boards/sure-pic32mx/configs/usbnsh/defconfig b/boards/mips/sure-pic32mx/configs/usbnsh/defconfig similarity index 100% rename from boards/sure-pic32mx/configs/usbnsh/defconfig rename to boards/mips/sure-pic32mx/configs/usbnsh/defconfig diff --git a/boards/sure-pic32mx/include/board.h b/boards/mips/sure-pic32mx/include/board.h similarity index 97% rename from boards/sure-pic32mx/include/board.h rename to boards/mips/sure-pic32mx/include/board.h index 9637472c20..e60fd5694d 100644 --- a/boards/sure-pic32mx/include/board.h +++ b/boards/mips/sure-pic32mx/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/sure-pic32mx/include/board.h + * boards/mips/sure-pic32mx/include/board.h * include/arch/board/board.h * * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_SURE_PIC32MX_INCLUDE_BOARD_H -#define __BOARDS_SURE_PIC32MX_INCLUDE_BOARD_H +#ifndef __BOARDS_MIPS_SURE_PIC32MX_INCLUDE_BOARD_H +#define __BOARDS_MIPS_SURE_PIC32MX_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -175,4 +175,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SURE_PIC32MX_INCLUDE_BOARD_H */ +#endif /* __BOARDS_MIPS_SURE_PIC32MX_INCLUDE_BOARD_H */ diff --git a/boards/sure-pic32mx/scripts/Make.defs b/boards/mips/sure-pic32mx/scripts/Make.defs similarity index 95% rename from boards/sure-pic32mx/scripts/Make.defs rename to boards/mips/sure-pic32mx/scripts/Make.defs index 0fe6412a79..ac20eeb0ff 100644 --- a/boards/sure-pic32mx/scripts/Make.defs +++ b/boards/mips/sure-pic32mx/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/sure-pic32mx/scripts/Make.defs +# boards/mips/sure-pic32mx/scripts/Make.defs # # Copyright (C) 2011, 2013, 2017-2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -60,13 +60,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/sure-pic32mx/scripts/c32-release.ld b/boards/mips/sure-pic32mx/scripts/c32-release.ld similarity index 99% rename from boards/sure-pic32mx/scripts/c32-release.ld rename to boards/mips/sure-pic32mx/scripts/c32-release.ld index 5761eaa3ba..16bd00ce12 100644 --- a/boards/sure-pic32mx/scripts/c32-release.ld +++ b/boards/mips/sure-pic32mx/scripts/c32-release.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/sure-pic32mx/nsh/c32-release.ld + * boards/mips/sure-pic32mx/nsh/c32-release.ld * * Copyright (C) 2011, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/sure-pic32mx/scripts/mips-release.ld b/boards/mips/sure-pic32mx/scripts/mips-release.ld similarity index 99% rename from boards/sure-pic32mx/scripts/mips-release.ld rename to boards/mips/sure-pic32mx/scripts/mips-release.ld index e1dc74f0ff..3cb6c4b8dc 100644 --- a/boards/sure-pic32mx/scripts/mips-release.ld +++ b/boards/mips/sure-pic32mx/scripts/mips-release.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/sure-pic32mx/nsh/mips-release.ld + * boards/mips/sure-pic32mx/nsh/mips-release.ld * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/tm4c1294-launchpad/src/.gitignore b/boards/mips/sure-pic32mx/src/.gitignore similarity index 100% rename from boards/tm4c1294-launchpad/src/.gitignore rename to boards/mips/sure-pic32mx/src/.gitignore diff --git a/boards/sure-pic32mx/src/Makefile b/boards/mips/sure-pic32mx/src/Makefile similarity index 100% rename from boards/sure-pic32mx/src/Makefile rename to boards/mips/sure-pic32mx/src/Makefile diff --git a/boards/sure-pic32mx/src/pic32mx_appinit.c b/boards/mips/sure-pic32mx/src/pic32mx_appinit.c similarity index 100% rename from boards/sure-pic32mx/src/pic32mx_appinit.c rename to boards/mips/sure-pic32mx/src/pic32mx_appinit.c diff --git a/boards/sure-pic32mx/src/pic32mx_autoleds.c b/boards/mips/sure-pic32mx/src/pic32mx_autoleds.c similarity index 99% rename from boards/sure-pic32mx/src/pic32mx_autoleds.c rename to boards/mips/sure-pic32mx/src/pic32mx_autoleds.c index 93165e4533..d823895a48 100644 --- a/boards/sure-pic32mx/src/pic32mx_autoleds.c +++ b/boards/mips/sure-pic32mx/src/pic32mx_autoleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/sure-pic32mx/src/pic32mx_leds.c + * boards/mips/sure-pic32mx/src/pic32mx_leds.c * * Copyright (C) 2011, 2013, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/sure-pic32mx/src/pic32mx_boot.c b/boards/mips/sure-pic32mx/src/pic32mx_boot.c similarity index 98% rename from boards/sure-pic32mx/src/pic32mx_boot.c rename to boards/mips/sure-pic32mx/src/pic32mx_boot.c index bfe29e486b..1d6d2cd6da 100644 --- a/boards/sure-pic32mx/src/pic32mx_boot.c +++ b/boards/mips/sure-pic32mx/src/pic32mx_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/sure-pic32mx/src/pic32mx_boot.c + * boards/mips/sure-pic32mx/src/pic32mx_boot.c * * Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/sure-pic32mx/src/pic32mx_buttons.c b/boards/mips/sure-pic32mx/src/pic32mx_buttons.c similarity index 99% rename from boards/sure-pic32mx/src/pic32mx_buttons.c rename to boards/mips/sure-pic32mx/src/pic32mx_buttons.c index 1ad468ff4e..27c0a9d3dd 100644 --- a/boards/sure-pic32mx/src/pic32mx_buttons.c +++ b/boards/mips/sure-pic32mx/src/pic32mx_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/sure-pic32mx/src/pic32mx_buttons.c + * boards/mips/sure-pic32mx/src/pic32mx_buttons.c * * Copyright (C) 2011, 2013-2015, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/sure-pic32mx/src/pic32mx_lcd1602.c b/boards/mips/sure-pic32mx/src/pic32mx_lcd1602.c similarity index 99% rename from boards/sure-pic32mx/src/pic32mx_lcd1602.c rename to boards/mips/sure-pic32mx/src/pic32mx_lcd1602.c index c03e510837..7ce49a51e9 100644 --- a/boards/sure-pic32mx/src/pic32mx_lcd1602.c +++ b/boards/mips/sure-pic32mx/src/pic32mx_lcd1602.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/sure-pic32mx/src/pic32mx_lcd1602.c + * boards/mips/sure-pic32mx/src/pic32mx_lcd1602.c * * This logic supports the connection of an LCD1602 LCD to the PCB Logic * PIC32MX board. The LCD1602 is based on the Hitachi HD44780U LCD diff --git a/boards/sure-pic32mx/src/pic32mx_spi.c b/boards/mips/sure-pic32mx/src/pic32mx_spi.c similarity index 99% rename from boards/sure-pic32mx/src/pic32mx_spi.c rename to boards/mips/sure-pic32mx/src/pic32mx_spi.c index a92ce6a4df..a3d8d20325 100644 --- a/boards/sure-pic32mx/src/pic32mx_spi.c +++ b/boards/mips/sure-pic32mx/src/pic32mx_spi.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/sure-pic32mx/src/pic32mx_spi.c + * boards/mips/sure-pic32mx/src/pic32mx_spi.c * * Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/sure-pic32mx/src/pic32mx_usbdev.c b/boards/mips/sure-pic32mx/src/pic32mx_usbdev.c similarity index 99% rename from boards/sure-pic32mx/src/pic32mx_usbdev.c rename to boards/mips/sure-pic32mx/src/pic32mx_usbdev.c index d1351093d0..2214c19a94 100644 --- a/boards/sure-pic32mx/src/pic32mx_usbdev.c +++ b/boards/mips/sure-pic32mx/src/pic32mx_usbdev.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/sure-pic32mx/src/pic32mx_usbdev.c + * boards/mips/sure-pic32mx/src/pic32mx_usbdev.c * * Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/sure-pic32mx/src/sure-pic32mx.h b/boards/mips/sure-pic32mx/src/sure-pic32mx.h similarity index 96% rename from boards/sure-pic32mx/src/sure-pic32mx.h rename to boards/mips/sure-pic32mx/src/sure-pic32mx.h index e049435477..e681c04cc2 100644 --- a/boards/sure-pic32mx/src/sure-pic32mx.h +++ b/boards/mips/sure-pic32mx/src/sure-pic32mx.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/sure-pic32mx/src/sure-pic32mx.h + * boards/mips/sure-pic32mx/src/sure-pic32mx.h * * Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_SURE_PIC32MX_SRC_SURE_PIC32MXL_H -#define __BOARDS_SURE_PIC32MX_SRC_SURE_PIC32MXL_H +#ifndef __BOARDS_MIPS_SURE_PIC32MX_SRC_SURE_PIC32MXL_H +#define __BOARDS_MIPS_SURE_PIC32MX_SRC_SURE_PIC32MXL_H /**************************************************************************** * Included Files @@ -170,4 +170,4 @@ void pic32mx_led_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_SURE_PIC32MX_SRC_SURE_PIC32MXL_H */ +#endif /* __BOARDS_MIPS_SURE_PIC32MX_SRC_SURE_PIC32MXL_H */ diff --git a/boards/ubw32/Kconfig b/boards/mips/ubw32/Kconfig similarity index 100% rename from boards/ubw32/Kconfig rename to boards/mips/ubw32/Kconfig diff --git a/boards/ubw32/README.txt b/boards/mips/ubw32/README.txt similarity index 100% rename from boards/ubw32/README.txt rename to boards/mips/ubw32/README.txt diff --git a/boards/ubw32/configs/nsh/defconfig b/boards/mips/ubw32/configs/nsh/defconfig similarity index 100% rename from boards/ubw32/configs/nsh/defconfig rename to boards/mips/ubw32/configs/nsh/defconfig diff --git a/boards/ubw32/include/board.h b/boards/mips/ubw32/include/board.h similarity index 97% rename from boards/ubw32/include/board.h rename to boards/mips/ubw32/include/board.h index 6aefdbf7bb..c439216877 100644 --- a/boards/ubw32/include/board.h +++ b/boards/mips/ubw32/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/ubw32/include/board.h + * boards/mips/ubw32/include/board.h * include/arch/board/board.h * * Copyright (C) 2012 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_UBW32_INCLUDE_BOARD_H -#define __BOARDS_UBW32_INCLUDE_BOARD_H +#ifndef __BOARDS_MIPS_UBW32_INCLUDE_BOARD_H +#define __BOARDS_MIPS_UBW32_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -184,4 +184,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_UBW32_INCLUDE_BOARD_H */ +#endif /* __BOARDS_MIPS_UBW32_INCLUDE_BOARD_H */ diff --git a/boards/ubw32/scripts/Make.defs b/boards/mips/ubw32/scripts/Make.defs similarity index 95% rename from boards/ubw32/scripts/Make.defs rename to boards/mips/ubw32/scripts/Make.defs index 49a6410b66..b1fc3f6be7 100644 --- a/boards/ubw32/scripts/Make.defs +++ b/boards/mips/ubw32/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/ubw32/scripts/Make.defs +# boards/mips/ubw32/scripts/Make.defs # # Copyright (C) 2012, 2017-2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -60,13 +60,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/ubw32/scripts/c32-release.ld b/boards/mips/ubw32/scripts/c32-release.ld similarity index 99% rename from boards/ubw32/scripts/c32-release.ld rename to boards/mips/ubw32/scripts/c32-release.ld index 8dd0455fec..002d6568b3 100644 --- a/boards/ubw32/scripts/c32-release.ld +++ b/boards/mips/ubw32/scripts/c32-release.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/ubw32/scripts/c32-release.ld + * boards/mips/ubw32/scripts/c32-release.ld * * Copyright (C) 2012-2013, 2017-2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/ubw32/scripts/mips-release.ld b/boards/mips/ubw32/scripts/mips-release.ld similarity index 99% rename from boards/ubw32/scripts/mips-release.ld rename to boards/mips/ubw32/scripts/mips-release.ld index accf1d8f3d..7189368589 100644 --- a/boards/ubw32/scripts/mips-release.ld +++ b/boards/mips/ubw32/scripts/mips-release.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/ubw32/scripts/mips-release.ld + * boards/mips/ubw32/scripts/mips-release.ld * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/twr-k60n512/src/.gitignore b/boards/mips/ubw32/src/.gitignore similarity index 100% rename from boards/twr-k60n512/src/.gitignore rename to boards/mips/ubw32/src/.gitignore diff --git a/boards/ubw32/src/Makefile b/boards/mips/ubw32/src/Makefile similarity index 100% rename from boards/ubw32/src/Makefile rename to boards/mips/ubw32/src/Makefile diff --git a/boards/ubw32/src/pic32_appinit.c b/boards/mips/ubw32/src/pic32_appinit.c similarity index 100% rename from boards/ubw32/src/pic32_appinit.c rename to boards/mips/ubw32/src/pic32_appinit.c diff --git a/boards/ubw32/src/pic32_boot.c b/boards/mips/ubw32/src/pic32_boot.c similarity index 98% rename from boards/ubw32/src/pic32_boot.c rename to boards/mips/ubw32/src/pic32_boot.c index 2d22afc510..e620a34ad2 100644 --- a/boards/ubw32/src/pic32_boot.c +++ b/boards/mips/ubw32/src/pic32_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/ubw32/src/pic32_boot.c + * boards/mips/ubw32/src/pic32_boot.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/ubw32/src/pic32_buttons.c b/boards/mips/ubw32/src/pic32_buttons.c similarity index 99% rename from boards/ubw32/src/pic32_buttons.c rename to boards/mips/ubw32/src/pic32_buttons.c index c5ddba0088..3f6e393976 100644 --- a/boards/ubw32/src/pic32_buttons.c +++ b/boards/mips/ubw32/src/pic32_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/ubw32/src/pic32_buttons.c + * boards/mips/ubw32/src/pic32_buttons.c * * Copyright (C) 2012, 2014-2015, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/ubw32/src/pic32_leds.c b/boards/mips/ubw32/src/pic32_leds.c similarity index 99% rename from boards/ubw32/src/pic32_leds.c rename to boards/mips/ubw32/src/pic32_leds.c index adc297272f..f9a0a77f0f 100644 --- a/boards/ubw32/src/pic32_leds.c +++ b/boards/mips/ubw32/src/pic32_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/ubw32/src/pic32_leds.c + * boards/mips/ubw32/src/pic32_leds.c * * Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/ubw32/src/pic32_usbdev.c b/boards/mips/ubw32/src/pic32_usbdev.c similarity index 99% rename from boards/ubw32/src/pic32_usbdev.c rename to boards/mips/ubw32/src/pic32_usbdev.c index a0e148224e..487cfdde98 100644 --- a/boards/ubw32/src/pic32_usbdev.c +++ b/boards/mips/ubw32/src/pic32_usbdev.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/ubw32/src/pic32_usbdev.c + * boards/mips/ubw32/src/pic32_usbdev.c * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/ubw32/src/ubw32.h b/boards/mips/ubw32/src/ubw32.h similarity index 95% rename from boards/ubw32/src/ubw32.h rename to boards/mips/ubw32/src/ubw32.h index 507cb6ec59..2e2f99eb39 100644 --- a/boards/ubw32/src/ubw32.h +++ b/boards/mips/ubw32/src/ubw32.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/ubw32/src/ubw32.h + * boards/mips/ubw32/src/ubw32.h * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_UBW32_SRC_UBW32_H -#define __BOARDS_UBW32_SRC_UBW32_H +#ifndef __BOARDS_MIPS_UBW32_SRC_UBW32_H +#define __BOARDS_MIPS_UBW32_SRC_UBW32_H /**************************************************************************** * Included Files @@ -99,4 +99,4 @@ void pic32mx_led_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_UBW32_SRC_UBW32_H */ +#endif /* __BOARDS_MIPS_UBW32_SRC_UBW32_H */ diff --git a/boards/moteino-mega/Kconfig b/boards/misoc/misoc/Kconfig similarity index 100% rename from boards/moteino-mega/Kconfig rename to boards/misoc/misoc/Kconfig diff --git a/boards/misoc/README.txt b/boards/misoc/misoc/README.txt similarity index 100% rename from boards/misoc/README.txt rename to boards/misoc/misoc/README.txt diff --git a/boards/misoc/configs/hello/defconfig b/boards/misoc/misoc/configs/hello/defconfig similarity index 100% rename from boards/misoc/configs/hello/defconfig rename to boards/misoc/misoc/configs/hello/defconfig diff --git a/boards/misoc/configs/nsh/defconfig b/boards/misoc/misoc/configs/nsh/defconfig similarity index 100% rename from boards/misoc/configs/nsh/defconfig rename to boards/misoc/misoc/configs/nsh/defconfig diff --git a/boards/misoc/include/.gitignore b/boards/misoc/misoc/include/.gitignore similarity index 100% rename from boards/misoc/include/.gitignore rename to boards/misoc/misoc/include/.gitignore diff --git a/boards/misoc/include/board.h b/boards/misoc/misoc/include/board.h similarity index 95% rename from boards/misoc/include/board.h rename to boards/misoc/misoc/include/board.h index e30e9ef821..b434a503f0 100644 --- a/boards/misoc/include/board.h +++ b/boards/misoc/misoc/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/misoc/include/board.h + * boards/misoc/misoc/include/board.h * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_AMBER_INCLUDE_BOARD_H -#define __BOARDS_AMBER_INCLUDE_BOARD_H +#ifndef __BOARDS_MISOC_AMBER_INCLUDE_BOARD_H +#define __BOARDS_MISOC_AMBER_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -97,4 +97,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_AMBER_INCLUDE_BOARD_H */ +#endif /* __BOARDS_MISOC_AMBER_INCLUDE_BOARD_H */ diff --git a/boards/misoc/scripts/Make.defs b/boards/misoc/misoc/scripts/Make.defs similarity index 96% rename from boards/misoc/scripts/Make.defs rename to boards/misoc/misoc/scripts/Make.defs index 6551f48e42..c1dc31963f 100644 --- a/boards/misoc/scripts/Make.defs +++ b/boards/misoc/misoc/scripts/Make.defs @@ -53,13 +53,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include" ARCHXXINCLUDES = $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx" - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD_CUSTOM_NAME)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD_CUSTOM_NAME)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/misoc/scripts/lm32.ld b/boards/misoc/misoc/scripts/lm32.ld similarity index 98% rename from boards/misoc/scripts/lm32.ld rename to boards/misoc/misoc/scripts/lm32.ld index ba6bc31ba8..1f334fa46d 100644 --- a/boards/misoc/scripts/lm32.ld +++ b/boards/misoc/misoc/scripts/lm32.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/misoc/hello/script/ld.script + * boards/misoc/misoc/hello/script/ld.script * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/misoc/scripts/minerva.ld b/boards/misoc/misoc/scripts/minerva.ld similarity index 98% rename from boards/misoc/scripts/minerva.ld rename to boards/misoc/misoc/scripts/minerva.ld index c3da040192..cf32617e26 100644 --- a/boards/misoc/scripts/minerva.ld +++ b/boards/misoc/misoc/scripts/minerva.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/misoc/scripts/ld.script + * boards/misoc/misoc/scripts/ld.script * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/u-blox-c027/src/.gitignore b/boards/misoc/misoc/src/.gitignore similarity index 100% rename from boards/u-blox-c027/src/.gitignore rename to boards/misoc/misoc/src/.gitignore diff --git a/boards/misoc/src/Makefile b/boards/misoc/misoc/src/Makefile similarity index 100% rename from boards/misoc/src/Makefile rename to boards/misoc/misoc/src/Makefile diff --git a/boards/misoc/src/lm32_boot.c b/boards/misoc/misoc/src/lm32_boot.c similarity index 98% rename from boards/misoc/src/lm32_boot.c rename to boards/misoc/misoc/src/lm32_boot.c index f19c374818..a28e1b63d6 100644 --- a/boards/misoc/src/lm32_boot.c +++ b/boards/misoc/misoc/src/lm32_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/misoc/src/lm32_boot.c + * boards/misoc/misoc/src/lm32_boot.c * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/misoc/src/misoc.h b/boards/misoc/misoc/src/misoc.h similarity index 95% rename from boards/misoc/src/misoc.h rename to boards/misoc/misoc/src/misoc.h index ffe2d47397..277255e937 100644 --- a/boards/misoc/src/misoc.h +++ b/boards/misoc/misoc/src/misoc.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/misoc/src/misoc.h + * boards/misoc/misoc/src/misoc.h * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_MISOC_SRC_MISOC_H -#define __BOARDS_MISOC_SRC_MISOC_H +#ifndef __BOARDS_MISOC_MISOC_SRC_MISOC_H +#define __BOARDS_MISOC_MISOC_SRC_MISOC_H /**************************************************************************** * Included Files @@ -99,4 +99,4 @@ void lm32_led_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_MISOC_SRC_MISOC_H */ +#endif /* __BOARDS_MISOC_MISOC_SRC_MISOC_H */ diff --git a/boards/or1k/Kconfig b/boards/or1k/or1k/Kconfig similarity index 100% rename from boards/or1k/Kconfig rename to boards/or1k/or1k/Kconfig diff --git a/boards/or1k/README.txt b/boards/or1k/or1k/README.txt similarity index 100% rename from boards/or1k/README.txt rename to boards/or1k/or1k/README.txt diff --git a/boards/or1k/configs/nsh/defconfig b/boards/or1k/or1k/configs/nsh/defconfig similarity index 100% rename from boards/or1k/configs/nsh/defconfig rename to boards/or1k/or1k/configs/nsh/defconfig diff --git a/boards/or1k/include/board.h b/boards/or1k/or1k/include/board.h similarity index 93% rename from boards/or1k/include/board.h rename to boards/or1k/or1k/include/board.h index 4889bad096..b274b7922c 100644 --- a/boards/or1k/include/board.h +++ b/boards/or1k/or1k/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/or1k/include/board.h + * boards/or1k/or1k/include/board.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_OR1K_INCLUDE_BOARD_H -#define __BOARDS_OR1K_INCLUDE_BOARD_H +#ifndef __BOARDS_OR1K_OR1K_INCLUDE_BOARD_H +#define __BOARDS_OR1K_OR1K_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -57,4 +57,4 @@ * Public Functions ****************************************************************************/ -#endif /* __BOARDS_OR1K_INCLUDE_BOARD_H */ +#endif /* __BOARDS_OR1K_OR1K_INCLUDE_BOARD_H */ diff --git a/boards/or1k/scripts/Make.defs b/boards/or1k/or1k/scripts/Make.defs similarity index 96% rename from boards/or1k/scripts/Make.defs rename to boards/or1k/or1k/scripts/Make.defs index 4dd2d1e177..5f75a87fa4 100644 --- a/boards/or1k/scripts/Make.defs +++ b/boards/or1k/or1k/scripts/Make.defs @@ -43,12 +43,12 @@ ifeq ($(WINTOOL),y) # Windows-native toolchains ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/or1k/scripts/flash.ld b/boards/or1k/or1k/scripts/flash.ld similarity index 98% rename from boards/or1k/scripts/flash.ld rename to boards/or1k/or1k/scripts/flash.ld index 2f25bb2df2..447bbe968f 100644 --- a/boards/or1k/scripts/flash.ld +++ b/boards/or1k/or1k/scripts/flash.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/or1k/scripts/ram.ld + * boards/or1k/or1k/scripts/ram.ld * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/p112/src/.gitignore b/boards/or1k/or1k/src/.gitignore similarity index 100% rename from boards/p112/src/.gitignore rename to boards/or1k/or1k/src/.gitignore diff --git a/boards/or1k/src/Makefile b/boards/or1k/or1k/src/Makefile similarity index 100% rename from boards/or1k/src/Makefile rename to boards/or1k/or1k/src/Makefile diff --git a/boards/or1k/src/or1k.h b/boards/or1k/or1k/src/or1k.h similarity index 94% rename from boards/or1k/src/or1k.h rename to boards/or1k/or1k/src/or1k.h index 4bd4ad2cd9..f3908fa4ab 100644 --- a/boards/or1k/src/or1k.h +++ b/boards/or1k/or1k/src/or1k.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/or1k/src/or1k.h + * boards/or1k/or1k/src/or1k.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_OR1K_SRC_OR1K_H -#define __BOARDS_OR1K_SRC_OR1K_H +#ifndef __BOARDS_OR1K_OR1K_SRC_OR1K_H +#define __BOARDS_OR1K_OR1K_SRC_OR1K_H /************************************************************************************ * Public Function Prototypes @@ -56,4 +56,4 @@ int or1k_bringup(void); -#endif /* __BOARDS_OR1K_SRC_OR1K_H */ +#endif /* __BOARDS_OR1K_OR1K_SRC_OR1K_H */ diff --git a/boards/or1k/src/or1k_appinit.c b/boards/or1k/or1k/src/or1k_appinit.c similarity index 100% rename from boards/or1k/src/or1k_appinit.c rename to boards/or1k/or1k/src/or1k_appinit.c diff --git a/boards/or1k/src/or1k_autoled.c b/boards/or1k/or1k/src/or1k_autoled.c similarity index 98% rename from boards/or1k/src/or1k_autoled.c rename to boards/or1k/or1k/src/or1k_autoled.c index 30df62d79b..fbe5bbddef 100644 --- a/boards/or1k/src/or1k_autoled.c +++ b/boards/or1k/or1k/src/or1k_autoled.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/or1k/src/or1k_autoled.c + * boards/or1k/or1k/src/or1k_autoled.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/or1k/src/or1k_boot.c b/boards/or1k/or1k/src/or1k_boot.c similarity index 99% rename from boards/or1k/src/or1k_boot.c rename to boards/or1k/or1k/src/or1k_boot.c index 9ee0df7355..64b827e352 100644 --- a/boards/or1k/src/or1k_boot.c +++ b/boards/or1k/or1k/src/or1k_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/or1k/src/or1k_boot.c + * boards/or1k/or1k/src/or1k_boot.c * * Copyright (C) 2018 Extent3D. All rights reserved. * Author: Matt Thompson diff --git a/boards/or1k/src/or1k_bringup.c b/boards/or1k/or1k/src/or1k_bringup.c similarity index 100% rename from boards/or1k/src/or1k_bringup.c rename to boards/or1k/or1k/src/or1k_bringup.c diff --git a/boards/skp16c26/Kconfig b/boards/renesas/skp16c26/Kconfig similarity index 100% rename from boards/skp16c26/Kconfig rename to boards/renesas/skp16c26/Kconfig diff --git a/boards/skp16c26/README.txt b/boards/renesas/skp16c26/README.txt similarity index 100% rename from boards/skp16c26/README.txt rename to boards/renesas/skp16c26/README.txt diff --git a/boards/skp16c26/configs/ostest/defconfig b/boards/renesas/skp16c26/configs/ostest/defconfig similarity index 100% rename from boards/skp16c26/configs/ostest/defconfig rename to boards/renesas/skp16c26/configs/ostest/defconfig diff --git a/boards/skp16c26/include/board.h b/boards/renesas/skp16c26/include/board.h similarity index 96% rename from boards/skp16c26/include/board.h rename to boards/renesas/skp16c26/include/board.h index d1882803f5..7aeb9ce6ff 100644 --- a/boards/skp16c26/include/board.h +++ b/boards/renesas/skp16c26/include/board.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/skp16c26/include/board.h + * boards/renesas/skp16c26/include/board.h * arch/board/board.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SKP16C26_INCLUDE_BOARD_H -#define __BOARDS_SKP16C26_INCLUDE_BOARD_H +#ifndef __BOARDS_RENESAS_SKP16C26_INCLUDE_BOARD_H +#define __BOARDS_RENESAS_SKP16C26_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -131,4 +131,4 @@ #endif -#endif /* __BOARDS_SKP16C26_INCLUDE_BOARD_H */ +#endif /* __BOARDS_RENESAS_SKP16C26_INCLUDE_BOARD_H */ diff --git a/boards/skp16c26/scripts/Make.defs b/boards/renesas/skp16c26/scripts/Make.defs similarity index 95% rename from boards/skp16c26/scripts/Make.defs rename to boards/renesas/skp16c26/scripts/Make.defs index 407c364e59..074ebb4e11 100644 --- a/boards/skp16c26/scripts/Make.defs +++ b/boards/renesas/skp16c26/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/skp16c26/scripts/Make.defs +# boards/renesas/skp16c26/scripts/Make.defs # # Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -61,7 +61,7 @@ ARCHPICFLAGS = -fpic ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef ARCHDEFINES = ARCHINCLUDES = -I. -isystem $(TOPDIR)/include -ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/skp16c26.ld +ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/skp16c26.ld CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \ $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe diff --git a/boards/skp16c26/scripts/skp16c26.ld b/boards/renesas/skp16c26/scripts/skp16c26.ld similarity index 98% rename from boards/skp16c26/scripts/skp16c26.ld rename to boards/renesas/skp16c26/scripts/skp16c26.ld index 341da55d55..c6d36b6541 100644 --- a/boards/skp16c26/scripts/skp16c26.ld +++ b/boards/renesas/skp16c26/scripts/skp16c26.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/skp16c26/scripts/skp16c26.ld + * boards/renesas/skp16c26/scripts/skp16c26.ld * * Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/ubw32/src/.gitignore b/boards/renesas/skp16c26/src/.gitignore similarity index 100% rename from boards/ubw32/src/.gitignore rename to boards/renesas/skp16c26/src/.gitignore diff --git a/boards/skp16c26/src/Makefile b/boards/renesas/skp16c26/src/Makefile similarity index 98% rename from boards/skp16c26/src/Makefile rename to boards/renesas/skp16c26/src/Makefile index 373bd043ed..91f488ef21 100644 --- a/boards/skp16c26/src/Makefile +++ b/boards/renesas/skp16c26/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/skp16c26/src/Makefile +# boards/renesas/skp16c26/src/Makefile # # Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/skp16c26/src/m16c_buttons.c b/boards/renesas/skp16c26/src/m16c_buttons.c similarity index 98% rename from boards/skp16c26/src/m16c_buttons.c rename to boards/renesas/skp16c26/src/m16c_buttons.c index 8fe8126b00..d7f668e147 100644 --- a/boards/skp16c26/src/m16c_buttons.c +++ b/boards/renesas/skp16c26/src/m16c_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/skp16c26/src/m16c_buttons.c + * boards/renesas/skp16c26/src/m16c_buttons.c * * Copyright (C) 2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/skp16c26/src/m16c_lcd.c b/boards/renesas/skp16c26/src/m16c_lcd.c similarity index 99% rename from boards/skp16c26/src/m16c_lcd.c rename to boards/renesas/skp16c26/src/m16c_lcd.c index 3ebbdabb43..cb869d2164 100644 --- a/boards/skp16c26/src/m16c_lcd.c +++ b/boards/renesas/skp16c26/src/m16c_lcd.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/scp16c26/src/m16c_lcd.c + * boards/renesas/scp16c26/src/m16c_lcd.c * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/skp16c26/src/m16c_lcdconsole.c b/boards/renesas/skp16c26/src/m16c_lcdconsole.c similarity index 99% rename from boards/skp16c26/src/m16c_lcdconsole.c rename to boards/renesas/skp16c26/src/m16c_lcdconsole.c index 001c1587e5..16fbdca855 100644 --- a/boards/skp16c26/src/m16c_lcdconsole.c +++ b/boards/renesas/skp16c26/src/m16c_lcdconsole.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/scp16c26/src/m16c_lcdconsole.c + * boards/renesas/scp16c26/src/m16c_lcdconsole.c * * Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/skp16c26/src/m16c_leds.c b/boards/renesas/skp16c26/src/m16c_leds.c similarity index 99% rename from boards/skp16c26/src/m16c_leds.c rename to boards/renesas/skp16c26/src/m16c_leds.c index e7df4d0e96..242f8cf0ed 100644 --- a/boards/skp16c26/src/m16c_leds.c +++ b/boards/renesas/skp16c26/src/m16c_leds.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/scp16c26/src/m16c_leds.c + * boards/renesas/scp16c26/src/m16c_leds.c * * Copyright (C) 2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/skp16c26/src/skp16c26.h b/boards/renesas/skp16c26/src/skp16c26.h similarity index 93% rename from boards/skp16c26/src/skp16c26.h rename to boards/renesas/skp16c26/src/skp16c26.h index 44c3009f60..39986b5932 100644 --- a/boards/skp16c26/src/skp16c26.h +++ b/boards/renesas/skp16c26/src/skp16c26.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/skp16c26/src/scp16c26.h + * boards/renesas/skp16c26/src/scp16c26.h * * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_SKP16C26_SRC_SKP16C26_H -#define __BOARDS_SKP16C26_SRC_SKP16C26_H +#ifndef __BOARDS_RENESAS_SKP16C26_SRC_SKP16C26_H +#define __BOARDS_RENESAS_SKP16C26_SRC_SKP16C26_H /************************************************************************************ * Included Files @@ -60,4 +60,4 @@ #endif -#endif /* __BOARDS_SKP16C26_SRC_SKP16C26_H */ +#endif /* __BOARDS_RENESAS_SKP16C26_SRC_SKP16C26_H */ diff --git a/boards/us7032evb1/Kconfig b/boards/renesas/us7032evb1/Kconfig similarity index 100% rename from boards/us7032evb1/Kconfig rename to boards/renesas/us7032evb1/Kconfig diff --git a/boards/us7032evb1/README.txt b/boards/renesas/us7032evb1/README.txt similarity index 100% rename from boards/us7032evb1/README.txt rename to boards/renesas/us7032evb1/README.txt diff --git a/boards/us7032evb1/bin/.gitignore b/boards/renesas/us7032evb1/bin/.gitignore similarity index 100% rename from boards/us7032evb1/bin/.gitignore rename to boards/renesas/us7032evb1/bin/.gitignore diff --git a/boards/us7032evb1/configs/nsh/defconfig b/boards/renesas/us7032evb1/configs/nsh/defconfig similarity index 100% rename from boards/us7032evb1/configs/nsh/defconfig rename to boards/renesas/us7032evb1/configs/nsh/defconfig diff --git a/boards/us7032evb1/configs/ostest/defconfig b/boards/renesas/us7032evb1/configs/ostest/defconfig similarity index 100% rename from boards/us7032evb1/configs/ostest/defconfig rename to boards/renesas/us7032evb1/configs/ostest/defconfig diff --git a/boards/us7032evb1/configs/ostest/ld.script b/boards/renesas/us7032evb1/configs/ostest/ld.script similarity index 98% rename from boards/us7032evb1/configs/ostest/ld.script rename to boards/renesas/us7032evb1/configs/ostest/ld.script index 984c2e06a1..e7347331ee 100644 --- a/boards/us7032evb1/configs/ostest/ld.script +++ b/boards/renesas/us7032evb1/configs/ostest/ld.script @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/us7032evb1/ostest/ld.script + * boards/ enesas/us7032evb1/ostest/ld.script * * Copyright (C) 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/us7032evb1/include/board.h b/boards/renesas/us7032evb1/include/board.h similarity index 98% rename from boards/us7032evb1/include/board.h rename to boards/renesas/us7032evb1/include/board.h index 14835180c7..3742fc9390 100644 --- a/boards/us7032evb1/include/board.h +++ b/boards/renesas/us7032evb1/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/us7032evb1/include/board.h + * boards/renesas/us7032evb1/include/board.h * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/us7032evb1/scripts/Make.defs b/boards/renesas/us7032evb1/scripts/Make.defs similarity index 95% rename from boards/us7032evb1/scripts/Make.defs rename to boards/renesas/us7032evb1/scripts/Make.defs index a1cf520f66..51103376c8 100644 --- a/boards/us7032evb1/scripts/Make.defs +++ b/boards/renesas/us7032evb1/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################## -# boards/us7032evb1/scripts/Make.defs +# boards/renesas/us7032evb1/scripts/Make.defs # # Copyright (C) 2008, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -49,7 +49,7 @@ ARCHPICFLAGS = -fpic ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef ARCHDEFINES = ARCHINCLUDES = -I. -isystem $(TOPDIR)/include -ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/sdram.ld +ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/sdram.ld CROSSDEV = sh-nuttx-elf- CC = $(CROSSDEV)gcc diff --git a/boards/us7032evb1/scripts/sram.ld b/boards/renesas/us7032evb1/scripts/sram.ld similarity index 98% rename from boards/us7032evb1/scripts/sram.ld rename to boards/renesas/us7032evb1/scripts/sram.ld index a8373fdc05..514b623dc0 100644 --- a/boards/us7032evb1/scripts/sram.ld +++ b/boards/renesas/us7032evb1/scripts/sram.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/us7032evb1/nsh/ld.script + * boards/renesas/us7032evb1/nsh/ld.script * * Copyright (C) 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/us7032evb1/shterm/.gitignore b/boards/renesas/us7032evb1/shterm/.gitignore similarity index 100% rename from boards/us7032evb1/shterm/.gitignore rename to boards/renesas/us7032evb1/shterm/.gitignore diff --git a/boards/us7032evb1/shterm/Makefile b/boards/renesas/us7032evb1/shterm/Makefile similarity index 97% rename from boards/us7032evb1/shterm/Makefile rename to boards/renesas/us7032evb1/shterm/Makefile index 654e591a76..f2ac7a63e2 100644 --- a/boards/us7032evb1/shterm/Makefile +++ b/boards/renesas/us7032evb1/shterm/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# config/us7032evb1/shterm/Makefile +# boards/renesas/us7032evb1/shterm/Makefile # # Copyright (C) 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/us7032evb1/shterm/shterm.c b/boards/renesas/us7032evb1/shterm/shterm.c similarity index 99% rename from boards/us7032evb1/shterm/shterm.c rename to boards/renesas/us7032evb1/shterm/shterm.c index 0fa1d4b266..df7fb2edbb 100644 --- a/boards/us7032evb1/shterm/shterm.c +++ b/boards/renesas/us7032evb1/shterm/shterm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/us7032evb1/shterm/shterm.c + * boards/renesas/us7032evb1/shterm/shterm.c * * Copyright(C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/us7032evb1/src/.gitignore b/boards/renesas/us7032evb1/src/.gitignore similarity index 100% rename from boards/us7032evb1/src/.gitignore rename to boards/renesas/us7032evb1/src/.gitignore diff --git a/boards/us7032evb1/src/Makefile b/boards/renesas/us7032evb1/src/Makefile similarity index 98% rename from boards/us7032evb1/src/Makefile rename to boards/renesas/us7032evb1/src/Makefile index 20b27e6c8e..b123b140b1 100644 --- a/boards/us7032evb1/src/Makefile +++ b/boards/renesas/us7032evb1/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/us7032evb1/src/Makefile +# boards/ enesas/us7032evb1/src/Makefile # # Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/us7032evb1/src/sh1_leds.c b/boards/renesas/us7032evb1/src/sh1_leds.c similarity index 99% rename from boards/us7032evb1/src/sh1_leds.c rename to boards/renesas/us7032evb1/src/sh1_leds.c index 97a53dd90f..234e400acf 100644 --- a/boards/us7032evb1/src/sh1_leds.c +++ b/boards/renesas/us7032evb1/src/sh1_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/us7032evb1/src/sh1_leds.c + * boards/ enesas/us7032evb1/src/sh1_leds.c * * Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/gapuino/Kconfig b/boards/risc-v/gapuino/Kconfig similarity index 100% rename from boards/gapuino/Kconfig rename to boards/risc-v/gapuino/Kconfig diff --git a/boards/gapuino/README.txt b/boards/risc-v/gapuino/README.txt similarity index 100% rename from boards/gapuino/README.txt rename to boards/risc-v/gapuino/README.txt diff --git a/boards/gapuino/configs/nsh/defconfig b/boards/risc-v/gapuino/configs/nsh/defconfig similarity index 100% rename from boards/gapuino/configs/nsh/defconfig rename to boards/risc-v/gapuino/configs/nsh/defconfig diff --git a/boards/gapuino/include/board.h b/boards/risc-v/gapuino/include/board.h similarity index 93% rename from boards/gapuino/include/board.h rename to boards/risc-v/gapuino/include/board.h index c9eb9ca78d..20c7bb5b5e 100644 --- a/boards/gapuino/include/board.h +++ b/boards/risc-v/gapuino/include/board.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/gapuino/include/board.h + * boards/risc-v/gapuino/include/board.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: hhuysqt <1020988872@qq.com> @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_GAPUINO_INCLUDE_BOARD_H -#define __CONFIG_GAPUINO_INCLUDE_BOARD_H +#ifndef __BOARDS_RISC-V_GAPUINO_INCLUDE_BOARD_H +#define __BOARDS_RISC-V_GAPUINO_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -74,4 +74,4 @@ extern "C" } #endif #endif /* __ASSEMBLY__ */ -#endif /* __CONFIG_NR5M100_NEXYS4_INCLUDE_BOARD_H */ +#endif /* __BOARDS_RISC-V_NR5M100_NEXYS4_INCLUDE_BOARD_H */ diff --git a/boards/gapuino/scripts/Make.defs b/boards/risc-v/gapuino/scripts/Make.defs similarity index 96% rename from boards/gapuino/scripts/Make.defs rename to boards/risc-v/gapuino/scripts/Make.defs index c9294e350f..a27531aa68 100644 --- a/boards/gapuino/scripts/Make.defs +++ b/boards/risc-v/gapuino/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/gapuino/scripts/Make.defs +# boards/risc-v/gapuino/scripts/Make.defs # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/gapuino/scripts/ld.script b/boards/risc-v/gapuino/scripts/ld.script similarity index 99% rename from boards/gapuino/scripts/ld.script rename to boards/risc-v/gapuino/scripts/ld.script index 17d8097a42..2d04a35a3c 100644 --- a/boards/gapuino/scripts/ld.script +++ b/boards/risc-v/gapuino/scripts/ld.script @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/gapduino/scripts/ld.script + * boards/risc-v/gapduino/scripts/ld.script * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: hhuysqt <1020988872@qq.com> diff --git a/boards/gapuino/src/Makefile b/boards/risc-v/gapuino/src/Makefile similarity index 100% rename from boards/gapuino/src/Makefile rename to boards/risc-v/gapuino/src/Makefile diff --git a/boards/gapuino/src/gapuino_appinit.c b/boards/risc-v/gapuino/src/gapuino_appinit.c similarity index 98% rename from boards/gapuino/src/gapuino_appinit.c rename to boards/risc-v/gapuino/src/gapuino_appinit.c index 1bdb84ead6..0004fe8b41 100644 --- a/boards/gapuino/src/gapuino_appinit.c +++ b/boards/risc-v/gapuino/src/gapuino_appinit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/gapduino/src/gapduino_appinit.c + * boards/risc-v/gapduino/src/gapduino_appinit.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: hhuysqt <1020988872@qq.com> diff --git a/boards/gapuino/src/gapuino_sysinit.c b/boards/risc-v/gapuino/src/gapuino_sysinit.c similarity index 100% rename from boards/gapuino/src/gapuino_sysinit.c rename to boards/risc-v/gapuino/src/gapuino_sysinit.c diff --git a/boards/nr5m100-nexys4/Kconfig b/boards/risc-v/nr5m100-nexys4/Kconfig similarity index 100% rename from boards/nr5m100-nexys4/Kconfig rename to boards/risc-v/nr5m100-nexys4/Kconfig diff --git a/boards/nr5m100-nexys4/README.txt b/boards/risc-v/nr5m100-nexys4/README.txt similarity index 100% rename from boards/nr5m100-nexys4/README.txt rename to boards/risc-v/nr5m100-nexys4/README.txt diff --git a/boards/nr5m100-nexys4/configs/nsh/defconfig b/boards/risc-v/nr5m100-nexys4/configs/nsh/defconfig similarity index 100% rename from boards/nr5m100-nexys4/configs/nsh/defconfig rename to boards/risc-v/nr5m100-nexys4/configs/nsh/defconfig diff --git a/boards/nr5m100-nexys4/include/board.h b/boards/risc-v/nr5m100-nexys4/include/board.h similarity index 96% rename from boards/nr5m100-nexys4/include/board.h rename to boards/risc-v/nr5m100-nexys4/include/board.h index 646d0b7bc4..028945c8f2 100644 --- a/boards/nr5m100-nexys4/include/board.h +++ b/boards/risc-v/nr5m100-nexys4/include/board.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/nr5m100-nexys4/include/board.h + * boards/risc-v/nr5m100-nexys4/include/board.h * include/arch/board/board.h * * Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. @@ -39,8 +39,8 @@ * ************************************************************************************/ -#ifndef __CONFIG_NR5M100_NEXYS4_INCLUDE_BOARD_H -#define __CONFIG_NR5M100_NEXYS4_INCLUDE_BOARD_H +#ifndef __BOARDS_RISC-V_NR5M100_NEXYS4_INCLUDE_BOARD_H +#define __BOARDS_RISC-V_NR5M100_NEXYS4_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -161,5 +161,5 @@ void nr5_setleds(uint8_t ledset); } #endif #endif /* __ASSEMBLY__ */ -#endif /* __CONFIG_NR5M100_NEXYS4_INCLUDE_BOARD_H */ +#endif /* __BOARDS_RISC-V_NR5M100_NEXYS4_INCLUDE_BOARD_H */ diff --git a/boards/nr5m100-nexys4/scripts/Make.defs b/boards/risc-v/nr5m100-nexys4/scripts/Make.defs similarity index 95% rename from boards/nr5m100-nexys4/scripts/Make.defs rename to boards/risc-v/nr5m100-nexys4/scripts/Make.defs index f1fed30657..a2cac65ce9 100644 --- a/boards/nr5m100-nexys4/scripts/Make.defs +++ b/boards/risc-v/nr5m100-nexys4/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/stm32f4discovery/nsh/Make.defs +# boards/risc-v/stm32f4discovery/nsh/Make.defs # # Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -46,13 +46,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/nr5m100-nexys4/scripts/ld.script b/boards/risc-v/nr5m100-nexys4/scripts/ld.script similarity index 99% rename from boards/nr5m100-nexys4/scripts/ld.script rename to boards/risc-v/nr5m100-nexys4/scripts/ld.script index 2c82bb79a5..6a7b61e896 100644 --- a/boards/nr5m100-nexys4/scripts/ld.script +++ b/boards/risc-v/nr5m100-nexys4/scripts/ld.script @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/nr5m100-nexys4/scripts/ld.script + * boards/risc-v/nr5m100-nexys4/scripts/ld.script * * Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. * Copyright (C) 2016 Ken Pettit. diff --git a/boards/nr5m100-nexys4/scripts/nr5m1xx.cfg b/boards/risc-v/nr5m100-nexys4/scripts/nr5m1xx.cfg similarity index 97% rename from boards/nr5m100-nexys4/scripts/nr5m1xx.cfg rename to boards/risc-v/nr5m100-nexys4/scripts/nr5m1xx.cfg index 0fe77f55d0..d8bb9049a6 100644 --- a/boards/nr5m100-nexys4/scripts/nr5m1xx.cfg +++ b/boards/risc-v/nr5m100-nexys4/scripts/nr5m1xx.cfg @@ -1,5 +1,5 @@ ############################################################################ -# boards/nr5m100-nexys4/scripts/nr5m1xx.cfg +# boards/risc-v/nr5m100-nexys4/scripts/nr5m1xx.cfg # # Copyright (C) 2016 Ken Pettit. All rights reserved. # Author: Ken Pettit diff --git a/boards/nr5m100-nexys4/scripts/openocd.cfg b/boards/risc-v/nr5m100-nexys4/scripts/openocd.cfg similarity index 97% rename from boards/nr5m100-nexys4/scripts/openocd.cfg rename to boards/risc-v/nr5m100-nexys4/scripts/openocd.cfg index 57af6e507a..be490e691c 100644 --- a/boards/nr5m100-nexys4/scripts/openocd.cfg +++ b/boards/risc-v/nr5m100-nexys4/scripts/openocd.cfg @@ -1,5 +1,5 @@ ############################################################################ -# boards/nr5m100-nexys4/scripts/openocd.cfg +# boards/risc-v/nr5m100-nexys4/scripts/openocd.cfg # # Copyright (C) 2016 Ken Pettit. All rights reserved. # Author: Ken Pettit diff --git a/boards/nr5m100-nexys4/src/Makefile b/boards/risc-v/nr5m100-nexys4/src/Makefile similarity index 100% rename from boards/nr5m100-nexys4/src/Makefile rename to boards/risc-v/nr5m100-nexys4/src/Makefile diff --git a/boards/nr5m100-nexys4/src/nr5_appinit.c b/boards/risc-v/nr5m100-nexys4/src/nr5_appinit.c similarity index 98% rename from boards/nr5m100-nexys4/src/nr5_appinit.c rename to boards/risc-v/nr5m100-nexys4/src/nr5_appinit.c index 3e0f74edd7..15bac9768c 100644 --- a/boards/nr5m100-nexys4/src/nr5_appinit.c +++ b/boards/risc-v/nr5m100-nexys4/src/nr5_appinit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/nr5m100-nexys4/src/nr5_appinit.c + * boards/risc-v//nr5m100-nexys4/src/nr5_appinit.c * * Copyright (C) 2012-2013, 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/nr5m100-nexys4/src/nr5_autoleds.c b/boards/risc-v/nr5m100-nexys4/src/nr5_autoleds.c similarity index 98% rename from boards/nr5m100-nexys4/src/nr5_autoleds.c rename to boards/risc-v/nr5m100-nexys4/src/nr5_autoleds.c index 6691ae955a..4b819f526d 100644 --- a/boards/nr5m100-nexys4/src/nr5_autoleds.c +++ b/boards/risc-v/nr5m100-nexys4/src/nr5_autoleds.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/nr5m100_nexys4/src/nr5_autoleds.c + * boards/risc-v/nr5m100_nexys4/src/nr5_autoleds.c * * Copyright (C) 2016 Ken Pettit. All rights reserved. * Author: Ken Pettit diff --git a/boards/nr5m100-nexys4/src/nr5_boot.c b/boards/risc-v/nr5m100-nexys4/src/nr5_boot.c similarity index 98% rename from boards/nr5m100-nexys4/src/nr5_boot.c rename to boards/risc-v/nr5m100-nexys4/src/nr5_boot.c index 80b03ff118..8711de8665 100644 --- a/boards/nr5m100-nexys4/src/nr5_boot.c +++ b/boards/risc-v/nr5m100-nexys4/src/nr5_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/nr5m100_nexys4/src/nr5_boot.c + * boards/risc-v/nr5m100_nexys4/src/nr5_boot.c * * Copyright (C) 2016 Ken Pettit. All rights reserved. * Author: Ken Pettit diff --git a/boards/sim/Kconfig b/boards/sim/sim/Kconfig similarity index 100% rename from boards/sim/Kconfig rename to boards/sim/sim/Kconfig diff --git a/boards/sim/NETWORK-LINUX.txt b/boards/sim/sim/NETWORK-LINUX.txt similarity index 100% rename from boards/sim/NETWORK-LINUX.txt rename to boards/sim/sim/NETWORK-LINUX.txt diff --git a/boards/sim/README.txt b/boards/sim/sim/README.txt similarity index 100% rename from boards/sim/README.txt rename to boards/sim/sim/README.txt diff --git a/boards/sim/configs/bas/defconfig b/boards/sim/sim/configs/bas/defconfig similarity index 100% rename from boards/sim/configs/bas/defconfig rename to boards/sim/sim/configs/bas/defconfig diff --git a/boards/sim/configs/bluetooth/defconfig b/boards/sim/sim/configs/bluetooth/defconfig similarity index 100% rename from boards/sim/configs/bluetooth/defconfig rename to boards/sim/sim/configs/bluetooth/defconfig diff --git a/boards/sim/configs/configdata/defconfig b/boards/sim/sim/configs/configdata/defconfig similarity index 100% rename from boards/sim/configs/configdata/defconfig rename to boards/sim/sim/configs/configdata/defconfig diff --git a/boards/sim/configs/cxxtest/Make.defs b/boards/sim/sim/configs/cxxtest/Make.defs similarity index 100% rename from boards/sim/configs/cxxtest/Make.defs rename to boards/sim/sim/configs/cxxtest/Make.defs diff --git a/boards/sim/configs/cxxtest/defconfig b/boards/sim/sim/configs/cxxtest/defconfig similarity index 100% rename from boards/sim/configs/cxxtest/defconfig rename to boards/sim/sim/configs/cxxtest/defconfig diff --git a/boards/sim/configs/dsptest/defconfig b/boards/sim/sim/configs/dsptest/defconfig similarity index 100% rename from boards/sim/configs/dsptest/defconfig rename to boards/sim/sim/configs/dsptest/defconfig diff --git a/boards/sim/configs/fb/defconfig b/boards/sim/sim/configs/fb/defconfig similarity index 100% rename from boards/sim/configs/fb/defconfig rename to boards/sim/sim/configs/fb/defconfig diff --git a/boards/sim/configs/ipforward/defconfig b/boards/sim/sim/configs/ipforward/defconfig similarity index 100% rename from boards/sim/configs/ipforward/defconfig rename to boards/sim/sim/configs/ipforward/defconfig diff --git a/boards/sim/configs/loadable/defconfig b/boards/sim/sim/configs/loadable/defconfig similarity index 100% rename from boards/sim/configs/loadable/defconfig rename to boards/sim/sim/configs/loadable/defconfig diff --git a/boards/sim/configs/minibasic/defconfig b/boards/sim/sim/configs/minibasic/defconfig similarity index 100% rename from boards/sim/configs/minibasic/defconfig rename to boards/sim/sim/configs/minibasic/defconfig diff --git a/boards/sim/configs/mount/defconfig b/boards/sim/sim/configs/mount/defconfig similarity index 100% rename from boards/sim/configs/mount/defconfig rename to boards/sim/sim/configs/mount/defconfig diff --git a/boards/sim/configs/mtdpart/defconfig b/boards/sim/sim/configs/mtdpart/defconfig similarity index 100% rename from boards/sim/configs/mtdpart/defconfig rename to boards/sim/sim/configs/mtdpart/defconfig diff --git a/boards/sim/configs/mtdrwb/defconfig b/boards/sim/sim/configs/mtdrwb/defconfig similarity index 100% rename from boards/sim/configs/mtdrwb/defconfig rename to boards/sim/sim/configs/mtdrwb/defconfig diff --git a/boards/sim/configs/nettest/defconfig b/boards/sim/sim/configs/nettest/defconfig similarity index 100% rename from boards/sim/configs/nettest/defconfig rename to boards/sim/sim/configs/nettest/defconfig diff --git a/boards/sim/configs/nsh/defconfig b/boards/sim/sim/configs/nsh/defconfig similarity index 100% rename from boards/sim/configs/nsh/defconfig rename to boards/sim/sim/configs/nsh/defconfig diff --git a/boards/sim/configs/nsh2/Make.defs b/boards/sim/sim/configs/nsh2/Make.defs similarity index 100% rename from boards/sim/configs/nsh2/Make.defs rename to boards/sim/sim/configs/nsh2/Make.defs diff --git a/boards/sim/configs/nsh2/defconfig b/boards/sim/sim/configs/nsh2/defconfig similarity index 100% rename from boards/sim/configs/nsh2/defconfig rename to boards/sim/sim/configs/nsh2/defconfig diff --git a/boards/sim/configs/nx/defconfig b/boards/sim/sim/configs/nx/defconfig similarity index 100% rename from boards/sim/configs/nx/defconfig rename to boards/sim/sim/configs/nx/defconfig diff --git a/boards/sim/configs/nx11/defconfig b/boards/sim/sim/configs/nx11/defconfig similarity index 100% rename from boards/sim/configs/nx11/defconfig rename to boards/sim/sim/configs/nx11/defconfig diff --git a/boards/sim/configs/nxffs/defconfig b/boards/sim/sim/configs/nxffs/defconfig similarity index 100% rename from boards/sim/configs/nxffs/defconfig rename to boards/sim/sim/configs/nxffs/defconfig diff --git a/boards/sim/configs/nxlines/defconfig b/boards/sim/sim/configs/nxlines/defconfig similarity index 100% rename from boards/sim/configs/nxlines/defconfig rename to boards/sim/sim/configs/nxlines/defconfig diff --git a/boards/sim/configs/nxwm/defconfig b/boards/sim/sim/configs/nxwm/defconfig similarity index 100% rename from boards/sim/configs/nxwm/defconfig rename to boards/sim/sim/configs/nxwm/defconfig diff --git a/boards/sim/configs/ostest/defconfig b/boards/sim/sim/configs/ostest/defconfig similarity index 100% rename from boards/sim/configs/ostest/defconfig rename to boards/sim/sim/configs/ostest/defconfig diff --git a/boards/sim/configs/pashello/defconfig b/boards/sim/sim/configs/pashello/defconfig similarity index 100% rename from boards/sim/configs/pashello/defconfig rename to boards/sim/sim/configs/pashello/defconfig diff --git a/boards/sim/configs/pf_ieee802154/defconfig b/boards/sim/sim/configs/pf_ieee802154/defconfig similarity index 100% rename from boards/sim/configs/pf_ieee802154/defconfig rename to boards/sim/sim/configs/pf_ieee802154/defconfig diff --git a/boards/sim/configs/pktradio/defconfig b/boards/sim/sim/configs/pktradio/defconfig similarity index 100% rename from boards/sim/configs/pktradio/defconfig rename to boards/sim/sim/configs/pktradio/defconfig diff --git a/boards/sim/configs/sixlowpan/defconfig b/boards/sim/sim/configs/sixlowpan/defconfig similarity index 100% rename from boards/sim/configs/sixlowpan/defconfig rename to boards/sim/sim/configs/sixlowpan/defconfig diff --git a/boards/sim/configs/spiffs/defconfig b/boards/sim/sim/configs/spiffs/defconfig similarity index 100% rename from boards/sim/configs/spiffs/defconfig rename to boards/sim/sim/configs/spiffs/defconfig diff --git a/boards/sim/configs/touchscreen/defconfig b/boards/sim/sim/configs/touchscreen/defconfig similarity index 100% rename from boards/sim/configs/touchscreen/defconfig rename to boards/sim/sim/configs/touchscreen/defconfig diff --git a/boards/sim/configs/traveler/defconfig b/boards/sim/sim/configs/traveler/defconfig similarity index 100% rename from boards/sim/configs/traveler/defconfig rename to boards/sim/sim/configs/traveler/defconfig diff --git a/boards/sim/configs/udgram/defconfig b/boards/sim/sim/configs/udgram/defconfig similarity index 100% rename from boards/sim/configs/udgram/defconfig rename to boards/sim/sim/configs/udgram/defconfig diff --git a/boards/sim/configs/unionfs/defconfig b/boards/sim/sim/configs/unionfs/defconfig similarity index 100% rename from boards/sim/configs/unionfs/defconfig rename to boards/sim/sim/configs/unionfs/defconfig diff --git a/boards/sim/configs/userfs/defconfig b/boards/sim/sim/configs/userfs/defconfig similarity index 100% rename from boards/sim/configs/userfs/defconfig rename to boards/sim/sim/configs/userfs/defconfig diff --git a/boards/sim/configs/ustream/defconfig b/boards/sim/sim/configs/ustream/defconfig similarity index 100% rename from boards/sim/configs/ustream/defconfig rename to boards/sim/sim/configs/ustream/defconfig diff --git a/boards/sim/include/.gitignore b/boards/sim/sim/include/.gitignore similarity index 100% rename from boards/sim/include/.gitignore rename to boards/sim/sim/include/.gitignore diff --git a/boards/sim/include/README.txt b/boards/sim/sim/include/README.txt similarity index 100% rename from boards/sim/include/README.txt rename to boards/sim/sim/include/README.txt diff --git a/boards/sim/include/board.h b/boards/sim/sim/include/board.h similarity index 82% rename from boards/sim/include/board.h rename to boards/sim/sim/include/board.h index da436e8006..7837f3621c 100644 --- a/boards/sim/include/board.h +++ b/boards/sim/sim/include/board.h @@ -1,3 +1,3 @@ /**************************************************************************** - * boards/sim/include/board.h + * boards/sim/sim/include/board.h ****************************************************************************/ diff --git a/boards/sim/include/etc.tar.gz b/boards/sim/sim/include/etc.tar.gz similarity index 100% rename from boards/sim/include/etc.tar.gz rename to boards/sim/sim/include/etc.tar.gz diff --git a/boards/sim/include/nsh_romfsimg.h b/boards/sim/sim/include/nsh_romfsimg.h similarity index 100% rename from boards/sim/include/nsh_romfsimg.h rename to boards/sim/sim/include/nsh_romfsimg.h diff --git a/boards/sim/scripts/Make.defs b/boards/sim/sim/scripts/Make.defs similarity index 96% rename from boards/sim/scripts/Make.defs rename to boards/sim/sim/scripts/Make.defs index 3c58347f26..a9c6fd2026 100644 --- a/boards/sim/scripts/Make.defs +++ b/boards/sim/sim/scripts/Make.defs @@ -94,9 +94,9 @@ CXXELFFLAGS = $(CXXFLAGS) LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif diff --git a/boards/sim/scripts/gnu-elf.ld b/boards/sim/sim/scripts/gnu-elf.ld similarity index 99% rename from boards/sim/scripts/gnu-elf.ld rename to boards/sim/sim/scripts/gnu-elf.ld index f40fc28311..b39c7e67be 100644 --- a/boards/sim/scripts/gnu-elf.ld +++ b/boards/sim/sim/scripts/gnu-elf.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/sim/scripts/gnu-elf.ld + * boards/sim/sim/scripts/gnu-elf.ld * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/viewtool-stm32f107/src/.gitignore b/boards/sim/sim/src/.gitignore similarity index 100% rename from boards/viewtool-stm32f107/src/.gitignore rename to boards/sim/sim/src/.gitignore diff --git a/boards/sim/src/Makefile b/boards/sim/sim/src/Makefile similarity index 100% rename from boards/sim/src/Makefile rename to boards/sim/sim/src/Makefile diff --git a/boards/sim/src/sim.h b/boards/sim/sim/src/sim.h similarity index 98% rename from boards/sim/src/sim.h rename to boards/sim/sim/src/sim.h index 624dbea9cc..3de54490a3 100644 --- a/boards/sim/src/sim.h +++ b/boards/sim/sim/src/sim.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_SIM_SRC_SIM_H -#define __BOARDS_SIM_SRC_SIM_H +#ifndef __BOARDS_SIM_SIM_SRC_SIM_H +#define __BOARDS_SIM_SIM_SRC_SIM_H /**************************************************************************** * Included Files @@ -144,4 +144,4 @@ int sim_gpio_initialize(void); int sim_tsc_setup(int minor); #endif -#endif /* __BOARDS_SIM_SRC_SIM_H */ \ No newline at end of file +#endif /* __BOARDS_SIM_SIM_SRC_SIM_H */ \ No newline at end of file diff --git a/boards/sim/src/sim_appinit.c b/boards/sim/sim/src/sim_appinit.c similarity index 99% rename from boards/sim/src/sim_appinit.c rename to boards/sim/sim/src/sim_appinit.c index 7a78088383..c553bedb11 100644 --- a/boards/sim/src/sim_appinit.c +++ b/boards/sim/sim/src/sim_appinit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/sim/src/sim_appinit.c + * boards/sim/sim/src/sim_appinit.c * * Copyright (C) 2015-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/sim/src/sim_boot.c b/boards/sim/sim/src/sim_boot.c similarity index 100% rename from boards/sim/src/sim_boot.c rename to boards/sim/sim/src/sim_boot.c diff --git a/boards/sim/src/sim_bringup.c b/boards/sim/sim/src/sim_bringup.c similarity index 99% rename from boards/sim/src/sim_bringup.c rename to boards/sim/sim/src/sim_bringup.c index 1802756e38..37828a0f9f 100644 --- a/boards/sim/src/sim_bringup.c +++ b/boards/sim/sim/src/sim_bringup.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/sim/src/sam_bringup.c + * boards/sim/sim/src/sam_bringup.c * * Copyright (C) 2015, 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/sim/src/sim_gpio.c b/boards/sim/sim/src/sim_gpio.c similarity index 99% rename from boards/sim/src/sim_gpio.c rename to boards/sim/sim/src/sim_gpio.c index a0b61ef0c8..76ff640887 100644 --- a/boards/sim/src/sim_gpio.c +++ b/boards/sim/sim/src/sim_gpio.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/sim/src/sim_gpio.c + * boards/sim/sim/src/sim_gpio.c * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/sim/src/sim_ioexpander.c b/boards/sim/sim/src/sim_ioexpander.c similarity index 99% rename from boards/sim/src/sim_ioexpander.c rename to boards/sim/sim/src/sim_ioexpander.c index 5c68da780f..42ab6dec3a 100644 --- a/boards/sim/src/sim_ioexpander.c +++ b/boards/sim/sim/src/sim_ioexpander.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/sim/src/sim_ioexpander.c + * boards/sim/sim/src/sim_ioexpander.c * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/sim/src/sim_touchscreen.c b/boards/sim/sim/src/sim_touchscreen.c similarity index 100% rename from boards/sim/src/sim_touchscreen.c rename to boards/sim/sim/src/sim_touchscreen.c diff --git a/boards/sim/src/sim_zoneinfo.c b/boards/sim/sim/src/sim_zoneinfo.c similarity index 100% rename from boards/sim/src/sim_zoneinfo.c rename to boards/sim/sim/src/sim_zoneinfo.c diff --git a/boards/p112/Kconfig b/boards/x86/qemu-i486/Kconfig similarity index 100% rename from boards/p112/Kconfig rename to boards/x86/qemu-i486/Kconfig diff --git a/boards/qemu-i486/README.txt b/boards/x86/qemu-i486/README.txt similarity index 100% rename from boards/qemu-i486/README.txt rename to boards/x86/qemu-i486/README.txt diff --git a/boards/qemu-i486/configs/nsh/defconfig b/boards/x86/qemu-i486/configs/nsh/defconfig similarity index 100% rename from boards/qemu-i486/configs/nsh/defconfig rename to boards/x86/qemu-i486/configs/nsh/defconfig diff --git a/boards/qemu-i486/configs/ostest/defconfig b/boards/x86/qemu-i486/configs/ostest/defconfig similarity index 100% rename from boards/qemu-i486/configs/ostest/defconfig rename to boards/x86/qemu-i486/configs/ostest/defconfig diff --git a/boards/qemu-i486/include/board.h b/boards/x86/qemu-i486/include/board.h similarity index 94% rename from boards/qemu-i486/include/board.h rename to boards/x86/qemu-i486/include/board.h index 7edfa3c6f8..2962712d34 100644 --- a/boards/qemu-i486/include/board.h +++ b/boards/x86/qemu-i486/include/board.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/qemu-i486/include/board.h + * boards/x86/qemu-i486/include/board.h * include/arch/board/board.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. @@ -34,8 +34,8 @@ * ************************************************************************************/ -#ifndef _CONFIGS_QEMU_I486_INCLUDE_BOARD_H -#define _CONFIGS_QEMU_I486_INCLUDE_BOARD_H +#ifndef __BOARDS_X86_QEMU_I486_INCLUDE_BOARD_H +#define __BOARDS_X86_QEMU_I486_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -88,4 +88,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* _CONFIGS_QEMU_I486_INCLUDE_BOARD_H */ +#endif /* __BOARDS_X86_QEMU_I486_INCLUDE_BOARD_H */ diff --git a/boards/qemu-i486/scripts/Make.defs b/boards/x86/qemu-i486/scripts/Make.defs similarity index 96% rename from boards/qemu-i486/scripts/Make.defs rename to boards/x86/qemu-i486/scripts/Make.defs index a29b6f4768..467c811725 100644 --- a/boards/qemu-i486/scripts/Make.defs +++ b/boards/x86/qemu-i486/scripts/Make.defs @@ -53,14 +53,14 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mkwindeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/qemu.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/qemu.ld}" MAXOPTIMIZATION = -O2 else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/qemu.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/qemu.ld endif ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin -fno-stack-protector diff --git a/boards/qemu-i486/scripts/qemu.ld b/boards/x86/qemu-i486/scripts/qemu.ld similarity index 98% rename from boards/qemu-i486/scripts/qemu.ld rename to boards/x86/qemu-i486/scripts/qemu.ld index 60943637ce..bfe3c34d81 100644 --- a/boards/qemu-i486/scripts/qemu.ld +++ b/boards/x86/qemu-i486/scripts/qemu.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/qemu-i486/scripts/qemu.ld + * boards/†/qemu-i486/scripts/qemu.ld * * Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/zkit-arm-1769/src/.gitignore b/boards/x86/qemu-i486/src/.gitignore similarity index 100% rename from boards/zkit-arm-1769/src/.gitignore rename to boards/x86/qemu-i486/src/.gitignore diff --git a/boards/qemu-i486/src/Makefile b/boards/x86/qemu-i486/src/Makefile similarity index 100% rename from boards/qemu-i486/src/Makefile rename to boards/x86/qemu-i486/src/Makefile diff --git a/boards/qemu-i486/src/qemu_boot.c b/boards/x86/qemu-i486/src/qemu_boot.c similarity index 98% rename from boards/qemu-i486/src/qemu_boot.c rename to boards/x86/qemu-i486/src/qemu_boot.c index 2707801965..95f4cb2f4c 100644 --- a/boards/qemu-i486/src/qemu_boot.c +++ b/boards/x86/qemu-i486/src/qemu_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/qemu-i486/src/qemu_boot.c + * boards/x86/qemu-i486/src/qemu_boot.c * * Copyright (C) 2011, 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/qemu-i486/src/qemu_i486.h b/boards/x86/qemu-i486/src/qemu_i486.h similarity index 94% rename from boards/qemu-i486/src/qemu_i486.h rename to boards/x86/qemu-i486/src/qemu_i486.h index eedf58f0da..a5bfc2a3d2 100644 --- a/boards/qemu-i486/src/qemu_i486.h +++ b/boards/x86/qemu-i486/src/qemu_i486.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/qemu-i486/src/qemu_i486.h + * boards/x86/qemu-i486/src/qemu_i486.h * * Copyright (C) 2011, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef _CONFIGS_QEMU_I486_SRC_QEMU_I486_H -#define _CONFIGS_QEMU_I486_SRC_QEMU_I486_H +#ifndef __BOARDS_X86_QEMU_I486_SRC_QEMU_I486_H +#define __BOARDS_X86_QEMU_I486_SRC_QEMU_I486_H /************************************************************************************ * Included Files @@ -64,4 +64,4 @@ ************************************************************************************/ #endif /* __ASSEMBLY__ */ -#endif /* _CONFIGS_QEMU_I486_SRC_QEMU_I486_H */ +#endif /* __BOARDS_X86_QEMU_I486_SRC_QEMU_I486_H */ diff --git a/boards/esp32-core/Kconfig b/boards/xtensa/esp32-core/Kconfig similarity index 100% rename from boards/esp32-core/Kconfig rename to boards/xtensa/esp32-core/Kconfig diff --git a/boards/esp32-core/README.txt b/boards/xtensa/esp32-core/README.txt similarity index 100% rename from boards/esp32-core/README.txt rename to boards/xtensa/esp32-core/README.txt diff --git a/boards/esp32-core/configs/nsh/defconfig b/boards/xtensa/esp32-core/configs/nsh/defconfig similarity index 100% rename from boards/esp32-core/configs/nsh/defconfig rename to boards/xtensa/esp32-core/configs/nsh/defconfig diff --git a/boards/esp32-core/configs/ostest/defconfig b/boards/xtensa/esp32-core/configs/ostest/defconfig similarity index 100% rename from boards/esp32-core/configs/ostest/defconfig rename to boards/xtensa/esp32-core/configs/ostest/defconfig diff --git a/boards/esp32-core/configs/smp/defconfig b/boards/xtensa/esp32-core/configs/smp/defconfig similarity index 100% rename from boards/esp32-core/configs/smp/defconfig rename to boards/xtensa/esp32-core/configs/smp/defconfig diff --git a/boards/esp32-core/include/board.h b/boards/xtensa/esp32-core/include/board.h similarity index 93% rename from boards/esp32-core/include/board.h rename to boards/xtensa/esp32-core/include/board.h index a7681c40a0..b78ac149b1 100644 --- a/boards/esp32-core/include/board.h +++ b/boards/xtensa/esp32-core/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/esp32-core/include/board.h + * boards/xtensa/esp32-core/include/board.h * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ESP32_CORE_INCLUDE_BOARD_H -#define __BOARDS_ESP32_CORE_INCLUDE_BOARD_H +#ifndef __BOARDS_XTENSA_ESP32_CORE_INCLUDE_BOARD_H +#define __BOARDS_XTENSA_ESP32_CORE_INCLUDE_BOARD_H /**************************************************************************** * Pre-processor Definitions @@ -68,4 +68,4 @@ # define BOARD_CLOCK_FREQUENCY BOARD_XTAL_FREQUENCY #endif -#endif /* __BOARDS_ESP32_CORE_INCLUDE_BOARD_H */ +#endif /* __BOARDS_XTENSA_ESP32_CORE_INCLUDE_BOARD_H */ diff --git a/boards/esp32-core/scripts/.gitignore b/boards/xtensa/esp32-core/scripts/.gitignore similarity index 100% rename from boards/esp32-core/scripts/.gitignore rename to boards/xtensa/esp32-core/scripts/.gitignore diff --git a/boards/esp32-core/scripts/Make.defs b/boards/xtensa/esp32-core/scripts/Make.defs similarity index 90% rename from boards/esp32-core/scripts/Make.defs rename to boards/xtensa/esp32-core/scripts/Make.defs index 2bdb2f57a7..0394f14d5b 100644 --- a/boards/esp32-core/scripts/Make.defs +++ b/boards/xtensa/esp32-core/scripts/Make.defs @@ -37,14 +37,14 @@ include ${TOPDIR}/.config include ${TOPDIR}/tools/Config.mk include ${TOPDIR}/arch/xtensa/src/lx6/Toolchain.defs -LDSCRIPT1 = $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/esp32_out.ld -LDSCRIPT3 = $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/esp32_rom.ld -LDSCRIPT4 = $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/esp32_peripherals.ld +LDSCRIPT1 = $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/esp32_out.ld +LDSCRIPT3 = $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/esp32_rom.ld +LDSCRIPT4 = $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/esp32_peripherals.ld ifeq ($(CONFIG_ESP32CORE_RUN_IRAM),y) - LDSCRIPT2 = $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/esp32_iram.ld + LDSCRIPT2 = $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/esp32_iram.ld else - LDSCRIPT2 = $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/esp32_flash.ld + LDSCRIPT2 = $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/esp32_flash.ld endif ifeq ($(WINTOOL),y) diff --git a/boards/esp32-core/scripts/esp32.cfg b/boards/xtensa/esp32-core/scripts/esp32.cfg similarity index 100% rename from boards/esp32-core/scripts/esp32.cfg rename to boards/xtensa/esp32-core/scripts/esp32.cfg diff --git a/boards/esp32-core/scripts/esp32.template b/boards/xtensa/esp32-core/scripts/esp32.template similarity index 97% rename from boards/esp32-core/scripts/esp32.template rename to boards/xtensa/esp32-core/scripts/esp32.template index b7394b9870..b9750aa50f 100644 --- a/boards/esp32-core/scripts/esp32.template +++ b/boards/xtensa/esp32-core/scripts/esp32.template @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/elf32-core/scripts/esp32.template + * boards/xtensa/elf32-core/scripts/esp32.template * ESP32 Linker Script Memory Layout * * This file describes the memory layout (memory blocks) as virtual diff --git a/boards/esp32-core/scripts/esp32_flash.ld b/boards/xtensa/esp32-core/scripts/esp32_flash.ld similarity index 98% rename from boards/esp32-core/scripts/esp32_flash.ld rename to boards/xtensa/esp32-core/scripts/esp32_flash.ld index 2292636f63..a830ea79cb 100644 --- a/boards/esp32-core/scripts/esp32_flash.ld +++ b/boards/xtensa/esp32-core/scripts/esp32_flash.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/elf32-core/scripts/esp32_flash.ld + * boards/xtensa/elf32-core/scripts/esp32_flash.ld ****************************************************************************/ /* Default entry point: */ diff --git a/boards/esp32-core/scripts/esp32_iram.ld b/boards/xtensa/esp32-core/scripts/esp32_iram.ld similarity index 98% rename from boards/esp32-core/scripts/esp32_iram.ld rename to boards/xtensa/esp32-core/scripts/esp32_iram.ld index c83316ffdf..5e7d954684 100644 --- a/boards/esp32-core/scripts/esp32_iram.ld +++ b/boards/xtensa/esp32-core/scripts/esp32_iram.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/elf32-core/scripts/esp32_iram.ld + * boards/xtensa/elf32-core/scripts/esp32_iram.ld ****************************************************************************/ /* Default entry point: */ diff --git a/boards/esp32-core/scripts/esp32_peripherals.ld b/boards/xtensa/esp32-core/scripts/esp32_peripherals.ld similarity index 93% rename from boards/esp32-core/scripts/esp32_peripherals.ld rename to boards/xtensa/esp32-core/scripts/esp32_peripherals.ld index 9595be2a9d..f44bb34646 100644 --- a/boards/esp32-core/scripts/esp32_peripherals.ld +++ b/boards/xtensa/esp32-core/scripts/esp32_peripherals.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/elf32-core/scripts/esp32_peripherals.ld + * boards/xtensa/elf32-core/scripts/esp32_peripherals.ld ****************************************************************************/ PROVIDE ( UART0 = 0x3ff40000 ); diff --git a/boards/esp32-core/scripts/esp32_rom.ld b/boards/xtensa/esp32-core/scripts/esp32_rom.ld similarity index 99% rename from boards/esp32-core/scripts/esp32_rom.ld rename to boards/xtensa/esp32-core/scripts/esp32_rom.ld index 8d318cc19f..60af0057d0 100644 --- a/boards/esp32-core/scripts/esp32_rom.ld +++ b/boards/xtensa/esp32-core/scripts/esp32_rom.ld @@ -1163,7 +1163,7 @@ PROVIDE ( r_lld_pdu_tx_prog = 0x4004b120 ); PROVIDE ( r_lld_pdu_tx_push = 0x4004b080 ); PROVIDE ( r_lld_ral_renew_req = 0x4004a73c ); /**************************************************************************** - * boards/elf32-core/scripts/esp32_rom.ld + * boards/xtensa/elf32-core/scripts/esp32_rom.ld ****************************************************************************/ PROVIDE ( r_lld_scan_start = 0x40048ee0 ); diff --git a/boards/zp214xpa/src/.gitignore b/boards/xtensa/esp32-core/src/.gitignore similarity index 100% rename from boards/zp214xpa/src/.gitignore rename to boards/xtensa/esp32-core/src/.gitignore diff --git a/boards/esp32-core/src/Makefile b/boards/xtensa/esp32-core/src/Makefile similarity index 100% rename from boards/esp32-core/src/Makefile rename to boards/xtensa/esp32-core/src/Makefile diff --git a/boards/esp32-core/src/esp32-core.h b/boards/xtensa/esp32-core/src/esp32-core.h similarity index 94% rename from boards/esp32-core/src/esp32-core.h rename to boards/xtensa/esp32-core/src/esp32-core.h index 0ed3ef5f72..75f9ded4c7 100644 --- a/boards/esp32-core/src/esp32-core.h +++ b/boards/xtensa/esp32-core/src/esp32-core.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/esp32-core/src/esp32-core.h + * boards/xtensa/esp32-core/src/esp32-core.h * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ESP32_CORE_SRC_ESP32_CORE_H -#define __BOARDS_ESP32_CORE_SRC_ESP32_CORE_H +#ifndef __BOARDS_XTENSA_ESP32_CORE_SRC_ESP32_CORE_H +#define __BOARDS_XTENSA_ESP32_CORE_SRC_ESP32_CORE_H /**************************************************************************** * Included Files @@ -79,4 +79,4 @@ int esp32_bringup(void); #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ESP32_CORE_SRC_ESP32_CORE_H */ +#endif /* __BOARDS_XTENSA_ESP32_CORE_SRC_ESP32_CORE_H */ diff --git a/boards/esp32-core/src/esp32_appinit.c b/boards/xtensa/esp32-core/src/esp32_appinit.c similarity index 100% rename from boards/esp32-core/src/esp32_appinit.c rename to boards/xtensa/esp32-core/src/esp32_appinit.c diff --git a/boards/esp32-core/src/esp32_boot.c b/boards/xtensa/esp32-core/src/esp32_boot.c similarity index 98% rename from boards/esp32-core/src/esp32_boot.c rename to boards/xtensa/esp32-core/src/esp32_boot.c index cef6421bcf..40b3be7c9d 100644 --- a/boards/esp32-core/src/esp32_boot.c +++ b/boards/xtensa/esp32-core/src/esp32_boot.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/esp32-core/src/esp32_boot.c + * boards/xtensa/esp32-core/src/esp32_boot.c * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/esp32-core/src/esp32_bringup.c b/boards/xtensa/esp32-core/src/esp32_bringup.c similarity index 100% rename from boards/esp32-core/src/esp32_bringup.c rename to boards/xtensa/esp32-core/src/esp32_bringup.c diff --git a/boards/qemu-i486/Kconfig b/boards/z16/z16f2800100zcog/Kconfig similarity index 100% rename from boards/qemu-i486/Kconfig rename to boards/z16/z16f2800100zcog/Kconfig diff --git a/boards/z16f2800100zcog/README.txt b/boards/z16/z16f2800100zcog/README.txt similarity index 100% rename from boards/z16f2800100zcog/README.txt rename to boards/z16/z16f2800100zcog/README.txt diff --git a/boards/z16f2800100zcog/configs/nsh/.gitignore b/boards/z16/z16f2800100zcog/configs/nsh/.gitignore similarity index 100% rename from boards/z16f2800100zcog/configs/nsh/.gitignore rename to boards/z16/z16f2800100zcog/configs/nsh/.gitignore diff --git a/boards/z16f2800100zcog/configs/nsh/README.txt b/boards/z16/z16f2800100zcog/configs/nsh/README.txt similarity index 100% rename from boards/z16f2800100zcog/configs/nsh/README.txt rename to boards/z16/z16f2800100zcog/configs/nsh/README.txt diff --git a/boards/z16f2800100zcog/configs/nsh/defconfig b/boards/z16/z16f2800100zcog/configs/nsh/defconfig similarity index 100% rename from boards/z16f2800100zcog/configs/nsh/defconfig rename to boards/z16/z16f2800100zcog/configs/nsh/defconfig diff --git a/boards/z16f2800100zcog/configs/nsh/nsh.zfpproj b/boards/z16/z16f2800100zcog/configs/nsh/nsh.zfpproj similarity index 100% rename from boards/z16f2800100zcog/configs/nsh/nsh.zfpproj rename to boards/z16/z16f2800100zcog/configs/nsh/nsh.zfpproj diff --git a/boards/z16f2800100zcog/configs/ostest/.gitignore b/boards/z16/z16f2800100zcog/configs/ostest/.gitignore similarity index 100% rename from boards/z16f2800100zcog/configs/ostest/.gitignore rename to boards/z16/z16f2800100zcog/configs/ostest/.gitignore diff --git a/boards/z16f2800100zcog/configs/ostest/README.txt b/boards/z16/z16f2800100zcog/configs/ostest/README.txt similarity index 100% rename from boards/z16f2800100zcog/configs/ostest/README.txt rename to boards/z16/z16f2800100zcog/configs/ostest/README.txt diff --git a/boards/z16f2800100zcog/configs/ostest/defconfig b/boards/z16/z16f2800100zcog/configs/ostest/defconfig similarity index 100% rename from boards/z16f2800100zcog/configs/ostest/defconfig rename to boards/z16/z16f2800100zcog/configs/ostest/defconfig diff --git a/boards/z16f2800100zcog/configs/ostest/ostest.zfpproj b/boards/z16/z16f2800100zcog/configs/ostest/ostest.zfpproj similarity index 100% rename from boards/z16f2800100zcog/configs/ostest/ostest.zfpproj rename to boards/z16/z16f2800100zcog/configs/ostest/ostest.zfpproj diff --git a/boards/z16f2800100zcog/configs/pashello/.gitignore b/boards/z16/z16f2800100zcog/configs/pashello/.gitignore similarity index 100% rename from boards/z16f2800100zcog/configs/pashello/.gitignore rename to boards/z16/z16f2800100zcog/configs/pashello/.gitignore diff --git a/boards/z16f2800100zcog/configs/pashello/README.txt b/boards/z16/z16f2800100zcog/configs/pashello/README.txt similarity index 100% rename from boards/z16f2800100zcog/configs/pashello/README.txt rename to boards/z16/z16f2800100zcog/configs/pashello/README.txt diff --git a/boards/z16f2800100zcog/configs/pashello/defconfig b/boards/z16/z16f2800100zcog/configs/pashello/defconfig similarity index 100% rename from boards/z16f2800100zcog/configs/pashello/defconfig rename to boards/z16/z16f2800100zcog/configs/pashello/defconfig diff --git a/boards/z16f2800100zcog/configs/pashello/pashello.zfpproj b/boards/z16/z16f2800100zcog/configs/pashello/pashello.zfpproj similarity index 100% rename from boards/z16f2800100zcog/configs/pashello/pashello.zfpproj rename to boards/z16/z16f2800100zcog/configs/pashello/pashello.zfpproj diff --git a/boards/z16f2800100zcog/include/board.h b/boards/z16/z16f2800100zcog/include/board.h similarity index 95% rename from boards/z16f2800100zcog/include/board.h rename to boards/z16/z16f2800100zcog/include/board.h index 0d49034c92..5ccc3552b2 100644 --- a/boards/z16f2800100zcog/include/board.h +++ b/boards/z16/z16f2800100zcog/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z16f2800100zcog/board.h + * boards/z16/z16f2800100zcog/board.h * * Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_Z16F2800100ZCOG_INCLUDE_BOARD_H -#define __BOARDS_Z16F2800100ZCOG_INCLUDE_BOARD_H +#ifndef __BOARDS_Z16_Z16F2800100ZCOG_INCLUDE_BOARD_H +#define __BOARDS_Z16_Z16F2800100ZCOG_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -122,4 +122,4 @@ extern "C" { } #endif -#endif /* __BOARDS_Z16F2800100ZCOG_INCLUDE_BOARD_H */ +#endif /* __BOARDS_Z16_Z16F2800100ZCOG_INCLUDE_BOARD_H */ diff --git a/boards/z16f2800100zcog/scripts/Make.defs b/boards/z16/z16f2800100zcog/scripts/Make.defs similarity index 100% rename from boards/z16f2800100zcog/scripts/Make.defs rename to boards/z16/z16f2800100zcog/scripts/Make.defs diff --git a/boards/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd b/boards/z16/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd similarity index 98% rename from boards/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd rename to boards/z16/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd index d952777ff7..57999c3b4a 100644 --- a/boards/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd +++ b/boards/z16/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd @@ -1,5 +1,5 @@ /****************************************************************************/ -/* boards/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd */ +/* boards/z16/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd */ /* */ /* Copyright (C) 2008, 2014, 2017 Gregory Nutt. All rights reserved. */ /* Author: Gregory Nutt */ diff --git a/boards/ez80f910200kitg/src/.gitignore b/boards/z16/z16f2800100zcog/src/.gitignore similarity index 100% rename from boards/ez80f910200kitg/src/.gitignore rename to boards/z16/z16f2800100zcog/src/.gitignore diff --git a/boards/z16f2800100zcog/src/Makefile b/boards/z16/z16f2800100zcog/src/Makefile similarity index 100% rename from boards/z16f2800100zcog/src/Makefile rename to boards/z16/z16f2800100zcog/src/Makefile diff --git a/boards/z16f2800100zcog/src/z16f_boot.c b/boards/z16/z16f2800100zcog/src/z16f_boot.c similarity index 98% rename from boards/z16f2800100zcog/src/z16f_boot.c rename to boards/z16/z16f2800100zcog/src/z16f_boot.c index fd79404f52..641dae3132 100644 --- a/boards/z16f2800100zcog/src/z16f_boot.c +++ b/boards/z16/z16f2800100zcog/src/z16f_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z16f2800100zcog/src/z16f_boot.c + * boards/z16/z16f2800100zcog/src/z16f_boot.c * * Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z16f2800100zcog/src/z16f_leds.c b/boards/z16/z16f2800100zcog/src/z16f_leds.c similarity index 98% rename from boards/z16f2800100zcog/src/z16f_leds.c rename to boards/z16/z16f2800100zcog/src/z16f_leds.c index ff802406fc..3a018958af 100644 --- a/boards/z16f2800100zcog/src/z16f_leds.c +++ b/boards/z16/z16f2800100zcog/src/z16f_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z16f2800100zcog/z16f_leds.c + * boards/z16/z16f2800100zcog/z16f_leds.c * * Copyright (C) 2008, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z16f2800100zcog/tools/dopatch.sh b/boards/z16/z16f2800100zcog/tools/dopatch.sh similarity index 100% rename from boards/z16f2800100zcog/tools/dopatch.sh rename to boards/z16/z16f2800100zcog/tools/dopatch.sh diff --git a/boards/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/boards/z16/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch similarity index 100% rename from boards/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch rename to boards/z16/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch diff --git a/boards/xmc4500-relax/Kconfig b/boards/z80/ez80f910200kitg/Kconfig similarity index 100% rename from boards/xmc4500-relax/Kconfig rename to boards/z80/ez80f910200kitg/Kconfig diff --git a/boards/ez80f910200kitg/README.txt b/boards/z80/ez80f910200kitg/README.txt similarity index 100% rename from boards/ez80f910200kitg/README.txt rename to boards/z80/ez80f910200kitg/README.txt diff --git a/boards/ez80f910200kitg/configs/ostest/.gitignore b/boards/z80/ez80f910200kitg/configs/ostest/.gitignore similarity index 100% rename from boards/ez80f910200kitg/configs/ostest/.gitignore rename to boards/z80/ez80f910200kitg/configs/ostest/.gitignore diff --git a/boards/ez80f910200kitg/configs/ostest/README.txt b/boards/z80/ez80f910200kitg/configs/ostest/README.txt similarity index 100% rename from boards/ez80f910200kitg/configs/ostest/README.txt rename to boards/z80/ez80f910200kitg/configs/ostest/README.txt diff --git a/boards/ez80f910200kitg/configs/ostest/defconfig b/boards/z80/ez80f910200kitg/configs/ostest/defconfig similarity index 100% rename from boards/ez80f910200kitg/configs/ostest/defconfig rename to boards/z80/ez80f910200kitg/configs/ostest/defconfig diff --git a/boards/ez80f910200kitg/configs/ostest/ostest.zdsproj b/boards/z80/ez80f910200kitg/configs/ostest/ostest.zdsproj similarity index 100% rename from boards/ez80f910200kitg/configs/ostest/ostest.zdsproj rename to boards/z80/ez80f910200kitg/configs/ostest/ostest.zdsproj diff --git a/boards/ez80f910200kitg/include/board.h b/boards/z80/ez80f910200kitg/include/board.h similarity index 100% rename from boards/ez80f910200kitg/include/board.h rename to boards/z80/ez80f910200kitg/include/board.h diff --git a/boards/ez80f910200kitg/scripts/Make.defs b/boards/z80/ez80f910200kitg/scripts/Make.defs similarity index 100% rename from boards/ez80f910200kitg/scripts/Make.defs rename to boards/z80/ez80f910200kitg/scripts/Make.defs diff --git a/boards/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd b/boards/z80/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd similarity index 98% rename from boards/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd rename to boards/z80/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd index 7c4fb4ad01..bd7ad1896c 100644 --- a/boards/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd +++ b/boards/z80/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd @@ -1,5 +1,5 @@ /****************************************************************************/ -/* boards/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd */ +/* boards/z80/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd */ /* */ /* Copyright (C) 2008 Gregory Nutt. All rights reserved. */ /* Author: Gregory Nutt */ diff --git a/boards/ez80f910200zco/src/.gitignore b/boards/z80/ez80f910200kitg/src/.gitignore similarity index 100% rename from boards/ez80f910200zco/src/.gitignore rename to boards/z80/ez80f910200kitg/src/.gitignore diff --git a/boards/ez80f910200kitg/src/Makefile b/boards/z80/ez80f910200kitg/src/Makefile similarity index 100% rename from boards/ez80f910200kitg/src/Makefile rename to boards/z80/ez80f910200kitg/src/Makefile diff --git a/boards/ez80f910200kitg/src/ez80_boot.c b/boards/z80/ez80f910200kitg/src/ez80_boot.c similarity index 98% rename from boards/ez80f910200kitg/src/ez80_boot.c rename to boards/z80/ez80f910200kitg/src/ez80_boot.c index a509ba91a1..6b4c7c1879 100644 --- a/boards/ez80f910200kitg/src/ez80_boot.c +++ b/boards/z80/ez80f910200kitg/src/ez80_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/ez80f910200kitg/src/ez80_boot.c + * boards/z80/ez80f910200kitg/src/ez80_boot.c * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/ez80f910200kitg/src/ez80_leds.c b/boards/z80/ez80f910200kitg/src/ez80_leds.c similarity index 98% rename from boards/ez80f910200kitg/src/ez80_leds.c rename to boards/z80/ez80f910200kitg/src/ez80_leds.c index 094c3cd0e0..8ffd7e7f45 100644 --- a/boards/ez80f910200kitg/src/ez80_leds.c +++ b/boards/z80/ez80f910200kitg/src/ez80_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/ez80f910200kitg/src/ez80_leds.c + * boards/z80/ez80f910200kitg/src/ez80_leds.c * * Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z16f2800100zcog/Kconfig b/boards/z80/ez80f910200zco/Kconfig similarity index 100% rename from boards/z16f2800100zcog/Kconfig rename to boards/z80/ez80f910200zco/Kconfig diff --git a/boards/ez80f910200zco/README.txt b/boards/z80/ez80f910200zco/README.txt similarity index 100% rename from boards/ez80f910200zco/README.txt rename to boards/z80/ez80f910200zco/README.txt diff --git a/boards/ez80f910200zco/configs/dhcpd/.gitignore b/boards/z80/ez80f910200zco/configs/dhcpd/.gitignore similarity index 100% rename from boards/ez80f910200zco/configs/dhcpd/.gitignore rename to boards/z80/ez80f910200zco/configs/dhcpd/.gitignore diff --git a/boards/ez80f910200zco/configs/dhcpd/README.txt b/boards/z80/ez80f910200zco/configs/dhcpd/README.txt similarity index 100% rename from boards/ez80f910200zco/configs/dhcpd/README.txt rename to boards/z80/ez80f910200zco/configs/dhcpd/README.txt diff --git a/boards/ez80f910200zco/configs/dhcpd/defconfig b/boards/z80/ez80f910200zco/configs/dhcpd/defconfig similarity index 100% rename from boards/ez80f910200zco/configs/dhcpd/defconfig rename to boards/z80/ez80f910200zco/configs/dhcpd/defconfig diff --git a/boards/ez80f910200zco/configs/dhcpd/dhcpd.zdsproj b/boards/z80/ez80f910200zco/configs/dhcpd/dhcpd.zdsproj similarity index 100% rename from boards/ez80f910200zco/configs/dhcpd/dhcpd.zdsproj rename to boards/z80/ez80f910200zco/configs/dhcpd/dhcpd.zdsproj diff --git a/boards/ez80f910200zco/configs/httpd/.gitignore b/boards/z80/ez80f910200zco/configs/httpd/.gitignore similarity index 100% rename from boards/ez80f910200zco/configs/httpd/.gitignore rename to boards/z80/ez80f910200zco/configs/httpd/.gitignore diff --git a/boards/ez80f910200zco/configs/httpd/README.txt b/boards/z80/ez80f910200zco/configs/httpd/README.txt similarity index 100% rename from boards/ez80f910200zco/configs/httpd/README.txt rename to boards/z80/ez80f910200zco/configs/httpd/README.txt diff --git a/boards/ez80f910200zco/configs/httpd/defconfig b/boards/z80/ez80f910200zco/configs/httpd/defconfig similarity index 100% rename from boards/ez80f910200zco/configs/httpd/defconfig rename to boards/z80/ez80f910200zco/configs/httpd/defconfig diff --git a/boards/ez80f910200zco/configs/httpd/httpd.zdsproj b/boards/z80/ez80f910200zco/configs/httpd/httpd.zdsproj similarity index 100% rename from boards/ez80f910200zco/configs/httpd/httpd.zdsproj rename to boards/z80/ez80f910200zco/configs/httpd/httpd.zdsproj diff --git a/boards/ez80f910200zco/configs/nettest/.gitignore b/boards/z80/ez80f910200zco/configs/nettest/.gitignore similarity index 100% rename from boards/ez80f910200zco/configs/nettest/.gitignore rename to boards/z80/ez80f910200zco/configs/nettest/.gitignore diff --git a/boards/ez80f910200zco/configs/nettest/README.txt b/boards/z80/ez80f910200zco/configs/nettest/README.txt similarity index 100% rename from boards/ez80f910200zco/configs/nettest/README.txt rename to boards/z80/ez80f910200zco/configs/nettest/README.txt diff --git a/boards/ez80f910200zco/configs/nettest/defconfig b/boards/z80/ez80f910200zco/configs/nettest/defconfig similarity index 100% rename from boards/ez80f910200zco/configs/nettest/defconfig rename to boards/z80/ez80f910200zco/configs/nettest/defconfig diff --git a/boards/ez80f910200zco/configs/nettest/nettest.zdsproj b/boards/z80/ez80f910200zco/configs/nettest/nettest.zdsproj similarity index 100% rename from boards/ez80f910200zco/configs/nettest/nettest.zdsproj rename to boards/z80/ez80f910200zco/configs/nettest/nettest.zdsproj diff --git a/boards/ez80f910200zco/configs/nsh/.gitignore b/boards/z80/ez80f910200zco/configs/nsh/.gitignore similarity index 100% rename from boards/ez80f910200zco/configs/nsh/.gitignore rename to boards/z80/ez80f910200zco/configs/nsh/.gitignore diff --git a/boards/ez80f910200zco/configs/nsh/README.txt b/boards/z80/ez80f910200zco/configs/nsh/README.txt similarity index 100% rename from boards/ez80f910200zco/configs/nsh/README.txt rename to boards/z80/ez80f910200zco/configs/nsh/README.txt diff --git a/boards/ez80f910200zco/configs/nsh/defconfig b/boards/z80/ez80f910200zco/configs/nsh/defconfig similarity index 100% rename from boards/ez80f910200zco/configs/nsh/defconfig rename to boards/z80/ez80f910200zco/configs/nsh/defconfig diff --git a/boards/ez80f910200zco/configs/nsh/nsh.zdsproj b/boards/z80/ez80f910200zco/configs/nsh/nsh.zdsproj similarity index 100% rename from boards/ez80f910200zco/configs/nsh/nsh.zdsproj rename to boards/z80/ez80f910200zco/configs/nsh/nsh.zdsproj diff --git a/boards/ez80f910200zco/configs/poll/.gitignore b/boards/z80/ez80f910200zco/configs/poll/.gitignore similarity index 100% rename from boards/ez80f910200zco/configs/poll/.gitignore rename to boards/z80/ez80f910200zco/configs/poll/.gitignore diff --git a/boards/ez80f910200zco/configs/poll/README.txt b/boards/z80/ez80f910200zco/configs/poll/README.txt similarity index 100% rename from boards/ez80f910200zco/configs/poll/README.txt rename to boards/z80/ez80f910200zco/configs/poll/README.txt diff --git a/boards/ez80f910200zco/configs/poll/defconfig b/boards/z80/ez80f910200zco/configs/poll/defconfig similarity index 100% rename from boards/ez80f910200zco/configs/poll/defconfig rename to boards/z80/ez80f910200zco/configs/poll/defconfig diff --git a/boards/ez80f910200zco/configs/poll/poll.zdsproj b/boards/z80/ez80f910200zco/configs/poll/poll.zdsproj similarity index 100% rename from boards/ez80f910200zco/configs/poll/poll.zdsproj rename to boards/z80/ez80f910200zco/configs/poll/poll.zdsproj diff --git a/boards/ez80f910200zco/include/board.h b/boards/z80/ez80f910200zco/include/board.h similarity index 100% rename from boards/ez80f910200zco/include/board.h rename to boards/z80/ez80f910200zco/include/board.h diff --git a/boards/ez80f910200zco/scripts/Make.defs b/boards/z80/ez80f910200zco/scripts/Make.defs similarity index 100% rename from boards/ez80f910200zco/scripts/Make.defs rename to boards/z80/ez80f910200zco/scripts/Make.defs diff --git a/boards/ez80f910200zco/scripts/ez80f910200zco.linkcmd b/boards/z80/ez80f910200zco/scripts/ez80f910200zco.linkcmd similarity index 98% rename from boards/ez80f910200zco/scripts/ez80f910200zco.linkcmd rename to boards/z80/ez80f910200zco/scripts/ez80f910200zco.linkcmd index 3ca7d83692..bcf65a5f1e 100644 --- a/boards/ez80f910200zco/scripts/ez80f910200zco.linkcmd +++ b/boards/z80/ez80f910200zco/scripts/ez80f910200zco.linkcmd @@ -1,5 +1,5 @@ /****************************************************************************/ -/* boards/ez80f910200zco/scripts/ez80f910200zco.linkcmd */ +/* boards/z80/ez80f910200zco/scripts/ez80f910200zco.linkcmd */ /* */ /* Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved. */ /* Author: Gregory Nutt */ diff --git a/boards/z16f2800100zcog/src/.gitignore b/boards/z80/ez80f910200zco/src/.gitignore similarity index 100% rename from boards/z16f2800100zcog/src/.gitignore rename to boards/z80/ez80f910200zco/src/.gitignore diff --git a/boards/ez80f910200zco/src/Makefile b/boards/z80/ez80f910200zco/src/Makefile similarity index 100% rename from boards/ez80f910200zco/src/Makefile rename to boards/z80/ez80f910200zco/src/Makefile diff --git a/boards/ez80f910200zco/src/ez80_boot.c b/boards/z80/ez80f910200zco/src/ez80_boot.c similarity index 98% rename from boards/ez80f910200zco/src/ez80_boot.c rename to boards/z80/ez80f910200zco/src/ez80_boot.c index dc901d3915..77f63eac4a 100644 --- a/boards/ez80f910200zco/src/ez80_boot.c +++ b/boards/z80/ez80f910200zco/src/ez80_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/ez80f910200zco/src/ez80_boot.c + * boards/z80/ez80f910200zco/src/ez80_boot.c * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/ez80f910200zco/src/ez80_buttons.c b/boards/z80/ez80f910200zco/src/ez80_buttons.c similarity index 99% rename from boards/ez80f910200zco/src/ez80_buttons.c rename to boards/z80/ez80f910200zco/src/ez80_buttons.c index 6db533c5fb..c5c4395854 100644 --- a/boards/ez80f910200zco/src/ez80_buttons.c +++ b/boards/z80/ez80f910200zco/src/ez80_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/ez80f910200zco/src/ez80_leds.c + * boards/z80/ez80f910200zco/src/ez80_leds.c * * Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/ez80f910200zco/src/ez80_leds.c b/boards/z80/ez80f910200zco/src/ez80_leds.c similarity index 99% rename from boards/ez80f910200zco/src/ez80_leds.c rename to boards/z80/ez80f910200zco/src/ez80_leds.c index 0241774578..537ce90046 100644 --- a/boards/ez80f910200zco/src/ez80_leds.c +++ b/boards/z80/ez80f910200zco/src/ez80_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/ez80f910200zco/src/ez80_leds.c + * boards/z80/ez80f910200zco/src/ez80_leds.c * * Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/ez80f910200zco/src/ez80f910200zco.h b/boards/z80/ez80f910200zco/src/ez80f910200zco.h similarity index 100% rename from boards/ez80f910200zco/src/ez80f910200zco.h rename to boards/z80/ez80f910200zco/src/ez80f910200zco.h diff --git a/boards/makerlisp/Kconfig b/boards/z80/makerlisp/Kconfig similarity index 100% rename from boards/makerlisp/Kconfig rename to boards/z80/makerlisp/Kconfig diff --git a/boards/makerlisp/README.txt b/boards/z80/makerlisp/README.txt similarity index 100% rename from boards/makerlisp/README.txt rename to boards/z80/makerlisp/README.txt diff --git a/boards/makerlisp/configs/nsh_flash/.gitignore b/boards/z80/makerlisp/configs/nsh_flash/.gitignore similarity index 100% rename from boards/makerlisp/configs/nsh_flash/.gitignore rename to boards/z80/makerlisp/configs/nsh_flash/.gitignore diff --git a/boards/makerlisp/configs/nsh_flash/README.txt b/boards/z80/makerlisp/configs/nsh_flash/README.txt similarity index 100% rename from boards/makerlisp/configs/nsh_flash/README.txt rename to boards/z80/makerlisp/configs/nsh_flash/README.txt diff --git a/boards/makerlisp/configs/nsh_flash/defconfig b/boards/z80/makerlisp/configs/nsh_flash/defconfig similarity index 100% rename from boards/makerlisp/configs/nsh_flash/defconfig rename to boards/z80/makerlisp/configs/nsh_flash/defconfig diff --git a/boards/makerlisp/configs/nsh_flash/nsh.zdsproj b/boards/z80/makerlisp/configs/nsh_flash/nsh.zdsproj similarity index 100% rename from boards/makerlisp/configs/nsh_flash/nsh.zdsproj rename to boards/z80/makerlisp/configs/nsh_flash/nsh.zdsproj diff --git a/boards/makerlisp/configs/nsh_flash/nsh.zfpproj b/boards/z80/makerlisp/configs/nsh_flash/nsh.zfpproj similarity index 100% rename from boards/makerlisp/configs/nsh_flash/nsh.zfpproj rename to boards/z80/makerlisp/configs/nsh_flash/nsh.zfpproj diff --git a/boards/makerlisp/configs/nsh_flash/nsh_flash.ztgt b/boards/z80/makerlisp/configs/nsh_flash/nsh_flash.ztgt similarity index 100% rename from boards/makerlisp/configs/nsh_flash/nsh_flash.ztgt rename to boards/z80/makerlisp/configs/nsh_flash/nsh_flash.ztgt diff --git a/boards/makerlisp/configs/nsh_flash/nsh_ram.ztgt b/boards/z80/makerlisp/configs/nsh_flash/nsh_ram.ztgt similarity index 100% rename from boards/makerlisp/configs/nsh_flash/nsh_ram.ztgt rename to boards/z80/makerlisp/configs/nsh_flash/nsh_ram.ztgt diff --git a/boards/makerlisp/configs/nsh_ram/.gitignore b/boards/z80/makerlisp/configs/nsh_ram/.gitignore similarity index 100% rename from boards/makerlisp/configs/nsh_ram/.gitignore rename to boards/z80/makerlisp/configs/nsh_ram/.gitignore diff --git a/boards/makerlisp/configs/nsh_ram/README.txt b/boards/z80/makerlisp/configs/nsh_ram/README.txt similarity index 100% rename from boards/makerlisp/configs/nsh_ram/README.txt rename to boards/z80/makerlisp/configs/nsh_ram/README.txt diff --git a/boards/makerlisp/configs/nsh_ram/defconfig b/boards/z80/makerlisp/configs/nsh_ram/defconfig similarity index 100% rename from boards/makerlisp/configs/nsh_ram/defconfig rename to boards/z80/makerlisp/configs/nsh_ram/defconfig diff --git a/boards/makerlisp/configs/nsh_ram/nsh.zdsproj b/boards/z80/makerlisp/configs/nsh_ram/nsh.zdsproj similarity index 100% rename from boards/makerlisp/configs/nsh_ram/nsh.zdsproj rename to boards/z80/makerlisp/configs/nsh_ram/nsh.zdsproj diff --git a/boards/makerlisp/configs/nsh_ram/nsh.zfpproj b/boards/z80/makerlisp/configs/nsh_ram/nsh.zfpproj similarity index 100% rename from boards/makerlisp/configs/nsh_ram/nsh.zfpproj rename to boards/z80/makerlisp/configs/nsh_ram/nsh.zfpproj diff --git a/boards/makerlisp/configs/nsh_ram/nsh_flash.ztgt b/boards/z80/makerlisp/configs/nsh_ram/nsh_flash.ztgt similarity index 100% rename from boards/makerlisp/configs/nsh_ram/nsh_flash.ztgt rename to boards/z80/makerlisp/configs/nsh_ram/nsh_flash.ztgt diff --git a/boards/makerlisp/configs/nsh_ram/nsh_ram.ztgt b/boards/z80/makerlisp/configs/nsh_ram/nsh_ram.ztgt similarity index 100% rename from boards/makerlisp/configs/nsh_ram/nsh_ram.ztgt rename to boards/z80/makerlisp/configs/nsh_ram/nsh_ram.ztgt diff --git a/boards/makerlisp/configs/sdboot/.gitignore b/boards/z80/makerlisp/configs/sdboot/.gitignore similarity index 100% rename from boards/makerlisp/configs/sdboot/.gitignore rename to boards/z80/makerlisp/configs/sdboot/.gitignore diff --git a/boards/makerlisp/configs/sdboot/README.txt b/boards/z80/makerlisp/configs/sdboot/README.txt similarity index 100% rename from boards/makerlisp/configs/sdboot/README.txt rename to boards/z80/makerlisp/configs/sdboot/README.txt diff --git a/boards/makerlisp/configs/sdboot/defconfig b/boards/z80/makerlisp/configs/sdboot/defconfig similarity index 100% rename from boards/makerlisp/configs/sdboot/defconfig rename to boards/z80/makerlisp/configs/sdboot/defconfig diff --git a/boards/makerlisp/configs/sdboot/sdboot.zdsproj b/boards/z80/makerlisp/configs/sdboot/sdboot.zdsproj similarity index 100% rename from boards/makerlisp/configs/sdboot/sdboot.zdsproj rename to boards/z80/makerlisp/configs/sdboot/sdboot.zdsproj diff --git a/boards/makerlisp/configs/sdboot/sdboot.zfpproj b/boards/z80/makerlisp/configs/sdboot/sdboot.zfpproj similarity index 100% rename from boards/makerlisp/configs/sdboot/sdboot.zfpproj rename to boards/z80/makerlisp/configs/sdboot/sdboot.zfpproj diff --git a/boards/makerlisp/configs/sdboot/sdboot_flash.ztgt b/boards/z80/makerlisp/configs/sdboot/sdboot_flash.ztgt similarity index 100% rename from boards/makerlisp/configs/sdboot/sdboot_flash.ztgt rename to boards/z80/makerlisp/configs/sdboot/sdboot_flash.ztgt diff --git a/boards/makerlisp/configs/sdboot/sdboot_ram.ztgt b/boards/z80/makerlisp/configs/sdboot/sdboot_ram.ztgt similarity index 100% rename from boards/makerlisp/configs/sdboot/sdboot_ram.ztgt rename to boards/z80/makerlisp/configs/sdboot/sdboot_ram.ztgt diff --git a/boards/makerlisp/include/board.h b/boards/z80/makerlisp/include/board.h similarity index 96% rename from boards/makerlisp/include/board.h rename to boards/z80/makerlisp/include/board.h index ec3e3badee..018812f442 100644 --- a/boards/makerlisp/include/board.h +++ b/boards/z80/makerlisp/include/board.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_MAKERLISP_INCLUDE_BOARD_H -#define __BOARDS_MAKERLISP_INCLUDE_BOARD_H +#ifndef __BOARDS_Z80_MAKERLISP_INCLUDE_BOARD_H +#define __BOARDS_Z80_MAKERLISP_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -103,4 +103,4 @@ extern "C" } #endif -#endif /* __BOARDS_MAKERLISP_INCLUDE_BOARD_H */ +#endif /* __BOARDS_Z80_MAKERLISP_INCLUDE_BOARD_H */ diff --git a/boards/makerlisp/scripts/Make.defs b/boards/z80/makerlisp/scripts/Make.defs similarity index 100% rename from boards/makerlisp/scripts/Make.defs rename to boards/z80/makerlisp/scripts/Make.defs diff --git a/boards/makerlisp/scripts/makerlisp_copytoram.linkcmd b/boards/z80/makerlisp/scripts/makerlisp_copytoram.linkcmd similarity index 98% rename from boards/makerlisp/scripts/makerlisp_copytoram.linkcmd rename to boards/z80/makerlisp/scripts/makerlisp_copytoram.linkcmd index f15b30b9df..8c12df0afc 100644 --- a/boards/makerlisp/scripts/makerlisp_copytoram.linkcmd +++ b/boards/z80/makerlisp/scripts/makerlisp_copytoram.linkcmd @@ -1,5 +1,5 @@ /****************************************************************************/ -/* boards/makerlisp/scripts/makerlisp_copytoram.linkcmd */ +/* boards/z80/makerlisp/scripts/makerlisp_copytoram.linkcmd */ /* For configurations booting from flash but otherwise running out of RAM */ /* */ /* Copyright (C) 2019 Gregory Nutt. All rights reserved. */ diff --git a/boards/makerlisp/scripts/makerlisp_flash.linkcmd b/boards/z80/makerlisp/scripts/makerlisp_flash.linkcmd similarity index 98% rename from boards/makerlisp/scripts/makerlisp_flash.linkcmd rename to boards/z80/makerlisp/scripts/makerlisp_flash.linkcmd index 4746235487..a7897cdc71 100644 --- a/boards/makerlisp/scripts/makerlisp_flash.linkcmd +++ b/boards/z80/makerlisp/scripts/makerlisp_flash.linkcmd @@ -1,5 +1,5 @@ /****************************************************************************/ -/* boards/makerlisp/scripts/makerlisp_flash.linkcmd */ +/* boards/z80/makerlisp/scripts/makerlisp_flash.linkcmd */ /* For configurations running entirely out of FLASH */ /* */ /* Copyright (C) 2019 Gregory Nutt. All rights reserved. */ diff --git a/boards/makerlisp/scripts/makerlisp_flash.ztgt b/boards/z80/makerlisp/scripts/makerlisp_flash.ztgt similarity index 100% rename from boards/makerlisp/scripts/makerlisp_flash.ztgt rename to boards/z80/makerlisp/scripts/makerlisp_flash.ztgt diff --git a/boards/makerlisp/scripts/makerlisp_ram.linkcmd b/boards/z80/makerlisp/scripts/makerlisp_ram.linkcmd similarity index 98% rename from boards/makerlisp/scripts/makerlisp_ram.linkcmd rename to boards/z80/makerlisp/scripts/makerlisp_ram.linkcmd index cb80083cfc..330600668d 100644 --- a/boards/makerlisp/scripts/makerlisp_ram.linkcmd +++ b/boards/z80/makerlisp/scripts/makerlisp_ram.linkcmd @@ -1,5 +1,5 @@ /****************************************************************************/ -/* boards/makerlisp/scripts/makerlisp_ram.linkcmd */ +/* boards/z80/makerlisp/scripts/makerlisp_ram.linkcmd */ /* For configurations running entirely out of RAM with nothing in FLASH */ /* */ /* Copyright (C) 2019 Gregory Nutt. All rights reserved. */ diff --git a/boards/makerlisp/scripts/makerlisp_ram.ztgt b/boards/z80/makerlisp/scripts/makerlisp_ram.ztgt similarity index 100% rename from boards/makerlisp/scripts/makerlisp_ram.ztgt rename to boards/z80/makerlisp/scripts/makerlisp_ram.ztgt diff --git a/boards/makerlisp/src/.gitignore b/boards/z80/makerlisp/src/.gitignore similarity index 100% rename from boards/makerlisp/src/.gitignore rename to boards/z80/makerlisp/src/.gitignore diff --git a/boards/makerlisp/src/Makefile b/boards/z80/makerlisp/src/Makefile similarity index 100% rename from boards/makerlisp/src/Makefile rename to boards/z80/makerlisp/src/Makefile diff --git a/boards/makerlisp/src/ez80_appinit.c b/boards/z80/makerlisp/src/ez80_appinit.c similarity index 100% rename from boards/makerlisp/src/ez80_appinit.c rename to boards/z80/makerlisp/src/ez80_appinit.c diff --git a/boards/makerlisp/src/ez80_boot.c b/boards/z80/makerlisp/src/ez80_boot.c similarity index 99% rename from boards/makerlisp/src/ez80_boot.c rename to boards/z80/makerlisp/src/ez80_boot.c index 8933f2d8a3..56c149f8c4 100644 --- a/boards/makerlisp/src/ez80_boot.c +++ b/boards/z80/makerlisp/src/ez80_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/makerlisp/src/ez80_boot.c + * boards/z80/makerlisp/src/ez80_boot.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/makerlisp/src/ez80_bringup.c b/boards/z80/makerlisp/src/ez80_bringup.c similarity index 100% rename from boards/makerlisp/src/ez80_bringup.c rename to boards/z80/makerlisp/src/ez80_bringup.c diff --git a/boards/makerlisp/src/ez80_leds.c b/boards/z80/makerlisp/src/ez80_leds.c similarity index 98% rename from boards/makerlisp/src/ez80_leds.c rename to boards/z80/makerlisp/src/ez80_leds.c index da403268be..0cc67d82f9 100644 --- a/boards/makerlisp/src/ez80_leds.c +++ b/boards/z80/makerlisp/src/ez80_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/makerlisp/src/ez80_leds.c + * boards/z80/makerlisp/src/ez80_leds.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/makerlisp/src/ez80_spi.c b/boards/z80/makerlisp/src/ez80_spi.c similarity index 99% rename from boards/makerlisp/src/ez80_spi.c rename to boards/z80/makerlisp/src/ez80_spi.c index cf5d30a4d8..4ed0a8c38b 100644 --- a/boards/makerlisp/src/ez80_spi.c +++ b/boards/z80/makerlisp/src/ez80_spi.c @@ -1,5 +1,5 @@ /***************************************************************************** - * boards/makerlisp/src/ez80_spi.c + * boards/z80/makerlisp/src/ez80_spi.c * * Copyright (C) 2019 Greg Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/makerlisp/src/ez80_spimmcsd.c b/boards/z80/makerlisp/src/ez80_spimmcsd.c similarity index 98% rename from boards/makerlisp/src/ez80_spimmcsd.c rename to boards/z80/makerlisp/src/ez80_spimmcsd.c index 2dd196e9a4..a9ee50c861 100644 --- a/boards/makerlisp/src/ez80_spimmcsd.c +++ b/boards/z80/makerlisp/src/ez80_spimmcsd.c @@ -1,5 +1,5 @@ /***************************************************************************** - * boards/makerlisp/src/ez80_spimmcsd.c + * boards/z80/makerlisp/src/ez80_spimmcsd.c * * Copyright (C) 2019 Greg Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/makerlisp/src/makerlisp.h b/boards/z80/makerlisp/src/makerlisp.h similarity index 100% rename from boards/makerlisp/src/makerlisp.h rename to boards/z80/makerlisp/src/makerlisp.h diff --git a/boards/makerlisp/src/sd_main.c b/boards/z80/makerlisp/src/sd_main.c similarity index 99% rename from boards/makerlisp/src/sd_main.c rename to boards/z80/makerlisp/src/sd_main.c index 3bac2fa265..0618330b55 100644 --- a/boards/makerlisp/src/sd_main.c +++ b/boards/z80/makerlisp/src/sd_main.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/makerlisp/src/sd_main.c + * boards/z80/makerlisp/src/sd_main.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z80sim/Kconfig b/boards/z80/z80sim/Kconfig similarity index 100% rename from boards/z80sim/Kconfig rename to boards/z80/z80sim/Kconfig diff --git a/boards/z80sim/README.txt b/boards/z80/z80sim/README.txt similarity index 100% rename from boards/z80sim/README.txt rename to boards/z80/z80sim/README.txt diff --git a/boards/z80sim/configs/nsh/defconfig b/boards/z80/z80sim/configs/nsh/defconfig similarity index 100% rename from boards/z80sim/configs/nsh/defconfig rename to boards/z80/z80sim/configs/nsh/defconfig diff --git a/boards/z80sim/configs/ostest/defconfig b/boards/z80/z80sim/configs/ostest/defconfig similarity index 100% rename from boards/z80sim/configs/ostest/defconfig rename to boards/z80/z80sim/configs/ostest/defconfig diff --git a/boards/z80sim/configs/pashello/defconfig b/boards/z80/z80sim/configs/pashello/defconfig similarity index 100% rename from boards/z80sim/configs/pashello/defconfig rename to boards/z80/z80sim/configs/pashello/defconfig diff --git a/boards/z80sim/include/board.h b/boards/z80/z80sim/include/board.h similarity index 98% rename from boards/z80sim/include/board.h rename to boards/z80/z80sim/include/board.h index 1d13629845..62132acc6e 100644 --- a/boards/z80sim/include/board.h +++ b/boards/z80/z80sim/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z80sim/include/board.h + * boards/z80/z80sim/include/board.h * * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z80sim/scripts/Make.defs b/boards/z80/z80sim/scripts/Make.defs similarity index 99% rename from boards/z80sim/scripts/Make.defs rename to boards/z80/z80sim/scripts/Make.defs index 5bee6ea217..3a1939ca0c 100644 --- a/boards/z80sim/scripts/Make.defs +++ b/boards/z80/z80sim/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/z80sim/scripts/Make.defs +# boards/z80/z80sim/scripts/Make.defs # # Copyright (C) 2007, 2008, 2012, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z80sim/src/.gitignore b/boards/z80/z80sim/src/.gitignore similarity index 100% rename from boards/z80sim/src/.gitignore rename to boards/z80/z80sim/src/.gitignore diff --git a/boards/z80sim/src/Makefile b/boards/z80/z80sim/src/Makefile similarity index 98% rename from boards/z80sim/src/Makefile rename to boards/z80/z80sim/src/Makefile index 9f0f2eba70..314d065c9c 100644 --- a/boards/z80sim/src/Makefile +++ b/boards/z80/z80sim/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/z80sim/src/Makefile +# boards/z80/z80sim/src/Makefile # # Copyright (C) 2007, 2008, 2012, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z80sim/src/z80_irq.c b/boards/z80/z80sim/src/z80_irq.c similarity index 98% rename from boards/z80sim/src/z80_irq.c rename to boards/z80/z80sim/src/z80_irq.c index 3297d78073..0c8b12feae 100644 --- a/boards/z80sim/src/z80_irq.c +++ b/boards/z80/z80sim/src/z80_irq.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z80sim/src/z80_irq.c + * boards/z80/z80sim/src/z80_irq.c * * Copyright (C) 2007-2009, 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z80sim/src/z80_lowputc.c b/boards/z80/z80sim/src/z80_lowputc.c similarity index 98% rename from boards/z80sim/src/z80_lowputc.c rename to boards/z80/z80sim/src/z80_lowputc.c index 1d612704e1..50ca0e39c8 100644 --- a/boards/z80sim/src/z80_lowputc.c +++ b/boards/z80/z80sim/src/z80_lowputc.c @@ -1,5 +1,5 @@ /******************************************************************************** - * boards/z80sim/src//z80_lowputc.c + * boards/z80/z80sim/src//z80_lowputc.c * * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z80sim/src/z80_serial.c b/boards/z80/z80sim/src/z80_serial.c similarity index 99% rename from boards/z80sim/src/z80_serial.c rename to boards/z80/z80sim/src/z80_serial.c index 13d2fca5f0..3ce9d556f5 100644 --- a/boards/z80sim/src/z80_serial.c +++ b/boards/z80/z80sim/src/z80_serial.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z80sim/src/z80_serial.c + * boards/z80/z80sim/src/z80_serial.c * * Copyright (C) 2007-2009, 2012, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z80sim/src/z80_timerisr.c b/boards/z80/z80sim/src/z80_timerisr.c similarity index 98% rename from boards/z80sim/src/z80_timerisr.c rename to boards/z80/z80sim/src/z80_timerisr.c index a857de3f9f..b6c1da4762 100644 --- a/boards/z80sim/src/z80_timerisr.c +++ b/boards/z80/z80sim/src/z80_timerisr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z80sim/src/z80_timerisr.c + * boards/z80/z80sim/src/z80_timerisr.c * * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z8encore000zco/Kconfig b/boards/z80/z8encore000zco/Kconfig similarity index 100% rename from boards/z8encore000zco/Kconfig rename to boards/z80/z8encore000zco/Kconfig diff --git a/boards/z8encore000zco/README.txt b/boards/z80/z8encore000zco/README.txt similarity index 100% rename from boards/z8encore000zco/README.txt rename to boards/z80/z8encore000zco/README.txt diff --git a/boards/z8encore000zco/configs/ostest/.gitignore b/boards/z80/z8encore000zco/configs/ostest/.gitignore similarity index 100% rename from boards/z8encore000zco/configs/ostest/.gitignore rename to boards/z80/z8encore000zco/configs/ostest/.gitignore diff --git a/boards/z8encore000zco/configs/ostest/Make.defs b/boards/z80/z8encore000zco/configs/ostest/Make.defs similarity index 100% rename from boards/z8encore000zco/configs/ostest/Make.defs rename to boards/z80/z8encore000zco/configs/ostest/Make.defs diff --git a/boards/z8encore000zco/configs/ostest/README.txt b/boards/z80/z8encore000zco/configs/ostest/README.txt similarity index 100% rename from boards/z8encore000zco/configs/ostest/README.txt rename to boards/z80/z8encore000zco/configs/ostest/README.txt diff --git a/boards/z8encore000zco/configs/ostest/defconfig b/boards/z80/z8encore000zco/configs/ostest/defconfig similarity index 100% rename from boards/z8encore000zco/configs/ostest/defconfig rename to boards/z80/z8encore000zco/configs/ostest/defconfig diff --git a/boards/z8encore000zco/configs/ostest/ostest.linkcmd b/boards/z80/z8encore000zco/configs/ostest/ostest.linkcmd similarity index 97% rename from boards/z8encore000zco/configs/ostest/ostest.linkcmd rename to boards/z80/z8encore000zco/configs/ostest/ostest.linkcmd index 30c6d75386..5bc72d8b65 100644 --- a/boards/z8encore000zco/configs/ostest/ostest.linkcmd +++ b/boards/z80/z8encore000zco/configs/ostest/ostest.linkcmd @@ -1,8 +1,8 @@ /****************************************************************************/ -/* boards/z8encore000zco/ostest/ostest.linkcmd */ +/* boards/z80/z8encore000zco/ostest/ostest.linkcmd */ /* */ /* Copyright (C) 2008 Gregory Nutt. All rights reserved. */ -/* Author: Gregory Nutt */ +/* Author: Gregory Nutt */ /* */ /* Redistribution and use in source and binary forms, with or without */ /* modification, are permitted provided that the following conditions */ diff --git a/boards/z8encore000zco/configs/ostest/ostest.zdsproj b/boards/z80/z8encore000zco/configs/ostest/ostest.zdsproj similarity index 100% rename from boards/z8encore000zco/configs/ostest/ostest.zdsproj rename to boards/z80/z8encore000zco/configs/ostest/ostest.zdsproj diff --git a/boards/z8encore000zco/include/board.h b/boards/z80/z8encore000zco/include/board.h similarity index 100% rename from boards/z8encore000zco/include/board.h rename to boards/z80/z8encore000zco/include/board.h diff --git a/boards/z8encore000zco/src/.gitignore b/boards/z80/z8encore000zco/src/.gitignore similarity index 100% rename from boards/z8encore000zco/src/.gitignore rename to boards/z80/z8encore000zco/src/.gitignore diff --git a/boards/z8encore000zco/src/Makefile b/boards/z80/z8encore000zco/src/Makefile similarity index 100% rename from boards/z8encore000zco/src/Makefile rename to boards/z80/z8encore000zco/src/Makefile diff --git a/boards/z8encore000zco/src/z8_boot.c b/boards/z80/z8encore000zco/src/z8_boot.c similarity index 98% rename from boards/z8encore000zco/src/z8_boot.c rename to boards/z80/z8encore000zco/src/z8_boot.c index 29e9b58455..6367090d92 100644 --- a/boards/z8encore000zco/src/z8_boot.c +++ b/boards/z80/z8encore000zco/src/z8_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z8encore000zco/src/z8_boot.c + * boards/z80/z8encore000zco/src/z8_boot.c * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z8encore000zco/src/z8_leds.c b/boards/z80/z8encore000zco/src/z8_leds.c similarity index 99% rename from boards/z8encore000zco/src/z8_leds.c rename to boards/z80/z8encore000zco/src/z8_leds.c index 200089735d..88496e8c9f 100644 --- a/boards/z8encore000zco/src/z8_leds.c +++ b/boards/z80/z8encore000zco/src/z8_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z8encore000zco/src/z8_leds.c + * boards/z80/z8encore000zco/src/z8_leds.c * * Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z8f64200100kit/Kconfig b/boards/z80/z8f64200100kit/Kconfig similarity index 100% rename from boards/z8f64200100kit/Kconfig rename to boards/z80/z8f64200100kit/Kconfig diff --git a/boards/z8f64200100kit/README.txt b/boards/z80/z8f64200100kit/README.txt similarity index 100% rename from boards/z8f64200100kit/README.txt rename to boards/z80/z8f64200100kit/README.txt diff --git a/boards/z8f64200100kit/configs/ostest/.gitignore b/boards/z80/z8f64200100kit/configs/ostest/.gitignore similarity index 100% rename from boards/z8f64200100kit/configs/ostest/.gitignore rename to boards/z80/z8f64200100kit/configs/ostest/.gitignore diff --git a/boards/z8f64200100kit/configs/ostest/Make.defs b/boards/z80/z8f64200100kit/configs/ostest/Make.defs similarity index 100% rename from boards/z8f64200100kit/configs/ostest/Make.defs rename to boards/z80/z8f64200100kit/configs/ostest/Make.defs diff --git a/boards/z8f64200100kit/configs/ostest/README.txt b/boards/z80/z8f64200100kit/configs/ostest/README.txt similarity index 100% rename from boards/z8f64200100kit/configs/ostest/README.txt rename to boards/z80/z8f64200100kit/configs/ostest/README.txt diff --git a/boards/z8f64200100kit/configs/ostest/defconfig b/boards/z80/z8f64200100kit/configs/ostest/defconfig similarity index 100% rename from boards/z8f64200100kit/configs/ostest/defconfig rename to boards/z80/z8f64200100kit/configs/ostest/defconfig diff --git a/boards/z8f64200100kit/configs/ostest/ostest.linkcmd b/boards/z80/z8f64200100kit/configs/ostest/ostest.linkcmd similarity index 97% rename from boards/z8f64200100kit/configs/ostest/ostest.linkcmd rename to boards/z80/z8f64200100kit/configs/ostest/ostest.linkcmd index f481d5b915..df448c80c3 100644 --- a/boards/z8f64200100kit/configs/ostest/ostest.linkcmd +++ b/boards/z80/z8f64200100kit/configs/ostest/ostest.linkcmd @@ -1,8 +1,8 @@ /****************************************************************************/ -/* boards/z8f64200100kit/ostest/ostest.linkcmd */ +/* boards/z80/z8f64200100kit/ostest/ostest.linkcmd */ /* */ /* Copyright (C) 2008 Gregory Nutt. All rights reserved. */ -/* Author: Gregory Nutt */ +/* Author: Gregory Nutt */ /* */ /* Redistribution and use in source and binary forms, with or without */ /* modification, are permitted provided that the following conditions */ diff --git a/boards/z8f64200100kit/configs/ostest/ostest.zdsproj b/boards/z80/z8f64200100kit/configs/ostest/ostest.zdsproj similarity index 100% rename from boards/z8f64200100kit/configs/ostest/ostest.zdsproj rename to boards/z80/z8f64200100kit/configs/ostest/ostest.zdsproj diff --git a/boards/z8f64200100kit/include/board.h b/boards/z80/z8f64200100kit/include/board.h similarity index 100% rename from boards/z8f64200100kit/include/board.h rename to boards/z80/z8f64200100kit/include/board.h diff --git a/boards/z8f64200100kit/src/.gitignore b/boards/z80/z8f64200100kit/src/.gitignore similarity index 100% rename from boards/z8f64200100kit/src/.gitignore rename to boards/z80/z8f64200100kit/src/.gitignore diff --git a/boards/z8f64200100kit/src/Makefile b/boards/z80/z8f64200100kit/src/Makefile similarity index 100% rename from boards/z8f64200100kit/src/Makefile rename to boards/z80/z8f64200100kit/src/Makefile diff --git a/boards/z8f64200100kit/src/z8_boot.c b/boards/z80/z8f64200100kit/src/z8_boot.c similarity index 98% rename from boards/z8f64200100kit/src/z8_boot.c rename to boards/z80/z8f64200100kit/src/z8_boot.c index 0e078c71c9..ab8b07ba95 100644 --- a/boards/z8f64200100kit/src/z8_boot.c +++ b/boards/z80/z8f64200100kit/src/z8_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z8f64200100kit/src/z8_boot.c + * boards/z80/z8f64200100kit/src/z8_boot.c * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/z8f64200100kit/src/z8_leds.c b/boards/z80/z8f64200100kit/src/z8_leds.c similarity index 98% rename from boards/z8f64200100kit/src/z8_leds.c rename to boards/z80/z8f64200100kit/src/z8_leds.c index 3984faee9c..87181cee6c 100644 --- a/boards/z8f64200100kit/src/z8_leds.c +++ b/boards/z80/z8f64200100kit/src/z8_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/z8f64200100kit/src/z8_leds.c + * boards/z80/z8f64200100kit/src/z8_leds.c * * Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/tools/Makefile.unix b/tools/Makefile.unix index 6d02566f9f..552d137f29 100644 --- a/tools/Makefile.unix +++ b/tools/Makefile.unix @@ -78,7 +78,7 @@ else BOARD_DIR = $(CONFIG_ARCH_BOARD_CUSTOM_DIR) endif else -BOARD_DIR = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD) +BOARD_DIR = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD) endif # CONFIG_APPS_DIR can be over-ridden from the command line or in the .config file. diff --git a/tools/Makefile.win b/tools/Makefile.win index 0f445a9152..48376534b9 100644 --- a/tools/Makefile.win +++ b/tools/Makefile.win @@ -73,7 +73,7 @@ else BOARD_DIR = $(CONFIG_ARCH_BOARD_CUSTOM_DIR) endif else -BOARD_DIR = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_BOARD) +BOARD_DIR = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD) endif # CONFIG_APPS_DIR can be over-ridden from the command line or in the .config file. diff --git a/tools/configure.sh b/tools/configure.sh index 49e8567fd2..06cc21d2aa 100755 --- a/tools/configure.sh +++ b/tools/configure.sh @@ -135,7 +135,17 @@ else boarddir=`echo ${boardconfig} | cut -d':' -f1` fi -configpath=${TOPDIR}/boards/${boarddir}/configs/${configdir} +# Try to detect architecure for convenience. +archs="arm avr hc mips misoc or1k renesas risc-v sim x86 xtensa z16 z80" + +for arc in ${archs}; do + if [ -f boards/${arc}/${boarddir}/Kconfig ]; then + archdir=${arc} + echo "Detected ${archdir} Architecture" + fi +done + +configpath=${TOPDIR}/boards/${archdir}/${boarddir}/configs/${configdir} if [ ! -d "${configpath}" ]; then # Try direct path for convenience. @@ -155,11 +165,11 @@ if [ ! -d "${configpath}" ]; then fi fi -src_makedefs="${TOPDIR}/boards/${boarddir}/configs/${configdir}/Make.defs" +src_makedefs="${TOPDIR}/boards/${archdir}/${boarddir}/configs/${configdir}/Make.defs" dest_makedefs="${TOPDIR}/Make.defs" if [ ! -r "${src_makedefs}" ]; then - src_makedefs="${TOPDIR}/boards/${boarddir}/scripts/Make.defs" + src_makedefs="${TOPDIR}/boards/${archdir}/${boarddir}/scripts/Make.defs" if [ ! -r "${src_makedefs}" ]; then src_makedefs="${TOPDIR}/${boardconfig}/Make.defs"