diff --git a/boards/Kconfig b/boards/Kconfig index b9cb5a397bd..448164b9a97 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -2064,524 +2064,533 @@ config ARCH_IRQBUTTONS comment "Board-Specific Options" -if ARCH_BOARD_ARDUINO_DUE -source "boards/arm/arduino-due/Kconfig" -endif -if ARCH_BOARD_AXOLOTI -source "boards/arm/axoloti/Kconfig" -endif -if ARCH_BOARD_B_L072Z_LRWAN1 -source "boards/arm/b-l072z-lrwan1/Kconfig" -endif -if ARCH_BOARD_B_L475E_IOT01A -source "boards/arm/b-l475e-iot01a/Kconfig" -endif -if ARCH_BOARD_BAMBINO_200E -source "boards/arm/bambino-200e/Kconfig" +if ARCH_BOARD_PCDUINO_A10 +source "boards/arm/a1x/pcduino-a10/Kconfig" endif if ARCH_BOARD_BEAGLEBONE_BLACK -source "boards/arm/beaglebone-black/Kconfig" +source "boards/arm/am335x/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/arm/stm32f746-ws/Kconfig" -endif -if ARCH_BOARD_STM32L476VG_DISCO -source "boards/arm/stm32l476vg-disco/Kconfig" -endif -if ARCH_BOARD_STM32L476_MDK -source "boards/arm/stm32l476-mdk/Kconfig" -endif -if ARCH_BOARD_STM32L_DISCOVERY -source "boards/arm/stm32ldiscovery/Kconfig" -endif -if ARCH_BOARD_STM32VL_DISCOVERY -source "boards/arm/stm32vldiscovery/Kconfig" -endif -if ARCH_BOARD_TEENSY_3X -source "boards/arm/teensy-3.x/Kconfig" -endif -if ARCH_BOARD_TEENSY_LC -source "boards/arm/teensy-lc/Kconfig" -endif -if ARCH_BOARD_TM4C123G_LAUNCHPAD -source "boards/arm/tm4c123g-launchpad/Kconfig" -endif -if ARCH_BOARD_TM4C1294_LAUNCHPAD -source "boards/arm/tm4c1294-launchpad/Kconfig" -endif -if ARCH_BOARD_TMS570LS31X_USB_KIT -source "boards/arm/tms570ls31x-usb-kit/Kconfig" -endif -if ARCH_BOARD_TWR_K60N512 -source "boards/arm/twr-k60n512/Kconfig" -endif -if ARCH_BOARD_TWR_K64F120M -source "boards/arm/twr-k64f120m/Kconfig" -endif -if ARCH_BOARD_U_BLOX_C027 -source "boards/arm/u-blox-c027/Kconfig" -endif -if ARCH_BOARD_VIEWTOOL_STM32F107 -source "boards/arm/viewtool-stm32f107/Kconfig" -endif -if ARCH_BOARD_XMC4500RELAX -source "boards/arm/xmc4500-relax/Kconfig" -endif -if ARCH_BOARD_ZP214XPA -source "boards/arm/zp214xpa/Kconfig" -endif -if ARCH_BOARD_ZKITARM -source "boards/arm/zkit-arm-1769/Kconfig" +source "boards/arm/c5471/c5471evm/Kconfig" endif if ARCH_BOARD_SPRESENSE -source "boards/arm/spresense/Kconfig" +source "boards/arm/cxd56xx/spresense/Kconfig" endif -if ARCH_BOARD_AMBER -source "boards/avr/amber/Kconfig" +if ARCH_BOARD_NTOSD_DM320 +source "boards/arm/dm320/ntosd-dm320/Kconfig" endif -if ARCH_BOARD_ARDUINO_MEGA2560 -source "boards/avr/arduino-mega2560/Kconfig" +if ARCH_BOARD_EFM32G8XXSTK +source "boards/arm/efm32/efm32-g8xx-stk/Kconfig" +endif +if ARCH_BOARD_EFM32GG_STK3700 +source "boards/arm/efm32/efm32gg-stk3700/Kconfig" +endif +if ARCH_BOARD_OLIMEX_EFM32G880F128_STK +source "boards/arm/efm32/olimex-efm32g880f128-stk/Kconfig" +endif +if ARCH_BOARD_SABRE_6QUAD +source "boards/arm/imx6/sabre-6quad/Kconfig" +endif +if ARCH_BOARD_IMXRT1050_EVK +source "boards/arm/imxrt/imxrt1050-evk/Kconfig" +endif +if ARCH_BOARD_IMXRT1060_EVK +source "boards/arm/imxrt/imxrt1060-evk/Kconfig" +endif +if ARCH_BOARD_FREEDOM_K28F +source "boards/arm/kinetis/freedom-k28f/Kconfig" +endif +if ARCH_BOARD_FREEDOM_K64F +source "boards/arm/kinetis/freedom-k64f/Kconfig" +endif +if ARCH_BOARD_FREEDOM_K66F +source "boards/arm/kinetis/freedom-k66f/Kconfig" +endif +if ARCH_BOARD_KWIKSTIK_K40 +source "boards/arm/kinetis/kwikstik-k40/Kconfig" +endif +if ARCH_BOARD_TEENSY_3X +source "boards/arm/kinetis/teensy-3.x/Kconfig" +endif +if ARCH_BOARD_TWR_K60N512 +source "boards/arm/kinetis/twr-k60n512/Kconfig" +endif +if ARCH_BOARD_TWR_K64F120M +source "boards/arm/kinetis/twr-k64f120m/Kconfig" +endif +if ARCH_BOARD_FREEDOM_KL25Z +source "boards/arm/kl/freedom-kl25z/Kconfig" +endif +if ARCH_BOARD_FREEDOM_KL26Z +source "boards/arm/kl/freedom-kl26z/Kconfig" +endif +if ARCH_BOARD_TEENSY_LC +source "boards/arm/kl/teensy-lc/Kconfig" +endif +if ARCH_BOARD_LC823450_XGEVK +source "boards/arm/lc823450/lc823450-xgevk/Kconfig" +endif +if ARCH_BOARD_LINCOLN60 +source "boards/arm/lpc17xx_40xx/lincoln60/Kconfig" +endif +if ARCH_BOARD_LPC4088_DEVKIT +source "boards/arm/lpc17xx_40xx/lpc4088-devkit/Kconfig" +endif +if ARCH_BOARD_LPC4088_QUICKSTART +source "boards/arm/lpc17xx_40xx/lpc4088-quickstart/Kconfig" +endif +if ARCH_BOARD_LPCXPRESSO +source "boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/Kconfig" +endif +if ARCH_BOARD_MBED +source "boards/arm/lpc17xx_40xx/mbed/Kconfig" +endif +if ARCH_BOARD_MCB1700 +source "boards/arm/lpc17xx_40xx/mcb1700/Kconfig" +endif +if ARCH_BOARD_LPC1766STK +source "boards/arm/lpc17xx_40xx/olimex-lpc1766stk/Kconfig" +endif +if ARCH_BOARD_OPEN1788 +source "boards/arm/lpc17xx_40xx/open1788/Kconfig" +endif +if ARCH_BOARD_PNEV5180B +source "boards/arm/lpc17xx_40xx/pnev5180b/Kconfig" +endif +if ARCH_BOARD_U_BLOX_C027 +source "boards/arm/lpc17xx_40xx/u-blox-c027/Kconfig" +endif +if ARCH_BOARD_ZKITARM +source "boards/arm/lpc17xx_40xx/zkit-arm-1769/Kconfig" +endif +if ARCH_BOARD_MCU123_LPC214X +source "boards/arm/lpc214x/mcu123-lpc214x/Kconfig" +endif +if ARCH_BOARD_ZP214XPA +source "boards/arm/lpc214x/zp214xpa/Kconfig" +endif +if ARCH_BOARD_OLIMEXLPC2378 +source "boards/arm/lpc2378/olimex-lpc2378/Kconfig" +endif +if ARCH_BOARD_EA3131 +source "boards/arm/lpc31xx/ea3131/Kconfig" +endif +if ARCH_BOARD_EA3152 +source "boards/arm/lpc31xx/ea3152/Kconfig" +endif +if ARCH_BOARD_OLIMEX_LPC_H3131 +source "boards/arm/lpc31xx/olimex-lpc-h3131/Kconfig" +endif +if ARCH_BOARD_BAMBINO_200E +source "boards/arm/lpc43xx/bambino-200e/Kconfig" +endif +if ARCH_BOARD_LPC4330_XPLORER +source "boards/arm/lpc43xx/lpc4330-xplorer/Kconfig" +endif +if ARCH_BOARD_LPC4337_WS +source "boards/arm/lpc43xx/lpc4337-ws/Kconfig" +endif +if ARCH_BOARD_LPC4357_EVB +source "boards/arm/lpc43xx/lpc4357-evb/Kconfig" +endif +if ARCH_BOARD_LPC4370_LINK2 +source "boards/arm/lpc43xx/lpc4370-link2/Kconfig" +endif +if ARCH_BOARD_LPCXPRESSO_LPC54628 +source "boards/arm/lpc54xx/lpcxpresso-lpc54628/Kconfig" +endif +if ARCH_BOARD_MAX32660_EVSYS +source "boards/arm/max326xx/max32660-evsys/Kconfig" +endif +if ARCH_BOARD_MOXA +source "boards/arm/moxart/moxa/Kconfig" +endif +if ARCH_BOARD_NRF52_GENERIC +source "boards/arm/nrf52/nrf52-generic/Kconfig" +endif +if ARCH_BOARD_NUTINY_NUC120 +source "boards/arm/nuc1xx/nutiny-nuc120/Kconfig" +endif +if ARCH_BOARD_ARDUINO_DUE +source "boards/arm/sam34/arduino-due/Kconfig" +endif +if ARCH_BOARD_FLIPNCLICK_SAM3X +source "boards/arm/sam34/flipnclick-sam3x/Kconfig" +endif +if ARCH_BOARD_SAM3UEK +source "boards/arm/sam34/sam3u-ek/Kconfig" +endif +if ARCH_BOARD_SAM4CMP_DB +source "boards/arm/sam34/sam4cmp-db/Kconfig" +endif +if ARCH_BOARD_SAM4EEK +source "boards/arm/sam34/sam4e-ek/Kconfig" +endif +if ARCH_BOARD_SAM4L_XPLAINED +source "boards/arm/sam34/sam4l-xplained/Kconfig" +endif +if ARCH_BOARD_SAM4S_XPLAINED +source "boards/arm/sam34/sam4s-xplained/Kconfig" +endif +if ARCH_BOARD_SAM4S_XPLAINED_PRO +source "boards/arm/sam34/sam4s-xplained-pro/Kconfig" +endif +if ARCH_BOARD_SAMA5D2_XULT +source "boards/arm/sama5/sama5d2-xult/Kconfig" +endif +if ARCH_BOARD_SAMA5D3X_EK +source "boards/arm/sama5/sama5d3x-ek/Kconfig" +endif +if ARCH_BOARD_SAMA5D3_XPLAINED +source "boards/arm/sama5/sama5d3-xplained/Kconfig" +endif +if ARCH_BOARD_SAMA5D4_EK +source "boards/arm/sama5/sama5d4-ek/Kconfig" +endif +if ARCH_BOARD_SAMD20_XPLAINED +source "boards/arm/samd2l2/samd20-xplained/Kconfig" +endif +if ARCH_BOARD_SAMD21_XPLAINED +source "boards/arm/samd2l2/samd21-xplained/Kconfig" +endif +if ARCH_BOARD_SAML21_XPLAINED +source "boards/arm/samd2l2/saml21-xplained/Kconfig" +endif +if ARCH_BOARD_METRO_M4 +source "boards/arm/samd5e5/metro-m4/Kconfig" +endif +if ARCH_BOARD_SAME70_XPLAINED +source "boards/arm/samv7/same70-xplained/Kconfig" +endif +if ARCH_BOARD_SAMV71_XULT +source "boards/arm/samv7/samv71-xult/Kconfig" +endif +if ARCH_BOARD_B_L072Z_LRWAN1 +source "boards/arm/stm32f0l0g0/b-l072z-lrwan1/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F072RB +source "boards/arm/stm32f0l0g0/nucleo-f072rb/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F091RC +source "boards/arm/stm32f0l0g0/nucleo-f091rc/Kconfig" +endif +if ARCH_BOARD_NUCLEO_G071RB +source "boards/arm/stm32f0l0g0/nucleo-g071rb/Kconfig" +endif +if ARCH_BOARD_NUCLEO_L073RZ +source "boards/arm/stm32f0l0g0/nucleo-l073rz/Kconfig" +endif +if ARCH_BOARD_STM32F051_DISCOVERY +source "boards/arm/stm32f0l0g0/stm32f051-discovery/Kconfig" +endif +if ARCH_BOARD_STM32F072_DISCOVERY +source "boards/arm/stm32f0l0g0/stm32f072-discovery/Kconfig" +endif +if ARCH_BOARD_NUCLEO_144 +source "boards/arm/stm32f7/nucleo-144/Kconfig" +endif +if ARCH_BOARD_STM32F746_WS +source "boards/arm/stm32f7/stm32f746-ws/Kconfig" +endif +if ARCH_BOARD_STM32F746G_DISCO +source "boards/arm/stm32f7/stm32f746g-disco/Kconfig" +endif +if ARCH_BOARD_STM32F769I_DISCO +source "boards/arm/stm32f7/stm32f769i-disco/Kconfig" +endif +if ARCH_BOARD_NUCLEO_H743ZI +source "boards/arm/stm32h7/nucleo-h743zi/Kconfig" +endif +if ARCH_BOARD_B_L475E_IOT01A +source "boards/arm/stm32l4/b-l475e-iot01a/Kconfig" +endif +if ARCH_BOARD_NUCLEO_L432KC +source "boards/arm/stm32l4/nucleo-l432kc/Kconfig" +endif +if ARCH_BOARD_NUCLEO_L452RE +source "boards/arm/stm32l4/nucleo-l452re/Kconfig" +endif +if ARCH_BOARD_NUCLEO_L476RG +source "boards/arm/stm32l4/nucleo-l476rg/Kconfig" +endif +if ARCH_BOARD_NUCLEO_L496ZG +source "boards/arm/stm32l4/nucleo-l496zg/Kconfig" +endif +if ARCH_BOARD_STM32L476_MDK +source "boards/arm/stm32l4/stm32l476-mdk/Kconfig" +endif +if ARCH_BOARD_STM32L476VG_DISCO +source "boards/arm/stm32l4/stm32l476vg-disco/Kconfig" +endif +if ARCH_BOARD_STM32L4R9AI_DISCO +source "boards/arm/stm32l4/stm32l4r9ai-disco/Kconfig" +endif +if ARCH_BOARD_AXOLOTI +source "boards/arm/stm32/axoloti/Kconfig" +endif +if ARCH_BOARD_CLICKER2_STM32 +source "boards/arm/stm32/clicker2-stm32/Kconfig" +endif +if ARCH_BOARD_CLOUDCTRL +source "boards/arm/stm32/cloudctrl/Kconfig" +endif +if ARCH_BOARD_FIRE_STM32 +source "boards/arm/stm32/fire-stm32v2/Kconfig" +endif +if ARCH_BOARD_HYMINI_STM32V +source "boards/arm/stm32/hymini-stm32v/Kconfig" +endif +if ARCH_BOARD_MAPLE +source "boards/arm/stm32/maple/Kconfig" +endif +if ARCH_BOARD_MIKROE_STM32F4 +source "boards/arm/stm32/mikroe-stm32f4/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F103RB +source "boards/arm/stm32/nucleo-f103rb/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F207ZG +source "boards/arm/stm32/nucleo-f207zg/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F302R8 +source "boards/arm/stm32/nucleo-f302r8/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F303RE +source "boards/arm/stm32/nucleo-f303re/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F303ZE +source "boards/arm/stm32/nucleo-f303ze/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F334R8 +source "boards/arm/stm32/nucleo-f334r8/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F410RB +source "boards/arm/stm32/nucleo-f410rb/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F44RE +source "boards/arm/stm32/nucleo-f446re/Kconfig" +endif +if ARCH_BOARD_NUCLEO_F401RE || ARCH_BOARD_NUCLEO_F411RE +source "boards/arm/stm32/nucleo-f4x1re/Kconfig" +endif +if ARCH_BOARD_NUCLEO_L152RE +source "boards/arm/stm32/nucleo-l152re/Kconfig" +endif +if ARCH_BOARD_OLIMEX_STM32E407 +source "boards/arm/stm32/olimex-stm32-e407/Kconfig" +endif +if ARCH_BOARD_OLIMEX_STM32H405 +source "boards/arm/stm32/olimex-stm32-h405/Kconfig" +endif +if ARCH_BOARD_OLIMEX_STM32H407 +source "boards/arm/stm32/olimex-stm32-h407/Kconfig" +endif +if ARCH_BOARD_OLIMEX_STM32P107 +source "boards/arm/stm32/olimex-stm32-p107/Kconfig" +endif +if ARCH_BOARD_OLIMEX_STM32P207 +source "boards/arm/stm32/olimex-stm32-p207/Kconfig" +endif +if ARCH_BOARD_OLIMEX_STM32P407 +source "boards/arm/stm32/olimex-stm32-p407/Kconfig" +endif +if ARCH_BOARD_OLIMEXINO_STM32 +source "boards/arm/stm32/olimexino-stm32/Kconfig" +endif +if ARCH_BOARD_OMNIBUSF4 +source "boards/arm/stm32/omnibusf4/Kconfig" +endif +if ARCH_BOARD_PHOTON +source "boards/arm/stm32/photon/Kconfig" +endif +if ARCH_BOARD_SHENZHOU +source "boards/arm/stm32/shenzhou/Kconfig" +endif +if ARCH_BOARD_STM3210E_EVAL +source "boards/arm/stm32/stm3210e-eval/Kconfig" +endif +if ARCH_BOARD_STM3220G_EVAL +source "boards/arm/stm32/stm3220g-eval/Kconfig" +endif +if ARCH_BOARD_STM3240G_EVAL +source "boards/arm/stm32/stm3240g-eval/Kconfig" +endif +if ARCH_BOARD_STM32_TINY +source "boards/arm/stm32/stm32_tiny/Kconfig" +endif +if ARCH_BOARD_STM32_BUTTERFLY2 +source "boards/arm/stm32/stm32butterfly2/Kconfig" +endif +if ARCH_BOARD_STM32F103_MINIMUM +source "boards/arm/stm32/stm32f103-minimum/Kconfig" +endif +if ARCH_BOARD_STM32F334_DISCO +source "boards/arm/stm32/stm32f334-disco/Kconfig" +endif +if ARCH_BOARD_STM32F3_DISCOVERY +source "boards/arm/stm32/stm32f3discovery/Kconfig" +endif +if ARCH_BOARD_STM32F411E_DISCO +source "boards/arm/stm32/stm32f411e-disco/Kconfig" +endif +if ARCH_BOARD_STM32F429I_DISCO +source "boards/arm/stm32/stm32f429i-disco/Kconfig" +endif +if ARCH_BOARD_STM32F4_DISCOVERY +source "boards/arm/stm32/stm32f4discovery/Kconfig" +endif +if ARCH_BOARD_STM32L_DISCOVERY +source "boards/arm/stm32/stm32ldiscovery/Kconfig" +endif +if ARCH_BOARD_STM32VL_DISCOVERY +source "boards/arm/stm32/stm32vldiscovery/Kconfig" +endif +if ARCH_BOARD_VIEWTOOL_STM32F107 +source "boards/arm/stm32/viewtool-stm32f107/Kconfig" +endif +if ARCH_BOARD_OLIMEX_STRP711 +source "boards/arm/str71x/olimex-strp711/Kconfig" +endif +if ARCH_BOARD_DK_TM4C129X +source "boards/arm/tiva/dk-tm4c129x/Kconfig" +endif +if ARCH_BOARD_EAGLE100 +source "boards/arm/tiva/eagle100/Kconfig" +endif +if ARCH_BOARD_EKKLM3S9B96 +source "boards/arm/tiva/ekk-lm3s9b96/Kconfig" +endif +if ARCH_BOARD_LAUNCHXL_CC1310 +source "boards/arm/tiva/launchxl-cc1310/Kconfig" +endif +if ARCH_BOARD_LAUNCHXL_CC1312R1 +source "boards/arm/tiva/launchxl-cc1312r1/Kconfig" +endif +if ARCH_BOARD_LM3S6432S2E +source "boards/arm/tiva/lm3s6432-s2e/Kconfig" +endif +if ARCH_BOARD_LM3S6965EK +source "boards/arm/tiva/lm3s6965-ek/Kconfig" +endif +if ARCH_BOARD_LM3S8962EK +source "boards/arm/tiva/lm3s8962-ek/Kconfig" +endif +if ARCH_BOARD_LM3S8962EK +source "boards/arm/tiva/lm4f120-launchpad/Kconfig" +endif +if ARCH_BOARD_TM4C123G_LAUNCHPAD +source "boards/arm/tiva/tm4c123g-launchpad/Kconfig" +endif +if ARCH_BOARD_TM4C1294_LAUNCHPAD +source "boards/arm/tiva/tm4c1294-launchpad/Kconfig" +endif +if ARCH_BOARD_LAUNCHXL_TMS57004 +source "boards/arm/tms570/launchxl-tms57004/Kconfig" +endif +if ARCH_BOARD_TMS570LS31X_USB_KIT +source "boards/arm/tms570/tms570ls31x-usb-kit/Kconfig" +endif +if ARCH_BOARD_XMC4500RELAX +source "boards/arm/xmc4/xmc4500-relax/Kconfig" endif if ARCH_BOARD_AVR32DEV1 -source "boards/avr/avr32dev1/Kconfig" +source "boards/avr/at32uc3/avr32dev1/Kconfig" endif if ARCH_BOARD_MICROPENDOUS3 -source "boards/avr/micropendous3/Kconfig" -endif -if ARCH_BOARD_MOTEINO_MEGA -source "boards/avr/moteino-mega/Kconfig" +source "boards/avr/at90usb/micropendous3/Kconfig" endif if ARCH_BOARD_TEENSY_20 -source "boards/avr/teensy-2.0/Kconfig" +source "boards/avr/at90usb/teensy-2.0/Kconfig" +endif +if ARCH_BOARD_AMBER +source "boards/avr/atmega/amber/Kconfig" +endif +if ARCH_BOARD_ARDUINO_MEGA2560 +source "boards/avr/atmega/arduino-mega2560/Kconfig" +endif +if ARCH_BOARD_MOTEINO_MEGA +source "boards/avr/atmega/moteino-mega/Kconfig" endif if ARCH_BOARD_CUSTOM source "boards/dummy/Kconfig" endif if ARCH_BOARD_DEMOS92S12NEC64 -source "boards/hc/demo9s12ne64/Kconfig" +source "boards/hc/mcs92s12ne64/demo9s12ne64/Kconfig" endif if ARCH_BOARD_NE64BADGE -source "boards/hc/ne64badge/Kconfig" -endif -if ARCH_BOARD_FLIPNCLICK_PIC32MZ -source "boards/mips/flipnclick-pic32mz/Kconfig" +source "boards/hc/mcs92s12ne64/ne64badge/Kconfig" endif if ARCH_BOARD_MIRTOO -source "boards/mips/mirtoo/Kconfig" +source "boards/mips/pic32mx/mirtoo/Kconfig" endif if ARCH_BOARD_PIC32MX_STARTERKIT -source "boards/mips/pic32mx-starterkit/Kconfig" +source "boards/mips/pic32mx/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" +source "boards/mips/pic32mx/pic32mx7mmb/Kconfig" endif if ARCH_BOARD_SUREPIC32MX -source "boards/mips/sure-pic32mx/Kconfig" +source "boards/mips/pic32mx/sure-pic32mx/Kconfig" endif if ARCH_BOARD_UBW32 -source "boards/mips/ubw32/Kconfig" +source "boards/mips/pic32mx/ubw32/Kconfig" +endif +if ARCH_BOARD_FLIPNCLICK_PIC32MZ +source "boards/mips/pic32mz/flipnclick-pic32mz/Kconfig" +endif +if ARCH_BOARD_PIC32MZ_STARTERKIT +source "boards/mips/pic32mz/pic32mz-starterkit/Kconfig" endif if ARCH_BOARD_MISOC_QEMU || ARCH_BOARD_MISOC_VERILATOR -source "boards/misoc/misoc/Kconfig" +source "boards/misoc/lm32/misoc/Kconfig" endif if ARCH_BOARD_OR1K -source "boards/or1k/or1k/Kconfig" +source "boards/or1k/mor1kx/or1k/Kconfig" endif if ARCH_BOARD_SKP16C26 -source "boards/renesas/skp16c26/Kconfig" +source "boards/renesas/m32262f8/skp16c26/Kconfig" endif if ARCH_BOARD_US7032EVB1 -source "boards/renesas/us7032evb1/Kconfig" +source "boards/renesas/sh7032/us7032evb1/Kconfig" endif if ARCH_BOARD_GAPUINO -source "boards/risc-v/gapuino/Kconfig" +source "boards/risc-v/gap8/gapuino/Kconfig" endif if ARCH_BOARD_NR5M100_NEXYS4 -source "boards/risc-v/nr5m100-nexys4/Kconfig" +source "boards/risc-v/nr5m100/nr5m100-nexys4/Kconfig" endif if ARCH_BOARD_SIM -source "boards/sim/sim/Kconfig" +source "boards/sim/sim/sim/Kconfig" endif if ARCH_BOARD_QEMU_I486 -source "boards/x86/qemu-i486/Kconfig" +source "boards/x86/qemu/qemu-i486/Kconfig" endif if ARCH_BOARD_ESP32CORE -source "boards/xtensa/esp32-core/Kconfig" +source "boards/xtensa/esp32/esp32-core/Kconfig" endif if ARCH_BOARD_Z16F2800100ZCOG -source "boards/z16/z16f2800100zcog/Kconfig" +source "boards/z16/z16f2811/z16f2800100zcog/Kconfig" endif if ARCH_BOARD_EZ80F910200KITG -source "boards/z80/ez80f910200kitg/Kconfig" +source "boards/z80/ez80/ez80f910200kitg/Kconfig" endif if ARCH_BOARD_EZ80F910200ZCO -source "boards/z80/ez80f910200zco/Kconfig" +source "boards/z80/ez80/ez80f910200zco/Kconfig" endif if ARCH_BOARD_MAKERLISP -source "boards/z80/makerlisp/Kconfig" +source "boards/z80/ez80/makerlisp/Kconfig" endif -if ARCH_BOARD_Z80SIM -source "boards/z80/z80sim/Kconfig" +if ARCH_BOARD_P112 +source "boards/z80/z180/p112/Kconfig" endif if ARCH_BOARD_Z8ENCORE000ZCO -source "boards/z80/z8encore000zco/Kconfig" +source "boards/z80/z8/z8encore000zco/Kconfig" endif if ARCH_BOARD_Z8F64200100KIT -source "boards/z80/z8f64200100kit/Kconfig" +source "boards/z80/z8/z8f64200100kit/Kconfig" +endif +if ARCH_BOARD_Z80SIM +source "boards/z80/z80/z80sim/Kconfig" endif config BOARD_CRASHDUMP diff --git a/boards/arm/pcduino-a10/Kconfig b/boards/arm/a1x/pcduino-a10/Kconfig similarity index 100% rename from boards/arm/pcduino-a10/Kconfig rename to boards/arm/a1x/pcduino-a10/Kconfig diff --git a/boards/arm/pcduino-a10/README.txt b/boards/arm/a1x/pcduino-a10/README.txt similarity index 100% rename from boards/arm/pcduino-a10/README.txt rename to boards/arm/a1x/pcduino-a10/README.txt diff --git a/boards/arm/pcduino-a10/configs/nsh/defconfig b/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig similarity index 98% rename from boards/arm/pcduino-a10/configs/nsh/defconfig rename to boards/arm/a1x/pcduino-a10/configs/nsh/defconfig index e82208c72ee..ff974a3205d 100644 --- a/boards/arm/pcduino-a10/configs/nsh/defconfig +++ b/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH_BOARD="pcduino-a10" CONFIG_ARCH_BOARD_PCDUINO_A10=y CONFIG_ARCH_CHIP_A10=y CONFIG_ARCH_CHIP_A1X=y +CONFIG_ARCH_CHIP="a1x" CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/pcduino-a10/configs/nsh/pcduino-140107.patch b/boards/arm/a1x/pcduino-a10/configs/nsh/pcduino-140107.patch similarity index 100% rename from boards/arm/pcduino-a10/configs/nsh/pcduino-140107.patch rename to boards/arm/a1x/pcduino-a10/configs/nsh/pcduino-140107.patch diff --git a/boards/arm/pcduino-a10/include/board.h b/boards/arm/a1x/pcduino-a10/include/board.h similarity index 96% rename from boards/arm/pcduino-a10/include/board.h rename to boards/arm/a1x/pcduino-a10/include/board.h index 1f7537dc66e..2d402cb3014 100644 --- a/boards/arm/pcduino-a10/include/board.h +++ b/boards/arm/a1x/pcduino-a10/include/board.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/pcduino-a10/include/board.h + * boards/arm/a1x/pcduino-a10/include/board.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_ARM_PCDUINO_A10_INCLUDE_BOARD_H -#define __BOARDS_ARM_PCDUINO_A10_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_A1X_PCDUINO_A10_INCLUDE_BOARD_H +#define __BOARDS_ARM_A1X_PCDUINO_A10_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -157,4 +157,4 @@ .endm #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_PCDUINO_A10_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_A1X_PCDUINO_A10_INCLUDE_BOARD_H */ diff --git a/boards/arm/pcduino-a10/include/board_memorymap.h b/boards/arm/a1x/pcduino-a10/include/board_memorymap.h similarity index 91% rename from boards/arm/pcduino-a10/include/board_memorymap.h rename to boards/arm/a1x/pcduino-a10/include/board_memorymap.h index d5d2051c734..13b863228a1 100644 --- a/boards/arm/pcduino-a10/include/board_memorymap.h +++ b/boards/arm/a1x/pcduino-a10/include/board_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/pcduino-a10/include/board_memorymap.h + * boards/arm/a1x/pcduino-a10/include/board_memorymap.h * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_ARM_PCDUINO_A10_INCLUDE_BOARD_MEMORYMAP_H -#define __BOARDS_ARM_PCDUINO_A10_INCLUDE_BOARD_MEMORYMAP_H +#ifndef __BOARDS_ARM_A1X_PCDUINO_A10_INCLUDE_BOARD_MEMORYMAP_H +#define __BOARDS_ARM_A1X_PCDUINO_A10_INCLUDE_BOARD_MEMORYMAP_H /************************************************************************************ * Included Files @@ -70,4 +70,4 @@ extern "C" { #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_PCDUINO_A10_INCLUDE_BOARD_MEMORYMAP_H */ +#endif /* __BOARDS_ARM_A1X_PCDUINO_A10_INCLUDE_BOARD_MEMORYMAP_H */ diff --git a/boards/arm/pcduino-a10/scripts/Make.defs b/boards/arm/a1x/pcduino-a10/scripts/Make.defs similarity index 95% rename from boards/arm/pcduino-a10/scripts/Make.defs rename to boards/arm/a1x/pcduino-a10/scripts/Make.defs index 3dbefb487e3..841b04e1025 100644 --- a/boards/arm/pcduino-a10/scripts/Make.defs +++ b/boards/arm/a1x/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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/pcduino-a10/scripts/sdram.ld b/boards/arm/a1x/pcduino-a10/scripts/sdram.ld similarity index 100% rename from boards/arm/pcduino-a10/scripts/sdram.ld rename to boards/arm/a1x/pcduino-a10/scripts/sdram.ld diff --git a/boards/arm/pcduino-a10/src/Makefile b/boards/arm/a1x/pcduino-a10/src/Makefile similarity index 100% rename from boards/arm/pcduino-a10/src/Makefile rename to boards/arm/a1x/pcduino-a10/src/Makefile diff --git a/boards/arm/pcduino-a10/src/a1x_boot.c b/boards/arm/a1x/pcduino-a10/src/a1x_boot.c similarity index 100% rename from boards/arm/pcduino-a10/src/a1x_boot.c rename to boards/arm/a1x/pcduino-a10/src/a1x_boot.c diff --git a/boards/arm/pcduino-a10/src/a1x_buttons.c b/boards/arm/a1x/pcduino-a10/src/a1x_buttons.c similarity index 100% rename from boards/arm/pcduino-a10/src/a1x_buttons.c rename to boards/arm/a1x/pcduino-a10/src/a1x_buttons.c diff --git a/boards/arm/pcduino-a10/src/a1x_leds.c b/boards/arm/a1x/pcduino-a10/src/a1x_leds.c similarity index 100% rename from boards/arm/pcduino-a10/src/a1x_leds.c rename to boards/arm/a1x/pcduino-a10/src/a1x_leds.c diff --git a/boards/arm/pcduino-a10/src/pcduino_a10.h b/boards/arm/a1x/pcduino-a10/src/pcduino_a10.h similarity index 100% rename from boards/arm/pcduino-a10/src/pcduino_a10.h rename to boards/arm/a1x/pcduino-a10/src/pcduino_a10.h diff --git a/boards/arm/beaglebone-black/Kconfig b/boards/arm/am335x/beaglebone-black/Kconfig similarity index 100% rename from boards/arm/beaglebone-black/Kconfig rename to boards/arm/am335x/beaglebone-black/Kconfig diff --git a/boards/arm/beaglebone-black/README.txt b/boards/arm/am335x/beaglebone-black/README.txt similarity index 100% rename from boards/arm/beaglebone-black/README.txt rename to boards/arm/am335x/beaglebone-black/README.txt diff --git a/boards/arm/beaglebone-black/configs/lcd/defconfig b/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig similarity index 98% rename from boards/arm/beaglebone-black/configs/lcd/defconfig rename to boards/arm/am335x/beaglebone-black/configs/lcd/defconfig index 9bd48ee6d2a..6567c1ee5fe 100644 --- a/boards/arm/beaglebone-black/configs/lcd/defconfig +++ b/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH_BOARD="beaglebone-black" CONFIG_ARCH_BOARD_BEAGLEBONE_BLACK=y CONFIG_ARCH_CHIP_AM3358=y CONFIG_ARCH_CHIP_AM335X=y +CONFIG_ARCH_CHIP="am335x" CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/beaglebone-black/configs/nsh/defconfig b/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig similarity index 98% rename from boards/arm/beaglebone-black/configs/nsh/defconfig rename to boards/arm/am335x/beaglebone-black/configs/nsh/defconfig index f2b729b01c6..0eb6022b834 100644 --- a/boards/arm/beaglebone-black/configs/nsh/defconfig +++ b/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH_BOARD_BEAGLEBONE_BLACK=y CONFIG_ARCH_BOARD="beaglebone-black" CONFIG_ARCH_CHIP_AM3358=y CONFIG_ARCH_CHIP_AM335X=y +CONFIG_ARCH_CHIP="am335x" CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_LOWVECTORS=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/beaglebone-black/include/board.h b/boards/arm/am335x/beaglebone-black/include/board.h similarity index 96% rename from boards/arm/beaglebone-black/include/board.h rename to boards/arm/am335x/beaglebone-black/include/board.h index 54a761026c6..274e1fbf0cf 100644 --- a/boards/arm/beaglebone-black/include/board.h +++ b/boards/arm/am335x/beaglebone-black/include/board.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/beaglebone-black/include/board.h + * boards/arm/am335x/beaglebone-black/include/board.h * * Copyright (C) 2018 Petro Karashchenko. All rights reserved. * Author: Petro Karashchenko @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_ARM_BEAGLEBONE_BLACK_INCLUDE_BOARD_H -#define __BOARDS_ARM_BEAGLEBONE_BLACK_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_AM335X_BEAGLEBONE_BLACK_INCLUDE_BOARD_H +#define __BOARDS_ARM_AM335X_BEAGLEBONE_BLACK_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -133,4 +133,4 @@ .endm #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_BEAGLEBONE_BLACK_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_AM335X_BEAGLEBONE_BLACK_INCLUDE_BOARD_H */ diff --git a/boards/arm/beaglebone-black/include/board_memorymap.h b/boards/arm/am335x/beaglebone-black/include/board_memorymap.h similarity index 90% rename from boards/arm/beaglebone-black/include/board_memorymap.h rename to boards/arm/am335x/beaglebone-black/include/board_memorymap.h index 85b0f72e20b..ad39ce3d832 100644 --- a/boards/arm/beaglebone-black/include/board_memorymap.h +++ b/boards/arm/am335x/beaglebone-black/include/board_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/beaglebone-black/include/board_memorymap.h + * boards/arm/am335x/beaglebone-black/include/board_memorymap.h * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_ARM_BEAGLEBONE_BLACK_INCLUDE_BOARD_MEMORYMAP_H -#define __BOARDS_ARM_BEAGLEBONE_BLACK_INCLUDE_BOARD_MEMORYMAP_H +#ifndef __BOARDS_ARM_AM335X_BEAGLEBONE_BLACK_INCLUDE_BOARD_MEMORYMAP_H +#define __BOARDS_ARM_AM335X_BEAGLEBONE_BLACK_INCLUDE_BOARD_MEMORYMAP_H /************************************************************************************ * Included Files @@ -71,4 +71,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_BEAGLEBONE_BLACK_INCLUDE_BOARD_MEMORYMAP_H */ +#endif /* __BOARDS_ARM_AM335X_BEAGLEBONE_BLACK_INCLUDE_BOARD_MEMORYMAP_H */ diff --git a/boards/arm/beaglebone-black/scripts/Make.defs b/boards/arm/am335x/beaglebone-black/scripts/Make.defs similarity index 96% rename from boards/arm/beaglebone-black/scripts/Make.defs rename to boards/arm/am335x/beaglebone-black/scripts/Make.defs index d2b3a00ba27..479bb05bbef 100644 --- a/boards/arm/beaglebone-black/scripts/Make.defs +++ b/boards/arm/am335x/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/beaglebone-black/scripts/sdram.ld b/boards/arm/am335x/beaglebone-black/scripts/sdram.ld similarity index 100% rename from boards/arm/beaglebone-black/scripts/sdram.ld rename to boards/arm/am335x/beaglebone-black/scripts/sdram.ld diff --git a/boards/arm/beaglebone-black/src/Makefile b/boards/arm/am335x/beaglebone-black/src/Makefile similarity index 97% rename from boards/arm/beaglebone-black/src/Makefile rename to boards/arm/am335x/beaglebone-black/src/Makefile index e2577072fbb..73c601f965a 100644 --- a/boards/arm/beaglebone-black/src/Makefile +++ b/boards/arm/am335x/beaglebone-black/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/beaglebone-black/src/Makefile +# boards/arm/am335x/beaglebone-black/src/Makefile # # Copyright (C) 2018 Petro Karashchenko. All rights reserved. # Author: Petro Karashchenko diff --git a/boards/arm/beaglebone-black/src/am335x_boot.c b/boards/arm/am335x/beaglebone-black/src/am335x_boot.c similarity index 100% rename from boards/arm/beaglebone-black/src/am335x_boot.c rename to boards/arm/am335x/beaglebone-black/src/am335x_boot.c diff --git a/boards/arm/beaglebone-black/src/am335x_buttons.c b/boards/arm/am335x/beaglebone-black/src/am335x_buttons.c similarity index 100% rename from boards/arm/beaglebone-black/src/am335x_buttons.c rename to boards/arm/am335x/beaglebone-black/src/am335x_buttons.c diff --git a/boards/arm/beaglebone-black/src/am335x_lcd.c b/boards/arm/am335x/beaglebone-black/src/am335x_lcd.c similarity index 100% rename from boards/arm/beaglebone-black/src/am335x_lcd.c rename to boards/arm/am335x/beaglebone-black/src/am335x_lcd.c diff --git a/boards/arm/beaglebone-black/src/am335x_leds.c b/boards/arm/am335x/beaglebone-black/src/am335x_leds.c similarity index 100% rename from boards/arm/beaglebone-black/src/am335x_leds.c rename to boards/arm/am335x/beaglebone-black/src/am335x_leds.c diff --git a/boards/arm/beaglebone-black/src/beaglebone-black.h b/boards/arm/am335x/beaglebone-black/src/beaglebone-black.h similarity index 100% rename from boards/arm/beaglebone-black/src/beaglebone-black.h rename to boards/arm/am335x/beaglebone-black/src/beaglebone-black.h diff --git a/boards/arm/c5471evm/Kconfig b/boards/arm/c5471/c5471evm/Kconfig similarity index 100% rename from boards/arm/c5471evm/Kconfig rename to boards/arm/c5471/c5471evm/Kconfig diff --git a/boards/arm/c5471evm/README.txt b/boards/arm/c5471/c5471evm/README.txt similarity index 100% rename from boards/arm/c5471evm/README.txt rename to boards/arm/c5471/c5471evm/README.txt diff --git a/boards/arm/c5471evm/configs/httpd/defconfig b/boards/arm/c5471/c5471evm/configs/httpd/defconfig similarity index 98% rename from boards/arm/c5471evm/configs/httpd/defconfig rename to boards/arm/c5471/c5471evm/configs/httpd/defconfig index aef58aaffa5..9f7412170f7 100644 --- a/boards/arm/c5471evm/configs/httpd/defconfig +++ b/boards/arm/c5471/c5471evm/configs/httpd/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="c5471evm" CONFIG_ARCH_BOARD_C5471EVM=y CONFIG_ARCH_CHIP_C5471=y +CONFIG_ARCH_CHIP="c5471" CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=1250 diff --git a/boards/arm/c5471evm/configs/nettest/defconfig b/boards/arm/c5471/c5471evm/configs/nettest/defconfig similarity index 98% rename from boards/arm/c5471evm/configs/nettest/defconfig rename to boards/arm/c5471/c5471evm/configs/nettest/defconfig index 698e87c4ac3..d2700c0c216 100644 --- a/boards/arm/c5471evm/configs/nettest/defconfig +++ b/boards/arm/c5471/c5471evm/configs/nettest/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="c5471evm" CONFIG_ARCH_BOARD_C5471EVM=y CONFIG_ARCH_CHIP_C5471=y +CONFIG_ARCH_CHIP="c5471" CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=1250 diff --git a/boards/arm/c5471evm/configs/nsh/defconfig b/boards/arm/c5471/c5471evm/configs/nsh/defconfig similarity index 98% rename from boards/arm/c5471evm/configs/nsh/defconfig rename to boards/arm/c5471/c5471evm/configs/nsh/defconfig index 25c690c7b92..7d75390bc01 100644 --- a/boards/arm/c5471evm/configs/nsh/defconfig +++ b/boards/arm/c5471/c5471evm/configs/nsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="c5471evm" CONFIG_ARCH_BOARD_C5471EVM=y CONFIG_ARCH_CHIP_C5471=y +CONFIG_ARCH_CHIP="c5471" CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_TOOLCHAIN_BUILDROOT=y CONFIG_BOARD_LOOPSPERMSEC=1250 diff --git a/boards/arm/c5471evm/include/board.h b/boards/arm/c5471/c5471evm/include/board.h similarity index 93% rename from boards/arm/c5471evm/include/board.h rename to boards/arm/c5471/c5471evm/include/board.h index 98eacabb159..c9d9c3a39f9 100644 --- a/boards/arm/c5471evm/include/board.h +++ b/boards/arm/c5471/c5471evm/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/board.h + * boards/arm/c5471/c5471evm/include/board.h * * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __ARCH_BOARD_H -#define __ARCH_BOARD_H +#ifndef __BOARDS_ARM_C5471_C5471EVM_INCLUDE_BOARD_H +#define __BOARDS_ARM_C5471_C5471EVM_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -63,4 +63,4 @@ * Inline Functions ****************************************************************************/ -#endif /* __ARCH_BOARD_H */ +#endif /* __BOARDS_ARM_C5471_C5471EVM_INCLUDE_BOARD_H */ diff --git a/boards/arm/c5471evm/scripts/Make.defs b/boards/arm/c5471/c5471evm/scripts/Make.defs similarity index 96% rename from boards/arm/c5471evm/scripts/Make.defs rename to boards/arm/c5471/c5471evm/scripts/Make.defs index d9ff6c48bde..7bade157bec 100644 --- a/boards/arm/c5471evm/scripts/Make.defs +++ b/boards/arm/c5471/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/c5471evm/scripts/ld.script b/boards/arm/c5471/c5471evm/scripts/ld.script similarity index 100% rename from boards/arm/c5471evm/scripts/ld.script rename to boards/arm/c5471/c5471evm/scripts/ld.script diff --git a/boards/arm/arduino-due/src/.gitignore b/boards/arm/c5471/c5471evm/src/.gitignore similarity index 100% rename from boards/arm/arduino-due/src/.gitignore rename to boards/arm/c5471/c5471evm/src/.gitignore diff --git a/boards/arm/c5471evm/src/Makefile b/boards/arm/c5471/c5471evm/src/Makefile similarity index 98% rename from boards/arm/c5471evm/src/Makefile rename to boards/arm/c5471/c5471evm/src/Makefile index 5a1b0aa3a14..5442544f20b 100644 --- a/boards/arm/c5471evm/src/Makefile +++ b/boards/arm/c5471/c5471evm/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/c5471evm/src/Makefile +# boards/c5471/c5471evm/src/Makefile # # Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/c5471evm/src/c5471_leds.c b/boards/arm/c5471/c5471evm/src/c5471_leds.c similarity index 98% rename from boards/arm/c5471evm/src/c5471_leds.c rename to boards/arm/c5471/c5471evm/src/c5471_leds.c index a8d16da4102..2f6279ed346 100644 --- a/boards/arm/c5471evm/src/c5471_leds.c +++ b/boards/arm/c5471/c5471evm/src/c5471_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/c5471evm/src/c5471_leds.c + * boards/c5471/c5471evm/src/c5471_leds.c * * Copyright (C) 2007-2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/spresense/Kconfig b/boards/arm/cxd56xx/spresense/Kconfig similarity index 100% rename from boards/arm/spresense/Kconfig rename to boards/arm/cxd56xx/spresense/Kconfig diff --git a/boards/arm/spresense/README.txt b/boards/arm/cxd56xx/spresense/README.txt similarity index 100% rename from boards/arm/spresense/README.txt rename to boards/arm/cxd56xx/spresense/README.txt diff --git a/boards/arm/spresense/configs/lcd/defconfig b/boards/arm/cxd56xx/spresense/configs/lcd/defconfig similarity index 98% rename from boards/arm/spresense/configs/lcd/defconfig rename to boards/arm/cxd56xx/spresense/configs/lcd/defconfig index 098c329a5b1..3db9f4037ec 100644 --- a/boards/arm/spresense/configs/lcd/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/lcd/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" CONFIG_ARCH_BOARD_SPRESENSE=y +CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_USEBASEPRI=y diff --git a/boards/arm/spresense/configs/mpy/defconfig b/boards/arm/cxd56xx/spresense/configs/mpy/defconfig similarity index 98% rename from boards/arm/spresense/configs/mpy/defconfig rename to boards/arm/cxd56xx/spresense/configs/mpy/defconfig index 907f138f173..49262769fe2 100644 --- a/boards/arm/spresense/configs/mpy/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/mpy/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" CONFIG_ARCH_BOARD_SPRESENSE=y +CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_USEBASEPRI=y diff --git a/boards/arm/spresense/configs/nsh/defconfig b/boards/arm/cxd56xx/spresense/configs/nsh/defconfig similarity index 98% rename from boards/arm/spresense/configs/nsh/defconfig rename to boards/arm/cxd56xx/spresense/configs/nsh/defconfig index 817108b5cd6..89dd4ada8ea 100644 --- a/boards/arm/spresense/configs/nsh/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" CONFIG_ARCH_BOARD_SPRESENSE=y +CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_USEBASEPRI=y diff --git a/boards/arm/spresense/configs/rndis/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig similarity index 99% rename from boards/arm/spresense/configs/rndis/defconfig rename to boards/arm/cxd56xx/spresense/configs/rndis/defconfig index ae335dee991..1324603e2db 100644 --- a/boards/arm/spresense/configs/rndis/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" CONFIG_ARCH_BOARD_SPRESENSE=y CONFIG_ARCH_CHIP_CXD56XX=y +CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_USEBASEPRI=y CONFIG_BOARDCTL_RESET=y diff --git a/boards/arm/spresense/configs/usbmsc/defconfig b/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig similarity index 98% rename from boards/arm/spresense/configs/usbmsc/defconfig rename to boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig index 4f71daeb5e1..7d1d954d3d1 100644 --- a/boards/arm/spresense/configs/usbmsc/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" CONFIG_ARCH_BOARD_SPRESENSE=y +CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_USEBASEPRI=y diff --git a/boards/arm/spresense/configs/usbnsh/defconfig b/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig similarity index 98% rename from boards/arm/spresense/configs/usbnsh/defconfig rename to boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig index f7df5d4034a..b5a464b42a7 100644 --- a/boards/arm/spresense/configs/usbnsh/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" CONFIG_ARCH_BOARD_SPRESENSE=y +CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_USEBASEPRI=y diff --git a/boards/arm/spresense/configs/wifi/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig similarity index 99% rename from boards/arm/spresense/configs/wifi/defconfig rename to boards/arm/cxd56xx/spresense/configs/wifi/defconfig index 52192602c68..a49b5bf6937 100644 --- a/boards/arm/spresense/configs/wifi/defconfig +++ b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="spresense" CONFIG_ARCH_BOARD_SPRESENSE=y +CONFIG_ARCH_CHIP="cxd56xx" CONFIG_ARCH_CHIP_CXD56XX=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARMV7M_USEBASEPRI=y diff --git a/boards/arm/spresense/include/board.h b/boards/arm/cxd56xx/spresense/include/board.h similarity index 100% rename from boards/arm/spresense/include/board.h rename to boards/arm/cxd56xx/spresense/include/board.h diff --git a/boards/arm/spresense/include/cxd56_bmi160.h b/boards/arm/cxd56xx/spresense/include/cxd56_bmi160.h similarity index 100% rename from boards/arm/spresense/include/cxd56_bmi160.h rename to boards/arm/cxd56xx/spresense/include/cxd56_bmi160.h diff --git a/boards/arm/spresense/include/cxd56_charger.h b/boards/arm/cxd56xx/spresense/include/cxd56_charger.h similarity index 100% rename from boards/arm/spresense/include/cxd56_charger.h rename to boards/arm/cxd56xx/spresense/include/cxd56_charger.h diff --git a/boards/arm/spresense/include/cxd56_clock.h b/boards/arm/cxd56xx/spresense/include/cxd56_clock.h similarity index 100% rename from boards/arm/spresense/include/cxd56_clock.h rename to boards/arm/cxd56xx/spresense/include/cxd56_clock.h diff --git a/boards/arm/spresense/include/cxd56_flash.h b/boards/arm/cxd56xx/spresense/include/cxd56_flash.h similarity index 100% rename from boards/arm/spresense/include/cxd56_flash.h rename to boards/arm/cxd56xx/spresense/include/cxd56_flash.h diff --git a/boards/arm/spresense/include/cxd56_gauge.h b/boards/arm/cxd56xx/spresense/include/cxd56_gauge.h similarity index 100% rename from boards/arm/spresense/include/cxd56_gauge.h rename to boards/arm/cxd56xx/spresense/include/cxd56_gauge.h diff --git a/boards/arm/spresense/include/cxd56_gpioif.h b/boards/arm/cxd56xx/spresense/include/cxd56_gpioif.h similarity index 100% rename from boards/arm/spresense/include/cxd56_gpioif.h rename to boards/arm/cxd56xx/spresense/include/cxd56_gpioif.h diff --git a/boards/arm/spresense/include/cxd56_gs2200m.h b/boards/arm/cxd56xx/spresense/include/cxd56_gs2200m.h similarity index 100% rename from boards/arm/spresense/include/cxd56_gs2200m.h rename to boards/arm/cxd56xx/spresense/include/cxd56_gs2200m.h diff --git a/boards/arm/spresense/include/cxd56_i2cdev.h b/boards/arm/cxd56xx/spresense/include/cxd56_i2cdev.h similarity index 100% rename from boards/arm/spresense/include/cxd56_i2cdev.h rename to boards/arm/cxd56xx/spresense/include/cxd56_i2cdev.h diff --git a/boards/arm/spresense/include/cxd56_power.h b/boards/arm/cxd56xx/spresense/include/cxd56_power.h similarity index 100% rename from boards/arm/spresense/include/cxd56_power.h rename to boards/arm/cxd56xx/spresense/include/cxd56_power.h diff --git a/boards/arm/spresense/include/cxd56_pwm.h b/boards/arm/cxd56xx/spresense/include/cxd56_pwm.h similarity index 100% rename from boards/arm/spresense/include/cxd56_pwm.h rename to boards/arm/cxd56xx/spresense/include/cxd56_pwm.h diff --git a/boards/arm/spresense/include/cxd56_sdcard.h b/boards/arm/cxd56xx/spresense/include/cxd56_sdcard.h similarity index 100% rename from boards/arm/spresense/include/cxd56_sdcard.h rename to boards/arm/cxd56xx/spresense/include/cxd56_sdcard.h diff --git a/boards/arm/spresense/include/cxd56_wdt.h b/boards/arm/cxd56xx/spresense/include/cxd56_wdt.h similarity index 100% rename from boards/arm/spresense/include/cxd56_wdt.h rename to boards/arm/cxd56xx/spresense/include/cxd56_wdt.h diff --git a/boards/arm/spresense/scripts/Make.defs b/boards/arm/cxd56xx/spresense/scripts/Make.defs similarity index 94% rename from boards/arm/spresense/scripts/Make.defs rename to boards/arm/cxd56xx/spresense/scripts/Make.defs index 48a1029b7e1..ef610afefe2 100644 --- a/boards/arm/spresense/scripts/Make.defs +++ b/boards/arm/cxd56xx/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/arm/spresense/scripts/ramconfig.ld b/boards/arm/cxd56xx/spresense/scripts/ramconfig.ld similarity index 100% rename from boards/arm/spresense/scripts/ramconfig.ld rename to boards/arm/cxd56xx/spresense/scripts/ramconfig.ld diff --git a/boards/arm/axoloti/src/.gitignore b/boards/arm/cxd56xx/spresense/src/.gitignore similarity index 100% rename from boards/arm/axoloti/src/.gitignore rename to boards/arm/cxd56xx/spresense/src/.gitignore diff --git a/boards/arm/spresense/src/Makefile b/boards/arm/cxd56xx/spresense/src/Makefile similarity index 100% rename from boards/arm/spresense/src/Makefile rename to boards/arm/cxd56xx/spresense/src/Makefile diff --git a/boards/arm/spresense/src/cxd56_appinit.c b/boards/arm/cxd56xx/spresense/src/cxd56_appinit.c similarity index 100% rename from boards/arm/spresense/src/cxd56_appinit.c rename to boards/arm/cxd56xx/spresense/src/cxd56_appinit.c diff --git a/boards/arm/spresense/src/cxd56_bmi160_i2c.c b/boards/arm/cxd56xx/spresense/src/cxd56_bmi160_i2c.c similarity index 100% rename from boards/arm/spresense/src/cxd56_bmi160_i2c.c rename to boards/arm/cxd56xx/spresense/src/cxd56_bmi160_i2c.c diff --git a/boards/arm/spresense/src/cxd56_boot.c b/boards/arm/cxd56xx/spresense/src/cxd56_boot.c similarity index 100% rename from boards/arm/spresense/src/cxd56_boot.c rename to boards/arm/cxd56xx/spresense/src/cxd56_boot.c diff --git a/boards/arm/spresense/src/cxd56_bringup.c b/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c similarity index 100% rename from boards/arm/spresense/src/cxd56_bringup.c rename to boards/arm/cxd56xx/spresense/src/cxd56_bringup.c diff --git a/boards/arm/spresense/src/cxd56_buttons.c b/boards/arm/cxd56xx/spresense/src/cxd56_buttons.c similarity index 100% rename from boards/arm/spresense/src/cxd56_buttons.c rename to boards/arm/cxd56xx/spresense/src/cxd56_buttons.c diff --git a/boards/arm/spresense/src/cxd56_charger.c b/boards/arm/cxd56xx/spresense/src/cxd56_charger.c similarity index 100% rename from boards/arm/spresense/src/cxd56_charger.c rename to boards/arm/cxd56xx/spresense/src/cxd56_charger.c diff --git a/boards/arm/spresense/src/cxd56_clock.c b/boards/arm/cxd56xx/spresense/src/cxd56_clock.c similarity index 100% rename from boards/arm/spresense/src/cxd56_clock.c rename to boards/arm/cxd56xx/spresense/src/cxd56_clock.c diff --git a/boards/arm/spresense/src/cxd56_composite.c b/boards/arm/cxd56xx/spresense/src/cxd56_composite.c similarity index 100% rename from boards/arm/spresense/src/cxd56_composite.c rename to boards/arm/cxd56xx/spresense/src/cxd56_composite.c diff --git a/boards/arm/spresense/src/cxd56_flash.c b/boards/arm/cxd56xx/spresense/src/cxd56_flash.c similarity index 100% rename from boards/arm/spresense/src/cxd56_flash.c rename to boards/arm/cxd56xx/spresense/src/cxd56_flash.c diff --git a/boards/arm/spresense/src/cxd56_gauge.c b/boards/arm/cxd56xx/spresense/src/cxd56_gauge.c similarity index 100% rename from boards/arm/spresense/src/cxd56_gauge.c rename to boards/arm/cxd56xx/spresense/src/cxd56_gauge.c diff --git a/boards/arm/spresense/src/cxd56_gpioif.c b/boards/arm/cxd56xx/spresense/src/cxd56_gpioif.c similarity index 100% rename from boards/arm/spresense/src/cxd56_gpioif.c rename to boards/arm/cxd56xx/spresense/src/cxd56_gpioif.c diff --git a/boards/arm/spresense/src/cxd56_gs2200m.c b/boards/arm/cxd56xx/spresense/src/cxd56_gs2200m.c similarity index 100% rename from boards/arm/spresense/src/cxd56_gs2200m.c rename to boards/arm/cxd56xx/spresense/src/cxd56_gs2200m.c diff --git a/boards/arm/spresense/src/cxd56_i2cdev.c b/boards/arm/cxd56xx/spresense/src/cxd56_i2cdev.c similarity index 100% rename from boards/arm/spresense/src/cxd56_i2cdev.c rename to boards/arm/cxd56xx/spresense/src/cxd56_i2cdev.c diff --git a/boards/arm/spresense/src/cxd56_ili9340.c b/boards/arm/cxd56xx/spresense/src/cxd56_ili9340.c similarity index 100% rename from boards/arm/spresense/src/cxd56_ili9340.c rename to boards/arm/cxd56xx/spresense/src/cxd56_ili9340.c diff --git a/boards/arm/spresense/src/cxd56_ioctl.c b/boards/arm/cxd56xx/spresense/src/cxd56_ioctl.c similarity index 100% rename from boards/arm/spresense/src/cxd56_ioctl.c rename to boards/arm/cxd56xx/spresense/src/cxd56_ioctl.c diff --git a/boards/arm/spresense/src/cxd56_leds.c b/boards/arm/cxd56xx/spresense/src/cxd56_leds.c similarity index 100% rename from boards/arm/spresense/src/cxd56_leds.c rename to boards/arm/cxd56xx/spresense/src/cxd56_leds.c diff --git a/boards/arm/spresense/src/cxd56_lpm013m091a.c b/boards/arm/cxd56xx/spresense/src/cxd56_lpm013m091a.c similarity index 100% rename from boards/arm/spresense/src/cxd56_lpm013m091a.c rename to boards/arm/cxd56xx/spresense/src/cxd56_lpm013m091a.c diff --git a/boards/arm/spresense/src/cxd56_main.c b/boards/arm/cxd56xx/spresense/src/cxd56_main.c similarity index 100% rename from boards/arm/spresense/src/cxd56_main.c rename to boards/arm/cxd56xx/spresense/src/cxd56_main.c diff --git a/boards/arm/spresense/src/cxd56_netinit.c b/boards/arm/cxd56xx/spresense/src/cxd56_netinit.c similarity index 100% rename from boards/arm/spresense/src/cxd56_netinit.c rename to boards/arm/cxd56xx/spresense/src/cxd56_netinit.c diff --git a/boards/arm/spresense/src/cxd56_ostest.c b/boards/arm/cxd56xx/spresense/src/cxd56_ostest.c similarity index 100% rename from boards/arm/spresense/src/cxd56_ostest.c rename to boards/arm/cxd56xx/spresense/src/cxd56_ostest.c diff --git a/boards/arm/spresense/src/cxd56_power.c b/boards/arm/cxd56xx/spresense/src/cxd56_power.c similarity index 100% rename from boards/arm/spresense/src/cxd56_power.c rename to boards/arm/cxd56xx/spresense/src/cxd56_power.c diff --git a/boards/arm/spresense/src/cxd56_pwm.c b/boards/arm/cxd56xx/spresense/src/cxd56_pwm.c similarity index 100% rename from boards/arm/spresense/src/cxd56_pwm.c rename to boards/arm/cxd56xx/spresense/src/cxd56_pwm.c diff --git a/boards/arm/spresense/src/cxd56_sdcard.c b/boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c similarity index 100% rename from boards/arm/spresense/src/cxd56_sdcard.c rename to boards/arm/cxd56xx/spresense/src/cxd56_sdcard.c diff --git a/boards/arm/spresense/src/cxd56_spi.c b/boards/arm/cxd56xx/spresense/src/cxd56_spi.c similarity index 100% rename from boards/arm/spresense/src/cxd56_spi.c rename to boards/arm/cxd56xx/spresense/src/cxd56_spi.c diff --git a/boards/arm/spresense/src/cxd56_uid.c b/boards/arm/cxd56xx/spresense/src/cxd56_uid.c similarity index 100% rename from boards/arm/spresense/src/cxd56_uid.c rename to boards/arm/cxd56xx/spresense/src/cxd56_uid.c diff --git a/boards/arm/spresense/src/cxd56_usbmsc.c b/boards/arm/cxd56xx/spresense/src/cxd56_usbmsc.c similarity index 100% rename from boards/arm/spresense/src/cxd56_usbmsc.c rename to boards/arm/cxd56xx/spresense/src/cxd56_usbmsc.c diff --git a/boards/arm/spresense/src/cxd56_userleds.c b/boards/arm/cxd56xx/spresense/src/cxd56_userleds.c similarity index 100% rename from boards/arm/spresense/src/cxd56_userleds.c rename to boards/arm/cxd56xx/spresense/src/cxd56_userleds.c diff --git a/boards/arm/spresense/src/spresense.h b/boards/arm/cxd56xx/spresense/src/spresense.h similarity index 100% rename from boards/arm/spresense/src/spresense.h rename to boards/arm/cxd56xx/spresense/src/spresense.h diff --git a/boards/arm/ntosd-dm320/Kconfig b/boards/arm/dm320/ntosd-dm320/Kconfig similarity index 100% rename from boards/arm/ntosd-dm320/Kconfig rename to boards/arm/dm320/ntosd-dm320/Kconfig diff --git a/boards/arm/ntosd-dm320/README.txt b/boards/arm/dm320/ntosd-dm320/README.txt similarity index 100% rename from boards/arm/ntosd-dm320/README.txt rename to boards/arm/dm320/ntosd-dm320/README.txt diff --git a/boards/arm/ntosd-dm320/configs/nettest/defconfig b/boards/arm/dm320/ntosd-dm320/configs/nettest/defconfig similarity index 98% rename from boards/arm/ntosd-dm320/configs/nettest/defconfig rename to boards/arm/dm320/ntosd-dm320/configs/nettest/defconfig index 54a25e2ead4..ddb1c91bcd4 100644 --- a/boards/arm/ntosd-dm320/configs/nettest/defconfig +++ b/boards/arm/dm320/ntosd-dm320/configs/nettest/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="ntosd-dm320" CONFIG_ARCH_BOARD_NTOSD_DM320=y +CONFIG_ARCH_CHIP="dm320" CONFIG_ARCH_CHIP_DM320=y CONFIG_ARM_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_LOOPSPERMSEC=16945 diff --git a/boards/arm/ntosd-dm320/configs/nsh/defconfig b/boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig similarity index 98% rename from boards/arm/ntosd-dm320/configs/nsh/defconfig rename to boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig index 5af8c11f76c..d17c6fc9402 100644 --- a/boards/arm/ntosd-dm320/configs/nsh/defconfig +++ b/boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="ntosd-dm320" CONFIG_ARCH_BOARD_NTOSD_DM320=y +CONFIG_ARCH_CHIP="dm320" CONFIG_ARCH_CHIP_DM320=y CONFIG_ARM_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_LOOPSPERMSEC=16945 diff --git a/boards/arm/ntosd-dm320/configs/poll/defconfig b/boards/arm/dm320/ntosd-dm320/configs/poll/defconfig similarity index 98% rename from boards/arm/ntosd-dm320/configs/poll/defconfig rename to boards/arm/dm320/ntosd-dm320/configs/poll/defconfig index f5b511e321e..672eae2bf63 100644 --- a/boards/arm/ntosd-dm320/configs/poll/defconfig +++ b/boards/arm/dm320/ntosd-dm320/configs/poll/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="ntosd-dm320" CONFIG_ARCH_BOARD_NTOSD_DM320=y +CONFIG_ARCH_CHIP="dm320" CONFIG_ARCH_CHIP_DM320=y CONFIG_ARM_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_LOOPSPERMSEC=16945 diff --git a/boards/arm/ntosd-dm320/configs/udp/defconfig b/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig similarity index 98% rename from boards/arm/ntosd-dm320/configs/udp/defconfig rename to boards/arm/dm320/ntosd-dm320/configs/udp/defconfig index 81fdc522df1..cbf1002b21d 100644 --- a/boards/arm/ntosd-dm320/configs/udp/defconfig +++ b/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="ntosd-dm320" CONFIG_ARCH_BOARD_NTOSD_DM320=y +CONFIG_ARCH_CHIP="dm320" CONFIG_ARCH_CHIP_DM320=y CONFIG_ARM_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_LOOPSPERMSEC=16945 diff --git a/boards/arm/ntosd-dm320/configs/webserver/defconfig b/boards/arm/dm320/ntosd-dm320/configs/webserver/defconfig similarity index 98% rename from boards/arm/ntosd-dm320/configs/webserver/defconfig rename to boards/arm/dm320/ntosd-dm320/configs/webserver/defconfig index 411cf460830..cc3910a862f 100644 --- a/boards/arm/ntosd-dm320/configs/webserver/defconfig +++ b/boards/arm/dm320/ntosd-dm320/configs/webserver/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="ntosd-dm320" CONFIG_ARCH_BOARD_NTOSD_DM320=y +CONFIG_ARCH_CHIP="dm320" CONFIG_ARCH_CHIP_DM320=y CONFIG_ARM_TOOLCHAIN_CODESOURCERYL=y CONFIG_BOARD_LOOPSPERMSEC=16945 diff --git a/boards/arm/ntosd-dm320/doc/README.txt b/boards/arm/dm320/ntosd-dm320/doc/README.txt similarity index 100% rename from boards/arm/ntosd-dm320/doc/README.txt rename to boards/arm/dm320/ntosd-dm320/doc/README.txt diff --git a/boards/arm/ntosd-dm320/include/board.h b/boards/arm/dm320/ntosd-dm320/include/board.h similarity index 100% rename from boards/arm/ntosd-dm320/include/board.h rename to boards/arm/dm320/ntosd-dm320/include/board.h diff --git a/boards/arm/ntosd-dm320/scripts/Make.defs b/boards/arm/dm320/ntosd-dm320/scripts/Make.defs similarity index 96% rename from boards/arm/ntosd-dm320/scripts/Make.defs rename to boards/arm/dm320/ntosd-dm320/scripts/Make.defs index d06a6c942ae..319a375e8a6 100644 --- a/boards/arm/ntosd-dm320/scripts/Make.defs +++ b/boards/arm/dm320/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)/$(CONFIG_ARCH_BOARD)/scripts/sdram.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/sdram.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/sdram.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/ntosd-dm320/scripts/sdram.ld b/boards/arm/dm320/ntosd-dm320/scripts/sdram.ld similarity index 100% rename from boards/arm/ntosd-dm320/scripts/sdram.ld rename to boards/arm/dm320/ntosd-dm320/scripts/sdram.ld diff --git a/boards/arm/b-l475e-iot01a/src/.gitignore b/boards/arm/dm320/ntosd-dm320/src/.gitignore similarity index 100% rename from boards/arm/b-l475e-iot01a/src/.gitignore rename to boards/arm/dm320/ntosd-dm320/src/.gitignore diff --git a/boards/arm/ntosd-dm320/src/Makefile b/boards/arm/dm320/ntosd-dm320/src/Makefile similarity index 100% rename from boards/arm/ntosd-dm320/src/Makefile rename to boards/arm/dm320/ntosd-dm320/src/Makefile diff --git a/boards/arm/ntosd-dm320/src/dm320_leds.c b/boards/arm/dm320/ntosd-dm320/src/dm320_leds.c similarity index 100% rename from boards/arm/ntosd-dm320/src/dm320_leds.c rename to boards/arm/dm320/ntosd-dm320/src/dm320_leds.c diff --git a/boards/arm/ntosd-dm320/src/dm320_network.c b/boards/arm/dm320/ntosd-dm320/src/dm320_network.c similarity index 100% rename from boards/arm/ntosd-dm320/src/dm320_network.c rename to boards/arm/dm320/ntosd-dm320/src/dm320_network.c diff --git a/boards/arm/efm32-g8xx-stk/Kconfig b/boards/arm/efm32/efm32-g8xx-stk/Kconfig similarity index 100% rename from boards/arm/efm32-g8xx-stk/Kconfig rename to boards/arm/efm32/efm32-g8xx-stk/Kconfig diff --git a/boards/arm/efm32-g8xx-stk/README.txt b/boards/arm/efm32/efm32-g8xx-stk/README.txt similarity index 100% rename from boards/arm/efm32-g8xx-stk/README.txt rename to boards/arm/efm32/efm32-g8xx-stk/README.txt diff --git a/boards/arm/efm32-g8xx-stk/configs/nsh/defconfig b/boards/arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig similarity index 98% rename from boards/arm/efm32-g8xx-stk/configs/nsh/defconfig rename to boards/arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig index 70bceb4a88d..00babc822ba 100644 --- a/boards/arm/efm32-g8xx-stk/configs/nsh/defconfig +++ b/boards/arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="efm32-g8xx-stk" CONFIG_ARCH_BOARD_EFM32G8XXSTK=y +CONFIG_ARCH_CHIP="efm32" CONFIG_ARCH_CHIP_EFM32=y CONFIG_ARCH_CHIP_EFM32G890F128=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/efm32-g8xx-stk/include/board.h b/boards/arm/efm32/efm32-g8xx-stk/include/board.h similarity index 97% rename from boards/arm/efm32-g8xx-stk/include/board.h rename to boards/arm/efm32/efm32-g8xx-stk/include/board.h index 55030328093..66b88bb3094 100644 --- a/boards/arm/efm32-g8xx-stk/include/board.h +++ b/boards/arm/efm32/efm32-g8xx-stk/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/efm32-g8xx-stk/include/board.h + * boards/arm/efm32/efm32-g8xx-stk/include/board.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_EFM32_G8XX_STK_INCLUDE_BOARD_H -#define __BOARDS_ARM_EFM32_G8XX_STK_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_EFM32_EFM32_G8XX_STK_INCLUDE_BOARD_H +#define __BOARDS_ARM_EFM32_EFM32_G8XX_STK_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -224,4 +224,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __BOARDS_ARM_EFM32_G8XX_STK_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_EFM32_EFM32_G8XX_STK_INCLUDE_BOARD_H */ diff --git a/boards/arm/efm32-g8xx-stk/scripts/Make.defs b/boards/arm/efm32/efm32-g8xx-stk/scripts/Make.defs similarity index 94% rename from boards/arm/efm32-g8xx-stk/scripts/Make.defs rename to boards/arm/efm32/efm32-g8xx-stk/scripts/Make.defs index d18c402a1d9..9eca910892a 100644 --- a/boards/arm/efm32-g8xx-stk/scripts/Make.defs +++ b/boards/arm/efm32/efm32-g8xx-stk/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/efm32-g8xx-stk/scripts/Make.defs +# boards/arm/efm32/efm32-g8xx-stk/scripts/Make.defs # # Copyright (C) 2014m 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 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/efm32-g8xx-stk/scripts/efm32-g8xx-stk.ld b/boards/arm/efm32/efm32-g8xx-stk/scripts/efm32-g8xx-stk.ld similarity index 98% rename from boards/arm/efm32-g8xx-stk/scripts/efm32-g8xx-stk.ld rename to boards/arm/efm32/efm32-g8xx-stk/scripts/efm32-g8xx-stk.ld index 4caa3ef9ce4..72342c77f2c 100644 --- a/boards/arm/efm32-g8xx-stk/scripts/efm32-g8xx-stk.ld +++ b/boards/arm/efm32/efm32-g8xx-stk/scripts/efm32-g8xx-stk.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/efm32-g8xx-stk/scripts/efm32-g8xx-stk.ld + * boards/arm/efm32-g8xx-stk/scripts/efm32-g8xx-stk.ld * * Copyright (C) 2012, 2014, 2017 Gregory Nutt. All rights reserved. * diff --git a/boards/arm/bambino-200e/src/.gitignore b/boards/arm/efm32/efm32-g8xx-stk/src/.gitignore similarity index 100% rename from boards/arm/bambino-200e/src/.gitignore rename to boards/arm/efm32/efm32-g8xx-stk/src/.gitignore diff --git a/boards/arm/efm32-g8xx-stk/src/Makefile b/boards/arm/efm32/efm32-g8xx-stk/src/Makefile similarity index 97% rename from boards/arm/efm32-g8xx-stk/src/Makefile rename to boards/arm/efm32/efm32-g8xx-stk/src/Makefile index a35e772d708..20596265385 100644 --- a/boards/arm/efm32-g8xx-stk/src/Makefile +++ b/boards/arm/efm32/efm32-g8xx-stk/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/efm32-g8xx-stk/src/Makefile +# boards/arm/efm32/efm32-g8xx-stk/src/Makefile # # Copyright (C) 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/efm32-g8xx-stk/src/efm32-g8xx-stk.h b/boards/arm/efm32/efm32-g8xx-stk/src/efm32-g8xx-stk.h similarity index 94% rename from boards/arm/efm32-g8xx-stk/src/efm32-g8xx-stk.h rename to boards/arm/efm32/efm32-g8xx-stk/src/efm32-g8xx-stk.h index 8ebe3d2b93c..4cfca0c925c 100644 --- a/boards/arm/efm32-g8xx-stk/src/efm32-g8xx-stk.h +++ b/boards/arm/efm32/efm32-g8xx-stk/src/efm32-g8xx-stk.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/efm32-g8xx-stk/src/efm32-g8xx-stk.h + * boards/arm/efm32/efm32-g8xx-stk/src/efm32-g8xx-stk.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_EFM32_G8XX_STK_SRC_EFM32_G8XX_STK_H -#define __BOARDS_ARM_EFM32_G8XX_STK_SRC_EFM32_G8XX_STK_H +#ifndef __BOARDS_ARM_EFM32_EFM32_G8XX_STK_SRC_EFM32_G8XX_STK_H +#define __BOARDS_ARM_EFM32_EFM32_G8XX_STK_SRC_EFM32_G8XX_STK_H /**************************************************************************** * Included Files @@ -91,4 +91,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __BOARDS_ARM_EFM32_G8XX_STK_SRC_EFM32_G8XX_STK_H */ +#endif /* __BOARDS_ARM_EFM32_EFM32_G8XX_STK_SRC_EFM32_G8XX_STK_H */ diff --git a/boards/arm/efm32-g8xx-stk/src/efm32_autoleds.c b/boards/arm/efm32/efm32-g8xx-stk/src/efm32_autoleds.c similarity index 99% rename from boards/arm/efm32-g8xx-stk/src/efm32_autoleds.c rename to boards/arm/efm32/efm32-g8xx-stk/src/efm32_autoleds.c index 0cf5483e679..84f08c85832 100644 --- a/boards/arm/efm32-g8xx-stk/src/efm32_autoleds.c +++ b/boards/arm/efm32/efm32-g8xx-stk/src/efm32_autoleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/efm32-g8xx-stk/src/efm32_autoleds.c + * boards/arm/efm32/efm32-g8xx-stk/src/efm32_autoleds.c * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/efm32-g8xx-stk/src/efm32_boot.c b/boards/arm/efm32/efm32-g8xx-stk/src/efm32_boot.c similarity index 98% rename from boards/arm/efm32-g8xx-stk/src/efm32_boot.c rename to boards/arm/efm32/efm32-g8xx-stk/src/efm32_boot.c index 4497ad6f335..fffbd184dc2 100644 --- a/boards/arm/efm32-g8xx-stk/src/efm32_boot.c +++ b/boards/arm/efm32/efm32-g8xx-stk/src/efm32_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/efm32-g8xx-stk/src/efm32_boot.c + * boards/arm/efm32/efm32-g8xx-stk/src/efm32_boot.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/efm32-g8xx-stk/src/efm32_userleds.c b/boards/arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c similarity index 99% rename from boards/arm/efm32-g8xx-stk/src/efm32_userleds.c rename to boards/arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c index 6b97bc71e3c..13a23ce71fb 100644 --- a/boards/arm/efm32-g8xx-stk/src/efm32_userleds.c +++ b/boards/arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/efm32-g8xx-stk/src/efm32_userleds.c + * boards/arm/efm32/efm32-g8xx-stk/src/efm32_userleds.c * * Copyright (C) 2014-2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/efm32gg-stk3700/Kconfig b/boards/arm/efm32/efm32gg-stk3700/Kconfig similarity index 100% rename from boards/arm/efm32gg-stk3700/Kconfig rename to boards/arm/efm32/efm32gg-stk3700/Kconfig diff --git a/boards/arm/efm32gg-stk3700/README.txt b/boards/arm/efm32/efm32gg-stk3700/README.txt similarity index 100% rename from boards/arm/efm32gg-stk3700/README.txt rename to boards/arm/efm32/efm32gg-stk3700/README.txt diff --git a/boards/arm/efm32gg-stk3700/configs/nsh/defconfig b/boards/arm/efm32/efm32gg-stk3700/configs/nsh/defconfig similarity index 98% rename from boards/arm/efm32gg-stk3700/configs/nsh/defconfig rename to boards/arm/efm32/efm32gg-stk3700/configs/nsh/defconfig index 27e5a932b99..cae9cbffa57 100644 --- a/boards/arm/efm32gg-stk3700/configs/nsh/defconfig +++ b/boards/arm/efm32/efm32gg-stk3700/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="efm32gg-stk3700" CONFIG_ARCH_BOARD_EFM32GG_STK3700=y +CONFIG_ARCH_CHIP="efm32" CONFIG_ARCH_CHIP_EFM32=y CONFIG_ARCH_CHIP_EFM32GG990F1024=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/efm32gg-stk3700/include/board.h b/boards/arm/efm32/efm32gg-stk3700/include/board.h similarity index 98% rename from boards/arm/efm32gg-stk3700/include/board.h rename to boards/arm/efm32/efm32gg-stk3700/include/board.h index 0d57da38b26..378bbcb0c7a 100644 --- a/boards/arm/efm32gg-stk3700/include/board.h +++ b/boards/arm/efm32/efm32gg-stk3700/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/efm32gg-stk3700/include/board.h + * boards/arm/efm32/efm32gg-stk3700/include/board.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_EFM32GG_STK3700_INCLUDE_BOARD_H -#define __BOARDS_ARM_EFM32GG_STK3700_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_EFM32_EFM32GG_STK3700_INCLUDE_BOARD_H +#define __BOARDS_ARM_EFM32_EFM32GG_STK3700_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -269,4 +269,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __BOARDS_ARM_EFM32GG_STK3700_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_EFM32_EFM32GG_STK3700_INCLUDE_BOARD_H */ diff --git a/boards/arm/efm32gg-stk3700/scripts/Make.defs b/boards/arm/efm32/efm32gg-stk3700/scripts/Make.defs similarity index 95% rename from boards/arm/efm32gg-stk3700/scripts/Make.defs rename to boards/arm/efm32/efm32gg-stk3700/scripts/Make.defs index 0e29feb4775..3ba2c5fe9ea 100644 --- a/boards/arm/efm32gg-stk3700/scripts/Make.defs +++ b/boards/arm/efm32/efm32gg-stk3700/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/efm32-g8xx-stk/nsh/Make.defs +# boards/arm/efm32/efm32-g8xx-stk/nsh/Make.defs # # Copyright (C) 2014 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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/efm32gg-stk3700/scripts/ld.script b/boards/arm/efm32/efm32gg-stk3700/scripts/ld.script similarity index 98% rename from boards/arm/efm32gg-stk3700/scripts/ld.script rename to boards/arm/efm32/efm32gg-stk3700/scripts/ld.script index 819258d203c..b2f36b8d718 100644 --- a/boards/arm/efm32gg-stk3700/scripts/ld.script +++ b/boards/arm/efm32/efm32gg-stk3700/scripts/ld.script @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/efm32gg-stk3700/scripts/ld.script + * boards/arm/efm32gg-stk3700/scripts/ld.script * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * diff --git a/boards/arm/c5471evm/src/.gitignore b/boards/arm/efm32/efm32gg-stk3700/src/.gitignore similarity index 100% rename from boards/arm/c5471evm/src/.gitignore rename to boards/arm/efm32/efm32gg-stk3700/src/.gitignore diff --git a/boards/arm/efm32gg-stk3700/src/Makefile b/boards/arm/efm32/efm32gg-stk3700/src/Makefile similarity index 97% rename from boards/arm/efm32gg-stk3700/src/Makefile rename to boards/arm/efm32/efm32gg-stk3700/src/Makefile index 6c70d4b6e9f..817c28a0868 100644 --- a/boards/arm/efm32gg-stk3700/src/Makefile +++ b/boards/arm/efm32/efm32gg-stk3700/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/efm32gg-stk3700/src/Makefile +# boards/arm/efm32/efm32gg-stk3700/src/Makefile # # Copyright (C) 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/efm32gg-stk3700/src/efm32_autoleds.c b/boards/arm/efm32/efm32gg-stk3700/src/efm32_autoleds.c similarity index 98% rename from boards/arm/efm32gg-stk3700/src/efm32_autoleds.c rename to boards/arm/efm32/efm32gg-stk3700/src/efm32_autoleds.c index 7728f8c8119..0566f828fa4 100644 --- a/boards/arm/efm32gg-stk3700/src/efm32_autoleds.c +++ b/boards/arm/efm32/efm32gg-stk3700/src/efm32_autoleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/efm32gg-stk3700/include/efm32_autoleds.c + * boards/arm/efm32/efm32gg-stk3700/include/efm32_autoleds.c * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/efm32gg-stk3700/src/efm32_boot.c b/boards/arm/efm32/efm32gg-stk3700/src/efm32_boot.c similarity index 98% rename from boards/arm/efm32gg-stk3700/src/efm32_boot.c rename to boards/arm/efm32/efm32gg-stk3700/src/efm32_boot.c index 8ec76faa4ae..078939b9981 100644 --- a/boards/arm/efm32gg-stk3700/src/efm32_boot.c +++ b/boards/arm/efm32/efm32gg-stk3700/src/efm32_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/efm32gg-stk3700/src/efm32_boot.c + * boards/arm/efm32/efm32gg-stk3700/src/efm32_boot.c * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/efm32gg-stk3700/src/efm32_userleds.c b/boards/arm/efm32/efm32gg-stk3700/src/efm32_userleds.c similarity index 98% rename from boards/arm/efm32gg-stk3700/src/efm32_userleds.c rename to boards/arm/efm32/efm32gg-stk3700/src/efm32_userleds.c index bc0da13a231..9847d792ab8 100644 --- a/boards/arm/efm32gg-stk3700/src/efm32_userleds.c +++ b/boards/arm/efm32/efm32gg-stk3700/src/efm32_userleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/efm32gg-stk3700/include/efm32_userleds.c + * boards/arm/efm32/efm32gg-stk3700/include/efm32_userleds.c * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/efm32gg-stk3700/src/efm32gg-stk3700.h b/boards/arm/efm32/efm32gg-stk3700/src/efm32gg-stk3700.h similarity index 93% rename from boards/arm/efm32gg-stk3700/src/efm32gg-stk3700.h rename to boards/arm/efm32/efm32gg-stk3700/src/efm32gg-stk3700.h index b9a7995285e..237b7bd7092 100644 --- a/boards/arm/efm32gg-stk3700/src/efm32gg-stk3700.h +++ b/boards/arm/efm32/efm32gg-stk3700/src/efm32gg-stk3700.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/efm32gg-stk3700/include/efm32gg-stk3700.h + * boards/arm/efm32/efm32gg-stk3700/include/efm32gg-stk3700.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_EFM32GG_STK3700_SRC_EFM32GG_STK3700_H -#define __BOARDS_ARM_EFM32GG_STK3700_SRC_EFM32GG_STK3700_H +#ifndef __BOARDS_ARM_EFM32_EFM32GG_STK3700_SRC_EFM32GG_STK3700_H +#define __BOARDS_ARM_EFM32_EFM32GG_STK3700_SRC_EFM32GG_STK3700_H /**************************************************************************** * Included Files @@ -89,4 +89,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __BOARDS_ARM_EFM32GG_STK3700_SRC_EFM32GG_STK3700_H */ +#endif /* __BOARDS_ARM_EFM32_EFM32GG_STK3700_SRC_EFM32GG_STK3700_H */ diff --git a/boards/arm/olimex-efm32g880f128-stk/Kconfig b/boards/arm/efm32/olimex-efm32g880f128-stk/Kconfig similarity index 100% rename from boards/arm/olimex-efm32g880f128-stk/Kconfig rename to boards/arm/efm32/olimex-efm32g880f128-stk/Kconfig diff --git a/boards/arm/olimex-efm32g880f128-stk/README.txt b/boards/arm/efm32/olimex-efm32g880f128-stk/README.txt similarity index 100% rename from boards/arm/olimex-efm32g880f128-stk/README.txt rename to boards/arm/efm32/olimex-efm32g880f128-stk/README.txt diff --git a/boards/arm/olimex-efm32g880f128-stk/configs/nsh/defconfig b/boards/arm/efm32/olimex-efm32g880f128-stk/configs/nsh/defconfig similarity index 98% rename from boards/arm/olimex-efm32g880f128-stk/configs/nsh/defconfig rename to boards/arm/efm32/olimex-efm32g880f128-stk/configs/nsh/defconfig index a69a1451502..b33a64062c9 100644 --- a/boards/arm/olimex-efm32g880f128-stk/configs/nsh/defconfig +++ b/boards/arm/efm32/olimex-efm32g880f128-stk/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-efm32g880f128-stk" CONFIG_ARCH_BOARD_OLIMEX_EFM32G880F128_STK=y +CONFIG_ARCH_CHIP="efm32" CONFIG_ARCH_CHIP_EFM32=y CONFIG_ARCH_CHIP_EFM32G880F128=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-efm32g880f128-stk/include/board.h b/boards/arm/efm32/olimex-efm32g880f128-stk/include/board.h similarity index 97% rename from boards/arm/olimex-efm32g880f128-stk/include/board.h rename to boards/arm/efm32/olimex-efm32g880f128-stk/include/board.h index c65f5ab88f3..ff86a07e959 100644 --- a/boards/arm/olimex-efm32g880f128-stk/include/board.h +++ b/boards/arm/efm32/olimex-efm32g880f128-stk/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/olimex-efm32g880f128-stk/include/board.h + * boards/arm/efm32/olimex-efm32g880f128-stk/include/board.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_OLIMEX_EFM32G880F128_STK_INCLUDE_BOARD_H -#define __BOARDS_ARM_OLIMEX_EFM32G880F128_STK_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_EFM32_OLIMEX_EFM32G880F128_STK_INCLUDE_BOARD_H +#define __BOARDS_ARM_EFM32_OLIMEX_EFM32G880F128_STK_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -255,4 +255,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __BOARDS_ARM_EFM32_DK3650_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_EFM32_OLIMEX_EFM32G880F128_STK_INCLUDE_BOARD_H */ diff --git a/boards/arm/olimex-efm32g880f128-stk/scripts/Make.defs b/boards/arm/efm32/olimex-efm32g880f128-stk/scripts/Make.defs similarity index 94% rename from boards/arm/olimex-efm32g880f128-stk/scripts/Make.defs rename to boards/arm/efm32/olimex-efm32g880f128-stk/scripts/Make.defs index 39f57650a83..89df516521a 100644 --- a/boards/arm/olimex-efm32g880f128-stk/scripts/Make.defs +++ b/boards/arm/efm32/olimex-efm32g880f128-stk/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/olimex-efm32g880f128-stk/scripts/Make.defs +# boards/arm/efm32/olimex-efm32g880f128-stk/scripts/Make.defs # # Copyright (C) 2014, 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 = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/olimex-efm32g880f128-stk/scripts/ld.script b/boards/arm/efm32/olimex-efm32g880f128-stk/scripts/ld.script similarity index 100% rename from boards/arm/olimex-efm32g880f128-stk/scripts/ld.script rename to boards/arm/efm32/olimex-efm32g880f128-stk/scripts/ld.script diff --git a/boards/arm/olimex-efm32g880f128-stk/src/Makefile b/boards/arm/efm32/olimex-efm32g880f128-stk/src/Makefile similarity index 97% rename from boards/arm/olimex-efm32g880f128-stk/src/Makefile rename to boards/arm/efm32/olimex-efm32g880f128-stk/src/Makefile index 70a1c2f4f8c..0af374e14b5 100644 --- a/boards/arm/olimex-efm32g880f128-stk/src/Makefile +++ b/boards/arm/efm32/olimex-efm32g880f128-stk/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/olimex-efm32g880f128-stk/src/Makefile +# boards/arm/efm32/olimex-efm32g880f128-stk/src/Makefile # # Copyright (C) 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/olimex-efm32g880f128-stk/src/efm32_boot.c b/boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32_boot.c similarity index 98% rename from boards/arm/olimex-efm32g880f128-stk/src/efm32_boot.c rename to boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32_boot.c index 304db5b602e..2313b0d6a61 100644 --- a/boards/arm/olimex-efm32g880f128-stk/src/efm32_boot.c +++ b/boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/olimex-efm32g880f128-stk/src/efm32_boot.c + * boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32_boot.c * * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/olimex-efm32g880f128-stk/src/efm32_buttons.c b/boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32_buttons.c similarity index 99% rename from boards/arm/olimex-efm32g880f128-stk/src/efm32_buttons.c rename to boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32_buttons.c index 8d7fa00ca3f..040bdecbf2e 100644 --- a/boards/arm/olimex-efm32g880f128-stk/src/efm32_buttons.c +++ b/boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/olimex-efm32g880f128-stk/src/efm32_buttons.c + * boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32_buttons.c * * Copyright (C) 2014-2015, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/olimex-efm32g880f128-stk/src/efm32g880f128-stk.h b/boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32g880f128-stk.h similarity index 92% rename from boards/arm/olimex-efm32g880f128-stk/src/efm32g880f128-stk.h rename to boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32g880f128-stk.h index 624c7d991d4..815fc0fa940 100644 --- a/boards/arm/olimex-efm32g880f128-stk/src/efm32g880f128-stk.h +++ b/boards/arm/efm32/olimex-efm32g880f128-stk/src/efm32g880f128-stk.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/olimex-efm32g880f128-stk/src/efm32g880f128-stk.h + * boards/arm/emf32/olimex-efm32g880f128-stk/src/efm32g880f128-stk.h * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_OLIMEX_EFM32G880F128_STK_SRC_EFM32G880F128_STK_H -#define __BOARDS_ARM_OLIMEX_EFM32G880F128_STK_SRC_EFM32G880F128_STK_H +#ifndef __BOARDS_ARM_EFM32_OLIMEX_EFM32G880F128_STK_SRC_EFM32G880F128_STK_H +#define __BOARDS_ARM_EFM32_OLIMEX_EFM32G880F128_STK_SRC_EFM32G880F128_STK_H /**************************************************************************** * Included Files @@ -83,4 +83,4 @@ * Public Function Prototypes ****************************************************************************/ -#endif /* __BOARDS_ARM_EFM32_DK3650_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_EFM32_OLIMEX_EFM32G880F128_STK_SRC_EFM32G880F128_STK_H */ diff --git a/boards/arm/sabre-6quad/Kconfig b/boards/arm/imx6/sabre-6quad/Kconfig similarity index 100% rename from boards/arm/sabre-6quad/Kconfig rename to boards/arm/imx6/sabre-6quad/Kconfig diff --git a/boards/arm/sabre-6quad/README.txt b/boards/arm/imx6/sabre-6quad/README.txt similarity index 100% rename from boards/arm/sabre-6quad/README.txt rename to boards/arm/imx6/sabre-6quad/README.txt diff --git a/boards/arm/sabre-6quad/configs/nsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig similarity index 98% rename from boards/arm/sabre-6quad/configs/nsh/defconfig rename to boards/arm/imx6/sabre-6quad/configs/nsh/defconfig index d572d70d671..b15becbb510 100644 --- a/boards/arm/sabre-6quad/configs/nsh/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sabre-6quad" CONFIG_ARCH_BOARD_SABRE_6QUAD=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="imx6" CONFIG_ARCH_CHIP_IMX6=y CONFIG_ARCH_CHIP_IMX6_6QUAD=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/sabre-6quad/configs/smp/defconfig b/boards/arm/imx6/sabre-6quad/configs/smp/defconfig similarity index 98% rename from boards/arm/sabre-6quad/configs/smp/defconfig rename to boards/arm/imx6/sabre-6quad/configs/smp/defconfig index a7ae1a69d0e..8c66a7693b9 100644 --- a/boards/arm/sabre-6quad/configs/smp/defconfig +++ b/boards/arm/imx6/sabre-6quad/configs/smp/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sabre-6quad" CONFIG_ARCH_BOARD_SABRE_6QUAD=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="imx6" CONFIG_ARCH_CHIP_IMX6=y CONFIG_ARCH_CHIP_IMX6_6QUAD=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/sabre-6quad/include/board.h b/boards/arm/imx6/sabre-6quad/include/board.h similarity index 96% rename from boards/arm/sabre-6quad/include/board.h rename to boards/arm/imx6/sabre-6quad/include/board.h index 6d249c638d5..065679fa72a 100644 --- a/boards/arm/sabre-6quad/include/board.h +++ b/boards/arm/imx6/sabre-6quad/include/board.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/sabre-6quad/include/board.h + * boards/arm/imx6/sabre-6quad/include/board.h * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_ARM_SABRE_6QUAD_INCLUDE_BOARD_H -#define __BOARDS_ARM_SABRE_6QUAD_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_IMX6_SABRE_6QUAD_INCLUDE_BOARD_H +#define __BOARDS_ARM_IMX6_SABRE_6QUAD_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -163,4 +163,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_SABRE_6QUAD_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_IMX6_SABRE_6QUAD_INCLUDE_BOARD_H */ diff --git a/boards/arm/sabre-6quad/include/board_memorymap.h b/boards/arm/imx6/sabre-6quad/include/board_memorymap.h similarity index 91% rename from boards/arm/sabre-6quad/include/board_memorymap.h rename to boards/arm/imx6/sabre-6quad/include/board_memorymap.h index ed4604724f3..1aacbccfaa5 100644 --- a/boards/arm/sabre-6quad/include/board_memorymap.h +++ b/boards/arm/imx6/sabre-6quad/include/board_memorymap.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/sabr-6quad/include/board_memorymap.h + * boards/arm/imx6/sabr-6quad/include/board_memorymap.h * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_ARM_SABRE_6QUAD_INCLUDE_BOARD_MEMORYMAP_H -#define __BOARDS_ARM_SABRE_6QUAD_INCLUDE_BOARD_MEMORYMAP_H +#ifndef __BOARDS_ARM_IMX6_SABRE_6QUAD_INCLUDE_BOARD_MEMORYMAP_H +#define __BOARDS_ARM_IMX6_SABRE_6QUAD_INCLUDE_BOARD_MEMORYMAP_H /************************************************************************************ * Included Files @@ -71,4 +71,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_SABRE_6QUAD_INCLUDE_BOARD_MEMORYMAP_H */ +#endif /* __BOARDS_ARM_IMX6_SABRE_6QUAD_INCLUDE_BOARD_MEMORYMAP_H */ diff --git a/boards/arm/sabre-6quad/scripts/Make.defs b/boards/arm/imx6/sabre-6quad/scripts/Make.defs similarity index 95% rename from boards/arm/sabre-6quad/scripts/Make.defs rename to boards/arm/imx6/sabre-6quad/scripts/Make.defs index 70379b2e1d1..7429185df28 100644 --- a/boards/arm/sabre-6quad/scripts/Make.defs +++ b/boards/arm/imx6/sabre-6quad/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/sabre-6quad/scripts/Make.defs +# boards/arm/imx6/sabre-6quad/scripts/Make.defs # # Copyright (C) 2016-2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/sabre-6quad/scripts/dramboot.ld b/boards/arm/imx6/sabre-6quad/scripts/dramboot.ld similarity index 98% rename from boards/arm/sabre-6quad/scripts/dramboot.ld rename to boards/arm/imx6/sabre-6quad/scripts/dramboot.ld index 7005b959185..a1e6d1ea0ac 100644 --- a/boards/arm/sabre-6quad/scripts/dramboot.ld +++ b/boards/arm/imx6/sabre-6quad/scripts/dramboot.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/sabre-6quad/scripts/dramboot.ld + * boards/arm/imx6/sabre-6quad/scripts/dramboot.ld * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/sabre-6quad/src/Makefile b/boards/arm/imx6/sabre-6quad/src/Makefile similarity index 97% rename from boards/arm/sabre-6quad/src/Makefile rename to boards/arm/imx6/sabre-6quad/src/Makefile index a897e1b25ba..0d9bb2c830d 100644 --- a/boards/arm/sabre-6quad/src/Makefile +++ b/boards/arm/imx6/sabre-6quad/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/sabre-6quad/src/Makefile +# boards/arm/imx6/sabre-6quad/src/Makefile # # Copyright (C) 2016 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/sabre-6quad/src/imx_appinit.c b/boards/arm/imx6/sabre-6quad/src/imx_appinit.c similarity index 98% rename from boards/arm/sabre-6quad/src/imx_appinit.c rename to boards/arm/imx6/sabre-6quad/src/imx_appinit.c index 602664f9506..c4405ca4830 100644 --- a/boards/arm/sabre-6quad/src/imx_appinit.c +++ b/boards/arm/imx6/sabre-6quad/src/imx_appinit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/sabre-6quad/src/imx_appinit.c + * config/arm/imx6/sabre-6quad/src/imx_appinit.c * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/sabre-6quad/src/imx_autoleds.c b/boards/arm/imx6/sabre-6quad/src/imx_autoleds.c similarity index 98% rename from boards/arm/sabre-6quad/src/imx_autoleds.c rename to boards/arm/imx6/sabre-6quad/src/imx_autoleds.c index 40fa61eae92..a3d268278fd 100644 --- a/boards/arm/sabre-6quad/src/imx_autoleds.c +++ b/boards/arm/imx6/sabre-6quad/src/imx_autoleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/sabre-6quad/include/imx_autoleds.c + * boards/arm/imx6/sabre-6quad/include/imx_autoleds.c * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/sabre-6quad/src/imx_boardinit.c b/boards/arm/imx6/sabre-6quad/src/imx_boardinit.c similarity index 99% rename from boards/arm/sabre-6quad/src/imx_boardinit.c rename to boards/arm/imx6/sabre-6quad/src/imx_boardinit.c index 44af90aea24..83b90171713 100644 --- a/boards/arm/sabre-6quad/src/imx_boardinit.c +++ b/boards/arm/imx6/sabre-6quad/src/imx_boardinit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/sabre-6quad/src/imx_boot.c + * boards/arm/imx6/sabre-6quad/src/imx_boot.c * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/sabre-6quad/src/imx_bringup.c b/boards/arm/imx6/sabre-6quad/src/imx_bringup.c similarity index 98% rename from boards/arm/sabre-6quad/src/imx_bringup.c rename to boards/arm/imx6/sabre-6quad/src/imx_bringup.c index 6c3f4949ba2..1e942bc381a 100644 --- a/boards/arm/sabre-6quad/src/imx_bringup.c +++ b/boards/arm/imx6/sabre-6quad/src/imx_bringup.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/sabre-6quad/src/imx_bringup.c + * config/arm/imx6/sabre-6quad/src/imx_bringup.c * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/sabre-6quad/src/imx_userleds.c b/boards/arm/imx6/sabre-6quad/src/imx_userleds.c similarity index 98% rename from boards/arm/sabre-6quad/src/imx_userleds.c rename to boards/arm/imx6/sabre-6quad/src/imx_userleds.c index efa81e65973..aac2dd7f87d 100644 --- a/boards/arm/sabre-6quad/src/imx_userleds.c +++ b/boards/arm/imx6/sabre-6quad/src/imx_userleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/sabre-6quad/src/imx_userleds.c + * boards/arm/imx6/sabre-6quad/src/imx_userleds.c * * Copyright (C) 2016 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/sabre-6quad/src/sabre-6quad.h b/boards/arm/imx6/sabre-6quad/src/sabre-6quad.h similarity index 96% rename from boards/arm/sabre-6quad/src/sabre-6quad.h rename to boards/arm/imx6/sabre-6quad/src/sabre-6quad.h index a2e5b451b95..efda2648d79 100644 --- a/boards/arm/sabre-6quad/src/sabre-6quad.h +++ b/boards/arm/imx6/sabre-6quad/src/sabre-6quad.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/sabre-6quad/src/sabre-6quad.h + * boards/arm/imx6/sabre-6quad/src/sabre-6quad.h * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_ARM_SABRE_6QUAD_SRC_SABRE_6QUAD_H -#define __BOARDS_ARM_SABRE_6QUAD_SRC_SABRE_6QUAD_H +#ifndef __BOARDS_ARM_IMX6_SABRE_6QUAD_SRC_SABRE_6QUAD_H +#define __BOARDS_ARM_IMX6_SABRE_6QUAD_SRC_SABRE_6QUAD_H /************************************************************************************ * Included Files diff --git a/boards/arm/imxrt1050-evk/Kconfig b/boards/arm/imxrt/imxrt1050-evk/Kconfig similarity index 100% rename from boards/arm/imxrt1050-evk/Kconfig rename to boards/arm/imxrt/imxrt1050-evk/Kconfig diff --git a/boards/arm/imxrt1050-evk/README.txt b/boards/arm/imxrt/imxrt1050-evk/README.txt similarity index 100% rename from boards/arm/imxrt1050-evk/README.txt rename to boards/arm/imxrt/imxrt1050-evk/README.txt diff --git a/boards/arm/imxrt1050-evk/configs/knsh/Make.defs b/boards/arm/imxrt/imxrt1050-evk/configs/knsh/Make.defs similarity index 94% rename from boards/arm/imxrt1050-evk/configs/knsh/Make.defs rename to boards/arm/imxrt/imxrt1050-evk/configs/knsh/Make.defs index 0c24e2b76b8..19b56436de2 100644 --- a/boards/arm/imxrt1050-evk/configs/knsh/Make.defs +++ b/boards/arm/imxrt/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) - ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) + ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/imxrt1050-evk/configs/knsh/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig similarity index 98% rename from boards/arm/imxrt1050-evk/configs/knsh/defconfig rename to boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig index ffbc8ed04d8..5549509d5d7 100644 --- a/boards/arm/imxrt1050-evk/configs/knsh/defconfig +++ b/boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="imxrt1050-evk" CONFIG_ARCH_BOARD_IMXRT1050_EVK=y +CONFIG_ARCH_CHIP="imxrt" CONFIG_ARCH_CHIP_IMXRT=y CONFIG_ARCH_CHIP_MIMXRT1052DVL6A=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/imxrt1050-evk/configs/libcxxtest/Make.defs b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/Make.defs similarity index 96% rename from boards/arm/imxrt1050-evk/configs/libcxxtest/Make.defs rename to boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/Make.defs index 539f0f0c2ec..7f0de542925 100644 --- a/boards/arm/imxrt1050-evk/configs/libcxxtest/Make.defs +++ b/boards/arm/imxrt/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) diff --git a/boards/arm/imxrt1050-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig similarity index 98% rename from boards/arm/imxrt1050-evk/configs/libcxxtest/defconfig rename to boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig index 4965b3e09b4..ae28ea7a4d6 100644 --- a/boards/arm/imxrt1050-evk/configs/libcxxtest/defconfig +++ b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="imxrt1050-evk" CONFIG_ARCH_BOARD_IMXRT1050_EVK=y +CONFIG_ARCH_CHIP="imxrt" CONFIG_ARCH_CHIP_IMXRT=y CONFIG_ARCH_CHIP_MIMXRT1052DVL6A=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/imxrt1050-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig similarity index 98% rename from boards/arm/imxrt1050-evk/configs/netnsh/defconfig rename to boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig index ea595ee3030..eeb499c86cf 100644 --- a/boards/arm/imxrt1050-evk/configs/netnsh/defconfig +++ b/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="imxrt1050-evk" CONFIG_ARCH_BOARD_IMXRT1050_EVK=y +CONFIG_ARCH_CHIP="imxrt" CONFIG_ARCH_CHIP_IMXRT=y CONFIG_ARCH_CHIP_MIMXRT1052DVL6A=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/imxrt1050-evk/configs/nsh/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig similarity index 97% rename from boards/arm/imxrt1050-evk/configs/nsh/defconfig rename to boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig index d7e67221d35..7d55ae945a4 100644 --- a/boards/arm/imxrt1050-evk/configs/nsh/defconfig +++ b/boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="imxrt1050-evk" CONFIG_ARCH_BOARD_IMXRT1050_EVK=y +CONFIG_ARCH_CHIP="imxrt" CONFIG_ARCH_CHIP_IMXRT=y CONFIG_ARCH_CHIP_MIMXRT1052DVL6A=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/imxrt1050-evk/include/board.h b/boards/arm/imxrt/imxrt1050-evk/include/board.h similarity index 98% rename from boards/arm/imxrt1050-evk/include/board.h rename to boards/arm/imxrt/imxrt1050-evk/include/board.h index 60b03c784a4..545989f73da 100644 --- a/boards/arm/imxrt1050-evk/include/board.h +++ b/boards/arm/imxrt/imxrt1050-evk/include/board.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/imxrt1050/include/board.h + * boards/arm/imxrt/imxrt1050/include/board.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_ARM_IMXRT1050_EVK_INCLUDE_BOARD_H -#define __BOARDS_ARM_IMXRT1050_EVK_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_IMXRT_IMXRT1050_EVK_INCLUDE_BOARD_H +#define __BOARDS_ARM_IMXRT_IMXRT1050_EVK_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -290,4 +290,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_IMXRT1050_EVK_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_IMXRT_IMXRT1050_EVK_INCLUDE_BOARD_H */ diff --git a/boards/arm/bambino-200e/kernel/.gitignore b/boards/arm/imxrt/imxrt1050-evk/kernel/.gitignore similarity index 100% rename from boards/arm/bambino-200e/kernel/.gitignore rename to boards/arm/imxrt/imxrt1050-evk/kernel/.gitignore diff --git a/boards/arm/imxrt1060-evk/kernel/Makefile b/boards/arm/imxrt/imxrt1050-evk/kernel/Makefile similarity index 89% rename from boards/arm/imxrt1060-evk/kernel/Makefile rename to boards/arm/imxrt/imxrt1050-evk/kernel/Makefile index 27b3299e13b..e989a8e36e0 100644 --- a/boards/arm/imxrt1060-evk/kernel/Makefile +++ b/boards/arm/imxrt/imxrt1050-evk/kernel/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/imxrt1060-evk/kernel/Makefile +# boards/arm/imxrt/imxrt1050-evk/kernel/Makefile # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/imxrt1050-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c similarity index 98% rename from boards/arm/imxrt1050-evk/kernel/imxrt_userspace.c rename to boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c index 3c523cab28b..56ee62e9a6c 100644 --- a/boards/arm/imxrt1050-evk/kernel/imxrt_userspace.c +++ b/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1050-evk/kernel/imxrt_userspace.c + * boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/imxrt1050-evk/scripts/Make.defs b/boards/arm/imxrt/imxrt1050-evk/scripts/Make.defs similarity index 95% rename from boards/arm/imxrt1050-evk/scripts/Make.defs rename to boards/arm/imxrt/imxrt1050-evk/scripts/Make.defs index 449264185c3..990c03d154c 100644 --- a/boards/arm/imxrt1050-evk/scripts/Make.defs +++ b/boards/arm/imxrt/imxrt1050-evk/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/imxrt1050-evk/scripts/Make.defs +# boards/arm/imxrt/imxrt1050-evk/scripts/Make.defs # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/imxrt1050-evk/scripts/flash-ocram.ld b/boards/arm/imxrt/imxrt1050-evk/scripts/flash-ocram.ld similarity index 98% rename from boards/arm/imxrt1050-evk/scripts/flash-ocram.ld rename to boards/arm/imxrt/imxrt1050-evk/scripts/flash-ocram.ld index 4b99138e633..227b03ceaab 100644 --- a/boards/arm/imxrt1050-evk/scripts/flash-ocram.ld +++ b/boards/arm/imxrt/imxrt1050-evk/scripts/flash-ocram.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1050-evk/scripts/flash-ocram.ld + * boards/arm/imxrt/imxrt1050-evk/scripts/flash-ocram.ld * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Ivan Ucherdzhiev diff --git a/boards/arm/imxrt1050-evk/scripts/kernel-space.ld b/boards/arm/imxrt/imxrt1050-evk/scripts/kernel-space.ld similarity index 98% rename from boards/arm/imxrt1050-evk/scripts/kernel-space.ld rename to boards/arm/imxrt/imxrt1050-evk/scripts/kernel-space.ld index 0ed21c9b853..75c8e920a16 100644 --- a/boards/arm/imxrt1050-evk/scripts/kernel-space.ld +++ b/boards/arm/imxrt/imxrt1050-evk/scripts/kernel-space.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/simxrt1050-evk/scripts/kernel-space.ld + * boards/arm/imxrt/simxrt1050-evk/scripts/kernel-space.ld * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/imxrt1050-evk/scripts/memory.ld b/boards/arm/imxrt/imxrt1050-evk/scripts/memory.ld similarity index 98% rename from boards/arm/imxrt1050-evk/scripts/memory.ld rename to boards/arm/imxrt/imxrt1050-evk/scripts/memory.ld index 63d477948ab..48c172e509c 100644 --- a/boards/arm/imxrt1050-evk/scripts/memory.ld +++ b/boards/arm/imxrt/imxrt1050-evk/scripts/memory.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1050-evk/scripts/memory.ld + * boards/arm/imxrt/imxrt1050-evk/scripts/memory.ld * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/imxrt1050-evk/scripts/user-space.ld b/boards/arm/imxrt/imxrt1050-evk/scripts/user-space.ld similarity index 98% rename from boards/arm/imxrt1050-evk/scripts/user-space.ld rename to boards/arm/imxrt/imxrt1050-evk/scripts/user-space.ld index 68ca37519d5..aee702881c7 100644 --- a/boards/arm/imxrt1050-evk/scripts/user-space.ld +++ b/boards/arm/imxrt/imxrt1050-evk/scripts/user-space.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/simxrt1050-evk/scripts/user-space.ld + * boards/arm/imxrt/simxrt1050-evk/scripts/user-space.ld * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/imxrt1050-evk/src/Makefile b/boards/arm/imxrt/imxrt1050-evk/src/Makefile similarity index 98% rename from boards/arm/imxrt1050-evk/src/Makefile rename to boards/arm/imxrt/imxrt1050-evk/src/Makefile index 48e51940c6f..c0a3011a7c2 100644 --- a/boards/arm/imxrt1050-evk/src/Makefile +++ b/boards/arm/imxrt/imxrt1050-evk/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/imxrt1050-evk/src/Makefile +# boards/arm/imxrt/imxrt1050-evk/src/Makefile # # Copyright (C) 2018, 2019 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/imxrt1050-evk/src/imxrt1050-evk.h b/boards/arm/imxrt/imxrt1050-evk/src/imxrt1050-evk.h similarity index 97% rename from boards/arm/imxrt1050-evk/src/imxrt1050-evk.h rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt1050-evk.h index 14845e52cfc..f78af67c05f 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt1050-evk.h +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt1050-evk.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1050-evk/src/imxrt1050-evk.h + * boards/arm/imxrt/imxrt1050-evk/src/imxrt1050-evk.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_IMXRT1050_EVK_SRC_IMXRT1050_EVK_H -#define __BOARDS_ARM_IMXRT1050_EVK_SRC_IMXRT1050_EVK_H +#ifndef __BOARDS_ARM_IMXRT_IMXRT1050_EVK_SRC_IMXRT1050_EVK_H +#define __BOARDS_ARM_IMXRT_IMXRT1050_EVK_SRC_IMXRT1050_EVK_H /**************************************************************************** * Included Files @@ -253,4 +253,4 @@ int imxrt_gpio_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_IMXRT1050_EVK_SRC_IMXRT1050_EVK_H */ +#endif /* __BOARDS_ARM_IMXRT_IMXRT1050_EVK_SRC_IMXRT1050_EVK_H */ diff --git a/boards/arm/imxrt1050-evk/src/imxrt_appinit.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_appinit.c similarity index 98% rename from boards/arm/imxrt1050-evk/src/imxrt_appinit.c rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt_appinit.c index 581b173aa8f..18b6a849a48 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt_appinit.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_appinit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/imxrt1050-evk/src/imxrt_appinit.c + * config/arm/imxrt/imxrt1050-evk/src/imxrt_appinit.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/imxrt1050-evk/src/imxrt_autoleds.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_autoleds.c similarity index 98% rename from boards/arm/imxrt1050-evk/src/imxrt_autoleds.c rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt_autoleds.c index 0c55e5142c1..7c5cf5c838f 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt_autoleds.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_autoleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1050-evk/include/imxrt_autoleds.c + * boards/arm/imxrt/imxrt1050-evk/include/imxrt_autoleds.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/imxrt1050-evk/src/imxrt_boot.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_boot.c similarity index 98% rename from boards/arm/imxrt1050-evk/src/imxrt_boot.c rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt_boot.c index 9a2409a1e55..94cddab21e0 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt_boot.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1050-evk/src/imxrt_boot.c + * boards/arm/imxrt/imxrt1050-evk/src/imxrt_boot.c * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/imxrt1050-evk/src/imxrt_bringup.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_bringup.c similarity index 99% rename from boards/arm/imxrt1050-evk/src/imxrt_bringup.c rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt_bringup.c index 0bcf97c12d0..c470c124d87 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt_bringup.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_bringup.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/imxrt1050-evk/src/imxrt_bringup.c + * config/arm/imxrt/imxrt1050-evk/src/imxrt_bringup.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/imxrt1050-evk/src/imxrt_buttons.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c similarity index 98% rename from boards/arm/imxrt1050-evk/src/imxrt_buttons.c rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c index 213d341b0c3..303ea237053 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt_buttons.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1050-evk/src/imxrt_buttons.c + * boards/arm/imxrt/imxrt1050-evk/src/imxrt_buttons.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/imxrt1050-evk/src/imxrt_ethernet.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_ethernet.c similarity index 99% rename from boards/arm/imxrt1050-evk/src/imxrt_ethernet.c rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt_ethernet.c index 2cfbc32b534..6aed7de32d3 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt_ethernet.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_ethernet.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1050-evk/src/imxrt_ethernet.c + * boards/arm/imxrt/imxrt1050-evk/src/imxrt_ethernet.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_flexspi_nor_boot.c similarity index 98% rename from boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt_flexspi_nor_boot.c index d070dd3d6df..750ffdd613f 100644 --- a/boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_flexspi_nor_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c + * config/arm/imxrt/imxrt1050-evk/src/imxrt_flexspi_nor_boot.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Ivan Ucherdzhiev diff --git a/boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_boot.h b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_flexspi_nor_boot.h similarity index 94% rename from boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_boot.h rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt_flexspi_nor_boot.h index 8282be7b4b8..20d727af2e3 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_boot.h +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_flexspi_nor_boot.h @@ -1,5 +1,5 @@ /**************************************************************************** - * config/imxrt1050-evk/src/imxrt_flexspi_nor_boot.h + * config/arm/imxrt/imxrt1050-evk/src/imxrt_flexspi_nor_boot.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Ivan Ucherdzhiev @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H -#define __BOARDS_ARM_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H +#ifndef __BOARDS_ARM_IMXRT_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H +#define __BOARDS_ARM_IMXRT_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_ARM_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H */ +#endif /* __BOARDS_ARM_IMXRT_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H */ diff --git a/boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c similarity index 99% rename from boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c index 4d7787c8acb..19aaa2a9c55 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c + * config/arm/imxrt/imxrt1050-evk/src/imxrt_flexspi_nor_flash.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Ivan Ucherdzhiev diff --git a/boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_flash.h b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_flexspi_nor_flash.h similarity index 97% rename from boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_flash.h rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt_flexspi_nor_flash.h index 1c46da6b147..f23b51b6769 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_flash.h +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_flexspi_nor_flash.h @@ -1,5 +1,5 @@ /**************************************************************************** - * config/imxrt1050-evk/src/imxrt_flexspi_nor_flash.h + * config/arm/imxrt/imxrt1050-evk/src/imxrt_flexspi_nor_flash.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Ivan Ucherdzhiev @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H -#define __BOARDS_ARM_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H +#ifndef __BOARDS_ARM_IMXRT_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H +#define __BOARDS_ARM_IMXRT_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_ARM_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H */ +#endif /* __BOARDS_ARM_IMXRT_IMXRT1050_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H */ diff --git a/boards/arm/imxrt1050-evk/src/imxrt_gpio.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_gpio.c similarity index 99% rename from boards/arm/imxrt1050-evk/src/imxrt_gpio.c rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt_gpio.c index 6d11dd73848..ebe2451c037 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt_gpio.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_gpio.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1050-evk/src/imxrt_gpio.c + * boards/arm/imxrt/imxrt1050-evk/src/imxrt_gpio.c * * Copyright (C) 2017-2018 Gregory Nutt. All rights reserved. * Copyright (C) 2017 Alan Carvalho de Assis. All rights reserved. diff --git a/boards/arm/imxrt1050-evk/src/imxrt_lcd.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_lcd.c similarity index 98% rename from boards/arm/imxrt1050-evk/src/imxrt_lcd.c rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt_lcd.c index 6321de10382..e48b83df123 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt_lcd.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_lcd.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1050-evk/src/imxrt_lcd.c + * boards/arm/imxrt/imxrt1050-evk/src/imxrt_lcd.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/imxrt1050-evk/src/imxrt_mmcsd_spi.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_mmcsd_spi.c similarity index 98% rename from boards/arm/imxrt1050-evk/src/imxrt_mmcsd_spi.c rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt_mmcsd_spi.c index 94d35632a5b..42952c15e25 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt_mmcsd_spi.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_mmcsd_spi.c @@ -1,5 +1,5 @@ /***************************************************************************** - * boards/imxrt/src/imxrt_mmcsd_spi.c + * boards/arm/imxrt/imxrt1050-evk/src/imxrt_mmcsd_spi.c * * Copyright (C) 2018 Greg Nutt. All rights reserved. * Author: ivan Ucherdzhiev diff --git a/boards/arm/imxrt1050-evk/src/imxrt_sdram_ini_dcd.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_sdram_ini_dcd.c similarity index 99% rename from boards/arm/imxrt1050-evk/src/imxrt_sdram_ini_dcd.c rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt_sdram_ini_dcd.c index 081c7ce1076..3bde7edd61b 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt_sdram_ini_dcd.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_sdram_ini_dcd.c @@ -1,5 +1,5 @@ /***************************************************************************** - * boards/imxrt/src/imxrt_sdram_ini_dcd.c + * boards/arm/imxrt/imxrt1050-evk/src/imxrt_sdram_ini_dcd.c * * Copyright (C) 2017, NXP Semiconductors, Inc. * diff --git a/boards/arm/imxrt1050-evk/src/imxrt_spi.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_spi.c similarity index 99% rename from boards/arm/imxrt1050-evk/src/imxrt_spi.c rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt_spi.c index f3e78510013..2da19981ef8 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt_spi.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_spi.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/imxrt1050-evk/src/imxrt_spi.c + * boards/arm/imxrt/imxrt1050-evk/src/imxrt_spi.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Ivan Ucherdzhiev diff --git a/boards/arm/imxrt1050-evk/src/imxrt_userleds.c b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_userleds.c similarity index 98% rename from boards/arm/imxrt1050-evk/src/imxrt_userleds.c rename to boards/arm/imxrt/imxrt1050-evk/src/imxrt_userleds.c index c638d7cd930..2b99393a07c 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt_userleds.c +++ b/boards/arm/imxrt/imxrt1050-evk/src/imxrt_userleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1050-evk/src/imxrt_userleds.c + * boards/arm/imxrt/imxrt1050-evk/src/imxrt_userleds.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/imxrt1060-evk/Kconfig b/boards/arm/imxrt/imxrt1060-evk/Kconfig similarity index 100% rename from boards/arm/imxrt1060-evk/Kconfig rename to boards/arm/imxrt/imxrt1060-evk/Kconfig diff --git a/boards/arm/imxrt1060-evk/README.txt b/boards/arm/imxrt/imxrt1060-evk/README.txt similarity index 100% rename from boards/arm/imxrt1060-evk/README.txt rename to boards/arm/imxrt/imxrt1060-evk/README.txt diff --git a/boards/arm/imxrt1060-evk/configs/knsh/Make.defs b/boards/arm/imxrt/imxrt1060-evk/configs/knsh/Make.defs similarity index 94% rename from boards/arm/imxrt1060-evk/configs/knsh/Make.defs rename to boards/arm/imxrt/imxrt1060-evk/configs/knsh/Make.defs index b0c716fc597..8030b6aa0cb 100644 --- a/boards/arm/imxrt1060-evk/configs/knsh/Make.defs +++ b/boards/arm/imxrt/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) - ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) + ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/imxrt1060-evk/configs/knsh/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig similarity index 98% rename from boards/arm/imxrt1060-evk/configs/knsh/defconfig rename to boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig index 51e2b522377..cef71f9f9bd 100644 --- a/boards/arm/imxrt1060-evk/configs/knsh/defconfig +++ b/boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="imxrt1060-evk" CONFIG_ARCH_BOARD_IMXRT1060_EVK=y +CONFIG_ARCH_CHIP="imxrt" CONFIG_ARCH_CHIP_IMXRT=y CONFIG_ARCH_CHIP_MIMXRT1062DVL6A=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/imxrt1060-evk/configs/libcxxtest/Make.defs b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/Make.defs similarity index 96% rename from boards/arm/imxrt1060-evk/configs/libcxxtest/Make.defs rename to boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/Make.defs index c0e82c3db4a..4ac29a15726 100644 --- a/boards/arm/imxrt1060-evk/configs/libcxxtest/Make.defs +++ b/boards/arm/imxrt/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) diff --git a/boards/arm/imxrt1060-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig similarity index 98% rename from boards/arm/imxrt1060-evk/configs/libcxxtest/defconfig rename to boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig index 95be64cc1cf..a681245e284 100644 --- a/boards/arm/imxrt1060-evk/configs/libcxxtest/defconfig +++ b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="imxrt1060-evk" CONFIG_ARCH_BOARD_IMXRT1060_EVK=y +CONFIG_ARCH_CHIP="imxrt" CONFIG_ARCH_CHIP_IMXRT=y CONFIG_ARCH_CHIP_MIMXRT1062DVL6A=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/imxrt1060-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig similarity index 98% rename from boards/arm/imxrt1060-evk/configs/netnsh/defconfig rename to boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig index 75f44386467..1d6baac9939 100644 --- a/boards/arm/imxrt1060-evk/configs/netnsh/defconfig +++ b/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="imxrt1060-evk" CONFIG_ARCH_BOARD_IMXRT1060_EVK=y +CONFIG_ARCH_CHIP="imxrt" CONFIG_ARCH_CHIP_IMXRT=y CONFIG_ARCH_CHIP_MIMXRT1062DVL6A=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/imxrt1060-evk/configs/nsh/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig similarity index 97% rename from boards/arm/imxrt1060-evk/configs/nsh/defconfig rename to boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig index 2b2803fee22..106b2d7d0be 100644 --- a/boards/arm/imxrt1060-evk/configs/nsh/defconfig +++ b/boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="imxrt1060-evk" CONFIG_ARCH_BOARD_IMXRT1060_EVK=y +CONFIG_ARCH_CHIP="imxrt" CONFIG_ARCH_CHIP_IMXRT=y CONFIG_ARCH_CHIP_MIMXRT1062DVL6A=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/imxrt1060-evk/include/board.h b/boards/arm/imxrt/imxrt1060-evk/include/board.h similarity index 98% rename from boards/arm/imxrt1060-evk/include/board.h rename to boards/arm/imxrt/imxrt1060-evk/include/board.h index 9c810329483..81c39bd2d55 100644 --- a/boards/arm/imxrt1060-evk/include/board.h +++ b/boards/arm/imxrt/imxrt1060-evk/include/board.h @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/imxrt1060/include/board.h + * boards/arm/imxrt/imxrt1060/include/board.h * * Copyright (C) 2018-2019 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -35,8 +35,8 @@ * ************************************************************************************/ -#ifndef __BOARDS_ARM_IMXRT1060_EVK_INCLUDE_BOARD_H -#define __BOARDS_ARM_IMXRT1060_EVK_INCLUDE_BOARD_H +#ifndef __BOARDS_ARM_IMXRT_IMXRT1060_EVK_INCLUDE_BOARD_H +#define __BOARDS_ARM_IMXRT_IMXRT1060_EVK_INCLUDE_BOARD_H /************************************************************************************ * Included Files @@ -282,4 +282,4 @@ extern "C" #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_ARM_IMXRT1060_EVK_INCLUDE_BOARD_H */ +#endif /* __BOARDS_ARM_IMXRT_IMXRT1060_EVK_INCLUDE_BOARD_H */ diff --git a/boards/arm/clicker2-stm32/kernel/.gitignore b/boards/arm/imxrt/imxrt1060-evk/kernel/.gitignore similarity index 100% rename from boards/arm/clicker2-stm32/kernel/.gitignore rename to boards/arm/imxrt/imxrt1060-evk/kernel/.gitignore diff --git a/boards/arm/imxrt1050-evk/kernel/Makefile b/boards/arm/imxrt/imxrt1060-evk/kernel/Makefile similarity index 89% rename from boards/arm/imxrt1050-evk/kernel/Makefile rename to boards/arm/imxrt/imxrt1060-evk/kernel/Makefile index c81aa90b72b..556da0606e0 100644 --- a/boards/arm/imxrt1050-evk/kernel/Makefile +++ b/boards/arm/imxrt/imxrt1060-evk/kernel/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/imxrt1050-evk/kernel/Makefile +# boards/arm/imxrt/imxrt1060-evk/kernel/Makefile # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/imxrt1060-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c similarity index 98% rename from boards/arm/imxrt1060-evk/kernel/imxrt_userspace.c rename to boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c index 0e6909c1bc2..601fe1f7fb2 100644 --- a/boards/arm/imxrt1060-evk/kernel/imxrt_userspace.c +++ b/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1060-evk/kernel/imxrt_userspace.c + * boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/imxrt1060-evk/scripts/Make.defs b/boards/arm/imxrt/imxrt1060-evk/scripts/Make.defs similarity index 95% rename from boards/arm/imxrt1060-evk/scripts/Make.defs rename to boards/arm/imxrt/imxrt1060-evk/scripts/Make.defs index 28f5680dbfb..0324786012f 100644 --- a/boards/arm/imxrt1060-evk/scripts/Make.defs +++ b/boards/arm/imxrt/imxrt1060-evk/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/imxrt1060-evk/scripts/Make.defs +# boards/arm/imxrt/imxrt1060-evk/scripts/Make.defs # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/imxrt1060-evk/scripts/flash-ocram.ld b/boards/arm/imxrt/imxrt1060-evk/scripts/flash-ocram.ld similarity index 98% rename from boards/arm/imxrt1060-evk/scripts/flash-ocram.ld rename to boards/arm/imxrt/imxrt1060-evk/scripts/flash-ocram.ld index 0bfbaf4eece..8370e1d8f82 100644 --- a/boards/arm/imxrt1060-evk/scripts/flash-ocram.ld +++ b/boards/arm/imxrt/imxrt1060-evk/scripts/flash-ocram.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1060-evk/scripts/flash-ocram.ld + * boards/arm/imxrt/imxrt1060-evk/scripts/flash-ocram.ld * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Ivan Ucherdzhiev diff --git a/boards/arm/imxrt1060-evk/scripts/kernel-space.ld b/boards/arm/imxrt/imxrt1060-evk/scripts/kernel-space.ld similarity index 98% rename from boards/arm/imxrt1060-evk/scripts/kernel-space.ld rename to boards/arm/imxrt/imxrt1060-evk/scripts/kernel-space.ld index dee7b7f4f7c..c642f42dc50 100644 --- a/boards/arm/imxrt1060-evk/scripts/kernel-space.ld +++ b/boards/arm/imxrt/imxrt1060-evk/scripts/kernel-space.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1060-evk/scripts/kernel-space.ld + * boards/arm/imxrt/imxrt1060-evk/scripts/kernel-space.ld * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/boards/arm/imxrt1060-evk/scripts/memory.ld b/boards/arm/imxrt/imxrt1060-evk/scripts/memory.ld similarity index 98% rename from boards/arm/imxrt1060-evk/scripts/memory.ld rename to boards/arm/imxrt/imxrt1060-evk/scripts/memory.ld index d14a2b1cf66..53002a5e12f 100644 --- a/boards/arm/imxrt1060-evk/scripts/memory.ld +++ b/boards/arm/imxrt/imxrt1060-evk/scripts/memory.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1060-evk/scripts/memory.ld + * boards/arm/imxrt/imxrt1060-evk/scripts/memory.ld * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/boards/arm/imxrt1060-evk/scripts/user-space.ld b/boards/arm/imxrt/imxrt1060-evk/scripts/user-space.ld similarity index 98% rename from boards/arm/imxrt1060-evk/scripts/user-space.ld rename to boards/arm/imxrt/imxrt1060-evk/scripts/user-space.ld index af70749e210..6759f349f11 100644 --- a/boards/arm/imxrt1060-evk/scripts/user-space.ld +++ b/boards/arm/imxrt/imxrt1060-evk/scripts/user-space.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/simxrt1060-evk/scripts/user-space.ld + * boards/arm/imxrt/simxrt1060-evk/scripts/user-space.ld * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/boards/arm/imxrt1060-evk/src/Makefile b/boards/arm/imxrt/imxrt1060-evk/src/Makefile similarity index 98% rename from boards/arm/imxrt1060-evk/src/Makefile rename to boards/arm/imxrt/imxrt1060-evk/src/Makefile index 26ec893a90e..19af148b878 100644 --- a/boards/arm/imxrt1060-evk/src/Makefile +++ b/boards/arm/imxrt/imxrt1060-evk/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/imxrt1060-evk/src/Makefile +# boards/arm/imxrt/imxrt1060-evk/src/Makefile # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/imxrt1060-evk/src/imxrt1060-evk.h b/boards/arm/imxrt/imxrt1060-evk/src/imxrt1060-evk.h similarity index 97% rename from boards/arm/imxrt1060-evk/src/imxrt1060-evk.h rename to boards/arm/imxrt/imxrt1060-evk/src/imxrt1060-evk.h index c14c3f105f2..58196e7c26c 100644 --- a/boards/arm/imxrt1060-evk/src/imxrt1060-evk.h +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt1060-evk.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1060-evk/src/imxrt1060-evk.h + * boards/arm/imxrt/imxrt1060-evk/src/imxrt1060-evk.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_IMXRT1060_EVK_SRC_IMXRT1060_EVK_H -#define __BOARDS_ARM_IMXRT1060_EVK_SRC_IMXRT1060_EVK_H +#ifndef __BOARDS_ARM_IMXRT_IMXRT1060_EVK_SRC_IMXRT1060_EVK_H +#define __BOARDS_ARM_IMXRT_IMXRT1060_EVK_SRC_IMXRT1060_EVK_H /**************************************************************************** * Included Files diff --git a/boards/arm/imxrt1060-evk/src/imxrt_appinit.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_appinit.c similarity index 98% rename from boards/arm/imxrt1060-evk/src/imxrt_appinit.c rename to boards/arm/imxrt/imxrt1060-evk/src/imxrt_appinit.c index e7fb82fc291..14a8e693d4f 100644 --- a/boards/arm/imxrt1060-evk/src/imxrt_appinit.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_appinit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/imxrt1060-evk/src/imxrt_appinit.c + * boards/arm/imxrt/imxrt1060-evk/src/imxrt_appinit.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/boards/arm/imxrt1060-evk/src/imxrt_autoleds.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_autoleds.c similarity index 98% rename from boards/arm/imxrt1060-evk/src/imxrt_autoleds.c rename to boards/arm/imxrt/imxrt1060-evk/src/imxrt_autoleds.c index b62b3ab4de5..eb71913bcd8 100644 --- a/boards/arm/imxrt1060-evk/src/imxrt_autoleds.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_autoleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1060-evk/include/imxrt_autoleds.c + * boards/arm/imxrt/imxrt1060-evk/include/imxrt_autoleds.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/boards/arm/imxrt1060-evk/src/imxrt_boot.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_boot.c similarity index 98% rename from boards/arm/imxrt1060-evk/src/imxrt_boot.c rename to boards/arm/imxrt/imxrt1060-evk/src/imxrt_boot.c index b63a1d6a20a..839542d2d0a 100644 --- a/boards/arm/imxrt1060-evk/src/imxrt_boot.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1060-evk/src/imxrt_boot.c + * boards/arm/imxrt/imxrt1060-evk/src/imxrt_boot.c * * Copyright (C) 2015-2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/boards/arm/imxrt1060-evk/src/imxrt_bringup.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_bringup.c similarity index 98% rename from boards/arm/imxrt1060-evk/src/imxrt_bringup.c rename to boards/arm/imxrt/imxrt1060-evk/src/imxrt_bringup.c index 91827f12e10..72c789d3b3c 100644 --- a/boards/arm/imxrt1060-evk/src/imxrt_bringup.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_bringup.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/imxrt1060-evk/src/imxrt_bringup.c + * boards/arm/imxrt/imxrt1060-evk/src/imxrt_bringup.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/boards/arm/imxrt1060-evk/src/imxrt_buttons.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c similarity index 98% rename from boards/arm/imxrt1060-evk/src/imxrt_buttons.c rename to boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c index 786cdabf880..9c27fe56037 100644 --- a/boards/arm/imxrt1060-evk/src/imxrt_buttons.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1060-evk/src/imxrt_buttons.c + * boards/arm/imxrt/imxrt1060-evk/src/imxrt_buttons.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/boards/arm/imxrt1060-evk/src/imxrt_ethernet.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_ethernet.c similarity index 99% rename from boards/arm/imxrt1060-evk/src/imxrt_ethernet.c rename to boards/arm/imxrt/imxrt1060-evk/src/imxrt_ethernet.c index 16a554ef289..d49d5806c5b 100644 --- a/boards/arm/imxrt1060-evk/src/imxrt_ethernet.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_ethernet.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1060-evk/src/imxrt_ethernet.c + * boards/arm/imxrt/imxrt1060-evk/src/imxrt_ethernet.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_boot.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c similarity index 98% rename from boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_boot.c rename to boards/arm/imxrt/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c index 4a048170fb8..24cf020a7fc 100644 --- a/boards/arm/imxrt1050-evk/src/imxrt_flexspi_nor_boot.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/imxrt1050-evk/src/imxrt_flexspi_nor_boot.c + * boards/arm/imxrt/imxrt1060-evk/src/imxrt_flexspi_nor_boot.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Ivan Ucherdzhiev diff --git a/boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h similarity index 94% rename from boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h rename to boards/arm/imxrt/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h index 8f43a9d97e9..329b4a4832c 100644 --- a/boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h @@ -1,5 +1,5 @@ /**************************************************************************** - * config/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h + * boards/arm/imxrt/imxrt1060-evk/src/imxrt_flexspi_nor_boot.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Ivan Ucherdzhiev @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H -#define __BOARDS_ARM_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H +#ifndef __BOARDS_ARM_IMXRT_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H +#define __BOARDS_ARM_IMXRT_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_ARM_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H */ +#endif /* __BOARDS_ARM_IMXRT_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_BOOT_H */ diff --git a/boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c similarity index 99% rename from boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c rename to boards/arm/imxrt/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c index 524b6d2f098..4ce1341f035 100644 --- a/boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c @@ -1,5 +1,5 @@ /**************************************************************************** - * config/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c + * boards/arm/imxrt/imxrt1060-evk/src/imxrt_flexspi_nor_flash.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Ivan Ucherdzhiev diff --git a/boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_flash.h b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_flexspi_nor_flash.h similarity index 97% rename from boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_flash.h rename to boards/arm/imxrt/imxrt1060-evk/src/imxrt_flexspi_nor_flash.h index 0c3ee2e1f38..d3b6f99a812 100644 --- a/boards/arm/imxrt1060-evk/src/imxrt_flexspi_nor_flash.h +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_flexspi_nor_flash.h @@ -1,5 +1,5 @@ /**************************************************************************** - * config/imxrt1060-evk/src/imxrt_flexspi_nor_flash.h + * boards/arm/imxrt/imxrt1060-evk/src/imxrt_flexspi_nor_flash.h * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Ivan Ucherdzhiev @@ -34,8 +34,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H -#define __BOARDS_ARM_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H +#ifndef __BOARDS_ARM_IMXRT_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H +#define __BOARDS_ARM_IMXRT_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_ARM_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H */ +#endif /* __BOARDS_ARM_IMXRT_IMXRT1060_EVK_SRC_IMXRT_FLEXSPI_NOR_FLASH_H */ diff --git a/boards/arm/imxrt1060-evk/src/imxrt_mmcsd_spi.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_mmcsd_spi.c similarity index 98% rename from boards/arm/imxrt1060-evk/src/imxrt_mmcsd_spi.c rename to boards/arm/imxrt/imxrt1060-evk/src/imxrt_mmcsd_spi.c index 94d35632a5b..a7fb5a816cf 100644 --- a/boards/arm/imxrt1060-evk/src/imxrt_mmcsd_spi.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_mmcsd_spi.c @@ -1,5 +1,5 @@ /***************************************************************************** - * boards/imxrt/src/imxrt_mmcsd_spi.c + * boards/arm/imxrt/imxrt1060-evk/src/imxrt_mmcsd_spi.c * * Copyright (C) 2018 Greg Nutt. All rights reserved. * Author: ivan Ucherdzhiev diff --git a/boards/arm/imxrt1060-evk/src/imxrt_spi.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_spi.c similarity index 99% rename from boards/arm/imxrt1060-evk/src/imxrt_spi.c rename to boards/arm/imxrt/imxrt1060-evk/src/imxrt_spi.c index 7e9bfa5178f..ff9b5af9bfc 100644 --- a/boards/arm/imxrt1060-evk/src/imxrt_spi.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_spi.c @@ -1,5 +1,5 @@ /************************************************************************************ - * boards/imxrt1060-evk/src/imxrt_spi.c + * boards/arm/imxrt/imxrt1060-evk/src/imxrt_spi.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Ivan Ucherdzhiev diff --git a/boards/arm/imxrt1060-evk/src/imxrt_userleds.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_userleds.c similarity index 98% rename from boards/arm/imxrt1060-evk/src/imxrt_userleds.c rename to boards/arm/imxrt/imxrt1060-evk/src/imxrt_userleds.c index ab5a63097b7..6ceea974086 100644 --- a/boards/arm/imxrt1060-evk/src/imxrt_userleds.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_userleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/imxrt1060-evk/src/imxrt_userleds.c + * boards/arm/imxrt/imxrt1060-evk/src/imxrt_userleds.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/boards/arm/freedom-k28f/Kconfig b/boards/arm/kinetis/freedom-k28f/Kconfig similarity index 100% rename from boards/arm/freedom-k28f/Kconfig rename to boards/arm/kinetis/freedom-k28f/Kconfig diff --git a/boards/arm/freedom-k28f/README.txt b/boards/arm/kinetis/freedom-k28f/README.txt similarity index 100% rename from boards/arm/freedom-k28f/README.txt rename to boards/arm/kinetis/freedom-k28f/README.txt diff --git a/boards/arm/freedom-k28f/configs/nsh/defconfig b/boards/arm/kinetis/freedom-k28f/configs/nsh/defconfig similarity index 98% rename from boards/arm/freedom-k28f/configs/nsh/defconfig rename to boards/arm/kinetis/freedom-k28f/configs/nsh/defconfig index dc8de79748f..5ef9107f50f 100644 --- a/boards/arm/freedom-k28f/configs/nsh/defconfig +++ b/boards/arm/kinetis/freedom-k28f/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="freedom-k28f" CONFIG_ARCH_BOARD_FREEDOM_K28F=y +CONFIG_ARCH_CHIP="kinetis" CONFIG_ARCH_CHIP_KINETIS=y CONFIG_ARCH_CHIP_MK28FN2M0VMI15=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/freedom-k28f/include/board.h b/boards/arm/kinetis/freedom-k28f/include/board.h similarity index 100% rename from boards/arm/freedom-k28f/include/board.h rename to boards/arm/kinetis/freedom-k28f/include/board.h diff --git a/boards/arm/freedom-k28f/scripts/Make.defs b/boards/arm/kinetis/freedom-k28f/scripts/Make.defs similarity index 96% rename from boards/arm/freedom-k28f/scripts/Make.defs rename to boards/arm/kinetis/freedom-k28f/scripts/Make.defs index 4af2d4cf9b2..7518f112de5 100644 --- a/boards/arm/freedom-k28f/scripts/Make.defs +++ b/boards/arm/kinetis/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/freedom-k28f/scripts/flash.ld b/boards/arm/kinetis/freedom-k28f/scripts/flash.ld similarity index 100% rename from boards/arm/freedom-k28f/scripts/flash.ld rename to boards/arm/kinetis/freedom-k28f/scripts/flash.ld diff --git a/boards/arm/clicker2-stm32/src/.gitignore b/boards/arm/kinetis/freedom-k28f/src/.gitignore similarity index 100% rename from boards/arm/clicker2-stm32/src/.gitignore rename to boards/arm/kinetis/freedom-k28f/src/.gitignore diff --git a/boards/arm/freedom-k28f/src/Makefile b/boards/arm/kinetis/freedom-k28f/src/Makefile similarity index 100% rename from boards/arm/freedom-k28f/src/Makefile rename to boards/arm/kinetis/freedom-k28f/src/Makefile diff --git a/boards/arm/freedom-k28f/src/freedom-k28f.h b/boards/arm/kinetis/freedom-k28f/src/freedom-k28f.h similarity index 100% rename from boards/arm/freedom-k28f/src/freedom-k28f.h rename to boards/arm/kinetis/freedom-k28f/src/freedom-k28f.h diff --git a/boards/arm/freedom-k28f/src/k28_appinit.c b/boards/arm/kinetis/freedom-k28f/src/k28_appinit.c similarity index 100% rename from boards/arm/freedom-k28f/src/k28_appinit.c rename to boards/arm/kinetis/freedom-k28f/src/k28_appinit.c diff --git a/boards/arm/freedom-k28f/src/k28_autoleds.c b/boards/arm/kinetis/freedom-k28f/src/k28_autoleds.c similarity index 100% rename from boards/arm/freedom-k28f/src/k28_autoleds.c rename to boards/arm/kinetis/freedom-k28f/src/k28_autoleds.c diff --git a/boards/arm/freedom-k28f/src/k28_boot.c b/boards/arm/kinetis/freedom-k28f/src/k28_boot.c similarity index 100% rename from boards/arm/freedom-k28f/src/k28_boot.c rename to boards/arm/kinetis/freedom-k28f/src/k28_boot.c diff --git a/boards/arm/freedom-k28f/src/k28_bringup.c b/boards/arm/kinetis/freedom-k28f/src/k28_bringup.c similarity index 100% rename from boards/arm/freedom-k28f/src/k28_bringup.c rename to boards/arm/kinetis/freedom-k28f/src/k28_bringup.c diff --git a/boards/arm/freedom-k28f/src/k28_i2c.c b/boards/arm/kinetis/freedom-k28f/src/k28_i2c.c similarity index 100% rename from boards/arm/freedom-k28f/src/k28_i2c.c rename to boards/arm/kinetis/freedom-k28f/src/k28_i2c.c diff --git a/boards/arm/freedom-k28f/src/k28_pwm.c b/boards/arm/kinetis/freedom-k28f/src/k28_pwm.c similarity index 100% rename from boards/arm/freedom-k28f/src/k28_pwm.c rename to boards/arm/kinetis/freedom-k28f/src/k28_pwm.c diff --git a/boards/arm/freedom-k28f/src/k28_spi.c b/boards/arm/kinetis/freedom-k28f/src/k28_spi.c similarity index 100% rename from boards/arm/freedom-k28f/src/k28_spi.c rename to boards/arm/kinetis/freedom-k28f/src/k28_spi.c diff --git a/boards/arm/freedom-k28f/src/k28_usbdev.c b/boards/arm/kinetis/freedom-k28f/src/k28_usbdev.c similarity index 100% rename from boards/arm/freedom-k28f/src/k28_usbdev.c rename to boards/arm/kinetis/freedom-k28f/src/k28_usbdev.c diff --git a/boards/arm/freedom-k28f/src/k28_userleds.c b/boards/arm/kinetis/freedom-k28f/src/k28_userleds.c similarity index 100% rename from boards/arm/freedom-k28f/src/k28_userleds.c rename to boards/arm/kinetis/freedom-k28f/src/k28_userleds.c diff --git a/boards/arm/freedom-k64f/Kconfig b/boards/arm/kinetis/freedom-k64f/Kconfig similarity index 100% rename from boards/arm/freedom-k64f/Kconfig rename to boards/arm/kinetis/freedom-k64f/Kconfig diff --git a/boards/arm/freedom-k64f/README.txt b/boards/arm/kinetis/freedom-k64f/README.txt similarity index 100% rename from boards/arm/freedom-k64f/README.txt rename to boards/arm/kinetis/freedom-k64f/README.txt diff --git a/boards/arm/freedom-k64f/configs/netnsh/defconfig b/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig similarity index 98% rename from boards/arm/freedom-k64f/configs/netnsh/defconfig rename to boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig index 66499fafa82..593a57b12e5 100644 --- a/boards/arm/freedom-k64f/configs/netnsh/defconfig +++ b/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="freedom-k64f" CONFIG_ARCH_BOARD_FREEDOM_K64F=y +CONFIG_ARCH_CHIP="kinetis" CONFIG_ARCH_CHIP_KINETIS=y CONFIG_ARCH_CHIP_MK64FN1M0VLL12=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/freedom-k64f/configs/nsh/defconfig b/boards/arm/kinetis/freedom-k64f/configs/nsh/defconfig similarity index 98% rename from boards/arm/freedom-k64f/configs/nsh/defconfig rename to boards/arm/kinetis/freedom-k64f/configs/nsh/defconfig index 111b2ab82a6..ab165cceecf 100644 --- a/boards/arm/freedom-k64f/configs/nsh/defconfig +++ b/boards/arm/kinetis/freedom-k64f/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="freedom-k64f" CONFIG_ARCH_BOARD_FREEDOM_K64F=y +CONFIG_ARCH_CHIP="kinetis" CONFIG_ARCH_CHIP_KINETIS=y CONFIG_ARCH_CHIP_MK64FN1M0VLL12=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/freedom-k64f/include/board.h b/boards/arm/kinetis/freedom-k64f/include/board.h similarity index 100% rename from boards/arm/freedom-k64f/include/board.h rename to boards/arm/kinetis/freedom-k64f/include/board.h diff --git a/boards/arm/freedom-k64f/scripts/Make.defs b/boards/arm/kinetis/freedom-k64f/scripts/Make.defs similarity index 96% rename from boards/arm/freedom-k64f/scripts/Make.defs rename to boards/arm/kinetis/freedom-k64f/scripts/Make.defs index e8061c5850d..952897d53af 100644 --- a/boards/arm/freedom-k64f/scripts/Make.defs +++ b/boards/arm/kinetis/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)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/freedom-k64f/scripts/flash.ld b/boards/arm/kinetis/freedom-k64f/scripts/flash.ld similarity index 100% rename from boards/arm/freedom-k64f/scripts/flash.ld rename to boards/arm/kinetis/freedom-k64f/scripts/flash.ld diff --git a/boards/arm/freedom-k64f/src/Makefile b/boards/arm/kinetis/freedom-k64f/src/Makefile similarity index 100% rename from boards/arm/freedom-k64f/src/Makefile rename to boards/arm/kinetis/freedom-k64f/src/Makefile diff --git a/boards/arm/freedom-k64f/src/freedom-k64f.h b/boards/arm/kinetis/freedom-k64f/src/freedom-k64f.h similarity index 100% rename from boards/arm/freedom-k64f/src/freedom-k64f.h rename to boards/arm/kinetis/freedom-k64f/src/freedom-k64f.h diff --git a/boards/arm/freedom-k64f/src/k64_appinit.c b/boards/arm/kinetis/freedom-k64f/src/k64_appinit.c similarity index 100% rename from boards/arm/freedom-k64f/src/k64_appinit.c rename to boards/arm/kinetis/freedom-k64f/src/k64_appinit.c diff --git a/boards/arm/freedom-k64f/src/k64_autoleds.c b/boards/arm/kinetis/freedom-k64f/src/k64_autoleds.c similarity index 100% rename from boards/arm/freedom-k64f/src/k64_autoleds.c rename to boards/arm/kinetis/freedom-k64f/src/k64_autoleds.c diff --git a/boards/arm/freedom-k64f/src/k64_automount.c b/boards/arm/kinetis/freedom-k64f/src/k64_automount.c similarity index 100% rename from boards/arm/freedom-k64f/src/k64_automount.c rename to boards/arm/kinetis/freedom-k64f/src/k64_automount.c diff --git a/boards/arm/freedom-k64f/src/k64_boot.c b/boards/arm/kinetis/freedom-k64f/src/k64_boot.c similarity index 100% rename from boards/arm/freedom-k64f/src/k64_boot.c rename to boards/arm/kinetis/freedom-k64f/src/k64_boot.c diff --git a/boards/arm/freedom-k64f/src/k64_bringup.c b/boards/arm/kinetis/freedom-k64f/src/k64_bringup.c similarity index 100% rename from boards/arm/freedom-k64f/src/k64_bringup.c rename to boards/arm/kinetis/freedom-k64f/src/k64_bringup.c diff --git a/boards/arm/freedom-k64f/src/k64_buttons.c b/boards/arm/kinetis/freedom-k64f/src/k64_buttons.c similarity index 100% rename from boards/arm/freedom-k64f/src/k64_buttons.c rename to boards/arm/kinetis/freedom-k64f/src/k64_buttons.c diff --git a/boards/arm/freedom-k64f/src/k64_pwm.c b/boards/arm/kinetis/freedom-k64f/src/k64_pwm.c similarity index 100% rename from boards/arm/freedom-k64f/src/k64_pwm.c rename to boards/arm/kinetis/freedom-k64f/src/k64_pwm.c diff --git a/boards/arm/freedom-k64f/src/k64_sdhc.c b/boards/arm/kinetis/freedom-k64f/src/k64_sdhc.c similarity index 100% rename from boards/arm/freedom-k64f/src/k64_sdhc.c rename to boards/arm/kinetis/freedom-k64f/src/k64_sdhc.c diff --git a/boards/arm/freedom-k64f/src/k64_spi.c b/boards/arm/kinetis/freedom-k64f/src/k64_spi.c similarity index 100% rename from boards/arm/freedom-k64f/src/k64_spi.c rename to boards/arm/kinetis/freedom-k64f/src/k64_spi.c diff --git a/boards/arm/freedom-k64f/src/k64_uid.c b/boards/arm/kinetis/freedom-k64f/src/k64_uid.c similarity index 100% rename from boards/arm/freedom-k64f/src/k64_uid.c rename to boards/arm/kinetis/freedom-k64f/src/k64_uid.c diff --git a/boards/arm/freedom-k64f/src/k64_usbdev.c b/boards/arm/kinetis/freedom-k64f/src/k64_usbdev.c similarity index 100% rename from boards/arm/freedom-k64f/src/k64_usbdev.c rename to boards/arm/kinetis/freedom-k64f/src/k64_usbdev.c diff --git a/boards/arm/freedom-k64f/src/k64_usbmsc.c b/boards/arm/kinetis/freedom-k64f/src/k64_usbmsc.c similarity index 100% rename from boards/arm/freedom-k64f/src/k64_usbmsc.c rename to boards/arm/kinetis/freedom-k64f/src/k64_usbmsc.c diff --git a/boards/arm/freedom-k64f/src/k64_userleds.c b/boards/arm/kinetis/freedom-k64f/src/k64_userleds.c similarity index 100% rename from boards/arm/freedom-k64f/src/k64_userleds.c rename to boards/arm/kinetis/freedom-k64f/src/k64_userleds.c diff --git a/boards/arm/freedom-k66f/Kconfig b/boards/arm/kinetis/freedom-k66f/Kconfig similarity index 100% rename from boards/arm/freedom-k66f/Kconfig rename to boards/arm/kinetis/freedom-k66f/Kconfig diff --git a/boards/arm/freedom-k66f/README.txt b/boards/arm/kinetis/freedom-k66f/README.txt similarity index 100% rename from boards/arm/freedom-k66f/README.txt rename to boards/arm/kinetis/freedom-k66f/README.txt diff --git a/boards/arm/freedom-k66f/configs/netnsh/defconfig b/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig similarity index 98% rename from boards/arm/freedom-k66f/configs/netnsh/defconfig rename to boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig index 6f5da7a9932..0e545b1aa48 100644 --- a/boards/arm/freedom-k66f/configs/netnsh/defconfig +++ b/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="freedom-k66f" CONFIG_ARCH_BOARD_FREEDOM_K66F=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="kinetis" CONFIG_ARCH_CHIP_KINETIS=y CONFIG_ARCH_CHIP_MK66FN2M0VMD18=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/freedom-k66f/configs/nsh/defconfig b/boards/arm/kinetis/freedom-k66f/configs/nsh/defconfig similarity index 99% rename from boards/arm/freedom-k66f/configs/nsh/defconfig rename to boards/arm/kinetis/freedom-k66f/configs/nsh/defconfig index 9c7cc4aea3a..1566762d8c7 100644 --- a/boards/arm/freedom-k66f/configs/nsh/defconfig +++ b/boards/arm/kinetis/freedom-k66f/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="freedom-k66f" CONFIG_ARCH_BOARD_FREEDOM_K66F=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="kinetis" CONFIG_ARCH_CHIP_KINETIS=y CONFIG_ARCH_CHIP_MK66FN2M0VMD18=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/freedom-k66f/include/board.h b/boards/arm/kinetis/freedom-k66f/include/board.h similarity index 100% rename from boards/arm/freedom-k66f/include/board.h rename to boards/arm/kinetis/freedom-k66f/include/board.h diff --git a/boards/arm/freedom-k66f/scripts/Make.defs b/boards/arm/kinetis/freedom-k66f/scripts/Make.defs similarity index 96% rename from boards/arm/freedom-k66f/scripts/Make.defs rename to boards/arm/kinetis/freedom-k66f/scripts/Make.defs index d7922812b39..8f055d4c99c 100644 --- a/boards/arm/freedom-k66f/scripts/Make.defs +++ b/boards/arm/kinetis/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)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/freedom-k66f/scripts/flash.ld b/boards/arm/kinetis/freedom-k66f/scripts/flash.ld similarity index 100% rename from boards/arm/freedom-k66f/scripts/flash.ld rename to boards/arm/kinetis/freedom-k66f/scripts/flash.ld diff --git a/boards/arm/freedom-k66f/src/Makefile b/boards/arm/kinetis/freedom-k66f/src/Makefile similarity index 100% rename from boards/arm/freedom-k66f/src/Makefile rename to boards/arm/kinetis/freedom-k66f/src/Makefile diff --git a/boards/arm/freedom-k66f/src/freedom-k66f.h b/boards/arm/kinetis/freedom-k66f/src/freedom-k66f.h similarity index 100% rename from boards/arm/freedom-k66f/src/freedom-k66f.h rename to boards/arm/kinetis/freedom-k66f/src/freedom-k66f.h diff --git a/boards/arm/freedom-k66f/src/k66_appinit.c b/boards/arm/kinetis/freedom-k66f/src/k66_appinit.c similarity index 100% rename from boards/arm/freedom-k66f/src/k66_appinit.c rename to boards/arm/kinetis/freedom-k66f/src/k66_appinit.c diff --git a/boards/arm/freedom-k66f/src/k66_autoleds.c b/boards/arm/kinetis/freedom-k66f/src/k66_autoleds.c similarity index 100% rename from boards/arm/freedom-k66f/src/k66_autoleds.c rename to boards/arm/kinetis/freedom-k66f/src/k66_autoleds.c diff --git a/boards/arm/freedom-k66f/src/k66_automount.c b/boards/arm/kinetis/freedom-k66f/src/k66_automount.c similarity index 100% rename from boards/arm/freedom-k66f/src/k66_automount.c rename to boards/arm/kinetis/freedom-k66f/src/k66_automount.c diff --git a/boards/arm/freedom-k66f/src/k66_boot.c b/boards/arm/kinetis/freedom-k66f/src/k66_boot.c similarity index 100% rename from boards/arm/freedom-k66f/src/k66_boot.c rename to boards/arm/kinetis/freedom-k66f/src/k66_boot.c diff --git a/boards/arm/freedom-k66f/src/k66_bringup.c b/boards/arm/kinetis/freedom-k66f/src/k66_bringup.c similarity index 100% rename from boards/arm/freedom-k66f/src/k66_bringup.c rename to boards/arm/kinetis/freedom-k66f/src/k66_bringup.c diff --git a/boards/arm/freedom-k66f/src/k66_buttons.c b/boards/arm/kinetis/freedom-k66f/src/k66_buttons.c similarity index 100% rename from boards/arm/freedom-k66f/src/k66_buttons.c rename to boards/arm/kinetis/freedom-k66f/src/k66_buttons.c diff --git a/boards/arm/freedom-k66f/src/k66_pwm.c b/boards/arm/kinetis/freedom-k66f/src/k66_pwm.c similarity index 100% rename from boards/arm/freedom-k66f/src/k66_pwm.c rename to boards/arm/kinetis/freedom-k66f/src/k66_pwm.c diff --git a/boards/arm/freedom-k66f/src/k66_reset.c b/boards/arm/kinetis/freedom-k66f/src/k66_reset.c similarity index 100% rename from boards/arm/freedom-k66f/src/k66_reset.c rename to boards/arm/kinetis/freedom-k66f/src/k66_reset.c diff --git a/boards/arm/freedom-k66f/src/k66_rtc.c b/boards/arm/kinetis/freedom-k66f/src/k66_rtc.c similarity index 100% rename from boards/arm/freedom-k66f/src/k66_rtc.c rename to boards/arm/kinetis/freedom-k66f/src/k66_rtc.c diff --git a/boards/arm/freedom-k66f/src/k66_sdhc.c b/boards/arm/kinetis/freedom-k66f/src/k66_sdhc.c similarity index 100% rename from boards/arm/freedom-k66f/src/k66_sdhc.c rename to boards/arm/kinetis/freedom-k66f/src/k66_sdhc.c diff --git a/boards/arm/freedom-k66f/src/k66_spi.c b/boards/arm/kinetis/freedom-k66f/src/k66_spi.c similarity index 100% rename from boards/arm/freedom-k66f/src/k66_spi.c rename to boards/arm/kinetis/freedom-k66f/src/k66_spi.c diff --git a/boards/arm/freedom-k66f/src/k66_uid.c b/boards/arm/kinetis/freedom-k66f/src/k66_uid.c similarity index 100% rename from boards/arm/freedom-k66f/src/k66_uid.c rename to boards/arm/kinetis/freedom-k66f/src/k66_uid.c diff --git a/boards/arm/freedom-k66f/src/k66_usbdev.c b/boards/arm/kinetis/freedom-k66f/src/k66_usbdev.c similarity index 100% rename from boards/arm/freedom-k66f/src/k66_usbdev.c rename to boards/arm/kinetis/freedom-k66f/src/k66_usbdev.c diff --git a/boards/arm/freedom-k66f/src/k66_usbmsc.c b/boards/arm/kinetis/freedom-k66f/src/k66_usbmsc.c similarity index 100% rename from boards/arm/freedom-k66f/src/k66_usbmsc.c rename to boards/arm/kinetis/freedom-k66f/src/k66_usbmsc.c diff --git a/boards/arm/freedom-k66f/src/k66_userleds.c b/boards/arm/kinetis/freedom-k66f/src/k66_userleds.c similarity index 100% rename from boards/arm/freedom-k66f/src/k66_userleds.c rename to boards/arm/kinetis/freedom-k66f/src/k66_userleds.c diff --git a/boards/arm/kwikstik-k40/Kconfig b/boards/arm/kinetis/kwikstik-k40/Kconfig similarity index 100% rename from boards/arm/kwikstik-k40/Kconfig rename to boards/arm/kinetis/kwikstik-k40/Kconfig diff --git a/boards/arm/kwikstik-k40/README.txt b/boards/arm/kinetis/kwikstik-k40/README.txt similarity index 100% rename from boards/arm/kwikstik-k40/README.txt rename to boards/arm/kinetis/kwikstik-k40/README.txt diff --git a/boards/arm/kwikstik-k40/configs/ostest/defconfig b/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig similarity index 97% rename from boards/arm/kwikstik-k40/configs/ostest/defconfig rename to boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig index 0120a411d4b..192577627f6 100644 --- a/boards/arm/kwikstik-k40/configs/ostest/defconfig +++ b/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="kwikstik-k40" CONFIG_ARCH_BOARD_KWIKSTIK_K40=y +CONFIG_ARCH_CHIP="kinetis" CONFIG_ARCH_CHIP_KINETIS=y CONFIG_ARCH_CHIP_MK40X256VLQ100=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/kwikstik-k40/include/board.h b/boards/arm/kinetis/kwikstik-k40/include/board.h similarity index 100% rename from boards/arm/kwikstik-k40/include/board.h rename to boards/arm/kinetis/kwikstik-k40/include/board.h diff --git a/boards/arm/kwikstik-k40/scripts/Make.defs b/boards/arm/kinetis/kwikstik-k40/scripts/Make.defs similarity index 95% rename from boards/arm/kwikstik-k40/scripts/Make.defs rename to boards/arm/kinetis/kwikstik-k40/scripts/Make.defs index 51cff8f7903..982e75325f0 100644 --- a/boards/arm/kwikstik-k40/scripts/Make.defs +++ b/boards/arm/kinetis/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)/$(CONFIG_ARCH_BOARD)/scripts/kwikstik-k40.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/kwikstik-k40.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/kwikstik-k40.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/kwikstik-k40/scripts/kwikstik-k40.ld b/boards/arm/kinetis/kwikstik-k40/scripts/kwikstik-k40.ld similarity index 100% rename from boards/arm/kwikstik-k40/scripts/kwikstik-k40.ld rename to boards/arm/kinetis/kwikstik-k40/scripts/kwikstik-k40.ld diff --git a/boards/arm/cloudctrl/src/.gitignore b/boards/arm/kinetis/kwikstik-k40/src/.gitignore similarity index 100% rename from boards/arm/cloudctrl/src/.gitignore rename to boards/arm/kinetis/kwikstik-k40/src/.gitignore diff --git a/boards/arm/kwikstik-k40/src/Makefile b/boards/arm/kinetis/kwikstik-k40/src/Makefile similarity index 100% rename from boards/arm/kwikstik-k40/src/Makefile rename to boards/arm/kinetis/kwikstik-k40/src/Makefile diff --git a/boards/arm/kwikstik-k40/src/k40_appinit.c b/boards/arm/kinetis/kwikstik-k40/src/k40_appinit.c similarity index 100% rename from boards/arm/kwikstik-k40/src/k40_appinit.c rename to boards/arm/kinetis/kwikstik-k40/src/k40_appinit.c diff --git a/boards/arm/kwikstik-k40/src/k40_boot.c b/boards/arm/kinetis/kwikstik-k40/src/k40_boot.c similarity index 100% rename from boards/arm/kwikstik-k40/src/k40_boot.c rename to boards/arm/kinetis/kwikstik-k40/src/k40_boot.c diff --git a/boards/arm/kwikstik-k40/src/k40_buttons.c b/boards/arm/kinetis/kwikstik-k40/src/k40_buttons.c similarity index 100% rename from boards/arm/kwikstik-k40/src/k40_buttons.c rename to boards/arm/kinetis/kwikstik-k40/src/k40_buttons.c diff --git a/boards/arm/kwikstik-k40/src/k40_lcd.c b/boards/arm/kinetis/kwikstik-k40/src/k40_lcd.c similarity index 100% rename from boards/arm/kwikstik-k40/src/k40_lcd.c rename to boards/arm/kinetis/kwikstik-k40/src/k40_lcd.c diff --git a/boards/arm/kwikstik-k40/src/k40_leds.c b/boards/arm/kinetis/kwikstik-k40/src/k40_leds.c similarity index 100% rename from boards/arm/kwikstik-k40/src/k40_leds.c rename to boards/arm/kinetis/kwikstik-k40/src/k40_leds.c diff --git a/boards/arm/kwikstik-k40/src/k40_spi.c b/boards/arm/kinetis/kwikstik-k40/src/k40_spi.c similarity index 100% rename from boards/arm/kwikstik-k40/src/k40_spi.c rename to boards/arm/kinetis/kwikstik-k40/src/k40_spi.c diff --git a/boards/arm/kwikstik-k40/src/k40_usbdev.c b/boards/arm/kinetis/kwikstik-k40/src/k40_usbdev.c similarity index 100% rename from boards/arm/kwikstik-k40/src/k40_usbdev.c rename to boards/arm/kinetis/kwikstik-k40/src/k40_usbdev.c diff --git a/boards/arm/kwikstik-k40/src/k40_usbmsc.c b/boards/arm/kinetis/kwikstik-k40/src/k40_usbmsc.c similarity index 100% rename from boards/arm/kwikstik-k40/src/k40_usbmsc.c rename to boards/arm/kinetis/kwikstik-k40/src/k40_usbmsc.c diff --git a/boards/arm/kwikstik-k40/src/kwikstik-k40.h b/boards/arm/kinetis/kwikstik-k40/src/kwikstik-k40.h similarity index 100% rename from boards/arm/kwikstik-k40/src/kwikstik-k40.h rename to boards/arm/kinetis/kwikstik-k40/src/kwikstik-k40.h diff --git a/boards/arm/teensy-3.x/Kconfig b/boards/arm/kinetis/teensy-3.x/Kconfig similarity index 100% rename from boards/arm/teensy-3.x/Kconfig rename to boards/arm/kinetis/teensy-3.x/Kconfig diff --git a/boards/arm/teensy-3.x/README.txt b/boards/arm/kinetis/teensy-3.x/README.txt similarity index 100% rename from boards/arm/teensy-3.x/README.txt rename to boards/arm/kinetis/teensy-3.x/README.txt diff --git a/boards/arm/teensy-3.x/configs/nsh/defconfig b/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig similarity index 98% rename from boards/arm/teensy-3.x/configs/nsh/defconfig rename to boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig index 9d0b8d19c9a..2ce411cbeef 100644 --- a/boards/arm/teensy-3.x/configs/nsh/defconfig +++ b/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="teensy-3.x" CONFIG_ARCH_BOARD_TEENSY_3X=y +CONFIG_ARCH_CHIP="kinetis" CONFIG_ARCH_CHIP_KINETIS=y CONFIG_ARCH_CHIP_MK20DX256VLH7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/teensy-3.x/configs/usbnsh/defconfig b/boards/arm/kinetis/teensy-3.x/configs/usbnsh/defconfig similarity index 98% rename from boards/arm/teensy-3.x/configs/usbnsh/defconfig rename to boards/arm/kinetis/teensy-3.x/configs/usbnsh/defconfig index 0b8510ac789..10a0bec317a 100644 --- a/boards/arm/teensy-3.x/configs/usbnsh/defconfig +++ b/boards/arm/kinetis/teensy-3.x/configs/usbnsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="teensy-3.x" CONFIG_ARCH_BOARD_TEENSY_3X=y +CONFIG_ARCH_CHIP="kinetis" CONFIG_ARCH_CHIP_KINETIS=y CONFIG_ARCH_CHIP_MK20DX256VLH7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/teensy-3.x/include/board.h b/boards/arm/kinetis/teensy-3.x/include/board.h similarity index 100% rename from boards/arm/teensy-3.x/include/board.h rename to boards/arm/kinetis/teensy-3.x/include/board.h diff --git a/boards/arm/teensy-3.x/scripts/Make.defs b/boards/arm/kinetis/teensy-3.x/scripts/Make.defs similarity index 96% rename from boards/arm/teensy-3.x/scripts/Make.defs rename to boards/arm/kinetis/teensy-3.x/scripts/Make.defs index 78b0bcee8b0..30f92518122 100644 --- a/boards/arm/teensy-3.x/scripts/Make.defs +++ b/boards/arm/kinetis/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/teensy-3.x/scripts/mk20dx128vlh5.ld b/boards/arm/kinetis/teensy-3.x/scripts/mk20dx128vlh5.ld similarity index 100% rename from boards/arm/teensy-3.x/scripts/mk20dx128vlh5.ld rename to boards/arm/kinetis/teensy-3.x/scripts/mk20dx128vlh5.ld diff --git a/boards/arm/teensy-3.x/scripts/mk20dx256vlh7.ld b/boards/arm/kinetis/teensy-3.x/scripts/mk20dx256vlh7.ld similarity index 100% rename from boards/arm/teensy-3.x/scripts/mk20dx256vlh7.ld rename to boards/arm/kinetis/teensy-3.x/scripts/mk20dx256vlh7.ld diff --git a/boards/arm/dk-tm4c129x/src/.gitignore b/boards/arm/kinetis/teensy-3.x/src/.gitignore similarity index 100% rename from boards/arm/dk-tm4c129x/src/.gitignore rename to boards/arm/kinetis/teensy-3.x/src/.gitignore diff --git a/boards/arm/teensy-3.x/src/Makefile b/boards/arm/kinetis/teensy-3.x/src/Makefile similarity index 100% rename from boards/arm/teensy-3.x/src/Makefile rename to boards/arm/kinetis/teensy-3.x/src/Makefile diff --git a/boards/arm/teensy-3.x/src/k20_appinit.c b/boards/arm/kinetis/teensy-3.x/src/k20_appinit.c similarity index 100% rename from boards/arm/teensy-3.x/src/k20_appinit.c rename to boards/arm/kinetis/teensy-3.x/src/k20_appinit.c diff --git a/boards/arm/teensy-3.x/src/k20_autoleds.c b/boards/arm/kinetis/teensy-3.x/src/k20_autoleds.c similarity index 100% rename from boards/arm/teensy-3.x/src/k20_autoleds.c rename to boards/arm/kinetis/teensy-3.x/src/k20_autoleds.c diff --git a/boards/arm/teensy-3.x/src/k20_boot.c b/boards/arm/kinetis/teensy-3.x/src/k20_boot.c similarity index 100% rename from boards/arm/teensy-3.x/src/k20_boot.c rename to boards/arm/kinetis/teensy-3.x/src/k20_boot.c diff --git a/boards/arm/teensy-3.x/src/k20_i2c.c b/boards/arm/kinetis/teensy-3.x/src/k20_i2c.c similarity index 100% rename from boards/arm/teensy-3.x/src/k20_i2c.c rename to boards/arm/kinetis/teensy-3.x/src/k20_i2c.c diff --git a/boards/arm/teensy-3.x/src/k20_pwm.c b/boards/arm/kinetis/teensy-3.x/src/k20_pwm.c similarity index 100% rename from boards/arm/teensy-3.x/src/k20_pwm.c rename to boards/arm/kinetis/teensy-3.x/src/k20_pwm.c diff --git a/boards/arm/teensy-3.x/src/k20_spi.c b/boards/arm/kinetis/teensy-3.x/src/k20_spi.c similarity index 100% rename from boards/arm/teensy-3.x/src/k20_spi.c rename to boards/arm/kinetis/teensy-3.x/src/k20_spi.c diff --git a/boards/arm/teensy-3.x/src/k20_usbdev.c b/boards/arm/kinetis/teensy-3.x/src/k20_usbdev.c similarity index 100% rename from boards/arm/teensy-3.x/src/k20_usbdev.c rename to boards/arm/kinetis/teensy-3.x/src/k20_usbdev.c diff --git a/boards/arm/teensy-3.x/src/k20_userleds.c b/boards/arm/kinetis/teensy-3.x/src/k20_userleds.c similarity index 100% rename from boards/arm/teensy-3.x/src/k20_userleds.c rename to boards/arm/kinetis/teensy-3.x/src/k20_userleds.c diff --git a/boards/arm/teensy-3.x/src/teensy-3x.h b/boards/arm/kinetis/teensy-3.x/src/teensy-3x.h similarity index 100% rename from boards/arm/teensy-3.x/src/teensy-3x.h rename to boards/arm/kinetis/teensy-3.x/src/teensy-3x.h diff --git a/boards/arm/twr-k60n512/Kconfig b/boards/arm/kinetis/twr-k60n512/Kconfig similarity index 100% rename from boards/arm/twr-k60n512/Kconfig rename to boards/arm/kinetis/twr-k60n512/Kconfig diff --git a/boards/arm/twr-k60n512/README.txt b/boards/arm/kinetis/twr-k60n512/README.txt similarity index 100% rename from boards/arm/twr-k60n512/README.txt rename to boards/arm/kinetis/twr-k60n512/README.txt diff --git a/boards/arm/twr-k60n512/configs/nsh/defconfig b/boards/arm/kinetis/twr-k60n512/configs/nsh/defconfig similarity index 97% rename from boards/arm/twr-k60n512/configs/nsh/defconfig rename to boards/arm/kinetis/twr-k60n512/configs/nsh/defconfig index 42e072a80ad..cd9f90ced84 100644 --- a/boards/arm/twr-k60n512/configs/nsh/defconfig +++ b/boards/arm/kinetis/twr-k60n512/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="twr-k60n512" CONFIG_ARCH_BOARD_TWR_K60N512=y +CONFIG_ARCH_CHIP="kinetis" CONFIG_ARCH_CHIP_KINETIS=y CONFIG_ARCH_CHIP_MK60N512VMD100=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/twr-k60n512/include/board.h b/boards/arm/kinetis/twr-k60n512/include/board.h similarity index 100% rename from boards/arm/twr-k60n512/include/board.h rename to boards/arm/kinetis/twr-k60n512/include/board.h diff --git a/boards/arm/twr-k60n512/scripts/Make.defs b/boards/arm/kinetis/twr-k60n512/scripts/Make.defs similarity index 95% rename from boards/arm/twr-k60n512/scripts/Make.defs rename to boards/arm/kinetis/twr-k60n512/scripts/Make.defs index 1351011c6cb..6588de5c421 100644 --- a/boards/arm/twr-k60n512/scripts/Make.defs +++ b/boards/arm/kinetis/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)/$(CONFIG_ARCH_BOARD)/scripts/twr-k60n512.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/twr-k60n512.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/twr-k60n512.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/twr-k60n512/scripts/twr-k60n512.ld b/boards/arm/kinetis/twr-k60n512/scripts/twr-k60n512.ld similarity index 100% rename from boards/arm/twr-k60n512/scripts/twr-k60n512.ld rename to boards/arm/kinetis/twr-k60n512/scripts/twr-k60n512.ld diff --git a/boards/arm/ea3131/src/.gitignore b/boards/arm/kinetis/twr-k60n512/src/.gitignore similarity index 100% rename from boards/arm/ea3131/src/.gitignore rename to boards/arm/kinetis/twr-k60n512/src/.gitignore diff --git a/boards/arm/twr-k60n512/src/Makefile b/boards/arm/kinetis/twr-k60n512/src/Makefile similarity index 100% rename from boards/arm/twr-k60n512/src/Makefile rename to boards/arm/kinetis/twr-k60n512/src/Makefile diff --git a/boards/arm/twr-k60n512/src/k60_appinit.c b/boards/arm/kinetis/twr-k60n512/src/k60_appinit.c similarity index 100% rename from boards/arm/twr-k60n512/src/k60_appinit.c rename to boards/arm/kinetis/twr-k60n512/src/k60_appinit.c diff --git a/boards/arm/twr-k60n512/src/k60_boot.c b/boards/arm/kinetis/twr-k60n512/src/k60_boot.c similarity index 100% rename from boards/arm/twr-k60n512/src/k60_boot.c rename to boards/arm/kinetis/twr-k60n512/src/k60_boot.c diff --git a/boards/arm/twr-k60n512/src/k60_buttons.c b/boards/arm/kinetis/twr-k60n512/src/k60_buttons.c similarity index 100% rename from boards/arm/twr-k60n512/src/k60_buttons.c rename to boards/arm/kinetis/twr-k60n512/src/k60_buttons.c diff --git a/boards/arm/twr-k60n512/src/k60_leds.c b/boards/arm/kinetis/twr-k60n512/src/k60_leds.c similarity index 100% rename from boards/arm/twr-k60n512/src/k60_leds.c rename to boards/arm/kinetis/twr-k60n512/src/k60_leds.c diff --git a/boards/arm/twr-k60n512/src/k60_spi.c b/boards/arm/kinetis/twr-k60n512/src/k60_spi.c similarity index 100% rename from boards/arm/twr-k60n512/src/k60_spi.c rename to boards/arm/kinetis/twr-k60n512/src/k60_spi.c diff --git a/boards/arm/twr-k60n512/src/k60_usbdev.c b/boards/arm/kinetis/twr-k60n512/src/k60_usbdev.c similarity index 100% rename from boards/arm/twr-k60n512/src/k60_usbdev.c rename to boards/arm/kinetis/twr-k60n512/src/k60_usbdev.c diff --git a/boards/arm/twr-k60n512/src/k60_usbmsc.c b/boards/arm/kinetis/twr-k60n512/src/k60_usbmsc.c similarity index 100% rename from boards/arm/twr-k60n512/src/k60_usbmsc.c rename to boards/arm/kinetis/twr-k60n512/src/k60_usbmsc.c diff --git a/boards/arm/twr-k60n512/src/twr-k60n512.h b/boards/arm/kinetis/twr-k60n512/src/twr-k60n512.h similarity index 100% rename from boards/arm/twr-k60n512/src/twr-k60n512.h rename to boards/arm/kinetis/twr-k60n512/src/twr-k60n512.h diff --git a/boards/arm/twr-k64f120m/Kconfig b/boards/arm/kinetis/twr-k64f120m/Kconfig similarity index 100% rename from boards/arm/twr-k64f120m/Kconfig rename to boards/arm/kinetis/twr-k64f120m/Kconfig diff --git a/boards/arm/twr-k64f120m/README.txt b/boards/arm/kinetis/twr-k64f120m/README.txt similarity index 100% rename from boards/arm/twr-k64f120m/README.txt rename to boards/arm/kinetis/twr-k64f120m/README.txt diff --git a/boards/arm/twr-k64f120m/configs/netnsh/defconfig b/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig similarity index 98% rename from boards/arm/twr-k64f120m/configs/netnsh/defconfig rename to boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig index 8ba8c7d8128..4790e6f323d 100644 --- a/boards/arm/twr-k64f120m/configs/netnsh/defconfig +++ b/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="twr-k64f120m" CONFIG_ARCH_BOARD_TWR_K64F120M=y +CONFIG_ARCH_CHIP="kinetis" CONFIG_ARCH_CHIP_KINETIS=y CONFIG_ARCH_CHIP_MK64FN1M0VMD12=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/twr-k64f120m/configs/nsh/defconfig b/boards/arm/kinetis/twr-k64f120m/configs/nsh/defconfig similarity index 98% rename from boards/arm/twr-k64f120m/configs/nsh/defconfig rename to boards/arm/kinetis/twr-k64f120m/configs/nsh/defconfig index bd8508fc052..4cf61afef40 100644 --- a/boards/arm/twr-k64f120m/configs/nsh/defconfig +++ b/boards/arm/kinetis/twr-k64f120m/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="twr-k64f120m" CONFIG_ARCH_BOARD_TWR_K64F120M=y +CONFIG_ARCH_CHIP="kinetis" CONFIG_ARCH_CHIP_KINETIS=y CONFIG_ARCH_CHIP_MK64FN1M0VMD12=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/twr-k64f120m/include/board.h b/boards/arm/kinetis/twr-k64f120m/include/board.h similarity index 100% rename from boards/arm/twr-k64f120m/include/board.h rename to boards/arm/kinetis/twr-k64f120m/include/board.h diff --git a/boards/arm/twr-k64f120m/scripts/Make.defs b/boards/arm/kinetis/twr-k64f120m/scripts/Make.defs similarity index 96% rename from boards/arm/twr-k64f120m/scripts/Make.defs rename to boards/arm/kinetis/twr-k64f120m/scripts/Make.defs index 7663228ac06..e61ebec7b21 100644 --- a/boards/arm/twr-k64f120m/scripts/Make.defs +++ b/boards/arm/kinetis/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/twr-k64f120m/scripts/ld.script b/boards/arm/kinetis/twr-k64f120m/scripts/ld.script similarity index 100% rename from boards/arm/twr-k64f120m/scripts/ld.script rename to boards/arm/kinetis/twr-k64f120m/scripts/ld.script diff --git a/boards/arm/twr-k64f120m/src/Makefile b/boards/arm/kinetis/twr-k64f120m/src/Makefile similarity index 100% rename from boards/arm/twr-k64f120m/src/Makefile rename to boards/arm/kinetis/twr-k64f120m/src/Makefile diff --git a/boards/arm/twr-k64f120m/src/k64_appinit.c b/boards/arm/kinetis/twr-k64f120m/src/k64_appinit.c similarity index 100% rename from boards/arm/twr-k64f120m/src/k64_appinit.c rename to boards/arm/kinetis/twr-k64f120m/src/k64_appinit.c diff --git a/boards/arm/twr-k64f120m/src/k64_automount.c b/boards/arm/kinetis/twr-k64f120m/src/k64_automount.c similarity index 100% rename from boards/arm/twr-k64f120m/src/k64_automount.c rename to boards/arm/kinetis/twr-k64f120m/src/k64_automount.c diff --git a/boards/arm/twr-k64f120m/src/k64_boot.c b/boards/arm/kinetis/twr-k64f120m/src/k64_boot.c similarity index 100% rename from boards/arm/twr-k64f120m/src/k64_boot.c rename to boards/arm/kinetis/twr-k64f120m/src/k64_boot.c diff --git a/boards/arm/twr-k64f120m/src/k64_leds.c b/boards/arm/kinetis/twr-k64f120m/src/k64_leds.c similarity index 100% rename from boards/arm/twr-k64f120m/src/k64_leds.c rename to boards/arm/kinetis/twr-k64f120m/src/k64_leds.c diff --git a/boards/arm/twr-k64f120m/src/k64_sdhc.c b/boards/arm/kinetis/twr-k64f120m/src/k64_sdhc.c similarity index 100% rename from boards/arm/twr-k64f120m/src/k64_sdhc.c rename to boards/arm/kinetis/twr-k64f120m/src/k64_sdhc.c diff --git a/boards/arm/twr-k64f120m/src/twrk64.h b/boards/arm/kinetis/twr-k64f120m/src/twrk64.h similarity index 100% rename from boards/arm/twr-k64f120m/src/twrk64.h rename to boards/arm/kinetis/twr-k64f120m/src/twrk64.h diff --git a/boards/arm/freedom-kl25z/Kconfig b/boards/arm/kl/freedom-kl25z/Kconfig similarity index 100% rename from boards/arm/freedom-kl25z/Kconfig rename to boards/arm/kl/freedom-kl25z/Kconfig diff --git a/boards/arm/freedom-kl25z/README.txt b/boards/arm/kl/freedom-kl25z/README.txt similarity index 100% rename from boards/arm/freedom-kl25z/README.txt rename to boards/arm/kl/freedom-kl25z/README.txt diff --git a/boards/arm/freedom-kl25z/configs/nsh/defconfig b/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig similarity index 98% rename from boards/arm/freedom-kl25z/configs/nsh/defconfig rename to boards/arm/kl/freedom-kl25z/configs/nsh/defconfig index 0148ad1edfb..820af374bb4 100644 --- a/boards/arm/freedom-kl25z/configs/nsh/defconfig +++ b/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="freedom-kl25z" CONFIG_ARCH_BOARD_FREEDOM_KL25Z=y +CONFIG_ARCH_CHIP="kl" CONFIG_ARCH_CHIP_KL=y CONFIG_ARCH_CHIP_MKL25Z128=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/freedom-kl25z/include/board.h b/boards/arm/kl/freedom-kl25z/include/board.h similarity index 100% rename from boards/arm/freedom-kl25z/include/board.h rename to boards/arm/kl/freedom-kl25z/include/board.h diff --git a/boards/arm/freedom-kl25z/scripts/Make.defs b/boards/arm/kl/freedom-kl25z/scripts/Make.defs similarity index 96% rename from boards/arm/freedom-kl25z/scripts/Make.defs rename to boards/arm/kl/freedom-kl25z/scripts/Make.defs index 486f1cf3592..0132a90c95b 100644 --- a/boards/arm/freedom-kl25z/scripts/Make.defs +++ b/boards/arm/kl/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/freedom-kl25z/scripts/freedom-kl25z.ld b/boards/arm/kl/freedom-kl25z/scripts/freedom-kl25z.ld similarity index 100% rename from boards/arm/freedom-kl25z/scripts/freedom-kl25z.ld rename to boards/arm/kl/freedom-kl25z/scripts/freedom-kl25z.ld diff --git a/boards/arm/ea3152/src/.gitignore b/boards/arm/kl/freedom-kl25z/src/.gitignore similarity index 100% rename from boards/arm/ea3152/src/.gitignore rename to boards/arm/kl/freedom-kl25z/src/.gitignore diff --git a/boards/arm/freedom-kl25z/src/Makefile b/boards/arm/kl/freedom-kl25z/src/Makefile similarity index 100% rename from boards/arm/freedom-kl25z/src/Makefile rename to boards/arm/kl/freedom-kl25z/src/Makefile diff --git a/boards/arm/freedom-kl25z/src/freedom-kl25z.h b/boards/arm/kl/freedom-kl25z/src/freedom-kl25z.h similarity index 100% rename from boards/arm/freedom-kl25z/src/freedom-kl25z.h rename to boards/arm/kl/freedom-kl25z/src/freedom-kl25z.h diff --git a/boards/arm/freedom-kl25z/src/kl_adxl345.c b/boards/arm/kl/freedom-kl25z/src/kl_adxl345.c similarity index 100% rename from boards/arm/freedom-kl25z/src/kl_adxl345.c rename to boards/arm/kl/freedom-kl25z/src/kl_adxl345.c diff --git a/boards/arm/freedom-kl25z/src/kl_appinit.c b/boards/arm/kl/freedom-kl25z/src/kl_appinit.c similarity index 100% rename from boards/arm/freedom-kl25z/src/kl_appinit.c rename to boards/arm/kl/freedom-kl25z/src/kl_appinit.c diff --git a/boards/arm/freedom-kl25z/src/kl_boardinitialize.c b/boards/arm/kl/freedom-kl25z/src/kl_boardinitialize.c similarity index 100% rename from boards/arm/freedom-kl25z/src/kl_boardinitialize.c rename to boards/arm/kl/freedom-kl25z/src/kl_boardinitialize.c diff --git a/boards/arm/freedom-kl25z/src/kl_led.c b/boards/arm/kl/freedom-kl25z/src/kl_led.c similarity index 100% rename from boards/arm/freedom-kl25z/src/kl_led.c rename to boards/arm/kl/freedom-kl25z/src/kl_led.c diff --git a/boards/arm/freedom-kl25z/src/kl_pwm.c b/boards/arm/kl/freedom-kl25z/src/kl_pwm.c similarity index 100% rename from boards/arm/freedom-kl25z/src/kl_pwm.c rename to boards/arm/kl/freedom-kl25z/src/kl_pwm.c diff --git a/boards/arm/freedom-kl25z/src/kl_spi.c b/boards/arm/kl/freedom-kl25z/src/kl_spi.c similarity index 100% rename from boards/arm/freedom-kl25z/src/kl_spi.c rename to boards/arm/kl/freedom-kl25z/src/kl_spi.c diff --git a/boards/arm/freedom-kl25z/src/kl_tsi.c b/boards/arm/kl/freedom-kl25z/src/kl_tsi.c similarity index 100% rename from boards/arm/freedom-kl25z/src/kl_tsi.c rename to boards/arm/kl/freedom-kl25z/src/kl_tsi.c diff --git a/boards/arm/freedom-kl26z/Kconfig b/boards/arm/kl/freedom-kl26z/Kconfig similarity index 100% rename from boards/arm/freedom-kl26z/Kconfig rename to boards/arm/kl/freedom-kl26z/Kconfig diff --git a/boards/arm/freedom-kl26z/README.txt b/boards/arm/kl/freedom-kl26z/README.txt similarity index 100% rename from boards/arm/freedom-kl26z/README.txt rename to boards/arm/kl/freedom-kl26z/README.txt diff --git a/boards/arm/freedom-kl26z/configs/nsh/defconfig b/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig similarity index 98% rename from boards/arm/freedom-kl26z/configs/nsh/defconfig rename to boards/arm/kl/freedom-kl26z/configs/nsh/defconfig index 871a7f0425a..af917e497aa 100644 --- a/boards/arm/freedom-kl26z/configs/nsh/defconfig +++ b/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="freedom-kl26z" CONFIG_ARCH_BOARD_FREEDOM_KL26Z=y +CONFIG_ARCH_CHIP="kl" CONFIG_ARCH_CHIP_KL=y CONFIG_ARCH_CHIP_MKL26Z128=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/freedom-kl26z/include/board.h b/boards/arm/kl/freedom-kl26z/include/board.h similarity index 100% rename from boards/arm/freedom-kl26z/include/board.h rename to boards/arm/kl/freedom-kl26z/include/board.h diff --git a/boards/arm/freedom-kl26z/scripts/Make.defs b/boards/arm/kl/freedom-kl26z/scripts/Make.defs similarity index 96% rename from boards/arm/freedom-kl26z/scripts/Make.defs rename to boards/arm/kl/freedom-kl26z/scripts/Make.defs index 35a3bba2867..b1d739900ad 100644 --- a/boards/arm/freedom-kl26z/scripts/Make.defs +++ b/boards/arm/kl/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/freedom-kl26z/scripts/freedom-kl26z.ld b/boards/arm/kl/freedom-kl26z/scripts/freedom-kl26z.ld similarity index 100% rename from boards/arm/freedom-kl26z/scripts/freedom-kl26z.ld rename to boards/arm/kl/freedom-kl26z/scripts/freedom-kl26z.ld diff --git a/boards/arm/eagle100/src/.gitignore b/boards/arm/kl/freedom-kl26z/src/.gitignore similarity index 100% rename from boards/arm/eagle100/src/.gitignore rename to boards/arm/kl/freedom-kl26z/src/.gitignore diff --git a/boards/arm/freedom-kl26z/src/Makefile b/boards/arm/kl/freedom-kl26z/src/Makefile similarity index 100% rename from boards/arm/freedom-kl26z/src/Makefile rename to boards/arm/kl/freedom-kl26z/src/Makefile diff --git a/boards/arm/freedom-kl26z/src/freedom-kl26z.h b/boards/arm/kl/freedom-kl26z/src/freedom-kl26z.h similarity index 100% rename from boards/arm/freedom-kl26z/src/freedom-kl26z.h rename to boards/arm/kl/freedom-kl26z/src/freedom-kl26z.h diff --git a/boards/arm/freedom-kl26z/src/kl_appinit.c b/boards/arm/kl/freedom-kl26z/src/kl_appinit.c similarity index 100% rename from boards/arm/freedom-kl26z/src/kl_appinit.c rename to boards/arm/kl/freedom-kl26z/src/kl_appinit.c diff --git a/boards/arm/freedom-kl26z/src/kl_boardinitialize.c b/boards/arm/kl/freedom-kl26z/src/kl_boardinitialize.c similarity index 100% rename from boards/arm/freedom-kl26z/src/kl_boardinitialize.c rename to boards/arm/kl/freedom-kl26z/src/kl_boardinitialize.c diff --git a/boards/arm/freedom-kl26z/src/kl_led.c b/boards/arm/kl/freedom-kl26z/src/kl_led.c similarity index 100% rename from boards/arm/freedom-kl26z/src/kl_led.c rename to boards/arm/kl/freedom-kl26z/src/kl_led.c diff --git a/boards/arm/freedom-kl26z/src/kl_pwm.c b/boards/arm/kl/freedom-kl26z/src/kl_pwm.c similarity index 100% rename from boards/arm/freedom-kl26z/src/kl_pwm.c rename to boards/arm/kl/freedom-kl26z/src/kl_pwm.c diff --git a/boards/arm/freedom-kl26z/src/kl_spi.c b/boards/arm/kl/freedom-kl26z/src/kl_spi.c similarity index 100% rename from boards/arm/freedom-kl26z/src/kl_spi.c rename to boards/arm/kl/freedom-kl26z/src/kl_spi.c diff --git a/boards/arm/freedom-kl26z/src/kl_tsi.c b/boards/arm/kl/freedom-kl26z/src/kl_tsi.c similarity index 100% rename from boards/arm/freedom-kl26z/src/kl_tsi.c rename to boards/arm/kl/freedom-kl26z/src/kl_tsi.c diff --git a/boards/arm/teensy-lc/Kconfig b/boards/arm/kl/teensy-lc/Kconfig similarity index 100% rename from boards/arm/teensy-lc/Kconfig rename to boards/arm/kl/teensy-lc/Kconfig diff --git a/boards/arm/teensy-lc/README.txt b/boards/arm/kl/teensy-lc/README.txt similarity index 100% rename from boards/arm/teensy-lc/README.txt rename to boards/arm/kl/teensy-lc/README.txt diff --git a/boards/arm/teensy-lc/configs/nsh/defconfig b/boards/arm/kl/teensy-lc/configs/nsh/defconfig similarity index 98% rename from boards/arm/teensy-lc/configs/nsh/defconfig rename to boards/arm/kl/teensy-lc/configs/nsh/defconfig index caa4ce3f216..7ec8804df8f 100644 --- a/boards/arm/teensy-lc/configs/nsh/defconfig +++ b/boards/arm/kl/teensy-lc/configs/nsh/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="teensy-lc" CONFIG_ARCH_BOARD_TEENSY_LC=y +CONFIG_ARCH_CHIP="kl" CONFIG_ARCH_CHIP_KL=y CONFIG_ARCH_CHIP_MKL25Z64=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/teensy-lc/include/board.h b/boards/arm/kl/teensy-lc/include/board.h similarity index 100% rename from boards/arm/teensy-lc/include/board.h rename to boards/arm/kl/teensy-lc/include/board.h diff --git a/boards/arm/teensy-lc/scripts/Make.defs b/boards/arm/kl/teensy-lc/scripts/Make.defs similarity index 96% rename from boards/arm/teensy-lc/scripts/Make.defs rename to boards/arm/kl/teensy-lc/scripts/Make.defs index 078f03e12b1..f232457ee66 100644 --- a/boards/arm/teensy-lc/scripts/Make.defs +++ b/boards/arm/kl/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/teensy-lc/scripts/teensy-lc.ld b/boards/arm/kl/teensy-lc/scripts/teensy-lc.ld similarity index 100% rename from boards/arm/teensy-lc/scripts/teensy-lc.ld rename to boards/arm/kl/teensy-lc/scripts/teensy-lc.ld diff --git a/boards/arm/efm32-g8xx-stk/src/.gitignore b/boards/arm/kl/teensy-lc/src/.gitignore similarity index 100% rename from boards/arm/efm32-g8xx-stk/src/.gitignore rename to boards/arm/kl/teensy-lc/src/.gitignore diff --git a/boards/arm/teensy-lc/src/Makefile b/boards/arm/kl/teensy-lc/src/Makefile similarity index 100% rename from boards/arm/teensy-lc/src/Makefile rename to boards/arm/kl/teensy-lc/src/Makefile diff --git a/boards/arm/teensy-lc/src/kl_appinit.c b/boards/arm/kl/teensy-lc/src/kl_appinit.c similarity index 100% rename from boards/arm/teensy-lc/src/kl_appinit.c rename to boards/arm/kl/teensy-lc/src/kl_appinit.c diff --git a/boards/arm/teensy-lc/src/kl_boardinitialize.c b/boards/arm/kl/teensy-lc/src/kl_boardinitialize.c similarity index 100% rename from boards/arm/teensy-lc/src/kl_boardinitialize.c rename to boards/arm/kl/teensy-lc/src/kl_boardinitialize.c diff --git a/boards/arm/teensy-lc/src/kl_led.c b/boards/arm/kl/teensy-lc/src/kl_led.c similarity index 100% rename from boards/arm/teensy-lc/src/kl_led.c rename to boards/arm/kl/teensy-lc/src/kl_led.c diff --git a/boards/arm/teensy-lc/src/kl_pwm.c b/boards/arm/kl/teensy-lc/src/kl_pwm.c similarity index 100% rename from boards/arm/teensy-lc/src/kl_pwm.c rename to boards/arm/kl/teensy-lc/src/kl_pwm.c diff --git a/boards/arm/teensy-lc/src/kl_spi.c b/boards/arm/kl/teensy-lc/src/kl_spi.c similarity index 100% rename from boards/arm/teensy-lc/src/kl_spi.c rename to boards/arm/kl/teensy-lc/src/kl_spi.c diff --git a/boards/arm/teensy-lc/src/teensy-lc.h b/boards/arm/kl/teensy-lc/src/teensy-lc.h similarity index 100% rename from boards/arm/teensy-lc/src/teensy-lc.h rename to boards/arm/kl/teensy-lc/src/teensy-lc.h diff --git a/boards/arm/lc823450-xgevk/Kconfig b/boards/arm/lc823450/lc823450-xgevk/Kconfig similarity index 100% rename from boards/arm/lc823450-xgevk/Kconfig rename to boards/arm/lc823450/lc823450-xgevk/Kconfig diff --git a/boards/arm/lc823450-xgevk/README.txt b/boards/arm/lc823450/lc823450-xgevk/README.txt similarity index 100% rename from boards/arm/lc823450-xgevk/README.txt rename to boards/arm/lc823450/lc823450-xgevk/README.txt diff --git a/boards/arm/lc823450-xgevk/configs/audio/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig similarity index 99% rename from boards/arm/lc823450-xgevk/configs/audio/defconfig rename to boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig index 3c41434c185..6a6208fd24e 100644 --- a/boards/arm/lc823450-xgevk/configs/audio/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig @@ -13,6 +13,7 @@ CONFIG_AQM_1248A=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y +CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lc823450-xgevk/configs/bt/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig similarity index 99% rename from boards/arm/lc823450-xgevk/configs/bt/defconfig rename to boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig index efe3096b597..6968c27a5f6 100644 --- a/boards/arm/lc823450-xgevk/configs/bt/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig @@ -13,6 +13,7 @@ CONFIG_AQM_1248A=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y +CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lc823450-xgevk/configs/elf/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig similarity index 98% rename from boards/arm/lc823450-xgevk/configs/elf/defconfig rename to boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig index 19a7a140504..d4a47f8679f 100644 --- a/boards/arm/lc823450-xgevk/configs/elf/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y +CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lc823450-xgevk/configs/ipl2/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig similarity index 98% rename from boards/arm/lc823450-xgevk/configs/ipl2/defconfig rename to boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig index 2e4a726bb25..100466b3e8a 100644 --- a/boards/arm/lc823450-xgevk/configs/ipl2/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y +CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lc823450-xgevk/configs/knsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig similarity index 99% rename from boards/arm/lc823450-xgevk/configs/knsh/defconfig rename to boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig index 58b3675e15d..b15786b15f6 100644 --- a/boards/arm/lc823450-xgevk/configs/knsh/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig @@ -15,6 +15,7 @@ CONFIG_AQM_1248A=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y +CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lc823450-xgevk/configs/kostest/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig similarity index 98% rename from boards/arm/lc823450-xgevk/configs/kostest/defconfig rename to boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig index d4109c577a8..b6451eb6836 100644 --- a/boards/arm/lc823450-xgevk/configs/kostest/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y +CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_STDARG_H=y diff --git a/boards/arm/lc823450-xgevk/configs/krndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig similarity index 99% rename from boards/arm/lc823450-xgevk/configs/krndis/defconfig rename to boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig index 38de526c646..730e63b5240 100644 --- a/boards/arm/lc823450-xgevk/configs/krndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig @@ -13,6 +13,7 @@ CONFIG_AQM_1248A=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y +CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lc823450-xgevk/configs/nsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig similarity index 99% rename from boards/arm/lc823450-xgevk/configs/nsh/defconfig rename to boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig index 340c9e72c84..e687b3832e2 100644 --- a/boards/arm/lc823450-xgevk/configs/nsh/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig @@ -15,6 +15,7 @@ CONFIG_AQM_1248A=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y +CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lc823450-xgevk/configs/posix_spawn/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig similarity index 98% rename from boards/arm/lc823450-xgevk/configs/posix_spawn/defconfig rename to boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig index 1ecb2867a47..7d4bc0ccba0 100644 --- a/boards/arm/lc823450-xgevk/configs/posix_spawn/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y +CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lc823450-xgevk/configs/rndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig similarity index 99% rename from boards/arm/lc823450-xgevk/configs/rndis/defconfig rename to boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig index 0a834bfd63c..2bdc9dbb627 100644 --- a/boards/arm/lc823450-xgevk/configs/rndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig @@ -13,6 +13,7 @@ CONFIG_AQM_1248A=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y +CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lc823450-xgevk/configs/usb/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig similarity index 99% rename from boards/arm/lc823450-xgevk/configs/usb/defconfig rename to boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig index b12208cbb23..73f21413926 100644 --- a/boards/arm/lc823450-xgevk/configs/usb/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig @@ -14,6 +14,7 @@ CONFIG_AQM_1248A=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lc823450-xgevk" CONFIG_ARCH_BOARD_LC823450_XGEVK=y +CONFIG_ARCH_CHIP="lc823450" CONFIG_ARCH_CHIP_LC823450=y CONFIG_ARCH_FLOAT_H=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lc823450-xgevk/include/board.h b/boards/arm/lc823450/lc823450-xgevk/include/board.h similarity index 100% rename from boards/arm/lc823450-xgevk/include/board.h rename to boards/arm/lc823450/lc823450-xgevk/include/board.h diff --git a/boards/arm/imxrt1050-evk/kernel/.gitignore b/boards/arm/lc823450/lc823450-xgevk/kernel/.gitignore similarity index 100% rename from boards/arm/imxrt1050-evk/kernel/.gitignore rename to boards/arm/lc823450/lc823450-xgevk/kernel/.gitignore diff --git a/boards/arm/lc823450-xgevk/kernel/Makefile b/boards/arm/lc823450/lc823450-xgevk/kernel/Makefile similarity index 90% rename from boards/arm/lc823450-xgevk/kernel/Makefile rename to boards/arm/lc823450/lc823450-xgevk/kernel/Makefile index 81a4b6fe26d..d74770d5a71 100644 --- a/boards/arm/lc823450-xgevk/kernel/Makefile +++ b/boards/arm/lc823450/lc823450-xgevk/kernel/Makefile @@ -39,7 +39,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -52,16 +52,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/lc823450-xgevk/kernel/lc823450_userspace.c b/boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c similarity index 100% rename from boards/arm/lc823450-xgevk/kernel/lc823450_userspace.c rename to boards/arm/lc823450/lc823450-xgevk/kernel/lc823450_userspace.c diff --git a/boards/arm/lc823450-xgevk/scripts/Make.defs b/boards/arm/lc823450/lc823450-xgevk/scripts/Make.defs similarity index 95% rename from boards/arm/lc823450-xgevk/scripts/Make.defs rename to boards/arm/lc823450/lc823450-xgevk/scripts/Make.defs index d274c366f98..cf6b1158d24 100644 --- a/boards/arm/lc823450-xgevk/scripts/Make.defs +++ b/boards/arm/lc823450/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif # File extensions diff --git a/boards/arm/lc823450-xgevk/scripts/gnu-elf.ld b/boards/arm/lc823450/lc823450-xgevk/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/lc823450-xgevk/scripts/gnu-elf.ld rename to boards/arm/lc823450/lc823450-xgevk/scripts/gnu-elf.ld diff --git a/boards/arm/lc823450-xgevk/scripts/ld-ipl2.script b/boards/arm/lc823450/lc823450-xgevk/scripts/ld-ipl2.script similarity index 100% rename from boards/arm/lc823450-xgevk/scripts/ld-ipl2.script rename to boards/arm/lc823450/lc823450-xgevk/scripts/ld-ipl2.script diff --git a/boards/arm/lc823450-xgevk/scripts/ld-spif-boot.script b/boards/arm/lc823450/lc823450-xgevk/scripts/ld-spif-boot.script similarity index 100% rename from boards/arm/lc823450-xgevk/scripts/ld-spif-boot.script rename to boards/arm/lc823450/lc823450-xgevk/scripts/ld-spif-boot.script diff --git a/boards/arm/lc823450-xgevk/scripts/ld.script b/boards/arm/lc823450/lc823450-xgevk/scripts/ld.script similarity index 100% rename from boards/arm/lc823450-xgevk/scripts/ld.script rename to boards/arm/lc823450/lc823450-xgevk/scripts/ld.script diff --git a/boards/arm/lc823450-xgevk/scripts/memory.ld b/boards/arm/lc823450/lc823450-xgevk/scripts/memory.ld similarity index 100% rename from boards/arm/lc823450-xgevk/scripts/memory.ld rename to boards/arm/lc823450/lc823450-xgevk/scripts/memory.ld diff --git a/boards/arm/lc823450-xgevk/scripts/user-space.ld b/boards/arm/lc823450/lc823450-xgevk/scripts/user-space.ld similarity index 100% rename from boards/arm/lc823450-xgevk/scripts/user-space.ld rename to boards/arm/lc823450/lc823450-xgevk/scripts/user-space.ld diff --git a/boards/arm/lc823450-xgevk/src/Makefile b/boards/arm/lc823450/lc823450-xgevk/src/Makefile similarity index 100% rename from boards/arm/lc823450-xgevk/src/Makefile rename to boards/arm/lc823450/lc823450-xgevk/src/Makefile diff --git a/boards/arm/lc823450-xgevk/src/lc823450-xgevk.h b/boards/arm/lc823450/lc823450-xgevk/src/lc823450-xgevk.h similarity index 100% rename from boards/arm/lc823450-xgevk/src/lc823450-xgevk.h rename to boards/arm/lc823450/lc823450-xgevk/src/lc823450-xgevk.h diff --git a/boards/arm/lc823450-xgevk/src/lc823450-xgevk_mux.h b/boards/arm/lc823450/lc823450-xgevk/src/lc823450-xgevk_mux.h similarity index 100% rename from boards/arm/lc823450-xgevk/src/lc823450-xgevk_mux.h rename to boards/arm/lc823450/lc823450-xgevk/src/lc823450-xgevk_mux.h diff --git a/boards/arm/lc823450-xgevk/src/lc823450_adc.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_adc.c similarity index 100% rename from boards/arm/lc823450-xgevk/src/lc823450_adc.c rename to boards/arm/lc823450/lc823450-xgevk/src/lc823450_adc.c diff --git a/boards/arm/lc823450-xgevk/src/lc823450_appinit.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_appinit.c similarity index 100% rename from boards/arm/lc823450-xgevk/src/lc823450_appinit.c rename to boards/arm/lc823450/lc823450-xgevk/src/lc823450_appinit.c diff --git a/boards/arm/lc823450-xgevk/src/lc823450_autoleds.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_autoleds.c similarity index 100% rename from boards/arm/lc823450-xgevk/src/lc823450_autoleds.c rename to boards/arm/lc823450/lc823450-xgevk/src/lc823450_autoleds.c diff --git a/boards/arm/lc823450-xgevk/src/lc823450_boot.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_boot.c similarity index 100% rename from boards/arm/lc823450-xgevk/src/lc823450_boot.c rename to boards/arm/lc823450/lc823450-xgevk/src/lc823450_boot.c diff --git a/boards/arm/lc823450-xgevk/src/lc823450_bringup.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_bringup.c similarity index 100% rename from boards/arm/lc823450-xgevk/src/lc823450_bringup.c rename to boards/arm/lc823450/lc823450-xgevk/src/lc823450_bringup.c diff --git a/boards/arm/lc823450-xgevk/src/lc823450_bt.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_bt.c similarity index 100% rename from boards/arm/lc823450-xgevk/src/lc823450_bt.c rename to boards/arm/lc823450/lc823450-xgevk/src/lc823450_bt.c diff --git a/boards/arm/lc823450-xgevk/src/lc823450_mux.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_mux.c similarity index 100% rename from boards/arm/lc823450-xgevk/src/lc823450_mux.c rename to boards/arm/lc823450/lc823450-xgevk/src/lc823450_mux.c diff --git a/boards/arm/lc823450-xgevk/src/lc823450_netinit.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_netinit.c similarity index 100% rename from boards/arm/lc823450-xgevk/src/lc823450_netinit.c rename to boards/arm/lc823450/lc823450-xgevk/src/lc823450_netinit.c diff --git a/boards/arm/lc823450-xgevk/src/lc823450_reset.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_reset.c similarity index 100% rename from boards/arm/lc823450-xgevk/src/lc823450_reset.c rename to boards/arm/lc823450/lc823450-xgevk/src/lc823450_reset.c diff --git a/boards/arm/lc823450-xgevk/src/lc823450_sdif.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_sdif.c similarity index 100% rename from boards/arm/lc823450-xgevk/src/lc823450_sdif.c rename to boards/arm/lc823450/lc823450-xgevk/src/lc823450_sdif.c diff --git a/boards/arm/lc823450-xgevk/src/lc823450_spi.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_spi.c similarity index 100% rename from boards/arm/lc823450-xgevk/src/lc823450_spi.c rename to boards/arm/lc823450/lc823450-xgevk/src/lc823450_spi.c diff --git a/boards/arm/lc823450-xgevk/src/lc823450_st7565.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_st7565.c similarity index 100% rename from boards/arm/lc823450-xgevk/src/lc823450_st7565.c rename to boards/arm/lc823450/lc823450-xgevk/src/lc823450_st7565.c diff --git a/boards/arm/lc823450-xgevk/src/lc823450_usbmsc.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_usbmsc.c similarity index 100% rename from boards/arm/lc823450-xgevk/src/lc823450_usbmsc.c rename to boards/arm/lc823450/lc823450-xgevk/src/lc823450_usbmsc.c diff --git a/boards/arm/lc823450-xgevk/src/lc823450_wm8776.c b/boards/arm/lc823450/lc823450-xgevk/src/lc823450_wm8776.c similarity index 100% rename from boards/arm/lc823450-xgevk/src/lc823450_wm8776.c rename to boards/arm/lc823450/lc823450-xgevk/src/lc823450_wm8776.c diff --git a/boards/arm/lincoln60/Kconfig b/boards/arm/lpc17xx_40xx/lincoln60/Kconfig similarity index 100% rename from boards/arm/lincoln60/Kconfig rename to boards/arm/lpc17xx_40xx/lincoln60/Kconfig diff --git a/boards/arm/lincoln60/README.txt b/boards/arm/lpc17xx_40xx/lincoln60/README.txt similarity index 100% rename from boards/arm/lincoln60/README.txt rename to boards/arm/lpc17xx_40xx/lincoln60/README.txt diff --git a/boards/arm/lincoln60/configs/netnsh/defconfig b/boards/arm/lpc17xx_40xx/lincoln60/configs/netnsh/defconfig similarity index 98% rename from boards/arm/lincoln60/configs/netnsh/defconfig rename to boards/arm/lpc17xx_40xx/lincoln60/configs/netnsh/defconfig index 6ffbe683a50..e839372118f 100644 --- a/boards/arm/lincoln60/configs/netnsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lincoln60/configs/netnsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lincoln60" CONFIG_ARCH_BOARD_LINCOLN60=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1769=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_INTERRUPTSTACK=1536 diff --git a/boards/arm/lincoln60/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lincoln60/configs/nsh/defconfig similarity index 97% rename from boards/arm/lincoln60/configs/nsh/defconfig rename to boards/arm/lpc17xx_40xx/lincoln60/configs/nsh/defconfig index 1ab2d844126..207fbe7c450 100644 --- a/boards/arm/lincoln60/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lincoln60/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lincoln60" CONFIG_ARCH_BOARD_LINCOLN60=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1769=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/lincoln60/configs/thttpd-binfs/defconfig b/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig similarity index 98% rename from boards/arm/lincoln60/configs/thttpd-binfs/defconfig rename to boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig index 6624dbf510f..923caf0daf3 100644 --- a/boards/arm/lincoln60/configs/thttpd-binfs/defconfig +++ b/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lincoln60" CONFIG_ARCH_BOARD_LINCOLN60=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1769=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_INTERRUPTSTACK=1024 diff --git a/boards/arm/lincoln60/include/board.h b/boards/arm/lpc17xx_40xx/lincoln60/include/board.h similarity index 100% rename from boards/arm/lincoln60/include/board.h rename to boards/arm/lpc17xx_40xx/lincoln60/include/board.h diff --git a/boards/arm/lincoln60/scripts/Make.defs b/boards/arm/lpc17xx_40xx/lincoln60/scripts/Make.defs similarity index 96% rename from boards/arm/lincoln60/scripts/Make.defs rename to boards/arm/lpc17xx_40xx/lincoln60/scripts/Make.defs index 029dd662dec..bd7b46d4c2f 100644 --- a/boards/arm/lincoln60/scripts/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/lincoln60/scripts/ld.script b/boards/arm/lpc17xx_40xx/lincoln60/scripts/ld.script similarity index 100% rename from boards/arm/lincoln60/scripts/ld.script rename to boards/arm/lpc17xx_40xx/lincoln60/scripts/ld.script diff --git a/boards/arm/efm32gg-stk3700/src/.gitignore b/boards/arm/lpc17xx_40xx/lincoln60/src/.gitignore similarity index 100% rename from boards/arm/efm32gg-stk3700/src/.gitignore rename to boards/arm/lpc17xx_40xx/lincoln60/src/.gitignore diff --git a/boards/arm/lincoln60/src/Makefile b/boards/arm/lpc17xx_40xx/lincoln60/src/Makefile similarity index 100% rename from boards/arm/lincoln60/src/Makefile rename to boards/arm/lpc17xx_40xx/lincoln60/src/Makefile diff --git a/boards/arm/lincoln60/src/lincoln60.h b/boards/arm/lpc17xx_40xx/lincoln60/src/lincoln60.h similarity index 100% rename from boards/arm/lincoln60/src/lincoln60.h rename to boards/arm/lpc17xx_40xx/lincoln60/src/lincoln60.h diff --git a/boards/arm/lincoln60/src/lpc17_40_appinit.c b/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_appinit.c similarity index 100% rename from boards/arm/lincoln60/src/lpc17_40_appinit.c rename to boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_appinit.c diff --git a/boards/arm/lincoln60/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_boot.c similarity index 100% rename from boards/arm/lincoln60/src/lpc17_40_boot.c rename to boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_boot.c diff --git a/boards/arm/lincoln60/src/lpc17_40_buttons.c b/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_buttons.c similarity index 100% rename from boards/arm/lincoln60/src/lpc17_40_buttons.c rename to boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_buttons.c diff --git a/boards/arm/lincoln60/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_leds.c similarity index 100% rename from boards/arm/lincoln60/src/lpc17_40_leds.c rename to boards/arm/lpc17xx_40xx/lincoln60/src/lpc17_40_leds.c diff --git a/boards/arm/lpc4088-devkit/Kconfig b/boards/arm/lpc17xx_40xx/lpc4088-devkit/Kconfig similarity index 100% rename from boards/arm/lpc4088-devkit/Kconfig rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/Kconfig diff --git a/boards/arm/lpc4088-devkit/README.txt b/boards/arm/lpc17xx_40xx/lpc4088-devkit/README.txt similarity index 100% rename from boards/arm/lpc4088-devkit/README.txt rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/README.txt diff --git a/boards/arm/lpc4088-devkit/configs/knsh/Make.defs b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/Make.defs similarity index 92% rename from boards/arm/lpc4088-devkit/configs/knsh/Make.defs rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/Make.defs index cdeef211bd1..7c191b2d3dc 100644 --- a/boards/arm/lpc4088-devkit/configs/knsh/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)$(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}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(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 + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/lpc4088-devkit/configs/knsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig similarity index 98% rename from boards/arm/lpc4088-devkit/configs/knsh/defconfig rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig index a05017646d8..75a1eb263d3 100644 --- a/boards/arm/lpc4088-devkit/configs/knsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpc4088-devkit" CONFIG_ARCH_BOARD_LPC4088_DEVKIT=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_CHIP_LPC4088=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/lpc4088-devkit/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig similarity index 98% rename from boards/arm/lpc4088-devkit/configs/nsh/defconfig rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig index af9e9a03c4e..f57a24cd9a7 100644 --- a/boards/arm/lpc4088-devkit/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpc4088-devkit" CONFIG_ARCH_BOARD_LPC4088_DEVKIT=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_CHIP_LPC4088=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/lpc4088-devkit/include/board.h b/boards/arm/lpc17xx_40xx/lpc4088-devkit/include/board.h similarity index 100% rename from boards/arm/lpc4088-devkit/include/board.h rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/include/board.h diff --git a/boards/arm/imxrt1060-evk/kernel/.gitignore b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/.gitignore similarity index 100% rename from boards/arm/imxrt1060-evk/kernel/.gitignore rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/.gitignore diff --git a/boards/arm/lpc4088-devkit/kernel/Makefile b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/Makefile similarity index 90% rename from boards/arm/lpc4088-devkit/kernel/Makefile rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/Makefile index 099b1ea816a..1be51140acb 100644 --- a/boards/arm/lpc4088-devkit/kernel/Makefile +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/lpc4088-devkit/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c similarity index 100% rename from boards/arm/lpc4088-devkit/kernel/lpc17_40_userspace.c rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c diff --git a/boards/arm/lpc4088-devkit/scripts/Make.defs b/boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/Make.defs similarity index 95% rename from boards/arm/lpc4088-devkit/scripts/Make.defs rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/Make.defs index a36627351d3..70efeffed96 100644 --- a/boards/arm/lpc4088-devkit/scripts/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/lpc4088-devkit/scripts/kernel-space.ld b/boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/kernel-space.ld similarity index 100% rename from boards/arm/lpc4088-devkit/scripts/kernel-space.ld rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/kernel-space.ld diff --git a/boards/arm/lpc4088-devkit/scripts/ld.script b/boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/ld.script similarity index 100% rename from boards/arm/lpc4088-devkit/scripts/ld.script rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/ld.script diff --git a/boards/arm/lpc4088-devkit/scripts/memory.ld b/boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/memory.ld similarity index 100% rename from boards/arm/lpc4088-devkit/scripts/memory.ld rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/memory.ld diff --git a/boards/arm/lpc4088-devkit/scripts/user-space.ld b/boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/user-space.ld similarity index 100% rename from boards/arm/lpc4088-devkit/scripts/user-space.ld rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/scripts/user-space.ld diff --git a/boards/arm/ekk-lm3s9b96/src/.gitignore b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/.gitignore similarity index 100% rename from boards/arm/ekk-lm3s9b96/src/.gitignore rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/src/.gitignore diff --git a/boards/arm/lpc4088-devkit/src/Makefile b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/Makefile similarity index 100% rename from boards/arm/lpc4088-devkit/src/Makefile rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/src/Makefile diff --git a/boards/arm/lpc4088-devkit/src/lpc17_40_appinit.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_appinit.c similarity index 100% rename from boards/arm/lpc4088-devkit/src/lpc17_40_appinit.c rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_appinit.c diff --git a/boards/arm/lpc4088-devkit/src/lpc17_40_autoleds.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_autoleds.c similarity index 100% rename from boards/arm/lpc4088-devkit/src/lpc17_40_autoleds.c rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_autoleds.c diff --git a/boards/arm/lpc4088-devkit/src/lpc17_40_boardinitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_boardinitialize.c similarity index 100% rename from boards/arm/lpc4088-devkit/src/lpc17_40_boardinitialize.c rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_boardinitialize.c diff --git a/boards/arm/lpc4088-devkit/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_bringup.c similarity index 100% rename from boards/arm/lpc4088-devkit/src/lpc17_40_bringup.c rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_bringup.c diff --git a/boards/arm/lpc4088-devkit/src/lpc17_40_buttons.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_buttons.c similarity index 100% rename from boards/arm/lpc4088-devkit/src/lpc17_40_buttons.c rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_buttons.c diff --git a/boards/arm/lpc4088-devkit/src/lpc17_40_djoystick.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_djoystick.c similarity index 100% rename from boards/arm/lpc4088-devkit/src/lpc17_40_djoystick.c rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_djoystick.c diff --git a/boards/arm/lpc4088-devkit/src/lpc17_40_lcd.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_lcd.c similarity index 100% rename from boards/arm/lpc4088-devkit/src/lpc17_40_lcd.c rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_lcd.c diff --git a/boards/arm/lpc4088-devkit/src/lpc17_40_nandinitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_nandinitialize.c similarity index 100% rename from boards/arm/lpc4088-devkit/src/lpc17_40_nandinitialize.c rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_nandinitialize.c diff --git a/boards/arm/lpc4088-devkit/src/lpc17_40_norinitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_norinitialize.c similarity index 100% rename from boards/arm/lpc4088-devkit/src/lpc17_40_norinitialize.c rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_norinitialize.c diff --git a/boards/arm/lpc4088-devkit/src/lpc17_40_sdraminitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_sdraminitialize.c similarity index 100% rename from boards/arm/lpc4088-devkit/src/lpc17_40_sdraminitialize.c rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_sdraminitialize.c diff --git a/boards/arm/lpc4088-devkit/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_ssp.c similarity index 100% rename from boards/arm/lpc4088-devkit/src/lpc17_40_ssp.c rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_ssp.c diff --git a/boards/arm/lpc4088-devkit/src/lpc17_40_touchscreen.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_touchscreen.c similarity index 100% rename from boards/arm/lpc4088-devkit/src/lpc17_40_touchscreen.c rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_touchscreen.c diff --git a/boards/arm/lpc4088-devkit/src/lpc17_40_userleds.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_userleds.c similarity index 100% rename from boards/arm/lpc4088-devkit/src/lpc17_40_userleds.c rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc17_40_userleds.c diff --git a/boards/arm/lpc4088-devkit/src/lpc4088-devkit.h b/boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc4088-devkit.h similarity index 100% rename from boards/arm/lpc4088-devkit/src/lpc4088-devkit.h rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/src/lpc4088-devkit.h diff --git a/boards/arm/lpc4088-devkit/tools/lpc4088-devkit.cfg b/boards/arm/lpc17xx_40xx/lpc4088-devkit/tools/lpc4088-devkit.cfg similarity index 100% rename from boards/arm/lpc4088-devkit/tools/lpc4088-devkit.cfg rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/tools/lpc4088-devkit.cfg diff --git a/boards/arm/lpc4088-devkit/tools/oocd.sh b/boards/arm/lpc17xx_40xx/lpc4088-devkit/tools/oocd.sh similarity index 100% rename from boards/arm/lpc4088-devkit/tools/oocd.sh rename to boards/arm/lpc17xx_40xx/lpc4088-devkit/tools/oocd.sh diff --git a/boards/arm/lpc4088-quickstart/Kconfig b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/Kconfig similarity index 100% rename from boards/arm/lpc4088-quickstart/Kconfig rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/Kconfig diff --git a/boards/arm/lpc4088-quickstart/README.txt b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/README.txt similarity index 100% rename from boards/arm/lpc4088-quickstart/README.txt rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/README.txt diff --git a/boards/arm/lpc4088-quickstart/configs/knsh/Make.defs b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/Make.defs similarity index 92% rename from boards/arm/lpc4088-quickstart/configs/knsh/Make.defs rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/Make.defs index 6fbcc6ee507..9d6038a8de0 100644 --- a/boards/arm/lpc4088-quickstart/configs/knsh/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)$(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}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(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 + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/lpc4088-quickstart/configs/knsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig similarity index 98% rename from boards/arm/lpc4088-quickstart/configs/knsh/defconfig rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig index 125910c363f..5a974acf037 100644 --- a/boards/arm/lpc4088-quickstart/configs/knsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpc4088-quickstart" CONFIG_ARCH_BOARD_LPC4088_QUICKSTART=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_CHIP_LPC4088=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/lpc4088-quickstart/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/nsh/defconfig similarity index 97% rename from boards/arm/lpc4088-quickstart/configs/nsh/defconfig rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/nsh/defconfig index 8249a698142..e0eefbed3b6 100644 --- a/boards/arm/lpc4088-quickstart/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpc4088-quickstart" CONFIG_ARCH_BOARD_LPC4088_QUICKSTART=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_CHIP_LPC4088=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/lpc4088-quickstart/include/board.h b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/include/board.h similarity index 100% rename from boards/arm/lpc4088-quickstart/include/board.h rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/include/board.h diff --git a/boards/arm/lc823450-xgevk/kernel/.gitignore b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/.gitignore similarity index 100% rename from boards/arm/lc823450-xgevk/kernel/.gitignore rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/.gitignore diff --git a/boards/arm/lpc4088-quickstart/kernel/Makefile b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/Makefile similarity index 90% rename from boards/arm/lpc4088-quickstart/kernel/Makefile rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/Makefile index 7c18e33bb5b..820007544fa 100644 --- a/boards/arm/lpc4088-quickstart/kernel/Makefile +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/lpc4088-quickstart/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c similarity index 100% rename from boards/arm/lpc4088-quickstart/kernel/lpc17_40_userspace.c rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c diff --git a/boards/arm/lpc4088-quickstart/scripts/Make.defs b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/Make.defs similarity index 95% rename from boards/arm/lpc4088-quickstart/scripts/Make.defs rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/Make.defs index 34d95880539..994b5329fed 100644 --- a/boards/arm/lpc4088-quickstart/scripts/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/lpc4088-quickstart/scripts/kernel-space.ld b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/kernel-space.ld similarity index 100% rename from boards/arm/lpc4088-quickstart/scripts/kernel-space.ld rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/kernel-space.ld diff --git a/boards/arm/lpc4088-quickstart/scripts/ld.script b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/ld.script similarity index 100% rename from boards/arm/lpc4088-quickstart/scripts/ld.script rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/ld.script diff --git a/boards/arm/lpc4088-quickstart/scripts/memory.ld b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/memory.ld similarity index 100% rename from boards/arm/lpc4088-quickstart/scripts/memory.ld rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/memory.ld diff --git a/boards/arm/lpc4088-quickstart/scripts/user-space.ld b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/user-space.ld similarity index 100% rename from boards/arm/lpc4088-quickstart/scripts/user-space.ld rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/scripts/user-space.ld diff --git a/boards/arm/fire-stm32v2/src/.gitignore b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/.gitignore similarity index 100% rename from boards/arm/fire-stm32v2/src/.gitignore rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/.gitignore diff --git a/boards/arm/lpc4088-quickstart/src/Makefile b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/Makefile similarity index 100% rename from boards/arm/lpc4088-quickstart/src/Makefile rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/Makefile diff --git a/boards/arm/lpc4088-quickstart/src/lpc17_40_appinit.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_appinit.c similarity index 100% rename from boards/arm/lpc4088-quickstart/src/lpc17_40_appinit.c rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_appinit.c diff --git a/boards/arm/lpc4088-quickstart/src/lpc17_40_autoleds.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_autoleds.c similarity index 100% rename from boards/arm/lpc4088-quickstart/src/lpc17_40_autoleds.c rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_autoleds.c diff --git a/boards/arm/lpc4088-quickstart/src/lpc17_40_boardinitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_boardinitialize.c similarity index 100% rename from boards/arm/lpc4088-quickstart/src/lpc17_40_boardinitialize.c rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_boardinitialize.c diff --git a/boards/arm/lpc4088-quickstart/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_bringup.c similarity index 100% rename from boards/arm/lpc4088-quickstart/src/lpc17_40_bringup.c rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_bringup.c diff --git a/boards/arm/lpc4088-quickstart/src/lpc17_40_buttons.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_buttons.c similarity index 100% rename from boards/arm/lpc4088-quickstart/src/lpc17_40_buttons.c rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_buttons.c diff --git a/boards/arm/lpc4088-quickstart/src/lpc17_40_lcd.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_lcd.c similarity index 100% rename from boards/arm/lpc4088-quickstart/src/lpc17_40_lcd.c rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_lcd.c diff --git a/boards/arm/lpc4088-quickstart/src/lpc17_40_nandinitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_nandinitialize.c similarity index 100% rename from boards/arm/lpc4088-quickstart/src/lpc17_40_nandinitialize.c rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_nandinitialize.c diff --git a/boards/arm/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c similarity index 100% rename from boards/arm/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_sdraminitialize.c diff --git a/boards/arm/lpc4088-quickstart/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_ssp.c similarity index 100% rename from boards/arm/lpc4088-quickstart/src/lpc17_40_ssp.c rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_ssp.c diff --git a/boards/arm/lpc4088-quickstart/src/lpc17_40_userleds.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_userleds.c similarity index 100% rename from boards/arm/lpc4088-quickstart/src/lpc17_40_userleds.c rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc17_40_userleds.c diff --git a/boards/arm/lpc4088-quickstart/src/lpc4088-quickstart.h b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc4088-quickstart.h similarity index 100% rename from boards/arm/lpc4088-quickstart/src/lpc4088-quickstart.h rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/src/lpc4088-quickstart.h diff --git a/boards/arm/lpc4088-quickstart/tools/lpc4088-quickstart.cfg b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/tools/lpc4088-quickstart.cfg similarity index 100% rename from boards/arm/lpc4088-quickstart/tools/lpc4088-quickstart.cfg rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/tools/lpc4088-quickstart.cfg diff --git a/boards/arm/lpc4088-quickstart/tools/oocd.sh b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/tools/oocd.sh similarity index 100% rename from boards/arm/lpc4088-quickstart/tools/oocd.sh rename to boards/arm/lpc17xx_40xx/lpc4088-quickstart/tools/oocd.sh diff --git a/boards/arm/lpcxpresso-lpc1768/Kconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/Kconfig similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/Kconfig rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/Kconfig diff --git a/boards/arm/lpcxpresso-lpc1768/README.txt b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/README.txt similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/README.txt rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/README.txt diff --git a/boards/arm/lpcxpresso-lpc1768/configs/dhcpd/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/dhcpd/defconfig similarity index 97% rename from boards/arm/lpcxpresso-lpc1768/configs/dhcpd/defconfig rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/dhcpd/defconfig index c4c4e21bebe..f9bdc253af8 100644 --- a/boards/arm/lpcxpresso-lpc1768/configs/dhcpd/defconfig +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/dhcpd/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc1768" CONFIG_ARCH_BOARD_LPCXPRESSO=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1768=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/lpcxpresso-lpc1768/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nsh/defconfig similarity index 98% rename from boards/arm/lpcxpresso-lpc1768/configs/nsh/defconfig rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nsh/defconfig index d519dd5d052..3ac0b544581 100644 --- a/boards/arm/lpcxpresso-lpc1768/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc1768" CONFIG_ARCH_BOARD_LPCXPRESSO=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1768=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/lpcxpresso-lpc1768/configs/nx/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nx/defconfig similarity index 98% rename from boards/arm/lpcxpresso-lpc1768/configs/nx/defconfig rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nx/defconfig index 8e5e4cfbae3..8ae067712f1 100644 --- a/boards/arm/lpcxpresso-lpc1768/configs/nx/defconfig +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nx/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc1768" CONFIG_ARCH_BOARD_LPCXPRESSO=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1768=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/lpcxpresso-lpc1768/configs/thttpd/Make.defs b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/Make.defs similarity index 96% rename from boards/arm/lpcxpresso-lpc1768/configs/thttpd/Make.defs rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/Make.defs index b44a9c0d132..f0e7e00c4ac 100644 --- a/boards/arm/lpcxpresso-lpc1768/configs/thttpd/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script NXFLATLDSCRIPT = -T"$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld" endif diff --git a/boards/arm/lpcxpresso-lpc1768/configs/thttpd/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig similarity index 98% rename from boards/arm/lpcxpresso-lpc1768/configs/thttpd/defconfig rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig index 926b6e07879..6f27672b31b 100644 --- a/boards/arm/lpcxpresso-lpc1768/configs/thttpd/defconfig +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc1768" CONFIG_ARCH_BOARD_LPCXPRESSO=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1768=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/lpcxpresso-lpc1768/configs/usbmsc/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig similarity index 98% rename from boards/arm/lpcxpresso-lpc1768/configs/usbmsc/defconfig rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig index ab468ee883b..6d1f0a683e1 100644 --- a/boards/arm/lpcxpresso-lpc1768/configs/usbmsc/defconfig +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc1768" CONFIG_ARCH_BOARD_LPCXPRESSO=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1768=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/lpcxpresso-lpc1768/include/board.h b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/include/board.h similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/include/board.h rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/include/board.h diff --git a/boards/arm/lpcxpresso-lpc1768/scripts/Make.defs b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/scripts/Make.defs similarity index 96% rename from boards/arm/lpcxpresso-lpc1768/scripts/Make.defs rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/scripts/Make.defs index 1feff0b79e7..d3ebcdd46c6 100644 --- a/boards/arm/lpcxpresso-lpc1768/scripts/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/lpcxpresso-lpc1768/scripts/ld.script b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/scripts/ld.script similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/scripts/ld.script rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/scripts/ld.script diff --git a/boards/arm/flipnclick-sam3x/src/.gitignore b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/.gitignore similarity index 100% rename from boards/arm/flipnclick-sam3x/src/.gitignore rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/.gitignore diff --git a/boards/arm/lpcxpresso-lpc1768/src/Makefile b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/Makefile similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/src/Makefile rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/Makefile diff --git a/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_adc.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_adc.c similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/src/lpc17_40_adc.c rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_adc.c diff --git a/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_appinit.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_appinit.c similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/src/lpc17_40_appinit.c rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_appinit.c diff --git a/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_boot.c similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/src/lpc17_40_boot.c rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_boot.c diff --git a/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_dac.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_dac.c similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/src/lpc17_40_dac.c rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_dac.c diff --git a/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_leds.c similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/src/lpc17_40_leds.c rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_leds.c diff --git a/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_oled.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_oled.c similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/src/lpc17_40_oled.c rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_oled.c diff --git a/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_pwm.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_pwm.c similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/src/lpc17_40_pwm.c rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_pwm.c diff --git a/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_ssp.c similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/src/lpc17_40_ssp.c rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_ssp.c diff --git a/boards/arm/lpcxpresso-lpc1768/src/lpc17_40_usbmsc.c b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_usbmsc.c similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/src/lpc17_40_usbmsc.c rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpc17_40_usbmsc.c diff --git a/boards/arm/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h diff --git a/boards/arm/lpcxpresso-lpc1768/tools/flash.sh b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/tools/flash.sh similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/tools/flash.sh rename to boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/tools/flash.sh diff --git a/boards/arm/mbed/Kconfig b/boards/arm/lpc17xx_40xx/mbed/Kconfig similarity index 100% rename from boards/arm/mbed/Kconfig rename to boards/arm/lpc17xx_40xx/mbed/Kconfig diff --git a/boards/arm/mbed/README.txt b/boards/arm/lpc17xx_40xx/mbed/README.txt similarity index 100% rename from boards/arm/mbed/README.txt rename to boards/arm/lpc17xx_40xx/mbed/README.txt diff --git a/boards/arm/mbed/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig similarity index 97% rename from boards/arm/mbed/configs/nsh/defconfig rename to boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig index 3433fead4b7..e1d73374f63 100644 --- a/boards/arm/mbed/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="mbed" CONFIG_ARCH_BOARD_MBED=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1768=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/mbed/include/board.h b/boards/arm/lpc17xx_40xx/mbed/include/board.h similarity index 100% rename from boards/arm/mbed/include/board.h rename to boards/arm/lpc17xx_40xx/mbed/include/board.h diff --git a/boards/arm/mbed/scripts/Make.defs b/boards/arm/lpc17xx_40xx/mbed/scripts/Make.defs similarity index 96% rename from boards/arm/mbed/scripts/Make.defs rename to boards/arm/lpc17xx_40xx/mbed/scripts/Make.defs index a2716befe64..442021b8eb1 100644 --- a/boards/arm/mbed/scripts/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/mbed/scripts/ld.script b/boards/arm/lpc17xx_40xx/mbed/scripts/ld.script similarity index 100% rename from boards/arm/mbed/scripts/ld.script rename to boards/arm/lpc17xx_40xx/mbed/scripts/ld.script diff --git a/boards/arm/freedom-k28f/src/.gitignore b/boards/arm/lpc17xx_40xx/mbed/src/.gitignore similarity index 100% rename from boards/arm/freedom-k28f/src/.gitignore rename to boards/arm/lpc17xx_40xx/mbed/src/.gitignore diff --git a/boards/arm/mbed/src/Makefile b/boards/arm/lpc17xx_40xx/mbed/src/Makefile similarity index 100% rename from boards/arm/mbed/src/Makefile rename to boards/arm/lpc17xx_40xx/mbed/src/Makefile diff --git a/boards/arm/mbed/src/lpc17_40_adc.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_adc.c similarity index 100% rename from boards/arm/mbed/src/lpc17_40_adc.c rename to boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_adc.c diff --git a/boards/arm/mbed/src/lpc17_40_appinit.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_appinit.c similarity index 100% rename from boards/arm/mbed/src/lpc17_40_appinit.c rename to boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_appinit.c diff --git a/boards/arm/mbed/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_boot.c similarity index 100% rename from boards/arm/mbed/src/lpc17_40_boot.c rename to boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_boot.c diff --git a/boards/arm/mbed/src/lpc17_40_dac.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_dac.c similarity index 100% rename from boards/arm/mbed/src/lpc17_40_dac.c rename to boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_dac.c diff --git a/boards/arm/mbed/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_leds.c similarity index 100% rename from boards/arm/mbed/src/lpc17_40_leds.c rename to boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_leds.c diff --git a/boards/arm/mbed/src/lpc17_40_pwm.c b/boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_pwm.c similarity index 100% rename from boards/arm/mbed/src/lpc17_40_pwm.c rename to boards/arm/lpc17xx_40xx/mbed/src/lpc17_40_pwm.c diff --git a/boards/arm/mbed/src/mbed.h b/boards/arm/lpc17xx_40xx/mbed/src/mbed.h similarity index 100% rename from boards/arm/mbed/src/mbed.h rename to boards/arm/lpc17xx_40xx/mbed/src/mbed.h diff --git a/boards/arm/mcb1700/Kconfig b/boards/arm/lpc17xx_40xx/mcb1700/Kconfig similarity index 100% rename from boards/arm/mcb1700/Kconfig rename to boards/arm/lpc17xx_40xx/mcb1700/Kconfig diff --git a/boards/arm/mcb1700/README.txt b/boards/arm/lpc17xx_40xx/mcb1700/README.txt similarity index 100% rename from boards/arm/mcb1700/README.txt rename to boards/arm/lpc17xx_40xx/mcb1700/README.txt diff --git a/boards/arm/mcb1700/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig similarity index 97% rename from boards/arm/mcb1700/configs/nsh/defconfig rename to boards/arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig index e15c2fc0527..aea2224c1df 100644 --- a/boards/arm/mcb1700/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="mcb1700" CONFIG_ARCH_BOARD_MCB1700=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1768=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/mcb1700/include/board.h b/boards/arm/lpc17xx_40xx/mcb1700/include/board.h similarity index 100% rename from boards/arm/mcb1700/include/board.h rename to boards/arm/lpc17xx_40xx/mcb1700/include/board.h diff --git a/boards/arm/mcb1700/scripts/Make.defs b/boards/arm/lpc17xx_40xx/mcb1700/scripts/Make.defs similarity index 96% rename from boards/arm/mcb1700/scripts/Make.defs rename to boards/arm/lpc17xx_40xx/mcb1700/scripts/Make.defs index f9078b1c83b..b024864ec1c 100644 --- a/boards/arm/mcb1700/scripts/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/mcb1700/scripts/ld.script b/boards/arm/lpc17xx_40xx/mcb1700/scripts/ld.script similarity index 100% rename from boards/arm/mcb1700/scripts/ld.script rename to boards/arm/lpc17xx_40xx/mcb1700/scripts/ld.script diff --git a/boards/arm/freedom-kl25z/src/.gitignore b/boards/arm/lpc17xx_40xx/mcb1700/src/.gitignore similarity index 100% rename from boards/arm/freedom-kl25z/src/.gitignore rename to boards/arm/lpc17xx_40xx/mcb1700/src/.gitignore diff --git a/boards/arm/mcb1700/src/Makefile b/boards/arm/lpc17xx_40xx/mcb1700/src/Makefile similarity index 100% rename from boards/arm/mcb1700/src/Makefile rename to boards/arm/lpc17xx_40xx/mcb1700/src/Makefile diff --git a/boards/arm/mcb1700/src/lpc17_40_adc.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_adc.c similarity index 100% rename from boards/arm/mcb1700/src/lpc17_40_adc.c rename to boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_adc.c diff --git a/boards/arm/mcb1700/src/lpc17_40_appinit.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_appinit.c similarity index 100% rename from boards/arm/mcb1700/src/lpc17_40_appinit.c rename to boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_appinit.c diff --git a/boards/arm/mcb1700/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_boot.c similarity index 100% rename from boards/arm/mcb1700/src/lpc17_40_boot.c rename to boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_boot.c diff --git a/boards/arm/mcb1700/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_bringup.c similarity index 100% rename from boards/arm/mcb1700/src/lpc17_40_bringup.c rename to boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_bringup.c diff --git a/boards/arm/mcb1700/src/lpc17_40_dac.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_dac.c similarity index 100% rename from boards/arm/mcb1700/src/lpc17_40_dac.c rename to boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_dac.c diff --git a/boards/arm/mcb1700/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_leds.c similarity index 100% rename from boards/arm/mcb1700/src/lpc17_40_leds.c rename to boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_leds.c diff --git a/boards/arm/mcb1700/src/lpc17_40_pwm.c b/boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_pwm.c similarity index 100% rename from boards/arm/mcb1700/src/lpc17_40_pwm.c rename to boards/arm/lpc17xx_40xx/mcb1700/src/lpc17_40_pwm.c diff --git a/boards/arm/mcb1700/src/mcb1700.h b/boards/arm/lpc17xx_40xx/mcb1700/src/mcb1700.h similarity index 100% rename from boards/arm/mcb1700/src/mcb1700.h rename to boards/arm/lpc17xx_40xx/mcb1700/src/mcb1700.h diff --git a/boards/arm/olimex-lpc1766stk/Kconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/Kconfig similarity index 100% rename from boards/arm/olimex-lpc1766stk/Kconfig rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/Kconfig diff --git a/boards/arm/olimex-lpc1766stk/README.txt b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/README.txt similarity index 100% rename from boards/arm/olimex-lpc1766stk/README.txt rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/README.txt diff --git a/boards/arm/olimex-lpc1766stk/configs/ftpc/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig similarity index 98% rename from boards/arm/olimex-lpc1766stk/configs/ftpc/defconfig rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig index d03bdbb840d..29a65651655 100644 --- a/boards/arm/olimex-lpc1766stk/configs/ftpc/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1766=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-lpc1766stk/configs/hidkbd/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidkbd/defconfig similarity index 98% rename from boards/arm/olimex-lpc1766stk/configs/hidkbd/defconfig rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidkbd/defconfig index 9ff33003fda..0bd29057dd2 100644 --- a/boards/arm/olimex-lpc1766stk/configs/hidkbd/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidkbd/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1766=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-lpc1766stk/configs/hidmouse/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig similarity index 98% rename from boards/arm/olimex-lpc1766stk/configs/hidmouse/defconfig rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig index bf3a0dc206c..15a6d650c89 100644 --- a/boards/arm/olimex-lpc1766stk/configs/hidmouse/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1766=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-lpc1766stk/configs/nettest/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig similarity index 97% rename from boards/arm/olimex-lpc1766stk/configs/nettest/defconfig rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig index e761d3eab2f..6942ef7f1f4 100644 --- a/boards/arm/olimex-lpc1766stk/configs/nettest/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1766=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-lpc1766stk/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nsh/defconfig similarity index 98% rename from boards/arm/olimex-lpc1766stk/configs/nsh/defconfig rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nsh/defconfig index a97bdb7667e..f81f2aa6b49 100644 --- a/boards/arm/olimex-lpc1766stk/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nsh/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1766=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-lpc1766stk/configs/slip-httpd/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig similarity index 98% rename from boards/arm/olimex-lpc1766stk/configs/slip-httpd/defconfig rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig index 05e212d02db..052d75c6c71 100644 --- a/boards/arm/olimex-lpc1766stk/configs/slip-httpd/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1766=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs similarity index 96% rename from boards/arm/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs index d454a905fcf..ca26eedb841 100644 --- a/boards/arm/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/olimex-lpc1766stk/configs/thttpd-binfs/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig similarity index 98% rename from boards/arm/olimex-lpc1766stk/configs/thttpd-binfs/defconfig rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig index dbd894edea5..23903c1d3bf 100644 --- a/boards/arm/olimex-lpc1766stk/configs/thttpd-binfs/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1766=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs similarity index 96% rename from boards/arm/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs index f7efa8c99e0..c4959a152c2 100644 --- a/boards/arm/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig similarity index 98% rename from boards/arm/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig index ece4a5f6feb..7199a0262fa 100644 --- a/boards/arm/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1766=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-lpc1766stk/configs/usbmsc/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig similarity index 98% rename from boards/arm/olimex-lpc1766stk/configs/usbmsc/defconfig rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig index a9ec4a034e5..48857d7b14b 100644 --- a/boards/arm/olimex-lpc1766stk/configs/usbmsc/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1766=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-lpc1766stk/configs/usbserial/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig similarity index 97% rename from boards/arm/olimex-lpc1766stk/configs/usbserial/defconfig rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig index 84785ffbb88..b0169bcd3fd 100644 --- a/boards/arm/olimex-lpc1766stk/configs/usbserial/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1766=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-lpc1766stk/configs/zmodem/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/zmodem/defconfig similarity index 98% rename from boards/arm/olimex-lpc1766stk/configs/zmodem/defconfig rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/zmodem/defconfig index b37a995b202..63f5cc2ea0f 100644 --- a/boards/arm/olimex-lpc1766stk/configs/zmodem/defconfig +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/zmodem/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-lpc1766stk" CONFIG_ARCH_BOARD_LPC1766STK=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1766=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-lpc1766stk/include/board.h b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/include/board.h similarity index 100% rename from boards/arm/olimex-lpc1766stk/include/board.h rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/include/board.h diff --git a/boards/arm/olimex-lpc1766stk/scripts/Make.defs b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/scripts/Make.defs similarity index 96% rename from boards/arm/olimex-lpc1766stk/scripts/Make.defs rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/scripts/Make.defs index 124f98c5324..0bbd0ef50b9 100644 --- a/boards/arm/olimex-lpc1766stk/scripts/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/olimex-lpc1766stk/scripts/ld.script b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/scripts/ld.script similarity index 100% rename from boards/arm/olimex-lpc1766stk/scripts/ld.script rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/scripts/ld.script diff --git a/boards/arm/freedom-kl26z/src/.gitignore b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/.gitignore similarity index 100% rename from boards/arm/freedom-kl26z/src/.gitignore rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/.gitignore diff --git a/boards/arm/olimex-lpc1766stk/src/Makefile b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/Makefile similarity index 100% rename from boards/arm/olimex-lpc1766stk/src/Makefile rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/Makefile diff --git a/boards/arm/olimex-lpc1766stk/src/lpc1766stk.h b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc1766stk.h similarity index 100% rename from boards/arm/olimex-lpc1766stk/src/lpc1766stk.h rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc1766stk.h diff --git a/boards/arm/olimex-lpc1766stk/src/lpc17_40_appinit.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_appinit.c similarity index 100% rename from boards/arm/olimex-lpc1766stk/src/lpc17_40_appinit.c rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_appinit.c diff --git a/boards/arm/olimex-lpc1766stk/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_boot.c similarity index 100% rename from boards/arm/olimex-lpc1766stk/src/lpc17_40_boot.c rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_boot.c diff --git a/boards/arm/olimex-lpc1766stk/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_bringup.c similarity index 100% rename from boards/arm/olimex-lpc1766stk/src/lpc17_40_bringup.c rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_bringup.c diff --git a/boards/arm/olimex-lpc1766stk/src/lpc17_40_buttons.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_buttons.c similarity index 100% rename from boards/arm/olimex-lpc1766stk/src/lpc17_40_buttons.c rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_buttons.c diff --git a/boards/arm/olimex-lpc1766stk/src/lpc17_40_can.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_can.c similarity index 100% rename from boards/arm/olimex-lpc1766stk/src/lpc17_40_can.c rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_can.c diff --git a/boards/arm/olimex-lpc1766stk/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_leds.c similarity index 100% rename from boards/arm/olimex-lpc1766stk/src/lpc17_40_leds.c rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_leds.c diff --git a/boards/arm/olimex-lpc1766stk/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_ssp.c similarity index 100% rename from boards/arm/olimex-lpc1766stk/src/lpc17_40_ssp.c rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_ssp.c diff --git a/boards/arm/olimex-lpc1766stk/src/lpc17_40_usbmsc.c b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_usbmsc.c similarity index 100% rename from boards/arm/olimex-lpc1766stk/src/lpc17_40_usbmsc.c rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/src/lpc17_40_usbmsc.c diff --git a/boards/arm/olimex-lpc1766stk/tools/olimex.cfg b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/tools/olimex.cfg similarity index 100% rename from boards/arm/olimex-lpc1766stk/tools/olimex.cfg rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/tools/olimex.cfg diff --git a/boards/arm/olimex-lpc1766stk/tools/oocd.sh b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/tools/oocd.sh similarity index 100% rename from boards/arm/olimex-lpc1766stk/tools/oocd.sh rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/tools/oocd.sh diff --git a/boards/arm/cloudctrl/tools/usb-driver.txt b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/tools/usb-driver.txt similarity index 100% rename from boards/arm/cloudctrl/tools/usb-driver.txt rename to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/tools/usb-driver.txt diff --git a/boards/arm/open1788/Kconfig b/boards/arm/lpc17xx_40xx/open1788/Kconfig similarity index 100% rename from boards/arm/open1788/Kconfig rename to boards/arm/lpc17xx_40xx/open1788/Kconfig diff --git a/boards/arm/open1788/README.txt b/boards/arm/lpc17xx_40xx/open1788/README.txt similarity index 100% rename from boards/arm/open1788/README.txt rename to boards/arm/lpc17xx_40xx/open1788/README.txt diff --git a/boards/arm/open1788/configs/fb/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig similarity index 97% rename from boards/arm/open1788/configs/fb/defconfig rename to boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig index 35aeec90db7..f0d39506cc2 100644 --- a/boards/arm/open1788/configs/fb/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="open1788" CONFIG_ARCH_BOARD_OPEN1788=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1788=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/open1788/configs/knsh/Make.defs b/boards/arm/lpc17xx_40xx/open1788/configs/knsh/Make.defs similarity index 92% rename from boards/arm/open1788/configs/knsh/Make.defs rename to boards/arm/lpc17xx_40xx/open1788/configs/knsh/Make.defs index d3c9af85e01..93a5e22be89 100644 --- a/boards/arm/open1788/configs/knsh/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)$(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}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(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 + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/open1788/configs/knsh/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/knsh/defconfig similarity index 98% rename from boards/arm/open1788/configs/knsh/defconfig rename to boards/arm/lpc17xx_40xx/open1788/configs/knsh/defconfig index 39eea5aeaec..ac6a7858b39 100644 --- a/boards/arm/open1788/configs/knsh/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/knsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="open1788" CONFIG_ARCH_BOARD_OPEN1788=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1788=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/open1788/configs/knxterm/Make.defs b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/Make.defs similarity index 92% rename from boards/arm/open1788/configs/knxterm/Make.defs rename to boards/arm/lpc17xx_40xx/open1788/configs/knxterm/Make.defs index 73f66195176..29f41d547f5 100644 --- a/boards/arm/open1788/configs/knxterm/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)$(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}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(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 + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/open1788/configs/knxterm/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig similarity index 98% rename from boards/arm/open1788/configs/knxterm/defconfig rename to boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig index eeb756d5c8e..096acee4e25 100644 --- a/boards/arm/open1788/configs/knxterm/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="open1788" CONFIG_ARCH_BOARD_OPEN1788=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1788=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/open1788/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/nsh/defconfig similarity index 97% rename from boards/arm/open1788/configs/nsh/defconfig rename to boards/arm/lpc17xx_40xx/open1788/configs/nsh/defconfig index 3fd018e7f24..2302ea7a0e0 100644 --- a/boards/arm/open1788/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="open1788" CONFIG_ARCH_BOARD_OPEN1788=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1788=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/open1788/configs/nxlines/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig similarity index 98% rename from boards/arm/open1788/configs/nxlines/defconfig rename to boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig index ace2eb7d499..2bfd5cc78bd 100644 --- a/boards/arm/open1788/configs/nxlines/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="open1788" CONFIG_ARCH_BOARD_OPEN1788=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1788=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/open1788/configs/pdcurses/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig similarity index 98% rename from boards/arm/open1788/configs/pdcurses/defconfig rename to boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig index c41daedc544..d160413e2cf 100644 --- a/boards/arm/open1788/configs/pdcurses/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="open1788" CONFIG_ARCH_BOARD_OPEN1788=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1788=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/open1788/configs/pwfb/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/pwfb/defconfig similarity index 98% rename from boards/arm/open1788/configs/pwfb/defconfig rename to boards/arm/lpc17xx_40xx/open1788/configs/pwfb/defconfig index 4d4400df96d..38dd8a3ada6 100644 --- a/boards/arm/open1788/configs/pwfb/defconfig +++ b/boards/arm/lpc17xx_40xx/open1788/configs/pwfb/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="open1788" CONFIG_ARCH_BOARD_OPEN1788=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1788=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/open1788/include/board.h b/boards/arm/lpc17xx_40xx/open1788/include/board.h similarity index 100% rename from boards/arm/open1788/include/board.h rename to boards/arm/lpc17xx_40xx/open1788/include/board.h diff --git a/boards/arm/lpc4088-devkit/kernel/.gitignore b/boards/arm/lpc17xx_40xx/open1788/kernel/.gitignore similarity index 100% rename from boards/arm/lpc4088-devkit/kernel/.gitignore rename to boards/arm/lpc17xx_40xx/open1788/kernel/.gitignore diff --git a/boards/arm/open1788/kernel/Makefile b/boards/arm/lpc17xx_40xx/open1788/kernel/Makefile similarity index 90% rename from boards/arm/open1788/kernel/Makefile rename to boards/arm/lpc17xx_40xx/open1788/kernel/Makefile index ee00c802fcb..b8a13857663 100644 --- a/boards/arm/open1788/kernel/Makefile +++ b/boards/arm/lpc17xx_40xx/open1788/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/open1788/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c similarity index 100% rename from boards/arm/open1788/kernel/lpc17_40_userspace.c rename to boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c diff --git a/boards/arm/open1788/scripts/Make.defs b/boards/arm/lpc17xx_40xx/open1788/scripts/Make.defs similarity index 95% rename from boards/arm/open1788/scripts/Make.defs rename to boards/arm/lpc17xx_40xx/open1788/scripts/Make.defs index 197a7145b35..918cad60229 100644 --- a/boards/arm/open1788/scripts/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/open1788/scripts/kernel-space.ld b/boards/arm/lpc17xx_40xx/open1788/scripts/kernel-space.ld similarity index 100% rename from boards/arm/open1788/scripts/kernel-space.ld rename to boards/arm/lpc17xx_40xx/open1788/scripts/kernel-space.ld diff --git a/boards/arm/open1788/scripts/ld.script b/boards/arm/lpc17xx_40xx/open1788/scripts/ld.script similarity index 100% rename from boards/arm/open1788/scripts/ld.script rename to boards/arm/lpc17xx_40xx/open1788/scripts/ld.script diff --git a/boards/arm/open1788/scripts/memory.ld b/boards/arm/lpc17xx_40xx/open1788/scripts/memory.ld similarity index 100% rename from boards/arm/open1788/scripts/memory.ld rename to boards/arm/lpc17xx_40xx/open1788/scripts/memory.ld diff --git a/boards/arm/open1788/scripts/user-space.ld b/boards/arm/lpc17xx_40xx/open1788/scripts/user-space.ld similarity index 100% rename from boards/arm/open1788/scripts/user-space.ld rename to boards/arm/lpc17xx_40xx/open1788/scripts/user-space.ld diff --git a/boards/arm/hymini-stm32v/src/.gitignore b/boards/arm/lpc17xx_40xx/open1788/src/.gitignore similarity index 100% rename from boards/arm/hymini-stm32v/src/.gitignore rename to boards/arm/lpc17xx_40xx/open1788/src/.gitignore diff --git a/boards/arm/open1788/src/Makefile b/boards/arm/lpc17xx_40xx/open1788/src/Makefile similarity index 100% rename from boards/arm/open1788/src/Makefile rename to boards/arm/lpc17xx_40xx/open1788/src/Makefile diff --git a/boards/arm/open1788/src/lpc17_40_appinit.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_appinit.c similarity index 100% rename from boards/arm/open1788/src/lpc17_40_appinit.c rename to boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_appinit.c diff --git a/boards/arm/open1788/src/lpc17_40_autoleds.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_autoleds.c similarity index 100% rename from boards/arm/open1788/src/lpc17_40_autoleds.c rename to boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_autoleds.c diff --git a/boards/arm/open1788/src/lpc17_40_boardinitialize.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_boardinitialize.c similarity index 100% rename from boards/arm/open1788/src/lpc17_40_boardinitialize.c rename to boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_boardinitialize.c diff --git a/boards/arm/open1788/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_bringup.c similarity index 100% rename from boards/arm/open1788/src/lpc17_40_bringup.c rename to boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_bringup.c diff --git a/boards/arm/open1788/src/lpc17_40_buttons.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_buttons.c similarity index 100% rename from boards/arm/open1788/src/lpc17_40_buttons.c rename to boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_buttons.c diff --git a/boards/arm/open1788/src/lpc17_40_djoystick.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_djoystick.c similarity index 100% rename from boards/arm/open1788/src/lpc17_40_djoystick.c rename to boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_djoystick.c diff --git a/boards/arm/open1788/src/lpc17_40_lcd.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_lcd.c similarity index 100% rename from boards/arm/open1788/src/lpc17_40_lcd.c rename to boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_lcd.c diff --git a/boards/arm/open1788/src/lpc17_40_nandinitialize.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_nandinitialize.c similarity index 100% rename from boards/arm/open1788/src/lpc17_40_nandinitialize.c rename to boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_nandinitialize.c diff --git a/boards/arm/open1788/src/lpc17_40_norinitialize.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_norinitialize.c similarity index 100% rename from boards/arm/open1788/src/lpc17_40_norinitialize.c rename to boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_norinitialize.c diff --git a/boards/arm/open1788/src/lpc17_40_sdraminitialize.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_sdraminitialize.c similarity index 100% rename from boards/arm/open1788/src/lpc17_40_sdraminitialize.c rename to boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_sdraminitialize.c diff --git a/boards/arm/open1788/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_ssp.c similarity index 100% rename from boards/arm/open1788/src/lpc17_40_ssp.c rename to boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_ssp.c diff --git a/boards/arm/open1788/src/lpc17_40_touchscreen.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_touchscreen.c similarity index 100% rename from boards/arm/open1788/src/lpc17_40_touchscreen.c rename to boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_touchscreen.c diff --git a/boards/arm/open1788/src/lpc17_40_userleds.c b/boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_userleds.c similarity index 100% rename from boards/arm/open1788/src/lpc17_40_userleds.c rename to boards/arm/lpc17xx_40xx/open1788/src/lpc17_40_userleds.c diff --git a/boards/arm/open1788/src/open1788.h b/boards/arm/lpc17xx_40xx/open1788/src/open1788.h similarity index 100% rename from boards/arm/open1788/src/open1788.h rename to boards/arm/lpc17xx_40xx/open1788/src/open1788.h diff --git a/boards/arm/open1788/tools/oocd.sh b/boards/arm/lpc17xx_40xx/open1788/tools/oocd.sh similarity index 100% rename from boards/arm/open1788/tools/oocd.sh rename to boards/arm/lpc17xx_40xx/open1788/tools/oocd.sh diff --git a/boards/arm/open1788/tools/open1788.cfg b/boards/arm/lpc17xx_40xx/open1788/tools/open1788.cfg similarity index 100% rename from boards/arm/open1788/tools/open1788.cfg rename to boards/arm/lpc17xx_40xx/open1788/tools/open1788.cfg diff --git a/boards/arm/pnev5180b/Kconfig b/boards/arm/lpc17xx_40xx/pnev5180b/Kconfig similarity index 100% rename from boards/arm/pnev5180b/Kconfig rename to boards/arm/lpc17xx_40xx/pnev5180b/Kconfig diff --git a/boards/arm/pnev5180b/README.txt b/boards/arm/lpc17xx_40xx/pnev5180b/README.txt similarity index 100% rename from boards/arm/pnev5180b/README.txt rename to boards/arm/lpc17xx_40xx/pnev5180b/README.txt diff --git a/boards/arm/pnev5180b/configs/knsh/Make.defs b/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs similarity index 92% rename from boards/arm/pnev5180b/configs/knsh/Make.defs rename to boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs index 890c407d421..5c4d1c6d4d5 100644 --- a/boards/arm/pnev5180b/configs/knsh/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)$(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}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(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 + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/pnev5180b/configs/knsh/defconfig b/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/defconfig similarity index 95% rename from boards/arm/pnev5180b/configs/knsh/defconfig rename to boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/defconfig index d7bba8b3c25..2088bba8b0c 100644 --- a/boards/arm/pnev5180b/configs/knsh/defconfig +++ b/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="pnev5180b" CONFIG_ARCH_BOARD_PNEV5180B=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1769=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARM_MPU=y diff --git a/boards/arm/pnev5180b/configs/nsh-cdcecm/defconfig b/boards/arm/lpc17xx_40xx/pnev5180b/configs/nsh-cdcecm/defconfig similarity index 96% rename from boards/arm/pnev5180b/configs/nsh-cdcecm/defconfig rename to boards/arm/lpc17xx_40xx/pnev5180b/configs/nsh-cdcecm/defconfig index 00daf1294ff..979bd2a2e5e 100644 --- a/boards/arm/pnev5180b/configs/nsh-cdcecm/defconfig +++ b/boards/arm/lpc17xx_40xx/pnev5180b/configs/nsh-cdcecm/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="pnev5180b" CONFIG_ARCH_BOARD_PNEV5180B=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1769=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_BOARD_LOOPSPERMSEC=11992 diff --git a/boards/arm/pnev5180b/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/pnev5180b/configs/nsh/defconfig similarity index 94% rename from boards/arm/pnev5180b/configs/nsh/defconfig rename to boards/arm/lpc17xx_40xx/pnev5180b/configs/nsh/defconfig index a2de2ad3df8..c94ae8d43b3 100644 --- a/boards/arm/pnev5180b/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/pnev5180b/configs/nsh/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="pnev5180b" CONFIG_ARCH_BOARD_PNEV5180B=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1769=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_BOARD_LOOPSPERMSEC=11992 diff --git a/boards/arm/pnev5180b/configs/usbnsh-cdcecm/defconfig b/boards/arm/lpc17xx_40xx/pnev5180b/configs/usbnsh-cdcecm/defconfig similarity index 97% rename from boards/arm/pnev5180b/configs/usbnsh-cdcecm/defconfig rename to boards/arm/lpc17xx_40xx/pnev5180b/configs/usbnsh-cdcecm/defconfig index 4d73f77fc86..3283696f5a3 100644 --- a/boards/arm/pnev5180b/configs/usbnsh-cdcecm/defconfig +++ b/boards/arm/lpc17xx_40xx/pnev5180b/configs/usbnsh-cdcecm/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="pnev5180b" CONFIG_ARCH_BOARD_PNEV5180B=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1769=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_BOARD_LOOPSPERMSEC=11992 diff --git a/boards/arm/pnev5180b/configs/usbnsh/defconfig b/boards/arm/lpc17xx_40xx/pnev5180b/configs/usbnsh/defconfig similarity index 96% rename from boards/arm/pnev5180b/configs/usbnsh/defconfig rename to boards/arm/lpc17xx_40xx/pnev5180b/configs/usbnsh/defconfig index 1baacdaf25c..1542c3af0fe 100644 --- a/boards/arm/pnev5180b/configs/usbnsh/defconfig +++ b/boards/arm/lpc17xx_40xx/pnev5180b/configs/usbnsh/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="pnev5180b" CONFIG_ARCH_BOARD_PNEV5180B=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1769=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_BOARD_LOOPSPERMSEC=11992 diff --git a/boards/arm/pnev5180b/include/board.h b/boards/arm/lpc17xx_40xx/pnev5180b/include/board.h similarity index 100% rename from boards/arm/pnev5180b/include/board.h rename to boards/arm/lpc17xx_40xx/pnev5180b/include/board.h diff --git a/boards/arm/pnev5180b/kernel/.gitignore b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/.gitignore similarity index 100% rename from boards/arm/pnev5180b/kernel/.gitignore rename to boards/arm/lpc17xx_40xx/pnev5180b/kernel/.gitignore diff --git a/boards/arm/pnev5180b/kernel/Makefile b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/Makefile similarity index 91% rename from boards/arm/pnev5180b/kernel/Makefile rename to boards/arm/lpc17xx_40xx/pnev5180b/kernel/Makefile index 4f43bbc9919..b78741f9bdc 100644 --- a/boards/arm/pnev5180b/kernel/Makefile +++ b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/Makefile @@ -42,7 +42,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -55,16 +55,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/pnev5180b/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c similarity index 100% rename from boards/arm/pnev5180b/kernel/lpc17_40_userspace.c rename to boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c diff --git a/boards/arm/pnev5180b/scripts/Make.defs b/boards/arm/lpc17xx_40xx/pnev5180b/scripts/Make.defs similarity index 96% rename from boards/arm/pnev5180b/scripts/Make.defs rename to boards/arm/lpc17xx_40xx/pnev5180b/scripts/Make.defs index b3caa048864..e976e807fd3 100644 --- a/boards/arm/pnev5180b/scripts/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)flash.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)flash.ld + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)flash.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/pnev5180b/scripts/flash.ld b/boards/arm/lpc17xx_40xx/pnev5180b/scripts/flash.ld similarity index 100% rename from boards/arm/pnev5180b/scripts/flash.ld rename to boards/arm/lpc17xx_40xx/pnev5180b/scripts/flash.ld diff --git a/boards/arm/pnev5180b/scripts/kernel-space.ld b/boards/arm/lpc17xx_40xx/pnev5180b/scripts/kernel-space.ld similarity index 100% rename from boards/arm/pnev5180b/scripts/kernel-space.ld rename to boards/arm/lpc17xx_40xx/pnev5180b/scripts/kernel-space.ld diff --git a/boards/arm/pnev5180b/scripts/memory.ld b/boards/arm/lpc17xx_40xx/pnev5180b/scripts/memory.ld similarity index 100% rename from boards/arm/pnev5180b/scripts/memory.ld rename to boards/arm/lpc17xx_40xx/pnev5180b/scripts/memory.ld diff --git a/boards/arm/pnev5180b/scripts/user-space.ld b/boards/arm/lpc17xx_40xx/pnev5180b/scripts/user-space.ld similarity index 100% rename from boards/arm/pnev5180b/scripts/user-space.ld rename to boards/arm/lpc17xx_40xx/pnev5180b/scripts/user-space.ld diff --git a/boards/arm/kwikstik-k40/src/.gitignore b/boards/arm/lpc17xx_40xx/pnev5180b/src/.gitignore similarity index 100% rename from boards/arm/kwikstik-k40/src/.gitignore rename to boards/arm/lpc17xx_40xx/pnev5180b/src/.gitignore diff --git a/boards/arm/pnev5180b/src/Makefile b/boards/arm/lpc17xx_40xx/pnev5180b/src/Makefile similarity index 100% rename from boards/arm/pnev5180b/src/Makefile rename to boards/arm/lpc17xx_40xx/pnev5180b/src/Makefile diff --git a/boards/arm/pnev5180b/src/lpc17_40_appinit.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_appinit.c similarity index 100% rename from boards/arm/pnev5180b/src/lpc17_40_appinit.c rename to boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_appinit.c diff --git a/boards/arm/pnev5180b/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_boot.c similarity index 100% rename from boards/arm/pnev5180b/src/lpc17_40_boot.c rename to boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_boot.c diff --git a/boards/arm/pnev5180b/src/lpc17_40_bringup.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_bringup.c similarity index 100% rename from boards/arm/pnev5180b/src/lpc17_40_bringup.c rename to boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_bringup.c diff --git a/boards/arm/pnev5180b/src/lpc17_40_composite.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_composite.c similarity index 100% rename from boards/arm/pnev5180b/src/lpc17_40_composite.c rename to boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_composite.c diff --git a/boards/arm/pnev5180b/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_leds.c similarity index 100% rename from boards/arm/pnev5180b/src/lpc17_40_leds.c rename to boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_leds.c diff --git a/boards/arm/pnev5180b/src/lpc17_40_romfs.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_romfs.c similarity index 100% rename from boards/arm/pnev5180b/src/lpc17_40_romfs.c rename to boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_romfs.c diff --git a/boards/arm/pnev5180b/src/lpc17_40_romfs.h b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_romfs.h similarity index 100% rename from boards/arm/pnev5180b/src/lpc17_40_romfs.h rename to boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_romfs.h diff --git a/boards/arm/pnev5180b/src/lpc17_40_spi.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_spi.c similarity index 100% rename from boards/arm/pnev5180b/src/lpc17_40_spi.c rename to boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_spi.c diff --git a/boards/arm/pnev5180b/src/lpc17_40_symtab.c b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_symtab.c similarity index 100% rename from boards/arm/pnev5180b/src/lpc17_40_symtab.c rename to boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_symtab.c diff --git a/boards/arm/pnev5180b/src/lpc17_40_symtab.h b/boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_symtab.h similarity index 100% rename from boards/arm/pnev5180b/src/lpc17_40_symtab.h rename to boards/arm/lpc17xx_40xx/pnev5180b/src/lpc17_40_symtab.h diff --git a/boards/arm/pnev5180b/src/pnev5180b.h b/boards/arm/lpc17xx_40xx/pnev5180b/src/pnev5180b.h similarity index 100% rename from boards/arm/pnev5180b/src/pnev5180b.h rename to boards/arm/lpc17xx_40xx/pnev5180b/src/pnev5180b.h diff --git a/boards/arm/u-blox-c027/Kconfig b/boards/arm/lpc17xx_40xx/u-blox-c027/Kconfig similarity index 100% rename from boards/arm/u-blox-c027/Kconfig rename to boards/arm/lpc17xx_40xx/u-blox-c027/Kconfig diff --git a/boards/arm/u-blox-c027/README.txt b/boards/arm/lpc17xx_40xx/u-blox-c027/README.txt similarity index 100% rename from boards/arm/u-blox-c027/README.txt rename to boards/arm/lpc17xx_40xx/u-blox-c027/README.txt diff --git a/boards/arm/u-blox-c027/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig similarity index 99% rename from boards/arm/u-blox-c027/configs/nsh/defconfig rename to boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig index d38ff5fe0e5..08c1b27019b 100644 --- a/boards/arm/u-blox-c027/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="u-blox-c027" CONFIG_ARCH_BOARD_U_BLOX_C027=y ++CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1768=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/u-blox-c027/include/board.h b/boards/arm/lpc17xx_40xx/u-blox-c027/include/board.h similarity index 100% rename from boards/arm/u-blox-c027/include/board.h rename to boards/arm/lpc17xx_40xx/u-blox-c027/include/board.h diff --git a/boards/arm/u-blox-c027/scripts/Make.defs b/boards/arm/lpc17xx_40xx/u-blox-c027/scripts/Make.defs similarity index 95% rename from boards/arm/u-blox-c027/scripts/Make.defs rename to boards/arm/lpc17xx_40xx/u-blox-c027/scripts/Make.defs index 9a17595a31b..2cb84959b39 100644 --- a/boards/arm/u-blox-c027/scripts/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)/$(CONFIG_ARCH_BOARD)/scripts/u-blox-c027.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/u-blox-c027.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/u-blox-c027.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/u-blox-c027/scripts/u-blox-c027.ld b/boards/arm/lpc17xx_40xx/u-blox-c027/scripts/u-blox-c027.ld similarity index 100% rename from boards/arm/u-blox-c027/scripts/u-blox-c027.ld rename to boards/arm/lpc17xx_40xx/u-blox-c027/scripts/u-blox-c027.ld diff --git a/boards/arm/lincoln60/src/.gitignore b/boards/arm/lpc17xx_40xx/u-blox-c027/src/.gitignore similarity index 100% rename from boards/arm/lincoln60/src/.gitignore rename to boards/arm/lpc17xx_40xx/u-blox-c027/src/.gitignore diff --git a/boards/arm/u-blox-c027/src/Makefile b/boards/arm/lpc17xx_40xx/u-blox-c027/src/Makefile similarity index 100% rename from boards/arm/u-blox-c027/src/Makefile rename to boards/arm/lpc17xx_40xx/u-blox-c027/src/Makefile diff --git a/boards/arm/u-blox-c027/src/lpc17_40_adc.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_adc.c similarity index 100% rename from boards/arm/u-blox-c027/src/lpc17_40_adc.c rename to boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_adc.c diff --git a/boards/arm/u-blox-c027/src/lpc17_40_appinit.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_appinit.c similarity index 100% rename from boards/arm/u-blox-c027/src/lpc17_40_appinit.c rename to boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_appinit.c diff --git a/boards/arm/u-blox-c027/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_boot.c similarity index 100% rename from boards/arm/u-blox-c027/src/lpc17_40_boot.c rename to boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_boot.c diff --git a/boards/arm/u-blox-c027/src/lpc17_40_dac.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_dac.c similarity index 100% rename from boards/arm/u-blox-c027/src/lpc17_40_dac.c rename to boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_dac.c diff --git a/boards/arm/u-blox-c027/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_leds.c similarity index 100% rename from boards/arm/u-blox-c027/src/lpc17_40_leds.c rename to boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_leds.c diff --git a/boards/arm/u-blox-c027/src/lpc17_40_pwm.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_pwm.c similarity index 100% rename from boards/arm/u-blox-c027/src/lpc17_40_pwm.c rename to boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_pwm.c diff --git a/boards/arm/u-blox-c027/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_ssp.c similarity index 100% rename from boards/arm/u-blox-c027/src/lpc17_40_ssp.c rename to boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_ssp.c diff --git a/boards/arm/u-blox-c027/src/lpc17_40_ubxmdm.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_ubxmdm.c similarity index 100% rename from boards/arm/u-blox-c027/src/lpc17_40_ubxmdm.c rename to boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_ubxmdm.c diff --git a/boards/arm/u-blox-c027/src/lpc17_40_usbmsc.c b/boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_usbmsc.c similarity index 100% rename from boards/arm/u-blox-c027/src/lpc17_40_usbmsc.c rename to boards/arm/lpc17xx_40xx/u-blox-c027/src/lpc17_40_usbmsc.c diff --git a/boards/arm/u-blox-c027/src/u-blox-c027.h b/boards/arm/lpc17xx_40xx/u-blox-c027/src/u-blox-c027.h similarity index 100% rename from boards/arm/u-blox-c027/src/u-blox-c027.h rename to boards/arm/lpc17xx_40xx/u-blox-c027/src/u-blox-c027.h diff --git a/boards/arm/u-blox-c027/tools/flash.sh b/boards/arm/lpc17xx_40xx/u-blox-c027/tools/flash.sh similarity index 100% rename from boards/arm/u-blox-c027/tools/flash.sh rename to boards/arm/lpc17xx_40xx/u-blox-c027/tools/flash.sh diff --git a/boards/arm/zkit-arm-1769/Kconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/Kconfig similarity index 100% rename from boards/arm/zkit-arm-1769/Kconfig rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/Kconfig diff --git a/boards/arm/zkit-arm-1769/README.txt b/boards/arm/lpc17xx_40xx/zkit-arm-1769/README.txt similarity index 100% rename from boards/arm/zkit-arm-1769/README.txt rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/README.txt diff --git a/boards/arm/zkit-arm-1769/configs/hello/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig similarity index 97% rename from boards/arm/zkit-arm-1769/configs/hello/defconfig rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig index 42ae79093cb..b34809055fc 100644 --- a/boards/arm/zkit-arm-1769/configs/hello/defconfig +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="zkit-arm-1769" CONFIG_ARCH_BOARD_ZKITARM=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1768=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/zkit-arm-1769/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nsh/defconfig similarity index 98% rename from boards/arm/zkit-arm-1769/configs/nsh/defconfig rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nsh/defconfig index fd409df7d92..17c4e951590 100644 --- a/boards/arm/zkit-arm-1769/configs/nsh/defconfig +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nsh/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="zkit-arm-1769" CONFIG_ARCH_BOARD_ZKITARM=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1768=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/zkit-arm-1769/configs/nxhello/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nxhello/defconfig similarity index 98% rename from boards/arm/zkit-arm-1769/configs/nxhello/defconfig rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nxhello/defconfig index b421edba1cd..1eb2ac60dc5 100644 --- a/boards/arm/zkit-arm-1769/configs/nxhello/defconfig +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nxhello/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="zkit-arm-1769" CONFIG_ARCH_BOARD_ZKITARM=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1768=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/zkit-arm-1769/configs/thttpd/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig similarity index 98% rename from boards/arm/zkit-arm-1769/configs/thttpd/defconfig rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig index 4b34ee8da6f..150578d252f 100644 --- a/boards/arm/zkit-arm-1769/configs/thttpd/defconfig +++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="zkit-arm-1769" CONFIG_ARCH_BOARD_ZKITARM=y +CONFIG_ARCH_CHIP="lpc17xx_40xx" CONFIG_ARCH_CHIP_LPC1768=y CONFIG_ARCH_CHIP_LPC17XX_40XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/zkit-arm-1769/include/board.h b/boards/arm/lpc17xx_40xx/zkit-arm-1769/include/board.h similarity index 100% rename from boards/arm/zkit-arm-1769/include/board.h rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/include/board.h diff --git a/boards/arm/zkit-arm-1769/scripts/Make.defs b/boards/arm/lpc17xx_40xx/zkit-arm-1769/scripts/Make.defs similarity index 96% rename from boards/arm/zkit-arm-1769/scripts/Make.defs rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/scripts/Make.defs index e982685c29a..1d12a698e3e 100644 --- a/boards/arm/zkit-arm-1769/scripts/Make.defs +++ b/boards/arm/lpc17xx_40xx/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script NXFLATLDSCRIPT = -T"$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld" endif diff --git a/boards/arm/zkit-arm-1769/scripts/ld.script b/boards/arm/lpc17xx_40xx/zkit-arm-1769/scripts/ld.script similarity index 100% rename from boards/arm/zkit-arm-1769/scripts/ld.script rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/scripts/ld.script diff --git a/boards/arm/lm3s6432-s2e/src/.gitignore b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/.gitignore similarity index 100% rename from boards/arm/lm3s6432-s2e/src/.gitignore rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/src/.gitignore diff --git a/boards/arm/zkit-arm-1769/src/Makefile b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/Makefile similarity index 100% rename from boards/arm/zkit-arm-1769/src/Makefile rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/src/Makefile diff --git a/boards/arm/zkit-arm-1769/src/lpc17_40_adc.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_adc.c similarity index 100% rename from boards/arm/zkit-arm-1769/src/lpc17_40_adc.c rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_adc.c diff --git a/boards/arm/zkit-arm-1769/src/lpc17_40_appinit.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_appinit.c similarity index 100% rename from boards/arm/zkit-arm-1769/src/lpc17_40_appinit.c rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_appinit.c diff --git a/boards/arm/zkit-arm-1769/src/lpc17_40_boot.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_boot.c similarity index 100% rename from boards/arm/zkit-arm-1769/src/lpc17_40_boot.c rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_boot.c diff --git a/boards/arm/zkit-arm-1769/src/lpc17_40_buttons.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c similarity index 100% rename from boards/arm/zkit-arm-1769/src/lpc17_40_buttons.c rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_buttons.c diff --git a/boards/arm/zkit-arm-1769/src/lpc17_40_can.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_can.c similarity index 100% rename from boards/arm/zkit-arm-1769/src/lpc17_40_can.c rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_can.c diff --git a/boards/arm/zkit-arm-1769/src/lpc17_40_dac.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_dac.c similarity index 100% rename from boards/arm/zkit-arm-1769/src/lpc17_40_dac.c rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_dac.c diff --git a/boards/arm/zkit-arm-1769/src/lpc17_40_lcd.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_lcd.c similarity index 100% rename from boards/arm/zkit-arm-1769/src/lpc17_40_lcd.c rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_lcd.c diff --git a/boards/arm/zkit-arm-1769/src/lpc17_40_leds.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_leds.c similarity index 100% rename from boards/arm/zkit-arm-1769/src/lpc17_40_leds.c rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_leds.c diff --git a/boards/arm/zkit-arm-1769/src/lpc17_40_spi.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_spi.c similarity index 100% rename from boards/arm/zkit-arm-1769/src/lpc17_40_spi.c rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_spi.c diff --git a/boards/arm/zkit-arm-1769/src/lpc17_40_ssp.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_ssp.c similarity index 100% rename from boards/arm/zkit-arm-1769/src/lpc17_40_ssp.c rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_ssp.c diff --git a/boards/arm/zkit-arm-1769/src/lpc17_40_usbmsc.c b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_usbmsc.c similarity index 100% rename from boards/arm/zkit-arm-1769/src/lpc17_40_usbmsc.c rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/src/lpc17_40_usbmsc.c diff --git a/boards/arm/zkit-arm-1769/src/zkit-arm-1769.h b/boards/arm/lpc17xx_40xx/zkit-arm-1769/src/zkit-arm-1769.h similarity index 100% rename from boards/arm/zkit-arm-1769/src/zkit-arm-1769.h rename to boards/arm/lpc17xx_40xx/zkit-arm-1769/src/zkit-arm-1769.h diff --git a/boards/arm/mcu123-lpc214x/Kconfig b/boards/arm/lpc214x/mcu123-lpc214x/Kconfig similarity index 100% rename from boards/arm/mcu123-lpc214x/Kconfig rename to boards/arm/lpc214x/mcu123-lpc214x/Kconfig diff --git a/boards/arm/mcu123-lpc214x/README.txt b/boards/arm/lpc214x/mcu123-lpc214x/README.txt similarity index 100% rename from boards/arm/mcu123-lpc214x/README.txt rename to boards/arm/lpc214x/mcu123-lpc214x/README.txt diff --git a/boards/arm/mcu123-lpc214x/configs/composite/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig similarity index 98% rename from boards/arm/mcu123-lpc214x/configs/composite/defconfig rename to boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig index 9386422a044..c6e15db1e9d 100644 --- a/boards/arm/mcu123-lpc214x/configs/composite/defconfig +++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="mcu123-lpc214x" CONFIG_ARCH_BOARD_MCU123_LPC214X=y +CONFIG_ARCH_CHIP="lpc214x" CONFIG_ARCH_CHIP_LPC2148=y CONFIG_ARCH_CHIP_LPC214X=y CONFIG_ARCH_INTERRUPTSTACK=1024 diff --git a/boards/arm/mcu123-lpc214x/configs/nsh/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/nsh/defconfig similarity index 97% rename from boards/arm/mcu123-lpc214x/configs/nsh/defconfig rename to boards/arm/lpc214x/mcu123-lpc214x/configs/nsh/defconfig index 79ea01db997..1f2dad733b9 100644 --- a/boards/arm/mcu123-lpc214x/configs/nsh/defconfig +++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="mcu123-lpc214x" CONFIG_ARCH_BOARD_MCU123_LPC214X=y +CONFIG_ARCH_CHIP="lpc214x" CONFIG_ARCH_CHIP_LPC2148=y CONFIG_ARCH_CHIP_LPC214X=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/mcu123-lpc214x/configs/usbmsc/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig similarity index 98% rename from boards/arm/mcu123-lpc214x/configs/usbmsc/defconfig rename to boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig index c9a94c1076c..5f19c06c726 100644 --- a/boards/arm/mcu123-lpc214x/configs/usbmsc/defconfig +++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="mcu123-lpc214x" CONFIG_ARCH_BOARD_MCU123_LPC214X=y +CONFIG_ARCH_CHIP="lpc214x" CONFIG_ARCH_CHIP_LPC2148=y CONFIG_ARCH_CHIP_LPC214X=y CONFIG_ARCH_INTERRUPTSTACK=1024 diff --git a/boards/arm/mcu123-lpc214x/configs/usbserial/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig similarity index 97% rename from boards/arm/mcu123-lpc214x/configs/usbserial/defconfig rename to boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig index 1926201c51f..fd428efe915 100644 --- a/boards/arm/mcu123-lpc214x/configs/usbserial/defconfig +++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="mcu123-lpc214x" CONFIG_ARCH_BOARD_MCU123_LPC214X=y +CONFIG_ARCH_CHIP="lpc214x" CONFIG_ARCH_CHIP_LPC2148=y CONFIG_ARCH_CHIP_LPC214X=y CONFIG_ARCH_INTERRUPTSTACK=1024 diff --git a/boards/arm/mcu123-lpc214x/include/board.h b/boards/arm/lpc214x/mcu123-lpc214x/include/board.h similarity index 100% rename from boards/arm/mcu123-lpc214x/include/board.h rename to boards/arm/lpc214x/mcu123-lpc214x/include/board.h diff --git a/boards/arm/mcu123-lpc214x/lpc21isp-1.60.diff b/boards/arm/lpc214x/mcu123-lpc214x/lpc21isp-1.60.diff similarity index 100% rename from boards/arm/mcu123-lpc214x/lpc21isp-1.60.diff rename to boards/arm/lpc214x/mcu123-lpc214x/lpc21isp-1.60.diff diff --git a/boards/arm/mcu123-lpc214x/scripts/Make.defs b/boards/arm/lpc214x/mcu123-lpc214x/scripts/Make.defs similarity index 96% rename from boards/arm/mcu123-lpc214x/scripts/Make.defs rename to boards/arm/lpc214x/mcu123-lpc214x/scripts/Make.defs index 9f966110efe..050e435db1e 100644 --- a/boards/arm/mcu123-lpc214x/scripts/Make.defs +++ b/boards/arm/lpc214x/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/mcu123-lpc214x/scripts/ld.script b/boards/arm/lpc214x/mcu123-lpc214x/scripts/ld.script similarity index 100% rename from boards/arm/mcu123-lpc214x/scripts/ld.script rename to boards/arm/lpc214x/mcu123-lpc214x/scripts/ld.script diff --git a/boards/arm/mcu123-lpc214x/scripts/lpc21isp.sh b/boards/arm/lpc214x/mcu123-lpc214x/scripts/lpc21isp.sh similarity index 100% rename from boards/arm/mcu123-lpc214x/scripts/lpc21isp.sh rename to boards/arm/lpc214x/mcu123-lpc214x/scripts/lpc21isp.sh diff --git a/boards/arm/lm3s6965-ek/src/.gitignore b/boards/arm/lpc214x/mcu123-lpc214x/src/.gitignore similarity index 100% rename from boards/arm/lm3s6965-ek/src/.gitignore rename to boards/arm/lpc214x/mcu123-lpc214x/src/.gitignore diff --git a/boards/arm/mcu123-lpc214x/src/Makefile b/boards/arm/lpc214x/mcu123-lpc214x/src/Makefile similarity index 100% rename from boards/arm/mcu123-lpc214x/src/Makefile rename to boards/arm/lpc214x/mcu123-lpc214x/src/Makefile diff --git a/boards/arm/mcu123-lpc214x/src/lpc2148_appinit.c b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_appinit.c similarity index 100% rename from boards/arm/mcu123-lpc214x/src/lpc2148_appinit.c rename to boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_appinit.c diff --git a/boards/arm/mcu123-lpc214x/src/lpc2148_composite.c b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_composite.c similarity index 100% rename from boards/arm/mcu123-lpc214x/src/lpc2148_composite.c rename to boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_composite.c diff --git a/boards/arm/mcu123-lpc214x/src/lpc2148_leds.c b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_leds.c similarity index 100% rename from boards/arm/mcu123-lpc214x/src/lpc2148_leds.c rename to boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_leds.c diff --git a/boards/arm/mcu123-lpc214x/src/lpc2148_spi1.c b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c similarity index 100% rename from boards/arm/mcu123-lpc214x/src/lpc2148_spi1.c rename to boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_spi1.c diff --git a/boards/arm/mcu123-lpc214x/src/lpc2148_usbmsc.c b/boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_usbmsc.c similarity index 100% rename from boards/arm/mcu123-lpc214x/src/lpc2148_usbmsc.c rename to boards/arm/lpc214x/mcu123-lpc214x/src/lpc2148_usbmsc.c diff --git a/boards/arm/zp214xpa/Kconfig b/boards/arm/lpc214x/zp214xpa/Kconfig similarity index 100% rename from boards/arm/zp214xpa/Kconfig rename to boards/arm/lpc214x/zp214xpa/Kconfig diff --git a/boards/arm/zp214xpa/README.txt b/boards/arm/lpc214x/zp214xpa/README.txt similarity index 100% rename from boards/arm/zp214xpa/README.txt rename to boards/arm/lpc214x/zp214xpa/README.txt diff --git a/boards/arm/zp214xpa/configs/nsh/defconfig b/boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig similarity index 97% rename from boards/arm/zp214xpa/configs/nsh/defconfig rename to boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig index 8ed3b3b430a..0f290d9f892 100644 --- a/boards/arm/zp214xpa/configs/nsh/defconfig +++ b/boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="zp214xpa" CONFIG_ARCH_BOARD_ZP214XPA=y +CONFIG_ARCH_CHIP="lpc214x" CONFIG_ARCH_CHIP_LPC2148=y CONFIG_ARCH_CHIP_LPC214X=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/zp214xpa/configs/nxlines/defconfig b/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig similarity index 98% rename from boards/arm/zp214xpa/configs/nxlines/defconfig rename to boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig index d17d20126e6..acececbf1ad 100644 --- a/boards/arm/zp214xpa/configs/nxlines/defconfig +++ b/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="zp214xpa" CONFIG_ARCH_BOARD_ZP214XPA=y +CONFIG_ARCH_CHIP="lpc214x" CONFIG_ARCH_CHIP_LPC2148=y CONFIG_ARCH_CHIP_LPC214X=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/zp214xpa/include/board.h b/boards/arm/lpc214x/zp214xpa/include/board.h similarity index 100% rename from boards/arm/zp214xpa/include/board.h rename to boards/arm/lpc214x/zp214xpa/include/board.h diff --git a/boards/arm/zp214xpa/scripts/Make.defs b/boards/arm/lpc214x/zp214xpa/scripts/Make.defs similarity index 96% rename from boards/arm/zp214xpa/scripts/Make.defs rename to boards/arm/lpc214x/zp214xpa/scripts/Make.defs index f0bc668f0ac..877fb6c35df 100644 --- a/boards/arm/zp214xpa/scripts/Make.defs +++ b/boards/arm/lpc214x/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/zp214xpa/scripts/ld.script b/boards/arm/lpc214x/zp214xpa/scripts/ld.script similarity index 100% rename from boards/arm/zp214xpa/scripts/ld.script rename to boards/arm/lpc214x/zp214xpa/scripts/ld.script diff --git a/boards/arm/lm3s8962-ek/src/.gitignore b/boards/arm/lpc214x/zp214xpa/src/.gitignore similarity index 100% rename from boards/arm/lm3s8962-ek/src/.gitignore rename to boards/arm/lpc214x/zp214xpa/src/.gitignore diff --git a/boards/arm/zp214xpa/src/Makefile b/boards/arm/lpc214x/zp214xpa/src/Makefile similarity index 100% rename from boards/arm/zp214xpa/src/Makefile rename to boards/arm/lpc214x/zp214xpa/src/Makefile diff --git a/boards/arm/zp214xpa/src/lpc2148_appinit.c b/boards/arm/lpc214x/zp214xpa/src/lpc2148_appinit.c similarity index 100% rename from boards/arm/zp214xpa/src/lpc2148_appinit.c rename to boards/arm/lpc214x/zp214xpa/src/lpc2148_appinit.c diff --git a/boards/arm/zp214xpa/src/lpc2148_spi1.c b/boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c similarity index 100% rename from boards/arm/zp214xpa/src/lpc2148_spi1.c rename to boards/arm/lpc214x/zp214xpa/src/lpc2148_spi1.c diff --git a/boards/arm/zp214xpa/src/lpc2148_ug2864ambag01.c b/boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c similarity index 100% rename from boards/arm/zp214xpa/src/lpc2148_ug2864ambag01.c rename to boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c diff --git a/boards/arm/zp214xpa/tools/olimex.cfg b/boards/arm/lpc214x/zp214xpa/tools/olimex.cfg similarity index 100% rename from boards/arm/zp214xpa/tools/olimex.cfg rename to boards/arm/lpc214x/zp214xpa/tools/olimex.cfg diff --git a/boards/arm/zp214xpa/tools/oocd.sh b/boards/arm/lpc214x/zp214xpa/tools/oocd.sh similarity index 100% rename from boards/arm/zp214xpa/tools/oocd.sh rename to boards/arm/lpc214x/zp214xpa/tools/oocd.sh diff --git a/boards/arm/zp214xpa/tools/usb-repair.txt b/boards/arm/lpc214x/zp214xpa/tools/usb-repair.txt similarity index 100% rename from boards/arm/zp214xpa/tools/usb-repair.txt rename to boards/arm/lpc214x/zp214xpa/tools/usb-repair.txt diff --git a/boards/arm/olimex-lpc2378/Kconfig b/boards/arm/lpc2378/olimex-lpc2378/Kconfig similarity index 100% rename from boards/arm/olimex-lpc2378/Kconfig rename to boards/arm/lpc2378/olimex-lpc2378/Kconfig diff --git a/boards/arm/olimex-lpc2378/README.txt b/boards/arm/lpc2378/olimex-lpc2378/README.txt similarity index 100% rename from boards/arm/olimex-lpc2378/README.txt rename to boards/arm/lpc2378/olimex-lpc2378/README.txt diff --git a/boards/arm/olimex-lpc2378/configs/nsh/defconfig b/boards/arm/lpc2378/olimex-lpc2378/configs/nsh/defconfig similarity index 97% rename from boards/arm/olimex-lpc2378/configs/nsh/defconfig rename to boards/arm/lpc2378/olimex-lpc2378/configs/nsh/defconfig index 9a7be8cf1c2..c5d930528d5 100644 --- a/boards/arm/olimex-lpc2378/configs/nsh/defconfig +++ b/boards/arm/lpc2378/olimex-lpc2378/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-lpc2378" CONFIG_ARCH_BOARD_OLIMEXLPC2378=y +CONFIG_ARCH_CHIP="lpc2378" CONFIG_ARCH_CHIP_LPC2378=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_TOOLCHAIN_CODESOURCERYL=y diff --git a/boards/arm/olimex-lpc2378/include/board.h b/boards/arm/lpc2378/olimex-lpc2378/include/board.h similarity index 100% rename from boards/arm/olimex-lpc2378/include/board.h rename to boards/arm/lpc2378/olimex-lpc2378/include/board.h diff --git a/boards/arm/olimex-lpc2378/scripts/Make.defs b/boards/arm/lpc2378/olimex-lpc2378/scripts/Make.defs similarity index 96% rename from boards/arm/olimex-lpc2378/scripts/Make.defs rename to boards/arm/lpc2378/olimex-lpc2378/scripts/Make.defs index 503a3382f4b..e3c79409442 100644 --- a/boards/arm/olimex-lpc2378/scripts/Make.defs +++ b/boards/arm/lpc2378/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/olimex-lpc2378/scripts/ld.script b/boards/arm/lpc2378/olimex-lpc2378/scripts/ld.script similarity index 100% rename from boards/arm/olimex-lpc2378/scripts/ld.script rename to boards/arm/lpc2378/olimex-lpc2378/scripts/ld.script diff --git a/boards/arm/lm4f120-launchpad/src/.gitignore b/boards/arm/lpc2378/olimex-lpc2378/src/.gitignore similarity index 100% rename from boards/arm/lm4f120-launchpad/src/.gitignore rename to boards/arm/lpc2378/olimex-lpc2378/src/.gitignore diff --git a/boards/arm/olimex-lpc2378/src/Makefile b/boards/arm/lpc2378/olimex-lpc2378/src/Makefile similarity index 100% rename from boards/arm/olimex-lpc2378/src/Makefile rename to boards/arm/lpc2378/olimex-lpc2378/src/Makefile diff --git a/boards/arm/olimex-lpc2378/src/lpc2378_appinit.c b/boards/arm/lpc2378/olimex-lpc2378/src/lpc2378_appinit.c similarity index 100% rename from boards/arm/olimex-lpc2378/src/lpc2378_appinit.c rename to boards/arm/lpc2378/olimex-lpc2378/src/lpc2378_appinit.c diff --git a/boards/arm/olimex-lpc2378/src/lpc2378_leds.c b/boards/arm/lpc2378/olimex-lpc2378/src/lpc2378_leds.c similarity index 100% rename from boards/arm/olimex-lpc2378/src/lpc2378_leds.c rename to boards/arm/lpc2378/olimex-lpc2378/src/lpc2378_leds.c diff --git a/boards/arm/ea3131/Kconfig b/boards/arm/lpc31xx/ea3131/Kconfig similarity index 100% rename from boards/arm/ea3131/Kconfig rename to boards/arm/lpc31xx/ea3131/Kconfig diff --git a/boards/arm/ea3131/README.txt b/boards/arm/lpc31xx/ea3131/README.txt similarity index 100% rename from boards/arm/ea3131/README.txt rename to boards/arm/lpc31xx/ea3131/README.txt diff --git a/boards/arm/ea3131/configs/nsh/defconfig b/boards/arm/lpc31xx/ea3131/configs/nsh/defconfig similarity index 98% rename from boards/arm/ea3131/configs/nsh/defconfig rename to boards/arm/lpc31xx/ea3131/configs/nsh/defconfig index 4215576dcee..d220900a9e0 100644 --- a/boards/arm/ea3131/configs/nsh/defconfig +++ b/boards/arm/lpc31xx/ea3131/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="ea3131" CONFIG_ARCH_BOARD_EA3131=y +CONFIG_ARCH_CHIP="lpc31xx" CONFIG_ARCH_CHIP_LPC3131=y CONFIG_ARCH_CHIP_LPC31XX=y CONFIG_ARCH_LOWVECTORS=y diff --git a/boards/arm/ea3131/configs/pgnsh/Make.defs b/boards/arm/lpc31xx/ea3131/configs/pgnsh/Make.defs similarity index 96% rename from boards/arm/ea3131/configs/pgnsh/Make.defs rename to boards/arm/lpc31xx/ea3131/configs/pgnsh/Make.defs index 115b2851547..783c8a1d9d5 100644 --- a/boards/arm/ea3131/configs/pgnsh/Make.defs +++ b/boards/arm/lpc31xx/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)/$(CONFIG_ARCH_BOARD)/scripts/pg-ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/pg-ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/pg-ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/ea3131/configs/pgnsh/defconfig b/boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig similarity index 98% rename from boards/arm/ea3131/configs/pgnsh/defconfig rename to boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig index 1f534a7b9ea..5b735cba424 100644 --- a/boards/arm/ea3131/configs/pgnsh/defconfig +++ b/boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="ea3131" CONFIG_ARCH_BOARD_EA3131=y +CONFIG_ARCH_CHIP="lpc31xx" CONFIG_ARCH_CHIP_LPC3131=y CONFIG_ARCH_CHIP_LPC31XX=y CONFIG_ARCH_LOWVECTORS=y diff --git a/boards/arm/ea3131/configs/usbserial/defconfig b/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig similarity index 98% rename from boards/arm/ea3131/configs/usbserial/defconfig rename to boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig index 2ef0b1d9434..536b405a9e3 100644 --- a/boards/arm/ea3131/configs/usbserial/defconfig +++ b/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="ea3131" CONFIG_ARCH_BOARD_EA3131=y +CONFIG_ARCH_CHIP="lpc31xx" CONFIG_ARCH_CHIP_LPC3131=y CONFIG_ARCH_CHIP_LPC31XX=y CONFIG_ARCH_LOWVECTORS=y diff --git a/boards/arm/ea3131/include/board.h b/boards/arm/lpc31xx/ea3131/include/board.h similarity index 100% rename from boards/arm/ea3131/include/board.h rename to boards/arm/lpc31xx/ea3131/include/board.h diff --git a/boards/arm/ea3131/include/board_memorymap.h b/boards/arm/lpc31xx/ea3131/include/board_memorymap.h similarity index 100% rename from boards/arm/ea3131/include/board_memorymap.h rename to boards/arm/lpc31xx/ea3131/include/board_memorymap.h diff --git a/boards/arm/ea3131/locked/.gitignore b/boards/arm/lpc31xx/ea3131/locked/.gitignore similarity index 100% rename from boards/arm/ea3131/locked/.gitignore rename to boards/arm/lpc31xx/ea3131/locked/.gitignore diff --git a/boards/arm/ea3131/locked/Makefile b/boards/arm/lpc31xx/ea3131/locked/Makefile similarity index 100% rename from boards/arm/ea3131/locked/Makefile rename to boards/arm/lpc31xx/ea3131/locked/Makefile diff --git a/boards/arm/ea3131/locked/ld-locked.script b/boards/arm/lpc31xx/ea3131/locked/ld-locked.script similarity index 100% rename from boards/arm/ea3131/locked/ld-locked.script rename to boards/arm/lpc31xx/ea3131/locked/ld-locked.script diff --git a/boards/arm/ea3131/locked/mklocked.sh b/boards/arm/lpc31xx/ea3131/locked/mklocked.sh similarity index 100% rename from boards/arm/ea3131/locked/mklocked.sh rename to boards/arm/lpc31xx/ea3131/locked/mklocked.sh diff --git a/boards/arm/ea3131/scripts/Make.defs b/boards/arm/lpc31xx/ea3131/scripts/Make.defs similarity index 96% rename from boards/arm/ea3131/scripts/Make.defs rename to boards/arm/lpc31xx/ea3131/scripts/Make.defs index b051965cf2b..807d9b8f986 100644 --- a/boards/arm/ea3131/scripts/Make.defs +++ b/boards/arm/lpc31xx/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/ea3131/scripts/ld.script b/boards/arm/lpc31xx/ea3131/scripts/ld.script similarity index 100% rename from boards/arm/ea3131/scripts/ld.script rename to boards/arm/lpc31xx/ea3131/scripts/ld.script diff --git a/boards/arm/ea3131/scripts/pg-ld.script b/boards/arm/lpc31xx/ea3131/scripts/pg-ld.script similarity index 100% rename from boards/arm/ea3131/scripts/pg-ld.script rename to boards/arm/lpc31xx/ea3131/scripts/pg-ld.script diff --git a/boards/arm/lpc4088-devkit/src/.gitignore b/boards/arm/lpc31xx/ea3131/src/.gitignore similarity index 100% rename from boards/arm/lpc4088-devkit/src/.gitignore rename to boards/arm/lpc31xx/ea3131/src/.gitignore diff --git a/boards/arm/ea3131/src/Makefile b/boards/arm/lpc31xx/ea3131/src/Makefile similarity index 100% rename from boards/arm/ea3131/src/Makefile rename to boards/arm/lpc31xx/ea3131/src/Makefile diff --git a/boards/arm/ea3131/src/ea3131.h b/boards/arm/lpc31xx/ea3131/src/ea3131.h similarity index 100% rename from boards/arm/ea3131/src/ea3131.h rename to boards/arm/lpc31xx/ea3131/src/ea3131.h diff --git a/boards/arm/ea3131/src/lpc31_appinit.c b/boards/arm/lpc31xx/ea3131/src/lpc31_appinit.c similarity index 100% rename from boards/arm/ea3131/src/lpc31_appinit.c rename to boards/arm/lpc31xx/ea3131/src/lpc31_appinit.c diff --git a/boards/arm/ea3131/src/lpc31_boot.c b/boards/arm/lpc31xx/ea3131/src/lpc31_boot.c similarity index 100% rename from boards/arm/ea3131/src/lpc31_boot.c rename to boards/arm/lpc31xx/ea3131/src/lpc31_boot.c diff --git a/boards/arm/ea3131/src/lpc31_buttons.c b/boards/arm/lpc31xx/ea3131/src/lpc31_buttons.c similarity index 100% rename from boards/arm/ea3131/src/lpc31_buttons.c rename to boards/arm/lpc31xx/ea3131/src/lpc31_buttons.c diff --git a/boards/arm/ea3131/src/lpc31_clkinit.c b/boards/arm/lpc31xx/ea3131/src/lpc31_clkinit.c similarity index 100% rename from boards/arm/ea3131/src/lpc31_clkinit.c rename to boards/arm/lpc31xx/ea3131/src/lpc31_clkinit.c diff --git a/boards/arm/ea3131/src/lpc31_fillpage.c b/boards/arm/lpc31xx/ea3131/src/lpc31_fillpage.c similarity index 100% rename from boards/arm/ea3131/src/lpc31_fillpage.c rename to boards/arm/lpc31xx/ea3131/src/lpc31_fillpage.c diff --git a/boards/arm/ea3131/src/lpc31_leds.c b/boards/arm/lpc31xx/ea3131/src/lpc31_leds.c similarity index 100% rename from boards/arm/ea3131/src/lpc31_leds.c rename to boards/arm/lpc31xx/ea3131/src/lpc31_leds.c diff --git a/boards/arm/ea3131/src/lpc31_mem.c b/boards/arm/lpc31xx/ea3131/src/lpc31_mem.c similarity index 100% rename from boards/arm/ea3131/src/lpc31_mem.c rename to boards/arm/lpc31xx/ea3131/src/lpc31_mem.c diff --git a/boards/arm/ea3131/src/lpc31_spi.c b/boards/arm/lpc31xx/ea3131/src/lpc31_spi.c similarity index 100% rename from boards/arm/ea3131/src/lpc31_spi.c rename to boards/arm/lpc31xx/ea3131/src/lpc31_spi.c diff --git a/boards/arm/ea3131/src/lpc31_usbhost.c b/boards/arm/lpc31xx/ea3131/src/lpc31_usbhost.c similarity index 100% rename from boards/arm/ea3131/src/lpc31_usbhost.c rename to boards/arm/lpc31xx/ea3131/src/lpc31_usbhost.c diff --git a/boards/arm/ea3131/tools/.gitignore b/boards/arm/lpc31xx/ea3131/tools/.gitignore similarity index 100% rename from boards/arm/ea3131/tools/.gitignore rename to boards/arm/lpc31xx/ea3131/tools/.gitignore diff --git a/boards/arm/ea3131/tools/Makefile b/boards/arm/lpc31xx/ea3131/tools/Makefile similarity index 100% rename from boards/arm/ea3131/tools/Makefile rename to boards/arm/lpc31xx/ea3131/tools/Makefile diff --git a/boards/arm/ea3131/tools/armusbocd.cfg b/boards/arm/lpc31xx/ea3131/tools/armusbocd.cfg similarity index 100% rename from boards/arm/ea3131/tools/armusbocd.cfg rename to boards/arm/lpc31xx/ea3131/tools/armusbocd.cfg diff --git a/boards/arm/ea3131/tools/crc32.c b/boards/arm/lpc31xx/ea3131/tools/crc32.c similarity index 100% rename from boards/arm/ea3131/tools/crc32.c rename to boards/arm/lpc31xx/ea3131/tools/crc32.c diff --git a/boards/arm/ea3131/tools/lpchdr.c b/boards/arm/lpc31xx/ea3131/tools/lpchdr.c similarity index 100% rename from boards/arm/ea3131/tools/lpchdr.c rename to boards/arm/lpc31xx/ea3131/tools/lpchdr.c diff --git a/boards/arm/ea3131/tools/lpchdr.h b/boards/arm/lpc31xx/ea3131/tools/lpchdr.h similarity index 100% rename from boards/arm/ea3131/tools/lpchdr.h rename to boards/arm/lpc31xx/ea3131/tools/lpchdr.h diff --git a/boards/arm/ea3131/tools/mklpc.sh b/boards/arm/lpc31xx/ea3131/tools/mklpc.sh similarity index 100% rename from boards/arm/ea3131/tools/mklpc.sh rename to boards/arm/lpc31xx/ea3131/tools/mklpc.sh diff --git a/boards/arm/ea3131/tools/oocd.sh b/boards/arm/lpc31xx/ea3131/tools/oocd.sh similarity index 100% rename from boards/arm/ea3131/tools/oocd.sh rename to boards/arm/lpc31xx/ea3131/tools/oocd.sh diff --git a/boards/arm/ea3131/tools/usb-driver.txt b/boards/arm/lpc31xx/ea3131/tools/usb-driver.txt similarity index 100% rename from boards/arm/ea3131/tools/usb-driver.txt rename to boards/arm/lpc31xx/ea3131/tools/usb-driver.txt diff --git a/boards/arm/ea3152/Kconfig b/boards/arm/lpc31xx/ea3152/Kconfig similarity index 100% rename from boards/arm/ea3152/Kconfig rename to boards/arm/lpc31xx/ea3152/Kconfig diff --git a/boards/arm/ea3152/README.txt b/boards/arm/lpc31xx/ea3152/README.txt similarity index 100% rename from boards/arm/ea3152/README.txt rename to boards/arm/lpc31xx/ea3152/README.txt diff --git a/boards/arm/ea3152/configs/ostest/defconfig b/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig similarity index 97% rename from boards/arm/ea3152/configs/ostest/defconfig rename to boards/arm/lpc31xx/ea3152/configs/ostest/defconfig index 2ecf70f9f78..bafc0839d05 100644 --- a/boards/arm/ea3152/configs/ostest/defconfig +++ b/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="ea3152" CONFIG_ARCH_BOARD_EA3152=y +CONFIG_ARCH_CHIP="lpc31xx" CONFIG_ARCH_CHIP_LPC3152=y CONFIG_ARCH_CHIP_LPC31XX=y CONFIG_ARCH_LOWVECTORS=y diff --git a/boards/arm/ea3152/include/board.h b/boards/arm/lpc31xx/ea3152/include/board.h similarity index 100% rename from boards/arm/ea3152/include/board.h rename to boards/arm/lpc31xx/ea3152/include/board.h diff --git a/boards/arm/ea3152/include/board_memorymap.h b/boards/arm/lpc31xx/ea3152/include/board_memorymap.h similarity index 100% rename from boards/arm/ea3152/include/board_memorymap.h rename to boards/arm/lpc31xx/ea3152/include/board_memorymap.h diff --git a/boards/arm/ea3152/scripts/Make.defs b/boards/arm/lpc31xx/ea3152/scripts/Make.defs similarity index 96% rename from boards/arm/ea3152/scripts/Make.defs rename to boards/arm/lpc31xx/ea3152/scripts/Make.defs index 345f050691f..6df4e6961fd 100644 --- a/boards/arm/ea3152/scripts/Make.defs +++ b/boards/arm/lpc31xx/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)/$(CONFIG_ARCH_BOARD)/scripts/ea3152.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ea3152.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ea3152.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/ea3152/scripts/ea3152.ld b/boards/arm/lpc31xx/ea3152/scripts/ea3152.ld similarity index 100% rename from boards/arm/ea3152/scripts/ea3152.ld rename to boards/arm/lpc31xx/ea3152/scripts/ea3152.ld diff --git a/boards/arm/lpc4088-quickstart/src/.gitignore b/boards/arm/lpc31xx/ea3152/src/.gitignore similarity index 100% rename from boards/arm/lpc4088-quickstart/src/.gitignore rename to boards/arm/lpc31xx/ea3152/src/.gitignore diff --git a/boards/arm/ea3152/src/Makefile b/boards/arm/lpc31xx/ea3152/src/Makefile similarity index 100% rename from boards/arm/ea3152/src/Makefile rename to boards/arm/lpc31xx/ea3152/src/Makefile diff --git a/boards/arm/ea3152/src/ea3152.h b/boards/arm/lpc31xx/ea3152/src/ea3152.h similarity index 100% rename from boards/arm/ea3152/src/ea3152.h rename to boards/arm/lpc31xx/ea3152/src/ea3152.h diff --git a/boards/arm/ea3152/src/lpc31_appinit.c b/boards/arm/lpc31xx/ea3152/src/lpc31_appinit.c similarity index 100% rename from boards/arm/ea3152/src/lpc31_appinit.c rename to boards/arm/lpc31xx/ea3152/src/lpc31_appinit.c diff --git a/boards/arm/ea3152/src/lpc31_boot.c b/boards/arm/lpc31xx/ea3152/src/lpc31_boot.c similarity index 100% rename from boards/arm/ea3152/src/lpc31_boot.c rename to boards/arm/lpc31xx/ea3152/src/lpc31_boot.c diff --git a/boards/arm/ea3152/src/lpc31_buttons.c b/boards/arm/lpc31xx/ea3152/src/lpc31_buttons.c similarity index 100% rename from boards/arm/ea3152/src/lpc31_buttons.c rename to boards/arm/lpc31xx/ea3152/src/lpc31_buttons.c diff --git a/boards/arm/ea3152/src/lpc31_clkinit.c b/boards/arm/lpc31xx/ea3152/src/lpc31_clkinit.c similarity index 100% rename from boards/arm/ea3152/src/lpc31_clkinit.c rename to boards/arm/lpc31xx/ea3152/src/lpc31_clkinit.c diff --git a/boards/arm/ea3152/src/lpc31_fillpage.c b/boards/arm/lpc31xx/ea3152/src/lpc31_fillpage.c similarity index 100% rename from boards/arm/ea3152/src/lpc31_fillpage.c rename to boards/arm/lpc31xx/ea3152/src/lpc31_fillpage.c diff --git a/boards/arm/ea3152/src/lpc31_leds.c b/boards/arm/lpc31xx/ea3152/src/lpc31_leds.c similarity index 100% rename from boards/arm/ea3152/src/lpc31_leds.c rename to boards/arm/lpc31xx/ea3152/src/lpc31_leds.c diff --git a/boards/arm/ea3152/src/lpc31_mem.c b/boards/arm/lpc31xx/ea3152/src/lpc31_mem.c similarity index 100% rename from boards/arm/ea3152/src/lpc31_mem.c rename to boards/arm/lpc31xx/ea3152/src/lpc31_mem.c diff --git a/boards/arm/ea3152/src/lpc31_spi.c b/boards/arm/lpc31xx/ea3152/src/lpc31_spi.c similarity index 100% rename from boards/arm/ea3152/src/lpc31_spi.c rename to boards/arm/lpc31xx/ea3152/src/lpc31_spi.c diff --git a/boards/arm/ea3152/tools/.gitignore b/boards/arm/lpc31xx/ea3152/tools/.gitignore similarity index 100% rename from boards/arm/ea3152/tools/.gitignore rename to boards/arm/lpc31xx/ea3152/tools/.gitignore diff --git a/boards/arm/ea3152/tools/Makefile b/boards/arm/lpc31xx/ea3152/tools/Makefile similarity index 100% rename from boards/arm/ea3152/tools/Makefile rename to boards/arm/lpc31xx/ea3152/tools/Makefile diff --git a/boards/arm/ea3152/tools/armusbocd.cfg b/boards/arm/lpc31xx/ea3152/tools/armusbocd.cfg similarity index 100% rename from boards/arm/ea3152/tools/armusbocd.cfg rename to boards/arm/lpc31xx/ea3152/tools/armusbocd.cfg diff --git a/boards/arm/ea3152/tools/crc32.c b/boards/arm/lpc31xx/ea3152/tools/crc32.c similarity index 100% rename from boards/arm/ea3152/tools/crc32.c rename to boards/arm/lpc31xx/ea3152/tools/crc32.c diff --git a/boards/arm/ea3152/tools/jlink.cfg b/boards/arm/lpc31xx/ea3152/tools/jlink.cfg similarity index 100% rename from boards/arm/ea3152/tools/jlink.cfg rename to boards/arm/lpc31xx/ea3152/tools/jlink.cfg diff --git a/boards/arm/ea3152/tools/lpc3152.cfg b/boards/arm/lpc31xx/ea3152/tools/lpc3152.cfg similarity index 100% rename from boards/arm/ea3152/tools/lpc3152.cfg rename to boards/arm/lpc31xx/ea3152/tools/lpc3152.cfg diff --git a/boards/arm/ea3152/tools/lpchdr.c b/boards/arm/lpc31xx/ea3152/tools/lpchdr.c similarity index 100% rename from boards/arm/ea3152/tools/lpchdr.c rename to boards/arm/lpc31xx/ea3152/tools/lpchdr.c diff --git a/boards/arm/ea3152/tools/lpchdr.h b/boards/arm/lpc31xx/ea3152/tools/lpchdr.h similarity index 100% rename from boards/arm/ea3152/tools/lpchdr.h rename to boards/arm/lpc31xx/ea3152/tools/lpchdr.h diff --git a/boards/arm/ea3152/tools/mklpc.sh b/boards/arm/lpc31xx/ea3152/tools/mklpc.sh similarity index 100% rename from boards/arm/ea3152/tools/mklpc.sh rename to boards/arm/lpc31xx/ea3152/tools/mklpc.sh diff --git a/boards/arm/ea3152/tools/olimex-arm-usb-ocd.cfg b/boards/arm/lpc31xx/ea3152/tools/olimex-arm-usb-ocd.cfg similarity index 100% rename from boards/arm/ea3152/tools/olimex-arm-usb-ocd.cfg rename to boards/arm/lpc31xx/ea3152/tools/olimex-arm-usb-ocd.cfg diff --git a/boards/arm/ea3152/tools/oocd.sh b/boards/arm/lpc31xx/ea3152/tools/oocd.sh similarity index 100% rename from boards/arm/ea3152/tools/oocd.sh rename to boards/arm/lpc31xx/ea3152/tools/oocd.sh diff --git a/boards/arm/ea3152/tools/usb-driver.txt b/boards/arm/lpc31xx/ea3152/tools/usb-driver.txt similarity index 100% rename from boards/arm/ea3152/tools/usb-driver.txt rename to boards/arm/lpc31xx/ea3152/tools/usb-driver.txt diff --git a/boards/arm/olimex-lpc-h3131/Kconfig b/boards/arm/lpc31xx/olimex-lpc-h3131/Kconfig similarity index 100% rename from boards/arm/olimex-lpc-h3131/Kconfig rename to boards/arm/lpc31xx/olimex-lpc-h3131/Kconfig diff --git a/boards/arm/olimex-lpc-h3131/README.txt b/boards/arm/lpc31xx/olimex-lpc-h3131/README.txt similarity index 100% rename from boards/arm/olimex-lpc-h3131/README.txt rename to boards/arm/lpc31xx/olimex-lpc-h3131/README.txt diff --git a/boards/arm/olimex-lpc-h3131/configs/nsh/defconfig b/boards/arm/lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig similarity index 98% rename from boards/arm/olimex-lpc-h3131/configs/nsh/defconfig rename to boards/arm/lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig index d64b04504fd..2a92499aa4a 100644 --- a/boards/arm/olimex-lpc-h3131/configs/nsh/defconfig +++ b/boards/arm/lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-lpc-h3131" CONFIG_ARCH_BOARD_OLIMEX_LPC_H3131=y +CONFIG_ARCH_CHIP="lpc31xx" CONFIG_ARCH_CHIP_LPC3131=y CONFIG_ARCH_CHIP_LPC31XX=y CONFIG_ARCH_LOWVECTORS=y diff --git a/boards/arm/olimex-lpc-h3131/include/board.h b/boards/arm/lpc31xx/olimex-lpc-h3131/include/board.h similarity index 100% rename from boards/arm/olimex-lpc-h3131/include/board.h rename to boards/arm/lpc31xx/olimex-lpc-h3131/include/board.h diff --git a/boards/arm/olimex-lpc-h3131/include/board_memorymap.h b/boards/arm/lpc31xx/olimex-lpc-h3131/include/board_memorymap.h similarity index 100% rename from boards/arm/olimex-lpc-h3131/include/board_memorymap.h rename to boards/arm/lpc31xx/olimex-lpc-h3131/include/board_memorymap.h diff --git a/boards/arm/olimex-lpc-h3131/scripts/Make.defs b/boards/arm/lpc31xx/olimex-lpc-h3131/scripts/Make.defs similarity index 96% rename from boards/arm/olimex-lpc-h3131/scripts/Make.defs rename to boards/arm/lpc31xx/olimex-lpc-h3131/scripts/Make.defs index a052765b306..fce6b5199a3 100644 --- a/boards/arm/olimex-lpc-h3131/scripts/Make.defs +++ b/boards/arm/lpc31xx/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/olimex-lpc-h3131/scripts/ld.script b/boards/arm/lpc31xx/olimex-lpc-h3131/scripts/ld.script similarity index 100% rename from boards/arm/olimex-lpc-h3131/scripts/ld.script rename to boards/arm/lpc31xx/olimex-lpc-h3131/scripts/ld.script diff --git a/boards/arm/lpc4330-xplorer/src/.gitignore b/boards/arm/lpc31xx/olimex-lpc-h3131/src/.gitignore similarity index 100% rename from boards/arm/lpc4330-xplorer/src/.gitignore rename to boards/arm/lpc31xx/olimex-lpc-h3131/src/.gitignore diff --git a/boards/arm/olimex-lpc-h3131/src/Makefile b/boards/arm/lpc31xx/olimex-lpc-h3131/src/Makefile similarity index 100% rename from boards/arm/olimex-lpc-h3131/src/Makefile rename to boards/arm/lpc31xx/olimex-lpc-h3131/src/Makefile diff --git a/boards/arm/olimex-lpc-h3131/src/lpc31_appinit.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_appinit.c similarity index 100% rename from boards/arm/olimex-lpc-h3131/src/lpc31_appinit.c rename to boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_appinit.c diff --git a/boards/arm/olimex-lpc-h3131/src/lpc31_boot.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_boot.c similarity index 100% rename from boards/arm/olimex-lpc-h3131/src/lpc31_boot.c rename to boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_boot.c diff --git a/boards/arm/olimex-lpc-h3131/src/lpc31_clkinit.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_clkinit.c similarity index 100% rename from boards/arm/olimex-lpc-h3131/src/lpc31_clkinit.c rename to boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_clkinit.c diff --git a/boards/arm/olimex-lpc-h3131/src/lpc31_leds.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_leds.c similarity index 100% rename from boards/arm/olimex-lpc-h3131/src/lpc31_leds.c rename to boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_leds.c diff --git a/boards/arm/olimex-lpc-h3131/src/lpc31_mem.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_mem.c similarity index 100% rename from boards/arm/olimex-lpc-h3131/src/lpc31_mem.c rename to boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_mem.c diff --git a/boards/arm/olimex-lpc-h3131/src/lpc31_mmcsd.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_mmcsd.c similarity index 100% rename from boards/arm/olimex-lpc-h3131/src/lpc31_mmcsd.c rename to boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_mmcsd.c diff --git a/boards/arm/olimex-lpc-h3131/src/lpc31_spi.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_spi.c similarity index 100% rename from boards/arm/olimex-lpc-h3131/src/lpc31_spi.c rename to boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_spi.c diff --git a/boards/arm/olimex-lpc-h3131/src/lpc31_usbhost.c b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_usbhost.c similarity index 100% rename from boards/arm/olimex-lpc-h3131/src/lpc31_usbhost.c rename to boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc31_usbhost.c diff --git a/boards/arm/olimex-lpc-h3131/src/lpc_h3131.h b/boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc_h3131.h similarity index 100% rename from boards/arm/olimex-lpc-h3131/src/lpc_h3131.h rename to boards/arm/lpc31xx/olimex-lpc-h3131/src/lpc_h3131.h diff --git a/boards/arm/olimex-lpc-h3131/tools/.gitignore b/boards/arm/lpc31xx/olimex-lpc-h3131/tools/.gitignore similarity index 100% rename from boards/arm/olimex-lpc-h3131/tools/.gitignore rename to boards/arm/lpc31xx/olimex-lpc-h3131/tools/.gitignore diff --git a/boards/arm/olimex-lpc-h3131/tools/Makefile b/boards/arm/lpc31xx/olimex-lpc-h3131/tools/Makefile similarity index 100% rename from boards/arm/olimex-lpc-h3131/tools/Makefile rename to boards/arm/lpc31xx/olimex-lpc-h3131/tools/Makefile diff --git a/boards/arm/olimex-lpc-h3131/tools/armusbocd.cfg b/boards/arm/lpc31xx/olimex-lpc-h3131/tools/armusbocd.cfg similarity index 100% rename from boards/arm/olimex-lpc-h3131/tools/armusbocd.cfg rename to boards/arm/lpc31xx/olimex-lpc-h3131/tools/armusbocd.cfg diff --git a/boards/arm/olimex-lpc-h3131/tools/crc32.c b/boards/arm/lpc31xx/olimex-lpc-h3131/tools/crc32.c similarity index 100% rename from boards/arm/olimex-lpc-h3131/tools/crc32.c rename to boards/arm/lpc31xx/olimex-lpc-h3131/tools/crc32.c diff --git a/boards/arm/olimex-lpc-h3131/tools/lpchdr.c b/boards/arm/lpc31xx/olimex-lpc-h3131/tools/lpchdr.c similarity index 100% rename from boards/arm/olimex-lpc-h3131/tools/lpchdr.c rename to boards/arm/lpc31xx/olimex-lpc-h3131/tools/lpchdr.c diff --git a/boards/arm/olimex-lpc-h3131/tools/lpchdr.h b/boards/arm/lpc31xx/olimex-lpc-h3131/tools/lpchdr.h similarity index 100% rename from boards/arm/olimex-lpc-h3131/tools/lpchdr.h rename to boards/arm/lpc31xx/olimex-lpc-h3131/tools/lpchdr.h diff --git a/boards/arm/olimex-lpc-h3131/tools/mklpc.sh b/boards/arm/lpc31xx/olimex-lpc-h3131/tools/mklpc.sh similarity index 100% rename from boards/arm/olimex-lpc-h3131/tools/mklpc.sh rename to boards/arm/lpc31xx/olimex-lpc-h3131/tools/mklpc.sh diff --git a/boards/arm/olimex-lpc-h3131/tools/oocd.sh b/boards/arm/lpc31xx/olimex-lpc-h3131/tools/oocd.sh similarity index 100% rename from boards/arm/olimex-lpc-h3131/tools/oocd.sh rename to boards/arm/lpc31xx/olimex-lpc-h3131/tools/oocd.sh diff --git a/boards/arm/olimex-lpc-h3131/tools/usb-driver.txt b/boards/arm/lpc31xx/olimex-lpc-h3131/tools/usb-driver.txt similarity index 100% rename from boards/arm/olimex-lpc-h3131/tools/usb-driver.txt rename to boards/arm/lpc31xx/olimex-lpc-h3131/tools/usb-driver.txt diff --git a/boards/arm/bambino-200e/Kconfig b/boards/arm/lpc43xx/bambino-200e/Kconfig similarity index 100% rename from boards/arm/bambino-200e/Kconfig rename to boards/arm/lpc43xx/bambino-200e/Kconfig diff --git a/boards/arm/bambino-200e/README.txt b/boards/arm/lpc43xx/bambino-200e/README.txt similarity index 100% rename from boards/arm/bambino-200e/README.txt rename to boards/arm/lpc43xx/bambino-200e/README.txt diff --git a/boards/arm/bambino-200e/configs/knsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/knsh/defconfig similarity index 98% rename from boards/arm/bambino-200e/configs/knsh/defconfig rename to boards/arm/lpc43xx/bambino-200e/configs/knsh/defconfig index 9e61dd354eb..5503a38f95c 100644 --- a/boards/arm/bambino-200e/configs/knsh/defconfig +++ b/boards/arm/lpc43xx/bambino-200e/configs/knsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="bambino-200e" CONFIG_ARCH_BOARD_BAMBINO_200E=y +CONFIG_ARCH_CHIP="lpc43xx" CONFIG_ARCH_CHIP_LPC4330FBD144=y CONFIG_ARCH_CHIP_LPC43XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/bambino-200e/configs/max31855/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/max31855/defconfig similarity index 98% rename from boards/arm/bambino-200e/configs/max31855/defconfig rename to boards/arm/lpc43xx/bambino-200e/configs/max31855/defconfig index d8d5781abda..a1ace4faa37 100644 --- a/boards/arm/bambino-200e/configs/max31855/defconfig +++ b/boards/arm/lpc43xx/bambino-200e/configs/max31855/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="bambino-200e" CONFIG_ARCH_BOARD_BAMBINO_200E=y +CONFIG_ARCH_CHIP="lpc43xx" CONFIG_ARCH_CHIP_LPC4330FBD144=y CONFIG_ARCH_CHIP_LPC43XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/bambino-200e/configs/netnsh/Make.defs b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/Make.defs similarity index 96% rename from boards/arm/bambino-200e/configs/netnsh/Make.defs rename to boards/arm/lpc43xx/bambino-200e/configs/netnsh/Make.defs index 7f6bd52bc7c..484e6cd1d0d 100644 --- a/boards/arm/bambino-200e/configs/netnsh/Make.defs +++ b/boards/arm/lpc43xx/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/bambino-200e/configs/netnsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig similarity index 98% rename from boards/arm/bambino-200e/configs/netnsh/defconfig rename to boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig index 6c7cc93867a..7a5a0981fb7 100644 --- a/boards/arm/bambino-200e/configs/netnsh/defconfig +++ b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="bambino-200e" CONFIG_ARCH_BOARD_BAMBINO_200E=y +CONFIG_ARCH_CHIP="lpc43xx" CONFIG_ARCH_CHIP_LPC4330FBD144=y CONFIG_ARCH_CHIP_LPC43XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/bambino-200e/configs/nsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/nsh/defconfig similarity index 98% rename from boards/arm/bambino-200e/configs/nsh/defconfig rename to boards/arm/lpc43xx/bambino-200e/configs/nsh/defconfig index 8de75cdad26..c661128dd1b 100644 --- a/boards/arm/bambino-200e/configs/nsh/defconfig +++ b/boards/arm/lpc43xx/bambino-200e/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="bambino-200e" CONFIG_ARCH_BOARD_BAMBINO_200E=y +CONFIG_ARCH_CHIP="lpc43xx" CONFIG_ARCH_CHIP_LPC4330FBD144=y CONFIG_ARCH_CHIP_LPC43XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/bambino-200e/configs/usbnsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/usbnsh/defconfig similarity index 98% rename from boards/arm/bambino-200e/configs/usbnsh/defconfig rename to boards/arm/lpc43xx/bambino-200e/configs/usbnsh/defconfig index 7396deb3d1e..659cf28d324 100644 --- a/boards/arm/bambino-200e/configs/usbnsh/defconfig +++ b/boards/arm/lpc43xx/bambino-200e/configs/usbnsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="bambino-200e" CONFIG_ARCH_BOARD_BAMBINO_200E=y +CONFIG_ARCH_CHIP="lpc43xx" CONFIG_ARCH_CHIP_LPC4330FBD144=y CONFIG_ARCH_CHIP_LPC43XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/bambino-200e/include/board.h b/boards/arm/lpc43xx/bambino-200e/include/board.h similarity index 100% rename from boards/arm/bambino-200e/include/board.h rename to boards/arm/lpc43xx/bambino-200e/include/board.h diff --git a/boards/arm/lpc4088-quickstart/kernel/.gitignore b/boards/arm/lpc43xx/bambino-200e/kernel/.gitignore similarity index 100% rename from boards/arm/lpc4088-quickstart/kernel/.gitignore rename to boards/arm/lpc43xx/bambino-200e/kernel/.gitignore diff --git a/boards/arm/bambino-200e/kernel/Makefile b/boards/arm/lpc43xx/bambino-200e/kernel/Makefile similarity index 90% rename from boards/arm/bambino-200e/kernel/Makefile rename to boards/arm/lpc43xx/bambino-200e/kernel/Makefile index a99f3fdde9f..93e70caad68 100644 --- a/boards/arm/bambino-200e/kernel/Makefile +++ b/boards/arm/lpc43xx/bambino-200e/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/bambino-200e/kernel/lpc43_userspace.c b/boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c similarity index 100% rename from boards/arm/bambino-200e/kernel/lpc43_userspace.c rename to boards/arm/lpc43xx/bambino-200e/kernel/lpc43_userspace.c diff --git a/boards/arm/bambino-200e/scripts/Make.defs b/boards/arm/lpc43xx/bambino-200e/scripts/Make.defs similarity index 96% rename from boards/arm/bambino-200e/scripts/Make.defs rename to boards/arm/lpc43xx/bambino-200e/scripts/Make.defs index cf7e6e29b7e..2c1de46448c 100644 --- a/boards/arm/bambino-200e/scripts/Make.defs +++ b/boards/arm/lpc43xx/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/bambino-200e/scripts/flash.sh b/boards/arm/lpc43xx/bambino-200e/scripts/flash.sh similarity index 100% rename from boards/arm/bambino-200e/scripts/flash.sh rename to boards/arm/lpc43xx/bambino-200e/scripts/flash.sh diff --git a/boards/arm/bambino-200e/scripts/memory.ld b/boards/arm/lpc43xx/bambino-200e/scripts/memory.ld similarity index 100% rename from boards/arm/bambino-200e/scripts/memory.ld rename to boards/arm/lpc43xx/bambino-200e/scripts/memory.ld diff --git a/boards/arm/bambino-200e/scripts/ramconfig.ld b/boards/arm/lpc43xx/bambino-200e/scripts/ramconfig.ld similarity index 100% rename from boards/arm/bambino-200e/scripts/ramconfig.ld rename to boards/arm/lpc43xx/bambino-200e/scripts/ramconfig.ld diff --git a/boards/arm/bambino-200e/scripts/spificonfig.ld b/boards/arm/lpc43xx/bambino-200e/scripts/spificonfig.ld similarity index 100% rename from boards/arm/bambino-200e/scripts/spificonfig.ld rename to boards/arm/lpc43xx/bambino-200e/scripts/spificonfig.ld diff --git a/boards/arm/bambino-200e/scripts/user-space.ld b/boards/arm/lpc43xx/bambino-200e/scripts/user-space.ld similarity index 100% rename from boards/arm/bambino-200e/scripts/user-space.ld rename to boards/arm/lpc43xx/bambino-200e/scripts/user-space.ld diff --git a/boards/arm/lpc4337-ws/src/.gitignore b/boards/arm/lpc43xx/bambino-200e/src/.gitignore similarity index 100% rename from boards/arm/lpc4337-ws/src/.gitignore rename to boards/arm/lpc43xx/bambino-200e/src/.gitignore diff --git a/boards/arm/bambino-200e/src/Makefile b/boards/arm/lpc43xx/bambino-200e/src/Makefile similarity index 100% rename from boards/arm/bambino-200e/src/Makefile rename to boards/arm/lpc43xx/bambino-200e/src/Makefile diff --git a/boards/arm/bambino-200e/src/bambino-200e.h b/boards/arm/lpc43xx/bambino-200e/src/bambino-200e.h similarity index 100% rename from boards/arm/bambino-200e/src/bambino-200e.h rename to boards/arm/lpc43xx/bambino-200e/src/bambino-200e.h diff --git a/boards/arm/bambino-200e/src/lpc43_appinit.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_appinit.c similarity index 100% rename from boards/arm/bambino-200e/src/lpc43_appinit.c rename to boards/arm/lpc43xx/bambino-200e/src/lpc43_appinit.c diff --git a/boards/arm/bambino-200e/src/lpc43_autoleds.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_autoleds.c similarity index 100% rename from boards/arm/bambino-200e/src/lpc43_autoleds.c rename to boards/arm/lpc43xx/bambino-200e/src/lpc43_autoleds.c diff --git a/boards/arm/bambino-200e/src/lpc43_boot.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c similarity index 100% rename from boards/arm/bambino-200e/src/lpc43_boot.c rename to boards/arm/lpc43xx/bambino-200e/src/lpc43_boot.c diff --git a/boards/arm/bambino-200e/src/lpc43_buttons.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_buttons.c similarity index 100% rename from boards/arm/bambino-200e/src/lpc43_buttons.c rename to boards/arm/lpc43xx/bambino-200e/src/lpc43_buttons.c diff --git a/boards/arm/bambino-200e/src/lpc43_max31855.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_max31855.c similarity index 100% rename from boards/arm/bambino-200e/src/lpc43_max31855.c rename to boards/arm/lpc43xx/bambino-200e/src/lpc43_max31855.c diff --git a/boards/arm/bambino-200e/src/lpc43_ostest.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_ostest.c similarity index 100% rename from boards/arm/bambino-200e/src/lpc43_ostest.c rename to boards/arm/lpc43xx/bambino-200e/src/lpc43_ostest.c diff --git a/boards/arm/bambino-200e/src/lpc43_ssp.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c similarity index 100% rename from boards/arm/bambino-200e/src/lpc43_ssp.c rename to boards/arm/lpc43xx/bambino-200e/src/lpc43_ssp.c diff --git a/boards/arm/bambino-200e/src/lpc43_timer.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_timer.c similarity index 100% rename from boards/arm/bambino-200e/src/lpc43_timer.c rename to boards/arm/lpc43xx/bambino-200e/src/lpc43_timer.c diff --git a/boards/arm/bambino-200e/src/lpc43_userleds.c b/boards/arm/lpc43xx/bambino-200e/src/lpc43_userleds.c similarity index 100% rename from boards/arm/bambino-200e/src/lpc43_userleds.c rename to boards/arm/lpc43xx/bambino-200e/src/lpc43_userleds.c diff --git a/boards/arm/lpc4330-xplorer/Kconfig b/boards/arm/lpc43xx/lpc4330-xplorer/Kconfig similarity index 100% rename from boards/arm/lpc4330-xplorer/Kconfig rename to boards/arm/lpc43xx/lpc4330-xplorer/Kconfig diff --git a/boards/arm/lpc4330-xplorer/README.txt b/boards/arm/lpc43xx/lpc4330-xplorer/README.txt similarity index 100% rename from boards/arm/lpc4330-xplorer/README.txt rename to boards/arm/lpc43xx/lpc4330-xplorer/README.txt diff --git a/boards/arm/lpc4330-xplorer/configs/nsh/defconfig b/boards/arm/lpc43xx/lpc4330-xplorer/configs/nsh/defconfig similarity index 98% rename from boards/arm/lpc4330-xplorer/configs/nsh/defconfig rename to boards/arm/lpc43xx/lpc4330-xplorer/configs/nsh/defconfig index f7d99c60667..212341af5f9 100644 --- a/boards/arm/lpc4330-xplorer/configs/nsh/defconfig +++ b/boards/arm/lpc43xx/lpc4330-xplorer/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpc4330-xplorer" CONFIG_ARCH_BOARD_LPC4330_XPLORER=y +CONFIG_ARCH_CHIP="lpc43xx" CONFIG_ARCH_CHIP_LPC4330FET100=y CONFIG_ARCH_CHIP_LPC43XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/lpc4330-xplorer/include/board.h b/boards/arm/lpc43xx/lpc4330-xplorer/include/board.h similarity index 100% rename from boards/arm/lpc4330-xplorer/include/board.h rename to boards/arm/lpc43xx/lpc4330-xplorer/include/board.h diff --git a/boards/arm/lpc4330-xplorer/scripts/Make.defs b/boards/arm/lpc43xx/lpc4330-xplorer/scripts/Make.defs similarity index 96% rename from boards/arm/lpc4330-xplorer/scripts/Make.defs rename to boards/arm/lpc43xx/lpc4330-xplorer/scripts/Make.defs index f8526c1c14d..72cf0f2a0c2 100644 --- a/boards/arm/lpc4330-xplorer/scripts/Make.defs +++ b/boards/arm/lpc43xx/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/lpc4330-xplorer/scripts/flash.sh b/boards/arm/lpc43xx/lpc4330-xplorer/scripts/flash.sh similarity index 100% rename from boards/arm/lpc4330-xplorer/scripts/flash.sh rename to boards/arm/lpc43xx/lpc4330-xplorer/scripts/flash.sh diff --git a/boards/arm/lpc4330-xplorer/scripts/ramconfig.ld b/boards/arm/lpc43xx/lpc4330-xplorer/scripts/ramconfig.ld similarity index 100% rename from boards/arm/lpc4330-xplorer/scripts/ramconfig.ld rename to boards/arm/lpc43xx/lpc4330-xplorer/scripts/ramconfig.ld diff --git a/boards/arm/lpc4330-xplorer/scripts/spificonfig.ld b/boards/arm/lpc43xx/lpc4330-xplorer/scripts/spificonfig.ld similarity index 100% rename from boards/arm/lpc4330-xplorer/scripts/spificonfig.ld rename to boards/arm/lpc43xx/lpc4330-xplorer/scripts/spificonfig.ld diff --git a/boards/arm/lpc4357-evb/src/.gitignore b/boards/arm/lpc43xx/lpc4330-xplorer/src/.gitignore similarity index 100% rename from boards/arm/lpc4357-evb/src/.gitignore rename to boards/arm/lpc43xx/lpc4330-xplorer/src/.gitignore diff --git a/boards/arm/lpc4330-xplorer/src/Makefile b/boards/arm/lpc43xx/lpc4330-xplorer/src/Makefile similarity index 100% rename from boards/arm/lpc4330-xplorer/src/Makefile rename to boards/arm/lpc43xx/lpc4330-xplorer/src/Makefile diff --git a/boards/arm/lpc4330-xplorer/src/lpc4330-xplorer.h b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc4330-xplorer.h similarity index 100% rename from boards/arm/lpc4330-xplorer/src/lpc4330-xplorer.h rename to boards/arm/lpc43xx/lpc4330-xplorer/src/lpc4330-xplorer.h diff --git a/boards/arm/lpc4330-xplorer/src/lpc43_appinit.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_appinit.c similarity index 100% rename from boards/arm/lpc4330-xplorer/src/lpc43_appinit.c rename to boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_appinit.c diff --git a/boards/arm/lpc4330-xplorer/src/lpc43_autoleds.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_autoleds.c similarity index 100% rename from boards/arm/lpc4330-xplorer/src/lpc43_autoleds.c rename to boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_autoleds.c diff --git a/boards/arm/lpc4330-xplorer/src/lpc43_boot.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_boot.c similarity index 100% rename from boards/arm/lpc4330-xplorer/src/lpc43_boot.c rename to boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_boot.c diff --git a/boards/arm/lpc4330-xplorer/src/lpc43_buttons.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_buttons.c similarity index 100% rename from boards/arm/lpc4330-xplorer/src/lpc43_buttons.c rename to boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_buttons.c diff --git a/boards/arm/lpc4330-xplorer/src/lpc43_ostest.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_ostest.c similarity index 100% rename from boards/arm/lpc4330-xplorer/src/lpc43_ostest.c rename to boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_ostest.c diff --git a/boards/arm/lpc4330-xplorer/src/lpc43_userleds.c b/boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_userleds.c similarity index 100% rename from boards/arm/lpc4330-xplorer/src/lpc43_userleds.c rename to boards/arm/lpc43xx/lpc4330-xplorer/src/lpc43_userleds.c diff --git a/boards/arm/lpc4337-ws/Kconfig b/boards/arm/lpc43xx/lpc4337-ws/Kconfig similarity index 100% rename from boards/arm/lpc4337-ws/Kconfig rename to boards/arm/lpc43xx/lpc4337-ws/Kconfig diff --git a/boards/arm/lpc4337-ws/README.txt b/boards/arm/lpc43xx/lpc4337-ws/README.txt similarity index 100% rename from boards/arm/lpc4337-ws/README.txt rename to boards/arm/lpc43xx/lpc4337-ws/README.txt diff --git a/boards/arm/lpc4337-ws/configs/nsh/defconfig b/boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig similarity index 98% rename from boards/arm/lpc4337-ws/configs/nsh/defconfig rename to boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig index ebf7e50f769..8f1c6a1ea55 100644 --- a/boards/arm/lpc4337-ws/configs/nsh/defconfig +++ b/boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpc4337-ws" CONFIG_ARCH_BOARD_LPC4337_WS=y +CONFIG_ARCH_CHIP="lpc43xx" CONFIG_ARCH_CHIP_LPC4337JBD144=y CONFIG_ARCH_CHIP_LPC43XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/lpc4337-ws/include/board.h b/boards/arm/lpc43xx/lpc4337-ws/include/board.h similarity index 100% rename from boards/arm/lpc4337-ws/include/board.h rename to boards/arm/lpc43xx/lpc4337-ws/include/board.h diff --git a/boards/arm/lpc4337-ws/scripts/Make.defs b/boards/arm/lpc43xx/lpc4337-ws/scripts/Make.defs similarity index 96% rename from boards/arm/lpc4337-ws/scripts/Make.defs rename to boards/arm/lpc43xx/lpc4337-ws/scripts/Make.defs index db36477a52d..a90eefa95f1 100644 --- a/boards/arm/lpc4337-ws/scripts/Make.defs +++ b/boards/arm/lpc43xx/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/lpc4337-ws/scripts/flash.bat b/boards/arm/lpc43xx/lpc4337-ws/scripts/flash.bat similarity index 100% rename from boards/arm/lpc4337-ws/scripts/flash.bat rename to boards/arm/lpc43xx/lpc4337-ws/scripts/flash.bat diff --git a/boards/arm/lpc4337-ws/scripts/flash.sh b/boards/arm/lpc43xx/lpc4337-ws/scripts/flash.sh similarity index 100% rename from boards/arm/lpc4337-ws/scripts/flash.sh rename to boards/arm/lpc43xx/lpc4337-ws/scripts/flash.sh diff --git a/boards/arm/lpc4337-ws/scripts/flashaconfig.ld b/boards/arm/lpc43xx/lpc4337-ws/scripts/flashaconfig.ld similarity index 100% rename from boards/arm/lpc4337-ws/scripts/flashaconfig.ld rename to boards/arm/lpc43xx/lpc4337-ws/scripts/flashaconfig.ld diff --git a/boards/arm/lpc4337-ws/scripts/ramconfig.ld b/boards/arm/lpc43xx/lpc4337-ws/scripts/ramconfig.ld similarity index 100% rename from boards/arm/lpc4337-ws/scripts/ramconfig.ld rename to boards/arm/lpc43xx/lpc4337-ws/scripts/ramconfig.ld diff --git a/boards/arm/lpc4370-link2/src/.gitignore b/boards/arm/lpc43xx/lpc4337-ws/src/.gitignore similarity index 100% rename from boards/arm/lpc4370-link2/src/.gitignore rename to boards/arm/lpc43xx/lpc4337-ws/src/.gitignore diff --git a/boards/arm/lpc4337-ws/src/Makefile b/boards/arm/lpc43xx/lpc4337-ws/src/Makefile similarity index 100% rename from boards/arm/lpc4337-ws/src/Makefile rename to boards/arm/lpc43xx/lpc4337-ws/src/Makefile diff --git a/boards/arm/lpc4337-ws/src/lpc4337-ws.h b/boards/arm/lpc43xx/lpc4337-ws/src/lpc4337-ws.h similarity index 100% rename from boards/arm/lpc4337-ws/src/lpc4337-ws.h rename to boards/arm/lpc43xx/lpc4337-ws/src/lpc4337-ws.h diff --git a/boards/arm/lpc4337-ws/src/lpc43_adc.c b/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_adc.c similarity index 100% rename from boards/arm/lpc4337-ws/src/lpc43_adc.c rename to boards/arm/lpc43xx/lpc4337-ws/src/lpc43_adc.c diff --git a/boards/arm/lpc4337-ws/src/lpc43_appinit.c b/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_appinit.c similarity index 100% rename from boards/arm/lpc4337-ws/src/lpc43_appinit.c rename to boards/arm/lpc43xx/lpc4337-ws/src/lpc43_appinit.c diff --git a/boards/arm/lpc4337-ws/src/lpc43_boot.c b/boards/arm/lpc43xx/lpc4337-ws/src/lpc43_boot.c similarity index 100% rename from boards/arm/lpc4337-ws/src/lpc43_boot.c rename to boards/arm/lpc43xx/lpc4337-ws/src/lpc43_boot.c diff --git a/boards/arm/lpc4357-evb/Kconfig b/boards/arm/lpc43xx/lpc4357-evb/Kconfig similarity index 100% rename from boards/arm/lpc4357-evb/Kconfig rename to boards/arm/lpc43xx/lpc4357-evb/Kconfig diff --git a/boards/arm/lpc4357-evb/README.txt b/boards/arm/lpc43xx/lpc4357-evb/README.txt similarity index 100% rename from boards/arm/lpc4357-evb/README.txt rename to boards/arm/lpc43xx/lpc4357-evb/README.txt diff --git a/boards/arm/lpc4357-evb/configs/nsh/defconfig b/boards/arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig similarity index 98% rename from boards/arm/lpc4357-evb/configs/nsh/defconfig rename to boards/arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig index 565ee018aea..7aa94b4cb4a 100644 --- a/boards/arm/lpc4357-evb/configs/nsh/defconfig +++ b/boards/arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpc4357-evb" CONFIG_ARCH_BOARD_LPC4357_EVB=y +CONFIG_ARCH_CHIP="lpc43xx" CONFIG_ARCH_CHIP_LPC4357FET256=y CONFIG_ARCH_CHIP_LPC43XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/lpc4357-evb/include/board.h b/boards/arm/lpc43xx/lpc4357-evb/include/board.h similarity index 100% rename from boards/arm/lpc4357-evb/include/board.h rename to boards/arm/lpc43xx/lpc4357-evb/include/board.h diff --git a/boards/arm/lpc4357-evb/scripts/Make.defs b/boards/arm/lpc43xx/lpc4357-evb/scripts/Make.defs similarity index 96% rename from boards/arm/lpc4357-evb/scripts/Make.defs rename to boards/arm/lpc43xx/lpc4357-evb/scripts/Make.defs index 5a7a6d8b0b2..522ff7d587b 100644 --- a/boards/arm/lpc4357-evb/scripts/Make.defs +++ b/boards/arm/lpc43xx/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/lpc4357-evb/scripts/bin_checksum_hex.sh b/boards/arm/lpc43xx/lpc4357-evb/scripts/bin_checksum_hex.sh similarity index 100% rename from boards/arm/lpc4357-evb/scripts/bin_checksum_hex.sh rename to boards/arm/lpc43xx/lpc4357-evb/scripts/bin_checksum_hex.sh diff --git a/boards/arm/lpc4357-evb/scripts/flash.sh b/boards/arm/lpc43xx/lpc4357-evb/scripts/flash.sh similarity index 100% rename from boards/arm/lpc4357-evb/scripts/flash.sh rename to boards/arm/lpc43xx/lpc4357-evb/scripts/flash.sh diff --git a/boards/arm/lpc4357-evb/scripts/flashaconfig.ld b/boards/arm/lpc43xx/lpc4357-evb/scripts/flashaconfig.ld similarity index 100% rename from boards/arm/lpc4357-evb/scripts/flashaconfig.ld rename to boards/arm/lpc43xx/lpc4357-evb/scripts/flashaconfig.ld diff --git a/boards/arm/lpc4357-evb/scripts/ramconfig.ld b/boards/arm/lpc43xx/lpc4357-evb/scripts/ramconfig.ld similarity index 100% rename from boards/arm/lpc4357-evb/scripts/ramconfig.ld rename to boards/arm/lpc43xx/lpc4357-evb/scripts/ramconfig.ld diff --git a/boards/arm/lpc4357-evb/scripts/spificonfig.ld b/boards/arm/lpc43xx/lpc4357-evb/scripts/spificonfig.ld similarity index 100% rename from boards/arm/lpc4357-evb/scripts/spificonfig.ld rename to boards/arm/lpc43xx/lpc4357-evb/scripts/spificonfig.ld diff --git a/boards/arm/lpcxpresso-lpc1768/src/.gitignore b/boards/arm/lpc43xx/lpc4357-evb/src/.gitignore similarity index 100% rename from boards/arm/lpcxpresso-lpc1768/src/.gitignore rename to boards/arm/lpc43xx/lpc4357-evb/src/.gitignore diff --git a/boards/arm/lpc4357-evb/src/Makefile b/boards/arm/lpc43xx/lpc4357-evb/src/Makefile similarity index 100% rename from boards/arm/lpc4357-evb/src/Makefile rename to boards/arm/lpc43xx/lpc4357-evb/src/Makefile diff --git a/boards/arm/lpc4357-evb/src/lpc4357-evb.h b/boards/arm/lpc43xx/lpc4357-evb/src/lpc4357-evb.h similarity index 100% rename from boards/arm/lpc4357-evb/src/lpc4357-evb.h rename to boards/arm/lpc43xx/lpc4357-evb/src/lpc4357-evb.h diff --git a/boards/arm/lpc4357-evb/src/lpc43_appinit.c b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_appinit.c similarity index 100% rename from boards/arm/lpc4357-evb/src/lpc43_appinit.c rename to boards/arm/lpc43xx/lpc4357-evb/src/lpc43_appinit.c diff --git a/boards/arm/lpc4357-evb/src/lpc43_autoleds.c b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_autoleds.c similarity index 100% rename from boards/arm/lpc4357-evb/src/lpc43_autoleds.c rename to boards/arm/lpc43xx/lpc4357-evb/src/lpc43_autoleds.c diff --git a/boards/arm/lpc4357-evb/src/lpc43_boot.c b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_boot.c similarity index 100% rename from boards/arm/lpc4357-evb/src/lpc43_boot.c rename to boards/arm/lpc43xx/lpc4357-evb/src/lpc43_boot.c diff --git a/boards/arm/lpc4357-evb/src/lpc43_buttons.c b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_buttons.c similarity index 100% rename from boards/arm/lpc4357-evb/src/lpc43_buttons.c rename to boards/arm/lpc43xx/lpc4357-evb/src/lpc43_buttons.c diff --git a/boards/arm/lpc4357-evb/src/lpc43_ostest.c b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_ostest.c similarity index 100% rename from boards/arm/lpc4357-evb/src/lpc43_ostest.c rename to boards/arm/lpc43xx/lpc4357-evb/src/lpc43_ostest.c diff --git a/boards/arm/lpc4357-evb/src/lpc43_userleds.c b/boards/arm/lpc43xx/lpc4357-evb/src/lpc43_userleds.c similarity index 100% rename from boards/arm/lpc4357-evb/src/lpc43_userleds.c rename to boards/arm/lpc43xx/lpc4357-evb/src/lpc43_userleds.c diff --git a/boards/arm/lpc4370-link2/Kconfig b/boards/arm/lpc43xx/lpc4370-link2/Kconfig similarity index 100% rename from boards/arm/lpc4370-link2/Kconfig rename to boards/arm/lpc43xx/lpc4370-link2/Kconfig diff --git a/boards/arm/lpc4370-link2/README.txt b/boards/arm/lpc43xx/lpc4370-link2/README.txt similarity index 100% rename from boards/arm/lpc4370-link2/README.txt rename to boards/arm/lpc43xx/lpc4370-link2/README.txt diff --git a/boards/arm/lpc4370-link2/configs/nsh/defconfig b/boards/arm/lpc43xx/lpc4370-link2/configs/nsh/defconfig similarity index 98% rename from boards/arm/lpc4370-link2/configs/nsh/defconfig rename to boards/arm/lpc43xx/lpc4370-link2/configs/nsh/defconfig index eb0d575b227..254f862b44a 100644 --- a/boards/arm/lpc4370-link2/configs/nsh/defconfig +++ b/boards/arm/lpc43xx/lpc4370-link2/configs/nsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpc4370-link2" CONFIG_ARCH_BOARD_LPC4370_LINK2=y +CONFIG_ARCH_CHIP="lpc43xx" CONFIG_ARCH_CHIP_LPC4370FET100=y CONFIG_ARCH_CHIP_LPC43XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/lpc4370-link2/include/board.h b/boards/arm/lpc43xx/lpc4370-link2/include/board.h similarity index 100% rename from boards/arm/lpc4370-link2/include/board.h rename to boards/arm/lpc43xx/lpc4370-link2/include/board.h diff --git a/boards/arm/lpc4370-link2/scripts/Make.defs b/boards/arm/lpc43xx/lpc4370-link2/scripts/Make.defs similarity index 96% rename from boards/arm/lpc4370-link2/scripts/Make.defs rename to boards/arm/lpc43xx/lpc4370-link2/scripts/Make.defs index 73a478bab49..c2005d0dc72 100644 --- a/boards/arm/lpc4370-link2/scripts/Make.defs +++ b/boards/arm/lpc43xx/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/lpc4370-link2/scripts/flash.bat b/boards/arm/lpc43xx/lpc4370-link2/scripts/flash.bat similarity index 100% rename from boards/arm/lpc4370-link2/scripts/flash.bat rename to boards/arm/lpc43xx/lpc4370-link2/scripts/flash.bat diff --git a/boards/arm/lpc4370-link2/scripts/flash.sh b/boards/arm/lpc43xx/lpc4370-link2/scripts/flash.sh similarity index 100% rename from boards/arm/lpc4370-link2/scripts/flash.sh rename to boards/arm/lpc43xx/lpc4370-link2/scripts/flash.sh diff --git a/boards/arm/lpc4370-link2/scripts/ramconfig.ld b/boards/arm/lpc43xx/lpc4370-link2/scripts/ramconfig.ld similarity index 100% rename from boards/arm/lpc4370-link2/scripts/ramconfig.ld rename to boards/arm/lpc43xx/lpc4370-link2/scripts/ramconfig.ld diff --git a/boards/arm/lpc4370-link2/scripts/spificonfig.ld b/boards/arm/lpc43xx/lpc4370-link2/scripts/spificonfig.ld similarity index 100% rename from boards/arm/lpc4370-link2/scripts/spificonfig.ld rename to boards/arm/lpc43xx/lpc4370-link2/scripts/spificonfig.ld diff --git a/boards/arm/mbed/src/.gitignore b/boards/arm/lpc43xx/lpc4370-link2/src/.gitignore similarity index 100% rename from boards/arm/mbed/src/.gitignore rename to boards/arm/lpc43xx/lpc4370-link2/src/.gitignore diff --git a/boards/arm/lpc4370-link2/src/Makefile b/boards/arm/lpc43xx/lpc4370-link2/src/Makefile similarity index 100% rename from boards/arm/lpc4370-link2/src/Makefile rename to boards/arm/lpc43xx/lpc4370-link2/src/Makefile diff --git a/boards/arm/lpc4370-link2/src/lpc4370-link2.h b/boards/arm/lpc43xx/lpc4370-link2/src/lpc4370-link2.h similarity index 100% rename from boards/arm/lpc4370-link2/src/lpc4370-link2.h rename to boards/arm/lpc43xx/lpc4370-link2/src/lpc4370-link2.h diff --git a/boards/arm/lpc4370-link2/src/lpc43_adc.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_adc.c similarity index 100% rename from boards/arm/lpc4370-link2/src/lpc43_adc.c rename to boards/arm/lpc43xx/lpc4370-link2/src/lpc43_adc.c diff --git a/boards/arm/lpc4370-link2/src/lpc43_appinit.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_appinit.c similarity index 100% rename from boards/arm/lpc4370-link2/src/lpc43_appinit.c rename to boards/arm/lpc43xx/lpc4370-link2/src/lpc43_appinit.c diff --git a/boards/arm/lpc4370-link2/src/lpc43_autoleds.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_autoleds.c similarity index 100% rename from boards/arm/lpc4370-link2/src/lpc43_autoleds.c rename to boards/arm/lpc43xx/lpc4370-link2/src/lpc43_autoleds.c diff --git a/boards/arm/lpc4370-link2/src/lpc43_boot.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_boot.c similarity index 100% rename from boards/arm/lpc4370-link2/src/lpc43_boot.c rename to boards/arm/lpc43xx/lpc4370-link2/src/lpc43_boot.c diff --git a/boards/arm/lpc4370-link2/src/lpc43_ostest.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_ostest.c similarity index 100% rename from boards/arm/lpc4370-link2/src/lpc43_ostest.c rename to boards/arm/lpc43xx/lpc4370-link2/src/lpc43_ostest.c diff --git a/boards/arm/lpc4370-link2/src/lpc43_spifilib_init.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_spifilib_init.c similarity index 100% rename from boards/arm/lpc4370-link2/src/lpc43_spifilib_init.c rename to boards/arm/lpc43xx/lpc4370-link2/src/lpc43_spifilib_init.c diff --git a/boards/arm/lpc4370-link2/src/lpc43_userleds.c b/boards/arm/lpc43xx/lpc4370-link2/src/lpc43_userleds.c similarity index 100% rename from boards/arm/lpc4370-link2/src/lpc43_userleds.c rename to boards/arm/lpc43xx/lpc4370-link2/src/lpc43_userleds.c diff --git a/boards/arm/lpcxpresso-lpc54628/Kconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/Kconfig similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/Kconfig rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/Kconfig diff --git a/boards/arm/lpcxpresso-lpc54628/README.txt b/boards/arm/lpc54xx/lpcxpresso-lpc54628/README.txt similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/README.txt rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/README.txt diff --git a/boards/arm/lpcxpresso-lpc54628/configs/fb/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig similarity index 98% rename from boards/arm/lpcxpresso-lpc54628/configs/fb/defconfig rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig index 6b5aa685aae..d76841af499 100644 --- a/boards/arm/lpcxpresso-lpc54628/configs/fb/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc54628" CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628=y +CONFIG_ARCH_CHIP="lpc54xx" CONFIG_ARCH_CHIP_LPC54628=y CONFIG_ARCH_CHIP_LPC54XX=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lpcxpresso-lpc54628/configs/lvgl/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig similarity index 98% rename from boards/arm/lpcxpresso-lpc54628/configs/lvgl/defconfig rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig index df70fdc3e1f..fff1f6ce200 100644 --- a/boards/arm/lpcxpresso-lpc54628/configs/lvgl/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc54628" CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628=y +CONFIG_ARCH_CHIP="lpc54xx" CONFIG_ARCH_CHIP_LPC54628=y CONFIG_ARCH_CHIP_LPC54XX=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lpcxpresso-lpc54628/configs/netnsh/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig similarity index 98% rename from boards/arm/lpcxpresso-lpc54628/configs/netnsh/defconfig rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig index a53210e0eb0..43b0c174eaa 100644 --- a/boards/arm/lpcxpresso-lpc54628/configs/netnsh/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc54628" CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="lpc54xx" CONFIG_ARCH_CHIP_LPC54628=y CONFIG_ARCH_CHIP_LPC54XX=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/lpcxpresso-lpc54628/configs/nsh/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nsh/defconfig similarity index 98% rename from boards/arm/lpcxpresso-lpc54628/configs/nsh/defconfig rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nsh/defconfig index 49cb1304400..b7c0ac69f8c 100644 --- a/boards/arm/lpcxpresso-lpc54628/configs/nsh/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc54628" CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="lpc54xx" CONFIG_ARCH_CHIP_LPC54628=y CONFIG_ARCH_CHIP_LPC54XX=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lpcxpresso-lpc54628/configs/nxwm/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig similarity index 99% rename from boards/arm/lpcxpresso-lpc54628/configs/nxwm/defconfig rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig index 338544a7f00..ac256556372 100644 --- a/boards/arm/lpcxpresso-lpc54628/configs/nxwm/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc54628" CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628=y +CONFIG_ARCH_CHIP="lpc54xx" CONFIG_ARCH_CHIP_LPC54628=y CONFIG_ARCH_CHIP_LPC54XX=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lpcxpresso-lpc54628/configs/pwfb/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig similarity index 98% rename from boards/arm/lpcxpresso-lpc54628/configs/pwfb/defconfig rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig index 98e50e65278..bd30979d387 100644 --- a/boards/arm/lpcxpresso-lpc54628/configs/pwfb/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc54628" CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628=y +CONFIG_ARCH_CHIP="lpc54xx" CONFIG_ARCH_CHIP_LPC54628=y CONFIG_ARCH_CHIP_LPC54XX=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lpcxpresso-lpc54628/configs/pwlines/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig similarity index 98% rename from boards/arm/lpcxpresso-lpc54628/configs/pwlines/defconfig rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig index 431a69ddbf2..e09278ca8d7 100644 --- a/boards/arm/lpcxpresso-lpc54628/configs/pwlines/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc54628" CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628=y +CONFIG_ARCH_CHIP="lpc54xx" CONFIG_ARCH_CHIP_LPC54628=y CONFIG_ARCH_CHIP_LPC54XX=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lpcxpresso-lpc54628/configs/twm4nx1/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig similarity index 99% rename from boards/arm/lpcxpresso-lpc54628/configs/twm4nx1/defconfig rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig index 0757e17288f..9ff8e685170 100644 --- a/boards/arm/lpcxpresso-lpc54628/configs/twm4nx1/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc54628" CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628=y +CONFIG_ARCH_CHIP="lpc54xx" CONFIG_ARCH_CHIP_LPC54628=y CONFIG_ARCH_CHIP_LPC54XX=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lpcxpresso-lpc54628/configs/twm4nx2/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig similarity index 99% rename from boards/arm/lpcxpresso-lpc54628/configs/twm4nx2/defconfig rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig index cd3f077f232..da7a7d067d0 100644 --- a/boards/arm/lpcxpresso-lpc54628/configs/twm4nx2/defconfig +++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lpcxpresso-lpc54628" CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628=y +CONFIG_ARCH_CHIP="lpc54xx" CONFIG_ARCH_CHIP_LPC54628=y CONFIG_ARCH_CHIP_LPC54XX=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/lpcxpresso-lpc54628/include/board.h b/boards/arm/lpc54xx/lpcxpresso-lpc54628/include/board.h similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/include/board.h rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/include/board.h diff --git a/boards/arm/lpcxpresso-lpc54628/scripts/Make.defs b/boards/arm/lpc54xx/lpcxpresso-lpc54628/scripts/Make.defs similarity index 96% rename from boards/arm/lpcxpresso-lpc54628/scripts/Make.defs rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/scripts/Make.defs index dc0ead32d6e..2dd03ea3ee6 100644 --- a/boards/arm/lpcxpresso-lpc54628/scripts/Make.defs +++ b/boards/arm/lpc54xx/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/lpcxpresso-lpc54628/scripts/flash.ld b/boards/arm/lpc54xx/lpcxpresso-lpc54628/scripts/flash.ld similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/scripts/flash.ld rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/scripts/flash.ld diff --git a/boards/arm/lpcxpresso-lpc54628/src/Makefile b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/Makefile similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/src/Makefile rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/src/Makefile diff --git a/boards/arm/lpcxpresso-lpc54628/src/lpc54_appinit.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_appinit.c similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/src/lpc54_appinit.c rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_appinit.c diff --git a/boards/arm/lpcxpresso-lpc54628/src/lpc54_autoleds.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_autoleds.c similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/src/lpc54_autoleds.c rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_autoleds.c diff --git a/boards/arm/lpcxpresso-lpc54628/src/lpc54_boot.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_boot.c similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/src/lpc54_boot.c rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_boot.c diff --git a/boards/arm/lpcxpresso-lpc54628/src/lpc54_bringup.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_bringup.c similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/src/lpc54_bringup.c rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_bringup.c diff --git a/boards/arm/lpcxpresso-lpc54628/src/lpc54_buttons.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_buttons.c similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/src/lpc54_buttons.c rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_buttons.c diff --git a/boards/arm/lpcxpresso-lpc54628/src/lpc54_ft5x06.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_ft5x06.c similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/src/lpc54_ft5x06.c rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_ft5x06.c diff --git a/boards/arm/lpcxpresso-lpc54628/src/lpc54_i2c.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_i2c.c similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/src/lpc54_i2c.c rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_i2c.c diff --git a/boards/arm/lpcxpresso-lpc54628/src/lpc54_i2ctool.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_i2ctool.c similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/src/lpc54_i2ctool.c rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_i2ctool.c diff --git a/boards/arm/lpcxpresso-lpc54628/src/lpc54_lcd.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_lcd.c similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/src/lpc54_lcd.c rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_lcd.c diff --git a/boards/arm/lpcxpresso-lpc54628/src/lpc54_sdram.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_sdram.c similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/src/lpc54_sdram.c rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_sdram.c diff --git a/boards/arm/lpcxpresso-lpc54628/src/lpc54_userleds.c b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_userleds.c similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/src/lpc54_userleds.c rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpc54_userleds.c diff --git a/boards/arm/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h b/boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h similarity index 100% rename from boards/arm/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h rename to boards/arm/lpc54xx/lpcxpresso-lpc54628/src/lpcxpresso-lpc54628.h diff --git a/boards/arm/max32660-evsys/Kconfig b/boards/arm/max326xx/max32660-evsys/Kconfig similarity index 100% rename from boards/arm/max32660-evsys/Kconfig rename to boards/arm/max326xx/max32660-evsys/Kconfig diff --git a/boards/arm/max32660-evsys/README.txt b/boards/arm/max326xx/max32660-evsys/README.txt similarity index 100% rename from boards/arm/max32660-evsys/README.txt rename to boards/arm/max326xx/max32660-evsys/README.txt diff --git a/boards/arm/max32660-evsys/configs/nsh/defconfig b/boards/arm/max326xx/max32660-evsys/configs/nsh/defconfig similarity index 97% rename from boards/arm/max32660-evsys/configs/nsh/defconfig rename to boards/arm/max326xx/max32660-evsys/configs/nsh/defconfig index e0ba2130364..2defa3bf0f4 100644 --- a/boards/arm/max32660-evsys/configs/nsh/defconfig +++ b/boards/arm/max326xx/max32660-evsys/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="max32660-evsys" CONFIG_ARCH_BOARD_MAX32660_EVSYS=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="max326xx" CONFIG_ARCH_CHIP_MAX32660=y CONFIG_ARCH_CHIP_MAX326XX=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/max32660-evsys/include/board.h b/boards/arm/max326xx/max32660-evsys/include/board.h similarity index 100% rename from boards/arm/max32660-evsys/include/board.h rename to boards/arm/max326xx/max32660-evsys/include/board.h diff --git a/boards/arm/max32660-evsys/scripts/Make.defs b/boards/arm/max326xx/max32660-evsys/scripts/Make.defs similarity index 96% rename from boards/arm/max32660-evsys/scripts/Make.defs rename to boards/arm/max326xx/max32660-evsys/scripts/Make.defs index b24869ba3bc..305e57f7a0f 100644 --- a/boards/arm/max32660-evsys/scripts/Make.defs +++ b/boards/arm/max326xx/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/max32660-evsys/scripts/flash.ld b/boards/arm/max326xx/max32660-evsys/scripts/flash.ld similarity index 100% rename from boards/arm/max32660-evsys/scripts/flash.ld rename to boards/arm/max326xx/max32660-evsys/scripts/flash.ld diff --git a/boards/arm/max32660-evsys/scripts/sram.ld b/boards/arm/max326xx/max32660-evsys/scripts/sram.ld similarity index 100% rename from boards/arm/max32660-evsys/scripts/sram.ld rename to boards/arm/max326xx/max32660-evsys/scripts/sram.ld diff --git a/boards/arm/max32660-evsys/src/Makefile b/boards/arm/max326xx/max32660-evsys/src/Makefile similarity index 100% rename from boards/arm/max32660-evsys/src/Makefile rename to boards/arm/max326xx/max32660-evsys/src/Makefile diff --git a/boards/arm/max32660-evsys/src/max32660-evsys.h b/boards/arm/max326xx/max32660-evsys/src/max32660-evsys.h similarity index 100% rename from boards/arm/max32660-evsys/src/max32660-evsys.h rename to boards/arm/max326xx/max32660-evsys/src/max32660-evsys.h diff --git a/boards/arm/max32660-evsys/src/max326_appinit.c b/boards/arm/max326xx/max32660-evsys/src/max326_appinit.c similarity index 100% rename from boards/arm/max32660-evsys/src/max326_appinit.c rename to boards/arm/max326xx/max32660-evsys/src/max326_appinit.c diff --git a/boards/arm/max32660-evsys/src/max326_autoleds.c b/boards/arm/max326xx/max32660-evsys/src/max326_autoleds.c similarity index 100% rename from boards/arm/max32660-evsys/src/max326_autoleds.c rename to boards/arm/max326xx/max32660-evsys/src/max326_autoleds.c diff --git a/boards/arm/max32660-evsys/src/max326_boot.c b/boards/arm/max326xx/max32660-evsys/src/max326_boot.c similarity index 100% rename from boards/arm/max32660-evsys/src/max326_boot.c rename to boards/arm/max326xx/max32660-evsys/src/max326_boot.c diff --git a/boards/arm/max32660-evsys/src/max326_bringup.c b/boards/arm/max326xx/max32660-evsys/src/max326_bringup.c similarity index 100% rename from boards/arm/max32660-evsys/src/max326_bringup.c rename to boards/arm/max326xx/max32660-evsys/src/max326_bringup.c diff --git a/boards/arm/max32660-evsys/src/max326_button.c b/boards/arm/max326xx/max32660-evsys/src/max326_button.c similarity index 100% rename from boards/arm/max32660-evsys/src/max326_button.c rename to boards/arm/max326xx/max32660-evsys/src/max326_button.c diff --git a/boards/arm/max32660-evsys/src/max326_mmcsd.c b/boards/arm/max326xx/max32660-evsys/src/max326_mmcsd.c similarity index 100% rename from boards/arm/max32660-evsys/src/max326_mmcsd.c rename to boards/arm/max326xx/max32660-evsys/src/max326_mmcsd.c diff --git a/boards/arm/max32660-evsys/src/max326_spi.c b/boards/arm/max326xx/max32660-evsys/src/max326_spi.c similarity index 100% rename from boards/arm/max32660-evsys/src/max326_spi.c rename to boards/arm/max326xx/max32660-evsys/src/max326_spi.c diff --git a/boards/arm/max32660-evsys/src/max326_userleds.c b/boards/arm/max326xx/max32660-evsys/src/max326_userleds.c similarity index 100% rename from boards/arm/max32660-evsys/src/max326_userleds.c rename to boards/arm/max326xx/max32660-evsys/src/max326_userleds.c diff --git a/boards/arm/moxa/Kconfig b/boards/arm/moxart/moxa/Kconfig similarity index 100% rename from boards/arm/moxa/Kconfig rename to boards/arm/moxart/moxa/Kconfig diff --git a/boards/arm/moxa/configs/nsh/defconfig b/boards/arm/moxart/moxa/configs/nsh/defconfig similarity index 99% rename from boards/arm/moxa/configs/nsh/defconfig rename to boards/arm/moxart/moxa/configs/nsh/defconfig index 4b1b6c8fc5a..adade9b02a7 100644 --- a/boards/arm/moxa/configs/nsh/defconfig +++ b/boards/arm/moxart/moxa/configs/nsh/defconfig @@ -38,6 +38,7 @@ CONFIG_16550_UART=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="moxa" CONFIG_ARCH_BOARD_MOXA=y +CONFIG_ARCH_CHIP="moxart" CONFIG_ARCH_CHIP_MOXART=y CONFIG_ARCH_INTERRUPTSTACK=1024 CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/moxa/include/board.h b/boards/arm/moxart/moxa/include/board.h similarity index 100% rename from boards/arm/moxa/include/board.h rename to boards/arm/moxart/moxa/include/board.h diff --git a/boards/arm/moxa/scripts/Make.defs b/boards/arm/moxart/moxa/scripts/Make.defs similarity index 96% rename from boards/arm/moxa/scripts/Make.defs rename to boards/arm/moxart/moxa/scripts/Make.defs index a4dc7755f4c..d88e85ad7f6 100644 --- a/boards/arm/moxa/scripts/Make.defs +++ b/boards/arm/moxart/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)/$(CONFIG_ARCH_BOARD)/scripts/moxa.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/moxa.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/moxa.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/moxa/scripts/moxa.ld b/boards/arm/moxart/moxa/scripts/moxa.ld similarity index 100% rename from boards/arm/moxa/scripts/moxa.ld rename to boards/arm/moxart/moxa/scripts/moxa.ld diff --git a/boards/arm/moxa/src/Makefile b/boards/arm/moxart/moxa/src/Makefile similarity index 100% rename from boards/arm/moxa/src/Makefile rename to boards/arm/moxart/moxa/src/Makefile diff --git a/boards/arm/moxa/src/moxart_appinit.c b/boards/arm/moxart/moxa/src/moxart_appinit.c similarity index 100% rename from boards/arm/moxa/src/moxart_appinit.c rename to boards/arm/moxart/moxa/src/moxart_appinit.c diff --git a/boards/arm/moxa/src/moxart_boot.c b/boards/arm/moxart/moxa/src/moxart_boot.c similarity index 100% rename from boards/arm/moxa/src/moxart_boot.c rename to boards/arm/moxart/moxa/src/moxart_boot.c diff --git a/boards/arm/moxa/src/moxart_reset.c b/boards/arm/moxart/moxa/src/moxart_reset.c similarity index 100% rename from boards/arm/moxa/src/moxart_reset.c rename to boards/arm/moxart/moxa/src/moxart_reset.c diff --git a/boards/arm/nrf52-generic/Kconfig b/boards/arm/nrf52/nrf52-generic/Kconfig similarity index 100% rename from boards/arm/nrf52-generic/Kconfig rename to boards/arm/nrf52/nrf52-generic/Kconfig diff --git a/boards/arm/nrf52-generic/README.txt b/boards/arm/nrf52/nrf52-generic/README.txt similarity index 100% rename from boards/arm/nrf52-generic/README.txt rename to boards/arm/nrf52/nrf52-generic/README.txt diff --git a/boards/arm/nrf52-generic/configs/feather-nsh/defconfig b/boards/arm/nrf52/nrf52-generic/configs/feather-nsh/defconfig similarity index 98% rename from boards/arm/nrf52-generic/configs/feather-nsh/defconfig rename to boards/arm/nrf52/nrf52-generic/configs/feather-nsh/defconfig index 4e660c1ddcb..62a4214525b 100644 --- a/boards/arm/nrf52-generic/configs/feather-nsh/defconfig +++ b/boards/arm/nrf52/nrf52-generic/configs/feather-nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nrf52-generic" CONFIG_ARCH_BOARD_NRF52_GENERIC=y +CONFIG_ARCH_CHIP="nrf52" CONFIG_ARCH_CHIP_NRF52832=y CONFIG_ARCH_CHIP_NRF52=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nrf52-generic/configs/feather-userleds/defconfig b/boards/arm/nrf52/nrf52-generic/configs/feather-userleds/defconfig similarity index 98% rename from boards/arm/nrf52-generic/configs/feather-userleds/defconfig rename to boards/arm/nrf52/nrf52-generic/configs/feather-userleds/defconfig index 4bf84bcc55b..d3874c390b8 100644 --- a/boards/arm/nrf52-generic/configs/feather-userleds/defconfig +++ b/boards/arm/nrf52/nrf52-generic/configs/feather-userleds/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nrf52-generic" CONFIG_ARCH_BOARD_NRF52_GENERIC=y +CONFIG_ARCH_CHIP="nrf52" CONFIG_ARCH_CHIP_NRF52832=y CONFIG_ARCH_CHIP_NRF52=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nrf52-generic/configs/pca10040-nsh/defconfig b/boards/arm/nrf52/nrf52-generic/configs/pca10040-nsh/defconfig similarity index 98% rename from boards/arm/nrf52-generic/configs/pca10040-nsh/defconfig rename to boards/arm/nrf52/nrf52-generic/configs/pca10040-nsh/defconfig index a4b1457fa0c..ec5c3b490b8 100644 --- a/boards/arm/nrf52-generic/configs/pca10040-nsh/defconfig +++ b/boards/arm/nrf52/nrf52-generic/configs/pca10040-nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nrf52-generic" CONFIG_ARCH_BOARD_NRF52_GENERIC=y +CONFIG_ARCH_CHIP="nrf52" CONFIG_ARCH_CHIP_NRF52832=y CONFIG_ARCH_CHIP_NRF52=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nrf52-generic/configs/pca10040-wdog/defconfig b/boards/arm/nrf52/nrf52-generic/configs/pca10040-wdog/defconfig similarity index 98% rename from boards/arm/nrf52-generic/configs/pca10040-wdog/defconfig rename to boards/arm/nrf52/nrf52-generic/configs/pca10040-wdog/defconfig index fef43f96392..aec615b6542 100644 --- a/boards/arm/nrf52-generic/configs/pca10040-wdog/defconfig +++ b/boards/arm/nrf52/nrf52-generic/configs/pca10040-wdog/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nrf52-generic" CONFIG_ARCH_BOARD_NRF52_GENERIC=y +CONFIG_ARCH_CHIP="nrf52" CONFIG_ARCH_CHIP_NRF52832=y CONFIG_ARCH_CHIP_NRF52=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nrf52-generic/include/board.h b/boards/arm/nrf52/nrf52-generic/include/board.h similarity index 100% rename from boards/arm/nrf52-generic/include/board.h rename to boards/arm/nrf52/nrf52-generic/include/board.h diff --git a/boards/arm/nrf52-generic/scripts/Make.defs b/boards/arm/nrf52/nrf52-generic/scripts/Make.defs similarity index 96% rename from boards/arm/nrf52-generic/scripts/Make.defs rename to boards/arm/nrf52/nrf52-generic/scripts/Make.defs index 51a31d4ed30..cdd175779fc 100644 --- a/boards/arm/nrf52-generic/scripts/Make.defs +++ b/boards/arm/nrf52/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nrf52-generic/scripts/flash_config.ld b/boards/arm/nrf52/nrf52-generic/scripts/flash_config.ld similarity index 100% rename from boards/arm/nrf52-generic/scripts/flash_config.ld rename to boards/arm/nrf52/nrf52-generic/scripts/flash_config.ld diff --git a/boards/arm/mcb1700/src/.gitignore b/boards/arm/nrf52/nrf52-generic/src/.gitignore similarity index 100% rename from boards/arm/mcb1700/src/.gitignore rename to boards/arm/nrf52/nrf52-generic/src/.gitignore diff --git a/boards/arm/nrf52-generic/src/Makefile b/boards/arm/nrf52/nrf52-generic/src/Makefile similarity index 100% rename from boards/arm/nrf52-generic/src/Makefile rename to boards/arm/nrf52/nrf52-generic/src/Makefile diff --git a/boards/arm/nrf52-generic/src/nrf52-generic.h b/boards/arm/nrf52/nrf52-generic/src/nrf52-generic.h similarity index 100% rename from boards/arm/nrf52-generic/src/nrf52-generic.h rename to boards/arm/nrf52/nrf52-generic/src/nrf52-generic.h diff --git a/boards/arm/nrf52-generic/src/nrf52_appinit.c b/boards/arm/nrf52/nrf52-generic/src/nrf52_appinit.c similarity index 100% rename from boards/arm/nrf52-generic/src/nrf52_appinit.c rename to boards/arm/nrf52/nrf52-generic/src/nrf52_appinit.c diff --git a/boards/arm/nrf52-generic/src/nrf52_autoleds.c b/boards/arm/nrf52/nrf52-generic/src/nrf52_autoleds.c similarity index 100% rename from boards/arm/nrf52-generic/src/nrf52_autoleds.c rename to boards/arm/nrf52/nrf52-generic/src/nrf52_autoleds.c diff --git a/boards/arm/nrf52-generic/src/nrf52_boot.c b/boards/arm/nrf52/nrf52-generic/src/nrf52_boot.c similarity index 100% rename from boards/arm/nrf52-generic/src/nrf52_boot.c rename to boards/arm/nrf52/nrf52-generic/src/nrf52_boot.c diff --git a/boards/arm/nrf52-generic/src/nrf52_bringup.c b/boards/arm/nrf52/nrf52-generic/src/nrf52_bringup.c similarity index 100% rename from boards/arm/nrf52-generic/src/nrf52_bringup.c rename to boards/arm/nrf52/nrf52-generic/src/nrf52_bringup.c diff --git a/boards/arm/nrf52-generic/src/nrf52_buttons.c b/boards/arm/nrf52/nrf52-generic/src/nrf52_buttons.c similarity index 100% rename from boards/arm/nrf52-generic/src/nrf52_buttons.c rename to boards/arm/nrf52/nrf52-generic/src/nrf52_buttons.c diff --git a/boards/arm/nrf52-generic/src/nrf52_userleds.c b/boards/arm/nrf52/nrf52-generic/src/nrf52_userleds.c similarity index 100% rename from boards/arm/nrf52-generic/src/nrf52_userleds.c rename to boards/arm/nrf52/nrf52-generic/src/nrf52_userleds.c diff --git a/boards/arm/nutiny-nuc120/Kconfig b/boards/arm/nuc1xx/nutiny-nuc120/Kconfig similarity index 100% rename from boards/arm/nutiny-nuc120/Kconfig rename to boards/arm/nuc1xx/nutiny-nuc120/Kconfig diff --git a/boards/arm/nutiny-nuc120/README.txt b/boards/arm/nuc1xx/nutiny-nuc120/README.txt similarity index 100% rename from boards/arm/nutiny-nuc120/README.txt rename to boards/arm/nuc1xx/nutiny-nuc120/README.txt diff --git a/boards/arm/nutiny-nuc120/configs/nsh/defconfig b/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig similarity index 98% rename from boards/arm/nutiny-nuc120/configs/nsh/defconfig rename to boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig index 6fefbe3a5d1..ea15a763409 100644 --- a/boards/arm/nutiny-nuc120/configs/nsh/defconfig +++ b/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nutiny-nuc120" CONFIG_ARCH_BOARD_NUTINY_NUC120=y +CONFIG_ARCH_CHIP="nuc1xx" CONFIG_ARCH_CHIP_NUC120LE3AN=y CONFIG_ARCH_CHIP_NUC1XX=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nutiny-nuc120/include/board.h b/boards/arm/nuc1xx/nutiny-nuc120/include/board.h similarity index 100% rename from boards/arm/nutiny-nuc120/include/board.h rename to boards/arm/nuc1xx/nutiny-nuc120/include/board.h diff --git a/boards/arm/nutiny-nuc120/scripts/Make.defs b/boards/arm/nuc1xx/nutiny-nuc120/scripts/Make.defs similarity index 96% rename from boards/arm/nutiny-nuc120/scripts/Make.defs rename to boards/arm/nuc1xx/nutiny-nuc120/scripts/Make.defs index 5bd7486149e..9fb060627f6 100644 --- a/boards/arm/nutiny-nuc120/scripts/Make.defs +++ b/boards/arm/nuc1xx/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nutiny-nuc120/scripts/nutiny-nuc120.ld b/boards/arm/nuc1xx/nutiny-nuc120/scripts/nutiny-nuc120.ld similarity index 100% rename from boards/arm/nutiny-nuc120/scripts/nutiny-nuc120.ld rename to boards/arm/nuc1xx/nutiny-nuc120/scripts/nutiny-nuc120.ld diff --git a/boards/arm/mcu123-lpc214x/src/.gitignore b/boards/arm/nuc1xx/nutiny-nuc120/src/.gitignore similarity index 100% rename from boards/arm/mcu123-lpc214x/src/.gitignore rename to boards/arm/nuc1xx/nutiny-nuc120/src/.gitignore diff --git a/boards/arm/nutiny-nuc120/src/Makefile b/boards/arm/nuc1xx/nutiny-nuc120/src/Makefile similarity index 100% rename from boards/arm/nutiny-nuc120/src/Makefile rename to boards/arm/nuc1xx/nutiny-nuc120/src/Makefile diff --git a/boards/arm/nutiny-nuc120/src/nuc_boardinitialize.c b/boards/arm/nuc1xx/nutiny-nuc120/src/nuc_boardinitialize.c similarity index 100% rename from boards/arm/nutiny-nuc120/src/nuc_boardinitialize.c rename to boards/arm/nuc1xx/nutiny-nuc120/src/nuc_boardinitialize.c diff --git a/boards/arm/nutiny-nuc120/src/nuc_led.c b/boards/arm/nuc1xx/nutiny-nuc120/src/nuc_led.c similarity index 100% rename from boards/arm/nutiny-nuc120/src/nuc_led.c rename to boards/arm/nuc1xx/nutiny-nuc120/src/nuc_led.c diff --git a/boards/arm/nutiny-nuc120/src/nutiny-nuc120.h b/boards/arm/nuc1xx/nutiny-nuc120/src/nutiny-nuc120.h similarity index 100% rename from boards/arm/nutiny-nuc120/src/nutiny-nuc120.h rename to boards/arm/nuc1xx/nutiny-nuc120/src/nutiny-nuc120.h diff --git a/boards/arm/arduino-due/Kconfig b/boards/arm/sam34/arduino-due/Kconfig similarity index 100% rename from boards/arm/arduino-due/Kconfig rename to boards/arm/sam34/arduino-due/Kconfig diff --git a/boards/arm/arduino-due/README.txt b/boards/arm/sam34/arduino-due/README.txt similarity index 100% rename from boards/arm/arduino-due/README.txt rename to boards/arm/sam34/arduino-due/README.txt diff --git a/boards/arm/arduino-due/configs/nsh/defconfig b/boards/arm/sam34/arduino-due/configs/nsh/defconfig similarity index 98% rename from boards/arm/arduino-due/configs/nsh/defconfig rename to boards/arm/sam34/arduino-due/configs/nsh/defconfig index 0b77f55de92..63cc7e5703d 100644 --- a/boards/arm/arduino-due/configs/nsh/defconfig +++ b/boards/arm/sam34/arduino-due/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="arduino-due" CONFIG_ARCH_BOARD_ARDUINO_DUE=y CONFIG_ARCH_CHIP_ATSAM3X8E=y +CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP_SAM34=y CONFIG_ARCH_CHIP_SAM3X=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/arduino-due/include/board.h b/boards/arm/sam34/arduino-due/include/board.h similarity index 100% rename from boards/arm/arduino-due/include/board.h rename to boards/arm/sam34/arduino-due/include/board.h diff --git a/boards/arm/arduino-due/scripts/Make.defs b/boards/arm/sam34/arduino-due/scripts/Make.defs similarity index 95% rename from boards/arm/arduino-due/scripts/Make.defs rename to boards/arm/sam34/arduino-due/scripts/Make.defs index 083b7a820b2..7dd1c55942a 100644 --- a/boards/arm/arduino-due/scripts/Make.defs +++ b/boards/arm/sam34/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)/$(CONFIG_ARCH_BOARD)/scripts/arduino-due.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/arduino-due.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/arduino-due.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/arduino-due/scripts/arduino-due.ld b/boards/arm/sam34/arduino-due/scripts/arduino-due.ld similarity index 100% rename from boards/arm/arduino-due/scripts/arduino-due.ld rename to boards/arm/sam34/arduino-due/scripts/arduino-due.ld diff --git a/boards/arm/mikroe-stm32f4/src/.gitignore b/boards/arm/sam34/arduino-due/src/.gitignore similarity index 100% rename from boards/arm/mikroe-stm32f4/src/.gitignore rename to boards/arm/sam34/arduino-due/src/.gitignore diff --git a/boards/arm/arduino-due/src/Makefile b/boards/arm/sam34/arduino-due/src/Makefile similarity index 100% rename from boards/arm/arduino-due/src/Makefile rename to boards/arm/sam34/arduino-due/src/Makefile diff --git a/boards/arm/arduino-due/src/arduino-due.h b/boards/arm/sam34/arduino-due/src/arduino-due.h similarity index 100% rename from boards/arm/arduino-due/src/arduino-due.h rename to boards/arm/sam34/arduino-due/src/arduino-due.h diff --git a/boards/arm/arduino-due/src/sam_appinit.c b/boards/arm/sam34/arduino-due/src/sam_appinit.c similarity index 100% rename from boards/arm/arduino-due/src/sam_appinit.c rename to boards/arm/sam34/arduino-due/src/sam_appinit.c diff --git a/boards/arm/arduino-due/src/sam_autoleds.c b/boards/arm/sam34/arduino-due/src/sam_autoleds.c similarity index 100% rename from boards/arm/arduino-due/src/sam_autoleds.c rename to boards/arm/sam34/arduino-due/src/sam_autoleds.c diff --git a/boards/arm/arduino-due/src/sam_boot.c b/boards/arm/sam34/arduino-due/src/sam_boot.c similarity index 100% rename from boards/arm/arduino-due/src/sam_boot.c rename to boards/arm/sam34/arduino-due/src/sam_boot.c diff --git a/boards/arm/arduino-due/src/sam_bringup.c b/boards/arm/sam34/arduino-due/src/sam_bringup.c similarity index 100% rename from boards/arm/arduino-due/src/sam_bringup.c rename to boards/arm/sam34/arduino-due/src/sam_bringup.c diff --git a/boards/arm/arduino-due/src/sam_mmcsd.c b/boards/arm/sam34/arduino-due/src/sam_mmcsd.c similarity index 100% rename from boards/arm/arduino-due/src/sam_mmcsd.c rename to boards/arm/sam34/arduino-due/src/sam_mmcsd.c diff --git a/boards/arm/arduino-due/src/sam_touchscreen.c b/boards/arm/sam34/arduino-due/src/sam_touchscreen.c similarity index 100% rename from boards/arm/arduino-due/src/sam_touchscreen.c rename to boards/arm/sam34/arduino-due/src/sam_touchscreen.c diff --git a/boards/arm/arduino-due/src/sam_userleds.c b/boards/arm/sam34/arduino-due/src/sam_userleds.c similarity index 100% rename from boards/arm/arduino-due/src/sam_userleds.c rename to boards/arm/sam34/arduino-due/src/sam_userleds.c diff --git a/boards/arm/flipnclick-sam3x/Kconfig b/boards/arm/sam34/flipnclick-sam3x/Kconfig similarity index 100% rename from boards/arm/flipnclick-sam3x/Kconfig rename to boards/arm/sam34/flipnclick-sam3x/Kconfig diff --git a/boards/arm/flipnclick-sam3x/README.txt b/boards/arm/sam34/flipnclick-sam3x/README.txt similarity index 100% rename from boards/arm/flipnclick-sam3x/README.txt rename to boards/arm/sam34/flipnclick-sam3x/README.txt diff --git a/boards/arm/flipnclick-sam3x/configs/nsh/defconfig b/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig similarity index 98% rename from boards/arm/flipnclick-sam3x/configs/nsh/defconfig rename to boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig index 9a54f99d150..293fbedc99f 100644 --- a/boards/arm/flipnclick-sam3x/configs/nsh/defconfig +++ b/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="flipnclick-sam3x" CONFIG_ARCH_BOARD_FLIPNCLICK_SAM3X=y +CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP_ATSAM3X8E=y CONFIG_ARCH_CHIP_SAM34=y CONFIG_ARCH_CHIP_SAM3X=y diff --git a/boards/arm/flipnclick-sam3x/configs/nxlines/defconfig b/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig similarity index 98% rename from boards/arm/flipnclick-sam3x/configs/nxlines/defconfig rename to boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig index 224c015588d..0252e56db9c 100644 --- a/boards/arm/flipnclick-sam3x/configs/nxlines/defconfig +++ b/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="flipnclick-sam3x" CONFIG_ARCH_BOARD_FLIPNCLICK_SAM3X=y +CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP_ATSAM3X8E=y CONFIG_ARCH_CHIP_SAM34=y CONFIG_ARCH_CHIP_SAM3X=y diff --git a/boards/arm/flipnclick-sam3x/include/board.h b/boards/arm/sam34/flipnclick-sam3x/include/board.h similarity index 100% rename from boards/arm/flipnclick-sam3x/include/board.h rename to boards/arm/sam34/flipnclick-sam3x/include/board.h diff --git a/boards/arm/flipnclick-sam3x/scripts/Make.defs b/boards/arm/sam34/flipnclick-sam3x/scripts/Make.defs similarity index 96% rename from boards/arm/flipnclick-sam3x/scripts/Make.defs rename to boards/arm/sam34/flipnclick-sam3x/scripts/Make.defs index 898d0fbe22c..52334a1f7b7 100644 --- a/boards/arm/flipnclick-sam3x/scripts/Make.defs +++ b/boards/arm/sam34/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)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/flipnclick-sam3x/scripts/flash.ld b/boards/arm/sam34/flipnclick-sam3x/scripts/flash.ld similarity index 100% rename from boards/arm/flipnclick-sam3x/scripts/flash.ld rename to boards/arm/sam34/flipnclick-sam3x/scripts/flash.ld diff --git a/boards/arm/nrf52-generic/src/.gitignore b/boards/arm/sam34/flipnclick-sam3x/src/.gitignore similarity index 100% rename from boards/arm/nrf52-generic/src/.gitignore rename to boards/arm/sam34/flipnclick-sam3x/src/.gitignore diff --git a/boards/arm/flipnclick-sam3x/src/Makefile b/boards/arm/sam34/flipnclick-sam3x/src/Makefile similarity index 100% rename from boards/arm/flipnclick-sam3x/src/Makefile rename to boards/arm/sam34/flipnclick-sam3x/src/Makefile diff --git a/boards/arm/flipnclick-sam3x/src/flipnclick-sam3x.h b/boards/arm/sam34/flipnclick-sam3x/src/flipnclick-sam3x.h similarity index 100% rename from boards/arm/flipnclick-sam3x/src/flipnclick-sam3x.h rename to boards/arm/sam34/flipnclick-sam3x/src/flipnclick-sam3x.h diff --git a/boards/arm/flipnclick-sam3x/src/sam_appinit.c b/boards/arm/sam34/flipnclick-sam3x/src/sam_appinit.c similarity index 100% rename from boards/arm/flipnclick-sam3x/src/sam_appinit.c rename to boards/arm/sam34/flipnclick-sam3x/src/sam_appinit.c diff --git a/boards/arm/flipnclick-sam3x/src/sam_autoleds.c b/boards/arm/sam34/flipnclick-sam3x/src/sam_autoleds.c similarity index 100% rename from boards/arm/flipnclick-sam3x/src/sam_autoleds.c rename to boards/arm/sam34/flipnclick-sam3x/src/sam_autoleds.c diff --git a/boards/arm/flipnclick-sam3x/src/sam_boot.c b/boards/arm/sam34/flipnclick-sam3x/src/sam_boot.c similarity index 100% rename from boards/arm/flipnclick-sam3x/src/sam_boot.c rename to boards/arm/sam34/flipnclick-sam3x/src/sam_boot.c diff --git a/boards/arm/flipnclick-sam3x/src/sam_bringup.c b/boards/arm/sam34/flipnclick-sam3x/src/sam_bringup.c similarity index 100% rename from boards/arm/flipnclick-sam3x/src/sam_bringup.c rename to boards/arm/sam34/flipnclick-sam3x/src/sam_bringup.c diff --git a/boards/arm/flipnclick-sam3x/src/sam_spi0.c b/boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c similarity index 100% rename from boards/arm/flipnclick-sam3x/src/sam_spi0.c rename to boards/arm/sam34/flipnclick-sam3x/src/sam_spi0.c diff --git a/boards/arm/flipnclick-sam3x/src/sam_ssd1306.c b/boards/arm/sam34/flipnclick-sam3x/src/sam_ssd1306.c similarity index 100% rename from boards/arm/flipnclick-sam3x/src/sam_ssd1306.c rename to boards/arm/sam34/flipnclick-sam3x/src/sam_ssd1306.c diff --git a/boards/arm/flipnclick-sam3x/src/sam_userleds.c b/boards/arm/sam34/flipnclick-sam3x/src/sam_userleds.c similarity index 100% rename from boards/arm/flipnclick-sam3x/src/sam_userleds.c rename to boards/arm/sam34/flipnclick-sam3x/src/sam_userleds.c diff --git a/boards/arm/sam3u-ek/Kconfig b/boards/arm/sam34/sam3u-ek/Kconfig similarity index 100% rename from boards/arm/sam3u-ek/Kconfig rename to boards/arm/sam34/sam3u-ek/Kconfig diff --git a/boards/arm/sam3u-ek/README.txt b/boards/arm/sam34/sam3u-ek/README.txt similarity index 100% rename from boards/arm/sam3u-ek/README.txt rename to boards/arm/sam34/sam3u-ek/README.txt diff --git a/boards/arm/sam3u-ek/configs/knsh/Make.defs b/boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs similarity index 92% rename from boards/arm/sam3u-ek/configs/knsh/Make.defs rename to boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs index ba15cea14a5..e0a1dfaf306 100644 --- a/boards/arm/sam3u-ek/configs/knsh/Make.defs +++ b/boards/arm/sam34/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)$(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}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(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 + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/sam3u-ek/configs/knsh/defconfig b/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig similarity index 98% rename from boards/arm/sam3u-ek/configs/knsh/defconfig rename to boards/arm/sam34/sam3u-ek/configs/knsh/defconfig index 4f5021bab76..3912cef6e2b 100644 --- a/boards/arm/sam3u-ek/configs/knsh/defconfig +++ b/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sam3u-ek" CONFIG_ARCH_BOARD_SAM3UEK=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP_ATSAM3U4E=y CONFIG_ARCH_CHIP_SAM34=y CONFIG_ARCH_CHIP_SAM3U=y diff --git a/boards/arm/sam3u-ek/configs/nsh/defconfig b/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig similarity index 98% rename from boards/arm/sam3u-ek/configs/nsh/defconfig rename to boards/arm/sam34/sam3u-ek/configs/nsh/defconfig index 0aca5df9fe6..805fab2c610 100644 --- a/boards/arm/sam3u-ek/configs/nsh/defconfig +++ b/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sam3u-ek" CONFIG_ARCH_BOARD_SAM3UEK=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP_ATSAM3U4E=y CONFIG_ARCH_CHIP_SAM34=y CONFIG_ARCH_CHIP_SAM3U=y diff --git a/boards/arm/sam3u-ek/configs/nx/defconfig b/boards/arm/sam34/sam3u-ek/configs/nx/defconfig similarity index 98% rename from boards/arm/sam3u-ek/configs/nx/defconfig rename to boards/arm/sam34/sam3u-ek/configs/nx/defconfig index 6db162e85d0..24354afa29d 100644 --- a/boards/arm/sam3u-ek/configs/nx/defconfig +++ b/boards/arm/sam34/sam3u-ek/configs/nx/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sam3u-ek" CONFIG_ARCH_BOARD_SAM3UEK=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP_ATSAM3U4E=y CONFIG_ARCH_CHIP_SAM34=y CONFIG_ARCH_CHIP_SAM3U=y diff --git a/boards/arm/sam3u-ek/configs/nxwm/defconfig b/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig similarity index 99% rename from boards/arm/sam3u-ek/configs/nxwm/defconfig rename to boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig index fac2374c036..096fe5d8a81 100644 --- a/boards/arm/sam3u-ek/configs/nxwm/defconfig +++ b/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig @@ -19,6 +19,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sam3u-ek" CONFIG_ARCH_BOARD_SAM3UEK=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP_ATSAM3U4E=y CONFIG_ARCH_CHIP_SAM34=y CONFIG_ARCH_CHIP_SAM3U=y diff --git a/boards/arm/sam3u-ek/include/board.h b/boards/arm/sam34/sam3u-ek/include/board.h similarity index 100% rename from boards/arm/sam3u-ek/include/board.h rename to boards/arm/sam34/sam3u-ek/include/board.h diff --git a/boards/arm/mikroe-stm32f4/kernel/.gitignore b/boards/arm/sam34/sam3u-ek/kernel/.gitignore similarity index 100% rename from boards/arm/mikroe-stm32f4/kernel/.gitignore rename to boards/arm/sam34/sam3u-ek/kernel/.gitignore diff --git a/boards/arm/sam3u-ek/kernel/Makefile b/boards/arm/sam34/sam3u-ek/kernel/Makefile similarity index 90% rename from boards/arm/sam3u-ek/kernel/Makefile rename to boards/arm/sam34/sam3u-ek/kernel/Makefile index 6b35f8cbe20..38a82190e44 100644 --- a/boards/arm/sam3u-ek/kernel/Makefile +++ b/boards/arm/sam34/sam3u-ek/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,13 +50,13 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld endif USER_LDFLAGS = --undefined=$(ENTRYPT) --entry=$(ENTRYPT) $(USER_LDSCRIPT) diff --git a/boards/arm/sam3u-ek/kernel/sam_userspace.c b/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c similarity index 100% rename from boards/arm/sam3u-ek/kernel/sam_userspace.c rename to boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c diff --git a/boards/arm/sam3u-ek/scripts/Make.defs b/boards/arm/sam34/sam3u-ek/scripts/Make.defs similarity index 96% rename from boards/arm/sam3u-ek/scripts/Make.defs rename to boards/arm/sam34/sam3u-ek/scripts/Make.defs index 811049d468e..da627b81828 100644 --- a/boards/arm/sam3u-ek/scripts/Make.defs +++ b/boards/arm/sam34/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/sam3u-ek/scripts/kernel-space.ld b/boards/arm/sam34/sam3u-ek/scripts/kernel-space.ld similarity index 100% rename from boards/arm/sam3u-ek/scripts/kernel-space.ld rename to boards/arm/sam34/sam3u-ek/scripts/kernel-space.ld diff --git a/boards/arm/sam3u-ek/scripts/ld.script b/boards/arm/sam34/sam3u-ek/scripts/ld.script similarity index 100% rename from boards/arm/sam3u-ek/scripts/ld.script rename to boards/arm/sam34/sam3u-ek/scripts/ld.script diff --git a/boards/arm/sam3u-ek/scripts/memory.ld b/boards/arm/sam34/sam3u-ek/scripts/memory.ld similarity index 100% rename from boards/arm/sam3u-ek/scripts/memory.ld rename to boards/arm/sam34/sam3u-ek/scripts/memory.ld diff --git a/boards/arm/sam3u-ek/scripts/user-space.ld b/boards/arm/sam34/sam3u-ek/scripts/user-space.ld similarity index 100% rename from boards/arm/sam3u-ek/scripts/user-space.ld rename to boards/arm/sam34/sam3u-ek/scripts/user-space.ld diff --git a/boards/arm/ntosd-dm320/src/.gitignore b/boards/arm/sam34/sam3u-ek/src/.gitignore similarity index 100% rename from boards/arm/ntosd-dm320/src/.gitignore rename to boards/arm/sam34/sam3u-ek/src/.gitignore diff --git a/boards/arm/sam3u-ek/src/Makefile b/boards/arm/sam34/sam3u-ek/src/Makefile similarity index 100% rename from boards/arm/sam3u-ek/src/Makefile rename to boards/arm/sam34/sam3u-ek/src/Makefile diff --git a/boards/arm/sam3u-ek/src/sam3u-ek.h b/boards/arm/sam34/sam3u-ek/src/sam3u-ek.h similarity index 100% rename from boards/arm/sam3u-ek/src/sam3u-ek.h rename to boards/arm/sam34/sam3u-ek/src/sam3u-ek.h diff --git a/boards/arm/sam3u-ek/src/sam_appinit.c b/boards/arm/sam34/sam3u-ek/src/sam_appinit.c similarity index 100% rename from boards/arm/sam3u-ek/src/sam_appinit.c rename to boards/arm/sam34/sam3u-ek/src/sam_appinit.c diff --git a/boards/arm/sam3u-ek/src/sam_boot.c b/boards/arm/sam34/sam3u-ek/src/sam_boot.c similarity index 100% rename from boards/arm/sam3u-ek/src/sam_boot.c rename to boards/arm/sam34/sam3u-ek/src/sam_boot.c diff --git a/boards/arm/sam3u-ek/src/sam_buttons.c b/boards/arm/sam34/sam3u-ek/src/sam_buttons.c similarity index 100% rename from boards/arm/sam3u-ek/src/sam_buttons.c rename to boards/arm/sam34/sam3u-ek/src/sam_buttons.c diff --git a/boards/arm/sam3u-ek/src/sam_lcd.c b/boards/arm/sam34/sam3u-ek/src/sam_lcd.c similarity index 100% rename from boards/arm/sam3u-ek/src/sam_lcd.c rename to boards/arm/sam34/sam3u-ek/src/sam_lcd.c diff --git a/boards/arm/sam3u-ek/src/sam_leds.c b/boards/arm/sam34/sam3u-ek/src/sam_leds.c similarity index 100% rename from boards/arm/sam3u-ek/src/sam_leds.c rename to boards/arm/sam34/sam3u-ek/src/sam_leds.c diff --git a/boards/arm/sam3u-ek/src/sam_mmcsd.c b/boards/arm/sam34/sam3u-ek/src/sam_mmcsd.c similarity index 100% rename from boards/arm/sam3u-ek/src/sam_mmcsd.c rename to boards/arm/sam34/sam3u-ek/src/sam_mmcsd.c diff --git a/boards/arm/sam3u-ek/src/sam_spi.c b/boards/arm/sam34/sam3u-ek/src/sam_spi.c similarity index 100% rename from boards/arm/sam3u-ek/src/sam_spi.c rename to boards/arm/sam34/sam3u-ek/src/sam_spi.c diff --git a/boards/arm/sam3u-ek/src/sam_touchscreen.c b/boards/arm/sam34/sam3u-ek/src/sam_touchscreen.c similarity index 100% rename from boards/arm/sam3u-ek/src/sam_touchscreen.c rename to boards/arm/sam34/sam3u-ek/src/sam_touchscreen.c diff --git a/boards/arm/sam3u-ek/src/sam_usbdev.c b/boards/arm/sam34/sam3u-ek/src/sam_usbdev.c similarity index 100% rename from boards/arm/sam3u-ek/src/sam_usbdev.c rename to boards/arm/sam34/sam3u-ek/src/sam_usbdev.c diff --git a/boards/arm/sam3u-ek/src/sam_usbmsc.c b/boards/arm/sam34/sam3u-ek/src/sam_usbmsc.c similarity index 100% rename from boards/arm/sam3u-ek/src/sam_usbmsc.c rename to boards/arm/sam34/sam3u-ek/src/sam_usbmsc.c diff --git a/boards/arm/sam4cmp-db/Kconfig b/boards/arm/sam34/sam4cmp-db/Kconfig similarity index 100% rename from boards/arm/sam4cmp-db/Kconfig rename to boards/arm/sam34/sam4cmp-db/Kconfig diff --git a/boards/arm/sam4cmp-db/README.txt b/boards/arm/sam34/sam4cmp-db/README.txt similarity index 100% rename from boards/arm/sam4cmp-db/README.txt rename to boards/arm/sam34/sam4cmp-db/README.txt diff --git a/boards/arm/sam4cmp-db/configs/nsh/defconfig b/boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig similarity index 98% rename from boards/arm/sam4cmp-db/configs/nsh/defconfig rename to boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig index 20874ec873a..b7d133518c3 100644 --- a/boards/arm/sam4cmp-db/configs/nsh/defconfig +++ b/boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sam4cmp-db" CONFIG_ARCH_BOARD_SAM4CMP_DB=y +CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP_ATSAM4CMP16B=y CONFIG_ARCH_CHIP_SAM34=y CONFIG_ARCH_CHIP_SAM4CM=y diff --git a/boards/arm/sam4cmp-db/include/board.h b/boards/arm/sam34/sam4cmp-db/include/board.h similarity index 100% rename from boards/arm/sam4cmp-db/include/board.h rename to boards/arm/sam34/sam4cmp-db/include/board.h diff --git a/boards/arm/sam4cmp-db/scripts/Make.defs b/boards/arm/sam34/sam4cmp-db/scripts/Make.defs similarity index 95% rename from boards/arm/sam4cmp-db/scripts/Make.defs rename to boards/arm/sam34/sam4cmp-db/scripts/Make.defs index 7587501c4d5..a2d83940363 100644 --- a/boards/arm/sam4cmp-db/scripts/Make.defs +++ b/boards/arm/sam34/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)/$(CONFIG_ARCH_BOARD)/scripts/sam4cmp-db.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/sam4cmp-db.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/sam4cmp-db.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/sam4cmp-db/scripts/sam4cmp-db.ld b/boards/arm/sam34/sam4cmp-db/scripts/sam4cmp-db.ld similarity index 100% rename from boards/arm/sam4cmp-db/scripts/sam4cmp-db.ld rename to boards/arm/sam34/sam4cmp-db/scripts/sam4cmp-db.ld diff --git a/boards/arm/sam4cmp-db/src/Makefile b/boards/arm/sam34/sam4cmp-db/src/Makefile similarity index 100% rename from boards/arm/sam4cmp-db/src/Makefile rename to boards/arm/sam34/sam4cmp-db/src/Makefile diff --git a/boards/arm/sam4cmp-db/src/sam4cmp-db.h b/boards/arm/sam34/sam4cmp-db/src/sam4cmp-db.h similarity index 100% rename from boards/arm/sam4cmp-db/src/sam4cmp-db.h rename to boards/arm/sam34/sam4cmp-db/src/sam4cmp-db.h diff --git a/boards/arm/sam4cmp-db/src/sam_appinit.c b/boards/arm/sam34/sam4cmp-db/src/sam_appinit.c similarity index 100% rename from boards/arm/sam4cmp-db/src/sam_appinit.c rename to boards/arm/sam34/sam4cmp-db/src/sam_appinit.c diff --git a/boards/arm/sam4cmp-db/src/sam_boot.c b/boards/arm/sam34/sam4cmp-db/src/sam_boot.c similarity index 100% rename from boards/arm/sam4cmp-db/src/sam_boot.c rename to boards/arm/sam34/sam4cmp-db/src/sam_boot.c diff --git a/boards/arm/sam4cmp-db/src/sam_bringup.c b/boards/arm/sam34/sam4cmp-db/src/sam_bringup.c similarity index 100% rename from boards/arm/sam4cmp-db/src/sam_bringup.c rename to boards/arm/sam34/sam4cmp-db/src/sam_bringup.c diff --git a/boards/arm/sam4e-ek/Kconfig b/boards/arm/sam34/sam4e-ek/Kconfig similarity index 100% rename from boards/arm/sam4e-ek/Kconfig rename to boards/arm/sam34/sam4e-ek/Kconfig diff --git a/boards/arm/sam4e-ek/README.txt b/boards/arm/sam34/sam4e-ek/README.txt similarity index 100% rename from boards/arm/sam4e-ek/README.txt rename to boards/arm/sam34/sam4e-ek/README.txt diff --git a/boards/arm/sam4e-ek/configs/nsh/defconfig b/boards/arm/sam34/sam4e-ek/configs/nsh/defconfig similarity index 98% rename from boards/arm/sam4e-ek/configs/nsh/defconfig rename to boards/arm/sam34/sam4e-ek/configs/nsh/defconfig index 2cc209ec9b0..318acd4a8bb 100644 --- a/boards/arm/sam4e-ek/configs/nsh/defconfig +++ b/boards/arm/sam34/sam4e-ek/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sam4e-ek" CONFIG_ARCH_BOARD_SAM4EEK=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP_ATSAM4E16E=y CONFIG_ARCH_CHIP_SAM34=y CONFIG_ARCH_CHIP_SAM4E=y diff --git a/boards/arm/sam4e-ek/configs/nxwm/defconfig b/boards/arm/sam34/sam4e-ek/configs/nxwm/defconfig similarity index 99% rename from boards/arm/sam4e-ek/configs/nxwm/defconfig rename to boards/arm/sam34/sam4e-ek/configs/nxwm/defconfig index 72d96e26580..086ed4296bd 100644 --- a/boards/arm/sam4e-ek/configs/nxwm/defconfig +++ b/boards/arm/sam34/sam4e-ek/configs/nxwm/defconfig @@ -18,6 +18,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sam4e-ek" CONFIG_ARCH_BOARD_SAM4EEK=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP_ATSAM4E16E=y CONFIG_ARCH_CHIP_SAM34=y CONFIG_ARCH_CHIP_SAM4E=y diff --git a/boards/arm/sam4e-ek/configs/usbnsh/defconfig b/boards/arm/sam34/sam4e-ek/configs/usbnsh/defconfig similarity index 99% rename from boards/arm/sam4e-ek/configs/usbnsh/defconfig rename to boards/arm/sam34/sam4e-ek/configs/usbnsh/defconfig index dde99cd5fd9..15538b497e3 100644 --- a/boards/arm/sam4e-ek/configs/usbnsh/defconfig +++ b/boards/arm/sam34/sam4e-ek/configs/usbnsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sam4e-ek" CONFIG_ARCH_BOARD_SAM4EEK=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP_ATSAM4E16E=y CONFIG_ARCH_CHIP_SAM34=y CONFIG_ARCH_CHIP_SAM4E=y diff --git a/boards/arm/sam4e-ek/include/board.h b/boards/arm/sam34/sam4e-ek/include/board.h similarity index 100% rename from boards/arm/sam4e-ek/include/board.h rename to boards/arm/sam34/sam4e-ek/include/board.h diff --git a/boards/arm/sam4e-ek/scripts/Make.defs b/boards/arm/sam34/sam4e-ek/scripts/Make.defs similarity index 96% rename from boards/arm/sam4e-ek/scripts/Make.defs rename to boards/arm/sam34/sam4e-ek/scripts/Make.defs index 7b041bda5e9..ac445678d94 100644 --- a/boards/arm/sam4e-ek/scripts/Make.defs +++ b/boards/arm/sam34/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)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/flash.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/sam4e-ek/scripts/flash.ld b/boards/arm/sam34/sam4e-ek/scripts/flash.ld similarity index 100% rename from boards/arm/sam4e-ek/scripts/flash.ld rename to boards/arm/sam34/sam4e-ek/scripts/flash.ld diff --git a/boards/arm/nucleo-144/src/.gitignore b/boards/arm/sam34/sam4e-ek/src/.gitignore similarity index 100% rename from boards/arm/nucleo-144/src/.gitignore rename to boards/arm/sam34/sam4e-ek/src/.gitignore diff --git a/boards/arm/sam4e-ek/src/Makefile b/boards/arm/sam34/sam4e-ek/src/Makefile similarity index 100% rename from boards/arm/sam4e-ek/src/Makefile rename to boards/arm/sam34/sam4e-ek/src/Makefile diff --git a/boards/arm/sam4e-ek/src/sam4e-ek.h b/boards/arm/sam34/sam4e-ek/src/sam4e-ek.h similarity index 100% rename from boards/arm/sam4e-ek/src/sam4e-ek.h rename to boards/arm/sam34/sam4e-ek/src/sam4e-ek.h diff --git a/boards/arm/sam4e-ek/src/sam_ads7843e.c b/boards/arm/sam34/sam4e-ek/src/sam_ads7843e.c similarity index 100% rename from boards/arm/sam4e-ek/src/sam_ads7843e.c rename to boards/arm/sam34/sam4e-ek/src/sam_ads7843e.c diff --git a/boards/arm/sam4e-ek/src/sam_appinit.c b/boards/arm/sam34/sam4e-ek/src/sam_appinit.c similarity index 100% rename from boards/arm/sam4e-ek/src/sam_appinit.c rename to boards/arm/sam34/sam4e-ek/src/sam_appinit.c diff --git a/boards/arm/sam4e-ek/src/sam_at25.c b/boards/arm/sam34/sam4e-ek/src/sam_at25.c similarity index 100% rename from boards/arm/sam4e-ek/src/sam_at25.c rename to boards/arm/sam34/sam4e-ek/src/sam_at25.c diff --git a/boards/arm/sam4e-ek/src/sam_boot.c b/boards/arm/sam34/sam4e-ek/src/sam_boot.c similarity index 100% rename from boards/arm/sam4e-ek/src/sam_boot.c rename to boards/arm/sam34/sam4e-ek/src/sam_boot.c diff --git a/boards/arm/sam4e-ek/src/sam_buttons.c b/boards/arm/sam34/sam4e-ek/src/sam_buttons.c similarity index 100% rename from boards/arm/sam4e-ek/src/sam_buttons.c rename to boards/arm/sam34/sam4e-ek/src/sam_buttons.c diff --git a/boards/arm/sam4e-ek/src/sam_ethernet.c b/boards/arm/sam34/sam4e-ek/src/sam_ethernet.c similarity index 100% rename from boards/arm/sam4e-ek/src/sam_ethernet.c rename to boards/arm/sam34/sam4e-ek/src/sam_ethernet.c diff --git a/boards/arm/sam4e-ek/src/sam_hsmci.c b/boards/arm/sam34/sam4e-ek/src/sam_hsmci.c similarity index 100% rename from boards/arm/sam4e-ek/src/sam_hsmci.c rename to boards/arm/sam34/sam4e-ek/src/sam_hsmci.c diff --git a/boards/arm/sam4e-ek/src/sam_ili9325.c b/boards/arm/sam34/sam4e-ek/src/sam_ili9325.c similarity index 100% rename from boards/arm/sam4e-ek/src/sam_ili9325.c rename to boards/arm/sam34/sam4e-ek/src/sam_ili9325.c diff --git a/boards/arm/sam4e-ek/src/sam_ili9341.c b/boards/arm/sam34/sam4e-ek/src/sam_ili9341.c similarity index 100% rename from boards/arm/sam4e-ek/src/sam_ili9341.c rename to boards/arm/sam34/sam4e-ek/src/sam_ili9341.c diff --git a/boards/arm/sam4e-ek/src/sam_leds.c b/boards/arm/sam34/sam4e-ek/src/sam_leds.c similarity index 100% rename from boards/arm/sam4e-ek/src/sam_leds.c rename to boards/arm/sam34/sam4e-ek/src/sam_leds.c diff --git a/boards/arm/sam4e-ek/src/sam_spi.c b/boards/arm/sam34/sam4e-ek/src/sam_spi.c similarity index 100% rename from boards/arm/sam4e-ek/src/sam_spi.c rename to boards/arm/sam34/sam4e-ek/src/sam_spi.c diff --git a/boards/arm/sam4e-ek/src/sam_udp.c b/boards/arm/sam34/sam4e-ek/src/sam_udp.c similarity index 100% rename from boards/arm/sam4e-ek/src/sam_udp.c rename to boards/arm/sam34/sam4e-ek/src/sam_udp.c diff --git a/boards/arm/sam4e-ek/src/sam_usbmsc.c b/boards/arm/sam34/sam4e-ek/src/sam_usbmsc.c similarity index 100% rename from boards/arm/sam4e-ek/src/sam_usbmsc.c rename to boards/arm/sam34/sam4e-ek/src/sam_usbmsc.c diff --git a/boards/arm/sam4e-ek/tools/gdb.ini b/boards/arm/sam34/sam4e-ek/tools/gdb.ini similarity index 100% rename from boards/arm/sam4e-ek/tools/gdb.ini rename to boards/arm/sam34/sam4e-ek/tools/gdb.ini diff --git a/boards/arm/sam4e-ek/tools/openocd.cfg b/boards/arm/sam34/sam4e-ek/tools/openocd.cfg similarity index 100% rename from boards/arm/sam4e-ek/tools/openocd.cfg rename to boards/arm/sam34/sam4e-ek/tools/openocd.cfg diff --git a/boards/arm/sam4l-xplained/Kconfig b/boards/arm/sam34/sam4l-xplained/Kconfig similarity index 100% rename from boards/arm/sam4l-xplained/Kconfig rename to boards/arm/sam34/sam4l-xplained/Kconfig diff --git a/boards/arm/sam4l-xplained/README.txt b/boards/arm/sam34/sam4l-xplained/README.txt similarity index 100% rename from boards/arm/sam4l-xplained/README.txt rename to boards/arm/sam34/sam4l-xplained/README.txt diff --git a/boards/arm/sam4l-xplained/configs/nsh/defconfig b/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig similarity index 98% rename from boards/arm/sam4l-xplained/configs/nsh/defconfig rename to boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig index 7ffd107d11d..4ae135083ec 100644 --- a/boards/arm/sam4l-xplained/configs/nsh/defconfig +++ b/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sam4l-xplained" CONFIG_ARCH_BOARD_SAM4L_XPLAINED=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP_ATSAM4LC4C=y CONFIG_ARCH_CHIP_SAM34=y CONFIG_ARCH_CHIP_SAM4L=y diff --git a/boards/arm/sam4l-xplained/include/board.h b/boards/arm/sam34/sam4l-xplained/include/board.h similarity index 100% rename from boards/arm/sam4l-xplained/include/board.h rename to boards/arm/sam34/sam4l-xplained/include/board.h diff --git a/boards/arm/sam4l-xplained/scripts/Make.defs b/boards/arm/sam34/sam4l-xplained/scripts/Make.defs similarity index 95% rename from boards/arm/sam4l-xplained/scripts/Make.defs rename to boards/arm/sam34/sam4l-xplained/scripts/Make.defs index 326db05c56a..1c4c0800ca0 100644 --- a/boards/arm/sam4l-xplained/scripts/Make.defs +++ b/boards/arm/sam34/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)/$(CONFIG_ARCH_BOARD)/scripts/sam4l-xplained.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/sam4l-xplained.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/sam4l-xplained.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/sam4l-xplained/scripts/sam4l-xplained.ld b/boards/arm/sam34/sam4l-xplained/scripts/sam4l-xplained.ld similarity index 100% rename from boards/arm/sam4l-xplained/scripts/sam4l-xplained.ld rename to boards/arm/sam34/sam4l-xplained/scripts/sam4l-xplained.ld diff --git a/boards/arm/nucleo-f072rb/src/.gitignore b/boards/arm/sam34/sam4l-xplained/src/.gitignore similarity index 100% rename from boards/arm/nucleo-f072rb/src/.gitignore rename to boards/arm/sam34/sam4l-xplained/src/.gitignore diff --git a/boards/arm/sam4l-xplained/src/Makefile b/boards/arm/sam34/sam4l-xplained/src/Makefile similarity index 100% rename from boards/arm/sam4l-xplained/src/Makefile rename to boards/arm/sam34/sam4l-xplained/src/Makefile diff --git a/boards/arm/sam4l-xplained/src/sam4l-xplained.h b/boards/arm/sam34/sam4l-xplained/src/sam4l-xplained.h similarity index 100% rename from boards/arm/sam4l-xplained/src/sam4l-xplained.h rename to boards/arm/sam34/sam4l-xplained/src/sam4l-xplained.h diff --git a/boards/arm/sam4l-xplained/src/sam_appinit.c b/boards/arm/sam34/sam4l-xplained/src/sam_appinit.c similarity index 100% rename from boards/arm/sam4l-xplained/src/sam_appinit.c rename to boards/arm/sam34/sam4l-xplained/src/sam_appinit.c diff --git a/boards/arm/sam4l-xplained/src/sam_autoleds.c b/boards/arm/sam34/sam4l-xplained/src/sam_autoleds.c similarity index 100% rename from boards/arm/sam4l-xplained/src/sam_autoleds.c rename to boards/arm/sam34/sam4l-xplained/src/sam_autoleds.c diff --git a/boards/arm/sam4l-xplained/src/sam_boot.c b/boards/arm/sam34/sam4l-xplained/src/sam_boot.c similarity index 100% rename from boards/arm/sam4l-xplained/src/sam_boot.c rename to boards/arm/sam34/sam4l-xplained/src/sam_boot.c diff --git a/boards/arm/sam4l-xplained/src/sam_buttons.c b/boards/arm/sam34/sam4l-xplained/src/sam_buttons.c similarity index 100% rename from boards/arm/sam4l-xplained/src/sam_buttons.c rename to boards/arm/sam34/sam4l-xplained/src/sam_buttons.c diff --git a/boards/arm/sam4l-xplained/src/sam_mmcsd.c b/boards/arm/sam34/sam4l-xplained/src/sam_mmcsd.c similarity index 100% rename from boards/arm/sam4l-xplained/src/sam_mmcsd.c rename to boards/arm/sam34/sam4l-xplained/src/sam_mmcsd.c diff --git a/boards/arm/sam4l-xplained/src/sam_slcd.c b/boards/arm/sam34/sam4l-xplained/src/sam_slcd.c similarity index 100% rename from boards/arm/sam4l-xplained/src/sam_slcd.c rename to boards/arm/sam34/sam4l-xplained/src/sam_slcd.c diff --git a/boards/arm/sam4l-xplained/src/sam_spi.c b/boards/arm/sam34/sam4l-xplained/src/sam_spi.c similarity index 100% rename from boards/arm/sam4l-xplained/src/sam_spi.c rename to boards/arm/sam34/sam4l-xplained/src/sam_spi.c diff --git a/boards/arm/sam4l-xplained/src/sam_ug2832hsweg04.c b/boards/arm/sam34/sam4l-xplained/src/sam_ug2832hsweg04.c similarity index 100% rename from boards/arm/sam4l-xplained/src/sam_ug2832hsweg04.c rename to boards/arm/sam34/sam4l-xplained/src/sam_ug2832hsweg04.c diff --git a/boards/arm/sam4l-xplained/src/sam_userleds.c b/boards/arm/sam34/sam4l-xplained/src/sam_userleds.c similarity index 100% rename from boards/arm/sam4l-xplained/src/sam_userleds.c rename to boards/arm/sam34/sam4l-xplained/src/sam_userleds.c diff --git a/boards/arm/sam4s-xplained-pro/Kconfig b/boards/arm/sam34/sam4s-xplained-pro/Kconfig similarity index 100% rename from boards/arm/sam4s-xplained-pro/Kconfig rename to boards/arm/sam34/sam4s-xplained-pro/Kconfig diff --git a/boards/arm/sam4s-xplained-pro/README.txt b/boards/arm/sam34/sam4s-xplained-pro/README.txt similarity index 100% rename from boards/arm/sam4s-xplained-pro/README.txt rename to boards/arm/sam34/sam4s-xplained-pro/README.txt diff --git a/boards/arm/sam4s-xplained-pro/configs/nsh/defconfig b/boards/arm/sam34/sam4s-xplained-pro/configs/nsh/defconfig similarity index 99% rename from boards/arm/sam4s-xplained-pro/configs/nsh/defconfig rename to boards/arm/sam34/sam4s-xplained-pro/configs/nsh/defconfig index 12003e48e55..f28f4acbe70 100644 --- a/boards/arm/sam4s-xplained-pro/configs/nsh/defconfig +++ b/boards/arm/sam34/sam4s-xplained-pro/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sam4s-xplained-pro" CONFIG_ARCH_BOARD_SAM4S_XPLAINED_PRO=y +CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP_ATSAM4SD32C=y CONFIG_ARCH_CHIP_SAM34=y CONFIG_ARCH_CHIP_SAM4S=y diff --git a/boards/arm/sam4s-xplained-pro/include/board.h b/boards/arm/sam34/sam4s-xplained-pro/include/board.h similarity index 100% rename from boards/arm/sam4s-xplained-pro/include/board.h rename to boards/arm/sam34/sam4s-xplained-pro/include/board.h diff --git a/boards/arm/sam4s-xplained-pro/scripts/Make.defs b/boards/arm/sam34/sam4s-xplained-pro/scripts/Make.defs similarity index 95% rename from boards/arm/sam4s-xplained-pro/scripts/Make.defs rename to boards/arm/sam34/sam4s-xplained-pro/scripts/Make.defs index 9908c5a2f17..bab1de099e2 100644 --- a/boards/arm/sam4s-xplained-pro/scripts/Make.defs +++ b/boards/arm/sam34/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)/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained-pro.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained-pro.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained-pro.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/sam4s-xplained-pro/scripts/sam4s-xplained-pro.ld b/boards/arm/sam34/sam4s-xplained-pro/scripts/sam4s-xplained-pro.ld similarity index 100% rename from boards/arm/sam4s-xplained-pro/scripts/sam4s-xplained-pro.ld rename to boards/arm/sam34/sam4s-xplained-pro/scripts/sam4s-xplained-pro.ld diff --git a/boards/arm/sam4s-xplained-pro/src/Makefile b/boards/arm/sam34/sam4s-xplained-pro/src/Makefile similarity index 100% rename from boards/arm/sam4s-xplained-pro/src/Makefile rename to boards/arm/sam34/sam4s-xplained-pro/src/Makefile diff --git a/boards/arm/sam4s-xplained-pro/src/sam4s-xplained-pro.h b/boards/arm/sam34/sam4s-xplained-pro/src/sam4s-xplained-pro.h similarity index 100% rename from boards/arm/sam4s-xplained-pro/src/sam4s-xplained-pro.h rename to boards/arm/sam34/sam4s-xplained-pro/src/sam4s-xplained-pro.h diff --git a/boards/arm/sam4s-xplained-pro/src/sam_appinit.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_appinit.c similarity index 100% rename from boards/arm/sam4s-xplained-pro/src/sam_appinit.c rename to boards/arm/sam34/sam4s-xplained-pro/src/sam_appinit.c diff --git a/boards/arm/sam4s-xplained-pro/src/sam_autoleds.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_autoleds.c similarity index 100% rename from boards/arm/sam4s-xplained-pro/src/sam_autoleds.c rename to boards/arm/sam34/sam4s-xplained-pro/src/sam_autoleds.c diff --git a/boards/arm/sam4s-xplained-pro/src/sam_boot.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_boot.c similarity index 100% rename from boards/arm/sam4s-xplained-pro/src/sam_boot.c rename to boards/arm/sam34/sam4s-xplained-pro/src/sam_boot.c diff --git a/boards/arm/sam4s-xplained-pro/src/sam_buttons.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_buttons.c similarity index 100% rename from boards/arm/sam4s-xplained-pro/src/sam_buttons.c rename to boards/arm/sam34/sam4s-xplained-pro/src/sam_buttons.c diff --git a/boards/arm/sam4s-xplained-pro/src/sam_hsmci.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_hsmci.c similarity index 100% rename from boards/arm/sam4s-xplained-pro/src/sam_hsmci.c rename to boards/arm/sam34/sam4s-xplained-pro/src/sam_hsmci.c diff --git a/boards/arm/sam4s-xplained-pro/src/sam_udp.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_udp.c similarity index 100% rename from boards/arm/sam4s-xplained-pro/src/sam_udp.c rename to boards/arm/sam34/sam4s-xplained-pro/src/sam_udp.c diff --git a/boards/arm/sam4s-xplained-pro/src/sam_userleds.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_userleds.c similarity index 100% rename from boards/arm/sam4s-xplained-pro/src/sam_userleds.c rename to boards/arm/sam34/sam4s-xplained-pro/src/sam_userleds.c diff --git a/boards/arm/sam4s-xplained-pro/src/sam_wdt.c b/boards/arm/sam34/sam4s-xplained-pro/src/sam_wdt.c similarity index 100% rename from boards/arm/sam4s-xplained-pro/src/sam_wdt.c rename to boards/arm/sam34/sam4s-xplained-pro/src/sam_wdt.c diff --git a/boards/arm/sam4s-xplained/Kconfig b/boards/arm/sam34/sam4s-xplained/Kconfig similarity index 100% rename from boards/arm/sam4s-xplained/Kconfig rename to boards/arm/sam34/sam4s-xplained/Kconfig diff --git a/boards/arm/sam4s-xplained/README.txt b/boards/arm/sam34/sam4s-xplained/README.txt similarity index 100% rename from boards/arm/sam4s-xplained/README.txt rename to boards/arm/sam34/sam4s-xplained/README.txt diff --git a/boards/arm/sam4s-xplained/configs/nsh/defconfig b/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig similarity index 98% rename from boards/arm/sam4s-xplained/configs/nsh/defconfig rename to boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig index 00ac86c634d..4cebef0ce1f 100644 --- a/boards/arm/sam4s-xplained/configs/nsh/defconfig +++ b/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sam4s-xplained" CONFIG_ARCH_BOARD_SAM4S_XPLAINED=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP_ATSAM4S16C=y CONFIG_ARCH_CHIP_SAM34=y CONFIG_ARCH_CHIP_SAM4S=y diff --git a/boards/arm/sam4s-xplained/include/board.h b/boards/arm/sam34/sam4s-xplained/include/board.h similarity index 100% rename from boards/arm/sam4s-xplained/include/board.h rename to boards/arm/sam34/sam4s-xplained/include/board.h diff --git a/boards/arm/sam4s-xplained/scripts/Make.defs b/boards/arm/sam34/sam4s-xplained/scripts/Make.defs similarity index 95% rename from boards/arm/sam4s-xplained/scripts/Make.defs rename to boards/arm/sam34/sam4s-xplained/scripts/Make.defs index db3b9944270..b8c0faf17f2 100644 --- a/boards/arm/sam4s-xplained/scripts/Make.defs +++ b/boards/arm/sam34/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)/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/sam4s-xplained.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/sam4s-xplained/scripts/sam4s-xplained.ld b/boards/arm/sam34/sam4s-xplained/scripts/sam4s-xplained.ld similarity index 100% rename from boards/arm/sam4s-xplained/scripts/sam4s-xplained.ld rename to boards/arm/sam34/sam4s-xplained/scripts/sam4s-xplained.ld diff --git a/boards/arm/sam4s-xplained/src/Makefile b/boards/arm/sam34/sam4s-xplained/src/Makefile similarity index 100% rename from boards/arm/sam4s-xplained/src/Makefile rename to boards/arm/sam34/sam4s-xplained/src/Makefile diff --git a/boards/arm/sam4s-xplained/src/sam4s-xplained.h b/boards/arm/sam34/sam4s-xplained/src/sam4s-xplained.h similarity index 100% rename from boards/arm/sam4s-xplained/src/sam4s-xplained.h rename to boards/arm/sam34/sam4s-xplained/src/sam4s-xplained.h diff --git a/boards/arm/sam4s-xplained/src/sam_autoleds.c b/boards/arm/sam34/sam4s-xplained/src/sam_autoleds.c similarity index 100% rename from boards/arm/sam4s-xplained/src/sam_autoleds.c rename to boards/arm/sam34/sam4s-xplained/src/sam_autoleds.c diff --git a/boards/arm/sam4s-xplained/src/sam_boot.c b/boards/arm/sam34/sam4s-xplained/src/sam_boot.c similarity index 100% rename from boards/arm/sam4s-xplained/src/sam_boot.c rename to boards/arm/sam34/sam4s-xplained/src/sam_boot.c diff --git a/boards/arm/sam4s-xplained/src/sam_buttons.c b/boards/arm/sam34/sam4s-xplained/src/sam_buttons.c similarity index 100% rename from boards/arm/sam4s-xplained/src/sam_buttons.c rename to boards/arm/sam34/sam4s-xplained/src/sam_buttons.c diff --git a/boards/arm/sam4s-xplained/src/sam_sram.c b/boards/arm/sam34/sam4s-xplained/src/sam_sram.c similarity index 100% rename from boards/arm/sam4s-xplained/src/sam_sram.c rename to boards/arm/sam34/sam4s-xplained/src/sam_sram.c diff --git a/boards/arm/sam4s-xplained/src/sam_userleds.c b/boards/arm/sam34/sam4s-xplained/src/sam_userleds.c similarity index 100% rename from boards/arm/sam4s-xplained/src/sam_userleds.c rename to boards/arm/sam34/sam4s-xplained/src/sam_userleds.c diff --git a/boards/arm/sama5d2-xult/Kconfig b/boards/arm/sama5/sama5d2-xult/Kconfig similarity index 100% rename from boards/arm/sama5d2-xult/Kconfig rename to boards/arm/sama5/sama5d2-xult/Kconfig diff --git a/boards/arm/sama5d2-xult/README.txt b/boards/arm/sama5/sama5d2-xult/README.txt similarity index 100% rename from boards/arm/sama5d2-xult/README.txt rename to boards/arm/sama5/sama5d2-xult/README.txt diff --git a/boards/arm/sama5d2-xult/configs/nsh/defconfig b/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig similarity index 98% rename from boards/arm/sama5d2-xult/configs/nsh/defconfig rename to boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig index 71e0e66627d..f78ff3382e5 100644 --- a/boards/arm/sama5d2-xult/configs/nsh/defconfig +++ b/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d2-xult" CONFIG_ARCH_BOARD_SAMA5D2_XULT=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D27=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D2=y diff --git a/boards/arm/sama5d2-xult/include/.gitignore b/boards/arm/sama5/sama5d2-xult/include/.gitignore similarity index 100% rename from boards/arm/sama5d2-xult/include/.gitignore rename to boards/arm/sama5/sama5d2-xult/include/.gitignore diff --git a/boards/arm/sama5d2-xult/include/board.h b/boards/arm/sama5/sama5d2-xult/include/board.h similarity index 100% rename from boards/arm/sama5d2-xult/include/board.h rename to boards/arm/sama5/sama5d2-xult/include/board.h diff --git a/boards/arm/sama5d2-xult/include/board_384mhz.h b/boards/arm/sama5/sama5d2-xult/include/board_384mhz.h similarity index 100% rename from boards/arm/sama5d2-xult/include/board_384mhz.h rename to boards/arm/sama5/sama5d2-xult/include/board_384mhz.h diff --git a/boards/arm/sama5d2-xult/include/board_396mhz.h b/boards/arm/sama5/sama5d2-xult/include/board_396mhz.h similarity index 100% rename from boards/arm/sama5d2-xult/include/board_396mhz.h rename to boards/arm/sama5/sama5d2-xult/include/board_396mhz.h diff --git a/boards/arm/sama5d2-xult/include/board_528mhz.h b/boards/arm/sama5/sama5d2-xult/include/board_528mhz.h similarity index 100% rename from boards/arm/sama5d2-xult/include/board_528mhz.h rename to boards/arm/sama5/sama5d2-xult/include/board_528mhz.h diff --git a/boards/arm/sama5d2-xult/include/board_memorymap.h b/boards/arm/sama5/sama5d2-xult/include/board_memorymap.h similarity index 100% rename from boards/arm/sama5d2-xult/include/board_memorymap.h rename to boards/arm/sama5/sama5d2-xult/include/board_memorymap.h diff --git a/boards/arm/sama5d2-xult/include/board_sdram.h b/boards/arm/sama5/sama5d2-xult/include/board_sdram.h similarity index 100% rename from boards/arm/sama5d2-xult/include/board_sdram.h rename to boards/arm/sama5/sama5d2-xult/include/board_sdram.h diff --git a/boards/arm/sama5d2-xult/scripts/Make.defs b/boards/arm/sama5/sama5d2-xult/scripts/Make.defs similarity index 94% rename from boards/arm/sama5d2-xult/scripts/Make.defs rename to boards/arm/sama5/sama5d2-xult/scripts/Make.defs index 0388598debc..0b79eb063f9 100644 --- a/boards/arm/sama5d2-xult/scripts/Make.defs +++ b/boards/arm/sama5/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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/arm/sama5d2-xult/scripts/dramboot.ld b/boards/arm/sama5/sama5d2-xult/scripts/dramboot.ld similarity index 100% rename from boards/arm/sama5d2-xult/scripts/dramboot.ld rename to boards/arm/sama5/sama5d2-xult/scripts/dramboot.ld diff --git a/boards/arm/sama5d2-xult/scripts/gnu-elf.ld b/boards/arm/sama5/sama5d2-xult/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/sama5d2-xult/scripts/gnu-elf.ld rename to boards/arm/sama5/sama5d2-xult/scripts/gnu-elf.ld diff --git a/boards/arm/sama5d2-xult/scripts/isram.ld b/boards/arm/sama5/sama5d2-xult/scripts/isram.ld similarity index 100% rename from boards/arm/sama5d2-xult/scripts/isram.ld rename to boards/arm/sama5/sama5d2-xult/scripts/isram.ld diff --git a/boards/arm/sama5d2-xult/scripts/uboot.ld b/boards/arm/sama5/sama5d2-xult/scripts/uboot.ld similarity index 100% rename from boards/arm/sama5d2-xult/scripts/uboot.ld rename to boards/arm/sama5/sama5d2-xult/scripts/uboot.ld diff --git a/boards/arm/sama5d2-xult/src/Makefile b/boards/arm/sama5/sama5d2-xult/src/Makefile similarity index 100% rename from boards/arm/sama5d2-xult/src/Makefile rename to boards/arm/sama5/sama5d2-xult/src/Makefile diff --git a/boards/arm/sama5d2-xult/src/sam_appinit.c b/boards/arm/sama5/sama5d2-xult/src/sam_appinit.c similarity index 100% rename from boards/arm/sama5d2-xult/src/sam_appinit.c rename to boards/arm/sama5/sama5d2-xult/src/sam_appinit.c diff --git a/boards/arm/sama5d2-xult/src/sam_autoleds.c b/boards/arm/sama5/sama5d2-xult/src/sam_autoleds.c similarity index 100% rename from boards/arm/sama5d2-xult/src/sam_autoleds.c rename to boards/arm/sama5/sama5d2-xult/src/sam_autoleds.c diff --git a/boards/arm/sama5d2-xult/src/sam_boot.c b/boards/arm/sama5/sama5d2-xult/src/sam_boot.c similarity index 100% rename from boards/arm/sama5d2-xult/src/sam_boot.c rename to boards/arm/sama5/sama5d2-xult/src/sam_boot.c diff --git a/boards/arm/sama5d2-xult/src/sam_bringup.c b/boards/arm/sama5/sama5d2-xult/src/sam_bringup.c similarity index 100% rename from boards/arm/sama5d2-xult/src/sam_bringup.c rename to boards/arm/sama5/sama5d2-xult/src/sam_bringup.c diff --git a/boards/arm/sama5d2-xult/src/sam_buttons.c b/boards/arm/sama5/sama5d2-xult/src/sam_buttons.c similarity index 100% rename from boards/arm/sama5d2-xult/src/sam_buttons.c rename to boards/arm/sama5/sama5d2-xult/src/sam_buttons.c diff --git a/boards/arm/sama5d2-xult/src/sam_userleds.c b/boards/arm/sama5/sama5d2-xult/src/sam_userleds.c similarity index 100% rename from boards/arm/sama5d2-xult/src/sam_userleds.c rename to boards/arm/sama5/sama5d2-xult/src/sam_userleds.c diff --git a/boards/arm/sama5d2-xult/src/sama5d2-xult.h b/boards/arm/sama5/sama5d2-xult/src/sama5d2-xult.h similarity index 100% rename from boards/arm/sama5d2-xult/src/sama5d2-xult.h rename to boards/arm/sama5/sama5d2-xult/src/sama5d2-xult.h diff --git a/boards/arm/sama5d3-xplained/Kconfig b/boards/arm/sama5/sama5d3-xplained/Kconfig similarity index 100% rename from boards/arm/sama5d3-xplained/Kconfig rename to boards/arm/sama5/sama5d3-xplained/Kconfig diff --git a/boards/arm/sama5d3-xplained/README.txt b/boards/arm/sama5/sama5d3-xplained/README.txt similarity index 100% rename from boards/arm/sama5d3-xplained/README.txt rename to boards/arm/sama5/sama5d3-xplained/README.txt diff --git a/boards/arm/sama5d3-xplained/configs/bridge/defconfig b/boards/arm/sama5/sama5d3-xplained/configs/bridge/defconfig similarity index 98% rename from boards/arm/sama5d3-xplained/configs/bridge/defconfig rename to boards/arm/sama5/sama5d3-xplained/configs/bridge/defconfig index 62b9342c7a9..f0116cd3b78 100644 --- a/boards/arm/sama5d3-xplained/configs/bridge/defconfig +++ b/boards/arm/sama5/sama5d3-xplained/configs/bridge/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d3-xplained" CONFIG_ARCH_BOARD_SAMA5D3_XPLAINED=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D36=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D3=y diff --git a/boards/arm/sama5d3-xplained/configs/nsh/defconfig b/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig similarity index 98% rename from boards/arm/sama5d3-xplained/configs/nsh/defconfig rename to boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig index b8911549093..7637763e2bb 100644 --- a/boards/arm/sama5d3-xplained/configs/nsh/defconfig +++ b/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d3-xplained" CONFIG_ARCH_BOARD_SAMA5D3_XPLAINED=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D36=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D3=y diff --git a/boards/arm/sama5d3-xplained/include/board.h b/boards/arm/sama5/sama5d3-xplained/include/board.h similarity index 100% rename from boards/arm/sama5d3-xplained/include/board.h rename to boards/arm/sama5/sama5d3-xplained/include/board.h diff --git a/boards/arm/sama5d3-xplained/include/board_384mhz.h b/boards/arm/sama5/sama5d3-xplained/include/board_384mhz.h similarity index 100% rename from boards/arm/sama5d3-xplained/include/board_384mhz.h rename to boards/arm/sama5/sama5d3-xplained/include/board_384mhz.h diff --git a/boards/arm/sama5d3-xplained/include/board_396mhz.h b/boards/arm/sama5/sama5d3-xplained/include/board_396mhz.h similarity index 100% rename from boards/arm/sama5d3-xplained/include/board_396mhz.h rename to boards/arm/sama5/sama5d3-xplained/include/board_396mhz.h diff --git a/boards/arm/sama5d3-xplained/include/board_528mhz.h b/boards/arm/sama5/sama5d3-xplained/include/board_528mhz.h similarity index 100% rename from boards/arm/sama5d3-xplained/include/board_528mhz.h rename to boards/arm/sama5/sama5d3-xplained/include/board_528mhz.h diff --git a/boards/arm/sama5d3-xplained/include/board_memorymap.h b/boards/arm/sama5/sama5d3-xplained/include/board_memorymap.h similarity index 100% rename from boards/arm/sama5d3-xplained/include/board_memorymap.h rename to boards/arm/sama5/sama5d3-xplained/include/board_memorymap.h diff --git a/boards/arm/sama5d3-xplained/include/board_sdram.h b/boards/arm/sama5/sama5d3-xplained/include/board_sdram.h similarity index 100% rename from boards/arm/sama5d3-xplained/include/board_sdram.h rename to boards/arm/sama5/sama5d3-xplained/include/board_sdram.h diff --git a/boards/arm/sama5d3-xplained/scripts/Make.defs b/boards/arm/sama5/sama5d3-xplained/scripts/Make.defs similarity index 94% rename from boards/arm/sama5d3-xplained/scripts/Make.defs rename to boards/arm/sama5/sama5d3-xplained/scripts/Make.defs index 66620564b45..4a6708c575c 100644 --- a/boards/arm/sama5d3-xplained/scripts/Make.defs +++ b/boards/arm/sama5/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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/arm/sama5d3-xplained/scripts/ddram.ld b/boards/arm/sama5/sama5d3-xplained/scripts/ddram.ld similarity index 100% rename from boards/arm/sama5d3-xplained/scripts/ddram.ld rename to boards/arm/sama5/sama5d3-xplained/scripts/ddram.ld diff --git a/boards/arm/sama5d3-xplained/scripts/gnu-elf.ld b/boards/arm/sama5/sama5d3-xplained/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/sama5d3-xplained/scripts/gnu-elf.ld rename to boards/arm/sama5/sama5d3-xplained/scripts/gnu-elf.ld diff --git a/boards/arm/sama5d3-xplained/scripts/isram.ld b/boards/arm/sama5/sama5d3-xplained/scripts/isram.ld similarity index 100% rename from boards/arm/sama5d3-xplained/scripts/isram.ld rename to boards/arm/sama5/sama5d3-xplained/scripts/isram.ld diff --git a/boards/arm/sama5d3-xplained/src/Makefile b/boards/arm/sama5/sama5d3-xplained/src/Makefile similarity index 100% rename from boards/arm/sama5d3-xplained/src/Makefile rename to boards/arm/sama5/sama5d3-xplained/src/Makefile diff --git a/boards/arm/sama5d3-xplained/src/sam_adc.c b/boards/arm/sama5/sama5d3-xplained/src/sam_adc.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_adc.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_adc.c diff --git a/boards/arm/sama5d3-xplained/src/sam_ajoystick.c b/boards/arm/sama5/sama5d3-xplained/src/sam_ajoystick.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_ajoystick.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_ajoystick.c diff --git a/boards/arm/sama5d3-xplained/src/sam_appinit.c b/boards/arm/sama5/sama5d3-xplained/src/sam_appinit.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_appinit.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_appinit.c diff --git a/boards/arm/sama5d3-xplained/src/sam_at25.c b/boards/arm/sama5/sama5d3-xplained/src/sam_at25.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_at25.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_at25.c diff --git a/boards/arm/sama5d3-xplained/src/sam_autoleds.c b/boards/arm/sama5/sama5d3-xplained/src/sam_autoleds.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_autoleds.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_autoleds.c diff --git a/boards/arm/sama5d3-xplained/src/sam_boot.c b/boards/arm/sama5/sama5d3-xplained/src/sam_boot.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_boot.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_boot.c diff --git a/boards/arm/sama5d3-xplained/src/sam_buttons.c b/boards/arm/sama5/sama5d3-xplained/src/sam_buttons.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_buttons.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_buttons.c diff --git a/boards/arm/sama5d3-xplained/src/sam_can.c b/boards/arm/sama5/sama5d3-xplained/src/sam_can.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_can.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_can.c diff --git a/boards/arm/sama5d3-xplained/src/sam_ethernet.c b/boards/arm/sama5/sama5d3-xplained/src/sam_ethernet.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_ethernet.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_ethernet.c diff --git a/boards/arm/sama5d3-xplained/src/sam_hsmci.c b/boards/arm/sama5/sama5d3-xplained/src/sam_hsmci.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_hsmci.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_hsmci.c diff --git a/boards/arm/sama5d3-xplained/src/sam_i2schar.c b/boards/arm/sama5/sama5d3-xplained/src/sam_i2schar.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_i2schar.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_i2schar.c diff --git a/boards/arm/sama5d3-xplained/src/sam_nandflash.c b/boards/arm/sama5/sama5d3-xplained/src/sam_nandflash.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_nandflash.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_nandflash.c diff --git a/boards/arm/sama5d3-xplained/src/sam_ostest.c b/boards/arm/sama5/sama5d3-xplained/src/sam_ostest.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_ostest.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_ostest.c diff --git a/boards/arm/sama5d3-xplained/src/sam_pwm.c b/boards/arm/sama5/sama5d3-xplained/src/sam_pwm.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_pwm.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_pwm.c diff --git a/boards/arm/sama5d3-xplained/src/sam_sdram.c b/boards/arm/sama5/sama5d3-xplained/src/sam_sdram.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_sdram.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_sdram.c diff --git a/boards/arm/sama5d3-xplained/src/sam_spi.c b/boards/arm/sama5/sama5d3-xplained/src/sam_spi.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_spi.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_spi.c diff --git a/boards/arm/sama5d3-xplained/src/sam_usb.c b/boards/arm/sama5/sama5d3-xplained/src/sam_usb.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_usb.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_usb.c diff --git a/boards/arm/sama5d3-xplained/src/sam_usbmsc.c b/boards/arm/sama5/sama5d3-xplained/src/sam_usbmsc.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_usbmsc.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_usbmsc.c diff --git a/boards/arm/sama5d3-xplained/src/sam_userleds.c b/boards/arm/sama5/sama5d3-xplained/src/sam_userleds.c similarity index 100% rename from boards/arm/sama5d3-xplained/src/sam_userleds.c rename to boards/arm/sama5/sama5d3-xplained/src/sam_userleds.c diff --git a/boards/arm/sama5d3-xplained/src/sama5d3-xplained.h b/boards/arm/sama5/sama5d3-xplained/src/sama5d3-xplained.h similarity index 100% rename from boards/arm/sama5d3-xplained/src/sama5d3-xplained.h rename to boards/arm/sama5/sama5d3-xplained/src/sama5d3-xplained.h diff --git a/boards/arm/sama5d3x-ek/Kconfig b/boards/arm/sama5/sama5d3x-ek/Kconfig similarity index 100% rename from boards/arm/sama5d3x-ek/Kconfig rename to boards/arm/sama5/sama5d3x-ek/Kconfig diff --git a/boards/arm/sama5d3x-ek/README.txt b/boards/arm/sama5/sama5d3x-ek/README.txt similarity index 100% rename from boards/arm/sama5d3x-ek/README.txt rename to boards/arm/sama5/sama5d3x-ek/README.txt diff --git a/boards/arm/sama5d3x-ek/Using-NxPlayer.txt b/boards/arm/sama5/sama5d3x-ek/Using-NxPlayer.txt similarity index 100% rename from boards/arm/sama5d3x-ek/Using-NxPlayer.txt rename to boards/arm/sama5/sama5d3x-ek/Using-NxPlayer.txt diff --git a/boards/arm/sama5d3x-ek/configs/demo/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig similarity index 99% rename from boards/arm/sama5d3x-ek/configs/demo/defconfig rename to boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig index 3843961ba91..5ef92be52b1 100644 --- a/boards/arm/sama5d3x-ek/configs/demo/defconfig +++ b/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d3x-ek" CONFIG_ARCH_BOARD_SAMA5D3X_EK=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D33=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D3=y diff --git a/boards/arm/sama5d3x-ek/configs/hello/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig similarity index 98% rename from boards/arm/sama5d3x-ek/configs/hello/defconfig rename to boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig index a8423089faa..b0b0b1bf8fb 100644 --- a/boards/arm/sama5d3x-ek/configs/hello/defconfig +++ b/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d3x-ek" CONFIG_ARCH_BOARD_SAMA5D3X_EK=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D33=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D3=y diff --git a/boards/arm/sama5d3x-ek/configs/norboot/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig similarity index 98% rename from boards/arm/sama5d3x-ek/configs/norboot/defconfig rename to boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig index 1c1b33bda52..1831a687b4b 100644 --- a/boards/arm/sama5d3x-ek/configs/norboot/defconfig +++ b/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d3x-ek" CONFIG_ARCH_BOARD_SAMA5D3X_EK=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D33=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D3=y diff --git a/boards/arm/sama5d3x-ek/configs/nsh/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig similarity index 98% rename from boards/arm/sama5d3x-ek/configs/nsh/defconfig rename to boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig index 2ddb2a57424..05a510ae314 100644 --- a/boards/arm/sama5d3x-ek/configs/nsh/defconfig +++ b/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d3x-ek" CONFIG_ARCH_BOARD_SAMA5D3X_EK=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D33=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D3=y diff --git a/boards/arm/sama5d3x-ek/configs/nx/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig similarity index 98% rename from boards/arm/sama5d3x-ek/configs/nx/defconfig rename to boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig index 9a3968295bc..5bbf46d8410 100644 --- a/boards/arm/sama5d3x-ek/configs/nx/defconfig +++ b/boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d3x-ek" CONFIG_ARCH_BOARD_SAMA5D3X_EK=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D33=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D3=y diff --git a/boards/arm/sama5d3x-ek/configs/nxplayer/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig similarity index 99% rename from boards/arm/sama5d3x-ek/configs/nxplayer/defconfig rename to boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig index 6085c36c481..27d9332757f 100644 --- a/boards/arm/sama5d3x-ek/configs/nxplayer/defconfig +++ b/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d3x-ek" CONFIG_ARCH_BOARD_SAMA5D3X_EK=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D33=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D3=y diff --git a/boards/arm/sama5d3x-ek/configs/nxwm/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nxwm/defconfig similarity index 99% rename from boards/arm/sama5d3x-ek/configs/nxwm/defconfig rename to boards/arm/sama5/sama5d3x-ek/configs/nxwm/defconfig index c7724006776..8a4522b0aa6 100644 --- a/boards/arm/sama5d3x-ek/configs/nxwm/defconfig +++ b/boards/arm/sama5/sama5d3x-ek/configs/nxwm/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d3x-ek" CONFIG_ARCH_BOARD_SAMA5D3X_EK=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D33=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D3=y diff --git a/boards/arm/sama5d3x-ek/configs/ov2640/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig similarity index 98% rename from boards/arm/sama5d3x-ek/configs/ov2640/defconfig rename to boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig index b671f5c923f..333def4b1d2 100644 --- a/boards/arm/sama5d3x-ek/configs/ov2640/defconfig +++ b/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d3x-ek" CONFIG_ARCH_BOARD_SAMA5D3X_EK=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D33=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D3=y diff --git a/boards/arm/sama5d3x-ek/include/board.h b/boards/arm/sama5/sama5d3x-ek/include/board.h similarity index 100% rename from boards/arm/sama5d3x-ek/include/board.h rename to boards/arm/sama5/sama5d3x-ek/include/board.h diff --git a/boards/arm/sama5d3x-ek/include/board_384mhz.h b/boards/arm/sama5/sama5d3x-ek/include/board_384mhz.h similarity index 100% rename from boards/arm/sama5d3x-ek/include/board_384mhz.h rename to boards/arm/sama5/sama5d3x-ek/include/board_384mhz.h diff --git a/boards/arm/sama5d3x-ek/include/board_396mhz.h b/boards/arm/sama5/sama5d3x-ek/include/board_396mhz.h similarity index 100% rename from boards/arm/sama5d3x-ek/include/board_396mhz.h rename to boards/arm/sama5/sama5d3x-ek/include/board_396mhz.h diff --git a/boards/arm/sama5d3x-ek/include/board_528mhz.h b/boards/arm/sama5/sama5d3x-ek/include/board_528mhz.h similarity index 100% rename from boards/arm/sama5d3x-ek/include/board_528mhz.h rename to boards/arm/sama5/sama5d3x-ek/include/board_528mhz.h diff --git a/boards/arm/sama5d3x-ek/include/board_memorymap.h b/boards/arm/sama5/sama5d3x-ek/include/board_memorymap.h similarity index 100% rename from boards/arm/sama5d3x-ek/include/board_memorymap.h rename to boards/arm/sama5/sama5d3x-ek/include/board_memorymap.h diff --git a/boards/arm/sama5d3x-ek/include/board_sdram.h b/boards/arm/sama5/sama5d3x-ek/include/board_sdram.h similarity index 100% rename from boards/arm/sama5d3x-ek/include/board_sdram.h rename to boards/arm/sama5/sama5d3x-ek/include/board_sdram.h diff --git a/boards/arm/sama5d3x-ek/scripts/Make.defs b/boards/arm/sama5/sama5d3x-ek/scripts/Make.defs similarity index 94% rename from boards/arm/sama5d3x-ek/scripts/Make.defs rename to boards/arm/sama5/sama5d3x-ek/scripts/Make.defs index 6dd2df3116a..2d69c42c753 100644 --- a/boards/arm/sama5d3x-ek/scripts/Make.defs +++ b/boards/arm/sama5/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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/arm/sama5d3x-ek/scripts/ddram.ld b/boards/arm/sama5/sama5d3x-ek/scripts/ddram.ld similarity index 100% rename from boards/arm/sama5d3x-ek/scripts/ddram.ld rename to boards/arm/sama5/sama5d3x-ek/scripts/ddram.ld diff --git a/boards/arm/sama5d3x-ek/scripts/gnu-elf.ld b/boards/arm/sama5/sama5d3x-ek/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/sama5d3x-ek/scripts/gnu-elf.ld rename to boards/arm/sama5/sama5d3x-ek/scripts/gnu-elf.ld diff --git a/boards/arm/sama5d3x-ek/scripts/isram.ld b/boards/arm/sama5/sama5d3x-ek/scripts/isram.ld similarity index 100% rename from boards/arm/sama5d3x-ek/scripts/isram.ld rename to boards/arm/sama5/sama5d3x-ek/scripts/isram.ld diff --git a/boards/arm/sama5d3x-ek/scripts/nor-ddram.ld b/boards/arm/sama5/sama5d3x-ek/scripts/nor-ddram.ld similarity index 100% rename from boards/arm/sama5d3x-ek/scripts/nor-ddram.ld rename to boards/arm/sama5/sama5d3x-ek/scripts/nor-ddram.ld diff --git a/boards/arm/sama5d3x-ek/scripts/nor-isram.ld b/boards/arm/sama5/sama5d3x-ek/scripts/nor-isram.ld similarity index 100% rename from boards/arm/sama5d3x-ek/scripts/nor-isram.ld rename to boards/arm/sama5/sama5d3x-ek/scripts/nor-isram.ld diff --git a/boards/arm/sama5d3x-ek/scripts/pg-sram.ld b/boards/arm/sama5/sama5d3x-ek/scripts/pg-sram.ld similarity index 100% rename from boards/arm/sama5d3x-ek/scripts/pg-sram.ld rename to boards/arm/sama5/sama5d3x-ek/scripts/pg-sram.ld diff --git a/boards/arm/sama5d3x-ek/src/Makefile b/boards/arm/sama5/sama5d3x-ek/src/Makefile similarity index 100% rename from boards/arm/sama5d3x-ek/src/Makefile rename to boards/arm/sama5/sama5d3x-ek/src/Makefile diff --git a/boards/arm/sama5d3x-ek/src/nor_main.c b/boards/arm/sama5/sama5d3x-ek/src/nor_main.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/nor_main.c rename to boards/arm/sama5/sama5d3x-ek/src/nor_main.c diff --git a/boards/arm/sama5d3x-ek/src/sam_adc.c b/boards/arm/sama5/sama5d3x-ek/src/sam_adc.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_adc.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_adc.c diff --git a/boards/arm/sama5d3x-ek/src/sam_appinit.c b/boards/arm/sama5/sama5d3x-ek/src/sam_appinit.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_appinit.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_appinit.c diff --git a/boards/arm/sama5d3x-ek/src/sam_at24.c b/boards/arm/sama5/sama5d3x-ek/src/sam_at24.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_at24.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_at24.c diff --git a/boards/arm/sama5d3x-ek/src/sam_at25.c b/boards/arm/sama5/sama5d3x-ek/src/sam_at25.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_at25.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_at25.c diff --git a/boards/arm/sama5d3x-ek/src/sam_autoleds.c b/boards/arm/sama5/sama5d3x-ek/src/sam_autoleds.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_autoleds.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_autoleds.c diff --git a/boards/arm/sama5d3x-ek/src/sam_boot.c b/boards/arm/sama5/sama5d3x-ek/src/sam_boot.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_boot.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_boot.c diff --git a/boards/arm/sama5d3x-ek/src/sam_buttons.c b/boards/arm/sama5/sama5d3x-ek/src/sam_buttons.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_buttons.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_buttons.c diff --git a/boards/arm/sama5d3x-ek/src/sam_can.c b/boards/arm/sama5/sama5d3x-ek/src/sam_can.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_can.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_can.c diff --git a/boards/arm/sama5d3x-ek/src/sam_ethernet.c b/boards/arm/sama5/sama5d3x-ek/src/sam_ethernet.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_ethernet.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_ethernet.c diff --git a/boards/arm/sama5d3x-ek/src/sam_hsmci.c b/boards/arm/sama5/sama5d3x-ek/src/sam_hsmci.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_hsmci.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_hsmci.c diff --git a/boards/arm/sama5d3x-ek/src/sam_i2schar.c b/boards/arm/sama5/sama5d3x-ek/src/sam_i2schar.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_i2schar.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_i2schar.c diff --git a/boards/arm/sama5d3x-ek/src/sam_nandflash.c b/boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_nandflash.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_nandflash.c diff --git a/boards/arm/sama5d3x-ek/src/sam_norflash.c b/boards/arm/sama5/sama5d3x-ek/src/sam_norflash.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_norflash.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_norflash.c diff --git a/boards/arm/sama5d3x-ek/src/sam_ostest.c b/boards/arm/sama5/sama5d3x-ek/src/sam_ostest.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_ostest.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_ostest.c diff --git a/boards/arm/sama5d3x-ek/src/sam_ov2640.c b/boards/arm/sama5/sama5d3x-ek/src/sam_ov2640.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_ov2640.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_ov2640.c diff --git a/boards/arm/sama5d3x-ek/src/sam_pwm.c b/boards/arm/sama5/sama5d3x-ek/src/sam_pwm.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_pwm.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_pwm.c diff --git a/boards/arm/sama5d3x-ek/src/sam_sdram.c b/boards/arm/sama5/sama5d3x-ek/src/sam_sdram.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_sdram.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_sdram.c diff --git a/boards/arm/sama5d3x-ek/src/sam_spi.c b/boards/arm/sama5/sama5d3x-ek/src/sam_spi.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_spi.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_spi.c diff --git a/boards/arm/sama5d3x-ek/src/sam_touchscreen.c b/boards/arm/sama5/sama5d3x-ek/src/sam_touchscreen.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_touchscreen.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_touchscreen.c diff --git a/boards/arm/sama5d3x-ek/src/sam_usb.c b/boards/arm/sama5/sama5d3x-ek/src/sam_usb.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_usb.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_usb.c diff --git a/boards/arm/sama5d3x-ek/src/sam_usbmsc.c b/boards/arm/sama5/sama5d3x-ek/src/sam_usbmsc.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_usbmsc.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_usbmsc.c diff --git a/boards/arm/sama5d3x-ek/src/sam_userleds.c b/boards/arm/sama5/sama5d3x-ek/src/sam_userleds.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_userleds.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_userleds.c diff --git a/boards/arm/sama5d3x-ek/src/sam_wm8904.c b/boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c similarity index 100% rename from boards/arm/sama5d3x-ek/src/sam_wm8904.c rename to boards/arm/sama5/sama5d3x-ek/src/sam_wm8904.c diff --git a/boards/arm/sama5d3x-ek/src/sama5d3x-ek.h b/boards/arm/sama5/sama5d3x-ek/src/sama5d3x-ek.h similarity index 100% rename from boards/arm/sama5d3x-ek/src/sama5d3x-ek.h rename to boards/arm/sama5/sama5d3x-ek/src/sama5d3x-ek.h diff --git a/boards/arm/sama5d4-ek/Kconfig b/boards/arm/sama5/sama5d4-ek/Kconfig similarity index 100% rename from boards/arm/sama5d4-ek/Kconfig rename to boards/arm/sama5/sama5d4-ek/Kconfig diff --git a/boards/arm/sama5d4-ek/README.txt b/boards/arm/sama5/sama5d4-ek/README.txt similarity index 100% rename from boards/arm/sama5d4-ek/README.txt rename to boards/arm/sama5/sama5d4-ek/README.txt diff --git a/boards/arm/sama5d4-ek/RunningNxWM.txt b/boards/arm/sama5/sama5d4-ek/RunningNxWM.txt similarity index 100% rename from boards/arm/sama5d4-ek/RunningNxWM.txt rename to boards/arm/sama5/sama5d4-ek/RunningNxWM.txt diff --git a/boards/arm/sama5d4-ek/configs/at25boot/defconfig b/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig similarity index 98% rename from boards/arm/sama5d4-ek/configs/at25boot/defconfig rename to boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig index 3df3179f4db..2f6004b6f3c 100644 --- a/boards/arm/sama5d4-ek/configs/at25boot/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d4-ek" CONFIG_ARCH_BOARD_SAMA5D4_EK=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D44=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D4=y diff --git a/boards/arm/sama5d4-ek/configs/bridge/defconfig b/boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig similarity index 98% rename from boards/arm/sama5d4-ek/configs/bridge/defconfig rename to boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig index 2c721b4c5e9..c31d0c713e4 100644 --- a/boards/arm/sama5d4-ek/configs/bridge/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d4-ek" CONFIG_ARCH_BOARD_SAMA5D4_EK=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D44=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D4=y diff --git a/boards/arm/sama5d4-ek/configs/dramboot/defconfig b/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig similarity index 98% rename from boards/arm/sama5d4-ek/configs/dramboot/defconfig rename to boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig index 7e8c31d4ede..7f7bdbbc466 100644 --- a/boards/arm/sama5d4-ek/configs/dramboot/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d4-ek" CONFIG_ARCH_BOARD_SAMA5D4_EK=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D44=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D4=y diff --git a/boards/arm/sama5d4-ek/configs/elf/defconfig b/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig similarity index 98% rename from boards/arm/sama5d4-ek/configs/elf/defconfig rename to boards/arm/sama5/sama5d4-ek/configs/elf/defconfig index 050030ec4c9..cafc95da322 100644 --- a/boards/arm/sama5d4-ek/configs/elf/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH_ADDRENV=y CONFIG_ARCH_BOARD="sama5d4-ek" CONFIG_ARCH_BOARD_SAMA5D4_EK=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D44=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D4=y diff --git a/boards/arm/sama5d4-ek/configs/ipv6/defconfig b/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig similarity index 99% rename from boards/arm/sama5d4-ek/configs/ipv6/defconfig rename to boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig index 4a43a414676..21bd66912bc 100644 --- a/boards/arm/sama5d4-ek/configs/ipv6/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d4-ek" CONFIG_ARCH_BOARD_SAMA5D4_EK=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D44=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D4=y diff --git a/boards/arm/sama5d4-ek/configs/knsh/Make.defs b/boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs similarity index 94% rename from boards/arm/sama5d4-ek/configs/knsh/Make.defs rename to boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs index ed3cd5565da..9d4f30df134 100644 --- a/boards/arm/sama5d4-ek/configs/knsh/Make.defs +++ b/boards/arm/sama5/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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/arm/sama5d4-ek/configs/knsh/defconfig b/boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig similarity index 99% rename from boards/arm/sama5d4-ek/configs/knsh/defconfig rename to boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig index fd1cedb0b6b..8dc63c1f5cc 100644 --- a/boards/arm/sama5d4-ek/configs/knsh/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH_ADDRENV=y CONFIG_ARCH_BOARD="sama5d4-ek" CONFIG_ARCH_BOARD_SAMA5D4_EK=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D44=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D4=y diff --git a/boards/arm/sama5d4-ek/configs/nsh/defconfig b/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig similarity index 99% rename from boards/arm/sama5d4-ek/configs/nsh/defconfig rename to boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig index b9eacb76392..c32068cf914 100644 --- a/boards/arm/sama5d4-ek/configs/nsh/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d4-ek" CONFIG_ARCH_BOARD_SAMA5D4_EK=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D44=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D4=y diff --git a/boards/arm/sama5d4-ek/configs/nxwm/defconfig b/boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig similarity index 99% rename from boards/arm/sama5d4-ek/configs/nxwm/defconfig rename to boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig index dbcc971c5ba..0496f1b7300 100644 --- a/boards/arm/sama5d4-ek/configs/nxwm/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig @@ -19,6 +19,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d4-ek" CONFIG_ARCH_BOARD_SAMA5D4_EK=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D44=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D4=y diff --git a/boards/arm/sama5d4-ek/configs/ramtest/defconfig b/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig similarity index 99% rename from boards/arm/sama5d4-ek/configs/ramtest/defconfig rename to boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig index b1afd472d7b..3ea022d452e 100644 --- a/boards/arm/sama5d4-ek/configs/ramtest/defconfig +++ b/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="sama5d4-ek" CONFIG_ARCH_BOARD_SAMA5D4_EK=y +CONFIG_ARCH_CHIP="sama5" CONFIG_ARCH_CHIP_ATSAMA5D44=y CONFIG_ARCH_CHIP_SAMA5=y CONFIG_ARCH_CHIP_SAMA5D4=y diff --git a/boards/arm/sama5d4-ek/include/.gitignore b/boards/arm/sama5/sama5d4-ek/include/.gitignore similarity index 100% rename from boards/arm/sama5d4-ek/include/.gitignore rename to boards/arm/sama5/sama5d4-ek/include/.gitignore diff --git a/boards/arm/sama5d4-ek/include/board.h b/boards/arm/sama5/sama5d4-ek/include/board.h similarity index 100% rename from boards/arm/sama5d4-ek/include/board.h rename to boards/arm/sama5/sama5d4-ek/include/board.h diff --git a/boards/arm/sama5d4-ek/include/board_384mhz.h b/boards/arm/sama5/sama5d4-ek/include/board_384mhz.h similarity index 100% rename from boards/arm/sama5d4-ek/include/board_384mhz.h rename to boards/arm/sama5/sama5d4-ek/include/board_384mhz.h diff --git a/boards/arm/sama5d4-ek/include/board_396mhz.h b/boards/arm/sama5/sama5d4-ek/include/board_396mhz.h similarity index 100% rename from boards/arm/sama5d4-ek/include/board_396mhz.h rename to boards/arm/sama5/sama5d4-ek/include/board_396mhz.h diff --git a/boards/arm/sama5d4-ek/include/board_528mhz.h b/boards/arm/sama5/sama5d4-ek/include/board_528mhz.h similarity index 100% rename from boards/arm/sama5d4-ek/include/board_528mhz.h rename to boards/arm/sama5/sama5d4-ek/include/board_528mhz.h diff --git a/boards/arm/sama5d4-ek/include/board_memorymap.h b/boards/arm/sama5/sama5d4-ek/include/board_memorymap.h similarity index 100% rename from boards/arm/sama5d4-ek/include/board_memorymap.h rename to boards/arm/sama5/sama5d4-ek/include/board_memorymap.h diff --git a/boards/arm/sama5d4-ek/include/board_sdram.h b/boards/arm/sama5/sama5d4-ek/include/board_sdram.h similarity index 100% rename from boards/arm/sama5d4-ek/include/board_sdram.h rename to boards/arm/sama5/sama5d4-ek/include/board_sdram.h diff --git a/boards/arm/sama5d4-ek/include/nsh_romfsimg.h b/boards/arm/sama5/sama5d4-ek/include/nsh_romfsimg.h similarity index 100% rename from boards/arm/sama5d4-ek/include/nsh_romfsimg.h rename to boards/arm/sama5/sama5d4-ek/include/nsh_romfsimg.h diff --git a/boards/arm/sama5d4-ek/include/rcS.template b/boards/arm/sama5/sama5d4-ek/include/rcS.template similarity index 100% rename from boards/arm/sama5d4-ek/include/rcS.template rename to boards/arm/sama5/sama5d4-ek/include/rcS.template diff --git a/boards/arm/sama5d4-ek/scripts/Make.defs b/boards/arm/sama5/sama5d4-ek/scripts/Make.defs similarity index 94% rename from boards/arm/sama5d4-ek/scripts/Make.defs rename to boards/arm/sama5/sama5d4-ek/scripts/Make.defs index 1383efda00b..df1b0999958 100644 --- a/boards/arm/sama5d4-ek/scripts/Make.defs +++ b/boards/arm/sama5/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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/arm/sama5d4-ek/scripts/dramboot.ld b/boards/arm/sama5/sama5d4-ek/scripts/dramboot.ld similarity index 100% rename from boards/arm/sama5d4-ek/scripts/dramboot.ld rename to boards/arm/sama5/sama5d4-ek/scripts/dramboot.ld diff --git a/boards/arm/sama5d4-ek/scripts/gnu-elf.ld b/boards/arm/sama5/sama5d4-ek/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/sama5d4-ek/scripts/gnu-elf.ld rename to boards/arm/sama5/sama5d4-ek/scripts/gnu-elf.ld diff --git a/boards/arm/sama5d4-ek/scripts/isram.ld b/boards/arm/sama5/sama5d4-ek/scripts/isram.ld similarity index 100% rename from boards/arm/sama5d4-ek/scripts/isram.ld rename to boards/arm/sama5/sama5d4-ek/scripts/isram.ld diff --git a/boards/arm/sama5d4-ek/scripts/uboot.ld b/boards/arm/sama5/sama5d4-ek/scripts/uboot.ld similarity index 100% rename from boards/arm/sama5d4-ek/scripts/uboot.ld rename to boards/arm/sama5/sama5d4-ek/scripts/uboot.ld diff --git a/boards/arm/sama5d4-ek/src/Makefile b/boards/arm/sama5/sama5d4-ek/src/Makefile similarity index 100% rename from boards/arm/sama5d4-ek/src/Makefile rename to boards/arm/sama5/sama5d4-ek/src/Makefile diff --git a/boards/arm/sama5d4-ek/src/at25_main.c b/boards/arm/sama5/sama5d4-ek/src/at25_main.c similarity index 100% rename from boards/arm/sama5d4-ek/src/at25_main.c rename to boards/arm/sama5/sama5d4-ek/src/at25_main.c diff --git a/boards/arm/sama5d4-ek/src/dram_main.c b/boards/arm/sama5/sama5d4-ek/src/dram_main.c similarity index 100% rename from boards/arm/sama5d4-ek/src/dram_main.c rename to boards/arm/sama5/sama5d4-ek/src/dram_main.c diff --git a/boards/arm/sama5d4-ek/src/sam_adc.c b/boards/arm/sama5/sama5d4-ek/src/sam_adc.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_adc.c rename to boards/arm/sama5/sama5d4-ek/src/sam_adc.c diff --git a/boards/arm/sama5d4-ek/src/sam_appinit.c b/boards/arm/sama5/sama5d4-ek/src/sam_appinit.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_appinit.c rename to boards/arm/sama5/sama5d4-ek/src/sam_appinit.c diff --git a/boards/arm/sama5d4-ek/src/sam_at25.c b/boards/arm/sama5/sama5d4-ek/src/sam_at25.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_at25.c rename to boards/arm/sama5/sama5d4-ek/src/sam_at25.c diff --git a/boards/arm/sama5d4-ek/src/sam_audio_null.c b/boards/arm/sama5/sama5d4-ek/src/sam_audio_null.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_audio_null.c rename to boards/arm/sama5/sama5d4-ek/src/sam_audio_null.c diff --git a/boards/arm/sama5d4-ek/src/sam_autoleds.c b/boards/arm/sama5/sama5d4-ek/src/sam_autoleds.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_autoleds.c rename to boards/arm/sama5/sama5d4-ek/src/sam_autoleds.c diff --git a/boards/arm/sama5d4-ek/src/sam_automount.c b/boards/arm/sama5/sama5d4-ek/src/sam_automount.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_automount.c rename to boards/arm/sama5/sama5d4-ek/src/sam_automount.c diff --git a/boards/arm/sama5d4-ek/src/sam_boot.c b/boards/arm/sama5/sama5d4-ek/src/sam_boot.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_boot.c rename to boards/arm/sama5/sama5d4-ek/src/sam_boot.c diff --git a/boards/arm/sama5d4-ek/src/sam_bringup.c b/boards/arm/sama5/sama5d4-ek/src/sam_bringup.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_bringup.c rename to boards/arm/sama5/sama5d4-ek/src/sam_bringup.c diff --git a/boards/arm/sama5d4-ek/src/sam_buttons.c b/boards/arm/sama5/sama5d4-ek/src/sam_buttons.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_buttons.c rename to boards/arm/sama5/sama5d4-ek/src/sam_buttons.c diff --git a/boards/arm/sama5d4-ek/src/sam_ethernet.c b/boards/arm/sama5/sama5d4-ek/src/sam_ethernet.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_ethernet.c rename to boards/arm/sama5/sama5d4-ek/src/sam_ethernet.c diff --git a/boards/arm/sama5d4-ek/src/sam_hsmci.c b/boards/arm/sama5/sama5d4-ek/src/sam_hsmci.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_hsmci.c rename to boards/arm/sama5/sama5d4-ek/src/sam_hsmci.c diff --git a/boards/arm/sama5d4-ek/src/sam_maxtouch.c b/boards/arm/sama5/sama5d4-ek/src/sam_maxtouch.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_maxtouch.c rename to boards/arm/sama5/sama5d4-ek/src/sam_maxtouch.c diff --git a/boards/arm/sama5d4-ek/src/sam_nandflash.c b/boards/arm/sama5/sama5d4-ek/src/sam_nandflash.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_nandflash.c rename to boards/arm/sama5/sama5d4-ek/src/sam_nandflash.c diff --git a/boards/arm/sama5d4-ek/src/sam_ostest.c b/boards/arm/sama5/sama5d4-ek/src/sam_ostest.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_ostest.c rename to boards/arm/sama5/sama5d4-ek/src/sam_ostest.c diff --git a/boards/arm/sama5d4-ek/src/sam_pmic.c b/boards/arm/sama5/sama5d4-ek/src/sam_pmic.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_pmic.c rename to boards/arm/sama5/sama5d4-ek/src/sam_pmic.c diff --git a/boards/arm/sama5d4-ek/src/sam_pwm.c b/boards/arm/sama5/sama5d4-ek/src/sam_pwm.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_pwm.c rename to boards/arm/sama5/sama5d4-ek/src/sam_pwm.c diff --git a/boards/arm/sama5d4-ek/src/sam_sdram.c b/boards/arm/sama5/sama5d4-ek/src/sam_sdram.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_sdram.c rename to boards/arm/sama5/sama5d4-ek/src/sam_sdram.c diff --git a/boards/arm/sama5d4-ek/src/sam_spi.c b/boards/arm/sama5/sama5d4-ek/src/sam_spi.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_spi.c rename to boards/arm/sama5/sama5d4-ek/src/sam_spi.c diff --git a/boards/arm/sama5d4-ek/src/sam_usb.c b/boards/arm/sama5/sama5d4-ek/src/sam_usb.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_usb.c rename to boards/arm/sama5/sama5d4-ek/src/sam_usb.c diff --git a/boards/arm/sama5d4-ek/src/sam_usbmsc.c b/boards/arm/sama5/sama5d4-ek/src/sam_usbmsc.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_usbmsc.c rename to boards/arm/sama5/sama5d4-ek/src/sam_usbmsc.c diff --git a/boards/arm/sama5d4-ek/src/sam_userleds.c b/boards/arm/sama5/sama5d4-ek/src/sam_userleds.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_userleds.c rename to boards/arm/sama5/sama5d4-ek/src/sam_userleds.c diff --git a/boards/arm/sama5d4-ek/src/sam_wm8904.c b/boards/arm/sama5/sama5d4-ek/src/sam_wm8904.c similarity index 100% rename from boards/arm/sama5d4-ek/src/sam_wm8904.c rename to boards/arm/sama5/sama5d4-ek/src/sam_wm8904.c diff --git a/boards/arm/sama5d4-ek/src/sama5d4-ek.h b/boards/arm/sama5/sama5d4-ek/src/sama5d4-ek.h similarity index 100% rename from boards/arm/sama5d4-ek/src/sama5d4-ek.h rename to boards/arm/sama5/sama5d4-ek/src/sama5d4-ek.h diff --git a/boards/arm/samd20-xplained/Kconfig b/boards/arm/samd2l2/samd20-xplained/Kconfig similarity index 100% rename from boards/arm/samd20-xplained/Kconfig rename to boards/arm/samd2l2/samd20-xplained/Kconfig diff --git a/boards/arm/samd20-xplained/README.txt b/boards/arm/samd2l2/samd20-xplained/README.txt similarity index 100% rename from boards/arm/samd20-xplained/README.txt rename to boards/arm/samd2l2/samd20-xplained/README.txt diff --git a/boards/arm/samd20-xplained/configs/nsh/defconfig b/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig similarity index 98% rename from boards/arm/samd20-xplained/configs/nsh/defconfig rename to boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig index 6826271ec66..6033a7cb036 100644 --- a/boards/arm/samd20-xplained/configs/nsh/defconfig +++ b/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig @@ -28,6 +28,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samd20-xplained" CONFIG_ARCH_BOARD_SAMD20_XPLAINED=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="samd2l2" CONFIG_ARCH_CHIP_SAMD20J18=y CONFIG_ARCH_CHIP_SAMD2X=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/samd20-xplained/include/board.h b/boards/arm/samd2l2/samd20-xplained/include/board.h similarity index 100% rename from boards/arm/samd20-xplained/include/board.h rename to boards/arm/samd2l2/samd20-xplained/include/board.h diff --git a/boards/arm/samd20-xplained/scripts/Make.defs b/boards/arm/samd2l2/samd20-xplained/scripts/Make.defs similarity index 96% rename from boards/arm/samd20-xplained/scripts/Make.defs rename to boards/arm/samd2l2/samd20-xplained/scripts/Make.defs index 33d723d316f..3bd9c768f97 100644 --- a/boards/arm/samd20-xplained/scripts/Make.defs +++ b/boards/arm/samd2l2/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/samd20-xplained/scripts/flash.ld b/boards/arm/samd2l2/samd20-xplained/scripts/flash.ld similarity index 100% rename from boards/arm/samd20-xplained/scripts/flash.ld rename to boards/arm/samd2l2/samd20-xplained/scripts/flash.ld diff --git a/boards/arm/nucleo-f091rc/src/.gitignore b/boards/arm/samd2l2/samd20-xplained/src/.gitignore similarity index 100% rename from boards/arm/nucleo-f091rc/src/.gitignore rename to boards/arm/samd2l2/samd20-xplained/src/.gitignore diff --git a/boards/arm/samd20-xplained/src/Makefile b/boards/arm/samd2l2/samd20-xplained/src/Makefile similarity index 100% rename from boards/arm/samd20-xplained/src/Makefile rename to boards/arm/samd2l2/samd20-xplained/src/Makefile diff --git a/boards/arm/samd20-xplained/src/sam_appinit.c b/boards/arm/samd2l2/samd20-xplained/src/sam_appinit.c similarity index 100% rename from boards/arm/samd20-xplained/src/sam_appinit.c rename to boards/arm/samd2l2/samd20-xplained/src/sam_appinit.c diff --git a/boards/arm/samd20-xplained/src/sam_autoleds.c b/boards/arm/samd2l2/samd20-xplained/src/sam_autoleds.c similarity index 100% rename from boards/arm/samd20-xplained/src/sam_autoleds.c rename to boards/arm/samd2l2/samd20-xplained/src/sam_autoleds.c diff --git a/boards/arm/samd20-xplained/src/sam_boot.c b/boards/arm/samd2l2/samd20-xplained/src/sam_boot.c similarity index 100% rename from boards/arm/samd20-xplained/src/sam_boot.c rename to boards/arm/samd2l2/samd20-xplained/src/sam_boot.c diff --git a/boards/arm/samd20-xplained/src/sam_buttons.c b/boards/arm/samd2l2/samd20-xplained/src/sam_buttons.c similarity index 100% rename from boards/arm/samd20-xplained/src/sam_buttons.c rename to boards/arm/samd2l2/samd20-xplained/src/sam_buttons.c diff --git a/boards/arm/samd20-xplained/src/sam_mmcsd.c b/boards/arm/samd2l2/samd20-xplained/src/sam_mmcsd.c similarity index 100% rename from boards/arm/samd20-xplained/src/sam_mmcsd.c rename to boards/arm/samd2l2/samd20-xplained/src/sam_mmcsd.c diff --git a/boards/arm/samd20-xplained/src/sam_spi.c b/boards/arm/samd2l2/samd20-xplained/src/sam_spi.c similarity index 100% rename from boards/arm/samd20-xplained/src/sam_spi.c rename to boards/arm/samd2l2/samd20-xplained/src/sam_spi.c diff --git a/boards/arm/samd20-xplained/src/sam_ug2832hsweg04.c b/boards/arm/samd2l2/samd20-xplained/src/sam_ug2832hsweg04.c similarity index 100% rename from boards/arm/samd20-xplained/src/sam_ug2832hsweg04.c rename to boards/arm/samd2l2/samd20-xplained/src/sam_ug2832hsweg04.c diff --git a/boards/arm/samd20-xplained/src/sam_userleds.c b/boards/arm/samd2l2/samd20-xplained/src/sam_userleds.c similarity index 100% rename from boards/arm/samd20-xplained/src/sam_userleds.c rename to boards/arm/samd2l2/samd20-xplained/src/sam_userleds.c diff --git a/boards/arm/samd20-xplained/src/samd20-xplained.h b/boards/arm/samd2l2/samd20-xplained/src/samd20-xplained.h similarity index 100% rename from boards/arm/samd20-xplained/src/samd20-xplained.h rename to boards/arm/samd2l2/samd20-xplained/src/samd20-xplained.h diff --git a/boards/arm/samd21-xplained/Kconfig b/boards/arm/samd2l2/samd21-xplained/Kconfig similarity index 100% rename from boards/arm/samd21-xplained/Kconfig rename to boards/arm/samd2l2/samd21-xplained/Kconfig diff --git a/boards/arm/samd21-xplained/README.txt b/boards/arm/samd2l2/samd21-xplained/README.txt similarity index 100% rename from boards/arm/samd21-xplained/README.txt rename to boards/arm/samd2l2/samd21-xplained/README.txt diff --git a/boards/arm/samd21-xplained/configs/nsh/defconfig b/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig similarity index 98% rename from boards/arm/samd21-xplained/configs/nsh/defconfig rename to boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig index eacbb81a3de..53a02440a00 100644 --- a/boards/arm/samd21-xplained/configs/nsh/defconfig +++ b/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig @@ -28,6 +28,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samd21-xplained" CONFIG_ARCH_BOARD_SAMD21_XPLAINED=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="samd2l2" CONFIG_ARCH_CHIP_SAMD21J18A=y CONFIG_ARCH_CHIP_SAMD2X=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/samd21-xplained/include/board.h b/boards/arm/samd2l2/samd21-xplained/include/board.h similarity index 100% rename from boards/arm/samd21-xplained/include/board.h rename to boards/arm/samd2l2/samd21-xplained/include/board.h diff --git a/boards/arm/samd21-xplained/scripts/Make.defs b/boards/arm/samd2l2/samd21-xplained/scripts/Make.defs similarity index 96% rename from boards/arm/samd21-xplained/scripts/Make.defs rename to boards/arm/samd2l2/samd21-xplained/scripts/Make.defs index eebd1830696..15b259502e5 100644 --- a/boards/arm/samd21-xplained/scripts/Make.defs +++ b/boards/arm/samd2l2/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/samd21-xplained/scripts/flash.ld b/boards/arm/samd2l2/samd21-xplained/scripts/flash.ld similarity index 100% rename from boards/arm/samd21-xplained/scripts/flash.ld rename to boards/arm/samd2l2/samd21-xplained/scripts/flash.ld diff --git a/boards/arm/nucleo-f446re/src/.gitignore b/boards/arm/samd2l2/samd21-xplained/src/.gitignore similarity index 100% rename from boards/arm/nucleo-f446re/src/.gitignore rename to boards/arm/samd2l2/samd21-xplained/src/.gitignore diff --git a/boards/arm/samd21-xplained/src/Makefile b/boards/arm/samd2l2/samd21-xplained/src/Makefile similarity index 100% rename from boards/arm/samd21-xplained/src/Makefile rename to boards/arm/samd2l2/samd21-xplained/src/Makefile diff --git a/boards/arm/samd21-xplained/src/sam_appinit.c b/boards/arm/samd2l2/samd21-xplained/src/sam_appinit.c similarity index 100% rename from boards/arm/samd21-xplained/src/sam_appinit.c rename to boards/arm/samd2l2/samd21-xplained/src/sam_appinit.c diff --git a/boards/arm/samd21-xplained/src/sam_autoleds.c b/boards/arm/samd2l2/samd21-xplained/src/sam_autoleds.c similarity index 100% rename from boards/arm/samd21-xplained/src/sam_autoleds.c rename to boards/arm/samd2l2/samd21-xplained/src/sam_autoleds.c diff --git a/boards/arm/samd21-xplained/src/sam_boot.c b/boards/arm/samd2l2/samd21-xplained/src/sam_boot.c similarity index 100% rename from boards/arm/samd21-xplained/src/sam_boot.c rename to boards/arm/samd2l2/samd21-xplained/src/sam_boot.c diff --git a/boards/arm/samd21-xplained/src/sam_buttons.c b/boards/arm/samd2l2/samd21-xplained/src/sam_buttons.c similarity index 100% rename from boards/arm/samd21-xplained/src/sam_buttons.c rename to boards/arm/samd2l2/samd21-xplained/src/sam_buttons.c diff --git a/boards/arm/samd21-xplained/src/sam_mmcsd.c b/boards/arm/samd2l2/samd21-xplained/src/sam_mmcsd.c similarity index 100% rename from boards/arm/samd21-xplained/src/sam_mmcsd.c rename to boards/arm/samd2l2/samd21-xplained/src/sam_mmcsd.c diff --git a/boards/arm/samd21-xplained/src/sam_spi.c b/boards/arm/samd2l2/samd21-xplained/src/sam_spi.c similarity index 100% rename from boards/arm/samd21-xplained/src/sam_spi.c rename to boards/arm/samd2l2/samd21-xplained/src/sam_spi.c diff --git a/boards/arm/samd21-xplained/src/sam_ug2832hsweg04.c b/boards/arm/samd2l2/samd21-xplained/src/sam_ug2832hsweg04.c similarity index 100% rename from boards/arm/samd21-xplained/src/sam_ug2832hsweg04.c rename to boards/arm/samd2l2/samd21-xplained/src/sam_ug2832hsweg04.c diff --git a/boards/arm/samd21-xplained/src/sam_userleds.c b/boards/arm/samd2l2/samd21-xplained/src/sam_userleds.c similarity index 100% rename from boards/arm/samd21-xplained/src/sam_userleds.c rename to boards/arm/samd2l2/samd21-xplained/src/sam_userleds.c diff --git a/boards/arm/samd21-xplained/src/samd21-xplained.h b/boards/arm/samd2l2/samd21-xplained/src/samd21-xplained.h similarity index 100% rename from boards/arm/samd21-xplained/src/samd21-xplained.h rename to boards/arm/samd2l2/samd21-xplained/src/samd21-xplained.h diff --git a/boards/arm/saml21-xplained/Kconfig b/boards/arm/samd2l2/saml21-xplained/Kconfig similarity index 100% rename from boards/arm/saml21-xplained/Kconfig rename to boards/arm/samd2l2/saml21-xplained/Kconfig diff --git a/boards/arm/saml21-xplained/README.txt b/boards/arm/samd2l2/saml21-xplained/README.txt similarity index 100% rename from boards/arm/saml21-xplained/README.txt rename to boards/arm/samd2l2/saml21-xplained/README.txt diff --git a/boards/arm/saml21-xplained/configs/nsh/defconfig b/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig similarity index 98% rename from boards/arm/saml21-xplained/configs/nsh/defconfig rename to boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig index 9c891b87747..0a4b88eea0d 100644 --- a/boards/arm/saml21-xplained/configs/nsh/defconfig +++ b/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig @@ -28,6 +28,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="saml21-xplained" CONFIG_ARCH_BOARD_SAML21_XPLAINED=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="samd2l2" CONFIG_ARCH_CHIP_SAML21J18=y CONFIG_ARCH_CHIP_SAML2X=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/saml21-xplained/include/board.h b/boards/arm/samd2l2/saml21-xplained/include/board.h similarity index 100% rename from boards/arm/saml21-xplained/include/board.h rename to boards/arm/samd2l2/saml21-xplained/include/board.h diff --git a/boards/arm/saml21-xplained/scripts/Make.defs b/boards/arm/samd2l2/saml21-xplained/scripts/Make.defs similarity index 96% rename from boards/arm/saml21-xplained/scripts/Make.defs rename to boards/arm/samd2l2/saml21-xplained/scripts/Make.defs index be9506c3bd6..1ba572300e6 100644 --- a/boards/arm/saml21-xplained/scripts/Make.defs +++ b/boards/arm/samd2l2/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/saml21-xplained/scripts/flash.ld b/boards/arm/samd2l2/saml21-xplained/scripts/flash.ld similarity index 100% rename from boards/arm/saml21-xplained/scripts/flash.ld rename to boards/arm/samd2l2/saml21-xplained/scripts/flash.ld diff --git a/boards/arm/nucleo-h743zi/src/.gitignore b/boards/arm/samd2l2/saml21-xplained/src/.gitignore similarity index 100% rename from boards/arm/nucleo-h743zi/src/.gitignore rename to boards/arm/samd2l2/saml21-xplained/src/.gitignore diff --git a/boards/arm/saml21-xplained/src/Makefile b/boards/arm/samd2l2/saml21-xplained/src/Makefile similarity index 100% rename from boards/arm/saml21-xplained/src/Makefile rename to boards/arm/samd2l2/saml21-xplained/src/Makefile diff --git a/boards/arm/saml21-xplained/src/sam_appinit.c b/boards/arm/samd2l2/saml21-xplained/src/sam_appinit.c similarity index 100% rename from boards/arm/saml21-xplained/src/sam_appinit.c rename to boards/arm/samd2l2/saml21-xplained/src/sam_appinit.c diff --git a/boards/arm/saml21-xplained/src/sam_autoleds.c b/boards/arm/samd2l2/saml21-xplained/src/sam_autoleds.c similarity index 100% rename from boards/arm/saml21-xplained/src/sam_autoleds.c rename to boards/arm/samd2l2/saml21-xplained/src/sam_autoleds.c diff --git a/boards/arm/saml21-xplained/src/sam_boot.c b/boards/arm/samd2l2/saml21-xplained/src/sam_boot.c similarity index 100% rename from boards/arm/saml21-xplained/src/sam_boot.c rename to boards/arm/samd2l2/saml21-xplained/src/sam_boot.c diff --git a/boards/arm/saml21-xplained/src/sam_buttons.c b/boards/arm/samd2l2/saml21-xplained/src/sam_buttons.c similarity index 100% rename from boards/arm/saml21-xplained/src/sam_buttons.c rename to boards/arm/samd2l2/saml21-xplained/src/sam_buttons.c diff --git a/boards/arm/saml21-xplained/src/sam_mmcsd.c b/boards/arm/samd2l2/saml21-xplained/src/sam_mmcsd.c similarity index 100% rename from boards/arm/saml21-xplained/src/sam_mmcsd.c rename to boards/arm/samd2l2/saml21-xplained/src/sam_mmcsd.c diff --git a/boards/arm/saml21-xplained/src/sam_spi.c b/boards/arm/samd2l2/saml21-xplained/src/sam_spi.c similarity index 100% rename from boards/arm/saml21-xplained/src/sam_spi.c rename to boards/arm/samd2l2/saml21-xplained/src/sam_spi.c diff --git a/boards/arm/saml21-xplained/src/sam_ug2832hsweg04.c b/boards/arm/samd2l2/saml21-xplained/src/sam_ug2832hsweg04.c similarity index 100% rename from boards/arm/saml21-xplained/src/sam_ug2832hsweg04.c rename to boards/arm/samd2l2/saml21-xplained/src/sam_ug2832hsweg04.c diff --git a/boards/arm/saml21-xplained/src/sam_userleds.c b/boards/arm/samd2l2/saml21-xplained/src/sam_userleds.c similarity index 100% rename from boards/arm/saml21-xplained/src/sam_userleds.c rename to boards/arm/samd2l2/saml21-xplained/src/sam_userleds.c diff --git a/boards/arm/saml21-xplained/src/saml21-xplained.h b/boards/arm/samd2l2/saml21-xplained/src/saml21-xplained.h similarity index 100% rename from boards/arm/saml21-xplained/src/saml21-xplained.h rename to boards/arm/samd2l2/saml21-xplained/src/saml21-xplained.h diff --git a/boards/arm/metro-m4/Kconfig b/boards/arm/samd5e5/metro-m4/Kconfig similarity index 100% rename from boards/arm/metro-m4/Kconfig rename to boards/arm/samd5e5/metro-m4/Kconfig diff --git a/boards/arm/metro-m4/README.txt b/boards/arm/samd5e5/metro-m4/README.txt similarity index 100% rename from boards/arm/metro-m4/README.txt rename to boards/arm/samd5e5/metro-m4/README.txt diff --git a/boards/arm/metro-m4/configs/nsh/defconfig b/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig similarity index 98% rename from boards/arm/metro-m4/configs/nsh/defconfig rename to boards/arm/samd5e5/metro-m4/configs/nsh/defconfig index f399b2b41d8..ae8be7921cb 100644 --- a/boards/arm/metro-m4/configs/nsh/defconfig +++ b/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="metro-m4" CONFIG_ARCH_BOARD_METRO_M4=y +CONFIG_ARCH_CHIP="samd5e5" CONFIG_ARCH_CHIP_SAMD51J19=y CONFIG_ARCH_CHIP_SAMD5X=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/metro-m4/include/board.h b/boards/arm/samd5e5/metro-m4/include/board.h similarity index 100% rename from boards/arm/metro-m4/include/board.h rename to boards/arm/samd5e5/metro-m4/include/board.h diff --git a/boards/arm/metro-m4/scripts/Make.defs b/boards/arm/samd5e5/metro-m4/scripts/Make.defs similarity index 96% rename from boards/arm/metro-m4/scripts/Make.defs rename to boards/arm/samd5e5/metro-m4/scripts/Make.defs index 9851fc9256c..52b3053748b 100644 --- a/boards/arm/metro-m4/scripts/Make.defs +++ b/boards/arm/samd5e5/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/metro-m4/scripts/flash.ld b/boards/arm/samd5e5/metro-m4/scripts/flash.ld similarity index 100% rename from boards/arm/metro-m4/scripts/flash.ld rename to boards/arm/samd5e5/metro-m4/scripts/flash.ld diff --git a/boards/arm/metro-m4/scripts/nvm.c b/boards/arm/samd5e5/metro-m4/scripts/nvm.c similarity index 100% rename from boards/arm/metro-m4/scripts/nvm.c rename to boards/arm/samd5e5/metro-m4/scripts/nvm.c diff --git a/boards/arm/metro-m4/scripts/nvm.srec b/boards/arm/samd5e5/metro-m4/scripts/nvm.srec similarity index 100% rename from boards/arm/metro-m4/scripts/nvm.srec rename to boards/arm/samd5e5/metro-m4/scripts/nvm.srec diff --git a/boards/arm/metro-m4/scripts/sram.ld b/boards/arm/samd5e5/metro-m4/scripts/sram.ld similarity index 100% rename from boards/arm/metro-m4/scripts/sram.ld rename to boards/arm/samd5e5/metro-m4/scripts/sram.ld diff --git a/boards/arm/metro-m4/src/Makefile b/boards/arm/samd5e5/metro-m4/src/Makefile similarity index 100% rename from boards/arm/metro-m4/src/Makefile rename to boards/arm/samd5e5/metro-m4/src/Makefile diff --git a/boards/arm/metro-m4/src/metro-m4.h b/boards/arm/samd5e5/metro-m4/src/metro-m4.h similarity index 100% rename from boards/arm/metro-m4/src/metro-m4.h rename to boards/arm/samd5e5/metro-m4/src/metro-m4.h diff --git a/boards/arm/metro-m4/src/sam_appinit.c b/boards/arm/samd5e5/metro-m4/src/sam_appinit.c similarity index 100% rename from boards/arm/metro-m4/src/sam_appinit.c rename to boards/arm/samd5e5/metro-m4/src/sam_appinit.c diff --git a/boards/arm/metro-m4/src/sam_autoleds.c b/boards/arm/samd5e5/metro-m4/src/sam_autoleds.c similarity index 100% rename from boards/arm/metro-m4/src/sam_autoleds.c rename to boards/arm/samd5e5/metro-m4/src/sam_autoleds.c diff --git a/boards/arm/metro-m4/src/sam_boot.c b/boards/arm/samd5e5/metro-m4/src/sam_boot.c similarity index 100% rename from boards/arm/metro-m4/src/sam_boot.c rename to boards/arm/samd5e5/metro-m4/src/sam_boot.c diff --git a/boards/arm/metro-m4/src/sam_bringup.c b/boards/arm/samd5e5/metro-m4/src/sam_bringup.c similarity index 100% rename from boards/arm/metro-m4/src/sam_bringup.c rename to boards/arm/samd5e5/metro-m4/src/sam_bringup.c diff --git a/boards/arm/metro-m4/src/sam_userleds.c b/boards/arm/samd5e5/metro-m4/src/sam_userleds.c similarity index 100% rename from boards/arm/metro-m4/src/sam_userleds.c rename to boards/arm/samd5e5/metro-m4/src/sam_userleds.c diff --git a/boards/arm/same70-xplained/Kconfig b/boards/arm/samv7/same70-xplained/Kconfig similarity index 100% rename from boards/arm/same70-xplained/Kconfig rename to boards/arm/samv7/same70-xplained/Kconfig diff --git a/boards/arm/same70-xplained/README.txt b/boards/arm/samv7/same70-xplained/README.txt similarity index 100% rename from boards/arm/same70-xplained/README.txt rename to boards/arm/samv7/same70-xplained/README.txt diff --git a/boards/arm/same70-xplained/configs/mrf24j40-starhub/defconfig b/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig similarity index 99% rename from boards/arm/same70-xplained/configs/mrf24j40-starhub/defconfig rename to boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig index dcd9789f301..f3206f97962 100644 --- a/boards/arm/same70-xplained/configs/mrf24j40-starhub/defconfig +++ b/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="same70-xplained" CONFIG_ARCH_BOARD_SAME70_XPLAINED=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="samv7" CONFIG_ARCH_CHIP_SAME70=y CONFIG_ARCH_CHIP_SAME70Q21=y CONFIG_ARCH_CHIP_SAME70Q=y diff --git a/boards/arm/same70-xplained/configs/netnsh/defconfig b/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig similarity index 99% rename from boards/arm/same70-xplained/configs/netnsh/defconfig rename to boards/arm/samv7/same70-xplained/configs/netnsh/defconfig index db42f435d5e..4b34d535a26 100644 --- a/boards/arm/same70-xplained/configs/netnsh/defconfig +++ b/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="same70-xplained" CONFIG_ARCH_BOARD_SAME70_XPLAINED=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="samv7" CONFIG_ARCH_CHIP_SAME70=y CONFIG_ARCH_CHIP_SAME70Q21=y CONFIG_ARCH_CHIP_SAME70Q=y diff --git a/boards/arm/same70-xplained/configs/nsh/defconfig b/boards/arm/samv7/same70-xplained/configs/nsh/defconfig similarity index 98% rename from boards/arm/same70-xplained/configs/nsh/defconfig rename to boards/arm/samv7/same70-xplained/configs/nsh/defconfig index 99e65d646fd..9d659283405 100644 --- a/boards/arm/same70-xplained/configs/nsh/defconfig +++ b/boards/arm/samv7/same70-xplained/configs/nsh/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="same70-xplained" CONFIG_ARCH_BOARD_SAME70_XPLAINED=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="samv7" CONFIG_ARCH_CHIP_SAME70=y CONFIG_ARCH_CHIP_SAME70Q21=y CONFIG_ARCH_CHIP_SAME70Q=y diff --git a/boards/arm/same70-xplained/configs/twm4nx/defconfig b/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig similarity index 99% rename from boards/arm/same70-xplained/configs/twm4nx/defconfig rename to boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig index 09fdcfc91b1..dd259b923c8 100644 --- a/boards/arm/same70-xplained/configs/twm4nx/defconfig +++ b/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="same70-xplained" CONFIG_ARCH_BOARD_SAME70_XPLAINED=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="samv7" CONFIG_ARCH_CHIP_SAME70=y CONFIG_ARCH_CHIP_SAME70Q21=y CONFIG_ARCH_CHIP_SAME70Q=y diff --git a/boards/arm/same70-xplained/include/board.h b/boards/arm/samv7/same70-xplained/include/board.h similarity index 100% rename from boards/arm/same70-xplained/include/board.h rename to boards/arm/samv7/same70-xplained/include/board.h diff --git a/boards/arm/nucleo-h743zi/kernel/.gitignore b/boards/arm/samv7/same70-xplained/kernel/.gitignore similarity index 100% rename from boards/arm/nucleo-h743zi/kernel/.gitignore rename to boards/arm/samv7/same70-xplained/kernel/.gitignore diff --git a/boards/arm/same70-xplained/kernel/Makefile b/boards/arm/samv7/same70-xplained/kernel/Makefile similarity index 90% rename from boards/arm/same70-xplained/kernel/Makefile rename to boards/arm/samv7/same70-xplained/kernel/Makefile index fc20b85b269..bc80560e1ef 100644 --- a/boards/arm/same70-xplained/kernel/Makefile +++ b/boards/arm/samv7/same70-xplained/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/same70-xplained/kernel/sam_userspace.c b/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c similarity index 100% rename from boards/arm/same70-xplained/kernel/sam_userspace.c rename to boards/arm/samv7/same70-xplained/kernel/sam_userspace.c diff --git a/boards/arm/same70-xplained/scripts/Make.defs b/boards/arm/samv7/same70-xplained/scripts/Make.defs similarity index 96% rename from boards/arm/same70-xplained/scripts/Make.defs rename to boards/arm/samv7/same70-xplained/scripts/Make.defs index 49c53e70a57..61c0bfcdd1d 100644 --- a/boards/arm/same70-xplained/scripts/Make.defs +++ b/boards/arm/samv7/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/same70-xplained/scripts/atmel_same70_xplained.cfg b/boards/arm/samv7/same70-xplained/scripts/atmel_same70_xplained.cfg similarity index 100% rename from boards/arm/same70-xplained/scripts/atmel_same70_xplained.cfg rename to boards/arm/samv7/same70-xplained/scripts/atmel_same70_xplained.cfg diff --git a/boards/arm/same70-xplained/scripts/flash-dtcm.ld b/boards/arm/samv7/same70-xplained/scripts/flash-dtcm.ld similarity index 100% rename from boards/arm/same70-xplained/scripts/flash-dtcm.ld rename to boards/arm/samv7/same70-xplained/scripts/flash-dtcm.ld diff --git a/boards/arm/same70-xplained/scripts/flash-sram.ld b/boards/arm/samv7/same70-xplained/scripts/flash-sram.ld similarity index 100% rename from boards/arm/same70-xplained/scripts/flash-sram.ld rename to boards/arm/samv7/same70-xplained/scripts/flash-sram.ld diff --git a/boards/arm/same70-xplained/scripts/gnu-elf.ld b/boards/arm/samv7/same70-xplained/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/same70-xplained/scripts/gnu-elf.ld rename to boards/arm/samv7/same70-xplained/scripts/gnu-elf.ld diff --git a/boards/arm/same70-xplained/scripts/kernel-space.ld b/boards/arm/samv7/same70-xplained/scripts/kernel-space.ld similarity index 100% rename from boards/arm/same70-xplained/scripts/kernel-space.ld rename to boards/arm/samv7/same70-xplained/scripts/kernel-space.ld diff --git a/boards/arm/same70-xplained/scripts/memory.ld b/boards/arm/samv7/same70-xplained/scripts/memory.ld similarity index 100% rename from boards/arm/same70-xplained/scripts/memory.ld rename to boards/arm/samv7/same70-xplained/scripts/memory.ld diff --git a/boards/arm/same70-xplained/scripts/user-space.ld b/boards/arm/samv7/same70-xplained/scripts/user-space.ld similarity index 100% rename from boards/arm/same70-xplained/scripts/user-space.ld rename to boards/arm/samv7/same70-xplained/scripts/user-space.ld diff --git a/boards/arm/same70-xplained/src/Makefile b/boards/arm/samv7/same70-xplained/src/Makefile similarity index 100% rename from boards/arm/same70-xplained/src/Makefile rename to boards/arm/samv7/same70-xplained/src/Makefile diff --git a/boards/arm/same70-xplained/src/sam_appinit.c b/boards/arm/samv7/same70-xplained/src/sam_appinit.c similarity index 100% rename from boards/arm/same70-xplained/src/sam_appinit.c rename to boards/arm/samv7/same70-xplained/src/sam_appinit.c diff --git a/boards/arm/same70-xplained/src/sam_at24config.c b/boards/arm/samv7/same70-xplained/src/sam_at24config.c similarity index 100% rename from boards/arm/same70-xplained/src/sam_at24config.c rename to boards/arm/samv7/same70-xplained/src/sam_at24config.c diff --git a/boards/arm/same70-xplained/src/sam_autoleds.c b/boards/arm/samv7/same70-xplained/src/sam_autoleds.c similarity index 100% rename from boards/arm/same70-xplained/src/sam_autoleds.c rename to boards/arm/samv7/same70-xplained/src/sam_autoleds.c diff --git a/boards/arm/same70-xplained/src/sam_boot.c b/boards/arm/samv7/same70-xplained/src/sam_boot.c similarity index 100% rename from boards/arm/same70-xplained/src/sam_boot.c rename to boards/arm/samv7/same70-xplained/src/sam_boot.c diff --git a/boards/arm/same70-xplained/src/sam_bringup.c b/boards/arm/samv7/same70-xplained/src/sam_bringup.c similarity index 100% rename from boards/arm/same70-xplained/src/sam_bringup.c rename to boards/arm/samv7/same70-xplained/src/sam_bringup.c diff --git a/boards/arm/same70-xplained/src/sam_buttons.c b/boards/arm/samv7/same70-xplained/src/sam_buttons.c similarity index 100% rename from boards/arm/same70-xplained/src/sam_buttons.c rename to boards/arm/samv7/same70-xplained/src/sam_buttons.c diff --git a/boards/arm/same70-xplained/src/sam_dac.c b/boards/arm/samv7/same70-xplained/src/sam_dac.c similarity index 100% rename from boards/arm/same70-xplained/src/sam_dac.c rename to boards/arm/samv7/same70-xplained/src/sam_dac.c diff --git a/boards/arm/same70-xplained/src/sam_ethernet.c b/boards/arm/samv7/same70-xplained/src/sam_ethernet.c similarity index 100% rename from boards/arm/same70-xplained/src/sam_ethernet.c rename to boards/arm/samv7/same70-xplained/src/sam_ethernet.c diff --git a/boards/arm/same70-xplained/src/sam_hsmci.c b/boards/arm/samv7/same70-xplained/src/sam_hsmci.c similarity index 100% rename from boards/arm/same70-xplained/src/sam_hsmci.c rename to boards/arm/samv7/same70-xplained/src/sam_hsmci.c diff --git a/boards/arm/same70-xplained/src/sam_mcan.c b/boards/arm/samv7/same70-xplained/src/sam_mcan.c similarity index 100% rename from boards/arm/same70-xplained/src/sam_mcan.c rename to boards/arm/samv7/same70-xplained/src/sam_mcan.c diff --git a/boards/arm/same70-xplained/src/sam_mrf24j40.c b/boards/arm/samv7/same70-xplained/src/sam_mrf24j40.c similarity index 100% rename from boards/arm/same70-xplained/src/sam_mrf24j40.c rename to boards/arm/samv7/same70-xplained/src/sam_mrf24j40.c diff --git a/boards/arm/same70-xplained/src/sam_sdram.c b/boards/arm/samv7/same70-xplained/src/sam_sdram.c similarity index 100% rename from boards/arm/same70-xplained/src/sam_sdram.c rename to boards/arm/samv7/same70-xplained/src/sam_sdram.c diff --git a/boards/arm/same70-xplained/src/sam_spi.c b/boards/arm/samv7/same70-xplained/src/sam_spi.c similarity index 100% rename from boards/arm/same70-xplained/src/sam_spi.c rename to boards/arm/samv7/same70-xplained/src/sam_spi.c diff --git a/boards/arm/same70-xplained/src/sam_usbdev.c b/boards/arm/samv7/same70-xplained/src/sam_usbdev.c similarity index 100% rename from boards/arm/same70-xplained/src/sam_usbdev.c rename to boards/arm/samv7/same70-xplained/src/sam_usbdev.c diff --git a/boards/arm/same70-xplained/src/sam_userleds.c b/boards/arm/samv7/same70-xplained/src/sam_userleds.c similarity index 100% rename from boards/arm/same70-xplained/src/sam_userleds.c rename to boards/arm/samv7/same70-xplained/src/sam_userleds.c diff --git a/boards/arm/same70-xplained/src/sam_xbee.c b/boards/arm/samv7/same70-xplained/src/sam_xbee.c similarity index 100% rename from boards/arm/same70-xplained/src/sam_xbee.c rename to boards/arm/samv7/same70-xplained/src/sam_xbee.c diff --git a/boards/arm/same70-xplained/src/same70-xplained.h b/boards/arm/samv7/same70-xplained/src/same70-xplained.h similarity index 100% rename from boards/arm/same70-xplained/src/same70-xplained.h rename to boards/arm/samv7/same70-xplained/src/same70-xplained.h diff --git a/boards/arm/same70-xplained/tools/atmel_same70_xplained.cfg b/boards/arm/samv7/same70-xplained/tools/atmel_same70_xplained.cfg similarity index 100% rename from boards/arm/same70-xplained/tools/atmel_same70_xplained.cfg rename to boards/arm/samv7/same70-xplained/tools/atmel_same70_xplained.cfg diff --git a/boards/arm/same70-xplained/tools/oocd.sh b/boards/arm/samv7/same70-xplained/tools/oocd.sh similarity index 100% rename from boards/arm/same70-xplained/tools/oocd.sh rename to boards/arm/samv7/same70-xplained/tools/oocd.sh diff --git a/boards/arm/samv71-xult/Kconfig b/boards/arm/samv7/samv71-xult/Kconfig similarity index 100% rename from boards/arm/samv71-xult/Kconfig rename to boards/arm/samv7/samv71-xult/Kconfig diff --git a/boards/arm/samv71-xult/README.txt b/boards/arm/samv7/samv71-xult/README.txt similarity index 100% rename from boards/arm/samv71-xult/README.txt rename to boards/arm/samv7/samv71-xult/README.txt diff --git a/boards/arm/samv71-xult/configs/knsh/Make.defs b/boards/arm/samv7/samv71-xult/configs/knsh/Make.defs similarity index 94% rename from boards/arm/samv71-xult/configs/knsh/Make.defs rename to boards/arm/samv7/samv71-xult/configs/knsh/Make.defs index 6e8e10e12cd..bbe2397ee51 100644 --- a/boards/arm/samv71-xult/configs/knsh/Make.defs +++ b/boards/arm/samv7/samv71-xult/configs/knsh/Make.defs @@ -48,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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) - ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) + ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/samv71-xult/configs/knsh/defconfig b/boards/arm/samv7/samv71-xult/configs/knsh/defconfig similarity index 98% rename from boards/arm/samv71-xult/configs/knsh/defconfig rename to boards/arm/samv7/samv71-xult/configs/knsh/defconfig index 3d0a4f9bb1c..ce5e421d69d 100644 --- a/boards/arm/samv71-xult/configs/knsh/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/knsh/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="samv7" CONFIG_ARCH_CHIP_SAMV71=y CONFIG_ARCH_CHIP_SAMV71Q21=y CONFIG_ARCH_CHIP_SAMV71Q=y diff --git a/boards/arm/samv71-xult/configs/module/defconfig b/boards/arm/samv7/samv71-xult/configs/module/defconfig similarity index 98% rename from boards/arm/samv71-xult/configs/module/defconfig rename to boards/arm/samv7/samv71-xult/configs/module/defconfig index 73a541f412d..376ca13a0ce 100644 --- a/boards/arm/samv71-xult/configs/module/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/module/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="samv7" CONFIG_ARCH_CHIP_SAMV71=y CONFIG_ARCH_CHIP_SAMV71Q21=y CONFIG_ARCH_CHIP_SAMV71Q=y diff --git a/boards/arm/samv71-xult/configs/mrf24j40-starhub/defconfig b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig similarity index 99% rename from boards/arm/samv71-xult/configs/mrf24j40-starhub/defconfig rename to boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig index 72cd732df5b..10f5c6529ec 100644 --- a/boards/arm/samv71-xult/configs/mrf24j40-starhub/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="samv7" CONFIG_ARCH_CHIP_SAMV71=y CONFIG_ARCH_CHIP_SAMV71Q21=y CONFIG_ARCH_CHIP_SAMV71Q=y diff --git a/boards/arm/samv71-xult/configs/mxtxplnd/defconfig b/boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig similarity index 98% rename from boards/arm/samv71-xult/configs/mxtxplnd/defconfig rename to boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig index b0f87a2e404..ab3931a8c24 100644 --- a/boards/arm/samv71-xult/configs/mxtxplnd/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="samv7" CONFIG_ARCH_CHIP_SAMV71=y CONFIG_ARCH_CHIP_SAMV71Q21=y CONFIG_ARCH_CHIP_SAMV71Q=y diff --git a/boards/arm/samv71-xult/configs/netnsh/defconfig b/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig similarity index 99% rename from boards/arm/samv71-xult/configs/netnsh/defconfig rename to boards/arm/samv7/samv71-xult/configs/netnsh/defconfig index e9564a9ba1c..a5ce285492b 100644 --- a/boards/arm/samv71-xult/configs/netnsh/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="samv7" CONFIG_ARCH_CHIP_SAMV71=y CONFIG_ARCH_CHIP_SAMV71Q21=y CONFIG_ARCH_CHIP_SAMV71Q=y diff --git a/boards/arm/samv71-xult/configs/nsh/defconfig b/boards/arm/samv7/samv71-xult/configs/nsh/defconfig similarity index 98% rename from boards/arm/samv71-xult/configs/nsh/defconfig rename to boards/arm/samv7/samv71-xult/configs/nsh/defconfig index d5a07a1185f..8f6afbacbba 100644 --- a/boards/arm/samv71-xult/configs/nsh/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/nsh/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="samv7" CONFIG_ARCH_CHIP_SAMV71=y CONFIG_ARCH_CHIP_SAMV71Q21=y CONFIG_ARCH_CHIP_SAMV71Q=y diff --git a/boards/arm/samv71-xult/configs/nxwm/defconfig b/boards/arm/samv7/samv71-xult/configs/nxwm/defconfig similarity index 99% rename from boards/arm/samv71-xult/configs/nxwm/defconfig rename to boards/arm/samv7/samv71-xult/configs/nxwm/defconfig index 0533b4e02bb..003579cb0ea 100644 --- a/boards/arm/samv71-xult/configs/nxwm/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/nxwm/defconfig @@ -19,6 +19,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="samv7" CONFIG_ARCH_CHIP_SAMV71=y CONFIG_ARCH_CHIP_SAMV71Q21=y CONFIG_ARCH_CHIP_SAMV71Q=y diff --git a/boards/arm/samv71-xult/configs/vnc/defconfig b/boards/arm/samv7/samv71-xult/configs/vnc/defconfig similarity index 99% rename from boards/arm/samv71-xult/configs/vnc/defconfig rename to boards/arm/samv7/samv71-xult/configs/vnc/defconfig index fee9bb918c8..5c65a23ef60 100644 --- a/boards/arm/samv71-xult/configs/vnc/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/vnc/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="samv7" CONFIG_ARCH_CHIP_SAMV71=y CONFIG_ARCH_CHIP_SAMV71Q21=y CONFIG_ARCH_CHIP_SAMV71Q=y diff --git a/boards/arm/samv71-xult/configs/vnxwm/defconfig b/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig similarity index 99% rename from boards/arm/samv71-xult/configs/vnxwm/defconfig rename to boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig index 784c14807bd..69af3e99ac4 100644 --- a/boards/arm/samv71-xult/configs/vnxwm/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="samv71-xult" CONFIG_ARCH_BOARD_SAMV71_XULT=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="samv7" CONFIG_ARCH_CHIP_SAMV71=y CONFIG_ARCH_CHIP_SAMV71Q21=y CONFIG_ARCH_CHIP_SAMV71Q=y diff --git a/boards/arm/samv71-xult/include/board.h b/boards/arm/samv7/samv71-xult/include/board.h similarity index 100% rename from boards/arm/samv71-xult/include/board.h rename to boards/arm/samv7/samv71-xult/include/board.h diff --git a/boards/arm/olimex-stm32-p407/kernel/.gitignore b/boards/arm/samv7/samv71-xult/kernel/.gitignore similarity index 100% rename from boards/arm/olimex-stm32-p407/kernel/.gitignore rename to boards/arm/samv7/samv71-xult/kernel/.gitignore diff --git a/boards/arm/samv71-xult/kernel/Makefile b/boards/arm/samv7/samv71-xult/kernel/Makefile similarity index 90% rename from boards/arm/samv71-xult/kernel/Makefile rename to boards/arm/samv7/samv71-xult/kernel/Makefile index 7eb026d076d..488bfeb6757 100644 --- a/boards/arm/samv71-xult/kernel/Makefile +++ b/boards/arm/samv7/samv71-xult/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/samv71-xult/kernel/sam_userspace.c b/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c similarity index 100% rename from boards/arm/samv71-xult/kernel/sam_userspace.c rename to boards/arm/samv7/samv71-xult/kernel/sam_userspace.c diff --git a/boards/arm/samv71-xult/scripts/Make.defs b/boards/arm/samv7/samv71-xult/scripts/Make.defs similarity index 96% rename from boards/arm/samv71-xult/scripts/Make.defs rename to boards/arm/samv7/samv71-xult/scripts/Make.defs index 5a3617fdbdd..e2b13961037 100644 --- a/boards/arm/samv71-xult/scripts/Make.defs +++ b/boards/arm/samv7/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/samv71-xult/scripts/flash-dtcm.ld b/boards/arm/samv7/samv71-xult/scripts/flash-dtcm.ld similarity index 100% rename from boards/arm/samv71-xult/scripts/flash-dtcm.ld rename to boards/arm/samv7/samv71-xult/scripts/flash-dtcm.ld diff --git a/boards/arm/samv71-xult/scripts/flash-sram.ld b/boards/arm/samv7/samv71-xult/scripts/flash-sram.ld similarity index 100% rename from boards/arm/samv71-xult/scripts/flash-sram.ld rename to boards/arm/samv7/samv71-xult/scripts/flash-sram.ld diff --git a/boards/arm/samv71-xult/scripts/gnu-elf.ld b/boards/arm/samv7/samv71-xult/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/samv71-xult/scripts/gnu-elf.ld rename to boards/arm/samv7/samv71-xult/scripts/gnu-elf.ld diff --git a/boards/arm/samv71-xult/scripts/kernel-space.ld b/boards/arm/samv7/samv71-xult/scripts/kernel-space.ld similarity index 100% rename from boards/arm/samv71-xult/scripts/kernel-space.ld rename to boards/arm/samv7/samv71-xult/scripts/kernel-space.ld diff --git a/boards/arm/samv71-xult/scripts/memory.ld b/boards/arm/samv7/samv71-xult/scripts/memory.ld similarity index 100% rename from boards/arm/samv71-xult/scripts/memory.ld rename to boards/arm/samv7/samv71-xult/scripts/memory.ld diff --git a/boards/arm/samv71-xult/scripts/user-space.ld b/boards/arm/samv7/samv71-xult/scripts/user-space.ld similarity index 100% rename from boards/arm/samv71-xult/scripts/user-space.ld rename to boards/arm/samv7/samv71-xult/scripts/user-space.ld diff --git a/boards/arm/samv71-xult/src/Makefile b/boards/arm/samv7/samv71-xult/src/Makefile similarity index 100% rename from boards/arm/samv71-xult/src/Makefile rename to boards/arm/samv7/samv71-xult/src/Makefile diff --git a/boards/arm/samv71-xult/src/atmxt-xpro.h b/boards/arm/samv7/samv71-xult/src/atmxt-xpro.h similarity index 100% rename from boards/arm/samv71-xult/src/atmxt-xpro.h rename to boards/arm/samv7/samv71-xult/src/atmxt-xpro.h diff --git a/boards/arm/samv71-xult/src/sam_appinit.c b/boards/arm/samv7/samv71-xult/src/sam_appinit.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_appinit.c rename to boards/arm/samv7/samv71-xult/src/sam_appinit.c diff --git a/boards/arm/samv71-xult/src/sam_at24config.c b/boards/arm/samv7/samv71-xult/src/sam_at24config.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_at24config.c rename to boards/arm/samv7/samv71-xult/src/sam_at24config.c diff --git a/boards/arm/samv71-xult/src/sam_atmxtconfig.c b/boards/arm/samv7/samv71-xult/src/sam_atmxtconfig.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_atmxtconfig.c rename to boards/arm/samv7/samv71-xult/src/sam_atmxtconfig.c diff --git a/boards/arm/samv71-xult/src/sam_audio_null.c b/boards/arm/samv7/samv71-xult/src/sam_audio_null.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_audio_null.c rename to boards/arm/samv7/samv71-xult/src/sam_audio_null.c diff --git a/boards/arm/samv71-xult/src/sam_autoleds.c b/boards/arm/samv7/samv71-xult/src/sam_autoleds.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_autoleds.c rename to boards/arm/samv7/samv71-xult/src/sam_autoleds.c diff --git a/boards/arm/samv71-xult/src/sam_boot.c b/boards/arm/samv7/samv71-xult/src/sam_boot.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_boot.c rename to boards/arm/samv7/samv71-xult/src/sam_boot.c diff --git a/boards/arm/samv71-xult/src/sam_bringup.c b/boards/arm/samv7/samv71-xult/src/sam_bringup.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_bringup.c rename to boards/arm/samv7/samv71-xult/src/sam_bringup.c diff --git a/boards/arm/samv71-xult/src/sam_buttons.c b/boards/arm/samv7/samv71-xult/src/sam_buttons.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_buttons.c rename to boards/arm/samv7/samv71-xult/src/sam_buttons.c diff --git a/boards/arm/samv71-xult/src/sam_composite.c b/boards/arm/samv7/samv71-xult/src/sam_composite.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_composite.c rename to boards/arm/samv7/samv71-xult/src/sam_composite.c diff --git a/boards/arm/samv71-xult/src/sam_ethernet.c b/boards/arm/samv7/samv71-xult/src/sam_ethernet.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_ethernet.c rename to boards/arm/samv7/samv71-xult/src/sam_ethernet.c diff --git a/boards/arm/samv71-xult/src/sam_hsmci.c b/boards/arm/samv7/samv71-xult/src/sam_hsmci.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_hsmci.c rename to boards/arm/samv7/samv71-xult/src/sam_hsmci.c diff --git a/boards/arm/samv71-xult/src/sam_ili9488.c b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_ili9488.c rename to boards/arm/samv7/samv71-xult/src/sam_ili9488.c diff --git a/boards/arm/samv71-xult/src/sam_maxtouch.c b/boards/arm/samv7/samv71-xult/src/sam_maxtouch.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_maxtouch.c rename to boards/arm/samv7/samv71-xult/src/sam_maxtouch.c diff --git a/boards/arm/samv71-xult/src/sam_mcan.c b/boards/arm/samv7/samv71-xult/src/sam_mcan.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_mcan.c rename to boards/arm/samv7/samv71-xult/src/sam_mcan.c diff --git a/boards/arm/samv71-xult/src/sam_mrf24j40.c b/boards/arm/samv7/samv71-xult/src/sam_mrf24j40.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_mrf24j40.c rename to boards/arm/samv7/samv71-xult/src/sam_mrf24j40.c diff --git a/boards/arm/samv71-xult/src/sam_sdram.c b/boards/arm/samv7/samv71-xult/src/sam_sdram.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_sdram.c rename to boards/arm/samv7/samv71-xult/src/sam_sdram.c diff --git a/boards/arm/samv71-xult/src/sam_spi.c b/boards/arm/samv7/samv71-xult/src/sam_spi.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_spi.c rename to boards/arm/samv7/samv71-xult/src/sam_spi.c diff --git a/boards/arm/samv71-xult/src/sam_usbdev.c b/boards/arm/samv7/samv71-xult/src/sam_usbdev.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_usbdev.c rename to boards/arm/samv7/samv71-xult/src/sam_usbdev.c diff --git a/boards/arm/samv71-xult/src/sam_usbmsc.c b/boards/arm/samv7/samv71-xult/src/sam_usbmsc.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_usbmsc.c rename to boards/arm/samv7/samv71-xult/src/sam_usbmsc.c diff --git a/boards/arm/samv71-xult/src/sam_userleds.c b/boards/arm/samv7/samv71-xult/src/sam_userleds.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_userleds.c rename to boards/arm/samv7/samv71-xult/src/sam_userleds.c diff --git a/boards/arm/samv71-xult/src/sam_wm8904.c b/boards/arm/samv7/samv71-xult/src/sam_wm8904.c similarity index 100% rename from boards/arm/samv71-xult/src/sam_wm8904.c rename to boards/arm/samv7/samv71-xult/src/sam_wm8904.c diff --git a/boards/arm/samv71-xult/src/samv71-xult.h b/boards/arm/samv7/samv71-xult/src/samv71-xult.h similarity index 100% rename from boards/arm/samv71-xult/src/samv71-xult.h rename to boards/arm/samv7/samv71-xult/src/samv71-xult.h diff --git a/boards/arm/axoloti/Kconfig b/boards/arm/stm32/axoloti/Kconfig similarity index 100% rename from boards/arm/axoloti/Kconfig rename to boards/arm/stm32/axoloti/Kconfig diff --git a/boards/arm/axoloti/README.txt b/boards/arm/stm32/axoloti/README.txt similarity index 100% rename from boards/arm/axoloti/README.txt rename to boards/arm/stm32/axoloti/README.txt diff --git a/boards/arm/axoloti/configs/nsh/defconfig b/boards/arm/stm32/axoloti/configs/nsh/defconfig similarity index 97% rename from boards/arm/axoloti/configs/nsh/defconfig rename to boards/arm/stm32/axoloti/configs/nsh/defconfig index ef743ced625..2377b03dbf6 100644 --- a/boards/arm/axoloti/configs/nsh/defconfig +++ b/boards/arm/stm32/axoloti/configs/nsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="axoloti" CONFIG_ARCH_BOARD_AXOLOTI=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F427I=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/axoloti/include/board.h b/boards/arm/stm32/axoloti/include/board.h similarity index 100% rename from boards/arm/axoloti/include/board.h rename to boards/arm/stm32/axoloti/include/board.h diff --git a/boards/arm/axoloti/scripts/Make.defs b/boards/arm/stm32/axoloti/scripts/Make.defs similarity index 96% rename from boards/arm/axoloti/scripts/Make.defs rename to boards/arm/stm32/axoloti/scripts/Make.defs index fc29a3bf3a6..f226088dcf5 100644 --- a/boards/arm/axoloti/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/axoloti/scripts/gnu-elf.ld b/boards/arm/stm32/axoloti/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/axoloti/scripts/gnu-elf.ld rename to boards/arm/stm32/axoloti/scripts/gnu-elf.ld diff --git a/boards/arm/axoloti/scripts/kernel-space.ld b/boards/arm/stm32/axoloti/scripts/kernel-space.ld similarity index 100% rename from boards/arm/axoloti/scripts/kernel-space.ld rename to boards/arm/stm32/axoloti/scripts/kernel-space.ld diff --git a/boards/arm/axoloti/scripts/ld.script b/boards/arm/stm32/axoloti/scripts/ld.script similarity index 100% rename from boards/arm/axoloti/scripts/ld.script rename to boards/arm/stm32/axoloti/scripts/ld.script diff --git a/boards/arm/axoloti/scripts/memory.ld b/boards/arm/stm32/axoloti/scripts/memory.ld similarity index 100% rename from boards/arm/axoloti/scripts/memory.ld rename to boards/arm/stm32/axoloti/scripts/memory.ld diff --git a/boards/arm/axoloti/scripts/user-space.ld b/boards/arm/stm32/axoloti/scripts/user-space.ld similarity index 100% rename from boards/arm/axoloti/scripts/user-space.ld rename to boards/arm/stm32/axoloti/scripts/user-space.ld diff --git a/boards/arm/nucleo-l452re/src/.gitignore b/boards/arm/stm32/axoloti/src/.gitignore similarity index 100% rename from boards/arm/nucleo-l452re/src/.gitignore rename to boards/arm/stm32/axoloti/src/.gitignore diff --git a/boards/arm/axoloti/src/Makefile b/boards/arm/stm32/axoloti/src/Makefile similarity index 100% rename from boards/arm/axoloti/src/Makefile rename to boards/arm/stm32/axoloti/src/Makefile diff --git a/boards/arm/axoloti/src/axoloti.h b/boards/arm/stm32/axoloti/src/axoloti.h similarity index 100% rename from boards/arm/axoloti/src/axoloti.h rename to boards/arm/stm32/axoloti/src/axoloti.h diff --git a/boards/arm/axoloti/src/stm32_adau1961.c b/boards/arm/stm32/axoloti/src/stm32_adau1961.c similarity index 100% rename from boards/arm/axoloti/src/stm32_adau1961.c rename to boards/arm/stm32/axoloti/src/stm32_adau1961.c diff --git a/boards/arm/axoloti/src/stm32_boot.c b/boards/arm/stm32/axoloti/src/stm32_boot.c similarity index 100% rename from boards/arm/axoloti/src/stm32_boot.c rename to boards/arm/stm32/axoloti/src/stm32_boot.c diff --git a/boards/arm/axoloti/src/stm32_bringup.c b/boards/arm/stm32/axoloti/src/stm32_bringup.c similarity index 100% rename from boards/arm/axoloti/src/stm32_bringup.c rename to boards/arm/stm32/axoloti/src/stm32_bringup.c diff --git a/boards/arm/axoloti/src/stm32_buttons.c b/boards/arm/stm32/axoloti/src/stm32_buttons.c similarity index 100% rename from boards/arm/axoloti/src/stm32_buttons.c rename to boards/arm/stm32/axoloti/src/stm32_buttons.c diff --git a/boards/arm/axoloti/src/stm32_extmem.c b/boards/arm/stm32/axoloti/src/stm32_extmem.c similarity index 100% rename from boards/arm/axoloti/src/stm32_extmem.c rename to boards/arm/stm32/axoloti/src/stm32_extmem.c diff --git a/boards/arm/axoloti/src/stm32_sdio.c b/boards/arm/stm32/axoloti/src/stm32_sdio.c similarity index 100% rename from boards/arm/axoloti/src/stm32_sdio.c rename to boards/arm/stm32/axoloti/src/stm32_sdio.c diff --git a/boards/arm/axoloti/src/stm32_usbhost.c b/boards/arm/stm32/axoloti/src/stm32_usbhost.c similarity index 100% rename from boards/arm/axoloti/src/stm32_usbhost.c rename to boards/arm/stm32/axoloti/src/stm32_usbhost.c diff --git a/boards/arm/axoloti/src/stm32_userleds.c b/boards/arm/stm32/axoloti/src/stm32_userleds.c similarity index 100% rename from boards/arm/axoloti/src/stm32_userleds.c rename to boards/arm/stm32/axoloti/src/stm32_userleds.c diff --git a/boards/arm/clicker2-stm32/Kconfig b/boards/arm/stm32/clicker2-stm32/Kconfig similarity index 100% rename from boards/arm/clicker2-stm32/Kconfig rename to boards/arm/stm32/clicker2-stm32/Kconfig diff --git a/boards/arm/clicker2-stm32/README.txt b/boards/arm/stm32/clicker2-stm32/README.txt similarity index 100% rename from boards/arm/clicker2-stm32/README.txt rename to boards/arm/stm32/clicker2-stm32/README.txt diff --git a/boards/arm/clicker2-stm32/configs/knsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig similarity index 98% rename from boards/arm/clicker2-stm32/configs/knsh/defconfig rename to boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig index 7700bc6006b..bd2283d54e7 100644 --- a/boards/arm/clicker2-stm32/configs/knsh/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="clicker2-stm32" CONFIG_ARCH_BOARD_CLICKER2_STM32=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig similarity index 99% rename from boards/arm/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig rename to boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig index 9bcb6df6044..5c7aff3c489 100644 --- a/boards/arm/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="clicker2-stm32" CONFIG_ARCH_BOARD_CLICKER2_STM32=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/clicker2-stm32/configs/mrf24j40-mac/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig similarity index 98% rename from boards/arm/clicker2-stm32/configs/mrf24j40-mac/defconfig rename to boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig index ff063e12b36..1a27b7805a5 100644 --- a/boards/arm/clicker2-stm32/configs/mrf24j40-mac/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="clicker2-stm32" CONFIG_ARCH_BOARD_CLICKER2_STM32=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/clicker2-stm32/configs/mrf24j40-starhub/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig similarity index 99% rename from boards/arm/clicker2-stm32/configs/mrf24j40-starhub/defconfig rename to boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig index a00f7c5bcb1..329acd08a26 100644 --- a/boards/arm/clicker2-stm32/configs/mrf24j40-starhub/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="clicker2-stm32" CONFIG_ARCH_BOARD_CLICKER2_STM32=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/clicker2-stm32/configs/mrf24j40-starpoint/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig similarity index 99% rename from boards/arm/clicker2-stm32/configs/mrf24j40-starpoint/defconfig rename to boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig index c71ca557fd4..524f10fd413 100644 --- a/boards/arm/clicker2-stm32/configs/mrf24j40-starpoint/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="clicker2-stm32" CONFIG_ARCH_BOARD_CLICKER2_STM32=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/clicker2-stm32/configs/nsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig similarity index 98% rename from boards/arm/clicker2-stm32/configs/nsh/defconfig rename to boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig index 44cc12f1fc2..aebfc3bd544 100644 --- a/boards/arm/clicker2-stm32/configs/nsh/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="clicker2-stm32" CONFIG_ARCH_BOARD_CLICKER2_STM32=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/clicker2-stm32/configs/usbnsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig similarity index 98% rename from boards/arm/clicker2-stm32/configs/usbnsh/defconfig rename to boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig index b4467d076e2..62ceda48b73 100644 --- a/boards/arm/clicker2-stm32/configs/usbnsh/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="clicker2-stm32" CONFIG_ARCH_BOARD_CLICKER2_STM32=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/clicker2-stm32/configs/xbee-6lowpan/defconfig b/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig similarity index 99% rename from boards/arm/clicker2-stm32/configs/xbee-6lowpan/defconfig rename to boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig index 6f8256a4449..0b2198e983a 100644 --- a/boards/arm/clicker2-stm32/configs/xbee-6lowpan/defconfig +++ b/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="clicker2-stm32" CONFIG_ARCH_BOARD_CLICKER2_STM32=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/clicker2-stm32/include/board.h b/boards/arm/stm32/clicker2-stm32/include/board.h similarity index 100% rename from boards/arm/clicker2-stm32/include/board.h rename to boards/arm/stm32/clicker2-stm32/include/board.h diff --git a/boards/arm/omnibusf4/kernel/.gitignore b/boards/arm/stm32/clicker2-stm32/kernel/.gitignore similarity index 100% rename from boards/arm/omnibusf4/kernel/.gitignore rename to boards/arm/stm32/clicker2-stm32/kernel/.gitignore diff --git a/boards/arm/clicker2-stm32/kernel/Makefile b/boards/arm/stm32/clicker2-stm32/kernel/Makefile similarity index 90% rename from boards/arm/clicker2-stm32/kernel/Makefile rename to boards/arm/stm32/clicker2-stm32/kernel/Makefile index a16ec6d6767..5abe2a29bc3 100644 --- a/boards/arm/clicker2-stm32/kernel/Makefile +++ b/boards/arm/stm32/clicker2-stm32/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/clicker2-stm32/kernel/stm32_userspace.c b/boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c similarity index 100% rename from boards/arm/clicker2-stm32/kernel/stm32_userspace.c rename to boards/arm/stm32/clicker2-stm32/kernel/stm32_userspace.c diff --git a/boards/arm/clicker2-stm32/scripts/Make.defs b/boards/arm/stm32/clicker2-stm32/scripts/Make.defs similarity index 96% rename from boards/arm/clicker2-stm32/scripts/Make.defs rename to boards/arm/stm32/clicker2-stm32/scripts/Make.defs index a4a8c7321ae..c0336e7e2b9 100644 --- a/boards/arm/clicker2-stm32/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/clicker2-stm32/scripts/flash.ld b/boards/arm/stm32/clicker2-stm32/scripts/flash.ld similarity index 100% rename from boards/arm/clicker2-stm32/scripts/flash.ld rename to boards/arm/stm32/clicker2-stm32/scripts/flash.ld diff --git a/boards/arm/clicker2-stm32/scripts/gnu-elf.ld b/boards/arm/stm32/clicker2-stm32/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/clicker2-stm32/scripts/gnu-elf.ld rename to boards/arm/stm32/clicker2-stm32/scripts/gnu-elf.ld diff --git a/boards/arm/clicker2-stm32/scripts/kernel-space.ld b/boards/arm/stm32/clicker2-stm32/scripts/kernel-space.ld similarity index 100% rename from boards/arm/clicker2-stm32/scripts/kernel-space.ld rename to boards/arm/stm32/clicker2-stm32/scripts/kernel-space.ld diff --git a/boards/arm/clicker2-stm32/scripts/memory.ld b/boards/arm/stm32/clicker2-stm32/scripts/memory.ld similarity index 100% rename from boards/arm/clicker2-stm32/scripts/memory.ld rename to boards/arm/stm32/clicker2-stm32/scripts/memory.ld diff --git a/boards/arm/clicker2-stm32/scripts/user-space.ld b/boards/arm/stm32/clicker2-stm32/scripts/user-space.ld similarity index 100% rename from boards/arm/clicker2-stm32/scripts/user-space.ld rename to boards/arm/stm32/clicker2-stm32/scripts/user-space.ld diff --git a/boards/arm/nucleo-l496zg/src/.gitignore b/boards/arm/stm32/clicker2-stm32/src/.gitignore similarity index 100% rename from boards/arm/nucleo-l496zg/src/.gitignore rename to boards/arm/stm32/clicker2-stm32/src/.gitignore diff --git a/boards/arm/clicker2-stm32/src/Makefile b/boards/arm/stm32/clicker2-stm32/src/Makefile similarity index 100% rename from boards/arm/clicker2-stm32/src/Makefile rename to boards/arm/stm32/clicker2-stm32/src/Makefile diff --git a/boards/arm/clicker2-stm32/src/clicker2-stm32.h b/boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h similarity index 100% rename from boards/arm/clicker2-stm32/src/clicker2-stm32.h rename to boards/arm/stm32/clicker2-stm32/src/clicker2-stm32.h diff --git a/boards/arm/clicker2-stm32/src/stm32_adc.c b/boards/arm/stm32/clicker2-stm32/src/stm32_adc.c similarity index 100% rename from boards/arm/clicker2-stm32/src/stm32_adc.c rename to boards/arm/stm32/clicker2-stm32/src/stm32_adc.c diff --git a/boards/arm/clicker2-stm32/src/stm32_appinit.c b/boards/arm/stm32/clicker2-stm32/src/stm32_appinit.c similarity index 100% rename from boards/arm/clicker2-stm32/src/stm32_appinit.c rename to boards/arm/stm32/clicker2-stm32/src/stm32_appinit.c diff --git a/boards/arm/clicker2-stm32/src/stm32_autoleds.c b/boards/arm/stm32/clicker2-stm32/src/stm32_autoleds.c similarity index 100% rename from boards/arm/clicker2-stm32/src/stm32_autoleds.c rename to boards/arm/stm32/clicker2-stm32/src/stm32_autoleds.c diff --git a/boards/arm/clicker2-stm32/src/stm32_automount.c b/boards/arm/stm32/clicker2-stm32/src/stm32_automount.c similarity index 100% rename from boards/arm/clicker2-stm32/src/stm32_automount.c rename to boards/arm/stm32/clicker2-stm32/src/stm32_automount.c diff --git a/boards/arm/clicker2-stm32/src/stm32_boot.c b/boards/arm/stm32/clicker2-stm32/src/stm32_boot.c similarity index 100% rename from boards/arm/clicker2-stm32/src/stm32_boot.c rename to boards/arm/stm32/clicker2-stm32/src/stm32_boot.c diff --git a/boards/arm/clicker2-stm32/src/stm32_bringup.c b/boards/arm/stm32/clicker2-stm32/src/stm32_bringup.c similarity index 100% rename from boards/arm/clicker2-stm32/src/stm32_bringup.c rename to boards/arm/stm32/clicker2-stm32/src/stm32_bringup.c diff --git a/boards/arm/clicker2-stm32/src/stm32_buttons.c b/boards/arm/stm32/clicker2-stm32/src/stm32_buttons.c similarity index 100% rename from boards/arm/clicker2-stm32/src/stm32_buttons.c rename to boards/arm/stm32/clicker2-stm32/src/stm32_buttons.c diff --git a/boards/arm/clicker2-stm32/src/stm32_can.c b/boards/arm/stm32/clicker2-stm32/src/stm32_can.c similarity index 100% rename from boards/arm/clicker2-stm32/src/stm32_can.c rename to boards/arm/stm32/clicker2-stm32/src/stm32_can.c diff --git a/boards/arm/clicker2-stm32/src/stm32_mmcsd.c b/boards/arm/stm32/clicker2-stm32/src/stm32_mmcsd.c similarity index 100% rename from boards/arm/clicker2-stm32/src/stm32_mmcsd.c rename to boards/arm/stm32/clicker2-stm32/src/stm32_mmcsd.c diff --git a/boards/arm/clicker2-stm32/src/stm32_mrf24j40.c b/boards/arm/stm32/clicker2-stm32/src/stm32_mrf24j40.c similarity index 100% rename from boards/arm/clicker2-stm32/src/stm32_mrf24j40.c rename to boards/arm/stm32/clicker2-stm32/src/stm32_mrf24j40.c diff --git a/boards/arm/clicker2-stm32/src/stm32_spi.c b/boards/arm/stm32/clicker2-stm32/src/stm32_spi.c similarity index 100% rename from boards/arm/clicker2-stm32/src/stm32_spi.c rename to boards/arm/stm32/clicker2-stm32/src/stm32_spi.c diff --git a/boards/arm/clicker2-stm32/src/stm32_usb.c b/boards/arm/stm32/clicker2-stm32/src/stm32_usb.c similarity index 100% rename from boards/arm/clicker2-stm32/src/stm32_usb.c rename to boards/arm/stm32/clicker2-stm32/src/stm32_usb.c diff --git a/boards/arm/clicker2-stm32/src/stm32_userleds.c b/boards/arm/stm32/clicker2-stm32/src/stm32_userleds.c similarity index 100% rename from boards/arm/clicker2-stm32/src/stm32_userleds.c rename to boards/arm/stm32/clicker2-stm32/src/stm32_userleds.c diff --git a/boards/arm/clicker2-stm32/src/stm32_xbee.c b/boards/arm/stm32/clicker2-stm32/src/stm32_xbee.c similarity index 100% rename from boards/arm/clicker2-stm32/src/stm32_xbee.c rename to boards/arm/stm32/clicker2-stm32/src/stm32_xbee.c diff --git a/boards/arm/cloudctrl/Kconfig b/boards/arm/stm32/cloudctrl/Kconfig similarity index 100% rename from boards/arm/cloudctrl/Kconfig rename to boards/arm/stm32/cloudctrl/Kconfig diff --git a/boards/arm/cloudctrl/README.txt b/boards/arm/stm32/cloudctrl/README.txt similarity index 100% rename from boards/arm/cloudctrl/README.txt rename to boards/arm/stm32/cloudctrl/README.txt diff --git a/boards/arm/cloudctrl/configs/nsh/defconfig b/boards/arm/stm32/cloudctrl/configs/nsh/defconfig similarity index 98% rename from boards/arm/cloudctrl/configs/nsh/defconfig rename to boards/arm/stm32/cloudctrl/configs/nsh/defconfig index 2cfbdcb2c12..822fbdced8d 100644 --- a/boards/arm/cloudctrl/configs/nsh/defconfig +++ b/boards/arm/stm32/cloudctrl/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="cloudctrl" CONFIG_ARCH_BOARD_CLOUDCTRL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/cloudctrl/include/board.h b/boards/arm/stm32/cloudctrl/include/board.h similarity index 100% rename from boards/arm/cloudctrl/include/board.h rename to boards/arm/stm32/cloudctrl/include/board.h diff --git a/boards/arm/cloudctrl/scripts/Make.defs b/boards/arm/stm32/cloudctrl/scripts/Make.defs similarity index 96% rename from boards/arm/cloudctrl/scripts/Make.defs rename to boards/arm/stm32/cloudctrl/scripts/Make.defs index c308617e1cb..ff06418168a 100644 --- a/boards/arm/cloudctrl/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/cloudctrl/scripts/cloudctrl-dfu.ld b/boards/arm/stm32/cloudctrl/scripts/cloudctrl-dfu.ld similarity index 100% rename from boards/arm/cloudctrl/scripts/cloudctrl-dfu.ld rename to boards/arm/stm32/cloudctrl/scripts/cloudctrl-dfu.ld diff --git a/boards/arm/cloudctrl/scripts/cloudctrl.ld b/boards/arm/stm32/cloudctrl/scripts/cloudctrl.ld similarity index 100% rename from boards/arm/cloudctrl/scripts/cloudctrl.ld rename to boards/arm/stm32/cloudctrl/scripts/cloudctrl.ld diff --git a/boards/arm/nutiny-nuc120/src/.gitignore b/boards/arm/stm32/cloudctrl/src/.gitignore similarity index 100% rename from boards/arm/nutiny-nuc120/src/.gitignore rename to boards/arm/stm32/cloudctrl/src/.gitignore diff --git a/boards/arm/cloudctrl/src/Makefile b/boards/arm/stm32/cloudctrl/src/Makefile similarity index 100% rename from boards/arm/cloudctrl/src/Makefile rename to boards/arm/stm32/cloudctrl/src/Makefile diff --git a/boards/arm/cloudctrl/src/cloudctrl.h b/boards/arm/stm32/cloudctrl/src/cloudctrl.h similarity index 100% rename from boards/arm/cloudctrl/src/cloudctrl.h rename to boards/arm/stm32/cloudctrl/src/cloudctrl.h diff --git a/boards/arm/cloudctrl/src/stm32_adc.c b/boards/arm/stm32/cloudctrl/src/stm32_adc.c similarity index 100% rename from boards/arm/cloudctrl/src/stm32_adc.c rename to boards/arm/stm32/cloudctrl/src/stm32_adc.c diff --git a/boards/arm/cloudctrl/src/stm32_appinit.c b/boards/arm/stm32/cloudctrl/src/stm32_appinit.c similarity index 100% rename from boards/arm/cloudctrl/src/stm32_appinit.c rename to boards/arm/stm32/cloudctrl/src/stm32_appinit.c diff --git a/boards/arm/cloudctrl/src/stm32_autoleds.c b/boards/arm/stm32/cloudctrl/src/stm32_autoleds.c similarity index 100% rename from boards/arm/cloudctrl/src/stm32_autoleds.c rename to boards/arm/stm32/cloudctrl/src/stm32_autoleds.c diff --git a/boards/arm/cloudctrl/src/stm32_boot.c b/boards/arm/stm32/cloudctrl/src/stm32_boot.c similarity index 100% rename from boards/arm/cloudctrl/src/stm32_boot.c rename to boards/arm/stm32/cloudctrl/src/stm32_boot.c diff --git a/boards/arm/cloudctrl/src/stm32_buttons.c b/boards/arm/stm32/cloudctrl/src/stm32_buttons.c similarity index 100% rename from boards/arm/cloudctrl/src/stm32_buttons.c rename to boards/arm/stm32/cloudctrl/src/stm32_buttons.c diff --git a/boards/arm/cloudctrl/src/stm32_chipid.c b/boards/arm/stm32/cloudctrl/src/stm32_chipid.c similarity index 100% rename from boards/arm/cloudctrl/src/stm32_chipid.c rename to boards/arm/stm32/cloudctrl/src/stm32_chipid.c diff --git a/boards/arm/cloudctrl/src/stm32_phyinit.c b/boards/arm/stm32/cloudctrl/src/stm32_phyinit.c similarity index 100% rename from boards/arm/cloudctrl/src/stm32_phyinit.c rename to boards/arm/stm32/cloudctrl/src/stm32_phyinit.c diff --git a/boards/arm/cloudctrl/src/stm32_relays.c b/boards/arm/stm32/cloudctrl/src/stm32_relays.c similarity index 100% rename from boards/arm/cloudctrl/src/stm32_relays.c rename to boards/arm/stm32/cloudctrl/src/stm32_relays.c diff --git a/boards/arm/cloudctrl/src/stm32_spi.c b/boards/arm/stm32/cloudctrl/src/stm32_spi.c similarity index 100% rename from boards/arm/cloudctrl/src/stm32_spi.c rename to boards/arm/stm32/cloudctrl/src/stm32_spi.c diff --git a/boards/arm/cloudctrl/src/stm32_usb.c b/boards/arm/stm32/cloudctrl/src/stm32_usb.c similarity index 100% rename from boards/arm/cloudctrl/src/stm32_usb.c rename to boards/arm/stm32/cloudctrl/src/stm32_usb.c diff --git a/boards/arm/cloudctrl/src/stm32_usbmsc.c b/boards/arm/stm32/cloudctrl/src/stm32_usbmsc.c similarity index 100% rename from boards/arm/cloudctrl/src/stm32_usbmsc.c rename to boards/arm/stm32/cloudctrl/src/stm32_usbmsc.c diff --git a/boards/arm/cloudctrl/src/stm32_userleds.c b/boards/arm/stm32/cloudctrl/src/stm32_userleds.c similarity index 100% rename from boards/arm/cloudctrl/src/stm32_userleds.c rename to boards/arm/stm32/cloudctrl/src/stm32_userleds.c diff --git a/boards/arm/cloudctrl/src/stm32_w25.c b/boards/arm/stm32/cloudctrl/src/stm32_w25.c similarity index 100% rename from boards/arm/cloudctrl/src/stm32_w25.c rename to boards/arm/stm32/cloudctrl/src/stm32_w25.c diff --git a/boards/arm/cloudctrl/tools/olimex-arm-usb-ocd.cfg b/boards/arm/stm32/cloudctrl/tools/olimex-arm-usb-ocd.cfg similarity index 100% rename from boards/arm/cloudctrl/tools/olimex-arm-usb-ocd.cfg rename to boards/arm/stm32/cloudctrl/tools/olimex-arm-usb-ocd.cfg diff --git a/boards/arm/cloudctrl/tools/oocd.sh b/boards/arm/stm32/cloudctrl/tools/oocd.sh similarity index 100% rename from boards/arm/cloudctrl/tools/oocd.sh rename to boards/arm/stm32/cloudctrl/tools/oocd.sh diff --git a/boards/arm/cloudctrl/tools/stm32.cfg b/boards/arm/stm32/cloudctrl/tools/stm32.cfg similarity index 100% rename from boards/arm/cloudctrl/tools/stm32.cfg rename to boards/arm/stm32/cloudctrl/tools/stm32.cfg diff --git a/boards/arm/olimex-lpc1766stk/tools/usb-driver.txt b/boards/arm/stm32/cloudctrl/tools/usb-driver.txt similarity index 100% rename from boards/arm/olimex-lpc1766stk/tools/usb-driver.txt rename to boards/arm/stm32/cloudctrl/tools/usb-driver.txt diff --git a/boards/arm/fire-stm32v2/Kconfig b/boards/arm/stm32/fire-stm32v2/Kconfig similarity index 100% rename from boards/arm/fire-stm32v2/Kconfig rename to boards/arm/stm32/fire-stm32v2/Kconfig diff --git a/boards/arm/fire-stm32v2/README.txt b/boards/arm/stm32/fire-stm32v2/README.txt similarity index 100% rename from boards/arm/fire-stm32v2/README.txt rename to boards/arm/stm32/fire-stm32v2/README.txt diff --git a/boards/arm/fire-stm32v2/configs/nsh/defconfig b/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig similarity index 99% rename from boards/arm/fire-stm32v2/configs/nsh/defconfig rename to boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig index 7be03c3bfe9..33844465c8a 100644 --- a/boards/arm/fire-stm32v2/configs/nsh/defconfig +++ b/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="fire-stm32v2" CONFIG_ARCH_BOARD_FIRE_STM32=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103VE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/fire-stm32v2/include/board.h b/boards/arm/stm32/fire-stm32v2/include/board.h similarity index 100% rename from boards/arm/fire-stm32v2/include/board.h rename to boards/arm/stm32/fire-stm32v2/include/board.h diff --git a/boards/arm/fire-stm32v2/scripts/Make.defs b/boards/arm/stm32/fire-stm32v2/scripts/Make.defs similarity index 96% rename from boards/arm/fire-stm32v2/scripts/Make.defs rename to boards/arm/stm32/fire-stm32v2/scripts/Make.defs index a2ca054d621..8db23e3a279 100644 --- a/boards/arm/fire-stm32v2/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/fire-stm32v2/scripts/fire-stm32v2-dfu.ld b/boards/arm/stm32/fire-stm32v2/scripts/fire-stm32v2-dfu.ld similarity index 100% rename from boards/arm/fire-stm32v2/scripts/fire-stm32v2-dfu.ld rename to boards/arm/stm32/fire-stm32v2/scripts/fire-stm32v2-dfu.ld diff --git a/boards/arm/fire-stm32v2/scripts/fire-stm32v2.ld b/boards/arm/stm32/fire-stm32v2/scripts/fire-stm32v2.ld similarity index 100% rename from boards/arm/fire-stm32v2/scripts/fire-stm32v2.ld rename to boards/arm/stm32/fire-stm32v2/scripts/fire-stm32v2.ld diff --git a/boards/arm/olimex-efm32g880f128-stk/src/.gitignore b/boards/arm/stm32/fire-stm32v2/src/.gitignore similarity index 100% rename from boards/arm/olimex-efm32g880f128-stk/src/.gitignore rename to boards/arm/stm32/fire-stm32v2/src/.gitignore diff --git a/boards/arm/fire-stm32v2/src/Makefile b/boards/arm/stm32/fire-stm32v2/src/Makefile similarity index 100% rename from boards/arm/fire-stm32v2/src/Makefile rename to boards/arm/stm32/fire-stm32v2/src/Makefile diff --git a/boards/arm/fire-stm32v2/src/fire-stm32v2.h b/boards/arm/stm32/fire-stm32v2/src/fire-stm32v2.h similarity index 100% rename from boards/arm/fire-stm32v2/src/fire-stm32v2.h rename to boards/arm/stm32/fire-stm32v2/src/fire-stm32v2.h diff --git a/boards/arm/fire-stm32v2/src/stm32_appinit.c b/boards/arm/stm32/fire-stm32v2/src/stm32_appinit.c similarity index 100% rename from boards/arm/fire-stm32v2/src/stm32_appinit.c rename to boards/arm/stm32/fire-stm32v2/src/stm32_appinit.c diff --git a/boards/arm/fire-stm32v2/src/stm32_autoleds.c b/boards/arm/stm32/fire-stm32v2/src/stm32_autoleds.c similarity index 100% rename from boards/arm/fire-stm32v2/src/stm32_autoleds.c rename to boards/arm/stm32/fire-stm32v2/src/stm32_autoleds.c diff --git a/boards/arm/fire-stm32v2/src/stm32_boot.c b/boards/arm/stm32/fire-stm32v2/src/stm32_boot.c similarity index 100% rename from boards/arm/fire-stm32v2/src/stm32_boot.c rename to boards/arm/stm32/fire-stm32v2/src/stm32_boot.c diff --git a/boards/arm/fire-stm32v2/src/stm32_buttons.c b/boards/arm/stm32/fire-stm32v2/src/stm32_buttons.c similarity index 100% rename from boards/arm/fire-stm32v2/src/stm32_buttons.c rename to boards/arm/stm32/fire-stm32v2/src/stm32_buttons.c diff --git a/boards/arm/fire-stm32v2/src/stm32_enc28j60.c b/boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c similarity index 100% rename from boards/arm/fire-stm32v2/src/stm32_enc28j60.c rename to boards/arm/stm32/fire-stm32v2/src/stm32_enc28j60.c diff --git a/boards/arm/fire-stm32v2/src/stm32_mmcsd.c b/boards/arm/stm32/fire-stm32v2/src/stm32_mmcsd.c similarity index 100% rename from boards/arm/fire-stm32v2/src/stm32_mmcsd.c rename to boards/arm/stm32/fire-stm32v2/src/stm32_mmcsd.c diff --git a/boards/arm/fire-stm32v2/src/stm32_selectlcd.c b/boards/arm/stm32/fire-stm32v2/src/stm32_selectlcd.c similarity index 100% rename from boards/arm/fire-stm32v2/src/stm32_selectlcd.c rename to boards/arm/stm32/fire-stm32v2/src/stm32_selectlcd.c diff --git a/boards/arm/fire-stm32v2/src/stm32_spi.c b/boards/arm/stm32/fire-stm32v2/src/stm32_spi.c similarity index 100% rename from boards/arm/fire-stm32v2/src/stm32_spi.c rename to boards/arm/stm32/fire-stm32v2/src/stm32_spi.c diff --git a/boards/arm/fire-stm32v2/src/stm32_usbdev.c b/boards/arm/stm32/fire-stm32v2/src/stm32_usbdev.c similarity index 100% rename from boards/arm/fire-stm32v2/src/stm32_usbdev.c rename to boards/arm/stm32/fire-stm32v2/src/stm32_usbdev.c diff --git a/boards/arm/fire-stm32v2/src/stm32_usbmsc.c b/boards/arm/stm32/fire-stm32v2/src/stm32_usbmsc.c similarity index 100% rename from boards/arm/fire-stm32v2/src/stm32_usbmsc.c rename to boards/arm/stm32/fire-stm32v2/src/stm32_usbmsc.c diff --git a/boards/arm/fire-stm32v2/src/stm32_userleds.c b/boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c similarity index 100% rename from boards/arm/fire-stm32v2/src/stm32_userleds.c rename to boards/arm/stm32/fire-stm32v2/src/stm32_userleds.c diff --git a/boards/arm/fire-stm32v2/src/stm32_w25.c b/boards/arm/stm32/fire-stm32v2/src/stm32_w25.c similarity index 100% rename from boards/arm/fire-stm32v2/src/stm32_w25.c rename to boards/arm/stm32/fire-stm32v2/src/stm32_w25.c diff --git a/boards/arm/hymini-stm32v/Kconfig b/boards/arm/stm32/hymini-stm32v/Kconfig similarity index 100% rename from boards/arm/hymini-stm32v/Kconfig rename to boards/arm/stm32/hymini-stm32v/Kconfig diff --git a/boards/arm/hymini-stm32v/README.txt b/boards/arm/stm32/hymini-stm32v/README.txt similarity index 100% rename from boards/arm/hymini-stm32v/README.txt rename to boards/arm/stm32/hymini-stm32v/README.txt diff --git a/boards/arm/hymini-stm32v/configs/nsh/defconfig b/boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig similarity index 98% rename from boards/arm/hymini-stm32v/configs/nsh/defconfig rename to boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig index cb379765ed0..7fa677b6b50 100644 --- a/boards/arm/hymini-stm32v/configs/nsh/defconfig +++ b/boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="hymini-stm32v" CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103VC=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/hymini-stm32v/configs/nsh2/defconfig b/boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig similarity index 99% rename from boards/arm/hymini-stm32v/configs/nsh2/defconfig rename to boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig index 34e6d0e1645..eb01ead845f 100644 --- a/boards/arm/hymini-stm32v/configs/nsh2/defconfig +++ b/boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="hymini-stm32v" CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103VC=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/hymini-stm32v/configs/usbmsc/defconfig b/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig similarity index 98% rename from boards/arm/hymini-stm32v/configs/usbmsc/defconfig rename to boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig index b12fd54a193..df7c982d517 100644 --- a/boards/arm/hymini-stm32v/configs/usbmsc/defconfig +++ b/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="hymini-stm32v" CONFIG_ARCH_BOARD_HYMINI_STM32V=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/hymini-stm32v/configs/usbnsh/defconfig b/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig similarity index 98% rename from boards/arm/hymini-stm32v/configs/usbnsh/defconfig rename to boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig index 33b7c413f8c..e1c25a8ca82 100644 --- a/boards/arm/hymini-stm32v/configs/usbnsh/defconfig +++ b/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="hymini-stm32v" CONFIG_ARCH_BOARD_HYMINI_STM32V=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103VC=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/hymini-stm32v/configs/usbserial/defconfig b/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig similarity index 98% rename from boards/arm/hymini-stm32v/configs/usbserial/defconfig rename to boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig index 55534d750e2..56b054183aa 100644 --- a/boards/arm/hymini-stm32v/configs/usbserial/defconfig +++ b/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="hymini-stm32v" CONFIG_ARCH_BOARD_HYMINI_STM32V=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/hymini-stm32v/include/board.h b/boards/arm/stm32/hymini-stm32v/include/board.h similarity index 100% rename from boards/arm/hymini-stm32v/include/board.h rename to boards/arm/stm32/hymini-stm32v/include/board.h diff --git a/boards/arm/hymini-stm32v/scripts/Make.defs b/boards/arm/stm32/hymini-stm32v/scripts/Make.defs similarity index 96% rename from boards/arm/hymini-stm32v/scripts/Make.defs rename to boards/arm/stm32/hymini-stm32v/scripts/Make.defs index 11f40fa8b93..2666472e19a 100644 --- a/boards/arm/hymini-stm32v/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/hymini-stm32v/scripts/ld.script b/boards/arm/stm32/hymini-stm32v/scripts/ld.script similarity index 100% rename from boards/arm/hymini-stm32v/scripts/ld.script rename to boards/arm/stm32/hymini-stm32v/scripts/ld.script diff --git a/boards/arm/olimex-lpc-h3131/src/.gitignore b/boards/arm/stm32/hymini-stm32v/src/.gitignore similarity index 100% rename from boards/arm/olimex-lpc-h3131/src/.gitignore rename to boards/arm/stm32/hymini-stm32v/src/.gitignore diff --git a/boards/arm/hymini-stm32v/src/Makefile b/boards/arm/stm32/hymini-stm32v/src/Makefile similarity index 100% rename from boards/arm/hymini-stm32v/src/Makefile rename to boards/arm/stm32/hymini-stm32v/src/Makefile diff --git a/boards/arm/hymini-stm32v/src/hymini-stm32v.h b/boards/arm/stm32/hymini-stm32v/src/hymini-stm32v.h similarity index 100% rename from boards/arm/hymini-stm32v/src/hymini-stm32v.h rename to boards/arm/stm32/hymini-stm32v/src/hymini-stm32v.h diff --git a/boards/arm/hymini-stm32v/src/stm32_appinit.c b/boards/arm/stm32/hymini-stm32v/src/stm32_appinit.c similarity index 100% rename from boards/arm/hymini-stm32v/src/stm32_appinit.c rename to boards/arm/stm32/hymini-stm32v/src/stm32_appinit.c diff --git a/boards/arm/hymini-stm32v/src/stm32_boot.c b/boards/arm/stm32/hymini-stm32v/src/stm32_boot.c similarity index 100% rename from boards/arm/hymini-stm32v/src/stm32_boot.c rename to boards/arm/stm32/hymini-stm32v/src/stm32_boot.c diff --git a/boards/arm/hymini-stm32v/src/stm32_buttons.c b/boards/arm/stm32/hymini-stm32v/src/stm32_buttons.c similarity index 100% rename from boards/arm/hymini-stm32v/src/stm32_buttons.c rename to boards/arm/stm32/hymini-stm32v/src/stm32_buttons.c diff --git a/boards/arm/hymini-stm32v/src/stm32_leds.c b/boards/arm/stm32/hymini-stm32v/src/stm32_leds.c similarity index 100% rename from boards/arm/hymini-stm32v/src/stm32_leds.c rename to boards/arm/stm32/hymini-stm32v/src/stm32_leds.c diff --git a/boards/arm/hymini-stm32v/src/stm32_r61505u.c b/boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c similarity index 100% rename from boards/arm/hymini-stm32v/src/stm32_r61505u.c rename to boards/arm/stm32/hymini-stm32v/src/stm32_r61505u.c diff --git a/boards/arm/hymini-stm32v/src/stm32_spi.c b/boards/arm/stm32/hymini-stm32v/src/stm32_spi.c similarity index 100% rename from boards/arm/hymini-stm32v/src/stm32_spi.c rename to boards/arm/stm32/hymini-stm32v/src/stm32_spi.c diff --git a/boards/arm/hymini-stm32v/src/stm32_ssd1289.c b/boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c similarity index 100% rename from boards/arm/hymini-stm32v/src/stm32_ssd1289.c rename to boards/arm/stm32/hymini-stm32v/src/stm32_ssd1289.c diff --git a/boards/arm/hymini-stm32v/src/stm32_ts.c b/boards/arm/stm32/hymini-stm32v/src/stm32_ts.c similarity index 100% rename from boards/arm/hymini-stm32v/src/stm32_ts.c rename to boards/arm/stm32/hymini-stm32v/src/stm32_ts.c diff --git a/boards/arm/hymini-stm32v/src/stm32_usbdev.c b/boards/arm/stm32/hymini-stm32v/src/stm32_usbdev.c similarity index 100% rename from boards/arm/hymini-stm32v/src/stm32_usbdev.c rename to boards/arm/stm32/hymini-stm32v/src/stm32_usbdev.c diff --git a/boards/arm/hymini-stm32v/src/stm32_usbmsc.c b/boards/arm/stm32/hymini-stm32v/src/stm32_usbmsc.c similarity index 100% rename from boards/arm/hymini-stm32v/src/stm32_usbmsc.c rename to boards/arm/stm32/hymini-stm32v/src/stm32_usbmsc.c diff --git a/boards/arm/maple/Kconfig b/boards/arm/stm32/maple/Kconfig similarity index 100% rename from boards/arm/maple/Kconfig rename to boards/arm/stm32/maple/Kconfig diff --git a/boards/arm/maple/README.txt b/boards/arm/stm32/maple/README.txt similarity index 100% rename from boards/arm/maple/README.txt rename to boards/arm/stm32/maple/README.txt diff --git a/boards/arm/maple/configs/nsh/defconfig b/boards/arm/stm32/maple/configs/nsh/defconfig similarity index 98% rename from boards/arm/maple/configs/nsh/defconfig rename to boards/arm/stm32/maple/configs/nsh/defconfig index c6dc2515af0..0a22b32f113 100644 --- a/boards/arm/maple/configs/nsh/defconfig +++ b/boards/arm/stm32/maple/configs/nsh/defconfig @@ -24,6 +24,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="maple" CONFIG_ARCH_BOARD_MAPLE=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103CB=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/maple/configs/nx/defconfig b/boards/arm/stm32/maple/configs/nx/defconfig similarity index 98% rename from boards/arm/maple/configs/nx/defconfig rename to boards/arm/stm32/maple/configs/nx/defconfig index c33a039f06f..437df11b5c1 100644 --- a/boards/arm/maple/configs/nx/defconfig +++ b/boards/arm/stm32/maple/configs/nx/defconfig @@ -26,6 +26,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="maple" CONFIG_ARCH_BOARD_MAPLE=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103CB=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/maple/configs/usbnsh/defconfig b/boards/arm/stm32/maple/configs/usbnsh/defconfig similarity index 98% rename from boards/arm/maple/configs/usbnsh/defconfig rename to boards/arm/stm32/maple/configs/usbnsh/defconfig index 922fee34f92..da66502df97 100644 --- a/boards/arm/maple/configs/usbnsh/defconfig +++ b/boards/arm/stm32/maple/configs/usbnsh/defconfig @@ -25,6 +25,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="maple" CONFIG_ARCH_BOARD_MAPLE=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103CB=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/maple/include/board.h b/boards/arm/stm32/maple/include/board.h similarity index 100% rename from boards/arm/maple/include/board.h rename to boards/arm/stm32/maple/include/board.h diff --git a/boards/arm/maple/scripts/Make.defs b/boards/arm/stm32/maple/scripts/Make.defs similarity index 96% rename from boards/arm/maple/scripts/Make.defs rename to boards/arm/stm32/maple/scripts/Make.defs index 6e5c653efe6..15f19909db4 100644 --- a/boards/arm/maple/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/maple/scripts/ld.script b/boards/arm/stm32/maple/scripts/ld.script similarity index 100% rename from boards/arm/maple/scripts/ld.script rename to boards/arm/stm32/maple/scripts/ld.script diff --git a/boards/arm/maple/scripts/ld.script.dfu b/boards/arm/stm32/maple/scripts/ld.script.dfu similarity index 100% rename from boards/arm/maple/scripts/ld.script.dfu rename to boards/arm/stm32/maple/scripts/ld.script.dfu diff --git a/boards/arm/maple/src/Makefile b/boards/arm/stm32/maple/src/Makefile similarity index 100% rename from boards/arm/maple/src/Makefile rename to boards/arm/stm32/maple/src/Makefile diff --git a/boards/arm/maple/src/maple.h b/boards/arm/stm32/maple/src/maple.h similarity index 100% rename from boards/arm/maple/src/maple.h rename to boards/arm/stm32/maple/src/maple.h diff --git a/boards/arm/maple/src/stm32_appinit.c b/boards/arm/stm32/maple/src/stm32_appinit.c similarity index 100% rename from boards/arm/maple/src/stm32_appinit.c rename to boards/arm/stm32/maple/src/stm32_appinit.c diff --git a/boards/arm/maple/src/stm32_boot.c b/boards/arm/stm32/maple/src/stm32_boot.c similarity index 100% rename from boards/arm/maple/src/stm32_boot.c rename to boards/arm/stm32/maple/src/stm32_boot.c diff --git a/boards/arm/maple/src/stm32_lcd.c b/boards/arm/stm32/maple/src/stm32_lcd.c similarity index 100% rename from boards/arm/maple/src/stm32_lcd.c rename to boards/arm/stm32/maple/src/stm32_lcd.c diff --git a/boards/arm/maple/src/stm32_leds.c b/boards/arm/stm32/maple/src/stm32_leds.c similarity index 100% rename from boards/arm/maple/src/stm32_leds.c rename to boards/arm/stm32/maple/src/stm32_leds.c diff --git a/boards/arm/maple/src/stm32_spi.c b/boards/arm/stm32/maple/src/stm32_spi.c similarity index 100% rename from boards/arm/maple/src/stm32_spi.c rename to boards/arm/stm32/maple/src/stm32_spi.c diff --git a/boards/arm/maple/src/stm32_usbdev.c b/boards/arm/stm32/maple/src/stm32_usbdev.c similarity index 100% rename from boards/arm/maple/src/stm32_usbdev.c rename to boards/arm/stm32/maple/src/stm32_usbdev.c diff --git a/boards/arm/maple/tools/dfu.sh b/boards/arm/stm32/maple/tools/dfu.sh similarity index 100% rename from boards/arm/maple/tools/dfu.sh rename to boards/arm/stm32/maple/tools/dfu.sh diff --git a/boards/arm/maple/tools/env.sh b/boards/arm/stm32/maple/tools/env.sh similarity index 100% rename from boards/arm/maple/tools/env.sh rename to boards/arm/stm32/maple/tools/env.sh diff --git a/boards/arm/mikroe-stm32f4/Kconfig b/boards/arm/stm32/mikroe-stm32f4/Kconfig similarity index 100% rename from boards/arm/mikroe-stm32f4/Kconfig rename to boards/arm/stm32/mikroe-stm32f4/Kconfig diff --git a/boards/arm/mikroe-stm32f4/README.txt b/boards/arm/stm32/mikroe-stm32f4/README.txt similarity index 100% rename from boards/arm/mikroe-stm32f4/README.txt rename to boards/arm/stm32/mikroe-stm32f4/README.txt diff --git a/boards/arm/mikroe-stm32f4/configs/fulldemo/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig similarity index 99% rename from boards/arm/mikroe-stm32f4/configs/fulldemo/defconfig rename to boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig index 7b556de2127..af313ab0de3 100644 --- a/boards/arm/mikroe-stm32f4/configs/fulldemo/defconfig +++ b/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig @@ -18,6 +18,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_BOARD_MIKROE_STM32F4=y CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/mikroe-stm32f4/configs/kostest/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/kostest/defconfig similarity index 99% rename from boards/arm/mikroe-stm32f4/configs/kostest/defconfig rename to boards/arm/stm32/mikroe-stm32f4/configs/kostest/defconfig index bbf85054c22..0d9ea0b571a 100644 --- a/boards/arm/mikroe-stm32f4/configs/kostest/defconfig +++ b/boards/arm/stm32/mikroe-stm32f4/configs/kostest/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_BOARD_MIKROE_STM32F4=y CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/mikroe-stm32f4/configs/nsh/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig similarity index 98% rename from boards/arm/mikroe-stm32f4/configs/nsh/defconfig rename to boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig index 6399bda36b8..70c1e5d5da7 100644 --- a/boards/arm/mikroe-stm32f4/configs/nsh/defconfig +++ b/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_BOARD_MIKROE_STM32F4=y CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/mikroe-stm32f4/configs/nx/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nx/defconfig similarity index 98% rename from boards/arm/mikroe-stm32f4/configs/nx/defconfig rename to boards/arm/stm32/mikroe-stm32f4/configs/nx/defconfig index b73329aac68..081281e5fe0 100644 --- a/boards/arm/mikroe-stm32f4/configs/nx/defconfig +++ b/boards/arm/stm32/mikroe-stm32f4/configs/nx/defconfig @@ -18,6 +18,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_BOARD_MIKROE_STM32F4=y CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/mikroe-stm32f4/configs/nxlines/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nxlines/defconfig similarity index 98% rename from boards/arm/mikroe-stm32f4/configs/nxlines/defconfig rename to boards/arm/stm32/mikroe-stm32f4/configs/nxlines/defconfig index 9a8040e26ea..8b8ce51a770 100644 --- a/boards/arm/mikroe-stm32f4/configs/nxlines/defconfig +++ b/boards/arm/stm32/mikroe-stm32f4/configs/nxlines/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_BOARD_MIKROE_STM32F4=y CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/mikroe-stm32f4/configs/nxtext/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nxtext/defconfig similarity index 98% rename from boards/arm/mikroe-stm32f4/configs/nxtext/defconfig rename to boards/arm/stm32/mikroe-stm32f4/configs/nxtext/defconfig index 8d55499df65..2169c32e0d6 100644 --- a/boards/arm/mikroe-stm32f4/configs/nxtext/defconfig +++ b/boards/arm/stm32/mikroe-stm32f4/configs/nxtext/defconfig @@ -18,6 +18,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_BOARD_MIKROE_STM32F4=y CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/mikroe-stm32f4/configs/usbnsh/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig similarity index 98% rename from boards/arm/mikroe-stm32f4/configs/usbnsh/defconfig rename to boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig index b6b921d7c1b..607775fbbab 100644 --- a/boards/arm/mikroe-stm32f4/configs/usbnsh/defconfig +++ b/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="mikroe-stm32f4" CONFIG_ARCH_BOARD_MIKROE_STM32F4=y CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/mikroe-stm32f4/include/board.h b/boards/arm/stm32/mikroe-stm32f4/include/board.h similarity index 100% rename from boards/arm/mikroe-stm32f4/include/board.h rename to boards/arm/stm32/mikroe-stm32f4/include/board.h diff --git a/boards/arm/open1788/kernel/.gitignore b/boards/arm/stm32/mikroe-stm32f4/kernel/.gitignore similarity index 100% rename from boards/arm/open1788/kernel/.gitignore rename to boards/arm/stm32/mikroe-stm32f4/kernel/.gitignore diff --git a/boards/arm/mikroe-stm32f4/kernel/Makefile b/boards/arm/stm32/mikroe-stm32f4/kernel/Makefile similarity index 90% rename from boards/arm/mikroe-stm32f4/kernel/Makefile rename to boards/arm/stm32/mikroe-stm32f4/kernel/Makefile index e3d57b25397..41df552d61d 100644 --- a/boards/arm/mikroe-stm32f4/kernel/Makefile +++ b/boards/arm/stm32/mikroe-stm32f4/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/mikroe-stm32f4/kernel/stm32_userspace.c b/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c similarity index 100% rename from boards/arm/mikroe-stm32f4/kernel/stm32_userspace.c rename to boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c diff --git a/boards/arm/mikroe-stm32f4/scripts/Make.defs b/boards/arm/stm32/mikroe-stm32f4/scripts/Make.defs similarity index 96% rename from boards/arm/mikroe-stm32f4/scripts/Make.defs rename to boards/arm/stm32/mikroe-stm32f4/scripts/Make.defs index e7ccce395df..7605ed5274d 100644 --- a/boards/arm/mikroe-stm32f4/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/mikroe-stm32f4/scripts/gnu-elf.ld b/boards/arm/stm32/mikroe-stm32f4/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/mikroe-stm32f4/scripts/gnu-elf.ld rename to boards/arm/stm32/mikroe-stm32f4/scripts/gnu-elf.ld diff --git a/boards/arm/mikroe-stm32f4/scripts/kernel-space.ld b/boards/arm/stm32/mikroe-stm32f4/scripts/kernel-space.ld similarity index 100% rename from boards/arm/mikroe-stm32f4/scripts/kernel-space.ld rename to boards/arm/stm32/mikroe-stm32f4/scripts/kernel-space.ld diff --git a/boards/arm/mikroe-stm32f4/scripts/ld.script b/boards/arm/stm32/mikroe-stm32f4/scripts/ld.script similarity index 100% rename from boards/arm/mikroe-stm32f4/scripts/ld.script rename to boards/arm/stm32/mikroe-stm32f4/scripts/ld.script diff --git a/boards/arm/mikroe-stm32f4/scripts/memory.ld b/boards/arm/stm32/mikroe-stm32f4/scripts/memory.ld similarity index 100% rename from boards/arm/mikroe-stm32f4/scripts/memory.ld rename to boards/arm/stm32/mikroe-stm32f4/scripts/memory.ld diff --git a/boards/arm/mikroe-stm32f4/scripts/user-space.ld b/boards/arm/stm32/mikroe-stm32f4/scripts/user-space.ld similarity index 100% rename from boards/arm/mikroe-stm32f4/scripts/user-space.ld rename to boards/arm/stm32/mikroe-stm32f4/scripts/user-space.ld diff --git a/boards/arm/olimex-lpc1766stk/src/.gitignore b/boards/arm/stm32/mikroe-stm32f4/src/.gitignore similarity index 100% rename from boards/arm/olimex-lpc1766stk/src/.gitignore rename to boards/arm/stm32/mikroe-stm32f4/src/.gitignore diff --git a/boards/arm/mikroe-stm32f4/src/Makefile b/boards/arm/stm32/mikroe-stm32f4/src/Makefile similarity index 100% rename from boards/arm/mikroe-stm32f4/src/Makefile rename to boards/arm/stm32/mikroe-stm32f4/src/Makefile diff --git a/boards/arm/mikroe-stm32f4/src/mikroe-stm32f4.h b/boards/arm/stm32/mikroe-stm32f4/src/mikroe-stm32f4.h similarity index 100% rename from boards/arm/mikroe-stm32f4/src/mikroe-stm32f4.h rename to boards/arm/stm32/mikroe-stm32f4/src/mikroe-stm32f4.h diff --git a/boards/arm/mikroe-stm32f4/src/stm32_appinit.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_appinit.c similarity index 100% rename from boards/arm/mikroe-stm32f4/src/stm32_appinit.c rename to boards/arm/stm32/mikroe-stm32f4/src/stm32_appinit.c diff --git a/boards/arm/mikroe-stm32f4/src/stm32_boot.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_boot.c similarity index 100% rename from boards/arm/mikroe-stm32f4/src/stm32_boot.c rename to boards/arm/stm32/mikroe-stm32f4/src/stm32_boot.c diff --git a/boards/arm/mikroe-stm32f4/src/stm32_clockconfig.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_clockconfig.c similarity index 100% rename from boards/arm/mikroe-stm32f4/src/stm32_clockconfig.c rename to boards/arm/stm32/mikroe-stm32f4/src/stm32_clockconfig.c diff --git a/boards/arm/mikroe-stm32f4/src/stm32_extmem.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_extmem.c similarity index 100% rename from boards/arm/mikroe-stm32f4/src/stm32_extmem.c rename to boards/arm/stm32/mikroe-stm32f4/src/stm32_extmem.c diff --git a/boards/arm/mikroe-stm32f4/src/stm32_idle.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_idle.c similarity index 100% rename from boards/arm/mikroe-stm32f4/src/stm32_idle.c rename to boards/arm/stm32/mikroe-stm32f4/src/stm32_idle.c diff --git a/boards/arm/mikroe-stm32f4/src/stm32_mio283qt2.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt2.c similarity index 100% rename from boards/arm/mikroe-stm32f4/src/stm32_mio283qt2.c rename to boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt2.c diff --git a/boards/arm/mikroe-stm32f4/src/stm32_mio283qt9a.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt9a.c similarity index 100% rename from boards/arm/mikroe-stm32f4/src/stm32_mio283qt9a.c rename to boards/arm/stm32/mikroe-stm32f4/src/stm32_mio283qt9a.c diff --git a/boards/arm/mikroe-stm32f4/src/stm32_pm.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_pm.c similarity index 100% rename from boards/arm/mikroe-stm32f4/src/stm32_pm.c rename to boards/arm/stm32/mikroe-stm32f4/src/stm32_pm.c diff --git a/boards/arm/mikroe-stm32f4/src/stm32_pwm.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_pwm.c similarity index 100% rename from boards/arm/mikroe-stm32f4/src/stm32_pwm.c rename to boards/arm/stm32/mikroe-stm32f4/src/stm32_pwm.c diff --git a/boards/arm/mikroe-stm32f4/src/stm32_qencoder.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_qencoder.c similarity index 100% rename from boards/arm/mikroe-stm32f4/src/stm32_qencoder.c rename to boards/arm/stm32/mikroe-stm32f4/src/stm32_qencoder.c diff --git a/boards/arm/mikroe-stm32f4/src/stm32_spi.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_spi.c similarity index 100% rename from boards/arm/mikroe-stm32f4/src/stm32_spi.c rename to boards/arm/stm32/mikroe-stm32f4/src/stm32_spi.c diff --git a/boards/arm/mikroe-stm32f4/src/stm32_touchscreen.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c similarity index 100% rename from boards/arm/mikroe-stm32f4/src/stm32_touchscreen.c rename to boards/arm/stm32/mikroe-stm32f4/src/stm32_touchscreen.c diff --git a/boards/arm/mikroe-stm32f4/src/stm32_usb.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_usb.c similarity index 100% rename from boards/arm/mikroe-stm32f4/src/stm32_usb.c rename to boards/arm/stm32/mikroe-stm32f4/src/stm32_usb.c diff --git a/boards/arm/mikroe-stm32f4/src/stm32_vs1053.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_vs1053.c similarity index 100% rename from boards/arm/mikroe-stm32f4/src/stm32_vs1053.c rename to boards/arm/stm32/mikroe-stm32f4/src/stm32_vs1053.c diff --git a/boards/arm/nucleo-f103rb/Kconfig b/boards/arm/stm32/nucleo-f103rb/Kconfig similarity index 100% rename from boards/arm/nucleo-f103rb/Kconfig rename to boards/arm/stm32/nucleo-f103rb/Kconfig diff --git a/boards/arm/nucleo-f103rb/README.txt b/boards/arm/stm32/nucleo-f103rb/README.txt similarity index 100% rename from boards/arm/nucleo-f103rb/README.txt rename to boards/arm/stm32/nucleo-f103rb/README.txt diff --git a/boards/arm/nucleo-f103rb/configs/adc/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/adc/defconfig similarity index 98% rename from boards/arm/nucleo-f103rb/configs/adc/defconfig rename to boards/arm/stm32/nucleo-f103rb/configs/adc/defconfig index 079e5de6b06..cacc4e177dc 100644 --- a/boards/arm/nucleo-f103rb/configs/adc/defconfig +++ b/boards/arm/stm32/nucleo-f103rb/configs/adc/defconfig @@ -11,6 +11,7 @@ CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f103rb" CONFIG_ARCH_BOARD_NUCLEO_F103RB=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103RB=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f103rb/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/nsh/defconfig similarity index 98% rename from boards/arm/nucleo-f103rb/configs/nsh/defconfig rename to boards/arm/stm32/nucleo-f103rb/configs/nsh/defconfig index 4c8208291b4..357e4a54651 100644 --- a/boards/arm/nucleo-f103rb/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f103rb/configs/nsh/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f103rb" CONFIG_ARCH_BOARD_NUCLEO_F103RB=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103RB=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f103rb/configs/pwm/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig similarity index 98% rename from boards/arm/nucleo-f103rb/configs/pwm/defconfig rename to boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig index 8f46be21318..a9b30eda80f 100644 --- a/boards/arm/nucleo-f103rb/configs/pwm/defconfig +++ b/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f103rb" CONFIG_ARCH_BOARD_NUCLEO_F103RB=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103RB=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f103rb/include/board.h b/boards/arm/stm32/nucleo-f103rb/include/board.h similarity index 100% rename from boards/arm/nucleo-f103rb/include/board.h rename to boards/arm/stm32/nucleo-f103rb/include/board.h diff --git a/boards/arm/nucleo-f103rb/scripts/Make.defs b/boards/arm/stm32/nucleo-f103rb/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-f103rb/scripts/Make.defs rename to boards/arm/stm32/nucleo-f103rb/scripts/Make.defs index 03ff5410cf2..5656eeac1b5 100644 --- a/boards/arm/nucleo-f103rb/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-f103rb/scripts/ld.script b/boards/arm/stm32/nucleo-f103rb/scripts/ld.script similarity index 100% rename from boards/arm/nucleo-f103rb/scripts/ld.script rename to boards/arm/stm32/nucleo-f103rb/scripts/ld.script diff --git a/boards/arm/nucleo-f103rb/src/Makefile b/boards/arm/stm32/nucleo-f103rb/src/Makefile similarity index 100% rename from boards/arm/nucleo-f103rb/src/Makefile rename to boards/arm/stm32/nucleo-f103rb/src/Makefile diff --git a/boards/arm/nucleo-f103rb/src/nucleo-f103rb.h b/boards/arm/stm32/nucleo-f103rb/src/nucleo-f103rb.h similarity index 100% rename from boards/arm/nucleo-f103rb/src/nucleo-f103rb.h rename to boards/arm/stm32/nucleo-f103rb/src/nucleo-f103rb.h diff --git a/boards/arm/nucleo-f103rb/src/stm32_adc.c b/boards/arm/stm32/nucleo-f103rb/src/stm32_adc.c similarity index 100% rename from boards/arm/nucleo-f103rb/src/stm32_adc.c rename to boards/arm/stm32/nucleo-f103rb/src/stm32_adc.c diff --git a/boards/arm/nucleo-f103rb/src/stm32_appinitialize.c b/boards/arm/stm32/nucleo-f103rb/src/stm32_appinitialize.c similarity index 100% rename from boards/arm/nucleo-f103rb/src/stm32_appinitialize.c rename to boards/arm/stm32/nucleo-f103rb/src/stm32_appinitialize.c diff --git a/boards/arm/nucleo-f103rb/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f103rb/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-f103rb/src/stm32_autoleds.c rename to boards/arm/stm32/nucleo-f103rb/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-f103rb/src/stm32_boot.c b/boards/arm/stm32/nucleo-f103rb/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-f103rb/src/stm32_boot.c rename to boards/arm/stm32/nucleo-f103rb/src/stm32_boot.c diff --git a/boards/arm/nucleo-f103rb/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f103rb/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-f103rb/src/stm32_buttons.c rename to boards/arm/stm32/nucleo-f103rb/src/stm32_buttons.c diff --git a/boards/arm/nucleo-f103rb/src/stm32_pwm.c b/boards/arm/stm32/nucleo-f103rb/src/stm32_pwm.c similarity index 100% rename from boards/arm/nucleo-f103rb/src/stm32_pwm.c rename to boards/arm/stm32/nucleo-f103rb/src/stm32_pwm.c diff --git a/boards/arm/nucleo-f103rb/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f103rb/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-f103rb/src/stm32_userleds.c rename to boards/arm/stm32/nucleo-f103rb/src/stm32_userleds.c diff --git a/boards/arm/nucleo-f207zg/Kconfig b/boards/arm/stm32/nucleo-f207zg/Kconfig similarity index 100% rename from boards/arm/nucleo-f207zg/Kconfig rename to boards/arm/stm32/nucleo-f207zg/Kconfig diff --git a/boards/arm/nucleo-f207zg/README.txt b/boards/arm/stm32/nucleo-f207zg/README.txt similarity index 100% rename from boards/arm/nucleo-f207zg/README.txt rename to boards/arm/stm32/nucleo-f207zg/README.txt diff --git a/boards/arm/nucleo-f207zg/configs/adc/defconfig b/boards/arm/stm32/nucleo-f207zg/configs/adc/defconfig similarity index 98% rename from boards/arm/nucleo-f207zg/configs/adc/defconfig rename to boards/arm/stm32/nucleo-f207zg/configs/adc/defconfig index d4758836eeb..b70b60c5491 100644 --- a/boards/arm/nucleo-f207zg/configs/adc/defconfig +++ b/boards/arm/stm32/nucleo-f207zg/configs/adc/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f207zg" CONFIG_ARCH_BOARD_NUCLEO_F207ZG=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f207zg/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f207zg/configs/nsh/defconfig similarity index 97% rename from boards/arm/nucleo-f207zg/configs/nsh/defconfig rename to boards/arm/stm32/nucleo-f207zg/configs/nsh/defconfig index 2f8f1a76c15..a9c45e0936d 100644 --- a/boards/arm/nucleo-f207zg/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f207zg/configs/nsh/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f207zg" CONFIG_ARCH_BOARD_NUCLEO_F207ZG=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f207zg/configs/pwm/defconfig b/boards/arm/stm32/nucleo-f207zg/configs/pwm/defconfig similarity index 98% rename from boards/arm/nucleo-f207zg/configs/pwm/defconfig rename to boards/arm/stm32/nucleo-f207zg/configs/pwm/defconfig index 70ad14900cc..5cc6a15ccf6 100644 --- a/boards/arm/nucleo-f207zg/configs/pwm/defconfig +++ b/boards/arm/stm32/nucleo-f207zg/configs/pwm/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f207zg" CONFIG_ARCH_BOARD_NUCLEO_F207ZG=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f207zg/include/board.h b/boards/arm/stm32/nucleo-f207zg/include/board.h similarity index 100% rename from boards/arm/nucleo-f207zg/include/board.h rename to boards/arm/stm32/nucleo-f207zg/include/board.h diff --git a/boards/arm/nucleo-f207zg/scripts/Make.defs b/boards/arm/stm32/nucleo-f207zg/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-f207zg/scripts/Make.defs rename to boards/arm/stm32/nucleo-f207zg/scripts/Make.defs index 4f8e821e538..65f0b12a615 100644 --- a/boards/arm/nucleo-f207zg/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-f207zg/scripts/ld.script b/boards/arm/stm32/nucleo-f207zg/scripts/ld.script similarity index 100% rename from boards/arm/nucleo-f207zg/scripts/ld.script rename to boards/arm/stm32/nucleo-f207zg/scripts/ld.script diff --git a/boards/arm/nucleo-f207zg/src/Makefile b/boards/arm/stm32/nucleo-f207zg/src/Makefile similarity index 100% rename from boards/arm/nucleo-f207zg/src/Makefile rename to boards/arm/stm32/nucleo-f207zg/src/Makefile diff --git a/boards/arm/nucleo-f207zg/src/nucleo-f207zg.h b/boards/arm/stm32/nucleo-f207zg/src/nucleo-f207zg.h similarity index 100% rename from boards/arm/nucleo-f207zg/src/nucleo-f207zg.h rename to boards/arm/stm32/nucleo-f207zg/src/nucleo-f207zg.h diff --git a/boards/arm/nucleo-f207zg/src/stm32_adc.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_adc.c similarity index 100% rename from boards/arm/nucleo-f207zg/src/stm32_adc.c rename to boards/arm/stm32/nucleo-f207zg/src/stm32_adc.c diff --git a/boards/arm/nucleo-f207zg/src/stm32_appinitialize.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_appinitialize.c similarity index 100% rename from boards/arm/nucleo-f207zg/src/stm32_appinitialize.c rename to boards/arm/stm32/nucleo-f207zg/src/stm32_appinitialize.c diff --git a/boards/arm/nucleo-f207zg/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-f207zg/src/stm32_autoleds.c rename to boards/arm/stm32/nucleo-f207zg/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-f207zg/src/stm32_boot.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-f207zg/src/stm32_boot.c rename to boards/arm/stm32/nucleo-f207zg/src/stm32_boot.c diff --git a/boards/arm/nucleo-f207zg/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_bringup.c similarity index 100% rename from boards/arm/nucleo-f207zg/src/stm32_bringup.c rename to boards/arm/stm32/nucleo-f207zg/src/stm32_bringup.c diff --git a/boards/arm/nucleo-f207zg/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-f207zg/src/stm32_buttons.c rename to boards/arm/stm32/nucleo-f207zg/src/stm32_buttons.c diff --git a/boards/arm/nucleo-f207zg/src/stm32_pwm.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_pwm.c similarity index 100% rename from boards/arm/nucleo-f207zg/src/stm32_pwm.c rename to boards/arm/stm32/nucleo-f207zg/src/stm32_pwm.c diff --git a/boards/arm/nucleo-f207zg/src/stm32_usb.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_usb.c similarity index 100% rename from boards/arm/nucleo-f207zg/src/stm32_usb.c rename to boards/arm/stm32/nucleo-f207zg/src/stm32_usb.c diff --git a/boards/arm/nucleo-f207zg/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f207zg/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-f207zg/src/stm32_userleds.c rename to boards/arm/stm32/nucleo-f207zg/src/stm32_userleds.c diff --git a/boards/arm/nucleo-f302r8/Kconfig b/boards/arm/stm32/nucleo-f302r8/Kconfig similarity index 100% rename from boards/arm/nucleo-f302r8/Kconfig rename to boards/arm/stm32/nucleo-f302r8/Kconfig diff --git a/boards/arm/nucleo-f302r8/README.txt b/boards/arm/stm32/nucleo-f302r8/README.txt similarity index 100% rename from boards/arm/nucleo-f302r8/README.txt rename to boards/arm/stm32/nucleo-f302r8/README.txt diff --git a/boards/arm/nucleo-f302r8/configs/highpri/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig similarity index 98% rename from boards/arm/nucleo-f302r8/configs/highpri/defconfig rename to boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig index 86c31b6e9db..ec4f36d6a41 100644 --- a/boards/arm/nucleo-f302r8/configs/highpri/defconfig +++ b/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f302r8" CONFIG_ARCH_BOARD_NUCLEO_F302R8=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F302R8=y CONFIG_ARCH_HIPRI_INTERRUPT=y diff --git a/boards/arm/nucleo-f302r8/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig similarity index 99% rename from boards/arm/nucleo-f302r8/configs/nsh/defconfig rename to boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig index d6c8af4aa20..9588918d72f 100644 --- a/boards/arm/nucleo-f302r8/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f302r8" CONFIG_ARCH_BOARD_NUCLEO_F302R8=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F302R8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f302r8/include/board.h b/boards/arm/stm32/nucleo-f302r8/include/board.h similarity index 100% rename from boards/arm/nucleo-f302r8/include/board.h rename to boards/arm/stm32/nucleo-f302r8/include/board.h diff --git a/boards/arm/nucleo-f302r8/scripts/Make.defs b/boards/arm/stm32/nucleo-f302r8/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-f302r8/scripts/Make.defs rename to boards/arm/stm32/nucleo-f302r8/scripts/Make.defs index bb45c6c2394..601c6ca218e 100644 --- a/boards/arm/nucleo-f302r8/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-f302r8/scripts/ld.script b/boards/arm/stm32/nucleo-f302r8/scripts/ld.script similarity index 100% rename from boards/arm/nucleo-f302r8/scripts/ld.script rename to boards/arm/stm32/nucleo-f302r8/scripts/ld.script diff --git a/boards/arm/nucleo-f302r8/src/Makefile b/boards/arm/stm32/nucleo-f302r8/src/Makefile similarity index 100% rename from boards/arm/nucleo-f302r8/src/Makefile rename to boards/arm/stm32/nucleo-f302r8/src/Makefile diff --git a/boards/arm/nucleo-f302r8/src/nucleo-f302r8.h b/boards/arm/stm32/nucleo-f302r8/src/nucleo-f302r8.h similarity index 100% rename from boards/arm/nucleo-f302r8/src/nucleo-f302r8.h rename to boards/arm/stm32/nucleo-f302r8/src/nucleo-f302r8.h diff --git a/boards/arm/nucleo-f302r8/src/stm32_appinitialize.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_appinitialize.c similarity index 100% rename from boards/arm/nucleo-f302r8/src/stm32_appinitialize.c rename to boards/arm/stm32/nucleo-f302r8/src/stm32_appinitialize.c diff --git a/boards/arm/nucleo-f302r8/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-f302r8/src/stm32_autoleds.c rename to boards/arm/stm32/nucleo-f302r8/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-f302r8/src/stm32_boot.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-f302r8/src/stm32_boot.c rename to boards/arm/stm32/nucleo-f302r8/src/stm32_boot.c diff --git a/boards/arm/nucleo-f302r8/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-f302r8/src/stm32_buttons.c rename to boards/arm/stm32/nucleo-f302r8/src/stm32_buttons.c diff --git a/boards/arm/nucleo-f302r8/src/stm32_highpri.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c similarity index 100% rename from boards/arm/nucleo-f302r8/src/stm32_highpri.c rename to boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c diff --git a/boards/arm/nucleo-f302r8/src/stm32_pwm.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_pwm.c similarity index 100% rename from boards/arm/nucleo-f302r8/src/stm32_pwm.c rename to boards/arm/stm32/nucleo-f302r8/src/stm32_pwm.c diff --git a/boards/arm/nucleo-f302r8/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-f302r8/src/stm32_userleds.c rename to boards/arm/stm32/nucleo-f302r8/src/stm32_userleds.c diff --git a/boards/arm/nucleo-f303re/Kconfig b/boards/arm/stm32/nucleo-f303re/Kconfig similarity index 100% rename from boards/arm/nucleo-f303re/Kconfig rename to boards/arm/stm32/nucleo-f303re/Kconfig diff --git a/boards/arm/nucleo-f303re/README.txt b/boards/arm/stm32/nucleo-f303re/README.txt similarity index 100% rename from boards/arm/nucleo-f303re/README.txt rename to boards/arm/stm32/nucleo-f303re/README.txt diff --git a/boards/arm/nucleo-f303re/configs/adc/defconfig b/boards/arm/stm32/nucleo-f303re/configs/adc/defconfig similarity index 98% rename from boards/arm/nucleo-f303re/configs/adc/defconfig rename to boards/arm/stm32/nucleo-f303re/configs/adc/defconfig index 5d3d5a58b47..f7792448ca5 100644 --- a/boards/arm/nucleo-f303re/configs/adc/defconfig +++ b/boards/arm/stm32/nucleo-f303re/configs/adc/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f303re" CONFIG_ARCH_BOARD_NUCLEO_F303RE=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303RE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f303re/configs/can/defconfig b/boards/arm/stm32/nucleo-f303re/configs/can/defconfig similarity index 97% rename from boards/arm/nucleo-f303re/configs/can/defconfig rename to boards/arm/stm32/nucleo-f303re/configs/can/defconfig index d9b8ab9ef27..3b55d943ac5 100644 --- a/boards/arm/nucleo-f303re/configs/can/defconfig +++ b/boards/arm/stm32/nucleo-f303re/configs/can/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f303re" CONFIG_ARCH_BOARD_NUCLEO_F303RE=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303RE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f303re/configs/hello/defconfig b/boards/arm/stm32/nucleo-f303re/configs/hello/defconfig similarity index 97% rename from boards/arm/nucleo-f303re/configs/hello/defconfig rename to boards/arm/stm32/nucleo-f303re/configs/hello/defconfig index aa1bd5c0da9..e7e8753e1b3 100644 --- a/boards/arm/nucleo-f303re/configs/hello/defconfig +++ b/boards/arm/stm32/nucleo-f303re/configs/hello/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f303re" CONFIG_ARCH_BOARD_NUCLEO_F303RE=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303RE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f303re/configs/nxlines/defconfig b/boards/arm/stm32/nucleo-f303re/configs/nxlines/defconfig similarity index 98% rename from boards/arm/nucleo-f303re/configs/nxlines/defconfig rename to boards/arm/stm32/nucleo-f303re/configs/nxlines/defconfig index 915d55fac96..19fa855ee68 100644 --- a/boards/arm/nucleo-f303re/configs/nxlines/defconfig +++ b/boards/arm/stm32/nucleo-f303re/configs/nxlines/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f303re" CONFIG_ARCH_BOARD_NUCLEO_F303RE=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303RE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f303re/configs/pwm/defconfig b/boards/arm/stm32/nucleo-f303re/configs/pwm/defconfig similarity index 98% rename from boards/arm/nucleo-f303re/configs/pwm/defconfig rename to boards/arm/stm32/nucleo-f303re/configs/pwm/defconfig index 4919a2749e7..fc23d1881f5 100644 --- a/boards/arm/nucleo-f303re/configs/pwm/defconfig +++ b/boards/arm/stm32/nucleo-f303re/configs/pwm/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f303re" CONFIG_ARCH_BOARD_NUCLEO_F303RE=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303RE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f303re/configs/serialrx/defconfig b/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig similarity index 98% rename from boards/arm/nucleo-f303re/configs/serialrx/defconfig rename to boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig index 40280d41336..e64a5c40327 100644 --- a/boards/arm/nucleo-f303re/configs/serialrx/defconfig +++ b/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f303re" CONFIG_ARCH_BOARD_NUCLEO_F303RE=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303RE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f303re/include/board.h b/boards/arm/stm32/nucleo-f303re/include/board.h similarity index 100% rename from boards/arm/nucleo-f303re/include/board.h rename to boards/arm/stm32/nucleo-f303re/include/board.h diff --git a/boards/arm/nucleo-f303re/scripts/Make.defs b/boards/arm/stm32/nucleo-f303re/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-f303re/scripts/Make.defs rename to boards/arm/stm32/nucleo-f303re/scripts/Make.defs index 0f9e91c5bbd..4cb8e5e0fe1 100644 --- a/boards/arm/nucleo-f303re/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-f303re/scripts/ld.script b/boards/arm/stm32/nucleo-f303re/scripts/ld.script similarity index 100% rename from boards/arm/nucleo-f303re/scripts/ld.script rename to boards/arm/stm32/nucleo-f303re/scripts/ld.script diff --git a/boards/arm/nucleo-f303re/src/Makefile b/boards/arm/stm32/nucleo-f303re/src/Makefile similarity index 100% rename from boards/arm/nucleo-f303re/src/Makefile rename to boards/arm/stm32/nucleo-f303re/src/Makefile diff --git a/boards/arm/nucleo-f303re/src/nucleo-f303re.h b/boards/arm/stm32/nucleo-f303re/src/nucleo-f303re.h similarity index 100% rename from boards/arm/nucleo-f303re/src/nucleo-f303re.h rename to boards/arm/stm32/nucleo-f303re/src/nucleo-f303re.h diff --git a/boards/arm/nucleo-f303re/src/stm32_adc.c b/boards/arm/stm32/nucleo-f303re/src/stm32_adc.c similarity index 100% rename from boards/arm/nucleo-f303re/src/stm32_adc.c rename to boards/arm/stm32/nucleo-f303re/src/stm32_adc.c diff --git a/boards/arm/nucleo-f303re/src/stm32_appinitialize.c b/boards/arm/stm32/nucleo-f303re/src/stm32_appinitialize.c similarity index 100% rename from boards/arm/nucleo-f303re/src/stm32_appinitialize.c rename to boards/arm/stm32/nucleo-f303re/src/stm32_appinitialize.c diff --git a/boards/arm/nucleo-f303re/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f303re/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-f303re/src/stm32_autoleds.c rename to boards/arm/stm32/nucleo-f303re/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-f303re/src/stm32_boot.c b/boards/arm/stm32/nucleo-f303re/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-f303re/src/stm32_boot.c rename to boards/arm/stm32/nucleo-f303re/src/stm32_boot.c diff --git a/boards/arm/nucleo-f303re/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f303re/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-f303re/src/stm32_buttons.c rename to boards/arm/stm32/nucleo-f303re/src/stm32_buttons.c diff --git a/boards/arm/nucleo-f303re/src/stm32_can.c b/boards/arm/stm32/nucleo-f303re/src/stm32_can.c similarity index 100% rename from boards/arm/nucleo-f303re/src/stm32_can.c rename to boards/arm/stm32/nucleo-f303re/src/stm32_can.c diff --git a/boards/arm/nucleo-f303re/src/stm32_pwm.c b/boards/arm/stm32/nucleo-f303re/src/stm32_pwm.c similarity index 100% rename from boards/arm/nucleo-f303re/src/stm32_pwm.c rename to boards/arm/stm32/nucleo-f303re/src/stm32_pwm.c diff --git a/boards/arm/nucleo-f303re/src/stm32_spi.c b/boards/arm/stm32/nucleo-f303re/src/stm32_spi.c similarity index 100% rename from boards/arm/nucleo-f303re/src/stm32_spi.c rename to boards/arm/stm32/nucleo-f303re/src/stm32_spi.c diff --git a/boards/arm/nucleo-f303re/src/stm32_ssd1351.c b/boards/arm/stm32/nucleo-f303re/src/stm32_ssd1351.c similarity index 100% rename from boards/arm/nucleo-f303re/src/stm32_ssd1351.c rename to boards/arm/stm32/nucleo-f303re/src/stm32_ssd1351.c diff --git a/boards/arm/nucleo-f303re/src/stm32_timer.c b/boards/arm/stm32/nucleo-f303re/src/stm32_timer.c similarity index 100% rename from boards/arm/nucleo-f303re/src/stm32_timer.c rename to boards/arm/stm32/nucleo-f303re/src/stm32_timer.c diff --git a/boards/arm/nucleo-f303re/src/stm32_uid.c b/boards/arm/stm32/nucleo-f303re/src/stm32_uid.c similarity index 100% rename from boards/arm/nucleo-f303re/src/stm32_uid.c rename to boards/arm/stm32/nucleo-f303re/src/stm32_uid.c diff --git a/boards/arm/nucleo-f303re/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f303re/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-f303re/src/stm32_userleds.c rename to boards/arm/stm32/nucleo-f303re/src/stm32_userleds.c diff --git a/boards/arm/nucleo-f303ze/Kconfig b/boards/arm/stm32/nucleo-f303ze/Kconfig similarity index 100% rename from boards/arm/nucleo-f303ze/Kconfig rename to boards/arm/stm32/nucleo-f303ze/Kconfig diff --git a/boards/arm/nucleo-f303ze/README.txt b/boards/arm/stm32/nucleo-f303ze/README.txt similarity index 100% rename from boards/arm/nucleo-f303ze/README.txt rename to boards/arm/stm32/nucleo-f303ze/README.txt diff --git a/boards/arm/nucleo-f303ze/configs/adc/defconfig b/boards/arm/stm32/nucleo-f303ze/configs/adc/defconfig similarity index 98% rename from boards/arm/nucleo-f303ze/configs/adc/defconfig rename to boards/arm/stm32/nucleo-f303ze/configs/adc/defconfig index 6de30250bd1..5123a13e1d0 100644 --- a/boards/arm/nucleo-f303ze/configs/adc/defconfig +++ b/boards/arm/stm32/nucleo-f303ze/configs/adc/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f303ze" CONFIG_ARCH_BOARD_NUCLEO_F303ZE=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303ZE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f303ze/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f303ze/configs/nsh/defconfig similarity index 98% rename from boards/arm/nucleo-f303ze/configs/nsh/defconfig rename to boards/arm/stm32/nucleo-f303ze/configs/nsh/defconfig index bc800aa885a..e7217fe7d7a 100644 --- a/boards/arm/nucleo-f303ze/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f303ze/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f303ze" CONFIG_ARCH_BOARD_NUCLEO_F303ZE=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303ZE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f303ze/configs/nxlines_oled/defconfig b/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig similarity index 98% rename from boards/arm/nucleo-f303ze/configs/nxlines_oled/defconfig rename to boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig index fce455db806..c00d00f4d6d 100644 --- a/boards/arm/nucleo-f303ze/configs/nxlines_oled/defconfig +++ b/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f303ze" CONFIG_ARCH_BOARD_NUCLEO_F303ZE=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303ZE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f303ze/include/board.h b/boards/arm/stm32/nucleo-f303ze/include/board.h similarity index 100% rename from boards/arm/nucleo-f303ze/include/board.h rename to boards/arm/stm32/nucleo-f303ze/include/board.h diff --git a/boards/arm/nucleo-f303ze/scripts/Make.defs b/boards/arm/stm32/nucleo-f303ze/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-f303ze/scripts/Make.defs rename to boards/arm/stm32/nucleo-f303ze/scripts/Make.defs index 8833e4f36e5..7779e20a5e5 100644 --- a/boards/arm/nucleo-f303ze/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-f303ze/scripts/ld.script b/boards/arm/stm32/nucleo-f303ze/scripts/ld.script similarity index 100% rename from boards/arm/nucleo-f303ze/scripts/ld.script rename to boards/arm/stm32/nucleo-f303ze/scripts/ld.script diff --git a/boards/arm/nucleo-f303ze/src/Makefile b/boards/arm/stm32/nucleo-f303ze/src/Makefile similarity index 100% rename from boards/arm/nucleo-f303ze/src/Makefile rename to boards/arm/stm32/nucleo-f303ze/src/Makefile diff --git a/boards/arm/nucleo-f303ze/src/nucleo-f303ze.h b/boards/arm/stm32/nucleo-f303ze/src/nucleo-f303ze.h similarity index 100% rename from boards/arm/nucleo-f303ze/src/nucleo-f303ze.h rename to boards/arm/stm32/nucleo-f303ze/src/nucleo-f303ze.h diff --git a/boards/arm/nucleo-f303ze/src/stm32_adc.c b/boards/arm/stm32/nucleo-f303ze/src/stm32_adc.c similarity index 100% rename from boards/arm/nucleo-f303ze/src/stm32_adc.c rename to boards/arm/stm32/nucleo-f303ze/src/stm32_adc.c diff --git a/boards/arm/nucleo-f303ze/src/stm32_appinitialize.c b/boards/arm/stm32/nucleo-f303ze/src/stm32_appinitialize.c similarity index 100% rename from boards/arm/nucleo-f303ze/src/stm32_appinitialize.c rename to boards/arm/stm32/nucleo-f303ze/src/stm32_appinitialize.c diff --git a/boards/arm/nucleo-f303ze/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f303ze/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-f303ze/src/stm32_autoleds.c rename to boards/arm/stm32/nucleo-f303ze/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-f303ze/src/stm32_boot.c b/boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-f303ze/src/stm32_boot.c rename to boards/arm/stm32/nucleo-f303ze/src/stm32_boot.c diff --git a/boards/arm/nucleo-f303ze/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f303ze/src/stm32_bringup.c similarity index 100% rename from boards/arm/nucleo-f303ze/src/stm32_bringup.c rename to boards/arm/stm32/nucleo-f303ze/src/stm32_bringup.c diff --git a/boards/arm/nucleo-f303ze/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f303ze/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-f303ze/src/stm32_buttons.c rename to boards/arm/stm32/nucleo-f303ze/src/stm32_buttons.c diff --git a/boards/arm/nucleo-f303ze/src/stm32_ssd1306.c b/boards/arm/stm32/nucleo-f303ze/src/stm32_ssd1306.c similarity index 100% rename from boards/arm/nucleo-f303ze/src/stm32_ssd1306.c rename to boards/arm/stm32/nucleo-f303ze/src/stm32_ssd1306.c diff --git a/boards/arm/nucleo-f303ze/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f303ze/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-f303ze/src/stm32_userleds.c rename to boards/arm/stm32/nucleo-f303ze/src/stm32_userleds.c diff --git a/boards/arm/nucleo-f334r8/Kconfig b/boards/arm/stm32/nucleo-f334r8/Kconfig similarity index 100% rename from boards/arm/nucleo-f334r8/Kconfig rename to boards/arm/stm32/nucleo-f334r8/Kconfig diff --git a/boards/arm/nucleo-f334r8/README.txt b/boards/arm/stm32/nucleo-f334r8/README.txt similarity index 100% rename from boards/arm/nucleo-f334r8/README.txt rename to boards/arm/stm32/nucleo-f334r8/README.txt diff --git a/boards/arm/nucleo-f334r8/configs/adc/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig similarity index 99% rename from boards/arm/nucleo-f334r8/configs/adc/defconfig rename to boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig index 18a2b122b7a..4f0a5ecec9d 100644 --- a/boards/arm/nucleo-f334r8/configs/adc/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f334r8" CONFIG_ARCH_BOARD_NUCLEO_F334R8=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F334R8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f334r8/configs/highpri/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig similarity index 98% rename from boards/arm/nucleo-f334r8/configs/highpri/defconfig rename to boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig index 5e4cdf5646a..1d238f2462a 100644 --- a/boards/arm/nucleo-f334r8/configs/highpri/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f334r8" CONFIG_ARCH_BOARD_NUCLEO_F334R8=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F334R8=y CONFIG_ARCH_HIPRI_INTERRUPT=y diff --git a/boards/arm/nucleo-f334r8/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig similarity index 99% rename from boards/arm/nucleo-f334r8/configs/nsh/defconfig rename to boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig index ddbd6506583..ec46ea0734f 100644 --- a/boards/arm/nucleo-f334r8/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f334r8" CONFIG_ARCH_BOARD_NUCLEO_F334R8=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F334R8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-f334r8/configs/spwm1/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig similarity index 98% rename from boards/arm/nucleo-f334r8/configs/spwm1/defconfig rename to boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig index d38b97c44ab..4c794e462ae 100644 --- a/boards/arm/nucleo-f334r8/configs/spwm1/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f334r8" CONFIG_ARCH_BOARD_NUCLEO_F334R8=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F334R8=y CONFIG_ARCH_HIPRI_INTERRUPT=y diff --git a/boards/arm/nucleo-f334r8/configs/spwm2/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig similarity index 98% rename from boards/arm/nucleo-f334r8/configs/spwm2/defconfig rename to boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig index 910ea6f28cd..e993ece0d96 100644 --- a/boards/arm/nucleo-f334r8/configs/spwm2/defconfig +++ b/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f334r8" CONFIG_ARCH_BOARD_NUCLEO_F334R8=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F334R8=y CONFIG_ARCH_HIPRI_INTERRUPT=y diff --git a/boards/arm/nucleo-f334r8/include/board.h b/boards/arm/stm32/nucleo-f334r8/include/board.h similarity index 100% rename from boards/arm/nucleo-f334r8/include/board.h rename to boards/arm/stm32/nucleo-f334r8/include/board.h diff --git a/boards/arm/nucleo-f334r8/scripts/Make.defs b/boards/arm/stm32/nucleo-f334r8/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-f334r8/scripts/Make.defs rename to boards/arm/stm32/nucleo-f334r8/scripts/Make.defs index 5ce0d8ff444..f54288e8e94 100644 --- a/boards/arm/nucleo-f334r8/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-f334r8/scripts/ld.script b/boards/arm/stm32/nucleo-f334r8/scripts/ld.script similarity index 100% rename from boards/arm/nucleo-f334r8/scripts/ld.script rename to boards/arm/stm32/nucleo-f334r8/scripts/ld.script diff --git a/boards/arm/nucleo-f334r8/src/Makefile b/boards/arm/stm32/nucleo-f334r8/src/Makefile similarity index 100% rename from boards/arm/nucleo-f334r8/src/Makefile rename to boards/arm/stm32/nucleo-f334r8/src/Makefile diff --git a/boards/arm/nucleo-f334r8/src/nucleo-f334r8.h b/boards/arm/stm32/nucleo-f334r8/src/nucleo-f334r8.h similarity index 100% rename from boards/arm/nucleo-f334r8/src/nucleo-f334r8.h rename to boards/arm/stm32/nucleo-f334r8/src/nucleo-f334r8.h diff --git a/boards/arm/nucleo-f334r8/src/stm32_adc.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_adc.c similarity index 100% rename from boards/arm/nucleo-f334r8/src/stm32_adc.c rename to boards/arm/stm32/nucleo-f334r8/src/stm32_adc.c diff --git a/boards/arm/nucleo-f334r8/src/stm32_appinit.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_appinit.c similarity index 100% rename from boards/arm/nucleo-f334r8/src/stm32_appinit.c rename to boards/arm/stm32/nucleo-f334r8/src/stm32_appinit.c diff --git a/boards/arm/nucleo-f334r8/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-f334r8/src/stm32_autoleds.c rename to boards/arm/stm32/nucleo-f334r8/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-f334r8/src/stm32_boot.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-f334r8/src/stm32_boot.c rename to boards/arm/stm32/nucleo-f334r8/src/stm32_boot.c diff --git a/boards/arm/nucleo-f334r8/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-f334r8/src/stm32_buttons.c rename to boards/arm/stm32/nucleo-f334r8/src/stm32_buttons.c diff --git a/boards/arm/nucleo-f334r8/src/stm32_can.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_can.c similarity index 100% rename from boards/arm/nucleo-f334r8/src/stm32_can.c rename to boards/arm/stm32/nucleo-f334r8/src/stm32_can.c diff --git a/boards/arm/nucleo-f334r8/src/stm32_comp.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_comp.c similarity index 100% rename from boards/arm/nucleo-f334r8/src/stm32_comp.c rename to boards/arm/stm32/nucleo-f334r8/src/stm32_comp.c diff --git a/boards/arm/nucleo-f334r8/src/stm32_highpri.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c similarity index 100% rename from boards/arm/nucleo-f334r8/src/stm32_highpri.c rename to boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c diff --git a/boards/arm/nucleo-f334r8/src/stm32_hrtim.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_hrtim.c similarity index 100% rename from boards/arm/nucleo-f334r8/src/stm32_hrtim.c rename to boards/arm/stm32/nucleo-f334r8/src/stm32_hrtim.c diff --git a/boards/arm/nucleo-f334r8/src/stm32_opamp.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_opamp.c similarity index 100% rename from boards/arm/nucleo-f334r8/src/stm32_opamp.c rename to boards/arm/stm32/nucleo-f334r8/src/stm32_opamp.c diff --git a/boards/arm/nucleo-f334r8/src/stm32_pwm.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_pwm.c similarity index 100% rename from boards/arm/nucleo-f334r8/src/stm32_pwm.c rename to boards/arm/stm32/nucleo-f334r8/src/stm32_pwm.c diff --git a/boards/arm/nucleo-f334r8/src/stm32_spi.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_spi.c similarity index 100% rename from boards/arm/nucleo-f334r8/src/stm32_spi.c rename to boards/arm/stm32/nucleo-f334r8/src/stm32_spi.c diff --git a/boards/arm/nucleo-f334r8/src/stm32_spwm.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c similarity index 100% rename from boards/arm/nucleo-f334r8/src/stm32_spwm.c rename to boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c diff --git a/boards/arm/nucleo-f334r8/src/stm32_timer.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_timer.c similarity index 100% rename from boards/arm/nucleo-f334r8/src/stm32_timer.c rename to boards/arm/stm32/nucleo-f334r8/src/stm32_timer.c diff --git a/boards/arm/nucleo-f334r8/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-f334r8/src/stm32_userleds.c rename to boards/arm/stm32/nucleo-f334r8/src/stm32_userleds.c diff --git a/boards/arm/nucleo-f410rb/Kconfig b/boards/arm/stm32/nucleo-f410rb/Kconfig similarity index 100% rename from boards/arm/nucleo-f410rb/Kconfig rename to boards/arm/stm32/nucleo-f410rb/Kconfig diff --git a/boards/arm/nucleo-f410rb/README.txt b/boards/arm/stm32/nucleo-f410rb/README.txt similarity index 100% rename from boards/arm/nucleo-f410rb/README.txt rename to boards/arm/stm32/nucleo-f410rb/README.txt diff --git a/boards/arm/nucleo-f410rb/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig similarity index 98% rename from boards/arm/nucleo-f410rb/configs/nsh/defconfig rename to boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig index 6ee10cdf0ef..5057bff939e 100644 --- a/boards/arm/nucleo-f410rb/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f410rb" CONFIG_ARCH_BOARD_NUCLEO_F410RB=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F410RB=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/nucleo-f410rb/include/board.h b/boards/arm/stm32/nucleo-f410rb/include/board.h similarity index 100% rename from boards/arm/nucleo-f410rb/include/board.h rename to boards/arm/stm32/nucleo-f410rb/include/board.h diff --git a/boards/arm/nucleo-f410rb/scripts/Make.defs b/boards/arm/stm32/nucleo-f410rb/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-f410rb/scripts/Make.defs rename to boards/arm/stm32/nucleo-f410rb/scripts/Make.defs index 512c67f88dc..ca251c9f528 100644 --- a/boards/arm/nucleo-f410rb/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-f410rb/scripts/f410rb.ld b/boards/arm/stm32/nucleo-f410rb/scripts/f410rb.ld similarity index 100% rename from boards/arm/nucleo-f410rb/scripts/f410rb.ld rename to boards/arm/stm32/nucleo-f410rb/scripts/f410rb.ld diff --git a/boards/arm/nucleo-f410rb/src/Makefile b/boards/arm/stm32/nucleo-f410rb/src/Makefile similarity index 100% rename from boards/arm/nucleo-f410rb/src/Makefile rename to boards/arm/stm32/nucleo-f410rb/src/Makefile diff --git a/boards/arm/nucleo-f410rb/src/nucleo-f410rb.h b/boards/arm/stm32/nucleo-f410rb/src/nucleo-f410rb.h similarity index 100% rename from boards/arm/nucleo-f410rb/src/nucleo-f410rb.h rename to boards/arm/stm32/nucleo-f410rb/src/nucleo-f410rb.h diff --git a/boards/arm/nucleo-f410rb/src/stm32_adc.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_adc.c similarity index 100% rename from boards/arm/nucleo-f410rb/src/stm32_adc.c rename to boards/arm/stm32/nucleo-f410rb/src/stm32_adc.c diff --git a/boards/arm/nucleo-f410rb/src/stm32_appinit.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_appinit.c similarity index 100% rename from boards/arm/nucleo-f410rb/src/stm32_appinit.c rename to boards/arm/stm32/nucleo-f410rb/src/stm32_appinit.c diff --git a/boards/arm/nucleo-f410rb/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-f410rb/src/stm32_autoleds.c rename to boards/arm/stm32/nucleo-f410rb/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-f410rb/src/stm32_boot.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-f410rb/src/stm32_boot.c rename to boards/arm/stm32/nucleo-f410rb/src/stm32_boot.c diff --git a/boards/arm/nucleo-f410rb/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_bringup.c similarity index 100% rename from boards/arm/nucleo-f410rb/src/stm32_bringup.c rename to boards/arm/stm32/nucleo-f410rb/src/stm32_bringup.c diff --git a/boards/arm/nucleo-f410rb/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-f410rb/src/stm32_buttons.c rename to boards/arm/stm32/nucleo-f410rb/src/stm32_buttons.c diff --git a/boards/arm/nucleo-f410rb/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f410rb/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-f410rb/src/stm32_userleds.c rename to boards/arm/stm32/nucleo-f410rb/src/stm32_userleds.c diff --git a/boards/arm/nucleo-f446re/Kconfig b/boards/arm/stm32/nucleo-f446re/Kconfig similarity index 100% rename from boards/arm/nucleo-f446re/Kconfig rename to boards/arm/stm32/nucleo-f446re/Kconfig diff --git a/boards/arm/nucleo-f446re/README.txt b/boards/arm/stm32/nucleo-f446re/README.txt similarity index 100% rename from boards/arm/nucleo-f446re/README.txt rename to boards/arm/stm32/nucleo-f446re/README.txt diff --git a/boards/arm/nucleo-f446re/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig similarity index 98% rename from boards/arm/nucleo-f446re/configs/nsh/defconfig rename to boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig index b33427b4c82..9c8d6161c1a 100644 --- a/boards/arm/nucleo-f446re/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f446re" CONFIG_ARCH_BOARD_NUCLEO_F446RE=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F446R=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/nucleo-f446re/include/board.h b/boards/arm/stm32/nucleo-f446re/include/board.h similarity index 100% rename from boards/arm/nucleo-f446re/include/board.h rename to boards/arm/stm32/nucleo-f446re/include/board.h diff --git a/boards/arm/nucleo-f446re/include/nucleo-f446re.h b/boards/arm/stm32/nucleo-f446re/include/nucleo-f446re.h similarity index 100% rename from boards/arm/nucleo-f446re/include/nucleo-f446re.h rename to boards/arm/stm32/nucleo-f446re/include/nucleo-f446re.h diff --git a/boards/arm/nucleo-f446re/scripts/Make.defs b/boards/arm/stm32/nucleo-f446re/scripts/Make.defs similarity index 99% rename from boards/arm/nucleo-f446re/scripts/Make.defs rename to boards/arm/stm32/nucleo-f446re/scripts/Make.defs index 2f4e46c0be6..0a823694576 100644 --- a/boards/arm/nucleo-f446re/scripts/Make.defs +++ b/boards/arm/stm32/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)$(DELIM)$(CONFIG_ARCH_BOARD) +BOARD_DIR = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD) endif ifeq ($(WINTOOL),y) diff --git a/boards/arm/nucleo-f446re/scripts/f446re.ld b/boards/arm/stm32/nucleo-f446re/scripts/f446re.ld similarity index 100% rename from boards/arm/nucleo-f446re/scripts/f446re.ld rename to boards/arm/stm32/nucleo-f446re/scripts/f446re.ld diff --git a/boards/arm/olimex-lpc2378/src/.gitignore b/boards/arm/stm32/nucleo-f446re/src/.gitignore similarity index 100% rename from boards/arm/olimex-lpc2378/src/.gitignore rename to boards/arm/stm32/nucleo-f446re/src/.gitignore diff --git a/boards/arm/nucleo-f446re/src/Makefile b/boards/arm/stm32/nucleo-f446re/src/Makefile similarity index 100% rename from boards/arm/nucleo-f446re/src/Makefile rename to boards/arm/stm32/nucleo-f446re/src/Makefile diff --git a/boards/arm/nucleo-f446re/src/nucleo-f446re.h b/boards/arm/stm32/nucleo-f446re/src/nucleo-f446re.h similarity index 100% rename from boards/arm/nucleo-f446re/src/nucleo-f446re.h rename to boards/arm/stm32/nucleo-f446re/src/nucleo-f446re.h diff --git a/boards/arm/nucleo-f446re/src/stm32_adc.c b/boards/arm/stm32/nucleo-f446re/src/stm32_adc.c similarity index 100% rename from boards/arm/nucleo-f446re/src/stm32_adc.c rename to boards/arm/stm32/nucleo-f446re/src/stm32_adc.c diff --git a/boards/arm/nucleo-f446re/src/stm32_ajoystick.c b/boards/arm/stm32/nucleo-f446re/src/stm32_ajoystick.c similarity index 100% rename from boards/arm/nucleo-f446re/src/stm32_ajoystick.c rename to boards/arm/stm32/nucleo-f446re/src/stm32_ajoystick.c diff --git a/boards/arm/nucleo-f446re/src/stm32_appinit.c b/boards/arm/stm32/nucleo-f446re/src/stm32_appinit.c similarity index 100% rename from boards/arm/nucleo-f446re/src/stm32_appinit.c rename to boards/arm/stm32/nucleo-f446re/src/stm32_appinit.c diff --git a/boards/arm/nucleo-f446re/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f446re/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-f446re/src/stm32_autoleds.c rename to boards/arm/stm32/nucleo-f446re/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-f446re/src/stm32_boot.c b/boards/arm/stm32/nucleo-f446re/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-f446re/src/stm32_boot.c rename to boards/arm/stm32/nucleo-f446re/src/stm32_boot.c diff --git a/boards/arm/nucleo-f446re/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f446re/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-f446re/src/stm32_buttons.c rename to boards/arm/stm32/nucleo-f446re/src/stm32_buttons.c diff --git a/boards/arm/nucleo-f446re/src/stm32_qencoder.c b/boards/arm/stm32/nucleo-f446re/src/stm32_qencoder.c similarity index 100% rename from boards/arm/nucleo-f446re/src/stm32_qencoder.c rename to boards/arm/stm32/nucleo-f446re/src/stm32_qencoder.c diff --git a/boards/arm/nucleo-f446re/src/stm32_spi.c b/boards/arm/stm32/nucleo-f446re/src/stm32_spi.c similarity index 100% rename from boards/arm/nucleo-f446re/src/stm32_spi.c rename to boards/arm/stm32/nucleo-f446re/src/stm32_spi.c diff --git a/boards/arm/nucleo-f446re/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f446re/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-f446re/src/stm32_userleds.c rename to boards/arm/stm32/nucleo-f446re/src/stm32_userleds.c diff --git a/boards/arm/nucleo-f4x1re/Kconfig b/boards/arm/stm32/nucleo-f4x1re/Kconfig similarity index 100% rename from boards/arm/nucleo-f4x1re/Kconfig rename to boards/arm/stm32/nucleo-f4x1re/Kconfig diff --git a/boards/arm/nucleo-f4x1re/README.txt b/boards/arm/stm32/nucleo-f4x1re/README.txt similarity index 100% rename from boards/arm/nucleo-f4x1re/README.txt rename to boards/arm/stm32/nucleo-f4x1re/README.txt diff --git a/boards/arm/nucleo-f4x1re/configs/f401-nsh/defconfig b/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig similarity index 98% rename from boards/arm/nucleo-f4x1re/configs/f401-nsh/defconfig rename to boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig index 3b2b848e686..b58bf02668f 100644 --- a/boards/arm/nucleo-f4x1re/configs/f401-nsh/defconfig +++ b/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f4x1re" CONFIG_ARCH_BOARD_NUCLEO_F401RE=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F401RE=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/nucleo-f4x1re/configs/f411-nsh/defconfig b/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig similarity index 98% rename from boards/arm/nucleo-f4x1re/configs/f411-nsh/defconfig rename to boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig index a92b91de72c..17f766f34f0 100644 --- a/boards/arm/nucleo-f4x1re/configs/f411-nsh/defconfig +++ b/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f4x1re" CONFIG_ARCH_BOARD_NUCLEO_F411RE=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F411RE=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/nucleo-f4x1re/include/board.h b/boards/arm/stm32/nucleo-f4x1re/include/board.h similarity index 100% rename from boards/arm/nucleo-f4x1re/include/board.h rename to boards/arm/stm32/nucleo-f4x1re/include/board.h diff --git a/boards/arm/nucleo-f4x1re/include/nucleo-f401re.h b/boards/arm/stm32/nucleo-f4x1re/include/nucleo-f401re.h similarity index 100% rename from boards/arm/nucleo-f4x1re/include/nucleo-f401re.h rename to boards/arm/stm32/nucleo-f4x1re/include/nucleo-f401re.h diff --git a/boards/arm/nucleo-f4x1re/include/nucleo-f411re.h b/boards/arm/stm32/nucleo-f4x1re/include/nucleo-f411re.h similarity index 100% rename from boards/arm/nucleo-f4x1re/include/nucleo-f411re.h rename to boards/arm/stm32/nucleo-f4x1re/include/nucleo-f411re.h diff --git a/boards/arm/nucleo-f4x1re/scripts/Make.defs b/boards/arm/stm32/nucleo-f4x1re/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-f4x1re/scripts/Make.defs rename to boards/arm/stm32/nucleo-f4x1re/scripts/Make.defs index f28cd3a1773..adc599c87b5 100644 --- a/boards/arm/nucleo-f4x1re/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) diff --git a/boards/arm/nucleo-f4x1re/scripts/f401re.ld b/boards/arm/stm32/nucleo-f4x1re/scripts/f401re.ld similarity index 100% rename from boards/arm/nucleo-f4x1re/scripts/f401re.ld rename to boards/arm/stm32/nucleo-f4x1re/scripts/f401re.ld diff --git a/boards/arm/nucleo-f4x1re/scripts/f411re.ld b/boards/arm/stm32/nucleo-f4x1re/scripts/f411re.ld similarity index 100% rename from boards/arm/nucleo-f4x1re/scripts/f411re.ld rename to boards/arm/stm32/nucleo-f4x1re/scripts/f411re.ld diff --git a/boards/arm/nucleo-f4x1re/src/Makefile b/boards/arm/stm32/nucleo-f4x1re/src/Makefile similarity index 100% rename from boards/arm/nucleo-f4x1re/src/Makefile rename to boards/arm/stm32/nucleo-f4x1re/src/Makefile diff --git a/boards/arm/nucleo-f4x1re/src/nucleo-f4x1re.h b/boards/arm/stm32/nucleo-f4x1re/src/nucleo-f4x1re.h similarity index 100% rename from boards/arm/nucleo-f4x1re/src/nucleo-f4x1re.h rename to boards/arm/stm32/nucleo-f4x1re/src/nucleo-f4x1re.h diff --git a/boards/arm/nucleo-f4x1re/src/stm32_adc.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c similarity index 100% rename from boards/arm/nucleo-f4x1re/src/stm32_adc.c rename to boards/arm/stm32/nucleo-f4x1re/src/stm32_adc.c diff --git a/boards/arm/nucleo-f4x1re/src/stm32_ajoystick.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_ajoystick.c similarity index 100% rename from boards/arm/nucleo-f4x1re/src/stm32_ajoystick.c rename to boards/arm/stm32/nucleo-f4x1re/src/stm32_ajoystick.c diff --git a/boards/arm/nucleo-f4x1re/src/stm32_appinit.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_appinit.c similarity index 100% rename from boards/arm/nucleo-f4x1re/src/stm32_appinit.c rename to boards/arm/stm32/nucleo-f4x1re/src/stm32_appinit.c diff --git a/boards/arm/nucleo-f4x1re/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-f4x1re/src/stm32_autoleds.c rename to boards/arm/stm32/nucleo-f4x1re/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-f4x1re/src/stm32_boot.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-f4x1re/src/stm32_boot.c rename to boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c diff --git a/boards/arm/nucleo-f4x1re/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_bringup.c similarity index 100% rename from boards/arm/nucleo-f4x1re/src/stm32_bringup.c rename to boards/arm/stm32/nucleo-f4x1re/src/stm32_bringup.c diff --git a/boards/arm/nucleo-f4x1re/src/stm32_buttons.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-f4x1re/src/stm32_buttons.c rename to boards/arm/stm32/nucleo-f4x1re/src/stm32_buttons.c diff --git a/boards/arm/nucleo-f4x1re/src/stm32_qencoder.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_qencoder.c similarity index 100% rename from boards/arm/nucleo-f4x1re/src/stm32_qencoder.c rename to boards/arm/stm32/nucleo-f4x1re/src/stm32_qencoder.c diff --git a/boards/arm/nucleo-f4x1re/src/stm32_spi.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c similarity index 100% rename from boards/arm/nucleo-f4x1re/src/stm32_spi.c rename to boards/arm/stm32/nucleo-f4x1re/src/stm32_spi.c diff --git a/boards/arm/nucleo-f4x1re/src/stm32_userleds.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-f4x1re/src/stm32_userleds.c rename to boards/arm/stm32/nucleo-f4x1re/src/stm32_userleds.c diff --git a/boards/arm/nucleo-l152re/Kconfig b/boards/arm/stm32/nucleo-l152re/Kconfig similarity index 100% rename from boards/arm/nucleo-l152re/Kconfig rename to boards/arm/stm32/nucleo-l152re/Kconfig diff --git a/boards/arm/nucleo-l152re/README.txt b/boards/arm/stm32/nucleo-l152re/README.txt similarity index 100% rename from boards/arm/nucleo-l152re/README.txt rename to boards/arm/stm32/nucleo-l152re/README.txt diff --git a/boards/arm/nucleo-l152re/configs/nsh/defconfig b/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig similarity index 98% rename from boards/arm/nucleo-l152re/configs/nsh/defconfig rename to boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig index 7358d104bb1..e6f31b0ef84 100644 --- a/boards/arm/nucleo-l152re/configs/nsh/defconfig +++ b/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-l152re" CONFIG_ARCH_BOARD_NUCLEO_L152RE=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32L152RE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-l152re/include/board.h b/boards/arm/stm32/nucleo-l152re/include/board.h similarity index 100% rename from boards/arm/nucleo-l152re/include/board.h rename to boards/arm/stm32/nucleo-l152re/include/board.h diff --git a/boards/arm/nucleo-l152re/scripts/Make.defs b/boards/arm/stm32/nucleo-l152re/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-l152re/scripts/Make.defs rename to boards/arm/stm32/nucleo-l152re/scripts/Make.defs index cac831ba5ed..ae5b09b18d2 100644 --- a/boards/arm/nucleo-l152re/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-l152re/scripts/ld.script b/boards/arm/stm32/nucleo-l152re/scripts/ld.script similarity index 100% rename from boards/arm/nucleo-l152re/scripts/ld.script rename to boards/arm/stm32/nucleo-l152re/scripts/ld.script diff --git a/boards/arm/nucleo-l152re/src/Makefile b/boards/arm/stm32/nucleo-l152re/src/Makefile similarity index 100% rename from boards/arm/nucleo-l152re/src/Makefile rename to boards/arm/stm32/nucleo-l152re/src/Makefile diff --git a/boards/arm/nucleo-l152re/src/nucleo-l152re.h b/boards/arm/stm32/nucleo-l152re/src/nucleo-l152re.h similarity index 100% rename from boards/arm/nucleo-l152re/src/nucleo-l152re.h rename to boards/arm/stm32/nucleo-l152re/src/nucleo-l152re.h diff --git a/boards/arm/nucleo-l152re/src/stm32_appinitialize.c b/boards/arm/stm32/nucleo-l152re/src/stm32_appinitialize.c similarity index 100% rename from boards/arm/nucleo-l152re/src/stm32_appinitialize.c rename to boards/arm/stm32/nucleo-l152re/src/stm32_appinitialize.c diff --git a/boards/arm/nucleo-l152re/src/stm32_autoleds.c b/boards/arm/stm32/nucleo-l152re/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-l152re/src/stm32_autoleds.c rename to boards/arm/stm32/nucleo-l152re/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-l152re/src/stm32_boot.c b/boards/arm/stm32/nucleo-l152re/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-l152re/src/stm32_boot.c rename to boards/arm/stm32/nucleo-l152re/src/stm32_boot.c diff --git a/boards/arm/nucleo-l152re/src/stm32_buttons.c b/boards/arm/stm32/nucleo-l152re/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-l152re/src/stm32_buttons.c rename to boards/arm/stm32/nucleo-l152re/src/stm32_buttons.c diff --git a/boards/arm/nucleo-l152re/src/stm32_userleds.c b/boards/arm/stm32/nucleo-l152re/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-l152re/src/stm32_userleds.c rename to boards/arm/stm32/nucleo-l152re/src/stm32_userleds.c diff --git a/boards/arm/olimex-stm32-e407/Kconfig b/boards/arm/stm32/olimex-stm32-e407/Kconfig similarity index 100% rename from boards/arm/olimex-stm32-e407/Kconfig rename to boards/arm/stm32/olimex-stm32-e407/Kconfig diff --git a/boards/arm/olimex-stm32-e407/README.txt b/boards/arm/stm32/olimex-stm32-e407/README.txt similarity index 100% rename from boards/arm/olimex-stm32-e407/README.txt rename to boards/arm/stm32/olimex-stm32-e407/README.txt diff --git a/boards/arm/olimex-stm32-e407/configs/bmp180/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig similarity index 98% rename from boards/arm/olimex-stm32-e407/configs/bmp180/defconfig rename to boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig index f6b5557bb82..db9a57deb93 100644 --- a/boards/arm/olimex-stm32-e407/configs/bmp180/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-e407/configs/dac/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig similarity index 98% rename from boards/arm/olimex-stm32-e407/configs/dac/defconfig rename to boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig index 77f614d02cd..4a1b5945975 100644 --- a/boards/arm/olimex-stm32-e407/configs/dac/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-e407/configs/discover/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig similarity index 98% rename from boards/arm/olimex-stm32-e407/configs/discover/defconfig rename to boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig index c75f28dd265..9868fb4bf11 100644 --- a/boards/arm/olimex-stm32-e407/configs/discover/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-e407/configs/ina219/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig similarity index 98% rename from boards/arm/olimex-stm32-e407/configs/ina219/defconfig rename to boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig index 5a4d22ce25f..c2311ceaf76 100644 --- a/boards/arm/olimex-stm32-e407/configs/ina219/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig similarity index 99% rename from boards/arm/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig rename to boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig index f9d7d6a8501..1b4570263ed 100644 --- a/boards/arm/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-e407/configs/mrf24j40-mac/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-mac/defconfig similarity index 98% rename from boards/arm/olimex-stm32-e407/configs/mrf24j40-mac/defconfig rename to boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-mac/defconfig index e87600b4bde..8a303806f21 100644 --- a/boards/arm/olimex-stm32-e407/configs/mrf24j40-mac/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-mac/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-e407/configs/netnsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig similarity index 98% rename from boards/arm/olimex-stm32-e407/configs/netnsh/defconfig rename to boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig index 30f49e50372..835dae3e5d2 100644 --- a/boards/arm/olimex-stm32-e407/configs/netnsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-e407/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig similarity index 98% rename from boards/arm/olimex-stm32-e407/configs/nsh/defconfig rename to boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig index 94c6e0b5d39..6b17b8b507d 100644 --- a/boards/arm/olimex-stm32-e407/configs/nsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-e407/configs/telnetd/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig similarity index 98% rename from boards/arm/olimex-stm32-e407/configs/telnetd/defconfig rename to boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig index 4d0dfbb3bc8..dfb6120008f 100644 --- a/boards/arm/olimex-stm32-e407/configs/telnetd/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-e407/configs/timer/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig similarity index 98% rename from boards/arm/olimex-stm32-e407/configs/timer/defconfig rename to boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig index ab7f171baba..f0a95640b71 100644 --- a/boards/arm/olimex-stm32-e407/configs/timer/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-e407/configs/usbnsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig similarity index 98% rename from boards/arm/olimex-stm32-e407/configs/usbnsh/defconfig rename to boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig index a0046046e68..384c078bb4a 100644 --- a/boards/arm/olimex-stm32-e407/configs/usbnsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-e407/configs/webserver/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig similarity index 98% rename from boards/arm/olimex-stm32-e407/configs/webserver/defconfig rename to boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig index f7ad656ecb9..dad9d19b374 100644 --- a/boards/arm/olimex-stm32-e407/configs/webserver/defconfig +++ b/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-e407" CONFIG_ARCH_BOARD_OLIMEX_STM32E407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-e407/include/board.h b/boards/arm/stm32/olimex-stm32-e407/include/board.h similarity index 100% rename from boards/arm/olimex-stm32-e407/include/board.h rename to boards/arm/stm32/olimex-stm32-e407/include/board.h diff --git a/boards/arm/olimex-stm32-e407/scripts/Make.defs b/boards/arm/stm32/olimex-stm32-e407/scripts/Make.defs similarity index 96% rename from boards/arm/olimex-stm32-e407/scripts/Make.defs rename to boards/arm/stm32/olimex-stm32-e407/scripts/Make.defs index 0ed55238bac..bed1f6b98a2 100644 --- a/boards/arm/olimex-stm32-e407/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/olimex-stm32-e407/scripts/ld.script b/boards/arm/stm32/olimex-stm32-e407/scripts/ld.script similarity index 100% rename from boards/arm/olimex-stm32-e407/scripts/ld.script rename to boards/arm/stm32/olimex-stm32-e407/scripts/ld.script diff --git a/boards/arm/olimex-stm32-e407/src/Makefile b/boards/arm/stm32/olimex-stm32-e407/src/Makefile similarity index 100% rename from boards/arm/olimex-stm32-e407/src/Makefile rename to boards/arm/stm32/olimex-stm32-e407/src/Makefile diff --git a/boards/arm/olimex-stm32-e407/src/olimex-stm32-e407.h b/boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h similarity index 100% rename from boards/arm/olimex-stm32-e407/src/olimex-stm32-e407.h rename to boards/arm/stm32/olimex-stm32-e407/src/olimex-stm32-e407.h diff --git a/boards/arm/olimex-stm32-e407/src/stm32_adc.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_adc.c similarity index 100% rename from boards/arm/olimex-stm32-e407/src/stm32_adc.c rename to boards/arm/stm32/olimex-stm32-e407/src/stm32_adc.c diff --git a/boards/arm/olimex-stm32-e407/src/stm32_appinit.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_appinit.c similarity index 100% rename from boards/arm/olimex-stm32-e407/src/stm32_appinit.c rename to boards/arm/stm32/olimex-stm32-e407/src/stm32_appinit.c diff --git a/boards/arm/olimex-stm32-e407/src/stm32_autoleds.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_autoleds.c similarity index 100% rename from boards/arm/olimex-stm32-e407/src/stm32_autoleds.c rename to boards/arm/stm32/olimex-stm32-e407/src/stm32_autoleds.c diff --git a/boards/arm/olimex-stm32-e407/src/stm32_bmp180.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_bmp180.c similarity index 100% rename from boards/arm/olimex-stm32-e407/src/stm32_bmp180.c rename to boards/arm/stm32/olimex-stm32-e407/src/stm32_bmp180.c diff --git a/boards/arm/olimex-stm32-e407/src/stm32_boot.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_boot.c similarity index 100% rename from boards/arm/olimex-stm32-e407/src/stm32_boot.c rename to boards/arm/stm32/olimex-stm32-e407/src/stm32_boot.c diff --git a/boards/arm/olimex-stm32-e407/src/stm32_bringup.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c similarity index 100% rename from boards/arm/olimex-stm32-e407/src/stm32_bringup.c rename to boards/arm/stm32/olimex-stm32-e407/src/stm32_bringup.c diff --git a/boards/arm/olimex-stm32-e407/src/stm32_buttons.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_buttons.c similarity index 100% rename from boards/arm/olimex-stm32-e407/src/stm32_buttons.c rename to boards/arm/stm32/olimex-stm32-e407/src/stm32_buttons.c diff --git a/boards/arm/olimex-stm32-e407/src/stm32_can.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_can.c similarity index 100% rename from boards/arm/olimex-stm32-e407/src/stm32_can.c rename to boards/arm/stm32/olimex-stm32-e407/src/stm32_can.c diff --git a/boards/arm/olimex-stm32-e407/src/stm32_dac.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_dac.c similarity index 100% rename from boards/arm/olimex-stm32-e407/src/stm32_dac.c rename to boards/arm/stm32/olimex-stm32-e407/src/stm32_dac.c diff --git a/boards/arm/olimex-stm32-e407/src/stm32_ina219.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_ina219.c similarity index 100% rename from boards/arm/olimex-stm32-e407/src/stm32_ina219.c rename to boards/arm/stm32/olimex-stm32-e407/src/stm32_ina219.c diff --git a/boards/arm/olimex-stm32-e407/src/stm32_mrf24j40.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_mrf24j40.c similarity index 100% rename from boards/arm/olimex-stm32-e407/src/stm32_mrf24j40.c rename to boards/arm/stm32/olimex-stm32-e407/src/stm32_mrf24j40.c diff --git a/boards/arm/olimex-stm32-e407/src/stm32_spi.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_spi.c similarity index 100% rename from boards/arm/olimex-stm32-e407/src/stm32_spi.c rename to boards/arm/stm32/olimex-stm32-e407/src/stm32_spi.c diff --git a/boards/arm/olimex-stm32-e407/src/stm32_timer.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_timer.c similarity index 100% rename from boards/arm/olimex-stm32-e407/src/stm32_timer.c rename to boards/arm/stm32/olimex-stm32-e407/src/stm32_timer.c diff --git a/boards/arm/olimex-stm32-e407/src/stm32_usb.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_usb.c similarity index 100% rename from boards/arm/olimex-stm32-e407/src/stm32_usb.c rename to boards/arm/stm32/olimex-stm32-e407/src/stm32_usb.c diff --git a/boards/arm/olimex-stm32-e407/src/stm32_userleds.c b/boards/arm/stm32/olimex-stm32-e407/src/stm32_userleds.c similarity index 100% rename from boards/arm/olimex-stm32-e407/src/stm32_userleds.c rename to boards/arm/stm32/olimex-stm32-e407/src/stm32_userleds.c diff --git a/boards/arm/olimex-stm32-h405/Kconfig b/boards/arm/stm32/olimex-stm32-h405/Kconfig similarity index 100% rename from boards/arm/olimex-stm32-h405/Kconfig rename to boards/arm/stm32/olimex-stm32-h405/Kconfig diff --git a/boards/arm/olimex-stm32-h405/README.txt b/boards/arm/stm32/olimex-stm32-h405/README.txt similarity index 100% rename from boards/arm/olimex-stm32-h405/README.txt rename to boards/arm/stm32/olimex-stm32-h405/README.txt diff --git a/boards/arm/olimex-stm32-h405/configs/usbnsh/defconfig b/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig similarity index 98% rename from boards/arm/olimex-stm32-h405/configs/usbnsh/defconfig rename to boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig index 6eb6a77a741..a6731b0efe2 100644 --- a/boards/arm/olimex-stm32-h405/configs/usbnsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-h405" CONFIG_ARCH_BOARD_OLIMEX_STM32H405=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F405RG=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/olimex-stm32-h405/include/board.h b/boards/arm/stm32/olimex-stm32-h405/include/board.h similarity index 100% rename from boards/arm/olimex-stm32-h405/include/board.h rename to boards/arm/stm32/olimex-stm32-h405/include/board.h diff --git a/boards/arm/olimex-stm32-h405/scripts/Make.defs b/boards/arm/stm32/olimex-stm32-h405/scripts/Make.defs similarity index 96% rename from boards/arm/olimex-stm32-h405/scripts/Make.defs rename to boards/arm/stm32/olimex-stm32-h405/scripts/Make.defs index 0ebe39ecc2e..1d4b01ed3e0 100644 --- a/boards/arm/olimex-stm32-h405/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/olimex-stm32-h405/scripts/ld.script b/boards/arm/stm32/olimex-stm32-h405/scripts/ld.script similarity index 100% rename from boards/arm/olimex-stm32-h405/scripts/ld.script rename to boards/arm/stm32/olimex-stm32-h405/scripts/ld.script diff --git a/boards/arm/olimex-stm32-h405/src/Makefile b/boards/arm/stm32/olimex-stm32-h405/src/Makefile similarity index 100% rename from boards/arm/olimex-stm32-h405/src/Makefile rename to boards/arm/stm32/olimex-stm32-h405/src/Makefile diff --git a/boards/arm/olimex-stm32-h405/src/olimex-stm32-h405.h b/boards/arm/stm32/olimex-stm32-h405/src/olimex-stm32-h405.h similarity index 100% rename from boards/arm/olimex-stm32-h405/src/olimex-stm32-h405.h rename to boards/arm/stm32/olimex-stm32-h405/src/olimex-stm32-h405.h diff --git a/boards/arm/olimex-stm32-h405/src/stm32_adc.c b/boards/arm/stm32/olimex-stm32-h405/src/stm32_adc.c similarity index 100% rename from boards/arm/olimex-stm32-h405/src/stm32_adc.c rename to boards/arm/stm32/olimex-stm32-h405/src/stm32_adc.c diff --git a/boards/arm/olimex-stm32-h405/src/stm32_appinit.c b/boards/arm/stm32/olimex-stm32-h405/src/stm32_appinit.c similarity index 100% rename from boards/arm/olimex-stm32-h405/src/stm32_appinit.c rename to boards/arm/stm32/olimex-stm32-h405/src/stm32_appinit.c diff --git a/boards/arm/olimex-stm32-h405/src/stm32_autoleds.c b/boards/arm/stm32/olimex-stm32-h405/src/stm32_autoleds.c similarity index 100% rename from boards/arm/olimex-stm32-h405/src/stm32_autoleds.c rename to boards/arm/stm32/olimex-stm32-h405/src/stm32_autoleds.c diff --git a/boards/arm/olimex-stm32-h405/src/stm32_boot.c b/boards/arm/stm32/olimex-stm32-h405/src/stm32_boot.c similarity index 100% rename from boards/arm/olimex-stm32-h405/src/stm32_boot.c rename to boards/arm/stm32/olimex-stm32-h405/src/stm32_boot.c diff --git a/boards/arm/olimex-stm32-h405/src/stm32_buttons.c b/boards/arm/stm32/olimex-stm32-h405/src/stm32_buttons.c similarity index 100% rename from boards/arm/olimex-stm32-h405/src/stm32_buttons.c rename to boards/arm/stm32/olimex-stm32-h405/src/stm32_buttons.c diff --git a/boards/arm/olimex-stm32-h405/src/stm32_can.c b/boards/arm/stm32/olimex-stm32-h405/src/stm32_can.c similarity index 100% rename from boards/arm/olimex-stm32-h405/src/stm32_can.c rename to boards/arm/stm32/olimex-stm32-h405/src/stm32_can.c diff --git a/boards/arm/olimex-stm32-h405/src/stm32_usb.c b/boards/arm/stm32/olimex-stm32-h405/src/stm32_usb.c similarity index 100% rename from boards/arm/olimex-stm32-h405/src/stm32_usb.c rename to boards/arm/stm32/olimex-stm32-h405/src/stm32_usb.c diff --git a/boards/arm/olimex-stm32-h405/src/stm32_userleds.c b/boards/arm/stm32/olimex-stm32-h405/src/stm32_userleds.c similarity index 100% rename from boards/arm/olimex-stm32-h405/src/stm32_userleds.c rename to boards/arm/stm32/olimex-stm32-h405/src/stm32_userleds.c diff --git a/boards/arm/olimex-stm32-h407/Kconfig b/boards/arm/stm32/olimex-stm32-h407/Kconfig similarity index 100% rename from boards/arm/olimex-stm32-h407/Kconfig rename to boards/arm/stm32/olimex-stm32-h407/Kconfig diff --git a/boards/arm/olimex-stm32-h407/README.txt b/boards/arm/stm32/olimex-stm32-h407/README.txt similarity index 100% rename from boards/arm/olimex-stm32-h407/README.txt rename to boards/arm/stm32/olimex-stm32-h407/README.txt diff --git a/boards/arm/olimex-stm32-h407/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig similarity index 98% rename from boards/arm/olimex-stm32-h407/configs/nsh/defconfig rename to boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig index f9284285092..6a4f743d496 100644 --- a/boards/arm/olimex-stm32-h407/configs/nsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-h407" CONFIG_ARCH_BOARD_OLIMEX_STM32H407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-h407/configs/nsh_uext/defconfig b/boards/arm/stm32/olimex-stm32-h407/configs/nsh_uext/defconfig similarity index 98% rename from boards/arm/olimex-stm32-h407/configs/nsh_uext/defconfig rename to boards/arm/stm32/olimex-stm32-h407/configs/nsh_uext/defconfig index 0bd3b9e2535..6e093200638 100644 --- a/boards/arm/olimex-stm32-h407/configs/nsh_uext/defconfig +++ b/boards/arm/stm32/olimex-stm32-h407/configs/nsh_uext/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-h407" CONFIG_ARCH_BOARD_OLIMEX_STM32H407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-h407/include/board.h b/boards/arm/stm32/olimex-stm32-h407/include/board.h similarity index 100% rename from boards/arm/olimex-stm32-h407/include/board.h rename to boards/arm/stm32/olimex-stm32-h407/include/board.h diff --git a/boards/arm/olimex-stm32-h407/scripts/Make.defs b/boards/arm/stm32/olimex-stm32-h407/scripts/Make.defs similarity index 96% rename from boards/arm/olimex-stm32-h407/scripts/Make.defs rename to boards/arm/stm32/olimex-stm32-h407/scripts/Make.defs index 8a84e7da73d..5c78cdecd4e 100644 --- a/boards/arm/olimex-stm32-h407/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/olimex-stm32-h407/scripts/ld.script b/boards/arm/stm32/olimex-stm32-h407/scripts/ld.script similarity index 100% rename from boards/arm/olimex-stm32-h407/scripts/ld.script rename to boards/arm/stm32/olimex-stm32-h407/scripts/ld.script diff --git a/boards/arm/olimex-stm32-h407/src/.gitignore b/boards/arm/stm32/olimex-stm32-h407/src/.gitignore similarity index 100% rename from boards/arm/olimex-stm32-h407/src/.gitignore rename to boards/arm/stm32/olimex-stm32-h407/src/.gitignore diff --git a/boards/arm/olimex-stm32-h407/src/Makefile b/boards/arm/stm32/olimex-stm32-h407/src/Makefile similarity index 100% rename from boards/arm/olimex-stm32-h407/src/Makefile rename to boards/arm/stm32/olimex-stm32-h407/src/Makefile diff --git a/boards/arm/olimex-stm32-h407/src/olimex-stm32-h407.h b/boards/arm/stm32/olimex-stm32-h407/src/olimex-stm32-h407.h similarity index 100% rename from boards/arm/olimex-stm32-h407/src/olimex-stm32-h407.h rename to boards/arm/stm32/olimex-stm32-h407/src/olimex-stm32-h407.h diff --git a/boards/arm/olimex-stm32-h407/src/stm32_adc.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_adc.c similarity index 100% rename from boards/arm/olimex-stm32-h407/src/stm32_adc.c rename to boards/arm/stm32/olimex-stm32-h407/src/stm32_adc.c diff --git a/boards/arm/olimex-stm32-h407/src/stm32_appinit.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_appinit.c similarity index 100% rename from boards/arm/olimex-stm32-h407/src/stm32_appinit.c rename to boards/arm/stm32/olimex-stm32-h407/src/stm32_appinit.c diff --git a/boards/arm/olimex-stm32-h407/src/stm32_autoleds.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_autoleds.c similarity index 100% rename from boards/arm/olimex-stm32-h407/src/stm32_autoleds.c rename to boards/arm/stm32/olimex-stm32-h407/src/stm32_autoleds.c diff --git a/boards/arm/olimex-stm32-h407/src/stm32_boot.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_boot.c similarity index 100% rename from boards/arm/olimex-stm32-h407/src/stm32_boot.c rename to boards/arm/stm32/olimex-stm32-h407/src/stm32_boot.c diff --git a/boards/arm/olimex-stm32-h407/src/stm32_bringup.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_bringup.c similarity index 100% rename from boards/arm/olimex-stm32-h407/src/stm32_bringup.c rename to boards/arm/stm32/olimex-stm32-h407/src/stm32_bringup.c diff --git a/boards/arm/olimex-stm32-h407/src/stm32_buttons.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_buttons.c similarity index 100% rename from boards/arm/olimex-stm32-h407/src/stm32_buttons.c rename to boards/arm/stm32/olimex-stm32-h407/src/stm32_buttons.c diff --git a/boards/arm/olimex-stm32-h407/src/stm32_can.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_can.c similarity index 100% rename from boards/arm/olimex-stm32-h407/src/stm32_can.c rename to boards/arm/stm32/olimex-stm32-h407/src/stm32_can.c diff --git a/boards/arm/olimex-stm32-h407/src/stm32_sdio.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_sdio.c similarity index 100% rename from boards/arm/olimex-stm32-h407/src/stm32_sdio.c rename to boards/arm/stm32/olimex-stm32-h407/src/stm32_sdio.c diff --git a/boards/arm/olimex-stm32-h407/src/stm32_usb.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_usb.c similarity index 100% rename from boards/arm/olimex-stm32-h407/src/stm32_usb.c rename to boards/arm/stm32/olimex-stm32-h407/src/stm32_usb.c diff --git a/boards/arm/olimex-stm32-h407/src/stm32_userleds.c b/boards/arm/stm32/olimex-stm32-h407/src/stm32_userleds.c similarity index 100% rename from boards/arm/olimex-stm32-h407/src/stm32_userleds.c rename to boards/arm/stm32/olimex-stm32-h407/src/stm32_userleds.c diff --git a/boards/arm/olimex-stm32-p107/Kconfig b/boards/arm/stm32/olimex-stm32-p107/Kconfig similarity index 100% rename from boards/arm/olimex-stm32-p107/Kconfig rename to boards/arm/stm32/olimex-stm32-p107/Kconfig diff --git a/boards/arm/olimex-stm32-p107/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig similarity index 98% rename from boards/arm/olimex-stm32-p107/configs/nsh/defconfig rename to boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig index 5c2e9039517..1e715c86445 100644 --- a/boards/arm/olimex-stm32-p107/configs/nsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-p107" CONFIG_ARCH_BOARD_OLIMEX_STM32P107=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-p107/include/board.h b/boards/arm/stm32/olimex-stm32-p107/include/board.h similarity index 100% rename from boards/arm/olimex-stm32-p107/include/board.h rename to boards/arm/stm32/olimex-stm32-p107/include/board.h diff --git a/boards/arm/olimex-stm32-p107/scripts/Make.defs b/boards/arm/stm32/olimex-stm32-p107/scripts/Make.defs similarity index 94% rename from boards/arm/olimex-stm32-p107/scripts/Make.defs rename to boards/arm/stm32/olimex-stm32-p107/scripts/Make.defs index 5c4bd128ddb..d23441c6f84 100644 --- a/boards/arm/olimex-stm32-p107/scripts/Make.defs +++ b/boards/arm/stm32/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)\$(CONFIG_ARCH_BOARD)\scripts\$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)\boards\$(CONFIG_ARCH)\$(CONFIG_ARCH_CHIP)\$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif endif diff --git a/boards/arm/olimex-stm32-p107/scripts/ld.script b/boards/arm/stm32/olimex-stm32-p107/scripts/ld.script similarity index 100% rename from boards/arm/olimex-stm32-p107/scripts/ld.script rename to boards/arm/stm32/olimex-stm32-p107/scripts/ld.script diff --git a/boards/arm/olimex-stm32-p107/scripts/ld.script.dfu b/boards/arm/stm32/olimex-stm32-p107/scripts/ld.script.dfu similarity index 100% rename from boards/arm/olimex-stm32-p107/scripts/ld.script.dfu rename to boards/arm/stm32/olimex-stm32-p107/scripts/ld.script.dfu diff --git a/boards/arm/olimex-stm32-p107/src/.gitignore b/boards/arm/stm32/olimex-stm32-p107/src/.gitignore similarity index 100% rename from boards/arm/olimex-stm32-p107/src/.gitignore rename to boards/arm/stm32/olimex-stm32-p107/src/.gitignore diff --git a/boards/arm/olimex-stm32-p107/src/Makefile b/boards/arm/stm32/olimex-stm32-p107/src/Makefile similarity index 100% rename from boards/arm/olimex-stm32-p107/src/Makefile rename to boards/arm/stm32/olimex-stm32-p107/src/Makefile diff --git a/boards/arm/olimex-stm32-p107/src/olimex-stm32-p107.h b/boards/arm/stm32/olimex-stm32-p107/src/olimex-stm32-p107.h similarity index 100% rename from boards/arm/olimex-stm32-p107/src/olimex-stm32-p107.h rename to boards/arm/stm32/olimex-stm32-p107/src/olimex-stm32-p107.h diff --git a/boards/arm/olimex-stm32-p107/src/stm32_appinit.c b/boards/arm/stm32/olimex-stm32-p107/src/stm32_appinit.c similarity index 100% rename from boards/arm/olimex-stm32-p107/src/stm32_appinit.c rename to boards/arm/stm32/olimex-stm32-p107/src/stm32_appinit.c diff --git a/boards/arm/olimex-stm32-p107/src/stm32_boot.c b/boards/arm/stm32/olimex-stm32-p107/src/stm32_boot.c similarity index 100% rename from boards/arm/olimex-stm32-p107/src/stm32_boot.c rename to boards/arm/stm32/olimex-stm32-p107/src/stm32_boot.c diff --git a/boards/arm/olimex-stm32-p107/src/stm32_can.c b/boards/arm/stm32/olimex-stm32-p107/src/stm32_can.c similarity index 100% rename from boards/arm/olimex-stm32-p107/src/stm32_can.c rename to boards/arm/stm32/olimex-stm32-p107/src/stm32_can.c diff --git a/boards/arm/olimex-stm32-p107/src/stm32_encx24j600.c b/boards/arm/stm32/olimex-stm32-p107/src/stm32_encx24j600.c similarity index 100% rename from boards/arm/olimex-stm32-p107/src/stm32_encx24j600.c rename to boards/arm/stm32/olimex-stm32-p107/src/stm32_encx24j600.c diff --git a/boards/arm/olimex-stm32-p107/src/stm32_spi.c b/boards/arm/stm32/olimex-stm32-p107/src/stm32_spi.c similarity index 100% rename from boards/arm/olimex-stm32-p107/src/stm32_spi.c rename to boards/arm/stm32/olimex-stm32-p107/src/stm32_spi.c diff --git a/boards/arm/olimex-stm32-p207/Kconfig b/boards/arm/stm32/olimex-stm32-p207/Kconfig similarity index 100% rename from boards/arm/olimex-stm32-p207/Kconfig rename to boards/arm/stm32/olimex-stm32-p207/Kconfig diff --git a/boards/arm/olimex-stm32-p207/README.txt b/boards/arm/stm32/olimex-stm32-p207/README.txt similarity index 100% rename from boards/arm/olimex-stm32-p207/README.txt rename to boards/arm/stm32/olimex-stm32-p207/README.txt diff --git a/boards/arm/olimex-stm32-p207/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig similarity index 98% rename from boards/arm/olimex-stm32-p207/configs/nsh/defconfig rename to boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig index 0dba0851aad..52c54cc3b63 100644 --- a/boards/arm/olimex-stm32-p207/configs/nsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-p207" CONFIG_ARCH_BOARD_OLIMEX_STM32P207=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207ZE=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/olimex-stm32-p207/include/board.h b/boards/arm/stm32/olimex-stm32-p207/include/board.h similarity index 100% rename from boards/arm/olimex-stm32-p207/include/board.h rename to boards/arm/stm32/olimex-stm32-p207/include/board.h diff --git a/boards/arm/olimex-stm32-p207/scripts/Make.defs b/boards/arm/stm32/olimex-stm32-p207/scripts/Make.defs similarity index 96% rename from boards/arm/olimex-stm32-p207/scripts/Make.defs rename to boards/arm/stm32/olimex-stm32-p207/scripts/Make.defs index 270b7ded379..32af9ddf0ae 100644 --- a/boards/arm/olimex-stm32-p207/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/olimex-stm32-p207/scripts/ld.script b/boards/arm/stm32/olimex-stm32-p207/scripts/ld.script similarity index 100% rename from boards/arm/olimex-stm32-p207/scripts/ld.script rename to boards/arm/stm32/olimex-stm32-p207/scripts/ld.script diff --git a/boards/arm/olimex-stm32-p207/src/Makefile b/boards/arm/stm32/olimex-stm32-p207/src/Makefile similarity index 100% rename from boards/arm/olimex-stm32-p207/src/Makefile rename to boards/arm/stm32/olimex-stm32-p207/src/Makefile diff --git a/boards/arm/olimex-stm32-p207/src/olimex-stm32-p207.h b/boards/arm/stm32/olimex-stm32-p207/src/olimex-stm32-p207.h similarity index 100% rename from boards/arm/olimex-stm32-p207/src/olimex-stm32-p207.h rename to boards/arm/stm32/olimex-stm32-p207/src/olimex-stm32-p207.h diff --git a/boards/arm/olimex-stm32-p207/src/stm32_adc.c b/boards/arm/stm32/olimex-stm32-p207/src/stm32_adc.c similarity index 100% rename from boards/arm/olimex-stm32-p207/src/stm32_adc.c rename to boards/arm/stm32/olimex-stm32-p207/src/stm32_adc.c diff --git a/boards/arm/olimex-stm32-p207/src/stm32_appinit.c b/boards/arm/stm32/olimex-stm32-p207/src/stm32_appinit.c similarity index 100% rename from boards/arm/olimex-stm32-p207/src/stm32_appinit.c rename to boards/arm/stm32/olimex-stm32-p207/src/stm32_appinit.c diff --git a/boards/arm/olimex-stm32-p207/src/stm32_autoleds.c b/boards/arm/stm32/olimex-stm32-p207/src/stm32_autoleds.c similarity index 100% rename from boards/arm/olimex-stm32-p207/src/stm32_autoleds.c rename to boards/arm/stm32/olimex-stm32-p207/src/stm32_autoleds.c diff --git a/boards/arm/olimex-stm32-p207/src/stm32_boot.c b/boards/arm/stm32/olimex-stm32-p207/src/stm32_boot.c similarity index 100% rename from boards/arm/olimex-stm32-p207/src/stm32_boot.c rename to boards/arm/stm32/olimex-stm32-p207/src/stm32_boot.c diff --git a/boards/arm/olimex-stm32-p207/src/stm32_buttons.c b/boards/arm/stm32/olimex-stm32-p207/src/stm32_buttons.c similarity index 100% rename from boards/arm/olimex-stm32-p207/src/stm32_buttons.c rename to boards/arm/stm32/olimex-stm32-p207/src/stm32_buttons.c diff --git a/boards/arm/olimex-stm32-p207/src/stm32_can.c b/boards/arm/stm32/olimex-stm32-p207/src/stm32_can.c similarity index 100% rename from boards/arm/olimex-stm32-p207/src/stm32_can.c rename to boards/arm/stm32/olimex-stm32-p207/src/stm32_can.c diff --git a/boards/arm/olimex-stm32-p207/src/stm32_usb.c b/boards/arm/stm32/olimex-stm32-p207/src/stm32_usb.c similarity index 100% rename from boards/arm/olimex-stm32-p207/src/stm32_usb.c rename to boards/arm/stm32/olimex-stm32-p207/src/stm32_usb.c diff --git a/boards/arm/olimex-stm32-p207/src/stm32_userleds.c b/boards/arm/stm32/olimex-stm32-p207/src/stm32_userleds.c similarity index 100% rename from boards/arm/olimex-stm32-p207/src/stm32_userleds.c rename to boards/arm/stm32/olimex-stm32-p207/src/stm32_userleds.c diff --git a/boards/arm/olimex-stm32-p407/Kconfig b/boards/arm/stm32/olimex-stm32-p407/Kconfig similarity index 100% rename from boards/arm/olimex-stm32-p407/Kconfig rename to boards/arm/stm32/olimex-stm32-p407/Kconfig diff --git a/boards/arm/olimex-stm32-p407/README.txt b/boards/arm/stm32/olimex-stm32-p407/README.txt similarity index 100% rename from boards/arm/olimex-stm32-p407/README.txt rename to boards/arm/stm32/olimex-stm32-p407/README.txt diff --git a/boards/arm/olimex-stm32-p407/configs/dhtxx/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig similarity index 98% rename from boards/arm/olimex-stm32-p407/configs/dhtxx/defconfig rename to boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig index c36a7a1cc72..f84cf53fc56 100644 --- a/boards/arm/olimex-stm32-p407/configs/dhtxx/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-p407" CONFIG_ARCH_BOARD_OLIMEX_STM32P407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/olimex-stm32-p407/configs/hidkbd/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig similarity index 98% rename from boards/arm/olimex-stm32-p407/configs/hidkbd/defconfig rename to boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig index bd87bef0426..b156075601c 100644 --- a/boards/arm/olimex-stm32-p407/configs/hidkbd/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-p407" CONFIG_ARCH_BOARD_OLIMEX_STM32P407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/olimex-stm32-p407/configs/kelf/Make.defs b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs similarity index 93% rename from boards/arm/olimex-stm32-p407/configs/kelf/Make.defs rename to boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs index 5d6e2b38273..c32d6547418 100644 --- a/boards/arm/olimex-stm32-p407/configs/kelf/Make.defs +++ b/boards/arm/stm32/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)$(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}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(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 + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/olimex-stm32-p407/configs/kelf/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig similarity index 98% rename from boards/arm/olimex-stm32-p407/configs/kelf/defconfig rename to boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig index a5988358577..66903ecfe65 100644 --- a/boards/arm/olimex-stm32-p407/configs/kelf/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-p407" CONFIG_ARCH_BOARD_OLIMEX_STM32P407=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-p407/configs/kmodule/Make.defs b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs similarity index 93% rename from boards/arm/olimex-stm32-p407/configs/kmodule/Make.defs rename to boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs index 46504254ba8..a2986987ea4 100644 --- a/boards/arm/olimex-stm32-p407/configs/kmodule/Make.defs +++ b/boards/arm/stm32/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)$(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}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(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 + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/olimex-stm32-p407/configs/kmodule/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig similarity index 98% rename from boards/arm/olimex-stm32-p407/configs/kmodule/defconfig rename to boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig index 700e27daa88..bda542d0477 100644 --- a/boards/arm/olimex-stm32-p407/configs/kmodule/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-p407" CONFIG_ARCH_BOARD_OLIMEX_STM32P407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/olimex-stm32-p407/configs/knsh/Make.defs b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/Make.defs similarity index 94% rename from boards/arm/olimex-stm32-p407/configs/knsh/Make.defs rename to boards/arm/stm32/olimex-stm32-p407/configs/knsh/Make.defs index 29b81c11ada..284db67a9e8 100644 --- a/boards/arm/olimex-stm32-p407/configs/knsh/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) - ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) + ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/olimex-stm32-p407/configs/knsh/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig similarity index 98% rename from boards/arm/olimex-stm32-p407/configs/knsh/defconfig rename to boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig index 3bfb347c293..74f568ce8c9 100644 --- a/boards/arm/olimex-stm32-p407/configs/knsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-p407" CONFIG_ARCH_BOARD_OLIMEX_STM32P407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/olimex-stm32-p407/configs/module/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/module/defconfig similarity index 98% rename from boards/arm/olimex-stm32-p407/configs/module/defconfig rename to boards/arm/stm32/olimex-stm32-p407/configs/module/defconfig index 30243ad32af..bb2d40869cf 100644 --- a/boards/arm/olimex-stm32-p407/configs/module/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/module/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-p407" CONFIG_ARCH_BOARD_OLIMEX_STM32P407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/olimex-stm32-p407/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig similarity index 98% rename from boards/arm/olimex-stm32-p407/configs/nsh/defconfig rename to boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig index 88be22f286c..d1d4b5fcb6c 100644 --- a/boards/arm/olimex-stm32-p407/configs/nsh/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-p407" CONFIG_ARCH_BOARD_OLIMEX_STM32P407=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/olimex-stm32-p407/configs/zmodem/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig similarity index 98% rename from boards/arm/olimex-stm32-p407/configs/zmodem/defconfig rename to boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig index 3f5af40b769..be965ec4e05 100644 --- a/boards/arm/olimex-stm32-p407/configs/zmodem/defconfig +++ b/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-stm32-p407" CONFIG_ARCH_BOARD_OLIMEX_STM32P407=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407ZG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/olimex-stm32-p407/include/board.h b/boards/arm/stm32/olimex-stm32-p407/include/board.h similarity index 100% rename from boards/arm/olimex-stm32-p407/include/board.h rename to boards/arm/stm32/olimex-stm32-p407/include/board.h diff --git a/boards/arm/sam3u-ek/kernel/.gitignore b/boards/arm/stm32/olimex-stm32-p407/kernel/.gitignore similarity index 100% rename from boards/arm/sam3u-ek/kernel/.gitignore rename to boards/arm/stm32/olimex-stm32-p407/kernel/.gitignore diff --git a/boards/arm/olimex-stm32-p407/kernel/Makefile b/boards/arm/stm32/olimex-stm32-p407/kernel/Makefile similarity index 90% rename from boards/arm/olimex-stm32-p407/kernel/Makefile rename to boards/arm/stm32/olimex-stm32-p407/kernel/Makefile index 12d1fcde08e..19741de32cf 100644 --- a/boards/arm/olimex-stm32-p407/kernel/Makefile +++ b/boards/arm/stm32/olimex-stm32-p407/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/olimex-stm32-p407/kernel/stm32_userspace.c b/boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c similarity index 100% rename from boards/arm/olimex-stm32-p407/kernel/stm32_userspace.c rename to boards/arm/stm32/olimex-stm32-p407/kernel/stm32_userspace.c diff --git a/boards/arm/olimex-stm32-p407/scripts/Make.defs b/boards/arm/stm32/olimex-stm32-p407/scripts/Make.defs similarity index 96% rename from boards/arm/olimex-stm32-p407/scripts/Make.defs rename to boards/arm/stm32/olimex-stm32-p407/scripts/Make.defs index cd838c71564..6d51bfe08ca 100644 --- a/boards/arm/olimex-stm32-p407/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/olimex-stm32-p407/scripts/flash.ld b/boards/arm/stm32/olimex-stm32-p407/scripts/flash.ld similarity index 100% rename from boards/arm/olimex-stm32-p407/scripts/flash.ld rename to boards/arm/stm32/olimex-stm32-p407/scripts/flash.ld diff --git a/boards/arm/olimex-stm32-p407/scripts/kernel-space.ld b/boards/arm/stm32/olimex-stm32-p407/scripts/kernel-space.ld similarity index 100% rename from boards/arm/olimex-stm32-p407/scripts/kernel-space.ld rename to boards/arm/stm32/olimex-stm32-p407/scripts/kernel-space.ld diff --git a/boards/arm/olimex-stm32-p407/scripts/memory.ld b/boards/arm/stm32/olimex-stm32-p407/scripts/memory.ld similarity index 100% rename from boards/arm/olimex-stm32-p407/scripts/memory.ld rename to boards/arm/stm32/olimex-stm32-p407/scripts/memory.ld diff --git a/boards/arm/olimex-stm32-p407/scripts/user-space.ld b/boards/arm/stm32/olimex-stm32-p407/scripts/user-space.ld similarity index 100% rename from boards/arm/olimex-stm32-p407/scripts/user-space.ld rename to boards/arm/stm32/olimex-stm32-p407/scripts/user-space.ld diff --git a/boards/arm/olimex-stm32-p407/src/Makefile b/boards/arm/stm32/olimex-stm32-p407/src/Makefile similarity index 100% rename from boards/arm/olimex-stm32-p407/src/Makefile rename to boards/arm/stm32/olimex-stm32-p407/src/Makefile diff --git a/boards/arm/olimex-stm32-p407/src/olimex-stm32-p407.h b/boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h similarity index 100% rename from boards/arm/olimex-stm32-p407/src/olimex-stm32-p407.h rename to boards/arm/stm32/olimex-stm32-p407/src/olimex-stm32-p407.h diff --git a/boards/arm/olimex-stm32-p407/src/stm32_adc.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_adc.c similarity index 100% rename from boards/arm/olimex-stm32-p407/src/stm32_adc.c rename to boards/arm/stm32/olimex-stm32-p407/src/stm32_adc.c diff --git a/boards/arm/olimex-stm32-p407/src/stm32_appinit.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_appinit.c similarity index 100% rename from boards/arm/olimex-stm32-p407/src/stm32_appinit.c rename to boards/arm/stm32/olimex-stm32-p407/src/stm32_appinit.c diff --git a/boards/arm/olimex-stm32-p407/src/stm32_autoleds.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_autoleds.c similarity index 100% rename from boards/arm/olimex-stm32-p407/src/stm32_autoleds.c rename to boards/arm/stm32/olimex-stm32-p407/src/stm32_autoleds.c diff --git a/boards/arm/olimex-stm32-p407/src/stm32_boot.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_boot.c similarity index 100% rename from boards/arm/olimex-stm32-p407/src/stm32_boot.c rename to boards/arm/stm32/olimex-stm32-p407/src/stm32_boot.c diff --git a/boards/arm/olimex-stm32-p407/src/stm32_bringup.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_bringup.c similarity index 100% rename from boards/arm/olimex-stm32-p407/src/stm32_bringup.c rename to boards/arm/stm32/olimex-stm32-p407/src/stm32_bringup.c diff --git a/boards/arm/olimex-stm32-p407/src/stm32_buttons.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_buttons.c similarity index 100% rename from boards/arm/olimex-stm32-p407/src/stm32_buttons.c rename to boards/arm/stm32/olimex-stm32-p407/src/stm32_buttons.c diff --git a/boards/arm/olimex-stm32-p407/src/stm32_can.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_can.c similarity index 100% rename from boards/arm/olimex-stm32-p407/src/stm32_can.c rename to boards/arm/stm32/olimex-stm32-p407/src/stm32_can.c diff --git a/boards/arm/olimex-stm32-p407/src/stm32_dhtxx.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_dhtxx.c similarity index 100% rename from boards/arm/olimex-stm32-p407/src/stm32_dhtxx.c rename to boards/arm/stm32/olimex-stm32-p407/src/stm32_dhtxx.c diff --git a/boards/arm/olimex-stm32-p407/src/stm32_sram.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_sram.c similarity index 100% rename from boards/arm/olimex-stm32-p407/src/stm32_sram.c rename to boards/arm/stm32/olimex-stm32-p407/src/stm32_sram.c diff --git a/boards/arm/olimex-stm32-p407/src/stm32_usb.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_usb.c similarity index 100% rename from boards/arm/olimex-stm32-p407/src/stm32_usb.c rename to boards/arm/stm32/olimex-stm32-p407/src/stm32_usb.c diff --git a/boards/arm/olimex-stm32-p407/src/stm32_userleds.c b/boards/arm/stm32/olimex-stm32-p407/src/stm32_userleds.c similarity index 100% rename from boards/arm/olimex-stm32-p407/src/stm32_userleds.c rename to boards/arm/stm32/olimex-stm32-p407/src/stm32_userleds.c diff --git a/boards/arm/olimexino-stm32/Kconfig b/boards/arm/stm32/olimexino-stm32/Kconfig similarity index 100% rename from boards/arm/olimexino-stm32/Kconfig rename to boards/arm/stm32/olimexino-stm32/Kconfig diff --git a/boards/arm/olimexino-stm32/configs/can/defconfig b/boards/arm/stm32/olimexino-stm32/configs/can/defconfig similarity index 99% rename from boards/arm/olimexino-stm32/configs/can/defconfig rename to boards/arm/stm32/olimexino-stm32/configs/can/defconfig index 24ea96efb48..9b3cc6613af 100644 --- a/boards/arm/olimexino-stm32/configs/can/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/can/defconfig @@ -22,6 +22,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimexino-stm32" CONFIG_ARCH_BOARD_OLIMEXINO_STM32=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103RB=y CONFIG_ARCH_HIPRI_INTERRUPT=y diff --git a/boards/arm/olimexino-stm32/configs/composite/defconfig b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig similarity index 99% rename from boards/arm/olimexino-stm32/configs/composite/defconfig rename to boards/arm/stm32/olimexino-stm32/configs/composite/defconfig index 2755cfde1bf..5a8ebf35979 100644 --- a/boards/arm/olimexino-stm32/configs/composite/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig @@ -33,6 +33,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimexino-stm32" CONFIG_ARCH_BOARD_OLIMEXINO_STM32=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103RB=y CONFIG_ARCH_HIPRI_INTERRUPT=y diff --git a/boards/arm/olimexino-stm32/configs/nsh/defconfig b/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig similarity index 99% rename from boards/arm/olimexino-stm32/configs/nsh/defconfig rename to boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig index 9e1394a73a7..d93e31c169a 100644 --- a/boards/arm/olimexino-stm32/configs/nsh/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig @@ -33,6 +33,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimexino-stm32" CONFIG_ARCH_BOARD_OLIMEXINO_STM32=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103RB=y CONFIG_ARCH_HIPRI_INTERRUPT=y diff --git a/boards/arm/olimexino-stm32/configs/smallnsh/defconfig b/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig similarity index 99% rename from boards/arm/olimexino-stm32/configs/smallnsh/defconfig rename to boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig index c6c76d537ad..ef6b12fdf75 100644 --- a/boards/arm/olimexino-stm32/configs/smallnsh/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimexino-stm32" CONFIG_ARCH_BOARD_OLIMEXINO_STM32=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103RB=y CONFIG_ARCH_HIPRI_INTERRUPT=y diff --git a/boards/arm/olimexino-stm32/configs/tiny/defconfig b/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig similarity index 98% rename from boards/arm/olimexino-stm32/configs/tiny/defconfig rename to boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig index 454376a21c0..a9def287075 100644 --- a/boards/arm/olimexino-stm32/configs/tiny/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimexino-stm32" CONFIG_ARCH_BOARD_OLIMEXINO_STM32=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103RB=y CONFIG_ARCH_HIPRI_INTERRUPT=y diff --git a/boards/arm/olimexino-stm32/include/board.h b/boards/arm/stm32/olimexino-stm32/include/board.h similarity index 100% rename from boards/arm/olimexino-stm32/include/board.h rename to boards/arm/stm32/olimexino-stm32/include/board.h diff --git a/boards/arm/olimexino-stm32/scripts/Make.defs b/boards/arm/stm32/olimexino-stm32/scripts/Make.defs similarity index 94% rename from boards/arm/olimexino-stm32/scripts/Make.defs rename to boards/arm/stm32/olimexino-stm32/scripts/Make.defs index e12a0b4acd9..dc81402532c 100644 --- a/boards/arm/olimexino-stm32/scripts/Make.defs +++ b/boards/arm/stm32/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)\$(CONFIG_ARCH_BOARD)\scripts\$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)\boards\$(CONFIG_ARCH)\$(CONFIG_ARCH_CHIP)\$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif endif diff --git a/boards/arm/olimexino-stm32/scripts/ld.script b/boards/arm/stm32/olimexino-stm32/scripts/ld.script similarity index 100% rename from boards/arm/olimexino-stm32/scripts/ld.script rename to boards/arm/stm32/olimexino-stm32/scripts/ld.script diff --git a/boards/arm/olimexino-stm32/scripts/ld.script.dfu b/boards/arm/stm32/olimexino-stm32/scripts/ld.script.dfu similarity index 100% rename from boards/arm/olimexino-stm32/scripts/ld.script.dfu rename to boards/arm/stm32/olimexino-stm32/scripts/ld.script.dfu diff --git a/boards/arm/olimex-strp711/src/.gitignore b/boards/arm/stm32/olimexino-stm32/src/.gitignore similarity index 100% rename from boards/arm/olimex-strp711/src/.gitignore rename to boards/arm/stm32/olimexino-stm32/src/.gitignore diff --git a/boards/arm/olimexino-stm32/src/Makefile b/boards/arm/stm32/olimexino-stm32/src/Makefile similarity index 100% rename from boards/arm/olimexino-stm32/src/Makefile rename to boards/arm/stm32/olimexino-stm32/src/Makefile diff --git a/boards/arm/olimexino-stm32/src/olimexino-stm32.h b/boards/arm/stm32/olimexino-stm32/src/olimexino-stm32.h similarity index 100% rename from boards/arm/olimexino-stm32/src/olimexino-stm32.h rename to boards/arm/stm32/olimexino-stm32/src/olimexino-stm32.h diff --git a/boards/arm/olimexino-stm32/src/stm32_appinit.c b/boards/arm/stm32/olimexino-stm32/src/stm32_appinit.c similarity index 100% rename from boards/arm/olimexino-stm32/src/stm32_appinit.c rename to boards/arm/stm32/olimexino-stm32/src/stm32_appinit.c diff --git a/boards/arm/olimexino-stm32/src/stm32_boot.c b/boards/arm/stm32/olimexino-stm32/src/stm32_boot.c similarity index 100% rename from boards/arm/olimexino-stm32/src/stm32_boot.c rename to boards/arm/stm32/olimexino-stm32/src/stm32_boot.c diff --git a/boards/arm/olimexino-stm32/src/stm32_buttons.c b/boards/arm/stm32/olimexino-stm32/src/stm32_buttons.c similarity index 100% rename from boards/arm/olimexino-stm32/src/stm32_buttons.c rename to boards/arm/stm32/olimexino-stm32/src/stm32_buttons.c diff --git a/boards/arm/olimexino-stm32/src/stm32_can.c b/boards/arm/stm32/olimexino-stm32/src/stm32_can.c similarity index 100% rename from boards/arm/olimexino-stm32/src/stm32_can.c rename to boards/arm/stm32/olimexino-stm32/src/stm32_can.c diff --git a/boards/arm/olimexino-stm32/src/stm32_composite.c b/boards/arm/stm32/olimexino-stm32/src/stm32_composite.c similarity index 100% rename from boards/arm/olimexino-stm32/src/stm32_composite.c rename to boards/arm/stm32/olimexino-stm32/src/stm32_composite.c diff --git a/boards/arm/olimexino-stm32/src/stm32_leds.c b/boards/arm/stm32/olimexino-stm32/src/stm32_leds.c similarity index 100% rename from boards/arm/olimexino-stm32/src/stm32_leds.c rename to boards/arm/stm32/olimexino-stm32/src/stm32_leds.c diff --git a/boards/arm/olimexino-stm32/src/stm32_spi.c b/boards/arm/stm32/olimexino-stm32/src/stm32_spi.c similarity index 100% rename from boards/arm/olimexino-stm32/src/stm32_spi.c rename to boards/arm/stm32/olimexino-stm32/src/stm32_spi.c diff --git a/boards/arm/olimexino-stm32/src/stm32_usbdev.c b/boards/arm/stm32/olimexino-stm32/src/stm32_usbdev.c similarity index 100% rename from boards/arm/olimexino-stm32/src/stm32_usbdev.c rename to boards/arm/stm32/olimexino-stm32/src/stm32_usbdev.c diff --git a/boards/arm/olimexino-stm32/src/stm32_usbmsc.c b/boards/arm/stm32/olimexino-stm32/src/stm32_usbmsc.c similarity index 100% rename from boards/arm/olimexino-stm32/src/stm32_usbmsc.c rename to boards/arm/stm32/olimexino-stm32/src/stm32_usbmsc.c diff --git a/boards/arm/omnibusf4/Kconfig b/boards/arm/stm32/omnibusf4/Kconfig similarity index 100% rename from boards/arm/omnibusf4/Kconfig rename to boards/arm/stm32/omnibusf4/Kconfig diff --git a/boards/arm/omnibusf4/README.txt b/boards/arm/stm32/omnibusf4/README.txt similarity index 100% rename from boards/arm/omnibusf4/README.txt rename to boards/arm/stm32/omnibusf4/README.txt diff --git a/boards/arm/omnibusf4/configs/nsh/defconfig b/boards/arm/stm32/omnibusf4/configs/nsh/defconfig similarity index 99% rename from boards/arm/omnibusf4/configs/nsh/defconfig rename to boards/arm/stm32/omnibusf4/configs/nsh/defconfig index ff55b7c456e..df00e935179 100644 --- a/boards/arm/omnibusf4/configs/nsh/defconfig +++ b/boards/arm/stm32/omnibusf4/configs/nsh/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="omnibusf4" CONFIG_ARCH_BOARD_OMNIBUSF4=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F405RG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/omnibusf4/include/board.h b/boards/arm/stm32/omnibusf4/include/board.h similarity index 100% rename from boards/arm/omnibusf4/include/board.h rename to boards/arm/stm32/omnibusf4/include/board.h diff --git a/boards/arm/same70-xplained/kernel/.gitignore b/boards/arm/stm32/omnibusf4/kernel/.gitignore similarity index 100% rename from boards/arm/same70-xplained/kernel/.gitignore rename to boards/arm/stm32/omnibusf4/kernel/.gitignore diff --git a/boards/arm/omnibusf4/kernel/Makefile b/boards/arm/stm32/omnibusf4/kernel/Makefile similarity index 90% rename from boards/arm/omnibusf4/kernel/Makefile rename to boards/arm/stm32/omnibusf4/kernel/Makefile index 87011a415de..da205c85342 100644 --- a/boards/arm/omnibusf4/kernel/Makefile +++ b/boards/arm/stm32/omnibusf4/kernel/Makefile @@ -39,7 +39,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -52,16 +52,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/omnibusf4/kernel/stm32_userspace.c b/boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c similarity index 100% rename from boards/arm/omnibusf4/kernel/stm32_userspace.c rename to boards/arm/stm32/omnibusf4/kernel/stm32_userspace.c diff --git a/boards/arm/omnibusf4/scripts/Make.defs b/boards/arm/stm32/omnibusf4/scripts/Make.defs similarity index 94% rename from boards/arm/omnibusf4/scripts/Make.defs rename to boards/arm/stm32/omnibusf4/scripts/Make.defs index 9709a42c3fd..4d9c40d9371 100644 --- a/boards/arm/omnibusf4/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif diff --git a/boards/arm/omnibusf4/scripts/gnu-elf.ld b/boards/arm/stm32/omnibusf4/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/omnibusf4/scripts/gnu-elf.ld rename to boards/arm/stm32/omnibusf4/scripts/gnu-elf.ld diff --git a/boards/arm/omnibusf4/scripts/kernel-space.ld b/boards/arm/stm32/omnibusf4/scripts/kernel-space.ld similarity index 100% rename from boards/arm/omnibusf4/scripts/kernel-space.ld rename to boards/arm/stm32/omnibusf4/scripts/kernel-space.ld diff --git a/boards/arm/omnibusf4/scripts/ld.script b/boards/arm/stm32/omnibusf4/scripts/ld.script similarity index 100% rename from boards/arm/omnibusf4/scripts/ld.script rename to boards/arm/stm32/omnibusf4/scripts/ld.script diff --git a/boards/arm/omnibusf4/scripts/memory.ld b/boards/arm/stm32/omnibusf4/scripts/memory.ld similarity index 100% rename from boards/arm/omnibusf4/scripts/memory.ld rename to boards/arm/stm32/omnibusf4/scripts/memory.ld diff --git a/boards/arm/omnibusf4/scripts/user-space.ld b/boards/arm/stm32/omnibusf4/scripts/user-space.ld similarity index 100% rename from boards/arm/omnibusf4/scripts/user-space.ld rename to boards/arm/stm32/omnibusf4/scripts/user-space.ld diff --git a/boards/arm/olimexino-stm32/src/.gitignore b/boards/arm/stm32/omnibusf4/src/.gitignore similarity index 100% rename from boards/arm/olimexino-stm32/src/.gitignore rename to boards/arm/stm32/omnibusf4/src/.gitignore diff --git a/boards/arm/omnibusf4/src/Makefile b/boards/arm/stm32/omnibusf4/src/Makefile similarity index 100% rename from boards/arm/omnibusf4/src/Makefile rename to boards/arm/stm32/omnibusf4/src/Makefile diff --git a/boards/arm/omnibusf4/src/omnibusf4.h b/boards/arm/stm32/omnibusf4/src/omnibusf4.h similarity index 100% rename from boards/arm/omnibusf4/src/omnibusf4.h rename to boards/arm/stm32/omnibusf4/src/omnibusf4.h diff --git a/boards/arm/omnibusf4/src/stm32_appinit.c b/boards/arm/stm32/omnibusf4/src/stm32_appinit.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_appinit.c rename to boards/arm/stm32/omnibusf4/src/stm32_appinit.c diff --git a/boards/arm/omnibusf4/src/stm32_boot.c b/boards/arm/stm32/omnibusf4/src/stm32_boot.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_boot.c rename to boards/arm/stm32/omnibusf4/src/stm32_boot.c diff --git a/boards/arm/omnibusf4/src/stm32_bringup.c b/boards/arm/stm32/omnibusf4/src/stm32_bringup.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_bringup.c rename to boards/arm/stm32/omnibusf4/src/stm32_bringup.c diff --git a/boards/arm/omnibusf4/src/stm32_critmon.c b/boards/arm/stm32/omnibusf4/src/stm32_critmon.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_critmon.c rename to boards/arm/stm32/omnibusf4/src/stm32_critmon.c diff --git a/boards/arm/omnibusf4/src/stm32_idle.c b/boards/arm/stm32/omnibusf4/src/stm32_idle.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_idle.c rename to boards/arm/stm32/omnibusf4/src/stm32_idle.c diff --git a/boards/arm/omnibusf4/src/stm32_ioctl.c b/boards/arm/stm32/omnibusf4/src/stm32_ioctl.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_ioctl.c rename to boards/arm/stm32/omnibusf4/src/stm32_ioctl.c diff --git a/boards/arm/omnibusf4/src/stm32_max7456.c b/boards/arm/stm32/omnibusf4/src/stm32_max7456.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_max7456.c rename to boards/arm/stm32/omnibusf4/src/stm32_max7456.c diff --git a/boards/arm/omnibusf4/src/stm32_mmcsd.c b/boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_mmcsd.c rename to boards/arm/stm32/omnibusf4/src/stm32_mmcsd.c diff --git a/boards/arm/omnibusf4/src/stm32_mpu6000.c b/boards/arm/stm32/omnibusf4/src/stm32_mpu6000.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_mpu6000.c rename to boards/arm/stm32/omnibusf4/src/stm32_mpu6000.c diff --git a/boards/arm/omnibusf4/src/stm32_netinit.c b/boards/arm/stm32/omnibusf4/src/stm32_netinit.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_netinit.c rename to boards/arm/stm32/omnibusf4/src/stm32_netinit.c diff --git a/boards/arm/omnibusf4/src/stm32_ostest.c b/boards/arm/stm32/omnibusf4/src/stm32_ostest.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_ostest.c rename to boards/arm/stm32/omnibusf4/src/stm32_ostest.c diff --git a/boards/arm/omnibusf4/src/stm32_pm.c b/boards/arm/stm32/omnibusf4/src/stm32_pm.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_pm.c rename to boards/arm/stm32/omnibusf4/src/stm32_pm.c diff --git a/boards/arm/omnibusf4/src/stm32_pwm.c b/boards/arm/stm32/omnibusf4/src/stm32_pwm.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_pwm.c rename to boards/arm/stm32/omnibusf4/src/stm32_pwm.c diff --git a/boards/arm/omnibusf4/src/stm32_reset.c b/boards/arm/stm32/omnibusf4/src/stm32_reset.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_reset.c rename to boards/arm/stm32/omnibusf4/src/stm32_reset.c diff --git a/boards/arm/omnibusf4/src/stm32_romfs.h b/boards/arm/stm32/omnibusf4/src/stm32_romfs.h similarity index 100% rename from boards/arm/omnibusf4/src/stm32_romfs.h rename to boards/arm/stm32/omnibusf4/src/stm32_romfs.h diff --git a/boards/arm/omnibusf4/src/stm32_romfs_initialize.c b/boards/arm/stm32/omnibusf4/src/stm32_romfs_initialize.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_romfs_initialize.c rename to boards/arm/stm32/omnibusf4/src/stm32_romfs_initialize.c diff --git a/boards/arm/omnibusf4/src/stm32_spi.c b/boards/arm/stm32/omnibusf4/src/stm32_spi.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_spi.c rename to boards/arm/stm32/omnibusf4/src/stm32_spi.c diff --git a/boards/arm/omnibusf4/src/stm32_timer.c b/boards/arm/stm32/omnibusf4/src/stm32_timer.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_timer.c rename to boards/arm/stm32/omnibusf4/src/stm32_timer.c diff --git a/boards/arm/omnibusf4/src/stm32_uid.c b/boards/arm/stm32/omnibusf4/src/stm32_uid.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_uid.c rename to boards/arm/stm32/omnibusf4/src/stm32_uid.c diff --git a/boards/arm/omnibusf4/src/stm32_usb.c b/boards/arm/stm32/omnibusf4/src/stm32_usb.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_usb.c rename to boards/arm/stm32/omnibusf4/src/stm32_usb.c diff --git a/boards/arm/omnibusf4/src/stm32_usbmsc.c b/boards/arm/stm32/omnibusf4/src/stm32_usbmsc.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_usbmsc.c rename to boards/arm/stm32/omnibusf4/src/stm32_usbmsc.c diff --git a/boards/arm/omnibusf4/src/stm32_userleds.c b/boards/arm/stm32/omnibusf4/src/stm32_userleds.c similarity index 100% rename from boards/arm/omnibusf4/src/stm32_userleds.c rename to boards/arm/stm32/omnibusf4/src/stm32_userleds.c diff --git a/boards/arm/photon/Kconfig b/boards/arm/stm32/photon/Kconfig similarity index 100% rename from boards/arm/photon/Kconfig rename to boards/arm/stm32/photon/Kconfig diff --git a/boards/arm/photon/README.txt b/boards/arm/stm32/photon/README.txt similarity index 100% rename from boards/arm/photon/README.txt rename to boards/arm/stm32/photon/README.txt diff --git a/boards/arm/photon/configs/nsh/defconfig b/boards/arm/stm32/photon/configs/nsh/defconfig similarity index 98% rename from boards/arm/photon/configs/nsh/defconfig rename to boards/arm/stm32/photon/configs/nsh/defconfig index a4f999023e0..7c3ed7870a5 100644 --- a/boards/arm/photon/configs/nsh/defconfig +++ b/boards/arm/stm32/photon/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="photon" CONFIG_ARCH_BOARD_PHOTON=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F205RG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/photon/configs/rgbled/defconfig b/boards/arm/stm32/photon/configs/rgbled/defconfig similarity index 98% rename from boards/arm/photon/configs/rgbled/defconfig rename to boards/arm/stm32/photon/configs/rgbled/defconfig index d50f8bd8ffd..8d5cc70d24b 100644 --- a/boards/arm/photon/configs/rgbled/defconfig +++ b/boards/arm/stm32/photon/configs/rgbled/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="photon" CONFIG_ARCH_BOARD_PHOTON=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F205RG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/photon/configs/usbnsh/defconfig b/boards/arm/stm32/photon/configs/usbnsh/defconfig similarity index 98% rename from boards/arm/photon/configs/usbnsh/defconfig rename to boards/arm/stm32/photon/configs/usbnsh/defconfig index 5dc024de084..096fb11ec50 100644 --- a/boards/arm/photon/configs/usbnsh/defconfig +++ b/boards/arm/stm32/photon/configs/usbnsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="photon" CONFIG_ARCH_BOARD_PHOTON=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F205RG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/photon/configs/wlan/defconfig b/boards/arm/stm32/photon/configs/wlan/defconfig similarity index 99% rename from boards/arm/photon/configs/wlan/defconfig rename to boards/arm/stm32/photon/configs/wlan/defconfig index d3402186891..0a160a9b22a 100644 --- a/boards/arm/photon/configs/wlan/defconfig +++ b/boards/arm/stm32/photon/configs/wlan/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="photon" CONFIG_ARCH_BOARD_PHOTON=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F205RG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/photon/include/board.h b/boards/arm/stm32/photon/include/board.h similarity index 100% rename from boards/arm/photon/include/board.h rename to boards/arm/stm32/photon/include/board.h diff --git a/boards/arm/photon/scripts/Make.defs b/boards/arm/stm32/photon/scripts/Make.defs similarity index 96% rename from boards/arm/photon/scripts/Make.defs rename to boards/arm/stm32/photon/scripts/Make.defs index 1efeadf2fa5..096392970ec 100644 --- a/boards/arm/photon/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/photon/scripts/photon_dfu.ld b/boards/arm/stm32/photon/scripts/photon_dfu.ld similarity index 100% rename from boards/arm/photon/scripts/photon_dfu.ld rename to boards/arm/stm32/photon/scripts/photon_dfu.ld diff --git a/boards/arm/photon/scripts/photon_jtag.ld b/boards/arm/stm32/photon/scripts/photon_jtag.ld similarity index 100% rename from boards/arm/photon/scripts/photon_jtag.ld rename to boards/arm/stm32/photon/scripts/photon_jtag.ld diff --git a/boards/arm/photon/src/Makefile b/boards/arm/stm32/photon/src/Makefile similarity index 100% rename from boards/arm/photon/src/Makefile rename to boards/arm/stm32/photon/src/Makefile diff --git a/boards/arm/photon/src/dfu_signature.c b/boards/arm/stm32/photon/src/dfu_signature.c similarity index 100% rename from boards/arm/photon/src/dfu_signature.c rename to boards/arm/stm32/photon/src/dfu_signature.c diff --git a/boards/arm/photon/src/photon.h b/boards/arm/stm32/photon/src/photon.h similarity index 100% rename from boards/arm/photon/src/photon.h rename to boards/arm/stm32/photon/src/photon.h diff --git a/boards/arm/photon/src/stm32_appinit.c b/boards/arm/stm32/photon/src/stm32_appinit.c similarity index 100% rename from boards/arm/photon/src/stm32_appinit.c rename to boards/arm/stm32/photon/src/stm32_appinit.c diff --git a/boards/arm/photon/src/stm32_autoleds.c b/boards/arm/stm32/photon/src/stm32_autoleds.c similarity index 100% rename from boards/arm/photon/src/stm32_autoleds.c rename to boards/arm/stm32/photon/src/stm32_autoleds.c diff --git a/boards/arm/photon/src/stm32_boot.c b/boards/arm/stm32/photon/src/stm32_boot.c similarity index 100% rename from boards/arm/photon/src/stm32_boot.c rename to boards/arm/stm32/photon/src/stm32_boot.c diff --git a/boards/arm/photon/src/stm32_bringup.c b/boards/arm/stm32/photon/src/stm32_bringup.c similarity index 100% rename from boards/arm/photon/src/stm32_bringup.c rename to boards/arm/stm32/photon/src/stm32_bringup.c diff --git a/boards/arm/photon/src/stm32_buttons.c b/boards/arm/stm32/photon/src/stm32_buttons.c similarity index 100% rename from boards/arm/photon/src/stm32_buttons.c rename to boards/arm/stm32/photon/src/stm32_buttons.c diff --git a/boards/arm/photon/src/stm32_rgbled.c b/boards/arm/stm32/photon/src/stm32_rgbled.c similarity index 100% rename from boards/arm/photon/src/stm32_rgbled.c rename to boards/arm/stm32/photon/src/stm32_rgbled.c diff --git a/boards/arm/photon/src/stm32_spi.c b/boards/arm/stm32/photon/src/stm32_spi.c similarity index 100% rename from boards/arm/photon/src/stm32_spi.c rename to boards/arm/stm32/photon/src/stm32_spi.c diff --git a/boards/arm/photon/src/stm32_usb.c b/boards/arm/stm32/photon/src/stm32_usb.c similarity index 100% rename from boards/arm/photon/src/stm32_usb.c rename to boards/arm/stm32/photon/src/stm32_usb.c diff --git a/boards/arm/photon/src/stm32_userleds.c b/boards/arm/stm32/photon/src/stm32_userleds.c similarity index 100% rename from boards/arm/photon/src/stm32_userleds.c rename to boards/arm/stm32/photon/src/stm32_userleds.c diff --git a/boards/arm/photon/src/stm32_wdt.c b/boards/arm/stm32/photon/src/stm32_wdt.c similarity index 100% rename from boards/arm/photon/src/stm32_wdt.c rename to boards/arm/stm32/photon/src/stm32_wdt.c diff --git a/boards/arm/photon/src/stm32_wlan.c b/boards/arm/stm32/photon/src/stm32_wlan.c similarity index 100% rename from boards/arm/photon/src/stm32_wlan.c rename to boards/arm/stm32/photon/src/stm32_wlan.c diff --git a/boards/arm/photon/src/stm32_wlan_firmware.c b/boards/arm/stm32/photon/src/stm32_wlan_firmware.c similarity index 100% rename from boards/arm/photon/src/stm32_wlan_firmware.c rename to boards/arm/stm32/photon/src/stm32_wlan_firmware.c diff --git a/boards/arm/shenzhou/Kconfig b/boards/arm/stm32/shenzhou/Kconfig similarity index 100% rename from boards/arm/shenzhou/Kconfig rename to boards/arm/stm32/shenzhou/Kconfig diff --git a/boards/arm/shenzhou/README.txt b/boards/arm/stm32/shenzhou/README.txt similarity index 100% rename from boards/arm/shenzhou/README.txt rename to boards/arm/stm32/shenzhou/README.txt diff --git a/boards/arm/shenzhou/configs/nsh/defconfig b/boards/arm/stm32/shenzhou/configs/nsh/defconfig similarity index 98% rename from boards/arm/shenzhou/configs/nsh/defconfig rename to boards/arm/stm32/shenzhou/configs/nsh/defconfig index 3309873af42..4473457b621 100644 --- a/boards/arm/shenzhou/configs/nsh/defconfig +++ b/boards/arm/stm32/shenzhou/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="shenzhou" CONFIG_ARCH_BOARD_SHENZHOU=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/shenzhou/configs/nxwm/defconfig b/boards/arm/stm32/shenzhou/configs/nxwm/defconfig similarity index 99% rename from boards/arm/shenzhou/configs/nxwm/defconfig rename to boards/arm/stm32/shenzhou/configs/nxwm/defconfig index 78c22e81089..9d4d72fffe6 100644 --- a/boards/arm/shenzhou/configs/nxwm/defconfig +++ b/boards/arm/stm32/shenzhou/configs/nxwm/defconfig @@ -19,6 +19,7 @@ CONFIG_ADS7843E_THRESHY=51 CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="shenzhou" CONFIG_ARCH_BOARD_SHENZHOU=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/shenzhou/configs/thttpd/defconfig b/boards/arm/stm32/shenzhou/configs/thttpd/defconfig similarity index 99% rename from boards/arm/shenzhou/configs/thttpd/defconfig rename to boards/arm/stm32/shenzhou/configs/thttpd/defconfig index bd300baf14e..00677861069 100644 --- a/boards/arm/shenzhou/configs/thttpd/defconfig +++ b/boards/arm/stm32/shenzhou/configs/thttpd/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="shenzhou" CONFIG_ARCH_BOARD_SHENZHOU=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/shenzhou/include/board.h b/boards/arm/stm32/shenzhou/include/board.h similarity index 100% rename from boards/arm/shenzhou/include/board.h rename to boards/arm/stm32/shenzhou/include/board.h diff --git a/boards/arm/shenzhou/scripts/Make.defs b/boards/arm/stm32/shenzhou/scripts/Make.defs similarity index 96% rename from boards/arm/shenzhou/scripts/Make.defs rename to boards/arm/stm32/shenzhou/scripts/Make.defs index 843e64875d5..aeaadb8c63e 100644 --- a/boards/arm/shenzhou/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/shenzhou/scripts/ld.script b/boards/arm/stm32/shenzhou/scripts/ld.script similarity index 100% rename from boards/arm/shenzhou/scripts/ld.script rename to boards/arm/stm32/shenzhou/scripts/ld.script diff --git a/boards/arm/shenzhou/scripts/ld.script.dfu b/boards/arm/stm32/shenzhou/scripts/ld.script.dfu similarity index 100% rename from boards/arm/shenzhou/scripts/ld.script.dfu rename to boards/arm/stm32/shenzhou/scripts/ld.script.dfu diff --git a/boards/arm/omnibusf4/src/.gitignore b/boards/arm/stm32/shenzhou/src/.gitignore similarity index 100% rename from boards/arm/omnibusf4/src/.gitignore rename to boards/arm/stm32/shenzhou/src/.gitignore diff --git a/boards/arm/shenzhou/src/Makefile b/boards/arm/stm32/shenzhou/src/Makefile similarity index 100% rename from boards/arm/shenzhou/src/Makefile rename to boards/arm/stm32/shenzhou/src/Makefile diff --git a/boards/arm/shenzhou/src/shenzhou.h b/boards/arm/stm32/shenzhou/src/shenzhou.h similarity index 100% rename from boards/arm/shenzhou/src/shenzhou.h rename to boards/arm/stm32/shenzhou/src/shenzhou.h diff --git a/boards/arm/shenzhou/src/stm32_adc.c b/boards/arm/stm32/shenzhou/src/stm32_adc.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_adc.c rename to boards/arm/stm32/shenzhou/src/stm32_adc.c diff --git a/boards/arm/shenzhou/src/stm32_appinit.c b/boards/arm/stm32/shenzhou/src/stm32_appinit.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_appinit.c rename to boards/arm/stm32/shenzhou/src/stm32_appinit.c diff --git a/boards/arm/shenzhou/src/stm32_autoleds.c b/boards/arm/stm32/shenzhou/src/stm32_autoleds.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_autoleds.c rename to boards/arm/stm32/shenzhou/src/stm32_autoleds.c diff --git a/boards/arm/shenzhou/src/stm32_boot.c b/boards/arm/stm32/shenzhou/src/stm32_boot.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_boot.c rename to boards/arm/stm32/shenzhou/src/stm32_boot.c diff --git a/boards/arm/shenzhou/src/stm32_buttons.c b/boards/arm/stm32/shenzhou/src/stm32_buttons.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_buttons.c rename to boards/arm/stm32/shenzhou/src/stm32_buttons.c diff --git a/boards/arm/shenzhou/src/stm32_can.c b/boards/arm/stm32/shenzhou/src/stm32_can.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_can.c rename to boards/arm/stm32/shenzhou/src/stm32_can.c diff --git a/boards/arm/shenzhou/src/stm32_chipid.c b/boards/arm/stm32/shenzhou/src/stm32_chipid.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_chipid.c rename to boards/arm/stm32/shenzhou/src/stm32_chipid.c diff --git a/boards/arm/shenzhou/src/stm32_ili93xx.c b/boards/arm/stm32/shenzhou/src/stm32_ili93xx.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_ili93xx.c rename to boards/arm/stm32/shenzhou/src/stm32_ili93xx.c diff --git a/boards/arm/shenzhou/src/stm32_mmcsd.c b/boards/arm/stm32/shenzhou/src/stm32_mmcsd.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_mmcsd.c rename to boards/arm/stm32/shenzhou/src/stm32_mmcsd.c diff --git a/boards/arm/shenzhou/src/stm32_relays.c b/boards/arm/stm32/shenzhou/src/stm32_relays.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_relays.c rename to boards/arm/stm32/shenzhou/src/stm32_relays.c diff --git a/boards/arm/shenzhou/src/stm32_spi.c b/boards/arm/stm32/shenzhou/src/stm32_spi.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_spi.c rename to boards/arm/stm32/shenzhou/src/stm32_spi.c diff --git a/boards/arm/shenzhou/src/stm32_ssd1289.c b/boards/arm/stm32/shenzhou/src/stm32_ssd1289.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_ssd1289.c rename to boards/arm/stm32/shenzhou/src/stm32_ssd1289.c diff --git a/boards/arm/shenzhou/src/stm32_touchscreen.c b/boards/arm/stm32/shenzhou/src/stm32_touchscreen.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_touchscreen.c rename to boards/arm/stm32/shenzhou/src/stm32_touchscreen.c diff --git a/boards/arm/shenzhou/src/stm32_usb.c b/boards/arm/stm32/shenzhou/src/stm32_usb.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_usb.c rename to boards/arm/stm32/shenzhou/src/stm32_usb.c diff --git a/boards/arm/shenzhou/src/stm32_usbmsc.c b/boards/arm/stm32/shenzhou/src/stm32_usbmsc.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_usbmsc.c rename to boards/arm/stm32/shenzhou/src/stm32_usbmsc.c diff --git a/boards/arm/shenzhou/src/stm32_userleds.c b/boards/arm/stm32/shenzhou/src/stm32_userleds.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_userleds.c rename to boards/arm/stm32/shenzhou/src/stm32_userleds.c diff --git a/boards/arm/shenzhou/src/stm32_w25.c b/boards/arm/stm32/shenzhou/src/stm32_w25.c similarity index 100% rename from boards/arm/shenzhou/src/stm32_w25.c rename to boards/arm/stm32/shenzhou/src/stm32_w25.c diff --git a/boards/arm/shenzhou/tools/olimex-arm-usb-ocd.cfg b/boards/arm/stm32/shenzhou/tools/olimex-arm-usb-ocd.cfg similarity index 100% rename from boards/arm/shenzhou/tools/olimex-arm-usb-ocd.cfg rename to boards/arm/stm32/shenzhou/tools/olimex-arm-usb-ocd.cfg diff --git a/boards/arm/shenzhou/tools/oocd.sh b/boards/arm/stm32/shenzhou/tools/oocd.sh similarity index 100% rename from boards/arm/shenzhou/tools/oocd.sh rename to boards/arm/stm32/shenzhou/tools/oocd.sh diff --git a/boards/arm/shenzhou/tools/stm32.cfg b/boards/arm/stm32/shenzhou/tools/stm32.cfg similarity index 100% rename from boards/arm/shenzhou/tools/stm32.cfg rename to boards/arm/stm32/shenzhou/tools/stm32.cfg diff --git a/boards/arm/olimex-strp711/scripts/usb-driver.txt b/boards/arm/stm32/shenzhou/tools/usb-driver.txt similarity index 100% rename from boards/arm/olimex-strp711/scripts/usb-driver.txt rename to boards/arm/stm32/shenzhou/tools/usb-driver.txt diff --git a/boards/arm/stm3210e-eval/Kconfig b/boards/arm/stm32/stm3210e-eval/Kconfig similarity index 100% rename from boards/arm/stm3210e-eval/Kconfig rename to boards/arm/stm32/stm3210e-eval/Kconfig diff --git a/boards/arm/stm3210e-eval/README.txt b/boards/arm/stm32/stm3210e-eval/README.txt similarity index 100% rename from boards/arm/stm3210e-eval/README.txt rename to boards/arm/stm32/stm3210e-eval/README.txt diff --git a/boards/arm/stm3210e-eval/configs/composite/defconfig b/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig similarity index 98% rename from boards/arm/stm3210e-eval/configs/composite/defconfig rename to boards/arm/stm32/stm3210e-eval/configs/composite/defconfig index 79ccdf2f3ba..4d28e2e2bea 100644 --- a/boards/arm/stm3210e-eval/configs/composite/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3210e-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm3210e-eval/configs/nsh/defconfig rename to boards/arm/stm32/stm3210e-eval/configs/nsh/defconfig index 5ec39d7c06e..fea47adcd52 100644 --- a/boards/arm/stm3210e-eval/configs/nsh/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3210e-eval/configs/nsh2/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nsh2/defconfig similarity index 99% rename from boards/arm/stm3210e-eval/configs/nsh2/defconfig rename to boards/arm/stm32/stm3210e-eval/configs/nsh2/defconfig index b7b3318cbe4..6536febc23a 100644 --- a/boards/arm/stm3210e-eval/configs/nsh2/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/nsh2/defconfig @@ -21,6 +21,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3210e-eval/configs/nx/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig similarity index 98% rename from boards/arm/stm3210e-eval/configs/nx/defconfig rename to boards/arm/stm32/stm3210e-eval/configs/nx/defconfig index c491ae71fbd..8bbeb7298dd 100644 --- a/boards/arm/stm3210e-eval/configs/nx/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3210e-eval/configs/nxterm/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nxterm/defconfig similarity index 98% rename from boards/arm/stm3210e-eval/configs/nxterm/defconfig rename to boards/arm/stm32/stm3210e-eval/configs/nxterm/defconfig index 16ac4bcd9ff..749bb497749 100644 --- a/boards/arm/stm3210e-eval/configs/nxterm/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/nxterm/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3210e-eval/configs/pm/defconfig b/boards/arm/stm32/stm3210e-eval/configs/pm/defconfig similarity index 99% rename from boards/arm/stm3210e-eval/configs/pm/defconfig rename to boards/arm/stm32/stm3210e-eval/configs/pm/defconfig index e78ce440304..da533a422ec 100644 --- a/boards/arm/stm3210e-eval/configs/pm/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/pm/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_CUSTOM_PMINIT=y diff --git a/boards/arm/stm3210e-eval/configs/usbmsc/defconfig b/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig similarity index 98% rename from boards/arm/stm3210e-eval/configs/usbmsc/defconfig rename to boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig index 6abb054ae66..ca9c8b273f0 100644 --- a/boards/arm/stm3210e-eval/configs/usbmsc/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3210e-eval/configs/usbserial/defconfig b/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig similarity index 98% rename from boards/arm/stm3210e-eval/configs/usbserial/defconfig rename to boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig index 6ef50d80ebd..29f0a9a7189 100644 --- a/boards/arm/stm3210e-eval/configs/usbserial/defconfig +++ b/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3210e-eval" CONFIG_ARCH_BOARD_STM3210E_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103ZE=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3210e-eval/include/board.h b/boards/arm/stm32/stm3210e-eval/include/board.h similarity index 100% rename from boards/arm/stm3210e-eval/include/board.h rename to boards/arm/stm32/stm3210e-eval/include/board.h diff --git a/boards/arm/stm3210e-eval/scripts/Make.defs b/boards/arm/stm32/stm3210e-eval/scripts/Make.defs similarity index 96% rename from boards/arm/stm3210e-eval/scripts/Make.defs rename to boards/arm/stm32/stm3210e-eval/scripts/Make.defs index 5b3e1491488..1d136963d14 100644 --- a/boards/arm/stm3210e-eval/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm3210e-eval/scripts/ld.script b/boards/arm/stm32/stm3210e-eval/scripts/ld.script similarity index 100% rename from boards/arm/stm3210e-eval/scripts/ld.script rename to boards/arm/stm32/stm3210e-eval/scripts/ld.script diff --git a/boards/arm/stm3210e-eval/scripts/ld.script.dfu b/boards/arm/stm32/stm3210e-eval/scripts/ld.script.dfu similarity index 100% rename from boards/arm/stm3210e-eval/scripts/ld.script.dfu rename to boards/arm/stm32/stm3210e-eval/scripts/ld.script.dfu diff --git a/boards/arm/open1788/src/.gitignore b/boards/arm/stm32/stm3210e-eval/src/.gitignore similarity index 100% rename from boards/arm/open1788/src/.gitignore rename to boards/arm/stm32/stm3210e-eval/src/.gitignore diff --git a/boards/arm/stm3210e-eval/src/Makefile b/boards/arm/stm32/stm3210e-eval/src/Makefile similarity index 100% rename from boards/arm/stm3210e-eval/src/Makefile rename to boards/arm/stm32/stm3210e-eval/src/Makefile diff --git a/boards/arm/stm3210e-eval/src/stm3210e-eval.h b/boards/arm/stm32/stm3210e-eval/src/stm3210e-eval.h similarity index 100% rename from boards/arm/stm3210e-eval/src/stm3210e-eval.h rename to boards/arm/stm32/stm3210e-eval/src/stm3210e-eval.h diff --git a/boards/arm/stm3210e-eval/src/stm32_adc.c b/boards/arm/stm32/stm3210e-eval/src/stm32_adc.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_adc.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_adc.c diff --git a/boards/arm/stm3210e-eval/src/stm32_appinit.c b/boards/arm/stm32/stm3210e-eval/src/stm32_appinit.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_appinit.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_appinit.c diff --git a/boards/arm/stm3210e-eval/src/stm32_boot.c b/boards/arm/stm32/stm3210e-eval/src/stm32_boot.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_boot.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_boot.c diff --git a/boards/arm/stm3210e-eval/src/stm32_bringup.c b/boards/arm/stm32/stm3210e-eval/src/stm32_bringup.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_bringup.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_bringup.c diff --git a/boards/arm/stm3210e-eval/src/stm32_buttons.c b/boards/arm/stm32/stm3210e-eval/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_buttons.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_buttons.c diff --git a/boards/arm/stm3210e-eval/src/stm32_can.c b/boards/arm/stm32/stm3210e-eval/src/stm32_can.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_can.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_can.c diff --git a/boards/arm/stm3210e-eval/src/stm32_composite.c b/boards/arm/stm32/stm3210e-eval/src/stm32_composite.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_composite.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_composite.c diff --git a/boards/arm/stm3210e-eval/src/stm32_deselectlcd.c b/boards/arm/stm32/stm3210e-eval/src/stm32_deselectlcd.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_deselectlcd.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_deselectlcd.c diff --git a/boards/arm/stm3210e-eval/src/stm32_deselectnor.c b/boards/arm/stm32/stm3210e-eval/src/stm32_deselectnor.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_deselectnor.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_deselectnor.c diff --git a/boards/arm/stm3210e-eval/src/stm32_deselectsram.c b/boards/arm/stm32/stm3210e-eval/src/stm32_deselectsram.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_deselectsram.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_deselectsram.c diff --git a/boards/arm/stm3210e-eval/src/stm32_djoystick.c b/boards/arm/stm32/stm3210e-eval/src/stm32_djoystick.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_djoystick.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_djoystick.c diff --git a/boards/arm/stm3210e-eval/src/stm32_extcontext.c b/boards/arm/stm32/stm3210e-eval/src/stm32_extcontext.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_extcontext.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_extcontext.c diff --git a/boards/arm/stm3210e-eval/src/stm32_extmem.c b/boards/arm/stm32/stm3210e-eval/src/stm32_extmem.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_extmem.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_extmem.c diff --git a/boards/arm/stm3210e-eval/src/stm32_idle.c b/boards/arm/stm32/stm3210e-eval/src/stm32_idle.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_idle.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_idle.c diff --git a/boards/arm/stm3210e-eval/src/stm32_lcd.c b/boards/arm/stm32/stm3210e-eval/src/stm32_lcd.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_lcd.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_lcd.c diff --git a/boards/arm/stm3210e-eval/src/stm32_leds.c b/boards/arm/stm32/stm3210e-eval/src/stm32_leds.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_leds.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_leds.c diff --git a/boards/arm/stm3210e-eval/src/stm32_lm75.c b/boards/arm/stm32/stm3210e-eval/src/stm32_lm75.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_lm75.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_lm75.c diff --git a/boards/arm/stm3210e-eval/src/stm32_pm.c b/boards/arm/stm32/stm3210e-eval/src/stm32_pm.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_pm.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_pm.c diff --git a/boards/arm/stm3210e-eval/src/stm32_pmbuttons.c b/boards/arm/stm32/stm3210e-eval/src/stm32_pmbuttons.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_pmbuttons.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_pmbuttons.c diff --git a/boards/arm/stm3210e-eval/src/stm32_selectlcd.c b/boards/arm/stm32/stm3210e-eval/src/stm32_selectlcd.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_selectlcd.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_selectlcd.c diff --git a/boards/arm/stm3210e-eval/src/stm32_selectnor.c b/boards/arm/stm32/stm3210e-eval/src/stm32_selectnor.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_selectnor.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_selectnor.c diff --git a/boards/arm/stm3210e-eval/src/stm32_selectsram.c b/boards/arm/stm32/stm3210e-eval/src/stm32_selectsram.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_selectsram.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_selectsram.c diff --git a/boards/arm/stm3210e-eval/src/stm32_spi.c b/boards/arm/stm32/stm3210e-eval/src/stm32_spi.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_spi.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_spi.c diff --git a/boards/arm/stm3210e-eval/src/stm32_usbdev.c b/boards/arm/stm32/stm3210e-eval/src/stm32_usbdev.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_usbdev.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_usbdev.c diff --git a/boards/arm/stm3210e-eval/src/stm32_usbmsc.c b/boards/arm/stm32/stm3210e-eval/src/stm32_usbmsc.c similarity index 100% rename from boards/arm/stm3210e-eval/src/stm32_usbmsc.c rename to boards/arm/stm32/stm3210e-eval/src/stm32_usbmsc.c diff --git a/boards/arm/stm3210e-eval/tools/olimex-arm-usb-ocd.cfg b/boards/arm/stm32/stm3210e-eval/tools/olimex-arm-usb-ocd.cfg similarity index 100% rename from boards/arm/stm3210e-eval/tools/olimex-arm-usb-ocd.cfg rename to boards/arm/stm32/stm3210e-eval/tools/olimex-arm-usb-ocd.cfg diff --git a/boards/arm/stm3210e-eval/tools/oocd.sh b/boards/arm/stm32/stm3210e-eval/tools/oocd.sh similarity index 100% rename from boards/arm/stm3210e-eval/tools/oocd.sh rename to boards/arm/stm32/stm3210e-eval/tools/oocd.sh diff --git a/boards/arm/stm3210e-eval/tools/stm32.cfg b/boards/arm/stm32/stm3210e-eval/tools/stm32.cfg similarity index 100% rename from boards/arm/stm3210e-eval/tools/stm32.cfg rename to boards/arm/stm32/stm3210e-eval/tools/stm32.cfg diff --git a/boards/arm/shenzhou/tools/usb-driver.txt b/boards/arm/stm32/stm3210e-eval/tools/usb-driver.txt similarity index 100% rename from boards/arm/shenzhou/tools/usb-driver.txt rename to boards/arm/stm32/stm3210e-eval/tools/usb-driver.txt diff --git a/boards/arm/stm3220g-eval/Kconfig b/boards/arm/stm32/stm3220g-eval/Kconfig similarity index 100% rename from boards/arm/stm3220g-eval/Kconfig rename to boards/arm/stm32/stm3220g-eval/Kconfig diff --git a/boards/arm/stm3220g-eval/README.txt b/boards/arm/stm32/stm3220g-eval/README.txt similarity index 100% rename from boards/arm/stm3220g-eval/README.txt rename to boards/arm/stm32/stm3220g-eval/README.txt diff --git a/boards/arm/stm3220g-eval/configs/dhcpd/defconfig b/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig similarity index 98% rename from boards/arm/stm3220g-eval/configs/dhcpd/defconfig rename to boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig index dbd423fe051..f4f0c032fb2 100644 --- a/boards/arm/stm3220g-eval/configs/dhcpd/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3220g-eval/configs/nettest/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig similarity index 98% rename from boards/arm/stm3220g-eval/configs/nettest/defconfig rename to boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig index 7fdaf0e4130..118767c8e11 100644 --- a/boards/arm/stm3220g-eval/configs/nettest/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3220g-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm3220g-eval/configs/nsh/defconfig rename to boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig index 8764eda14d5..37f0607b886 100644 --- a/boards/arm/stm3220g-eval/configs/nsh/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3220g-eval/configs/nsh2/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig similarity index 99% rename from boards/arm/stm3220g-eval/configs/nsh2/defconfig rename to boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig index 23b8942591c..efcc1358d25 100644 --- a/boards/arm/stm3220g-eval/configs/nsh2/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3220g-eval/configs/nxwm/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig similarity index 99% rename from boards/arm/stm3220g-eval/configs/nxwm/defconfig rename to boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig index fe51ea578d5..559809a37d8 100644 --- a/boards/arm/stm3220g-eval/configs/nxwm/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3220g-eval/configs/telnetd/defconfig b/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig similarity index 98% rename from boards/arm/stm3220g-eval/configs/telnetd/defconfig rename to boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig index 598987dca59..01e1803e957 100644 --- a/boards/arm/stm3220g-eval/configs/telnetd/defconfig +++ b/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3220g-eval" CONFIG_ARCH_BOARD_STM3220G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F207IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3220g-eval/include/board.h b/boards/arm/stm32/stm3220g-eval/include/board.h similarity index 100% rename from boards/arm/stm3220g-eval/include/board.h rename to boards/arm/stm32/stm3220g-eval/include/board.h diff --git a/boards/arm/stm3220g-eval/scripts/Make.defs b/boards/arm/stm32/stm3220g-eval/scripts/Make.defs similarity index 96% rename from boards/arm/stm3220g-eval/scripts/Make.defs rename to boards/arm/stm32/stm3220g-eval/scripts/Make.defs index bd3d2ace29f..fb53a934fe0 100644 --- a/boards/arm/stm3220g-eval/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm3220g-eval/scripts/ld.script b/boards/arm/stm32/stm3220g-eval/scripts/ld.script similarity index 100% rename from boards/arm/stm3220g-eval/scripts/ld.script rename to boards/arm/stm32/stm3220g-eval/scripts/ld.script diff --git a/boards/arm/pnev5180b/src/.gitignore b/boards/arm/stm32/stm3220g-eval/src/.gitignore similarity index 100% rename from boards/arm/pnev5180b/src/.gitignore rename to boards/arm/stm32/stm3220g-eval/src/.gitignore diff --git a/boards/arm/stm3220g-eval/src/Makefile b/boards/arm/stm32/stm3220g-eval/src/Makefile similarity index 100% rename from boards/arm/stm3220g-eval/src/Makefile rename to boards/arm/stm32/stm3220g-eval/src/Makefile diff --git a/boards/arm/stm3220g-eval/src/stm3220g-eval.h b/boards/arm/stm32/stm3220g-eval/src/stm3220g-eval.h similarity index 100% rename from boards/arm/stm3220g-eval/src/stm3220g-eval.h rename to boards/arm/stm32/stm3220g-eval/src/stm3220g-eval.h diff --git a/boards/arm/stm3220g-eval/src/stm32_adc.c b/boards/arm/stm32/stm3220g-eval/src/stm32_adc.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_adc.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_adc.c diff --git a/boards/arm/stm3220g-eval/src/stm32_appinit.c b/boards/arm/stm32/stm3220g-eval/src/stm32_appinit.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_appinit.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_appinit.c diff --git a/boards/arm/stm3220g-eval/src/stm32_autoleds.c b/boards/arm/stm32/stm3220g-eval/src/stm32_autoleds.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_autoleds.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_autoleds.c diff --git a/boards/arm/stm3220g-eval/src/stm32_boot.c b/boards/arm/stm32/stm3220g-eval/src/stm32_boot.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_boot.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_boot.c diff --git a/boards/arm/stm3220g-eval/src/stm32_buttons.c b/boards/arm/stm32/stm3220g-eval/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_buttons.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_buttons.c diff --git a/boards/arm/stm3220g-eval/src/stm32_can.c b/boards/arm/stm32/stm3220g-eval/src/stm32_can.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_can.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_can.c diff --git a/boards/arm/stm3220g-eval/src/stm32_deselectlcd.c b/boards/arm/stm32/stm3220g-eval/src/stm32_deselectlcd.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_deselectlcd.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_deselectlcd.c diff --git a/boards/arm/stm3220g-eval/src/stm32_deselectsram.c b/boards/arm/stm32/stm3220g-eval/src/stm32_deselectsram.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_deselectsram.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_deselectsram.c diff --git a/boards/arm/stm3220g-eval/src/stm32_extmem.c b/boards/arm/stm32/stm3220g-eval/src/stm32_extmem.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_extmem.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_extmem.c diff --git a/boards/arm/stm3220g-eval/src/stm32_lcd.c b/boards/arm/stm32/stm3220g-eval/src/stm32_lcd.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_lcd.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_lcd.c diff --git a/boards/arm/stm3220g-eval/src/stm32_pwm.c b/boards/arm/stm32/stm3220g-eval/src/stm32_pwm.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_pwm.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_pwm.c diff --git a/boards/arm/stm3220g-eval/src/stm32_selectlcd.c b/boards/arm/stm32/stm3220g-eval/src/stm32_selectlcd.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_selectlcd.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_selectlcd.c diff --git a/boards/arm/stm3220g-eval/src/stm32_selectsram.c b/boards/arm/stm32/stm3220g-eval/src/stm32_selectsram.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_selectsram.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_selectsram.c diff --git a/boards/arm/stm3220g-eval/src/stm32_spi.c b/boards/arm/stm32/stm3220g-eval/src/stm32_spi.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_spi.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_spi.c diff --git a/boards/arm/stm3220g-eval/src/stm32_stmpe811.c b/boards/arm/stm32/stm3220g-eval/src/stm32_stmpe811.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_stmpe811.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_stmpe811.c diff --git a/boards/arm/stm3220g-eval/src/stm32_usb.c b/boards/arm/stm32/stm3220g-eval/src/stm32_usb.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_usb.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_usb.c diff --git a/boards/arm/stm3220g-eval/src/stm32_userleds.c b/boards/arm/stm32/stm3220g-eval/src/stm32_userleds.c similarity index 100% rename from boards/arm/stm3220g-eval/src/stm32_userleds.c rename to boards/arm/stm32/stm3220g-eval/src/stm32_userleds.c diff --git a/boards/arm/stm3220g-eval/tools/olimex-arm-usb-ocd.cfg b/boards/arm/stm32/stm3220g-eval/tools/olimex-arm-usb-ocd.cfg similarity index 100% rename from boards/arm/stm3220g-eval/tools/olimex-arm-usb-ocd.cfg rename to boards/arm/stm32/stm3220g-eval/tools/olimex-arm-usb-ocd.cfg diff --git a/boards/arm/stm3220g-eval/tools/oocd.sh b/boards/arm/stm32/stm3220g-eval/tools/oocd.sh similarity index 100% rename from boards/arm/stm3220g-eval/tools/oocd.sh rename to boards/arm/stm32/stm3220g-eval/tools/oocd.sh diff --git a/boards/arm/stm3220g-eval/tools/stm32.cfg b/boards/arm/stm32/stm3220g-eval/tools/stm32.cfg similarity index 100% rename from boards/arm/stm3220g-eval/tools/stm32.cfg rename to boards/arm/stm32/stm3220g-eval/tools/stm32.cfg diff --git a/boards/arm/stm3210e-eval/tools/usb-driver.txt b/boards/arm/stm32/stm3220g-eval/tools/usb-driver.txt similarity index 100% rename from boards/arm/stm3210e-eval/tools/usb-driver.txt rename to boards/arm/stm32/stm3220g-eval/tools/usb-driver.txt diff --git a/boards/arm/stm3240g-eval/Kconfig b/boards/arm/stm32/stm3240g-eval/Kconfig similarity index 100% rename from boards/arm/stm3240g-eval/Kconfig rename to boards/arm/stm32/stm3240g-eval/Kconfig diff --git a/boards/arm/stm3240g-eval/README.txt b/boards/arm/stm32/stm3240g-eval/README.txt similarity index 100% rename from boards/arm/stm3240g-eval/README.txt rename to boards/arm/stm32/stm3240g-eval/README.txt diff --git a/boards/arm/stm3240g-eval/configs/dhcpd/defconfig b/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig similarity index 98% rename from boards/arm/stm3240g-eval/configs/dhcpd/defconfig rename to boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig index baee10f8564..156ec8a4d2d 100644 --- a/boards/arm/stm3240g-eval/configs/dhcpd/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3240g-eval/configs/discover/defconfig b/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig similarity index 98% rename from boards/arm/stm3240g-eval/configs/discover/defconfig rename to boards/arm/stm32/stm3240g-eval/configs/discover/defconfig index 054f353e582..fe44ba6f35d 100644 --- a/boards/arm/stm3240g-eval/configs/discover/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3240g-eval/configs/fb/defconfig b/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig similarity index 98% rename from boards/arm/stm3240g-eval/configs/fb/defconfig rename to boards/arm/stm32/stm3240g-eval/configs/fb/defconfig index 03219db0ee5..55c51c2c60f 100644 --- a/boards/arm/stm3240g-eval/configs/fb/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3240g-eval/configs/knxwm/Make.defs b/boards/arm/stm32/stm3240g-eval/configs/knxwm/Make.defs similarity index 91% rename from boards/arm/stm3240g-eval/configs/knxwm/Make.defs rename to boards/arm/stm32/stm3240g-eval/configs/knxwm/Make.defs index 18b4b40ee9f..a893a64d75b 100644 --- a/boards/arm/stm3240g-eval/configs/knxwm/Make.defs +++ b/boards/arm/stm32/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)$(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}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(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 + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + ARCHSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm3240g-eval/configs/knxwm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig similarity index 99% rename from boards/arm/stm3240g-eval/configs/knxwm/defconfig rename to boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig index 24a68b276be..fa6220f1367 100644 --- a/boards/arm/stm3240g-eval/configs/knxwm/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3240g-eval/configs/nettest/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig similarity index 98% rename from boards/arm/stm3240g-eval/configs/nettest/defconfig rename to boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig index 2f57f463656..75597571b32 100644 --- a/boards/arm/stm3240g-eval/configs/nettest/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3240g-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm3240g-eval/configs/nsh/defconfig rename to boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig index 5b31e17a783..d9b9e868659 100644 --- a/boards/arm/stm3240g-eval/configs/nsh/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3240g-eval/configs/nsh2/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig similarity index 99% rename from boards/arm/stm3240g-eval/configs/nsh2/defconfig rename to boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig index 72310ff3d46..da35c04897d 100644 --- a/boards/arm/stm3240g-eval/configs/nsh2/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3240g-eval/configs/nxterm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig similarity index 99% rename from boards/arm/stm3240g-eval/configs/nxterm/defconfig rename to boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig index b83f12239fd..5ebf0a4cf51 100644 --- a/boards/arm/stm3240g-eval/configs/nxterm/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3240g-eval/configs/nxwm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig similarity index 99% rename from boards/arm/stm3240g-eval/configs/nxwm/defconfig rename to boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig index 7893c0bdf03..7a607aa884e 100644 --- a/boards/arm/stm3240g-eval/configs/nxwm/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3240g-eval/configs/telnetd/defconfig b/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig similarity index 98% rename from boards/arm/stm3240g-eval/configs/telnetd/defconfig rename to boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig index 9ca06d139d1..6f73e2509fc 100644 --- a/boards/arm/stm3240g-eval/configs/telnetd/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3240g-eval/configs/webserver/defconfig b/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig similarity index 98% rename from boards/arm/stm3240g-eval/configs/webserver/defconfig rename to boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig index 1849d9c9db5..96710ca3f7f 100644 --- a/boards/arm/stm3240g-eval/configs/webserver/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3240g-eval/configs/xmlrpc/defconfig b/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig similarity index 98% rename from boards/arm/stm3240g-eval/configs/xmlrpc/defconfig rename to boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig index b20ccbba063..3b4a126dee5 100644 --- a/boards/arm/stm3240g-eval/configs/xmlrpc/defconfig +++ b/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm3240g-eval" CONFIG_ARCH_BOARD_STM3240G_EVAL=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407IG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm3240g-eval/include/board.h b/boards/arm/stm32/stm3240g-eval/include/board.h similarity index 100% rename from boards/arm/stm3240g-eval/include/board.h rename to boards/arm/stm32/stm3240g-eval/include/board.h diff --git a/boards/arm/samv71-xult/kernel/.gitignore b/boards/arm/stm32/stm3240g-eval/kernel/.gitignore similarity index 100% rename from boards/arm/samv71-xult/kernel/.gitignore rename to boards/arm/stm32/stm3240g-eval/kernel/.gitignore diff --git a/boards/arm/stm3240g-eval/kernel/Makefile b/boards/arm/stm32/stm3240g-eval/kernel/Makefile similarity index 90% rename from boards/arm/stm3240g-eval/kernel/Makefile rename to boards/arm/stm32/stm3240g-eval/kernel/Makefile index 62f667331c5..4bbed042455 100644 --- a/boards/arm/stm3240g-eval/kernel/Makefile +++ b/boards/arm/stm32/stm3240g-eval/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/stm3240g-eval/kernel/stm32_userspace.c b/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c similarity index 100% rename from boards/arm/stm3240g-eval/kernel/stm32_userspace.c rename to boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c diff --git a/boards/arm/stm3240g-eval/scripts/Make.defs b/boards/arm/stm32/stm3240g-eval/scripts/Make.defs similarity index 96% rename from boards/arm/stm3240g-eval/scripts/Make.defs rename to boards/arm/stm32/stm3240g-eval/scripts/Make.defs index 29c9110a4f0..4fcbdbdd1a8 100644 --- a/boards/arm/stm3240g-eval/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm3240g-eval/scripts/kernel-space.ld b/boards/arm/stm32/stm3240g-eval/scripts/kernel-space.ld similarity index 100% rename from boards/arm/stm3240g-eval/scripts/kernel-space.ld rename to boards/arm/stm32/stm3240g-eval/scripts/kernel-space.ld diff --git a/boards/arm/stm3240g-eval/scripts/ld.script b/boards/arm/stm32/stm3240g-eval/scripts/ld.script similarity index 100% rename from boards/arm/stm3240g-eval/scripts/ld.script rename to boards/arm/stm32/stm3240g-eval/scripts/ld.script diff --git a/boards/arm/stm3240g-eval/scripts/memory.ld b/boards/arm/stm32/stm3240g-eval/scripts/memory.ld similarity index 100% rename from boards/arm/stm3240g-eval/scripts/memory.ld rename to boards/arm/stm32/stm3240g-eval/scripts/memory.ld diff --git a/boards/arm/stm3240g-eval/scripts/user-space.ld b/boards/arm/stm32/stm3240g-eval/scripts/user-space.ld similarity index 100% rename from boards/arm/stm3240g-eval/scripts/user-space.ld rename to boards/arm/stm32/stm3240g-eval/scripts/user-space.ld diff --git a/boards/arm/sam3u-ek/src/.gitignore b/boards/arm/stm32/stm3240g-eval/src/.gitignore similarity index 100% rename from boards/arm/sam3u-ek/src/.gitignore rename to boards/arm/stm32/stm3240g-eval/src/.gitignore diff --git a/boards/arm/stm3240g-eval/src/Makefile b/boards/arm/stm32/stm3240g-eval/src/Makefile similarity index 100% rename from boards/arm/stm3240g-eval/src/Makefile rename to boards/arm/stm32/stm3240g-eval/src/Makefile diff --git a/boards/arm/stm3240g-eval/src/stm3240g-eval.h b/boards/arm/stm32/stm3240g-eval/src/stm3240g-eval.h similarity index 100% rename from boards/arm/stm3240g-eval/src/stm3240g-eval.h rename to boards/arm/stm32/stm3240g-eval/src/stm3240g-eval.h diff --git a/boards/arm/stm3240g-eval/src/stm32_adc.c b/boards/arm/stm32/stm3240g-eval/src/stm32_adc.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_adc.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_adc.c diff --git a/boards/arm/stm3240g-eval/src/stm32_appinit.c b/boards/arm/stm32/stm3240g-eval/src/stm32_appinit.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_appinit.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_appinit.c diff --git a/boards/arm/stm3240g-eval/src/stm32_autoleds.c b/boards/arm/stm32/stm3240g-eval/src/stm32_autoleds.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_autoleds.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_autoleds.c diff --git a/boards/arm/stm3240g-eval/src/stm32_boot.c b/boards/arm/stm32/stm3240g-eval/src/stm32_boot.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_boot.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_boot.c diff --git a/boards/arm/stm3240g-eval/src/stm32_bringup.c b/boards/arm/stm32/stm3240g-eval/src/stm32_bringup.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_bringup.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_bringup.c diff --git a/boards/arm/stm3240g-eval/src/stm32_buttons.c b/boards/arm/stm32/stm3240g-eval/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_buttons.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_buttons.c diff --git a/boards/arm/stm3240g-eval/src/stm32_can.c b/boards/arm/stm32/stm3240g-eval/src/stm32_can.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_can.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_can.c diff --git a/boards/arm/stm3240g-eval/src/stm32_deselectlcd.c b/boards/arm/stm32/stm3240g-eval/src/stm32_deselectlcd.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_deselectlcd.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_deselectlcd.c diff --git a/boards/arm/stm3240g-eval/src/stm32_deselectsram.c b/boards/arm/stm32/stm3240g-eval/src/stm32_deselectsram.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_deselectsram.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_deselectsram.c diff --git a/boards/arm/stm3240g-eval/src/stm32_extmem.c b/boards/arm/stm32/stm3240g-eval/src/stm32_extmem.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_extmem.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_extmem.c diff --git a/boards/arm/stm3240g-eval/src/stm32_lcd.c b/boards/arm/stm32/stm3240g-eval/src/stm32_lcd.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_lcd.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_lcd.c diff --git a/boards/arm/stm3240g-eval/src/stm32_ostest.c b/boards/arm/stm32/stm3240g-eval/src/stm32_ostest.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_ostest.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_ostest.c diff --git a/boards/arm/stm3240g-eval/src/stm32_pwm.c b/boards/arm/stm32/stm3240g-eval/src/stm32_pwm.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_pwm.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_pwm.c diff --git a/boards/arm/stm3240g-eval/src/stm32_selectlcd.c b/boards/arm/stm32/stm3240g-eval/src/stm32_selectlcd.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_selectlcd.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_selectlcd.c diff --git a/boards/arm/stm3240g-eval/src/stm32_selectsram.c b/boards/arm/stm32/stm3240g-eval/src/stm32_selectsram.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_selectsram.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_selectsram.c diff --git a/boards/arm/stm3240g-eval/src/stm32_spi.c b/boards/arm/stm32/stm3240g-eval/src/stm32_spi.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_spi.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_spi.c diff --git a/boards/arm/stm3240g-eval/src/stm32_stmpe811.c b/boards/arm/stm32/stm3240g-eval/src/stm32_stmpe811.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_stmpe811.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_stmpe811.c diff --git a/boards/arm/stm3240g-eval/src/stm32_usb.c b/boards/arm/stm32/stm3240g-eval/src/stm32_usb.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_usb.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_usb.c diff --git a/boards/arm/stm3240g-eval/src/stm32_userleds.c b/boards/arm/stm32/stm3240g-eval/src/stm32_userleds.c similarity index 100% rename from boards/arm/stm3240g-eval/src/stm32_userleds.c rename to boards/arm/stm32/stm3240g-eval/src/stm32_userleds.c diff --git a/boards/arm/stm32_tiny/Kconfig b/boards/arm/stm32/stm32_tiny/Kconfig similarity index 100% rename from boards/arm/stm32_tiny/Kconfig rename to boards/arm/stm32/stm32_tiny/Kconfig diff --git a/boards/arm/stm32_tiny/README.txt b/boards/arm/stm32/stm32_tiny/README.txt similarity index 100% rename from boards/arm/stm32_tiny/README.txt rename to boards/arm/stm32/stm32_tiny/README.txt diff --git a/boards/arm/stm32_tiny/configs/nsh/defconfig b/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm32_tiny/configs/nsh/defconfig rename to boards/arm/stm32/stm32_tiny/configs/nsh/defconfig index 90b552bf42a..27be57a7ebb 100644 --- a/boards/arm/stm32_tiny/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32_tiny" CONFIG_ARCH_BOARD_STM32_TINY=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32_tiny/configs/usbnsh/defconfig b/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig similarity index 98% rename from boards/arm/stm32_tiny/configs/usbnsh/defconfig rename to boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig index 837ac3fc3f0..aa0d98127df 100644 --- a/boards/arm/stm32_tiny/configs/usbnsh/defconfig +++ b/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig @@ -22,6 +22,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32_tiny" CONFIG_ARCH_BOARD_STM32_TINY=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32_tiny/include/board.h b/boards/arm/stm32/stm32_tiny/include/board.h similarity index 100% rename from boards/arm/stm32_tiny/include/board.h rename to boards/arm/stm32/stm32_tiny/include/board.h diff --git a/boards/arm/stm32_tiny/scripts/Make.defs b/boards/arm/stm32/stm32_tiny/scripts/Make.defs similarity index 96% rename from boards/arm/stm32_tiny/scripts/Make.defs rename to boards/arm/stm32/stm32_tiny/scripts/Make.defs index 1373b9b54d2..7a24b622f7e 100644 --- a/boards/arm/stm32_tiny/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32_tiny/scripts/ld.script b/boards/arm/stm32/stm32_tiny/scripts/ld.script similarity index 100% rename from boards/arm/stm32_tiny/scripts/ld.script rename to boards/arm/stm32/stm32_tiny/scripts/ld.script diff --git a/boards/arm/sam4e-ek/src/.gitignore b/boards/arm/stm32/stm32_tiny/src/.gitignore similarity index 100% rename from boards/arm/sam4e-ek/src/.gitignore rename to boards/arm/stm32/stm32_tiny/src/.gitignore diff --git a/boards/arm/stm32_tiny/src/Makefile b/boards/arm/stm32/stm32_tiny/src/Makefile similarity index 100% rename from boards/arm/stm32_tiny/src/Makefile rename to boards/arm/stm32/stm32_tiny/src/Makefile diff --git a/boards/arm/stm32_tiny/src/stm32_appinit.c b/boards/arm/stm32/stm32_tiny/src/stm32_appinit.c similarity index 100% rename from boards/arm/stm32_tiny/src/stm32_appinit.c rename to boards/arm/stm32/stm32_tiny/src/stm32_appinit.c diff --git a/boards/arm/stm32_tiny/src/stm32_boot.c b/boards/arm/stm32/stm32_tiny/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32_tiny/src/stm32_boot.c rename to boards/arm/stm32/stm32_tiny/src/stm32_boot.c diff --git a/boards/arm/stm32_tiny/src/stm32_leds.c b/boards/arm/stm32/stm32_tiny/src/stm32_leds.c similarity index 100% rename from boards/arm/stm32_tiny/src/stm32_leds.c rename to boards/arm/stm32/stm32_tiny/src/stm32_leds.c diff --git a/boards/arm/stm32_tiny/src/stm32_nrf24l01.c b/boards/arm/stm32/stm32_tiny/src/stm32_nrf24l01.c similarity index 100% rename from boards/arm/stm32_tiny/src/stm32_nrf24l01.c rename to boards/arm/stm32/stm32_tiny/src/stm32_nrf24l01.c diff --git a/boards/arm/stm32_tiny/src/stm32_pwm.c b/boards/arm/stm32/stm32_tiny/src/stm32_pwm.c similarity index 100% rename from boards/arm/stm32_tiny/src/stm32_pwm.c rename to boards/arm/stm32/stm32_tiny/src/stm32_pwm.c diff --git a/boards/arm/stm32_tiny/src/stm32_spi.c b/boards/arm/stm32/stm32_tiny/src/stm32_spi.c similarity index 100% rename from boards/arm/stm32_tiny/src/stm32_spi.c rename to boards/arm/stm32/stm32_tiny/src/stm32_spi.c diff --git a/boards/arm/stm32_tiny/src/stm32_tiny.h b/boards/arm/stm32/stm32_tiny/src/stm32_tiny.h similarity index 100% rename from boards/arm/stm32_tiny/src/stm32_tiny.h rename to boards/arm/stm32/stm32_tiny/src/stm32_tiny.h diff --git a/boards/arm/stm32_tiny/src/stm32_usbdev.c b/boards/arm/stm32/stm32_tiny/src/stm32_usbdev.c similarity index 100% rename from boards/arm/stm32_tiny/src/stm32_usbdev.c rename to boards/arm/stm32/stm32_tiny/src/stm32_usbdev.c diff --git a/boards/arm/stm32butterfly2/Kconfig b/boards/arm/stm32/stm32butterfly2/Kconfig similarity index 100% rename from boards/arm/stm32butterfly2/Kconfig rename to boards/arm/stm32/stm32butterfly2/Kconfig diff --git a/boards/arm/stm32butterfly2/configs/nshusbhost/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm32butterfly2/configs/nshusbhost/defconfig rename to boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig index 13d178fa26a..79439906a1d 100644 --- a/boards/arm/stm32butterfly2/configs/nshusbhost/defconfig +++ b/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32butterfly2" CONFIG_ARCH_BOARD_STM32_BUTTERFLY2=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32butterfly2/configs/nshnet/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig similarity index 99% rename from boards/arm/stm32butterfly2/configs/nshnet/defconfig rename to boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig index 9176e71ac84..fea7992881c 100644 --- a/boards/arm/stm32butterfly2/configs/nshnet/defconfig +++ b/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig @@ -18,6 +18,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32butterfly2" CONFIG_ARCH_BOARD_STM32_BUTTERFLY2=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32butterfly2/configs/nshusbdev/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig similarity index 98% rename from boards/arm/stm32butterfly2/configs/nshusbdev/defconfig rename to boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig index ea4541fc8c0..bd6412f1745 100644 --- a/boards/arm/stm32butterfly2/configs/nshusbdev/defconfig +++ b/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32butterfly2" CONFIG_ARCH_BOARD_STM32_BUTTERFLY2=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32butterfly2/configs/nsh/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig similarity index 98% rename from boards/arm/stm32butterfly2/configs/nsh/defconfig rename to boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig index 13d178fa26a..79439906a1d 100644 --- a/boards/arm/stm32butterfly2/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32butterfly2" CONFIG_ARCH_BOARD_STM32_BUTTERFLY2=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32butterfly2/include/board.h b/boards/arm/stm32/stm32butterfly2/include/board.h similarity index 100% rename from boards/arm/stm32butterfly2/include/board.h rename to boards/arm/stm32/stm32butterfly2/include/board.h diff --git a/boards/arm/stm32butterfly2/scripts/Make.defs b/boards/arm/stm32/stm32butterfly2/scripts/Make.defs similarity index 96% rename from boards/arm/stm32butterfly2/scripts/Make.defs rename to boards/arm/stm32/stm32butterfly2/scripts/Make.defs index 21d7b0848e5..b9522be3529 100644 --- a/boards/arm/stm32butterfly2/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32butterfly2/scripts/dfu.ld b/boards/arm/stm32/stm32butterfly2/scripts/dfu.ld similarity index 100% rename from boards/arm/stm32butterfly2/scripts/dfu.ld rename to boards/arm/stm32/stm32butterfly2/scripts/dfu.ld diff --git a/boards/arm/stm32butterfly2/scripts/flash.ld b/boards/arm/stm32/stm32butterfly2/scripts/flash.ld similarity index 100% rename from boards/arm/stm32butterfly2/scripts/flash.ld rename to boards/arm/stm32/stm32butterfly2/scripts/flash.ld diff --git a/boards/arm/stm32butterfly2/src/Makefile b/boards/arm/stm32/stm32butterfly2/src/Makefile similarity index 100% rename from boards/arm/stm32butterfly2/src/Makefile rename to boards/arm/stm32/stm32butterfly2/src/Makefile diff --git a/boards/arm/stm32butterfly2/src/stm32_adc.c b/boards/arm/stm32/stm32butterfly2/src/stm32_adc.c similarity index 100% rename from boards/arm/stm32butterfly2/src/stm32_adc.c rename to boards/arm/stm32/stm32butterfly2/src/stm32_adc.c diff --git a/boards/arm/stm32butterfly2/src/stm32_boot.c b/boards/arm/stm32/stm32butterfly2/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32butterfly2/src/stm32_boot.c rename to boards/arm/stm32/stm32butterfly2/src/stm32_boot.c diff --git a/boards/arm/stm32butterfly2/src/stm32_butterfly2.h b/boards/arm/stm32/stm32butterfly2/src/stm32_butterfly2.h similarity index 100% rename from boards/arm/stm32butterfly2/src/stm32_butterfly2.h rename to boards/arm/stm32/stm32butterfly2/src/stm32_butterfly2.h diff --git a/boards/arm/stm32butterfly2/src/stm32_buttons.c b/boards/arm/stm32/stm32butterfly2/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm32butterfly2/src/stm32_buttons.c rename to boards/arm/stm32/stm32butterfly2/src/stm32_buttons.c diff --git a/boards/arm/stm32butterfly2/src/stm32_leds.c b/boards/arm/stm32/stm32butterfly2/src/stm32_leds.c similarity index 100% rename from boards/arm/stm32butterfly2/src/stm32_leds.c rename to boards/arm/stm32/stm32butterfly2/src/stm32_leds.c diff --git a/boards/arm/stm32butterfly2/src/stm32_mmcsd.c b/boards/arm/stm32/stm32butterfly2/src/stm32_mmcsd.c similarity index 100% rename from boards/arm/stm32butterfly2/src/stm32_mmcsd.c rename to boards/arm/stm32/stm32butterfly2/src/stm32_mmcsd.c diff --git a/boards/arm/stm32butterfly2/src/stm32_spi.c b/boards/arm/stm32/stm32butterfly2/src/stm32_spi.c similarity index 100% rename from boards/arm/stm32butterfly2/src/stm32_spi.c rename to boards/arm/stm32/stm32butterfly2/src/stm32_spi.c diff --git a/boards/arm/stm32butterfly2/src/stm32_usb.c b/boards/arm/stm32/stm32butterfly2/src/stm32_usb.c similarity index 100% rename from boards/arm/stm32butterfly2/src/stm32_usb.c rename to boards/arm/stm32/stm32butterfly2/src/stm32_usb.c diff --git a/boards/arm/stm32butterfly2/src/stm32_usbdev.c b/boards/arm/stm32/stm32butterfly2/src/stm32_usbdev.c similarity index 100% rename from boards/arm/stm32butterfly2/src/stm32_usbdev.c rename to boards/arm/stm32/stm32butterfly2/src/stm32_usbdev.c diff --git a/boards/arm/stm32butterfly2/src/stm32_usbhost.c b/boards/arm/stm32/stm32butterfly2/src/stm32_usbhost.c similarity index 100% rename from boards/arm/stm32butterfly2/src/stm32_usbhost.c rename to boards/arm/stm32/stm32butterfly2/src/stm32_usbhost.c diff --git a/boards/arm/stm32f103-minimum/Kconfig b/boards/arm/stm32/stm32f103-minimum/Kconfig similarity index 100% rename from boards/arm/stm32f103-minimum/Kconfig rename to boards/arm/stm32/stm32f103-minimum/Kconfig diff --git a/boards/arm/stm32f103-minimum/README.txt b/boards/arm/stm32/stm32f103-minimum/README.txt similarity index 100% rename from boards/arm/stm32f103-minimum/README.txt rename to boards/arm/stm32/stm32f103-minimum/README.txt diff --git a/boards/arm/stm32f103-minimum/configs/apds9960/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig similarity index 98% rename from boards/arm/stm32f103-minimum/configs/apds9960/defconfig rename to boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig index 2b9211431ba..1abb6229c92 100644 --- a/boards/arm/stm32f103-minimum/configs/apds9960/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f103-minimum/configs/audio_tone/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig similarity index 98% rename from boards/arm/stm32f103-minimum/configs/audio_tone/defconfig rename to boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig index def957e1e3c..bf7e7ad6a09 100644 --- a/boards/arm/stm32f103-minimum/configs/audio_tone/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f103-minimum/configs/buttons/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/buttons/defconfig similarity index 98% rename from boards/arm/stm32f103-minimum/configs/buttons/defconfig rename to boards/arm/stm32/stm32f103-minimum/configs/buttons/defconfig index a6717fe0bfc..eee0e9584ac 100644 --- a/boards/arm/stm32f103-minimum/configs/buttons/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/buttons/defconfig @@ -22,6 +22,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/stm32f103-minimum/configs/hello/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig similarity index 98% rename from boards/arm/stm32f103-minimum/configs/hello/defconfig rename to boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig index 6bd51df709d..fdf0142996b 100644 --- a/boards/arm/stm32f103-minimum/configs/hello/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig @@ -18,6 +18,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_BINFMT_DISABLE=y diff --git a/boards/arm/stm32f103-minimum/configs/jlx12864g/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/jlx12864g/defconfig similarity index 98% rename from boards/arm/stm32f103-minimum/configs/jlx12864g/defconfig rename to boards/arm/stm32/stm32f103-minimum/configs/jlx12864g/defconfig index 176ece1b22a..fb19f6689a8 100644 --- a/boards/arm/stm32f103-minimum/configs/jlx12864g/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/jlx12864g/defconfig @@ -21,6 +21,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f103-minimum/configs/mcp2515/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/mcp2515/defconfig similarity index 98% rename from boards/arm/stm32f103-minimum/configs/mcp2515/defconfig rename to boards/arm/stm32/stm32f103-minimum/configs/mcp2515/defconfig index e27510b0aa1..ace1986f298 100644 --- a/boards/arm/stm32f103-minimum/configs/mcp2515/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/mcp2515/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f103-minimum/configs/nrf24/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig similarity index 98% rename from boards/arm/stm32f103-minimum/configs/nrf24/defconfig rename to boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig index 22794d0d5dd..f678652d5b2 100644 --- a/boards/arm/stm32f103-minimum/configs/nrf24/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f103-minimum/configs/nsh/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm32f103-minimum/configs/nsh/defconfig rename to boards/arm/stm32/stm32f103-minimum/configs/nsh/defconfig index 109de64b9bc..f167eb8bd67 100644 --- a/boards/arm/stm32f103-minimum/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/nsh/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f103-minimum/configs/pwm/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig similarity index 98% rename from boards/arm/stm32f103-minimum/configs/pwm/defconfig rename to boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig index cc34ca2c910..48b4d3b7ce2 100644 --- a/boards/arm/stm32f103-minimum/configs/pwm/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f103-minimum/configs/rfid-rc522/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig similarity index 98% rename from boards/arm/stm32f103-minimum/configs/rfid-rc522/defconfig rename to boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig index 2bb6618ce72..937f0174844 100644 --- a/boards/arm/stm32f103-minimum/configs/rfid-rc522/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f103-minimum/configs/rgbled/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/rgbled/defconfig similarity index 98% rename from boards/arm/stm32f103-minimum/configs/rgbled/defconfig rename to boards/arm/stm32/stm32f103-minimum/configs/rgbled/defconfig index 0ff6f2dcffe..642aa4fdcaf 100644 --- a/boards/arm/stm32f103-minimum/configs/rgbled/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/rgbled/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f103-minimum/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig similarity index 98% rename from boards/arm/stm32f103-minimum/configs/usbnsh/defconfig rename to boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig index 1d9708bd893..feff48184ef 100644 --- a/boards/arm/stm32f103-minimum/configs/usbnsh/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig @@ -22,6 +22,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f103-minimum/configs/userled/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/userled/defconfig similarity index 98% rename from boards/arm/stm32f103-minimum/configs/userled/defconfig rename to boards/arm/stm32/stm32f103-minimum/configs/userled/defconfig index 1a4c4523931..2e78eb1e402 100644 --- a/boards/arm/stm32f103-minimum/configs/userled/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/userled/defconfig @@ -21,6 +21,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f103-minimum/configs/veml6070/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig similarity index 98% rename from boards/arm/stm32f103-minimum/configs/veml6070/defconfig rename to boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig index 9deec46c49b..6810aa4186b 100644 --- a/boards/arm/stm32f103-minimum/configs/veml6070/defconfig +++ b/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig @@ -20,6 +20,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f103-minimum" CONFIG_ARCH_BOARD_STM32F103_MINIMUM=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103C8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f103-minimum/include/board.h b/boards/arm/stm32/stm32f103-minimum/include/board.h similarity index 100% rename from boards/arm/stm32f103-minimum/include/board.h rename to boards/arm/stm32/stm32f103-minimum/include/board.h diff --git a/boards/arm/stm32f103-minimum/scripts/Make.defs b/boards/arm/stm32/stm32f103-minimum/scripts/Make.defs similarity index 96% rename from boards/arm/stm32f103-minimum/scripts/Make.defs rename to boards/arm/stm32/stm32f103-minimum/scripts/Make.defs index 056dd41d981..df5ac43bb17 100644 --- a/boards/arm/stm32f103-minimum/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32f103-minimum/scripts/ld.script b/boards/arm/stm32/stm32f103-minimum/scripts/ld.script similarity index 100% rename from boards/arm/stm32f103-minimum/scripts/ld.script rename to boards/arm/stm32/stm32f103-minimum/scripts/ld.script diff --git a/boards/arm/stm32f103-minimum/scripts/ld.script.dfu b/boards/arm/stm32/stm32f103-minimum/scripts/ld.script.dfu similarity index 100% rename from boards/arm/stm32f103-minimum/scripts/ld.script.dfu rename to boards/arm/stm32/stm32f103-minimum/scripts/ld.script.dfu diff --git a/boards/arm/sam4l-xplained/src/.gitignore b/boards/arm/stm32/stm32f103-minimum/src/.gitignore similarity index 100% rename from boards/arm/sam4l-xplained/src/.gitignore rename to boards/arm/stm32/stm32f103-minimum/src/.gitignore diff --git a/boards/arm/stm32f103-minimum/src/Makefile b/boards/arm/stm32/stm32f103-minimum/src/Makefile similarity index 100% rename from boards/arm/stm32f103-minimum/src/Makefile rename to boards/arm/stm32/stm32f103-minimum/src/Makefile diff --git a/boards/arm/stm32f103-minimum/src/stm32_adc.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_adc.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_adc.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_adc.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_apa102.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_apa102.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_apa102.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_apa102.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_apds9960.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_apds9960.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_apds9960.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_apds9960.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_appinit.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_appinit.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_appinit.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_appinit.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_at24.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_at24.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_at24.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_at24.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_autoleds.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_autoleds.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_autoleds.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_autoleds.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_bmp180.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_bmp180.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_bmp180.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_bmp180.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_boot.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_boot.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_boot.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_bringup.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_bringup.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_bringup.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_buttons.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_buttons.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_buttons.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_gpio.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_gpio.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_gpio.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_gpio.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_hcsr04.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_hcsr04.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_hcsr04.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_hcsr04.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_lcd.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_lcd.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_lcd.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_lcd.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_lm75.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_lm75.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_lm75.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_lm75.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_max6675.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_max6675.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_max6675.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_max6675.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_max7219.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_max7219.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_max7219.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_max7219.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_mcp2515.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_mcp2515.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_mcp2515.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_mcp2515.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_mfrc522.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_mfrc522.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_mfrc522.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_mfrc522.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_mmcsd.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_mmcsd.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_mmcsd.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_mmcsd.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_nrf24l01.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_nrf24l01.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_nrf24l01.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_nrf24l01.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_nunchuck.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_nunchuck.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_nunchuck.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_nunchuck.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_pcd8544.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_pcd8544.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_pcd8544.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_pcd8544.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_pwm.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_pwm.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_pwm.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_pwm.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_qencoder.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_qencoder.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_qencoder.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_qencoder.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_rgbled.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_rgbled.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_rgbled.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_rgbled.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_spi.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_spi.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_spi.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_spi.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_ssd1306.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_ssd1306.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_ssd1306.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_ssd1306.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_tone.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_tone.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_tone.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_tone.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_usbdev.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_usbdev.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_usbdev.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_usbdev.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_usbmsc.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_usbmsc.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_usbmsc.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_usbmsc.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_userleds.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_userleds.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_userleds.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_userleds.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_veml6070.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_veml6070.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_veml6070.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_veml6070.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_w25.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_w25.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_w25.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_w25.c diff --git a/boards/arm/stm32f103-minimum/src/stm32_zerocross.c b/boards/arm/stm32/stm32f103-minimum/src/stm32_zerocross.c similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32_zerocross.c rename to boards/arm/stm32/stm32f103-minimum/src/stm32_zerocross.c diff --git a/boards/arm/stm32f103-minimum/src/stm32f103_minimum.h b/boards/arm/stm32/stm32f103-minimum/src/stm32f103_minimum.h similarity index 100% rename from boards/arm/stm32f103-minimum/src/stm32f103_minimum.h rename to boards/arm/stm32/stm32f103-minimum/src/stm32f103_minimum.h diff --git a/boards/arm/stm32f334-disco/Kconfig b/boards/arm/stm32/stm32f334-disco/Kconfig similarity index 100% rename from boards/arm/stm32f334-disco/Kconfig rename to boards/arm/stm32/stm32f334-disco/Kconfig diff --git a/boards/arm/stm32f334-disco/README.txt b/boards/arm/stm32/stm32f334-disco/README.txt similarity index 100% rename from boards/arm/stm32f334-disco/README.txt rename to boards/arm/stm32/stm32f334-disco/README.txt diff --git a/boards/arm/stm32f334-disco/configs/buckboost/defconfig b/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig similarity index 99% rename from boards/arm/stm32f334-disco/configs/buckboost/defconfig rename to boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig index 0d95315cc12..1a981fbe7ae 100644 --- a/boards/arm/stm32f334-disco/configs/buckboost/defconfig +++ b/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f334-disco" CONFIG_ARCH_BOARD_STM32F334_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F334C8=y CONFIG_ARCH_HIPRI_INTERRUPT=y diff --git a/boards/arm/stm32f334-disco/configs/nsh/defconfig b/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig similarity index 99% rename from boards/arm/stm32f334-disco/configs/nsh/defconfig rename to boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig index 3cbe9cfaecd..9e19a417986 100644 --- a/boards/arm/stm32f334-disco/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f334-disco" CONFIG_ARCH_BOARD_STM32F334_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F334C8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f334-disco/configs/powerled/defconfig b/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig similarity index 99% rename from boards/arm/stm32f334-disco/configs/powerled/defconfig rename to boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig index 77ec271c749..a0ece61ba65 100644 --- a/boards/arm/stm32f334-disco/configs/powerled/defconfig +++ b/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f334-disco" CONFIG_ARCH_BOARD_STM32F334_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F334C8=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f334-disco/include/board.h b/boards/arm/stm32/stm32f334-disco/include/board.h similarity index 100% rename from boards/arm/stm32f334-disco/include/board.h rename to boards/arm/stm32/stm32f334-disco/include/board.h diff --git a/boards/arm/stm32f334-disco/scripts/Make.defs b/boards/arm/stm32/stm32f334-disco/scripts/Make.defs similarity index 96% rename from boards/arm/stm32f334-disco/scripts/Make.defs rename to boards/arm/stm32/stm32f334-disco/scripts/Make.defs index 5013bbff500..6b026183d0b 100644 --- a/boards/arm/stm32f334-disco/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32f334-disco/scripts/ld.script b/boards/arm/stm32/stm32f334-disco/scripts/ld.script similarity index 100% rename from boards/arm/stm32f334-disco/scripts/ld.script rename to boards/arm/stm32/stm32f334-disco/scripts/ld.script diff --git a/boards/arm/stm32f334-disco/src/Makefile b/boards/arm/stm32/stm32f334-disco/src/Makefile similarity index 100% rename from boards/arm/stm32f334-disco/src/Makefile rename to boards/arm/stm32/stm32f334-disco/src/Makefile diff --git a/boards/arm/stm32f334-disco/src/stm32_adc.c b/boards/arm/stm32/stm32f334-disco/src/stm32_adc.c similarity index 100% rename from boards/arm/stm32f334-disco/src/stm32_adc.c rename to boards/arm/stm32/stm32f334-disco/src/stm32_adc.c diff --git a/boards/arm/stm32f334-disco/src/stm32_appinit.c b/boards/arm/stm32/stm32f334-disco/src/stm32_appinit.c similarity index 100% rename from boards/arm/stm32f334-disco/src/stm32_appinit.c rename to boards/arm/stm32/stm32f334-disco/src/stm32_appinit.c diff --git a/boards/arm/stm32f334-disco/src/stm32_autoleds.c b/boards/arm/stm32/stm32f334-disco/src/stm32_autoleds.c similarity index 100% rename from boards/arm/stm32f334-disco/src/stm32_autoleds.c rename to boards/arm/stm32/stm32f334-disco/src/stm32_autoleds.c diff --git a/boards/arm/stm32f334-disco/src/stm32_boot.c b/boards/arm/stm32/stm32f334-disco/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32f334-disco/src/stm32_boot.c rename to boards/arm/stm32/stm32f334-disco/src/stm32_boot.c diff --git a/boards/arm/stm32f334-disco/src/stm32_buttons.c b/boards/arm/stm32/stm32f334-disco/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm32f334-disco/src/stm32_buttons.c rename to boards/arm/stm32/stm32f334-disco/src/stm32_buttons.c diff --git a/boards/arm/stm32f334-disco/src/stm32_comp.c b/boards/arm/stm32/stm32f334-disco/src/stm32_comp.c similarity index 100% rename from boards/arm/stm32f334-disco/src/stm32_comp.c rename to boards/arm/stm32/stm32f334-disco/src/stm32_comp.c diff --git a/boards/arm/stm32f334-disco/src/stm32_hrtim.c b/boards/arm/stm32/stm32f334-disco/src/stm32_hrtim.c similarity index 100% rename from boards/arm/stm32f334-disco/src/stm32_hrtim.c rename to boards/arm/stm32/stm32f334-disco/src/stm32_hrtim.c diff --git a/boards/arm/stm32f334-disco/src/stm32_opamp.c b/boards/arm/stm32/stm32f334-disco/src/stm32_opamp.c similarity index 100% rename from boards/arm/stm32f334-disco/src/stm32_opamp.c rename to boards/arm/stm32/stm32f334-disco/src/stm32_opamp.c diff --git a/boards/arm/stm32f334-disco/src/stm32_powerled.c b/boards/arm/stm32/stm32f334-disco/src/stm32_powerled.c similarity index 100% rename from boards/arm/stm32f334-disco/src/stm32_powerled.c rename to boards/arm/stm32/stm32f334-disco/src/stm32_powerled.c diff --git a/boards/arm/stm32f334-disco/src/stm32_smps.c b/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c similarity index 100% rename from boards/arm/stm32f334-disco/src/stm32_smps.c rename to boards/arm/stm32/stm32f334-disco/src/stm32_smps.c diff --git a/boards/arm/stm32f334-disco/src/stm32f334-disco.h b/boards/arm/stm32/stm32f334-disco/src/stm32f334-disco.h similarity index 100% rename from boards/arm/stm32f334-disco/src/stm32f334-disco.h rename to boards/arm/stm32/stm32f334-disco/src/stm32f334-disco.h diff --git a/boards/arm/stm32f3discovery/Kconfig b/boards/arm/stm32/stm32f3discovery/Kconfig similarity index 100% rename from boards/arm/stm32f3discovery/Kconfig rename to boards/arm/stm32/stm32f3discovery/Kconfig diff --git a/boards/arm/stm32f3discovery/README.txt b/boards/arm/stm32/stm32f3discovery/README.txt similarity index 100% rename from boards/arm/stm32f3discovery/README.txt rename to boards/arm/stm32/stm32f3discovery/README.txt diff --git a/boards/arm/stm32f3discovery/configs/nsh/defconfig b/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm32f3discovery/configs/nsh/defconfig rename to boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig index afa6534be04..178bf2e10e2 100644 --- a/boards/arm/stm32f3discovery/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f3discovery" CONFIG_ARCH_BOARD_STM32F3_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f3discovery/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig similarity index 98% rename from boards/arm/stm32f3discovery/configs/usbnsh/defconfig rename to boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig index 948e817163a..d2eb7c96ab6 100644 --- a/boards/arm/stm32f3discovery/configs/usbnsh/defconfig +++ b/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f3discovery" CONFIG_ARCH_BOARD_STM32F3_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F303VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f3discovery/include/board.h b/boards/arm/stm32/stm32f3discovery/include/board.h similarity index 100% rename from boards/arm/stm32f3discovery/include/board.h rename to boards/arm/stm32/stm32f3discovery/include/board.h diff --git a/boards/arm/stm32f3discovery/scripts/Make.defs b/boards/arm/stm32/stm32f3discovery/scripts/Make.defs similarity index 96% rename from boards/arm/stm32f3discovery/scripts/Make.defs rename to boards/arm/stm32/stm32f3discovery/scripts/Make.defs index dcc066f64b5..405544562ca 100644 --- a/boards/arm/stm32f3discovery/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32f3discovery/scripts/gnu-elf.ld b/boards/arm/stm32/stm32f3discovery/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/stm32f3discovery/scripts/gnu-elf.ld rename to boards/arm/stm32/stm32f3discovery/scripts/gnu-elf.ld diff --git a/boards/arm/stm32f3discovery/scripts/ld.script b/boards/arm/stm32/stm32f3discovery/scripts/ld.script similarity index 100% rename from boards/arm/stm32f3discovery/scripts/ld.script rename to boards/arm/stm32/stm32f3discovery/scripts/ld.script diff --git a/boards/arm/samd20-xplained/src/.gitignore b/boards/arm/stm32/stm32f3discovery/src/.gitignore similarity index 100% rename from boards/arm/samd20-xplained/src/.gitignore rename to boards/arm/stm32/stm32f3discovery/src/.gitignore diff --git a/boards/arm/stm32f3discovery/src/Makefile b/boards/arm/stm32/stm32f3discovery/src/Makefile similarity index 100% rename from boards/arm/stm32f3discovery/src/Makefile rename to boards/arm/stm32/stm32f3discovery/src/Makefile diff --git a/boards/arm/stm32f3discovery/src/stm32_appinit.c b/boards/arm/stm32/stm32f3discovery/src/stm32_appinit.c similarity index 100% rename from boards/arm/stm32f3discovery/src/stm32_appinit.c rename to boards/arm/stm32/stm32f3discovery/src/stm32_appinit.c diff --git a/boards/arm/stm32f3discovery/src/stm32_autoleds.c b/boards/arm/stm32/stm32f3discovery/src/stm32_autoleds.c similarity index 100% rename from boards/arm/stm32f3discovery/src/stm32_autoleds.c rename to boards/arm/stm32/stm32f3discovery/src/stm32_autoleds.c diff --git a/boards/arm/stm32f3discovery/src/stm32_boot.c b/boards/arm/stm32/stm32f3discovery/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32f3discovery/src/stm32_boot.c rename to boards/arm/stm32/stm32f3discovery/src/stm32_boot.c diff --git a/boards/arm/stm32f3discovery/src/stm32_bringup.c b/boards/arm/stm32/stm32f3discovery/src/stm32_bringup.c similarity index 100% rename from boards/arm/stm32f3discovery/src/stm32_bringup.c rename to boards/arm/stm32/stm32f3discovery/src/stm32_bringup.c diff --git a/boards/arm/stm32f3discovery/src/stm32_buttons.c b/boards/arm/stm32/stm32f3discovery/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm32f3discovery/src/stm32_buttons.c rename to boards/arm/stm32/stm32f3discovery/src/stm32_buttons.c diff --git a/boards/arm/stm32f3discovery/src/stm32_pwm.c b/boards/arm/stm32/stm32f3discovery/src/stm32_pwm.c similarity index 100% rename from boards/arm/stm32f3discovery/src/stm32_pwm.c rename to boards/arm/stm32/stm32f3discovery/src/stm32_pwm.c diff --git a/boards/arm/stm32f3discovery/src/stm32_qencoder.c b/boards/arm/stm32/stm32f3discovery/src/stm32_qencoder.c similarity index 100% rename from boards/arm/stm32f3discovery/src/stm32_qencoder.c rename to boards/arm/stm32/stm32f3discovery/src/stm32_qencoder.c diff --git a/boards/arm/stm32f3discovery/src/stm32_spi.c b/boards/arm/stm32/stm32f3discovery/src/stm32_spi.c similarity index 100% rename from boards/arm/stm32f3discovery/src/stm32_spi.c rename to boards/arm/stm32/stm32f3discovery/src/stm32_spi.c diff --git a/boards/arm/stm32f3discovery/src/stm32_usb.c b/boards/arm/stm32/stm32f3discovery/src/stm32_usb.c similarity index 100% rename from boards/arm/stm32f3discovery/src/stm32_usb.c rename to boards/arm/stm32/stm32f3discovery/src/stm32_usb.c diff --git a/boards/arm/stm32f3discovery/src/stm32_userleds.c b/boards/arm/stm32/stm32f3discovery/src/stm32_userleds.c similarity index 100% rename from boards/arm/stm32f3discovery/src/stm32_userleds.c rename to boards/arm/stm32/stm32f3discovery/src/stm32_userleds.c diff --git a/boards/arm/stm32f3discovery/src/stm32f3discovery.h b/boards/arm/stm32/stm32f3discovery/src/stm32f3discovery.h similarity index 100% rename from boards/arm/stm32f3discovery/src/stm32f3discovery.h rename to boards/arm/stm32/stm32f3discovery/src/stm32f3discovery.h diff --git a/boards/arm/stm32f411e-disco/Kconfig b/boards/arm/stm32/stm32f411e-disco/Kconfig similarity index 100% rename from boards/arm/stm32f411e-disco/Kconfig rename to boards/arm/stm32/stm32f411e-disco/Kconfig diff --git a/boards/arm/stm32f411e-disco/README.txt b/boards/arm/stm32/stm32f411e-disco/README.txt similarity index 100% rename from boards/arm/stm32f411e-disco/README.txt rename to boards/arm/stm32/stm32f411e-disco/README.txt diff --git a/boards/arm/stm32f411e-disco/configs/nsh/defconfig b/boards/arm/stm32/stm32f411e-disco/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm32f411e-disco/configs/nsh/defconfig rename to boards/arm/stm32/stm32f411e-disco/configs/nsh/defconfig index 1fcd18edcbc..8934a5216fb 100644 --- a/boards/arm/stm32f411e-disco/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f411e-disco/configs/nsh/defconfig @@ -17,6 +17,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f411e-disco" CONFIG_ARCH_BOARD_STM32F411E_DISCO=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F411VE=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/stm32f411e-disco/include/board.h b/boards/arm/stm32/stm32f411e-disco/include/board.h similarity index 100% rename from boards/arm/stm32f411e-disco/include/board.h rename to boards/arm/stm32/stm32f411e-disco/include/board.h diff --git a/boards/arm/stm32f411e-disco/scripts/Make.defs b/boards/arm/stm32/stm32f411e-disco/scripts/Make.defs similarity index 96% rename from boards/arm/stm32f411e-disco/scripts/Make.defs rename to boards/arm/stm32/stm32f411e-disco/scripts/Make.defs index e9aa3a249c3..5ff6f140019 100644 --- a/boards/arm/stm32f411e-disco/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32f411e-disco/scripts/f411ve.ld b/boards/arm/stm32/stm32f411e-disco/scripts/f411ve.ld similarity index 100% rename from boards/arm/stm32f411e-disco/scripts/f411ve.ld rename to boards/arm/stm32/stm32f411e-disco/scripts/f411ve.ld diff --git a/boards/arm/stm32f411e-disco/src/Makefile b/boards/arm/stm32/stm32f411e-disco/src/Makefile similarity index 100% rename from boards/arm/stm32f411e-disco/src/Makefile rename to boards/arm/stm32/stm32f411e-disco/src/Makefile diff --git a/boards/arm/stm32f411e-disco/src/stm32_appinit.c b/boards/arm/stm32/stm32f411e-disco/src/stm32_appinit.c similarity index 100% rename from boards/arm/stm32f411e-disco/src/stm32_appinit.c rename to boards/arm/stm32/stm32f411e-disco/src/stm32_appinit.c diff --git a/boards/arm/stm32f411e-disco/src/stm32_boot.c b/boards/arm/stm32/stm32f411e-disco/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32f411e-disco/src/stm32_boot.c rename to boards/arm/stm32/stm32f411e-disco/src/stm32_boot.c diff --git a/boards/arm/stm32f411e-disco/src/stm32_bringup.c b/boards/arm/stm32/stm32f411e-disco/src/stm32_bringup.c similarity index 100% rename from boards/arm/stm32f411e-disco/src/stm32_bringup.c rename to boards/arm/stm32/stm32f411e-disco/src/stm32_bringup.c diff --git a/boards/arm/stm32f411e-disco/src/stm32_usb.c b/boards/arm/stm32/stm32f411e-disco/src/stm32_usb.c similarity index 100% rename from boards/arm/stm32f411e-disco/src/stm32_usb.c rename to boards/arm/stm32/stm32f411e-disco/src/stm32_usb.c diff --git a/boards/arm/stm32f411e-disco/src/stm32f411e-disco.h b/boards/arm/stm32/stm32f411e-disco/src/stm32f411e-disco.h similarity index 100% rename from boards/arm/stm32f411e-disco/src/stm32f411e-disco.h rename to boards/arm/stm32/stm32f411e-disco/src/stm32f411e-disco.h diff --git a/boards/arm/stm32f429i-disco/Kconfig b/boards/arm/stm32/stm32f429i-disco/Kconfig similarity index 100% rename from boards/arm/stm32f429i-disco/Kconfig rename to boards/arm/stm32/stm32f429i-disco/Kconfig diff --git a/boards/arm/stm32f429i-disco/README.txt b/boards/arm/stm32/stm32f429i-disco/README.txt similarity index 100% rename from boards/arm/stm32f429i-disco/README.txt rename to boards/arm/stm32/stm32f429i-disco/README.txt diff --git a/boards/arm/stm32f429i-disco/configs/adc/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig similarity index 98% rename from boards/arm/stm32f429i-disco/configs/adc/defconfig rename to boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig index 39452d7c623..4e58334711d 100644 --- a/boards/arm/stm32f429i-disco/configs/adc/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f429i-disco" CONFIG_ARCH_BOARD_STM32F429I_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f429i-disco/configs/extflash/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig similarity index 98% rename from boards/arm/stm32f429i-disco/configs/extflash/defconfig rename to boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig index ea8b529b465..adeb4c35349 100644 --- a/boards/arm/stm32f429i-disco/configs/extflash/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f429i-disco" CONFIG_ARCH_BOARD_STM32F429I_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f429i-disco/configs/fb/README.txt b/boards/arm/stm32/stm32f429i-disco/configs/fb/README.txt similarity index 100% rename from boards/arm/stm32f429i-disco/configs/fb/README.txt rename to boards/arm/stm32/stm32f429i-disco/configs/fb/README.txt diff --git a/boards/arm/stm32f429i-disco/configs/fb/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig similarity index 98% rename from boards/arm/stm32f429i-disco/configs/fb/defconfig rename to boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig index f77940446ce..d31c54d317f 100644 --- a/boards/arm/stm32f429i-disco/configs/fb/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f429i-disco" CONFIG_ARCH_BOARD_STM32F429I_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f429i-disco/configs/highpri/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig similarity index 98% rename from boards/arm/stm32f429i-disco/configs/highpri/defconfig rename to boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig index 0db601c6d80..a3e7da96f10 100644 --- a/boards/arm/stm32f429i-disco/configs/highpri/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f429i-disco" CONFIG_ARCH_BOARD_STM32F429I_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y CONFIG_ARCH_FPU=y diff --git a/boards/arm/stm32f429i-disco/configs/lcd/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig similarity index 98% rename from boards/arm/stm32f429i-disco/configs/lcd/defconfig rename to boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig index 568f8da42e3..ba335c92a5b 100644 --- a/boards/arm/stm32f429i-disco/configs/lcd/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f429i-disco" CONFIG_ARCH_BOARD_STM32F429I_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f429i-disco/configs/lvgl/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig similarity index 98% rename from boards/arm/stm32f429i-disco/configs/lvgl/defconfig rename to boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig index 7a51804f57d..77a7576379a 100644 --- a/boards/arm/stm32f429i-disco/configs/lvgl/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f429i-disco" CONFIG_ARCH_BOARD_STM32F429I_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f429i-disco/configs/nsh/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm32f429i-disco/configs/nsh/defconfig rename to boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig index 0f78d68b930..04af1388317 100644 --- a/boards/arm/stm32f429i-disco/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f429i-disco" CONFIG_ARCH_BOARD_STM32F429I_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f429i-disco/configs/nxhello/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig similarity index 98% rename from boards/arm/stm32f429i-disco/configs/nxhello/defconfig rename to boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig index e499232c447..765ad49a3fd 100644 --- a/boards/arm/stm32f429i-disco/configs/nxhello/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f429i-disco" CONFIG_ARCH_BOARD_STM32F429I_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f429i-disco/configs/nxwm/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig similarity index 99% rename from boards/arm/stm32f429i-disco/configs/nxwm/defconfig rename to boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig index 79ac042be1b..f2bba7f96f0 100644 --- a/boards/arm/stm32f429i-disco/configs/nxwm/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f429i-disco" CONFIG_ARCH_BOARD_STM32F429I_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/stm32f429i-disco/configs/usbmsc/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig similarity index 98% rename from boards/arm/stm32f429i-disco/configs/usbmsc/defconfig rename to boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig index b4681447ae1..617e06b77b0 100644 --- a/boards/arm/stm32f429i-disco/configs/usbmsc/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f429i-disco" CONFIG_ARCH_BOARD_STM32F429I_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f429i-disco/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig similarity index 98% rename from boards/arm/stm32f429i-disco/configs/usbnsh/defconfig rename to boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig index 133e39a6121..ea80c4b0b34 100644 --- a/boards/arm/stm32f429i-disco/configs/usbnsh/defconfig +++ b/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f429i-disco" CONFIG_ARCH_BOARD_STM32F429I_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F429Z=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f429i-disco/include/board.h b/boards/arm/stm32/stm32f429i-disco/include/board.h similarity index 100% rename from boards/arm/stm32f429i-disco/include/board.h rename to boards/arm/stm32/stm32f429i-disco/include/board.h diff --git a/boards/arm/stm32f429i-disco/scripts/Make.defs b/boards/arm/stm32/stm32f429i-disco/scripts/Make.defs similarity index 96% rename from boards/arm/stm32f429i-disco/scripts/Make.defs rename to boards/arm/stm32/stm32f429i-disco/scripts/Make.defs index a01799600ea..d0ce05bc366 100644 --- a/boards/arm/stm32f429i-disco/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32f429i-disco/scripts/gnu-elf.ld b/boards/arm/stm32/stm32f429i-disco/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/stm32f429i-disco/scripts/gnu-elf.ld rename to boards/arm/stm32/stm32f429i-disco/scripts/gnu-elf.ld diff --git a/boards/arm/stm32f429i-disco/scripts/kernel-space.ld b/boards/arm/stm32/stm32f429i-disco/scripts/kernel-space.ld similarity index 100% rename from boards/arm/stm32f429i-disco/scripts/kernel-space.ld rename to boards/arm/stm32/stm32f429i-disco/scripts/kernel-space.ld diff --git a/boards/arm/stm32f429i-disco/scripts/ld.script b/boards/arm/stm32/stm32f429i-disco/scripts/ld.script similarity index 100% rename from boards/arm/stm32f429i-disco/scripts/ld.script rename to boards/arm/stm32/stm32f429i-disco/scripts/ld.script diff --git a/boards/arm/stm32f429i-disco/scripts/memory.ld b/boards/arm/stm32/stm32f429i-disco/scripts/memory.ld similarity index 100% rename from boards/arm/stm32f429i-disco/scripts/memory.ld rename to boards/arm/stm32/stm32f429i-disco/scripts/memory.ld diff --git a/boards/arm/stm32f429i-disco/scripts/user-space.ld b/boards/arm/stm32/stm32f429i-disco/scripts/user-space.ld similarity index 100% rename from boards/arm/stm32f429i-disco/scripts/user-space.ld rename to boards/arm/stm32/stm32f429i-disco/scripts/user-space.ld diff --git a/boards/arm/samd21-xplained/src/.gitignore b/boards/arm/stm32/stm32f429i-disco/src/.gitignore similarity index 100% rename from boards/arm/samd21-xplained/src/.gitignore rename to boards/arm/stm32/stm32f429i-disco/src/.gitignore diff --git a/boards/arm/stm32f429i-disco/src/Makefile b/boards/arm/stm32/stm32f429i-disco/src/Makefile similarity index 100% rename from boards/arm/stm32f429i-disco/src/Makefile rename to boards/arm/stm32/stm32f429i-disco/src/Makefile diff --git a/boards/arm/stm32f429i-disco/src/stm32_adc.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_adc.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_adc.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_adc.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_appinit.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_appinit.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_appinit.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_appinit.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_autoleds.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_autoleds.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_autoleds.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_autoleds.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_boot.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_boot.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_boot.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_bringup.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_bringup.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_bringup.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_bringup.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_buttons.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_buttons.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_buttons.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_extmem.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_extmem.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_extmem.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_extmem.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_highpri.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_highpri.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_idle.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_idle.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_idle.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_idle.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_ili93414ws.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_ili93414ws.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_ili93414ws.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_ili93414ws.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_l3gd20.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_l3gd20.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_l3gd20.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_l3gd20.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_lcd.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_lcd.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_lcd.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_lcd.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_ostest.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_ostest.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_ostest.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_ostest.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_pwm.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_pwm.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_pwm.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_pwm.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_spi.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_spi.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_spi.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_spi.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_stmpe811.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_stmpe811.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_stmpe811.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_stmpe811.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_usb.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_usb.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_usb.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_usb.c diff --git a/boards/arm/stm32f429i-disco/src/stm32_userleds.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_userleds.c similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32_userleds.c rename to boards/arm/stm32/stm32f429i-disco/src/stm32_userleds.c diff --git a/boards/arm/stm32f429i-disco/src/stm32f429i-disco.h b/boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h similarity index 100% rename from boards/arm/stm32f429i-disco/src/stm32f429i-disco.h rename to boards/arm/stm32/stm32f429i-disco/src/stm32f429i-disco.h diff --git a/boards/arm/stm32f429i-disco/tools/fbcalc.sh b/boards/arm/stm32/stm32f429i-disco/tools/fbcalc.sh similarity index 100% rename from boards/arm/stm32f429i-disco/tools/fbcalc.sh rename to boards/arm/stm32/stm32f429i-disco/tools/fbcalc.sh diff --git a/boards/arm/stm32f4discovery/Kconfig b/boards/arm/stm32/stm32f4discovery/Kconfig similarity index 100% rename from boards/arm/stm32f4discovery/Kconfig rename to boards/arm/stm32/stm32f4discovery/Kconfig diff --git a/boards/arm/stm32f4discovery/README.txt b/boards/arm/stm32/stm32f4discovery/README.txt similarity index 100% rename from boards/arm/stm32f4discovery/README.txt rename to boards/arm/stm32/stm32f4discovery/README.txt diff --git a/boards/arm/stm32f4discovery/configs/audio/defconfig b/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/audio/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/audio/defconfig index 6ca1a8d1f00..19ef4391cc2 100644 --- a/boards/arm/stm32f4discovery/configs/audio/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/canard/defconfig b/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/canard/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/canard/defconfig index dceeb551e73..b4f72c43ac2 100644 --- a/boards/arm/stm32f4discovery/configs/canard/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/cxxtest/Make.defs b/boards/arm/stm32/stm32f4discovery/configs/cxxtest/Make.defs similarity index 96% rename from boards/arm/stm32f4discovery/configs/cxxtest/Make.defs rename to boards/arm/stm32/stm32f4discovery/configs/cxxtest/Make.defs index 3fc0c5417f0..7cbb00d59ef 100644 --- a/boards/arm/stm32f4discovery/configs/cxxtest/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) diff --git a/boards/arm/stm32f4discovery/configs/cxxtest/defconfig b/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/cxxtest/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig index 0c9e4bd373e..6a1184a3b87 100644 --- a/boards/arm/stm32f4discovery/configs/cxxtest/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_FLOAT_H=y diff --git a/boards/arm/stm32f4discovery/configs/elf/Make.defs b/boards/arm/stm32/stm32f4discovery/configs/elf/Make.defs similarity index 94% rename from boards/arm/stm32f4discovery/configs/elf/Make.defs rename to boards/arm/stm32/stm32f4discovery/configs/elf/Make.defs index fffd18c6f44..465551281ef 100644 --- a/boards/arm/stm32f4discovery/configs/elf/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif # File extensions diff --git a/boards/arm/stm32f4discovery/configs/elf/defconfig b/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/elf/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/elf/defconfig index ed92ca85070..1d01657b861 100644 --- a/boards/arm/stm32f4discovery/configs/elf/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/hciuart/defconfig b/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/hciuart/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig index fddaa6e5560..63b63886297 100644 --- a/boards/arm/stm32f4discovery/configs/hciuart/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/stm32f4discovery/configs/ipv6/defconfig b/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig similarity index 99% rename from boards/arm/stm32f4discovery/configs/ipv6/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig index 1403120a71e..b912918d899 100644 --- a/boards/arm/stm32f4discovery/configs/ipv6/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/kostest/defconfig b/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/kostest/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig index a7c517d6acf..88611977f69 100644 --- a/boards/arm/stm32f4discovery/configs/kostest/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/max31855/defconfig b/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/max31855/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig index f0ddff5a262..99787e55acd 100644 --- a/boards/arm/stm32f4discovery/configs/max31855/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/max7219/defconfig b/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig similarity index 99% rename from boards/arm/stm32f4discovery/configs/max7219/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig index 7d9dfce2da0..26be516ec31 100644 --- a/boards/arm/stm32f4discovery/configs/max7219/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig @@ -34,6 +34,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/module/defconfig b/boards/arm/stm32/stm32f4discovery/configs/module/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/module/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/module/defconfig index 885108645b0..60464bb368f 100644 --- a/boards/arm/stm32f4discovery/configs/module/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/module/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/netnsh/defconfig b/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig similarity index 99% rename from boards/arm/stm32f4discovery/configs/netnsh/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig index 74cc42edb11..c79bf5e9232 100644 --- a/boards/arm/stm32f4discovery/configs/netnsh/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/nsh/defconfig b/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/nsh/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig index 1b973d2ef60..00de2ead579 100644 --- a/boards/arm/stm32f4discovery/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/nxlines/defconfig b/boards/arm/stm32/stm32f4discovery/configs/nxlines/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/nxlines/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/nxlines/defconfig index 410a678e9e7..58db4547602 100644 --- a/boards/arm/stm32f4discovery/configs/nxlines/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/nxlines/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/pm/defconfig b/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/pm/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/pm/defconfig index eaab60f6a0d..ddac6af3fa7 100644 --- a/boards/arm/stm32f4discovery/configs/pm/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_CUSTOM_PMINIT=y diff --git a/boards/arm/stm32f4discovery/configs/posix_spawn/Make.defs b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/Make.defs similarity index 94% rename from boards/arm/stm32f4discovery/configs/posix_spawn/Make.defs rename to boards/arm/stm32/stm32f4discovery/configs/posix_spawn/Make.defs index f85a19ba152..de62c1dd478 100644 --- a/boards/arm/stm32f4discovery/configs/posix_spawn/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif # File extensions diff --git a/boards/arm/stm32f4discovery/configs/posix_spawn/defconfig b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/posix_spawn/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig index ccbc53851f1..e14ecd8bced 100644 --- a/boards/arm/stm32f4discovery/configs/posix_spawn/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/pseudoterm/defconfig b/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/pseudoterm/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig index be93e5786a0..2ad4bb4d7ac 100644 --- a/boards/arm/stm32f4discovery/configs/pseudoterm/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/rgbled/defconfig b/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/rgbled/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig index a9d73ab8cdd..c09cfc2a9f7 100644 --- a/boards/arm/stm32f4discovery/configs/rgbled/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/rndis/defconfig b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig similarity index 99% rename from boards/arm/stm32f4discovery/configs/rndis/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig index 01aa71f15f4..cf4aaac851c 100644 --- a/boards/arm/stm32f4discovery/configs/rndis/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/testlibcxx/Make.defs b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/Make.defs similarity index 96% rename from boards/arm/stm32f4discovery/configs/testlibcxx/Make.defs rename to boards/arm/stm32/stm32f4discovery/configs/testlibcxx/Make.defs index fd29e1e652a..b3fadc4e85b 100644 --- a/boards/arm/stm32f4discovery/configs/testlibcxx/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) diff --git a/boards/arm/stm32f4discovery/configs/testlibcxx/defconfig b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/testlibcxx/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig index c7da07e0f45..240a73d6c25 100644 --- a/boards/arm/stm32f4discovery/configs/testlibcxx/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_FLOAT_H=y diff --git a/boards/arm/stm32f4discovery/configs/usbmsc/defconfig b/boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/usbmsc/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig index 51ae6800618..13802d47d90 100644 --- a/boards/arm/stm32f4discovery/configs/usbmsc/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/usbnsh/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig index ecf5bafa149..653b0ac52f7 100644 --- a/boards/arm/stm32f4discovery/configs/usbnsh/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/winbuild/Make.defs b/boards/arm/stm32/stm32f4discovery/configs/winbuild/Make.defs similarity index 97% rename from boards/arm/stm32f4discovery/configs/winbuild/Make.defs rename to boards/arm/stm32/stm32f4discovery/configs/winbuild/Make.defs index f2622e9c342..767a87ad0c4 100644 --- a/boards/arm/stm32f4discovery/configs/winbuild/Make.defs +++ b/boards/arm/stm32/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)\$(CONFIG_ARCH_BOARD)\scripts\$(LDSCRIPT) +ARCHSCRIPT = -T$(TOPDIR)\boards\$(CONFIG_ARCH)\$(CONFIG_ARCH_CHIP)\$(CONFIG_ARCH_BOARD)\scripts\$(LDSCRIPT) CC = $(CROSSDEV)gcc.exe CXX = $(CROSSDEV)g++.exe diff --git a/boards/arm/stm32f4discovery/configs/winbuild/defconfig b/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/winbuild/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig index 255c78e0c4f..34c6b180529 100644 --- a/boards/arm/stm32f4discovery/configs/winbuild/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig @@ -8,6 +8,7 @@ # CONFIG_ARCH_FPU is not set CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BOARD="stm32f4discovery" +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/configs/xen1210/defconfig b/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig similarity index 98% rename from boards/arm/stm32f4discovery/configs/xen1210/defconfig rename to boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig index 2e3bd98344c..74770ad83d8 100644 --- a/boards/arm/stm32f4discovery/configs/xen1210/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f4discovery" CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F407VG=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f4discovery/include/board.h b/boards/arm/stm32/stm32f4discovery/include/board.h similarity index 100% rename from boards/arm/stm32f4discovery/include/board.h rename to boards/arm/stm32/stm32f4discovery/include/board.h diff --git a/boards/arm/stm3240g-eval/kernel/.gitignore b/boards/arm/stm32/stm32f4discovery/kernel/.gitignore similarity index 100% rename from boards/arm/stm3240g-eval/kernel/.gitignore rename to boards/arm/stm32/stm32f4discovery/kernel/.gitignore diff --git a/boards/arm/stm32f4discovery/kernel/Makefile b/boards/arm/stm32/stm32f4discovery/kernel/Makefile similarity index 90% rename from boards/arm/stm32f4discovery/kernel/Makefile rename to boards/arm/stm32/stm32f4discovery/kernel/Makefile index 7654d4d5b99..84fc3aadba7 100644 --- a/boards/arm/stm32f4discovery/kernel/Makefile +++ b/boards/arm/stm32/stm32f4discovery/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/stm32f4discovery/kernel/stm32_userspace.c b/boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c similarity index 100% rename from boards/arm/stm32f4discovery/kernel/stm32_userspace.c rename to boards/arm/stm32/stm32f4discovery/kernel/stm32_userspace.c diff --git a/boards/arm/stm32f4discovery/scripts/Make.defs b/boards/arm/stm32/stm32f4discovery/scripts/Make.defs similarity index 94% rename from boards/arm/stm32f4discovery/scripts/Make.defs rename to boards/arm/stm32/stm32f4discovery/scripts/Make.defs index f4ee938653c..30f25cae237 100644 --- a/boards/arm/stm32f4discovery/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif diff --git a/boards/arm/stm32f4discovery/scripts/gnu-elf.ld b/boards/arm/stm32/stm32f4discovery/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/stm32f4discovery/scripts/gnu-elf.ld rename to boards/arm/stm32/stm32f4discovery/scripts/gnu-elf.ld diff --git a/boards/arm/stm32f4discovery/scripts/kernel-space.ld b/boards/arm/stm32/stm32f4discovery/scripts/kernel-space.ld similarity index 100% rename from boards/arm/stm32f4discovery/scripts/kernel-space.ld rename to boards/arm/stm32/stm32f4discovery/scripts/kernel-space.ld diff --git a/boards/arm/stm32f4discovery/scripts/ld.script b/boards/arm/stm32/stm32f4discovery/scripts/ld.script similarity index 100% rename from boards/arm/stm32f4discovery/scripts/ld.script rename to boards/arm/stm32/stm32f4discovery/scripts/ld.script diff --git a/boards/arm/stm32f4discovery/scripts/memory.ld b/boards/arm/stm32/stm32f4discovery/scripts/memory.ld similarity index 100% rename from boards/arm/stm32f4discovery/scripts/memory.ld rename to boards/arm/stm32/stm32f4discovery/scripts/memory.ld diff --git a/boards/arm/stm32f4discovery/scripts/user-space.ld b/boards/arm/stm32/stm32f4discovery/scripts/user-space.ld similarity index 100% rename from boards/arm/stm32f4discovery/scripts/user-space.ld rename to boards/arm/stm32/stm32f4discovery/scripts/user-space.ld diff --git a/boards/arm/saml21-xplained/src/.gitignore b/boards/arm/stm32/stm32f4discovery/src/.gitignore similarity index 100% rename from boards/arm/saml21-xplained/src/.gitignore rename to boards/arm/stm32/stm32f4discovery/src/.gitignore diff --git a/boards/arm/stm32f4discovery/src/Makefile b/boards/arm/stm32/stm32f4discovery/src/Makefile similarity index 100% rename from boards/arm/stm32f4discovery/src/Makefile rename to boards/arm/stm32/stm32f4discovery/src/Makefile diff --git a/boards/arm/stm32f4discovery/src/stm32_appinit.c b/boards/arm/stm32/stm32f4discovery/src/stm32_appinit.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_appinit.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_appinit.c diff --git a/boards/arm/stm32f4discovery/src/stm32_autoleds.c b/boards/arm/stm32/stm32f4discovery/src/stm32_autoleds.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_autoleds.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_autoleds.c diff --git a/boards/arm/stm32f4discovery/src/stm32_bh1750fvi.c b/boards/arm/stm32/stm32f4discovery/src/stm32_bh1750fvi.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_bh1750fvi.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_bh1750fvi.c diff --git a/boards/arm/stm32f4discovery/src/stm32_bmp180.c b/boards/arm/stm32/stm32f4discovery/src/stm32_bmp180.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_bmp180.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_bmp180.c diff --git a/boards/arm/stm32f4discovery/src/stm32_boot.c b/boards/arm/stm32/stm32f4discovery/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_boot.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_boot.c diff --git a/boards/arm/stm32f4discovery/src/stm32_bringup.c b/boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_bringup.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_bringup.c diff --git a/boards/arm/stm32f4discovery/src/stm32_buttons.c b/boards/arm/stm32/stm32f4discovery/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_buttons.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_buttons.c diff --git a/boards/arm/stm32f4discovery/src/stm32_can.c b/boards/arm/stm32/stm32f4discovery/src/stm32_can.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_can.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_can.c diff --git a/boards/arm/stm32f4discovery/src/stm32_critmon.c b/boards/arm/stm32/stm32f4discovery/src/stm32_critmon.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_critmon.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_critmon.c diff --git a/boards/arm/stm32f4discovery/src/stm32_cs43l22.c b/boards/arm/stm32/stm32f4discovery/src/stm32_cs43l22.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_cs43l22.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_cs43l22.c diff --git a/boards/arm/stm32f4discovery/src/stm32_ethernet.c b/boards/arm/stm32/stm32f4discovery/src/stm32_ethernet.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_ethernet.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_ethernet.c diff --git a/boards/arm/stm32f4discovery/src/stm32_extmem.c b/boards/arm/stm32/stm32f4discovery/src/stm32_extmem.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_extmem.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_extmem.c diff --git a/boards/arm/stm32f4discovery/src/stm32_hciuart.c b/boards/arm/stm32/stm32f4discovery/src/stm32_hciuart.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_hciuart.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_hciuart.c diff --git a/boards/arm/stm32f4discovery/src/stm32_idle.c b/boards/arm/stm32/stm32f4discovery/src/stm32_idle.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_idle.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_idle.c diff --git a/boards/arm/stm32f4discovery/src/stm32_lis3dsh.c b/boards/arm/stm32/stm32f4discovery/src/stm32_lis3dsh.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_lis3dsh.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_lis3dsh.c diff --git a/boards/arm/stm32f4discovery/src/stm32_max31855.c b/boards/arm/stm32/stm32f4discovery/src/stm32_max31855.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_max31855.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_max31855.c diff --git a/boards/arm/stm32f4discovery/src/stm32_max6675.c b/boards/arm/stm32/stm32f4discovery/src/stm32_max6675.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_max6675.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_max6675.c diff --git a/boards/arm/stm32f4discovery/src/stm32_max7219.c b/boards/arm/stm32/stm32f4discovery/src/stm32_max7219.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_max7219.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_max7219.c diff --git a/boards/arm/stm32f4discovery/src/stm32_max7219_leds.c b/boards/arm/stm32/stm32f4discovery/src/stm32_max7219_leds.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_max7219_leds.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_max7219_leds.c diff --git a/boards/arm/stm32f4discovery/src/stm32_mlx90614.c b/boards/arm/stm32/stm32f4discovery/src/stm32_mlx90614.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_mlx90614.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_mlx90614.c diff --git a/boards/arm/stm32f4discovery/src/stm32_netinit.c b/boards/arm/stm32/stm32f4discovery/src/stm32_netinit.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_netinit.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_netinit.c diff --git a/boards/arm/stm32f4discovery/src/stm32_nunchuck.c b/boards/arm/stm32/stm32f4discovery/src/stm32_nunchuck.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_nunchuck.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_nunchuck.c diff --git a/boards/arm/stm32f4discovery/src/stm32_ostest.c b/boards/arm/stm32/stm32f4discovery/src/stm32_ostest.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_ostest.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_ostest.c diff --git a/boards/arm/stm32f4discovery/src/stm32_pca9635.c b/boards/arm/stm32/stm32f4discovery/src/stm32_pca9635.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_pca9635.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_pca9635.c diff --git a/boards/arm/stm32f4discovery/src/stm32_pm.c b/boards/arm/stm32/stm32f4discovery/src/stm32_pm.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_pm.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_pm.c diff --git a/boards/arm/stm32f4discovery/src/stm32_pmbuttons.c b/boards/arm/stm32/stm32f4discovery/src/stm32_pmbuttons.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_pmbuttons.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_pmbuttons.c diff --git a/boards/arm/stm32f4discovery/src/stm32_pwm.c b/boards/arm/stm32/stm32f4discovery/src/stm32_pwm.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_pwm.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_pwm.c diff --git a/boards/arm/stm32f4discovery/src/stm32_qencoder.c b/boards/arm/stm32/stm32f4discovery/src/stm32_qencoder.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_qencoder.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_qencoder.c diff --git a/boards/arm/stm32f4discovery/src/stm32_reset.c b/boards/arm/stm32/stm32f4discovery/src/stm32_reset.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_reset.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_reset.c diff --git a/boards/arm/stm32f4discovery/src/stm32_rgbled.c b/boards/arm/stm32/stm32f4discovery/src/stm32_rgbled.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_rgbled.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_rgbled.c diff --git a/boards/arm/stm32f4discovery/src/stm32_romfs.h b/boards/arm/stm32/stm32f4discovery/src/stm32_romfs.h similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_romfs.h rename to boards/arm/stm32/stm32f4discovery/src/stm32_romfs.h diff --git a/boards/arm/stm32f4discovery/src/stm32_romfs_initialize.c b/boards/arm/stm32/stm32f4discovery/src/stm32_romfs_initialize.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_romfs_initialize.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_romfs_initialize.c diff --git a/boards/arm/stm32f4discovery/src/stm32_sdio.c b/boards/arm/stm32/stm32f4discovery/src/stm32_sdio.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_sdio.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_sdio.c diff --git a/boards/arm/stm32f4discovery/src/stm32_spi.c b/boards/arm/stm32/stm32f4discovery/src/stm32_spi.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_spi.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_spi.c diff --git a/boards/arm/stm32f4discovery/src/stm32_ssd1289.c b/boards/arm/stm32/stm32f4discovery/src/stm32_ssd1289.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_ssd1289.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_ssd1289.c diff --git a/boards/arm/stm32f4discovery/src/stm32_ssd1351.c b/boards/arm/stm32/stm32f4discovery/src/stm32_ssd1351.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_ssd1351.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_ssd1351.c diff --git a/boards/arm/stm32f4discovery/src/stm32_st7032.c b/boards/arm/stm32/stm32f4discovery/src/stm32_st7032.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_st7032.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_st7032.c diff --git a/boards/arm/stm32f4discovery/src/stm32_st7567.c b/boards/arm/stm32/stm32f4discovery/src/stm32_st7567.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_st7567.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_st7567.c diff --git a/boards/arm/stm32f4discovery/src/stm32_timer.c b/boards/arm/stm32/stm32f4discovery/src/stm32_timer.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_timer.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_timer.c diff --git a/boards/arm/stm32f4discovery/src/stm32_ug2864ambag01.c b/boards/arm/stm32/stm32f4discovery/src/stm32_ug2864ambag01.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_ug2864ambag01.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_ug2864ambag01.c diff --git a/boards/arm/stm32f4discovery/src/stm32_ug2864hsweg01.c b/boards/arm/stm32/stm32f4discovery/src/stm32_ug2864hsweg01.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_ug2864hsweg01.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_ug2864hsweg01.c diff --git a/boards/arm/stm32f4discovery/src/stm32_uid.c b/boards/arm/stm32/stm32f4discovery/src/stm32_uid.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_uid.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_uid.c diff --git a/boards/arm/stm32f4discovery/src/stm32_usb.c b/boards/arm/stm32/stm32f4discovery/src/stm32_usb.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_usb.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_usb.c diff --git a/boards/arm/stm32f4discovery/src/stm32_usbmsc.c b/boards/arm/stm32/stm32f4discovery/src/stm32_usbmsc.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_usbmsc.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_usbmsc.c diff --git a/boards/arm/stm32f4discovery/src/stm32_userleds.c b/boards/arm/stm32/stm32f4discovery/src/stm32_userleds.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_userleds.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_userleds.c diff --git a/boards/arm/stm32f4discovery/src/stm32_xen1210.c b/boards/arm/stm32/stm32f4discovery/src/stm32_xen1210.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_xen1210.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_xen1210.c diff --git a/boards/arm/stm32f4discovery/src/stm32_zerocross.c b/boards/arm/stm32/stm32f4discovery/src/stm32_zerocross.c similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32_zerocross.c rename to boards/arm/stm32/stm32f4discovery/src/stm32_zerocross.c diff --git a/boards/arm/stm32f4discovery/src/stm32f4discovery.h b/boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h similarity index 100% rename from boards/arm/stm32f4discovery/src/stm32f4discovery.h rename to boards/arm/stm32/stm32f4discovery/src/stm32f4discovery.h diff --git a/boards/arm/stm32ldiscovery/Kconfig b/boards/arm/stm32/stm32ldiscovery/Kconfig similarity index 100% rename from boards/arm/stm32ldiscovery/Kconfig rename to boards/arm/stm32/stm32ldiscovery/Kconfig diff --git a/boards/arm/stm32ldiscovery/README.txt b/boards/arm/stm32/stm32ldiscovery/README.txt similarity index 100% rename from boards/arm/stm32ldiscovery/README.txt rename to boards/arm/stm32/stm32ldiscovery/README.txt diff --git a/boards/arm/stm32ldiscovery/configs/chrono/defconfig b/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig similarity index 98% rename from boards/arm/stm32ldiscovery/configs/chrono/defconfig rename to boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig index cac46e98d14..638d7b8bdba 100644 --- a/boards/arm/stm32ldiscovery/configs/chrono/defconfig +++ b/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32ldiscovery" CONFIG_ARCH_BOARD_STM32L_DISCOVERY=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32L152RB=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/stm32ldiscovery/configs/nsh/defconfig b/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm32ldiscovery/configs/nsh/defconfig rename to boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig index df07c8941ed..00c1b81ba3d 100644 --- a/boards/arm/stm32ldiscovery/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32ldiscovery" CONFIG_ARCH_BOARD_STM32L_DISCOVERY=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32L152RB=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32ldiscovery/include/board.h b/boards/arm/stm32/stm32ldiscovery/include/board.h similarity index 100% rename from boards/arm/stm32ldiscovery/include/board.h rename to boards/arm/stm32/stm32ldiscovery/include/board.h diff --git a/boards/arm/stm32ldiscovery/scripts/Make.defs b/boards/arm/stm32/stm32ldiscovery/scripts/Make.defs similarity index 96% rename from boards/arm/stm32ldiscovery/scripts/Make.defs rename to boards/arm/stm32/stm32ldiscovery/scripts/Make.defs index 590cd747590..447275ddada 100644 --- a/boards/arm/stm32ldiscovery/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32ldiscovery/scripts/gnu-elf.ld b/boards/arm/stm32/stm32ldiscovery/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/stm32ldiscovery/scripts/gnu-elf.ld rename to boards/arm/stm32/stm32ldiscovery/scripts/gnu-elf.ld diff --git a/boards/arm/stm32ldiscovery/scripts/stm32l152rb.ld b/boards/arm/stm32/stm32ldiscovery/scripts/stm32l152rb.ld similarity index 100% rename from boards/arm/stm32ldiscovery/scripts/stm32l152rb.ld rename to boards/arm/stm32/stm32ldiscovery/scripts/stm32l152rb.ld diff --git a/boards/arm/stm32ldiscovery/scripts/stm32l152rc.ld b/boards/arm/stm32/stm32ldiscovery/scripts/stm32l152rc.ld similarity index 100% rename from boards/arm/stm32ldiscovery/scripts/stm32l152rc.ld rename to boards/arm/stm32/stm32ldiscovery/scripts/stm32l152rc.ld diff --git a/boards/arm/shenzhou/src/.gitignore b/boards/arm/stm32/stm32ldiscovery/src/.gitignore similarity index 100% rename from boards/arm/shenzhou/src/.gitignore rename to boards/arm/stm32/stm32ldiscovery/src/.gitignore diff --git a/boards/arm/stm32ldiscovery/src/Makefile b/boards/arm/stm32/stm32ldiscovery/src/Makefile similarity index 100% rename from boards/arm/stm32ldiscovery/src/Makefile rename to boards/arm/stm32/stm32ldiscovery/src/Makefile diff --git a/boards/arm/stm32ldiscovery/src/stm32_appinit.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_appinit.c similarity index 100% rename from boards/arm/stm32ldiscovery/src/stm32_appinit.c rename to boards/arm/stm32/stm32ldiscovery/src/stm32_appinit.c diff --git a/boards/arm/stm32ldiscovery/src/stm32_autoleds.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_autoleds.c similarity index 100% rename from boards/arm/stm32ldiscovery/src/stm32_autoleds.c rename to boards/arm/stm32/stm32ldiscovery/src/stm32_autoleds.c diff --git a/boards/arm/stm32ldiscovery/src/stm32_boot.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32ldiscovery/src/stm32_boot.c rename to boards/arm/stm32/stm32ldiscovery/src/stm32_boot.c diff --git a/boards/arm/stm32ldiscovery/src/stm32_bringup.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_bringup.c similarity index 100% rename from boards/arm/stm32ldiscovery/src/stm32_bringup.c rename to boards/arm/stm32/stm32ldiscovery/src/stm32_bringup.c diff --git a/boards/arm/stm32ldiscovery/src/stm32_buttons.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm32ldiscovery/src/stm32_buttons.c rename to boards/arm/stm32/stm32ldiscovery/src/stm32_buttons.c diff --git a/boards/arm/stm32ldiscovery/src/stm32_lcd.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c similarity index 100% rename from boards/arm/stm32ldiscovery/src/stm32_lcd.c rename to boards/arm/stm32/stm32ldiscovery/src/stm32_lcd.c diff --git a/boards/arm/stm32ldiscovery/src/stm32_pwm.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_pwm.c similarity index 100% rename from boards/arm/stm32ldiscovery/src/stm32_pwm.c rename to boards/arm/stm32/stm32ldiscovery/src/stm32_pwm.c diff --git a/boards/arm/stm32ldiscovery/src/stm32_qencoder.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_qencoder.c similarity index 100% rename from boards/arm/stm32ldiscovery/src/stm32_qencoder.c rename to boards/arm/stm32/stm32ldiscovery/src/stm32_qencoder.c diff --git a/boards/arm/stm32ldiscovery/src/stm32_spi.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_spi.c similarity index 100% rename from boards/arm/stm32ldiscovery/src/stm32_spi.c rename to boards/arm/stm32/stm32ldiscovery/src/stm32_spi.c diff --git a/boards/arm/stm32ldiscovery/src/stm32_userleds.c b/boards/arm/stm32/stm32ldiscovery/src/stm32_userleds.c similarity index 100% rename from boards/arm/stm32ldiscovery/src/stm32_userleds.c rename to boards/arm/stm32/stm32ldiscovery/src/stm32_userleds.c diff --git a/boards/arm/stm32ldiscovery/src/stm32ldiscovery.h b/boards/arm/stm32/stm32ldiscovery/src/stm32ldiscovery.h similarity index 100% rename from boards/arm/stm32ldiscovery/src/stm32ldiscovery.h rename to boards/arm/stm32/stm32ldiscovery/src/stm32ldiscovery.h diff --git a/boards/arm/stm32vldiscovery/Kconfig b/boards/arm/stm32/stm32vldiscovery/Kconfig similarity index 100% rename from boards/arm/stm32vldiscovery/Kconfig rename to boards/arm/stm32/stm32vldiscovery/Kconfig diff --git a/boards/arm/stm32vldiscovery/README.txt b/boards/arm/stm32/stm32vldiscovery/README.txt similarity index 100% rename from boards/arm/stm32vldiscovery/README.txt rename to boards/arm/stm32/stm32vldiscovery/README.txt diff --git a/boards/arm/stm32vldiscovery/configs/nsh/defconfig b/boards/arm/stm32/stm32vldiscovery/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm32vldiscovery/configs/nsh/defconfig rename to boards/arm/stm32/stm32vldiscovery/configs/nsh/defconfig index c9ef28bd1f2..9d04b6f9bbf 100644 --- a/boards/arm/stm32vldiscovery/configs/nsh/defconfig +++ b/boards/arm/stm32/stm32vldiscovery/configs/nsh/defconfig @@ -23,6 +23,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32vldiscovery" CONFIG_ARCH_BOARD_STM32VL_DISCOVERY=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F100RB=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32vldiscovery/include/board.h b/boards/arm/stm32/stm32vldiscovery/include/board.h similarity index 100% rename from boards/arm/stm32vldiscovery/include/board.h rename to boards/arm/stm32/stm32vldiscovery/include/board.h diff --git a/boards/arm/stm32vldiscovery/scripts/Make.defs b/boards/arm/stm32/stm32vldiscovery/scripts/Make.defs similarity index 96% rename from boards/arm/stm32vldiscovery/scripts/Make.defs rename to boards/arm/stm32/stm32vldiscovery/scripts/Make.defs index b278d6387fd..c10635731b7 100644 --- a/boards/arm/stm32vldiscovery/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32vldiscovery/scripts/stm32vldiscovery.ld b/boards/arm/stm32/stm32vldiscovery/scripts/stm32vldiscovery.ld similarity index 100% rename from boards/arm/stm32vldiscovery/scripts/stm32vldiscovery.ld rename to boards/arm/stm32/stm32vldiscovery/scripts/stm32vldiscovery.ld diff --git a/boards/arm/spresense/src/.gitignore b/boards/arm/stm32/stm32vldiscovery/src/.gitignore similarity index 100% rename from boards/arm/spresense/src/.gitignore rename to boards/arm/stm32/stm32vldiscovery/src/.gitignore diff --git a/boards/arm/stm32vldiscovery/src/Makefile b/boards/arm/stm32/stm32vldiscovery/src/Makefile similarity index 100% rename from boards/arm/stm32vldiscovery/src/Makefile rename to boards/arm/stm32/stm32vldiscovery/src/Makefile diff --git a/boards/arm/stm32vldiscovery/src/stm32_boot.c b/boards/arm/stm32/stm32vldiscovery/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32vldiscovery/src/stm32_boot.c rename to boards/arm/stm32/stm32vldiscovery/src/stm32_boot.c diff --git a/boards/arm/stm32vldiscovery/src/stm32_buttons.c b/boards/arm/stm32/stm32vldiscovery/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm32vldiscovery/src/stm32_buttons.c rename to boards/arm/stm32/stm32vldiscovery/src/stm32_buttons.c diff --git a/boards/arm/stm32vldiscovery/src/stm32_leds.c b/boards/arm/stm32/stm32vldiscovery/src/stm32_leds.c similarity index 100% rename from boards/arm/stm32vldiscovery/src/stm32_leds.c rename to boards/arm/stm32/stm32vldiscovery/src/stm32_leds.c diff --git a/boards/arm/stm32vldiscovery/src/stm32vldiscovery.h b/boards/arm/stm32/stm32vldiscovery/src/stm32vldiscovery.h similarity index 100% rename from boards/arm/stm32vldiscovery/src/stm32vldiscovery.h rename to boards/arm/stm32/stm32vldiscovery/src/stm32vldiscovery.h diff --git a/boards/arm/viewtool-stm32f107/Kconfig b/boards/arm/stm32/viewtool-stm32f107/Kconfig similarity index 100% rename from boards/arm/viewtool-stm32f107/Kconfig rename to boards/arm/stm32/viewtool-stm32f107/Kconfig diff --git a/boards/arm/viewtool-stm32f107/README.txt b/boards/arm/stm32/viewtool-stm32f107/README.txt similarity index 100% rename from boards/arm/viewtool-stm32f107/README.txt rename to boards/arm/stm32/viewtool-stm32f107/README.txt diff --git a/boards/arm/viewtool-stm32f107/configs/ft80x/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/ft80x/defconfig similarity index 98% rename from boards/arm/viewtool-stm32f107/configs/ft80x/defconfig rename to boards/arm/stm32/viewtool-stm32f107/configs/ft80x/defconfig index 1c372265daa..2ab13c645a2 100644 --- a/boards/arm/viewtool-stm32f107/configs/ft80x/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/ft80x/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="viewtool-stm32f107" CONFIG_ARCH_BOARD_VIEWTOOL_STM32F107=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/viewtool-stm32f107/configs/highpri/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/highpri/defconfig similarity index 98% rename from boards/arm/viewtool-stm32f107/configs/highpri/defconfig rename to boards/arm/stm32/viewtool-stm32f107/configs/highpri/defconfig index 6548ff8ea55..867176695e6 100644 --- a/boards/arm/viewtool-stm32f107/configs/highpri/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/highpri/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="viewtool-stm32f107" CONFIG_ARCH_BOARD_VIEWTOOL_STM32F107=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F103VC=y CONFIG_ARCH_HIPRI_INTERRUPT=y diff --git a/boards/arm/viewtool-stm32f107/configs/netnsh/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig similarity index 98% rename from boards/arm/viewtool-stm32f107/configs/netnsh/defconfig rename to boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig index 31744b5b0ca..536ca9d9de3 100644 --- a/boards/arm/viewtool-stm32f107/configs/netnsh/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="viewtool-stm32f107" CONFIG_ARCH_BOARD_VIEWTOOL_STM32F107=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/viewtool-stm32f107/configs/nsh/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/nsh/defconfig similarity index 98% rename from boards/arm/viewtool-stm32f107/configs/nsh/defconfig rename to boards/arm/stm32/viewtool-stm32f107/configs/nsh/defconfig index ddf74ceb6f8..4d5def9ea91 100644 --- a/boards/arm/viewtool-stm32f107/configs/nsh/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="viewtool-stm32f107" CONFIG_ARCH_BOARD_VIEWTOOL_STM32F107=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/viewtool-stm32f107/configs/tcpblaster/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig similarity index 98% rename from boards/arm/viewtool-stm32f107/configs/tcpblaster/defconfig rename to boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig index c380e359f19..32a36c08d50 100644 --- a/boards/arm/viewtool-stm32f107/configs/tcpblaster/defconfig +++ b/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="viewtool-stm32f107" CONFIG_ARCH_BOARD_VIEWTOOL_STM32F107=y +CONFIG_ARCH_CHIP="stm32" CONFIG_ARCH_CHIP_STM32=y CONFIG_ARCH_CHIP_STM32F107VC=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/viewtool-stm32f107/include/board-stm32f103vct6.h b/boards/arm/stm32/viewtool-stm32f107/include/board-stm32f103vct6.h similarity index 100% rename from boards/arm/viewtool-stm32f107/include/board-stm32f103vct6.h rename to boards/arm/stm32/viewtool-stm32f107/include/board-stm32f103vct6.h diff --git a/boards/arm/viewtool-stm32f107/include/board-stm32f107vct6.h b/boards/arm/stm32/viewtool-stm32f107/include/board-stm32f107vct6.h similarity index 100% rename from boards/arm/viewtool-stm32f107/include/board-stm32f107vct6.h rename to boards/arm/stm32/viewtool-stm32f107/include/board-stm32f107vct6.h diff --git a/boards/arm/viewtool-stm32f107/include/board.h b/boards/arm/stm32/viewtool-stm32f107/include/board.h similarity index 100% rename from boards/arm/viewtool-stm32f107/include/board.h rename to boards/arm/stm32/viewtool-stm32f107/include/board.h diff --git a/boards/arm/viewtool-stm32f107/scripts/Make.defs b/boards/arm/stm32/viewtool-stm32f107/scripts/Make.defs similarity index 96% rename from boards/arm/viewtool-stm32f107/scripts/Make.defs rename to boards/arm/stm32/viewtool-stm32f107/scripts/Make.defs index 2b9d7d1ea15..786213231e9 100644 --- a/boards/arm/viewtool-stm32f107/scripts/Make.defs +++ b/boards/arm/stm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/viewtool-stm32f107/scripts/dfu.ld b/boards/arm/stm32/viewtool-stm32f107/scripts/dfu.ld similarity index 100% rename from boards/arm/viewtool-stm32f107/scripts/dfu.ld rename to boards/arm/stm32/viewtool-stm32f107/scripts/dfu.ld diff --git a/boards/arm/viewtool-stm32f107/scripts/flash.ld b/boards/arm/stm32/viewtool-stm32f107/scripts/flash.ld similarity index 100% rename from boards/arm/viewtool-stm32f107/scripts/flash.ld rename to boards/arm/stm32/viewtool-stm32f107/scripts/flash.ld diff --git a/boards/arm/stm3210e-eval/src/.gitignore b/boards/arm/stm32/viewtool-stm32f107/src/.gitignore similarity index 100% rename from boards/arm/stm3210e-eval/src/.gitignore rename to boards/arm/stm32/viewtool-stm32f107/src/.gitignore diff --git a/boards/arm/viewtool-stm32f107/src/Makefile b/boards/arm/stm32/viewtool-stm32f107/src/Makefile similarity index 100% rename from boards/arm/viewtool-stm32f107/src/Makefile rename to boards/arm/stm32/viewtool-stm32f107/src/Makefile diff --git a/boards/arm/viewtool-stm32f107/src/stm32_ads7843e.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ads7843e.c similarity index 100% rename from boards/arm/viewtool-stm32f107/src/stm32_ads7843e.c rename to boards/arm/stm32/viewtool-stm32f107/src/stm32_ads7843e.c diff --git a/boards/arm/viewtool-stm32f107/src/stm32_appinit.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_appinit.c similarity index 100% rename from boards/arm/viewtool-stm32f107/src/stm32_appinit.c rename to boards/arm/stm32/viewtool-stm32f107/src/stm32_appinit.c diff --git a/boards/arm/viewtool-stm32f107/src/stm32_boot.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_boot.c similarity index 100% rename from boards/arm/viewtool-stm32f107/src/stm32_boot.c rename to boards/arm/stm32/viewtool-stm32f107/src/stm32_boot.c diff --git a/boards/arm/viewtool-stm32f107/src/stm32_bringup.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_bringup.c similarity index 100% rename from boards/arm/viewtool-stm32f107/src/stm32_bringup.c rename to boards/arm/stm32/viewtool-stm32f107/src/stm32_bringup.c diff --git a/boards/arm/viewtool-stm32f107/src/stm32_buttons.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_buttons.c similarity index 100% rename from boards/arm/viewtool-stm32f107/src/stm32_buttons.c rename to boards/arm/stm32/viewtool-stm32f107/src/stm32_buttons.c diff --git a/boards/arm/viewtool-stm32f107/src/stm32_can.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_can.c similarity index 100% rename from boards/arm/viewtool-stm32f107/src/stm32_can.c rename to boards/arm/stm32/viewtool-stm32f107/src/stm32_can.c diff --git a/boards/arm/viewtool-stm32f107/src/stm32_ft80x.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ft80x.c similarity index 100% rename from boards/arm/viewtool-stm32f107/src/stm32_ft80x.c rename to boards/arm/stm32/viewtool-stm32f107/src/stm32_ft80x.c diff --git a/boards/arm/viewtool-stm32f107/src/stm32_highpri.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c similarity index 100% rename from boards/arm/viewtool-stm32f107/src/stm32_highpri.c rename to boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c diff --git a/boards/arm/viewtool-stm32f107/src/stm32_leds.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_leds.c similarity index 100% rename from boards/arm/viewtool-stm32f107/src/stm32_leds.c rename to boards/arm/stm32/viewtool-stm32f107/src/stm32_leds.c diff --git a/boards/arm/viewtool-stm32f107/src/stm32_max3421e.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_max3421e.c similarity index 100% rename from boards/arm/viewtool-stm32f107/src/stm32_max3421e.c rename to boards/arm/stm32/viewtool-stm32f107/src/stm32_max3421e.c diff --git a/boards/arm/viewtool-stm32f107/src/stm32_mmcsd.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_mmcsd.c similarity index 100% rename from boards/arm/viewtool-stm32f107/src/stm32_mmcsd.c rename to boards/arm/stm32/viewtool-stm32f107/src/stm32_mmcsd.c diff --git a/boards/arm/viewtool-stm32f107/src/stm32_mpl115a.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_mpl115a.c similarity index 100% rename from boards/arm/viewtool-stm32f107/src/stm32_mpl115a.c rename to boards/arm/stm32/viewtool-stm32f107/src/stm32_mpl115a.c diff --git a/boards/arm/viewtool-stm32f107/src/stm32_spi.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_spi.c similarity index 100% rename from boards/arm/viewtool-stm32f107/src/stm32_spi.c rename to boards/arm/stm32/viewtool-stm32f107/src/stm32_spi.c diff --git a/boards/arm/viewtool-stm32f107/src/stm32_ssd1289.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_ssd1289.c similarity index 100% rename from boards/arm/viewtool-stm32f107/src/stm32_ssd1289.c rename to boards/arm/stm32/viewtool-stm32f107/src/stm32_ssd1289.c diff --git a/boards/arm/viewtool-stm32f107/src/stm32_usbdev.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_usbdev.c similarity index 100% rename from boards/arm/viewtool-stm32f107/src/stm32_usbdev.c rename to boards/arm/stm32/viewtool-stm32f107/src/stm32_usbdev.c diff --git a/boards/arm/viewtool-stm32f107/src/stm32_usbmsc.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_usbmsc.c similarity index 100% rename from boards/arm/viewtool-stm32f107/src/stm32_usbmsc.c rename to boards/arm/stm32/viewtool-stm32f107/src/stm32_usbmsc.c diff --git a/boards/arm/viewtool-stm32f107/src/viewtool_stm32f107.h b/boards/arm/stm32/viewtool-stm32f107/src/viewtool_stm32f107.h similarity index 100% rename from boards/arm/viewtool-stm32f107/src/viewtool_stm32f107.h rename to boards/arm/stm32/viewtool-stm32f107/src/viewtool_stm32f107.h diff --git a/boards/arm/b-l072z-lrwan1/Kconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/Kconfig similarity index 100% rename from boards/arm/b-l072z-lrwan1/Kconfig rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/Kconfig diff --git a/boards/arm/b-l072z-lrwan1/README.txt b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/README.txt similarity index 100% rename from boards/arm/b-l072z-lrwan1/README.txt rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/README.txt diff --git a/boards/arm/b-l072z-lrwan1/configs/adc/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig similarity index 98% rename from boards/arm/b-l072z-lrwan1/configs/adc/defconfig rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig index 6c5aa20f724..15a55e50c18 100644 --- a/boards/arm/b-l072z-lrwan1/configs/adc/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig @@ -12,6 +12,7 @@ CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="b-l072z-lrwan1" CONFIG_ARCH_BOARD_B_L072Z_LRWAN1=y +CONFIG_ARCH_CHIP="stm32f0l0g0" CONFIG_ARCH_CHIP_STM32L072CZ=y CONFIG_ARCH_CHIP_STM32L072XX=y CONFIG_ARCH_CHIP_STM32L0=y diff --git a/boards/arm/b-l072z-lrwan1/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig similarity index 98% rename from boards/arm/b-l072z-lrwan1/configs/nsh/defconfig rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig index 1889cfb3e46..ec13c111fb6 100644 --- a/boards/arm/b-l072z-lrwan1/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="b-l072z-lrwan1" CONFIG_ARCH_BOARD_B_L072Z_LRWAN1=y +CONFIG_ARCH_CHIP="stm32f0l0g0" CONFIG_ARCH_CHIP_STM32L072CZ=y CONFIG_ARCH_CHIP_STM32L0=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/b-l072z-lrwan1/configs/nxlines_oled/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig similarity index 98% rename from boards/arm/b-l072z-lrwan1/configs/nxlines_oled/defconfig rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig index 8eea9cc24ab..8d5ba51abe0 100644 --- a/boards/arm/b-l072z-lrwan1/configs/nxlines_oled/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="b-l072z-lrwan1" CONFIG_ARCH_BOARD_B_L072Z_LRWAN1=y +CONFIG_ARCH_CHIP="stm32f0l0g0" CONFIG_ARCH_CHIP_STM32L072CZ=y CONFIG_ARCH_CHIP_STM32L072XX=y CONFIG_ARCH_CHIP_STM32L0=y diff --git a/boards/arm/b-l072z-lrwan1/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig similarity index 98% rename from boards/arm/b-l072z-lrwan1/configs/sx127x/defconfig rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig index 65e839cd12a..487dcb852bf 100644 --- a/boards/arm/b-l072z-lrwan1/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="b-l072z-lrwan1" CONFIG_ARCH_BOARD_B_L072Z_LRWAN1=y +CONFIG_ARCH_CHIP="stm32f0l0g0" CONFIG_ARCH_CHIP_STM32L072CZ=y CONFIG_ARCH_CHIP_STM32L0=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/b-l072z-lrwan1/include/board.h b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/include/board.h similarity index 100% rename from boards/arm/b-l072z-lrwan1/include/board.h rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/include/board.h diff --git a/boards/arm/b-l072z-lrwan1/scripts/Make.defs b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/scripts/Make.defs similarity index 96% rename from boards/arm/b-l072z-lrwan1/scripts/Make.defs rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/scripts/Make.defs index d7031f32a8e..e4c92522455 100644 --- a/boards/arm/b-l072z-lrwan1/scripts/Make.defs +++ b/boards/arm/stm32f0l0g0/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/b-l072z-lrwan1/scripts/ld.script b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/scripts/ld.script similarity index 100% rename from boards/arm/b-l072z-lrwan1/scripts/ld.script rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/scripts/ld.script diff --git a/boards/arm/b-l072z-lrwan1/src/Makefile b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/Makefile similarity index 100% rename from boards/arm/b-l072z-lrwan1/src/Makefile rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/Makefile diff --git a/boards/arm/b-l072z-lrwan1/src/b-l072z-lrwan1.h b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/b-l072z-lrwan1.h similarity index 100% rename from boards/arm/b-l072z-lrwan1/src/b-l072z-lrwan1.h rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/b-l072z-lrwan1.h diff --git a/boards/arm/b-l072z-lrwan1/src/stm32_adc.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_adc.c similarity index 100% rename from boards/arm/b-l072z-lrwan1/src/stm32_adc.c rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_adc.c diff --git a/boards/arm/b-l072z-lrwan1/src/stm32_appinit.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_appinit.c similarity index 100% rename from boards/arm/b-l072z-lrwan1/src/stm32_appinit.c rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_appinit.c diff --git a/boards/arm/b-l072z-lrwan1/src/stm32_autoleds.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_autoleds.c similarity index 100% rename from boards/arm/b-l072z-lrwan1/src/stm32_autoleds.c rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_autoleds.c diff --git a/boards/arm/b-l072z-lrwan1/src/stm32_boot.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_boot.c similarity index 100% rename from boards/arm/b-l072z-lrwan1/src/stm32_boot.c rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_boot.c diff --git a/boards/arm/b-l072z-lrwan1/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_bringup.c similarity index 100% rename from boards/arm/b-l072z-lrwan1/src/stm32_bringup.c rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_bringup.c diff --git a/boards/arm/b-l072z-lrwan1/src/stm32_spi.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_spi.c similarity index 100% rename from boards/arm/b-l072z-lrwan1/src/stm32_spi.c rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_spi.c diff --git a/boards/arm/b-l072z-lrwan1/src/stm32_ssd1306.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_ssd1306.c similarity index 100% rename from boards/arm/b-l072z-lrwan1/src/stm32_ssd1306.c rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_ssd1306.c diff --git a/boards/arm/b-l072z-lrwan1/src/stm32_sx127x.c b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_sx127x.c similarity index 100% rename from boards/arm/b-l072z-lrwan1/src/stm32_sx127x.c rename to boards/arm/stm32f0l0g0/b-l072z-lrwan1/src/stm32_sx127x.c diff --git a/boards/arm/nucleo-f072rb/Kconfig b/boards/arm/stm32f0l0g0/nucleo-f072rb/Kconfig similarity index 100% rename from boards/arm/nucleo-f072rb/Kconfig rename to boards/arm/stm32f0l0g0/nucleo-f072rb/Kconfig diff --git a/boards/arm/nucleo-f072rb/README.txt b/boards/arm/stm32f0l0g0/nucleo-f072rb/README.txt similarity index 100% rename from boards/arm/nucleo-f072rb/README.txt rename to boards/arm/stm32f0l0g0/nucleo-f072rb/README.txt diff --git a/boards/arm/nucleo-f072rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig similarity index 98% rename from boards/arm/nucleo-f072rb/configs/nsh/defconfig rename to boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig index 3cdb7e50633..001de7435fe 100644 --- a/boards/arm/nucleo-f072rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f072rb" CONFIG_ARCH_BOARD_NUCLEO_F072RB=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f0l0g0" CONFIG_ARCH_CHIP_STM32F072RB=y CONFIG_ARCH_CHIP_STM32F0=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/nucleo-f072rb/include/board.h b/boards/arm/stm32f0l0g0/nucleo-f072rb/include/board.h similarity index 100% rename from boards/arm/nucleo-f072rb/include/board.h rename to boards/arm/stm32f0l0g0/nucleo-f072rb/include/board.h diff --git a/boards/arm/nucleo-f072rb/scripts/Make.defs b/boards/arm/stm32f0l0g0/nucleo-f072rb/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-f072rb/scripts/Make.defs rename to boards/arm/stm32f0l0g0/nucleo-f072rb/scripts/Make.defs index afc597e6618..911506147cf 100644 --- a/boards/arm/nucleo-f072rb/scripts/Make.defs +++ b/boards/arm/stm32f0l0g0/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-f072rb/scripts/flash.ld b/boards/arm/stm32f0l0g0/nucleo-f072rb/scripts/flash.ld similarity index 100% rename from boards/arm/nucleo-f072rb/scripts/flash.ld rename to boards/arm/stm32f0l0g0/nucleo-f072rb/scripts/flash.ld diff --git a/boards/arm/stm3220g-eval/src/.gitignore b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/.gitignore similarity index 100% rename from boards/arm/stm3220g-eval/src/.gitignore rename to boards/arm/stm32f0l0g0/nucleo-f072rb/src/.gitignore diff --git a/boards/arm/nucleo-f072rb/src/Makefile b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/Makefile similarity index 100% rename from boards/arm/nucleo-f072rb/src/Makefile rename to boards/arm/stm32f0l0g0/nucleo-f072rb/src/Makefile diff --git a/boards/arm/nucleo-f072rb/src/nucleo-f072rb.h b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/nucleo-f072rb.h similarity index 100% rename from boards/arm/nucleo-f072rb/src/nucleo-f072rb.h rename to boards/arm/stm32f0l0g0/nucleo-f072rb/src/nucleo-f072rb.h diff --git a/boards/arm/nucleo-f072rb/src/stm32_appinit.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_appinit.c similarity index 100% rename from boards/arm/nucleo-f072rb/src/stm32_appinit.c rename to boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_appinit.c diff --git a/boards/arm/nucleo-f072rb/src/stm32_autoleds.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-f072rb/src/stm32_autoleds.c rename to boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-f072rb/src/stm32_boot.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-f072rb/src/stm32_boot.c rename to boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_boot.c diff --git a/boards/arm/nucleo-f072rb/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_bringup.c similarity index 100% rename from boards/arm/nucleo-f072rb/src/stm32_bringup.c rename to boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_bringup.c diff --git a/boards/arm/nucleo-f072rb/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-f072rb/src/stm32_buttons.c rename to boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_buttons.c diff --git a/boards/arm/nucleo-f072rb/src/stm32_userleds.c b/boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-f072rb/src/stm32_userleds.c rename to boards/arm/stm32f0l0g0/nucleo-f072rb/src/stm32_userleds.c diff --git a/boards/arm/nucleo-f091rc/Kconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/Kconfig similarity index 100% rename from boards/arm/nucleo-f091rc/Kconfig rename to boards/arm/stm32f0l0g0/nucleo-f091rc/Kconfig diff --git a/boards/arm/nucleo-f091rc/README.txt b/boards/arm/stm32f0l0g0/nucleo-f091rc/README.txt similarity index 100% rename from boards/arm/nucleo-f091rc/README.txt rename to boards/arm/stm32f0l0g0/nucleo-f091rc/README.txt diff --git a/boards/arm/nucleo-f091rc/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig similarity index 98% rename from boards/arm/nucleo-f091rc/configs/nsh/defconfig rename to boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig index c168d81cacd..b17d3284aec 100644 --- a/boards/arm/nucleo-f091rc/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f091rc" CONFIG_ARCH_BOARD_NUCLEO_F091RC=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f0l0g0" CONFIG_ARCH_CHIP_STM32F091RC=y CONFIG_ARCH_CHIP_STM32F0=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/nucleo-f091rc/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig similarity index 98% rename from boards/arm/nucleo-f091rc/configs/sx127x/defconfig rename to boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig index 832ceae063a..20ea3326c62 100644 --- a/boards/arm/nucleo-f091rc/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-f091rc" CONFIG_ARCH_BOARD_NUCLEO_F091RC=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f0l0g0" CONFIG_ARCH_CHIP_STM32F091RC=y CONFIG_ARCH_CHIP_STM32F0=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/nucleo-f091rc/include/board.h b/boards/arm/stm32f0l0g0/nucleo-f091rc/include/board.h similarity index 100% rename from boards/arm/nucleo-f091rc/include/board.h rename to boards/arm/stm32f0l0g0/nucleo-f091rc/include/board.h diff --git a/boards/arm/nucleo-f091rc/scripts/Make.defs b/boards/arm/stm32f0l0g0/nucleo-f091rc/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-f091rc/scripts/Make.defs rename to boards/arm/stm32f0l0g0/nucleo-f091rc/scripts/Make.defs index 4f63cb5973c..8a016978e95 100644 --- a/boards/arm/nucleo-f091rc/scripts/Make.defs +++ b/boards/arm/stm32f0l0g0/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-f091rc/scripts/flash.ld b/boards/arm/stm32f0l0g0/nucleo-f091rc/scripts/flash.ld similarity index 100% rename from boards/arm/nucleo-f091rc/scripts/flash.ld rename to boards/arm/stm32f0l0g0/nucleo-f091rc/scripts/flash.ld diff --git a/boards/arm/stm3240g-eval/src/.gitignore b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/.gitignore similarity index 100% rename from boards/arm/stm3240g-eval/src/.gitignore rename to boards/arm/stm32f0l0g0/nucleo-f091rc/src/.gitignore diff --git a/boards/arm/nucleo-f091rc/src/Makefile b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/Makefile similarity index 100% rename from boards/arm/nucleo-f091rc/src/Makefile rename to boards/arm/stm32f0l0g0/nucleo-f091rc/src/Makefile diff --git a/boards/arm/nucleo-f091rc/src/nucleo-f091rc.h b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/nucleo-f091rc.h similarity index 100% rename from boards/arm/nucleo-f091rc/src/nucleo-f091rc.h rename to boards/arm/stm32f0l0g0/nucleo-f091rc/src/nucleo-f091rc.h diff --git a/boards/arm/nucleo-f091rc/src/stm32_appinit.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_appinit.c similarity index 100% rename from boards/arm/nucleo-f091rc/src/stm32_appinit.c rename to boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_appinit.c diff --git a/boards/arm/nucleo-f091rc/src/stm32_autoleds.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-f091rc/src/stm32_autoleds.c rename to boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-f091rc/src/stm32_boot.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-f091rc/src/stm32_boot.c rename to boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_boot.c diff --git a/boards/arm/nucleo-f091rc/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_bringup.c similarity index 100% rename from boards/arm/nucleo-f091rc/src/stm32_bringup.c rename to boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_bringup.c diff --git a/boards/arm/nucleo-f091rc/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-f091rc/src/stm32_buttons.c rename to boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_buttons.c diff --git a/boards/arm/nucleo-f091rc/src/stm32_spi.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_spi.c similarity index 100% rename from boards/arm/nucleo-f091rc/src/stm32_spi.c rename to boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_spi.c diff --git a/boards/arm/nucleo-f091rc/src/stm32_sx127x.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_sx127x.c similarity index 100% rename from boards/arm/nucleo-f091rc/src/stm32_sx127x.c rename to boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_sx127x.c diff --git a/boards/arm/nucleo-f091rc/src/stm32_userleds.c b/boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-f091rc/src/stm32_userleds.c rename to boards/arm/stm32f0l0g0/nucleo-f091rc/src/stm32_userleds.c diff --git a/boards/arm/nucleo-g071rb/Kconfig b/boards/arm/stm32f0l0g0/nucleo-g071rb/Kconfig similarity index 100% rename from boards/arm/nucleo-g071rb/Kconfig rename to boards/arm/stm32f0l0g0/nucleo-g071rb/Kconfig diff --git a/boards/arm/nucleo-g071rb/README.txt b/boards/arm/stm32f0l0g0/nucleo-g071rb/README.txt similarity index 100% rename from boards/arm/nucleo-g071rb/README.txt rename to boards/arm/stm32f0l0g0/nucleo-g071rb/README.txt diff --git a/boards/arm/nucleo-g071rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig similarity index 98% rename from boards/arm/nucleo-g071rb/configs/nsh/defconfig rename to boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig index 377db0e6794..7b3b1ac0e6e 100644 --- a/boards/arm/nucleo-g071rb/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-g071rb" CONFIG_ARCH_BOARD_NUCLEO_G071RB=y +CONFIG_ARCH_CHIP="stm32f0l0g0" CONFIG_ARCH_CHIP_STM32G071RB=y CONFIG_ARCH_CHIP_STM32G0=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-g071rb/include/board.h b/boards/arm/stm32f0l0g0/nucleo-g071rb/include/board.h similarity index 100% rename from boards/arm/nucleo-g071rb/include/board.h rename to boards/arm/stm32f0l0g0/nucleo-g071rb/include/board.h diff --git a/boards/arm/nucleo-g071rb/scripts/Make.defs b/boards/arm/stm32f0l0g0/nucleo-g071rb/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-g071rb/scripts/Make.defs rename to boards/arm/stm32f0l0g0/nucleo-g071rb/scripts/Make.defs index 73b6779ab36..a893d70f99a 100644 --- a/boards/arm/nucleo-g071rb/scripts/Make.defs +++ b/boards/arm/stm32f0l0g0/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-g071rb/scripts/ld.script b/boards/arm/stm32f0l0g0/nucleo-g071rb/scripts/ld.script similarity index 100% rename from boards/arm/nucleo-g071rb/scripts/ld.script rename to boards/arm/stm32f0l0g0/nucleo-g071rb/scripts/ld.script diff --git a/boards/arm/nucleo-g071rb/src/Makefile b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/Makefile similarity index 100% rename from boards/arm/nucleo-g071rb/src/Makefile rename to boards/arm/stm32f0l0g0/nucleo-g071rb/src/Makefile diff --git a/boards/arm/nucleo-g071rb/src/nucleo-g071rb.h b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/nucleo-g071rb.h similarity index 100% rename from boards/arm/nucleo-g071rb/src/nucleo-g071rb.h rename to boards/arm/stm32f0l0g0/nucleo-g071rb/src/nucleo-g071rb.h diff --git a/boards/arm/nucleo-g071rb/src/stm32_appinit.c b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_appinit.c similarity index 100% rename from boards/arm/nucleo-g071rb/src/stm32_appinit.c rename to boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_appinit.c diff --git a/boards/arm/nucleo-g071rb/src/stm32_autoleds.c b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-g071rb/src/stm32_autoleds.c rename to boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-g071rb/src/stm32_boot.c b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-g071rb/src/stm32_boot.c rename to boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_boot.c diff --git a/boards/arm/nucleo-g071rb/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_bringup.c similarity index 100% rename from boards/arm/nucleo-g071rb/src/stm32_bringup.c rename to boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_bringup.c diff --git a/boards/arm/nucleo-g071rb/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-g071rb/src/stm32_buttons.c rename to boards/arm/stm32f0l0g0/nucleo-g071rb/src/stm32_buttons.c diff --git a/boards/arm/nucleo-l073rz/Kconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/Kconfig similarity index 100% rename from boards/arm/nucleo-l073rz/Kconfig rename to boards/arm/stm32f0l0g0/nucleo-l073rz/Kconfig diff --git a/boards/arm/nucleo-l073rz/README.txt b/boards/arm/stm32f0l0g0/nucleo-l073rz/README.txt similarity index 100% rename from boards/arm/nucleo-l073rz/README.txt rename to boards/arm/stm32f0l0g0/nucleo-l073rz/README.txt diff --git a/boards/arm/nucleo-l073rz/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig similarity index 98% rename from boards/arm/nucleo-l073rz/configs/nsh/defconfig rename to boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig index eb2a814fe4c..cec3f610eb9 100644 --- a/boards/arm/nucleo-l073rz/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-l073rz" CONFIG_ARCH_BOARD_NUCLEO_L073RZ=y +CONFIG_ARCH_CHIP="stm32f0l0g0" CONFIG_ARCH_CHIP_STM32L073RZ=y CONFIG_ARCH_CHIP_STM32L0=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-l073rz/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig similarity index 98% rename from boards/arm/nucleo-l073rz/configs/sx127x/defconfig rename to boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig index 2ce7ee17382..515f0c030ce 100644 --- a/boards/arm/nucleo-l073rz/configs/sx127x/defconfig +++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-l073rz" CONFIG_ARCH_BOARD_NUCLEO_L073RZ=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f0l0g0" CONFIG_ARCH_CHIP_STM32L073RZ=y CONFIG_ARCH_CHIP_STM32L0=y CONFIG_ARCH_IRQBUTTONS=y diff --git a/boards/arm/nucleo-l073rz/include/board.h b/boards/arm/stm32f0l0g0/nucleo-l073rz/include/board.h similarity index 100% rename from boards/arm/nucleo-l073rz/include/board.h rename to boards/arm/stm32f0l0g0/nucleo-l073rz/include/board.h diff --git a/boards/arm/nucleo-l073rz/scripts/Make.defs b/boards/arm/stm32f0l0g0/nucleo-l073rz/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-l073rz/scripts/Make.defs rename to boards/arm/stm32f0l0g0/nucleo-l073rz/scripts/Make.defs index 461848af0c6..2f6f14002ff 100644 --- a/boards/arm/nucleo-l073rz/scripts/Make.defs +++ b/boards/arm/stm32f0l0g0/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-l073rz/scripts/ld.script b/boards/arm/stm32f0l0g0/nucleo-l073rz/scripts/ld.script similarity index 100% rename from boards/arm/nucleo-l073rz/scripts/ld.script rename to boards/arm/stm32f0l0g0/nucleo-l073rz/scripts/ld.script diff --git a/boards/arm/nucleo-l073rz/src/Makefile b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/Makefile similarity index 100% rename from boards/arm/nucleo-l073rz/src/Makefile rename to boards/arm/stm32f0l0g0/nucleo-l073rz/src/Makefile diff --git a/boards/arm/nucleo-l073rz/src/nucleo-l073rz.h b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/nucleo-l073rz.h similarity index 100% rename from boards/arm/nucleo-l073rz/src/nucleo-l073rz.h rename to boards/arm/stm32f0l0g0/nucleo-l073rz/src/nucleo-l073rz.h diff --git a/boards/arm/nucleo-l073rz/src/stm32_appinit.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_appinit.c similarity index 100% rename from boards/arm/nucleo-l073rz/src/stm32_appinit.c rename to boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_appinit.c diff --git a/boards/arm/nucleo-l073rz/src/stm32_autoleds.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-l073rz/src/stm32_autoleds.c rename to boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-l073rz/src/stm32_boot.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-l073rz/src/stm32_boot.c rename to boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_boot.c diff --git a/boards/arm/nucleo-l073rz/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_bringup.c similarity index 100% rename from boards/arm/nucleo-l073rz/src/stm32_bringup.c rename to boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_bringup.c diff --git a/boards/arm/nucleo-l073rz/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-l073rz/src/stm32_buttons.c rename to boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_buttons.c diff --git a/boards/arm/nucleo-l073rz/src/stm32_mfrc522.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_mfrc522.c similarity index 100% rename from boards/arm/nucleo-l073rz/src/stm32_mfrc522.c rename to boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_mfrc522.c diff --git a/boards/arm/nucleo-l073rz/src/stm32_nrf24l01.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_nrf24l01.c similarity index 100% rename from boards/arm/nucleo-l073rz/src/stm32_nrf24l01.c rename to boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_nrf24l01.c diff --git a/boards/arm/nucleo-l073rz/src/stm32_spi.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_spi.c similarity index 100% rename from boards/arm/nucleo-l073rz/src/stm32_spi.c rename to boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_spi.c diff --git a/boards/arm/nucleo-l073rz/src/stm32_sx127x.c b/boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_sx127x.c similarity index 100% rename from boards/arm/nucleo-l073rz/src/stm32_sx127x.c rename to boards/arm/stm32f0l0g0/nucleo-l073rz/src/stm32_sx127x.c diff --git a/boards/arm/stm32f051-discovery/Kconfig b/boards/arm/stm32f0l0g0/stm32f051-discovery/Kconfig similarity index 100% rename from boards/arm/stm32f051-discovery/Kconfig rename to boards/arm/stm32f0l0g0/stm32f051-discovery/Kconfig diff --git a/boards/arm/stm32f051-discovery/README.txt b/boards/arm/stm32f0l0g0/stm32f051-discovery/README.txt similarity index 100% rename from boards/arm/stm32f051-discovery/README.txt rename to boards/arm/stm32f0l0g0/stm32f051-discovery/README.txt diff --git a/boards/arm/stm32f051-discovery/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm32f051-discovery/configs/nsh/defconfig rename to boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig index 4ee63b9a0be..3093337ef77 100644 --- a/boards/arm/stm32f051-discovery/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f051-discovery" CONFIG_ARCH_BOARD_STM32F051_DISCOVERY=y +CONFIG_ARCH_CHIP="stm32f0l0g0" CONFIG_ARCH_CHIP_STM32F051R8=y CONFIG_ARCH_CHIP_STM32F0=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f051-discovery/include/board.h b/boards/arm/stm32f0l0g0/stm32f051-discovery/include/board.h similarity index 100% rename from boards/arm/stm32f051-discovery/include/board.h rename to boards/arm/stm32f0l0g0/stm32f051-discovery/include/board.h diff --git a/boards/arm/stm32f051-discovery/scripts/Make.defs b/boards/arm/stm32f0l0g0/stm32f051-discovery/scripts/Make.defs similarity index 96% rename from boards/arm/stm32f051-discovery/scripts/Make.defs rename to boards/arm/stm32f0l0g0/stm32f051-discovery/scripts/Make.defs index 412592cb89b..a87d706a040 100644 --- a/boards/arm/stm32f051-discovery/scripts/Make.defs +++ b/boards/arm/stm32f0l0g0/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32f051-discovery/scripts/flash.ld b/boards/arm/stm32f0l0g0/stm32f051-discovery/scripts/flash.ld similarity index 100% rename from boards/arm/stm32f051-discovery/scripts/flash.ld rename to boards/arm/stm32f0l0g0/stm32f051-discovery/scripts/flash.ld diff --git a/boards/arm/stm32f051-discovery/scripts/gnu-elf.ld b/boards/arm/stm32f0l0g0/stm32f051-discovery/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/stm32f051-discovery/scripts/gnu-elf.ld rename to boards/arm/stm32f0l0g0/stm32f051-discovery/scripts/gnu-elf.ld diff --git a/boards/arm/stm32_tiny/src/.gitignore b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/.gitignore similarity index 100% rename from boards/arm/stm32_tiny/src/.gitignore rename to boards/arm/stm32f0l0g0/stm32f051-discovery/src/.gitignore diff --git a/boards/arm/stm32f051-discovery/src/Makefile b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/Makefile similarity index 100% rename from boards/arm/stm32f051-discovery/src/Makefile rename to boards/arm/stm32f0l0g0/stm32f051-discovery/src/Makefile diff --git a/boards/arm/stm32f051-discovery/src/stm32_appinit.c b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_appinit.c similarity index 100% rename from boards/arm/stm32f051-discovery/src/stm32_appinit.c rename to boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_appinit.c diff --git a/boards/arm/stm32f051-discovery/src/stm32_autoleds.c b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_autoleds.c similarity index 100% rename from boards/arm/stm32f051-discovery/src/stm32_autoleds.c rename to boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_autoleds.c diff --git a/boards/arm/stm32f051-discovery/src/stm32_boot.c b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32f051-discovery/src/stm32_boot.c rename to boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_boot.c diff --git a/boards/arm/stm32f051-discovery/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_bringup.c similarity index 100% rename from boards/arm/stm32f051-discovery/src/stm32_bringup.c rename to boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_bringup.c diff --git a/boards/arm/stm32f051-discovery/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm32f051-discovery/src/stm32_buttons.c rename to boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_buttons.c diff --git a/boards/arm/stm32f051-discovery/src/stm32_userleds.c b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_userleds.c similarity index 100% rename from boards/arm/stm32f051-discovery/src/stm32_userleds.c rename to boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32_userleds.c diff --git a/boards/arm/stm32f051-discovery/src/stm32f051-discovery.h b/boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32f051-discovery.h similarity index 100% rename from boards/arm/stm32f051-discovery/src/stm32f051-discovery.h rename to boards/arm/stm32f0l0g0/stm32f051-discovery/src/stm32f051-discovery.h diff --git a/boards/arm/stm32f072-discovery/Kconfig b/boards/arm/stm32f0l0g0/stm32f072-discovery/Kconfig similarity index 100% rename from boards/arm/stm32f072-discovery/Kconfig rename to boards/arm/stm32f0l0g0/stm32f072-discovery/Kconfig diff --git a/boards/arm/stm32f072-discovery/README.txt b/boards/arm/stm32f0l0g0/stm32f072-discovery/README.txt similarity index 100% rename from boards/arm/stm32f072-discovery/README.txt rename to boards/arm/stm32f0l0g0/stm32f072-discovery/README.txt diff --git a/boards/arm/stm32f072-discovery/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm32f072-discovery/configs/nsh/defconfig rename to boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig index 3ea96369405..a83da402a24 100644 --- a/boards/arm/stm32f072-discovery/configs/nsh/defconfig +++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f072-discovery" CONFIG_ARCH_BOARD_STM32F072_DISCOVERY=y +CONFIG_ARCH_CHIP="stm32f0l0g0" CONFIG_ARCH_CHIP_STM32F072RB=y CONFIG_ARCH_CHIP_STM32F0=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f072-discovery/include/board.h b/boards/arm/stm32f0l0g0/stm32f072-discovery/include/board.h similarity index 100% rename from boards/arm/stm32f072-discovery/include/board.h rename to boards/arm/stm32f0l0g0/stm32f072-discovery/include/board.h diff --git a/boards/arm/stm32f072-discovery/scripts/Make.defs b/boards/arm/stm32f0l0g0/stm32f072-discovery/scripts/Make.defs similarity index 96% rename from boards/arm/stm32f072-discovery/scripts/Make.defs rename to boards/arm/stm32f0l0g0/stm32f072-discovery/scripts/Make.defs index ac4fd4b361f..ea3f6d8bbd4 100644 --- a/boards/arm/stm32f072-discovery/scripts/Make.defs +++ b/boards/arm/stm32f0l0g0/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32f072-discovery/scripts/flash.ld b/boards/arm/stm32f0l0g0/stm32f072-discovery/scripts/flash.ld similarity index 100% rename from boards/arm/stm32f072-discovery/scripts/flash.ld rename to boards/arm/stm32f0l0g0/stm32f072-discovery/scripts/flash.ld diff --git a/boards/arm/stm32f072-discovery/scripts/gnu-elf.ld b/boards/arm/stm32f0l0g0/stm32f072-discovery/scripts/gnu-elf.ld similarity index 100% rename from boards/arm/stm32f072-discovery/scripts/gnu-elf.ld rename to boards/arm/stm32f0l0g0/stm32f072-discovery/scripts/gnu-elf.ld diff --git a/boards/arm/stm32f051-discovery/src/.gitignore b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/.gitignore similarity index 100% rename from boards/arm/stm32f051-discovery/src/.gitignore rename to boards/arm/stm32f0l0g0/stm32f072-discovery/src/.gitignore diff --git a/boards/arm/stm32f072-discovery/src/Makefile b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/Makefile similarity index 100% rename from boards/arm/stm32f072-discovery/src/Makefile rename to boards/arm/stm32f0l0g0/stm32f072-discovery/src/Makefile diff --git a/boards/arm/stm32f072-discovery/src/stm32_appinit.c b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_appinit.c similarity index 100% rename from boards/arm/stm32f072-discovery/src/stm32_appinit.c rename to boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_appinit.c diff --git a/boards/arm/stm32f072-discovery/src/stm32_autoleds.c b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_autoleds.c similarity index 100% rename from boards/arm/stm32f072-discovery/src/stm32_autoleds.c rename to boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_autoleds.c diff --git a/boards/arm/stm32f072-discovery/src/stm32_boot.c b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32f072-discovery/src/stm32_boot.c rename to boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_boot.c diff --git a/boards/arm/stm32f072-discovery/src/stm32_bringup.c b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_bringup.c similarity index 100% rename from boards/arm/stm32f072-discovery/src/stm32_bringup.c rename to boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_bringup.c diff --git a/boards/arm/stm32f072-discovery/src/stm32_buttons.c b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm32f072-discovery/src/stm32_buttons.c rename to boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_buttons.c diff --git a/boards/arm/stm32f072-discovery/src/stm32_userleds.c b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_userleds.c similarity index 100% rename from boards/arm/stm32f072-discovery/src/stm32_userleds.c rename to boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32_userleds.c diff --git a/boards/arm/stm32f072-discovery/src/stm32f072-discovery.h b/boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32f072-discovery.h similarity index 100% rename from boards/arm/stm32f072-discovery/src/stm32f072-discovery.h rename to boards/arm/stm32f0l0g0/stm32f072-discovery/src/stm32f072-discovery.h diff --git a/boards/arm/nucleo-144/Kconfig b/boards/arm/stm32f7/nucleo-144/Kconfig similarity index 100% rename from boards/arm/nucleo-144/Kconfig rename to boards/arm/stm32f7/nucleo-144/Kconfig diff --git a/boards/arm/nucleo-144/README.txt b/boards/arm/stm32f7/nucleo-144/README.txt similarity index 100% rename from boards/arm/nucleo-144/README.txt rename to boards/arm/stm32f7/nucleo-144/README.txt diff --git a/boards/arm/nucleo-144/configs/f722-nsh/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/Make.defs similarity index 96% rename from boards/arm/nucleo-144/configs/f722-nsh/Make.defs rename to boards/arm/stm32f7/nucleo-144/configs/f722-nsh/Make.defs index 3a2e7161fa1..3f983a32473 100644 --- a/boards/arm/nucleo-144/configs/f722-nsh/Make.defs +++ b/boards/arm/stm32f7/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-144/configs/f722-nsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig similarity index 98% rename from boards/arm/nucleo-144/configs/f722-nsh/defconfig rename to boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig index d9030035a7b..28d49869267 100644 --- a/boards/arm/nucleo-144/configs/f722-nsh/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-144" CONFIG_ARCH_BOARD_NUCLEO_144=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f7" CONFIG_ARCH_CHIP_STM32F722ZE=y CONFIG_ARCH_CHIP_STM32F7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-144/configs/f746-evalos/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/Make.defs similarity index 96% rename from boards/arm/nucleo-144/configs/f746-evalos/Make.defs rename to boards/arm/stm32f7/nucleo-144/configs/f746-evalos/Make.defs index f6d0518c5b3..447af4746a7 100644 --- a/boards/arm/nucleo-144/configs/f746-evalos/Make.defs +++ b/boards/arm/stm32f7/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-144/configs/f746-evalos/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig similarity index 98% rename from boards/arm/nucleo-144/configs/f746-evalos/defconfig rename to boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig index 9522f317875..09f71c144be 100644 --- a/boards/arm/nucleo-144/configs/f746-evalos/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-144" CONFIG_ARCH_BOARD_NUCLEO_144=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f7" CONFIG_ARCH_CHIP_STM32F746ZG=y CONFIG_ARCH_CHIP_STM32F7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-144/configs/f746-nsh/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/Make.defs similarity index 96% rename from boards/arm/nucleo-144/configs/f746-nsh/Make.defs rename to boards/arm/stm32f7/nucleo-144/configs/f746-nsh/Make.defs index 24e5cc13cf2..e48134958d4 100644 --- a/boards/arm/nucleo-144/configs/f746-nsh/Make.defs +++ b/boards/arm/stm32f7/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-144/configs/f746-nsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig similarity index 98% rename from boards/arm/nucleo-144/configs/f746-nsh/defconfig rename to boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig index e5d06439a0f..b06d7758423 100644 --- a/boards/arm/nucleo-144/configs/f746-nsh/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-144" CONFIG_ARCH_BOARD_NUCLEO_144=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f7" CONFIG_ARCH_CHIP_STM32F746ZG=y CONFIG_ARCH_CHIP_STM32F7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-144/configs/f767-evalos/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/Make.defs similarity index 96% rename from boards/arm/nucleo-144/configs/f767-evalos/Make.defs rename to boards/arm/stm32f7/nucleo-144/configs/f767-evalos/Make.defs index f8617c1ebb3..1571ad34e6f 100644 --- a/boards/arm/nucleo-144/configs/f767-evalos/Make.defs +++ b/boards/arm/stm32f7/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-144/configs/f767-evalos/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig similarity index 98% rename from boards/arm/nucleo-144/configs/f767-evalos/defconfig rename to boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig index fd7a2e15e0c..5a218664d1e 100644 --- a/boards/arm/nucleo-144/configs/f767-evalos/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-144" CONFIG_ARCH_BOARD_NUCLEO_144=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f7" CONFIG_ARCH_CHIP_STM32F767ZI=y CONFIG_ARCH_CHIP_STM32F7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-144/configs/f767-netnsh/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/Make.defs similarity index 96% rename from boards/arm/nucleo-144/configs/f767-netnsh/Make.defs rename to boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/Make.defs index c70e8b7fe1c..a8372a62e61 100644 --- a/boards/arm/nucleo-144/configs/f767-netnsh/Make.defs +++ b/boards/arm/stm32f7/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-144/configs/f767-netnsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig similarity index 98% rename from boards/arm/nucleo-144/configs/f767-netnsh/defconfig rename to boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig index 72f51d849d9..c7bb5dfccca 100644 --- a/boards/arm/nucleo-144/configs/f767-netnsh/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-144" CONFIG_ARCH_BOARD_NUCLEO_144=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f7" CONFIG_ARCH_CHIP_STM32F767ZI=y CONFIG_ARCH_CHIP_STM32F7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-144/configs/f767-nsh/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/Make.defs similarity index 96% rename from boards/arm/nucleo-144/configs/f767-nsh/Make.defs rename to boards/arm/stm32f7/nucleo-144/configs/f767-nsh/Make.defs index 3c4ecc62f53..fffed89336c 100644 --- a/boards/arm/nucleo-144/configs/f767-nsh/Make.defs +++ b/boards/arm/stm32f7/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-144/configs/f767-nsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig similarity index 98% rename from boards/arm/nucleo-144/configs/f767-nsh/defconfig rename to boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig index 6aa5f5875a3..0fff25fe841 100644 --- a/boards/arm/nucleo-144/configs/f767-nsh/defconfig +++ b/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-144" CONFIG_ARCH_BOARD_NUCLEO_144=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f7" CONFIG_ARCH_CHIP_STM32F767ZI=y CONFIG_ARCH_CHIP_STM32F7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-144/include/board.h b/boards/arm/stm32f7/nucleo-144/include/board.h similarity index 100% rename from boards/arm/nucleo-144/include/board.h rename to boards/arm/stm32f7/nucleo-144/include/board.h diff --git a/boards/arm/nucleo-144/scripts/f722-flash.ld b/boards/arm/stm32f7/nucleo-144/scripts/f722-flash.ld similarity index 100% rename from boards/arm/nucleo-144/scripts/f722-flash.ld rename to boards/arm/stm32f7/nucleo-144/scripts/f722-flash.ld diff --git a/boards/arm/nucleo-144/scripts/f746-flash.ld b/boards/arm/stm32f7/nucleo-144/scripts/f746-flash.ld similarity index 100% rename from boards/arm/nucleo-144/scripts/f746-flash.ld rename to boards/arm/stm32f7/nucleo-144/scripts/f746-flash.ld diff --git a/boards/arm/nucleo-144/scripts/f767-flash.ld b/boards/arm/stm32f7/nucleo-144/scripts/f767-flash.ld similarity index 100% rename from boards/arm/nucleo-144/scripts/f767-flash.ld rename to boards/arm/stm32f7/nucleo-144/scripts/f767-flash.ld diff --git a/boards/arm/nucleo-144/scripts/kernel-space.ld b/boards/arm/stm32f7/nucleo-144/scripts/kernel-space.ld similarity index 100% rename from boards/arm/nucleo-144/scripts/kernel-space.ld rename to boards/arm/stm32f7/nucleo-144/scripts/kernel-space.ld diff --git a/boards/arm/nucleo-144/scripts/memory.ld b/boards/arm/stm32f7/nucleo-144/scripts/memory.ld similarity index 100% rename from boards/arm/nucleo-144/scripts/memory.ld rename to boards/arm/stm32f7/nucleo-144/scripts/memory.ld diff --git a/boards/arm/nucleo-144/scripts/user-space.ld b/boards/arm/stm32f7/nucleo-144/scripts/user-space.ld similarity index 100% rename from boards/arm/nucleo-144/scripts/user-space.ld rename to boards/arm/stm32f7/nucleo-144/scripts/user-space.ld diff --git a/boards/arm/stm32f072-discovery/src/.gitignore b/boards/arm/stm32f7/nucleo-144/src/.gitignore similarity index 100% rename from boards/arm/stm32f072-discovery/src/.gitignore rename to boards/arm/stm32f7/nucleo-144/src/.gitignore diff --git a/boards/arm/nucleo-144/src/Makefile b/boards/arm/stm32f7/nucleo-144/src/Makefile similarity index 100% rename from boards/arm/nucleo-144/src/Makefile rename to boards/arm/stm32f7/nucleo-144/src/Makefile diff --git a/boards/arm/nucleo-144/src/nucleo-144.h b/boards/arm/stm32f7/nucleo-144/src/nucleo-144.h similarity index 100% rename from boards/arm/nucleo-144/src/nucleo-144.h rename to boards/arm/stm32f7/nucleo-144/src/nucleo-144.h diff --git a/boards/arm/nucleo-144/src/stm32_adc.c b/boards/arm/stm32f7/nucleo-144/src/stm32_adc.c similarity index 100% rename from boards/arm/nucleo-144/src/stm32_adc.c rename to boards/arm/stm32f7/nucleo-144/src/stm32_adc.c diff --git a/boards/arm/nucleo-144/src/stm32_appinitialize.c b/boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c similarity index 100% rename from boards/arm/nucleo-144/src/stm32_appinitialize.c rename to boards/arm/stm32f7/nucleo-144/src/stm32_appinitialize.c diff --git a/boards/arm/nucleo-144/src/stm32_autoleds.c b/boards/arm/stm32f7/nucleo-144/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-144/src/stm32_autoleds.c rename to boards/arm/stm32f7/nucleo-144/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-144/src/stm32_bbsram.c b/boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c similarity index 100% rename from boards/arm/nucleo-144/src/stm32_bbsram.c rename to boards/arm/stm32f7/nucleo-144/src/stm32_bbsram.c diff --git a/boards/arm/nucleo-144/src/stm32_boot.c b/boards/arm/stm32f7/nucleo-144/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-144/src/stm32_boot.c rename to boards/arm/stm32f7/nucleo-144/src/stm32_boot.c diff --git a/boards/arm/nucleo-144/src/stm32_buttons.c b/boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-144/src/stm32_buttons.c rename to boards/arm/stm32f7/nucleo-144/src/stm32_buttons.c diff --git a/boards/arm/nucleo-144/src/stm32_dma_alloc.c b/boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c similarity index 100% rename from boards/arm/nucleo-144/src/stm32_dma_alloc.c rename to boards/arm/stm32f7/nucleo-144/src/stm32_dma_alloc.c diff --git a/boards/arm/nucleo-144/src/stm32_gpio.c b/boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c similarity index 100% rename from boards/arm/nucleo-144/src/stm32_gpio.c rename to boards/arm/stm32f7/nucleo-144/src/stm32_gpio.c diff --git a/boards/arm/nucleo-144/src/stm32_pwm.c b/boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c similarity index 100% rename from boards/arm/nucleo-144/src/stm32_pwm.c rename to boards/arm/stm32f7/nucleo-144/src/stm32_pwm.c diff --git a/boards/arm/nucleo-144/src/stm32_reset.c b/boards/arm/stm32f7/nucleo-144/src/stm32_reset.c similarity index 100% rename from boards/arm/nucleo-144/src/stm32_reset.c rename to boards/arm/stm32f7/nucleo-144/src/stm32_reset.c diff --git a/boards/arm/nucleo-144/src/stm32_romfs.h b/boards/arm/stm32f7/nucleo-144/src/stm32_romfs.h similarity index 100% rename from boards/arm/nucleo-144/src/stm32_romfs.h rename to boards/arm/stm32f7/nucleo-144/src/stm32_romfs.h diff --git a/boards/arm/nucleo-144/src/stm32_romfs_initialize.c b/boards/arm/stm32f7/nucleo-144/src/stm32_romfs_initialize.c similarity index 100% rename from boards/arm/nucleo-144/src/stm32_romfs_initialize.c rename to boards/arm/stm32f7/nucleo-144/src/stm32_romfs_initialize.c diff --git a/boards/arm/nucleo-144/src/stm32_sdio.c b/boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c similarity index 100% rename from boards/arm/nucleo-144/src/stm32_sdio.c rename to boards/arm/stm32f7/nucleo-144/src/stm32_sdio.c diff --git a/boards/arm/nucleo-144/src/stm32_spi.c b/boards/arm/stm32f7/nucleo-144/src/stm32_spi.c similarity index 100% rename from boards/arm/nucleo-144/src/stm32_spi.c rename to boards/arm/stm32f7/nucleo-144/src/stm32_spi.c diff --git a/boards/arm/nucleo-144/src/stm32_usb.c b/boards/arm/stm32f7/nucleo-144/src/stm32_usb.c similarity index 100% rename from boards/arm/nucleo-144/src/stm32_usb.c rename to boards/arm/stm32f7/nucleo-144/src/stm32_usb.c diff --git a/boards/arm/nucleo-144/src/stm32_userleds.c b/boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-144/src/stm32_userleds.c rename to boards/arm/stm32f7/nucleo-144/src/stm32_userleds.c diff --git a/boards/arm/stm32f746-ws/Kconfig b/boards/arm/stm32f7/stm32f746-ws/Kconfig similarity index 100% rename from boards/arm/stm32f746-ws/Kconfig rename to boards/arm/stm32f7/stm32f746-ws/Kconfig diff --git a/boards/arm/stm32f746-ws/configs/nsh/defconfig b/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig similarity index 99% rename from boards/arm/stm32f746-ws/configs/nsh/defconfig rename to boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig index 69d60e31087..f8d655d8a4f 100644 --- a/boards/arm/stm32f746-ws/configs/nsh/defconfig +++ b/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig @@ -15,6 +15,7 @@ CONFIG_ANALOG=y CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f746-ws" CONFIG_ARCH_BOARD_STM32F746_WS=y +CONFIG_ARCH_CHIP="stm32f7" CONFIG_ARCH_CHIP_STM32F746IG=y CONFIG_ARCH_CHIP_STM32F7=y CONFIG_ARCH_INTERRUPTSTACK=2600 diff --git a/boards/arm/stm32f746-ws/include/board.h b/boards/arm/stm32f7/stm32f746-ws/include/board.h similarity index 100% rename from boards/arm/stm32f746-ws/include/board.h rename to boards/arm/stm32f7/stm32f746-ws/include/board.h diff --git a/boards/arm/stm32f746-ws/scripts/Make.defs b/boards/arm/stm32f7/stm32f746-ws/scripts/Make.defs similarity index 96% rename from boards/arm/stm32f746-ws/scripts/Make.defs rename to boards/arm/stm32f7/stm32f746-ws/scripts/Make.defs index e6191a80544..61b08eef915 100644 --- a/boards/arm/stm32f746-ws/scripts/Make.defs +++ b/boards/arm/stm32f7/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32f746-ws/scripts/flash.ld b/boards/arm/stm32f7/stm32f746-ws/scripts/flash.ld similarity index 100% rename from boards/arm/stm32f746-ws/scripts/flash.ld rename to boards/arm/stm32f7/stm32f746-ws/scripts/flash.ld diff --git a/boards/arm/stm32f746-ws/scripts/kernel-space.ld b/boards/arm/stm32f7/stm32f746-ws/scripts/kernel-space.ld similarity index 100% rename from boards/arm/stm32f746-ws/scripts/kernel-space.ld rename to boards/arm/stm32f7/stm32f746-ws/scripts/kernel-space.ld diff --git a/boards/arm/stm32f746-ws/scripts/memory.ld b/boards/arm/stm32f7/stm32f746-ws/scripts/memory.ld similarity index 100% rename from boards/arm/stm32f746-ws/scripts/memory.ld rename to boards/arm/stm32f7/stm32f746-ws/scripts/memory.ld diff --git a/boards/arm/stm32f746-ws/scripts/user-space.ld b/boards/arm/stm32f7/stm32f746-ws/scripts/user-space.ld similarity index 100% rename from boards/arm/stm32f746-ws/scripts/user-space.ld rename to boards/arm/stm32f7/stm32f746-ws/scripts/user-space.ld diff --git a/boards/arm/stm32f103-minimum/src/.gitignore b/boards/arm/stm32f7/stm32f746-ws/src/.gitignore similarity index 100% rename from boards/arm/stm32f103-minimum/src/.gitignore rename to boards/arm/stm32f7/stm32f746-ws/src/.gitignore diff --git a/boards/arm/stm32f746-ws/src/Makefile b/boards/arm/stm32f7/stm32f746-ws/src/Makefile similarity index 100% rename from boards/arm/stm32f746-ws/src/Makefile rename to boards/arm/stm32f7/stm32f746-ws/src/Makefile diff --git a/boards/arm/stm32f746-ws/src/stm32_appinitialize.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_appinitialize.c similarity index 100% rename from boards/arm/stm32f746-ws/src/stm32_appinitialize.c rename to boards/arm/stm32f7/stm32f746-ws/src/stm32_appinitialize.c diff --git a/boards/arm/stm32f746-ws/src/stm32_boot.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32f746-ws/src/stm32_boot.c rename to boards/arm/stm32f7/stm32f746-ws/src/stm32_boot.c diff --git a/boards/arm/stm32f746-ws/src/stm32_dma_alloc.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_dma_alloc.c similarity index 100% rename from boards/arm/stm32f746-ws/src/stm32_dma_alloc.c rename to boards/arm/stm32f7/stm32f746-ws/src/stm32_dma_alloc.c diff --git a/boards/arm/stm32f746-ws/src/stm32_sdmmc.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_sdmmc.c similarity index 100% rename from boards/arm/stm32f746-ws/src/stm32_sdmmc.c rename to boards/arm/stm32f7/stm32f746-ws/src/stm32_sdmmc.c diff --git a/boards/arm/stm32f746-ws/src/stm32_spi.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_spi.c similarity index 100% rename from boards/arm/stm32f746-ws/src/stm32_spi.c rename to boards/arm/stm32f7/stm32f746-ws/src/stm32_spi.c diff --git a/boards/arm/stm32f746-ws/src/stm32_usb.c b/boards/arm/stm32f7/stm32f746-ws/src/stm32_usb.c similarity index 100% rename from boards/arm/stm32f746-ws/src/stm32_usb.c rename to boards/arm/stm32f7/stm32f746-ws/src/stm32_usb.c diff --git a/boards/arm/stm32f746-ws/src/stm32f746-ws.h b/boards/arm/stm32f7/stm32f746-ws/src/stm32f746-ws.h similarity index 100% rename from boards/arm/stm32f746-ws/src/stm32f746-ws.h rename to boards/arm/stm32f7/stm32f746-ws/src/stm32f746-ws.h diff --git a/boards/arm/stm32f746g-disco/Kconfig b/boards/arm/stm32f7/stm32f746g-disco/Kconfig similarity index 100% rename from boards/arm/stm32f746g-disco/Kconfig rename to boards/arm/stm32f7/stm32f746g-disco/Kconfig diff --git a/boards/arm/stm32f746g-disco/README.txt b/boards/arm/stm32f7/stm32f746g-disco/README.txt similarity index 100% rename from boards/arm/stm32f746g-disco/README.txt rename to boards/arm/stm32f7/stm32f746g-disco/README.txt diff --git a/boards/arm/stm32f746g-disco/configs/fb/README.txt b/boards/arm/stm32f7/stm32f746g-disco/configs/fb/README.txt similarity index 100% rename from boards/arm/stm32f746g-disco/configs/fb/README.txt rename to boards/arm/stm32f7/stm32f746g-disco/configs/fb/README.txt diff --git a/boards/arm/stm32f746g-disco/configs/fb/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig similarity index 98% rename from boards/arm/stm32f746g-disco/configs/fb/defconfig rename to boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig index ac05810325b..bea1a31a6fc 100644 --- a/boards/arm/stm32f746g-disco/configs/fb/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f746g-disco" CONFIG_ARCH_BOARD_STM32F746G_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f7" CONFIG_ARCH_CHIP_STM32F746NG=y CONFIG_ARCH_CHIP_STM32F7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f746g-disco/configs/lvgl/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig similarity index 98% rename from boards/arm/stm32f746g-disco/configs/lvgl/defconfig rename to boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig index 5f78e63d5eb..b535c015b14 100644 --- a/boards/arm/stm32f746g-disco/configs/lvgl/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/lvgl/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f746g-disco" CONFIG_ARCH_BOARD_STM32F746G_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f7" CONFIG_ARCH_CHIP_STM32F746NG=y CONFIG_ARCH_CHIP_STM32F7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f746g-disco/configs/netnsh/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig similarity index 98% rename from boards/arm/stm32f746g-disco/configs/netnsh/defconfig rename to boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig index 54e21b1dc26..81bee172a2f 100644 --- a/boards/arm/stm32f746g-disco/configs/netnsh/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f746g-disco" CONFIG_ARCH_BOARD_STM32F746G_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f7" CONFIG_ARCH_CHIP_STM32F746NG=y CONFIG_ARCH_CHIP_STM32F7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f746g-disco/configs/nsh/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm32f746g-disco/configs/nsh/defconfig rename to boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig index 3883df989b8..e268fd59d4a 100644 --- a/boards/arm/stm32f746g-disco/configs/nsh/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f746g-disco" CONFIG_ARCH_BOARD_STM32F746G_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f7" CONFIG_ARCH_CHIP_STM32F746NG=y CONFIG_ARCH_CHIP_STM32F7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f746g-disco/configs/nxdemo/README.txt b/boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/README.txt similarity index 100% rename from boards/arm/stm32f746g-disco/configs/nxdemo/README.txt rename to boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/README.txt diff --git a/boards/arm/stm32f746g-disco/configs/nxdemo/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/defconfig similarity index 98% rename from boards/arm/stm32f746g-disco/configs/nxdemo/defconfig rename to boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/defconfig index 57e7186abba..aa90eb486f7 100644 --- a/boards/arm/stm32f746g-disco/configs/nxdemo/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/nxdemo/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f746g-disco" CONFIG_ARCH_BOARD_STM32F746G_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f7" CONFIG_ARCH_CHIP_STM32F746NG=y CONFIG_ARCH_CHIP_STM32F7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f746g-disco/configs/nxterm/README.txt b/boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/README.txt similarity index 100% rename from boards/arm/stm32f746g-disco/configs/nxterm/README.txt rename to boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/README.txt diff --git a/boards/arm/stm32f746g-disco/configs/nxterm/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/defconfig similarity index 98% rename from boards/arm/stm32f746g-disco/configs/nxterm/defconfig rename to boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/defconfig index 7c7d6ab3633..878227f1e54 100644 --- a/boards/arm/stm32f746g-disco/configs/nxterm/defconfig +++ b/boards/arm/stm32f7/stm32f746g-disco/configs/nxterm/defconfig @@ -16,6 +16,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f746g-disco" CONFIG_ARCH_BOARD_STM32F746G_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f7" CONFIG_ARCH_CHIP_STM32F746NG=y CONFIG_ARCH_CHIP_STM32F7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f746g-disco/include/board.h b/boards/arm/stm32f7/stm32f746g-disco/include/board.h similarity index 100% rename from boards/arm/stm32f746g-disco/include/board.h rename to boards/arm/stm32f7/stm32f746g-disco/include/board.h diff --git a/boards/arm/stm32f4discovery/kernel/.gitignore b/boards/arm/stm32f7/stm32f746g-disco/kernel/.gitignore similarity index 100% rename from boards/arm/stm32f4discovery/kernel/.gitignore rename to boards/arm/stm32f7/stm32f746g-disco/kernel/.gitignore diff --git a/boards/arm/stm32f746g-disco/kernel/Makefile b/boards/arm/stm32f7/stm32f746g-disco/kernel/Makefile similarity index 90% rename from boards/arm/stm32f746g-disco/kernel/Makefile rename to boards/arm/stm32f7/stm32f746g-disco/kernel/Makefile index 9ca2809d0fe..7fd8d46eb4b 100644 --- a/boards/arm/stm32f746g-disco/kernel/Makefile +++ b/boards/arm/stm32f7/stm32f746g-disco/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/stm32f746g-disco/kernel/stm32_userspace.c b/boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c similarity index 100% rename from boards/arm/stm32f746g-disco/kernel/stm32_userspace.c rename to boards/arm/stm32f7/stm32f746g-disco/kernel/stm32_userspace.c diff --git a/boards/arm/stm32f746g-disco/scripts/Make.defs b/boards/arm/stm32f7/stm32f746g-disco/scripts/Make.defs similarity index 96% rename from boards/arm/stm32f746g-disco/scripts/Make.defs rename to boards/arm/stm32f7/stm32f746g-disco/scripts/Make.defs index 32f0742dbd7..9fcf38aadb3 100644 --- a/boards/arm/stm32f746g-disco/scripts/Make.defs +++ b/boards/arm/stm32f7/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32f746g-disco/scripts/flash.ld b/boards/arm/stm32f7/stm32f746g-disco/scripts/flash.ld similarity index 100% rename from boards/arm/stm32f746g-disco/scripts/flash.ld rename to boards/arm/stm32f7/stm32f746g-disco/scripts/flash.ld diff --git a/boards/arm/stm32f746g-disco/scripts/kernel-space.ld b/boards/arm/stm32f7/stm32f746g-disco/scripts/kernel-space.ld similarity index 100% rename from boards/arm/stm32f746g-disco/scripts/kernel-space.ld rename to boards/arm/stm32f7/stm32f746g-disco/scripts/kernel-space.ld diff --git a/boards/arm/stm32f746g-disco/scripts/memory.ld b/boards/arm/stm32f7/stm32f746g-disco/scripts/memory.ld similarity index 100% rename from boards/arm/stm32f746g-disco/scripts/memory.ld rename to boards/arm/stm32f7/stm32f746g-disco/scripts/memory.ld diff --git a/boards/arm/stm32f746g-disco/scripts/user-space.ld b/boards/arm/stm32f7/stm32f746g-disco/scripts/user-space.ld similarity index 100% rename from boards/arm/stm32f746g-disco/scripts/user-space.ld rename to boards/arm/stm32f7/stm32f746g-disco/scripts/user-space.ld diff --git a/boards/arm/stm32f3discovery/src/.gitignore b/boards/arm/stm32f7/stm32f746g-disco/src/.gitignore similarity index 100% rename from boards/arm/stm32f3discovery/src/.gitignore rename to boards/arm/stm32f7/stm32f746g-disco/src/.gitignore diff --git a/boards/arm/stm32f746g-disco/src/Makefile b/boards/arm/stm32f7/stm32f746g-disco/src/Makefile similarity index 100% rename from boards/arm/stm32f746g-disco/src/Makefile rename to boards/arm/stm32f7/stm32f746g-disco/src/Makefile diff --git a/boards/arm/stm32f746g-disco/src/stm32_adc.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_adc.c similarity index 100% rename from boards/arm/stm32f746g-disco/src/stm32_adc.c rename to boards/arm/stm32f7/stm32f746g-disco/src/stm32_adc.c diff --git a/boards/arm/stm32f746g-disco/src/stm32_appinitialize.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_appinitialize.c similarity index 100% rename from boards/arm/stm32f746g-disco/src/stm32_appinitialize.c rename to boards/arm/stm32f7/stm32f746g-disco/src/stm32_appinitialize.c diff --git a/boards/arm/stm32f746g-disco/src/stm32_autoleds.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_autoleds.c similarity index 100% rename from boards/arm/stm32f746g-disco/src/stm32_autoleds.c rename to boards/arm/stm32f7/stm32f746g-disco/src/stm32_autoleds.c diff --git a/boards/arm/stm32f746g-disco/src/stm32_boot.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32f746g-disco/src/stm32_boot.c rename to boards/arm/stm32f7/stm32f746g-disco/src/stm32_boot.c diff --git a/boards/arm/stm32f746g-disco/src/stm32_bringup.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c similarity index 100% rename from boards/arm/stm32f746g-disco/src/stm32_bringup.c rename to boards/arm/stm32f7/stm32f746g-disco/src/stm32_bringup.c diff --git a/boards/arm/stm32f746g-disco/src/stm32_buttons.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm32f746g-disco/src/stm32_buttons.c rename to boards/arm/stm32f7/stm32f746g-disco/src/stm32_buttons.c diff --git a/boards/arm/stm32f746g-disco/src/stm32_extmem.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_extmem.c similarity index 100% rename from boards/arm/stm32f746g-disco/src/stm32_extmem.c rename to boards/arm/stm32f7/stm32f746g-disco/src/stm32_extmem.c diff --git a/boards/arm/stm32f746g-disco/src/stm32_lcd.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_lcd.c similarity index 100% rename from boards/arm/stm32f746g-disco/src/stm32_lcd.c rename to boards/arm/stm32f7/stm32f746g-disco/src/stm32_lcd.c diff --git a/boards/arm/stm32f746g-disco/src/stm32_ostest.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_ostest.c similarity index 100% rename from boards/arm/stm32f746g-disco/src/stm32_ostest.c rename to boards/arm/stm32f7/stm32f746g-disco/src/stm32_ostest.c diff --git a/boards/arm/stm32f746g-disco/src/stm32_spi.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_spi.c similarity index 100% rename from boards/arm/stm32f746g-disco/src/stm32_spi.c rename to boards/arm/stm32f7/stm32f746g-disco/src/stm32_spi.c diff --git a/boards/arm/stm32f746g-disco/src/stm32_sporadic.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_sporadic.c similarity index 100% rename from boards/arm/stm32f746g-disco/src/stm32_sporadic.c rename to boards/arm/stm32f7/stm32f746g-disco/src/stm32_sporadic.c diff --git a/boards/arm/stm32f746g-disco/src/stm32_touchscreen.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_touchscreen.c similarity index 100% rename from boards/arm/stm32f746g-disco/src/stm32_touchscreen.c rename to boards/arm/stm32f7/stm32f746g-disco/src/stm32_touchscreen.c diff --git a/boards/arm/stm32f746g-disco/src/stm32_userleds.c b/boards/arm/stm32f7/stm32f746g-disco/src/stm32_userleds.c similarity index 100% rename from boards/arm/stm32f746g-disco/src/stm32_userleds.c rename to boards/arm/stm32f7/stm32f746g-disco/src/stm32_userleds.c diff --git a/boards/arm/stm32f746g-disco/src/stm32f746g-disco.h b/boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h similarity index 100% rename from boards/arm/stm32f746g-disco/src/stm32f746g-disco.h rename to boards/arm/stm32f7/stm32f746g-disco/src/stm32f746g-disco.h diff --git a/boards/arm/stm32f769i-disco/Kconfig b/boards/arm/stm32f7/stm32f769i-disco/Kconfig similarity index 100% rename from boards/arm/stm32f769i-disco/Kconfig rename to boards/arm/stm32f7/stm32f769i-disco/Kconfig diff --git a/boards/arm/stm32f769i-disco/README.txt b/boards/arm/stm32f7/stm32f769i-disco/README.txt similarity index 100% rename from boards/arm/stm32f769i-disco/README.txt rename to boards/arm/stm32f7/stm32f769i-disco/README.txt diff --git a/boards/arm/stm32f769i-disco/configs/netnsh/defconfig b/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig similarity index 98% rename from boards/arm/stm32f769i-disco/configs/netnsh/defconfig rename to boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig index 342e4799d90..23b3e146b0d 100644 --- a/boards/arm/stm32f769i-disco/configs/netnsh/defconfig +++ b/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f769i-disco" CONFIG_ARCH_BOARD_STM32F769I_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f7" CONFIG_ARCH_CHIP_STM32F769NI=y CONFIG_ARCH_CHIP_STM32F7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f769i-disco/configs/nsh/defconfig b/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm32f769i-disco/configs/nsh/defconfig rename to boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig index b6257378e3d..6229b250733 100644 --- a/boards/arm/stm32f769i-disco/configs/nsh/defconfig +++ b/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32f769i-disco" CONFIG_ARCH_BOARD_STM32F769I_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32f7" CONFIG_ARCH_CHIP_STM32F769NI=y CONFIG_ARCH_CHIP_STM32F7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/stm32f769i-disco/include/board.h b/boards/arm/stm32f7/stm32f769i-disco/include/board.h similarity index 100% rename from boards/arm/stm32f769i-disco/include/board.h rename to boards/arm/stm32f7/stm32f769i-disco/include/board.h diff --git a/boards/arm/stm32f746g-disco/kernel/.gitignore b/boards/arm/stm32f7/stm32f769i-disco/kernel/.gitignore similarity index 100% rename from boards/arm/stm32f746g-disco/kernel/.gitignore rename to boards/arm/stm32f7/stm32f769i-disco/kernel/.gitignore diff --git a/boards/arm/stm32f769i-disco/kernel/Makefile b/boards/arm/stm32f7/stm32f769i-disco/kernel/Makefile similarity index 90% rename from boards/arm/stm32f769i-disco/kernel/Makefile rename to boards/arm/stm32f7/stm32f769i-disco/kernel/Makefile index 126dd8becc9..ae9b6192f30 100644 --- a/boards/arm/stm32f769i-disco/kernel/Makefile +++ b/boards/arm/stm32f7/stm32f769i-disco/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/stm32f769i-disco/kernel/stm32_userspace.c b/boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c similarity index 100% rename from boards/arm/stm32f769i-disco/kernel/stm32_userspace.c rename to boards/arm/stm32f7/stm32f769i-disco/kernel/stm32_userspace.c diff --git a/boards/arm/stm32f769i-disco/scripts/Make.defs b/boards/arm/stm32f7/stm32f769i-disco/scripts/Make.defs similarity index 96% rename from boards/arm/stm32f769i-disco/scripts/Make.defs rename to boards/arm/stm32f7/stm32f769i-disco/scripts/Make.defs index d4fda25da8b..9c8bed3a8f5 100644 --- a/boards/arm/stm32f769i-disco/scripts/Make.defs +++ b/boards/arm/stm32f7/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32f769i-disco/scripts/flash.ld b/boards/arm/stm32f7/stm32f769i-disco/scripts/flash.ld similarity index 100% rename from boards/arm/stm32f769i-disco/scripts/flash.ld rename to boards/arm/stm32f7/stm32f769i-disco/scripts/flash.ld diff --git a/boards/arm/stm32f769i-disco/scripts/kernel-space.ld b/boards/arm/stm32f7/stm32f769i-disco/scripts/kernel-space.ld similarity index 100% rename from boards/arm/stm32f769i-disco/scripts/kernel-space.ld rename to boards/arm/stm32f7/stm32f769i-disco/scripts/kernel-space.ld diff --git a/boards/arm/stm32f769i-disco/scripts/memory.ld b/boards/arm/stm32f7/stm32f769i-disco/scripts/memory.ld similarity index 100% rename from boards/arm/stm32f769i-disco/scripts/memory.ld rename to boards/arm/stm32f7/stm32f769i-disco/scripts/memory.ld diff --git a/boards/arm/stm32f769i-disco/scripts/user-space.ld b/boards/arm/stm32f7/stm32f769i-disco/scripts/user-space.ld similarity index 100% rename from boards/arm/stm32f769i-disco/scripts/user-space.ld rename to boards/arm/stm32f7/stm32f769i-disco/scripts/user-space.ld diff --git a/boards/arm/stm32f429i-disco/src/.gitignore b/boards/arm/stm32f7/stm32f769i-disco/src/.gitignore similarity index 100% rename from boards/arm/stm32f429i-disco/src/.gitignore rename to boards/arm/stm32f7/stm32f769i-disco/src/.gitignore diff --git a/boards/arm/stm32f769i-disco/src/Makefile b/boards/arm/stm32f7/stm32f769i-disco/src/Makefile similarity index 100% rename from boards/arm/stm32f769i-disco/src/Makefile rename to boards/arm/stm32f7/stm32f769i-disco/src/Makefile diff --git a/boards/arm/stm32f769i-disco/src/stm32_appinitialize.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_appinitialize.c similarity index 100% rename from boards/arm/stm32f769i-disco/src/stm32_appinitialize.c rename to boards/arm/stm32f7/stm32f769i-disco/src/stm32_appinitialize.c diff --git a/boards/arm/stm32f769i-disco/src/stm32_autoleds.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_autoleds.c similarity index 100% rename from boards/arm/stm32f769i-disco/src/stm32_autoleds.c rename to boards/arm/stm32f7/stm32f769i-disco/src/stm32_autoleds.c diff --git a/boards/arm/stm32f769i-disco/src/stm32_boot.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32f769i-disco/src/stm32_boot.c rename to boards/arm/stm32f7/stm32f769i-disco/src/stm32_boot.c diff --git a/boards/arm/stm32f769i-disco/src/stm32_bringup.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_bringup.c similarity index 100% rename from boards/arm/stm32f769i-disco/src/stm32_bringup.c rename to boards/arm/stm32f7/stm32f769i-disco/src/stm32_bringup.c diff --git a/boards/arm/stm32f769i-disco/src/stm32_buttons.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm32f769i-disco/src/stm32_buttons.c rename to boards/arm/stm32f7/stm32f769i-disco/src/stm32_buttons.c diff --git a/boards/arm/stm32f769i-disco/src/stm32_ostest.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_ostest.c similarity index 100% rename from boards/arm/stm32f769i-disco/src/stm32_ostest.c rename to boards/arm/stm32f7/stm32f769i-disco/src/stm32_ostest.c diff --git a/boards/arm/stm32f769i-disco/src/stm32_pwm.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_pwm.c similarity index 100% rename from boards/arm/stm32f769i-disco/src/stm32_pwm.c rename to boards/arm/stm32f7/stm32f769i-disco/src/stm32_pwm.c diff --git a/boards/arm/stm32f769i-disco/src/stm32_spi.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_spi.c similarity index 100% rename from boards/arm/stm32f769i-disco/src/stm32_spi.c rename to boards/arm/stm32f7/stm32f769i-disco/src/stm32_spi.c diff --git a/boards/arm/stm32f769i-disco/src/stm32_sporadic.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_sporadic.c similarity index 100% rename from boards/arm/stm32f769i-disco/src/stm32_sporadic.c rename to boards/arm/stm32f7/stm32f769i-disco/src/stm32_sporadic.c diff --git a/boards/arm/stm32f769i-disco/src/stm32_userleds.c b/boards/arm/stm32f7/stm32f769i-disco/src/stm32_userleds.c similarity index 100% rename from boards/arm/stm32f769i-disco/src/stm32_userleds.c rename to boards/arm/stm32f7/stm32f769i-disco/src/stm32_userleds.c diff --git a/boards/arm/stm32f769i-disco/src/stm32f769i-disco.h b/boards/arm/stm32f7/stm32f769i-disco/src/stm32f769i-disco.h similarity index 100% rename from boards/arm/stm32f769i-disco/src/stm32f769i-disco.h rename to boards/arm/stm32f7/stm32f769i-disco/src/stm32f769i-disco.h diff --git a/boards/arm/nucleo-h743zi/Kconfig b/boards/arm/stm32h7/nucleo-h743zi/Kconfig similarity index 100% rename from boards/arm/nucleo-h743zi/Kconfig rename to boards/arm/stm32h7/nucleo-h743zi/Kconfig diff --git a/boards/arm/nucleo-h743zi/README.txt b/boards/arm/stm32h7/nucleo-h743zi/README.txt similarity index 100% rename from boards/arm/nucleo-h743zi/README.txt rename to boards/arm/stm32h7/nucleo-h743zi/README.txt diff --git a/boards/arm/nucleo-h743zi/configs/nsh/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig similarity index 98% rename from boards/arm/nucleo-h743zi/configs/nsh/defconfig rename to boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig index 23f050f31d6..a605f8ce524 100644 --- a/boards/arm/nucleo-h743zi/configs/nsh/defconfig +++ b/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-h743zi" CONFIG_ARCH_BOARD_NUCLEO_H743ZI=y +CONFIG_ARCH_CHIP="stm32h7" CONFIG_ARCH_CHIP_STM32H743ZI=y CONFIG_ARCH_CHIP_STM32H7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-h743zi/configs/nxlines_oled/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig similarity index 98% rename from boards/arm/nucleo-h743zi/configs/nxlines_oled/defconfig rename to boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig index a763083dfc9..396051d17f1 100644 --- a/boards/arm/nucleo-h743zi/configs/nxlines_oled/defconfig +++ b/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-h743zi" CONFIG_ARCH_BOARD_NUCLEO_H743ZI=y +CONFIG_ARCH_CHIP="stm32h7" CONFIG_ARCH_CHIP_STM32H743ZI=y CONFIG_ARCH_CHIP_STM32H7=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/nucleo-h743zi/include/board.h b/boards/arm/stm32h7/nucleo-h743zi/include/board.h similarity index 100% rename from boards/arm/nucleo-h743zi/include/board.h rename to boards/arm/stm32h7/nucleo-h743zi/include/board.h diff --git a/boards/arm/stm32f769i-disco/kernel/.gitignore b/boards/arm/stm32h7/nucleo-h743zi/kernel/.gitignore similarity index 100% rename from boards/arm/stm32f769i-disco/kernel/.gitignore rename to boards/arm/stm32h7/nucleo-h743zi/kernel/.gitignore diff --git a/boards/arm/nucleo-h743zi/kernel/Makefile b/boards/arm/stm32h7/nucleo-h743zi/kernel/Makefile similarity index 90% rename from boards/arm/nucleo-h743zi/kernel/Makefile rename to boards/arm/stm32h7/nucleo-h743zi/kernel/Makefile index 39ad88e4bf2..ce623ea6967 100644 --- a/boards/arm/nucleo-h743zi/kernel/Makefile +++ b/boards/arm/stm32h7/nucleo-h743zi/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/nucleo-h743zi/kernel/stm32_userspace.c b/boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c similarity index 100% rename from boards/arm/nucleo-h743zi/kernel/stm32_userspace.c rename to boards/arm/stm32h7/nucleo-h743zi/kernel/stm32_userspace.c diff --git a/boards/arm/nucleo-h743zi/scripts/Make.defs b/boards/arm/stm32h7/nucleo-h743zi/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-h743zi/scripts/Make.defs rename to boards/arm/stm32h7/nucleo-h743zi/scripts/Make.defs index 708b08fb636..d2fac51d255 100644 --- a/boards/arm/nucleo-h743zi/scripts/Make.defs +++ b/boards/arm/stm32h7/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-h743zi/scripts/flash.ld b/boards/arm/stm32h7/nucleo-h743zi/scripts/flash.ld similarity index 100% rename from boards/arm/nucleo-h743zi/scripts/flash.ld rename to boards/arm/stm32h7/nucleo-h743zi/scripts/flash.ld diff --git a/boards/arm/nucleo-h743zi/scripts/kernel.space.ld b/boards/arm/stm32h7/nucleo-h743zi/scripts/kernel.space.ld similarity index 100% rename from boards/arm/nucleo-h743zi/scripts/kernel.space.ld rename to boards/arm/stm32h7/nucleo-h743zi/scripts/kernel.space.ld diff --git a/boards/arm/nucleo-h743zi/scripts/memory.ld b/boards/arm/stm32h7/nucleo-h743zi/scripts/memory.ld similarity index 100% rename from boards/arm/nucleo-h743zi/scripts/memory.ld rename to boards/arm/stm32h7/nucleo-h743zi/scripts/memory.ld diff --git a/boards/arm/nucleo-h743zi/scripts/user-space.ld b/boards/arm/stm32h7/nucleo-h743zi/scripts/user-space.ld similarity index 100% rename from boards/arm/nucleo-h743zi/scripts/user-space.ld rename to boards/arm/stm32h7/nucleo-h743zi/scripts/user-space.ld diff --git a/boards/arm/stm32f4discovery/src/.gitignore b/boards/arm/stm32h7/nucleo-h743zi/src/.gitignore similarity index 100% rename from boards/arm/stm32f4discovery/src/.gitignore rename to boards/arm/stm32h7/nucleo-h743zi/src/.gitignore diff --git a/boards/arm/nucleo-h743zi/src/Makefile b/boards/arm/stm32h7/nucleo-h743zi/src/Makefile similarity index 100% rename from boards/arm/nucleo-h743zi/src/Makefile rename to boards/arm/stm32h7/nucleo-h743zi/src/Makefile diff --git a/boards/arm/nucleo-h743zi/src/nucleo-h743zi.h b/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h similarity index 100% rename from boards/arm/nucleo-h743zi/src/nucleo-h743zi.h rename to boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h diff --git a/boards/arm/nucleo-h743zi/src/stm32_adc.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_adc.c similarity index 100% rename from boards/arm/nucleo-h743zi/src/stm32_adc.c rename to boards/arm/stm32h7/nucleo-h743zi/src/stm32_adc.c diff --git a/boards/arm/nucleo-h743zi/src/stm32_appinitialize.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_appinitialize.c similarity index 100% rename from boards/arm/nucleo-h743zi/src/stm32_appinitialize.c rename to boards/arm/stm32h7/nucleo-h743zi/src/stm32_appinitialize.c diff --git a/boards/arm/nucleo-h743zi/src/stm32_autoleds.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-h743zi/src/stm32_autoleds.c rename to boards/arm/stm32h7/nucleo-h743zi/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-h743zi/src/stm32_boot.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-h743zi/src/stm32_boot.c rename to boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c diff --git a/boards/arm/nucleo-h743zi/src/stm32_bringup.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_bringup.c similarity index 100% rename from boards/arm/nucleo-h743zi/src/stm32_bringup.c rename to boards/arm/stm32h7/nucleo-h743zi/src/stm32_bringup.c diff --git a/boards/arm/nucleo-h743zi/src/stm32_buttons.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-h743zi/src/stm32_buttons.c rename to boards/arm/stm32h7/nucleo-h743zi/src/stm32_buttons.c diff --git a/boards/arm/nucleo-h743zi/src/stm32_lsm303agr.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm303agr.c similarity index 100% rename from boards/arm/nucleo-h743zi/src/stm32_lsm303agr.c rename to boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm303agr.c diff --git a/boards/arm/nucleo-h743zi/src/stm32_lsm6dsl.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm6dsl.c similarity index 100% rename from boards/arm/nucleo-h743zi/src/stm32_lsm6dsl.c rename to boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm6dsl.c diff --git a/boards/arm/nucleo-h743zi/src/stm32_lsm9ds1.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm9ds1.c similarity index 100% rename from boards/arm/nucleo-h743zi/src/stm32_lsm9ds1.c rename to boards/arm/stm32h7/nucleo-h743zi/src/stm32_lsm9ds1.c diff --git a/boards/arm/nucleo-h743zi/src/stm32_nrf24l01.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_nrf24l01.c similarity index 100% rename from boards/arm/nucleo-h743zi/src/stm32_nrf24l01.c rename to boards/arm/stm32h7/nucleo-h743zi/src/stm32_nrf24l01.c diff --git a/boards/arm/nucleo-h743zi/src/stm32_pca9635.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_pca9635.c similarity index 100% rename from boards/arm/nucleo-h743zi/src/stm32_pca9635.c rename to boards/arm/stm32h7/nucleo-h743zi/src/stm32_pca9635.c diff --git a/boards/arm/nucleo-h743zi/src/stm32_spi.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_spi.c similarity index 100% rename from boards/arm/nucleo-h743zi/src/stm32_spi.c rename to boards/arm/stm32h7/nucleo-h743zi/src/stm32_spi.c diff --git a/boards/arm/nucleo-h743zi/src/stm32_ssd1306.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_ssd1306.c similarity index 100% rename from boards/arm/nucleo-h743zi/src/stm32_ssd1306.c rename to boards/arm/stm32h7/nucleo-h743zi/src/stm32_ssd1306.c diff --git a/boards/arm/nucleo-h743zi/src/stm32_usb.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c similarity index 100% rename from boards/arm/nucleo-h743zi/src/stm32_usb.c rename to boards/arm/stm32h7/nucleo-h743zi/src/stm32_usb.c diff --git a/boards/arm/nucleo-h743zi/src/stm32_userleds.c b/boards/arm/stm32h7/nucleo-h743zi/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-h743zi/src/stm32_userleds.c rename to boards/arm/stm32h7/nucleo-h743zi/src/stm32_userleds.c diff --git a/boards/arm/b-l475e-iot01a/Kconfig b/boards/arm/stm32l4/b-l475e-iot01a/Kconfig similarity index 100% rename from boards/arm/b-l475e-iot01a/Kconfig rename to boards/arm/stm32l4/b-l475e-iot01a/Kconfig diff --git a/boards/arm/b-l475e-iot01a/README.txt b/boards/arm/stm32l4/b-l475e-iot01a/README.txt similarity index 100% rename from boards/arm/b-l475e-iot01a/README.txt rename to boards/arm/stm32l4/b-l475e-iot01a/README.txt diff --git a/boards/arm/b-l475e-iot01a/configs/nsh/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig similarity index 98% rename from boards/arm/b-l475e-iot01a/configs/nsh/defconfig rename to boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig index db7a2f3c26d..e9fb11c1ea1 100644 --- a/boards/arm/b-l475e-iot01a/configs/nsh/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="b-l475e-iot01a" CONFIG_ARCH_BOARD_B_L475E_IOT01A=y +CONFIG_ARCH_CHIP="stm32l4" CONFIG_ARCH_CHIP_STM32L475VG=y CONFIG_ARCH_CHIP_STM32L4=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/b-l475e-iot01a/configs/spirit-6lowpan/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig similarity index 99% rename from boards/arm/b-l475e-iot01a/configs/spirit-6lowpan/defconfig rename to boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig index 0055fb0c9e8..4cdec3fcadd 100644 --- a/boards/arm/b-l475e-iot01a/configs/spirit-6lowpan/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="b-l475e-iot01a" CONFIG_ARCH_BOARD_B_L475E_IOT01A=y +CONFIG_ARCH_CHIP="stm32l4" CONFIG_ARCH_CHIP_STM32L475VG=y CONFIG_ARCH_CHIP_STM32L4=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/b-l475e-iot01a/configs/spirit-starhub/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig similarity index 98% rename from boards/arm/b-l475e-iot01a/configs/spirit-starhub/defconfig rename to boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig index 9e0519ce4c1..9c14e5aa53d 100644 --- a/boards/arm/b-l475e-iot01a/configs/spirit-starhub/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="b-l475e-iot01a" CONFIG_ARCH_BOARD_B_L475E_IOT01A=y +CONFIG_ARCH_CHIP="stm32l4" CONFIG_ARCH_CHIP_STM32L475VG=y CONFIG_ARCH_CHIP_STM32L4=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/b-l475e-iot01a/configs/spirit-starpoint/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig similarity index 99% rename from boards/arm/b-l475e-iot01a/configs/spirit-starpoint/defconfig rename to boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig index 1aee5bca757..386aa41ab17 100644 --- a/boards/arm/b-l475e-iot01a/configs/spirit-starpoint/defconfig +++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="b-l475e-iot01a" CONFIG_ARCH_BOARD_B_L475E_IOT01A=y +CONFIG_ARCH_CHIP="stm32l4" CONFIG_ARCH_CHIP_STM32L475VG=y CONFIG_ARCH_CHIP_STM32L4=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/arm/b-l475e-iot01a/include/b-l475e-iot01a_clock.h b/boards/arm/stm32l4/b-l475e-iot01a/include/b-l475e-iot01a_clock.h similarity index 100% rename from boards/arm/b-l475e-iot01a/include/b-l475e-iot01a_clock.h rename to boards/arm/stm32l4/b-l475e-iot01a/include/b-l475e-iot01a_clock.h diff --git a/boards/arm/b-l475e-iot01a/include/board.h b/boards/arm/stm32l4/b-l475e-iot01a/include/board.h similarity index 100% rename from boards/arm/b-l475e-iot01a/include/board.h rename to boards/arm/stm32l4/b-l475e-iot01a/include/board.h diff --git a/boards/arm/b-l475e-iot01a/scripts/Make.defs b/boards/arm/stm32l4/b-l475e-iot01a/scripts/Make.defs similarity index 96% rename from boards/arm/b-l475e-iot01a/scripts/Make.defs rename to boards/arm/stm32l4/b-l475e-iot01a/scripts/Make.defs index ffeab0a3c49..433f30d36e0 100644 --- a/boards/arm/b-l475e-iot01a/scripts/Make.defs +++ b/boards/arm/stm32l4/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/b-l475e-iot01a/scripts/flash.ld b/boards/arm/stm32l4/b-l475e-iot01a/scripts/flash.ld similarity index 100% rename from boards/arm/b-l475e-iot01a/scripts/flash.ld rename to boards/arm/stm32l4/b-l475e-iot01a/scripts/flash.ld diff --git a/boards/arm/stm32f746-ws/src/.gitignore b/boards/arm/stm32l4/b-l475e-iot01a/src/.gitignore similarity index 100% rename from boards/arm/stm32f746-ws/src/.gitignore rename to boards/arm/stm32l4/b-l475e-iot01a/src/.gitignore diff --git a/boards/arm/b-l475e-iot01a/src/Makefile b/boards/arm/stm32l4/b-l475e-iot01a/src/Makefile similarity index 100% rename from boards/arm/b-l475e-iot01a/src/Makefile rename to boards/arm/stm32l4/b-l475e-iot01a/src/Makefile diff --git a/boards/arm/b-l475e-iot01a/src/b-l475e-iot01a.h b/boards/arm/stm32l4/b-l475e-iot01a/src/b-l475e-iot01a.h similarity index 100% rename from boards/arm/b-l475e-iot01a/src/b-l475e-iot01a.h rename to boards/arm/stm32l4/b-l475e-iot01a/src/b-l475e-iot01a.h diff --git a/boards/arm/b-l475e-iot01a/src/stm32_appinit.c b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_appinit.c similarity index 100% rename from boards/arm/b-l475e-iot01a/src/stm32_appinit.c rename to boards/arm/stm32l4/b-l475e-iot01a/src/stm32_appinit.c diff --git a/boards/arm/b-l475e-iot01a/src/stm32_autoleds.c b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_autoleds.c similarity index 100% rename from boards/arm/b-l475e-iot01a/src/stm32_autoleds.c rename to boards/arm/stm32l4/b-l475e-iot01a/src/stm32_autoleds.c diff --git a/boards/arm/b-l475e-iot01a/src/stm32_boot.c b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_boot.c similarity index 100% rename from boards/arm/b-l475e-iot01a/src/stm32_boot.c rename to boards/arm/stm32l4/b-l475e-iot01a/src/stm32_boot.c diff --git a/boards/arm/b-l475e-iot01a/src/stm32_bringup.c b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_bringup.c similarity index 100% rename from boards/arm/b-l475e-iot01a/src/stm32_bringup.c rename to boards/arm/stm32l4/b-l475e-iot01a/src/stm32_bringup.c diff --git a/boards/arm/b-l475e-iot01a/src/stm32_spi.c b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_spi.c similarity index 100% rename from boards/arm/b-l475e-iot01a/src/stm32_spi.c rename to boards/arm/stm32l4/b-l475e-iot01a/src/stm32_spi.c diff --git a/boards/arm/b-l475e-iot01a/src/stm32_spirit.c b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_spirit.c similarity index 100% rename from boards/arm/b-l475e-iot01a/src/stm32_spirit.c rename to boards/arm/stm32l4/b-l475e-iot01a/src/stm32_spirit.c diff --git a/boards/arm/b-l475e-iot01a/src/stm32_timer.c b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_timer.c similarity index 100% rename from boards/arm/b-l475e-iot01a/src/stm32_timer.c rename to boards/arm/stm32l4/b-l475e-iot01a/src/stm32_timer.c diff --git a/boards/arm/b-l475e-iot01a/src/stm32_userleds.c b/boards/arm/stm32l4/b-l475e-iot01a/src/stm32_userleds.c similarity index 100% rename from boards/arm/b-l475e-iot01a/src/stm32_userleds.c rename to boards/arm/stm32l4/b-l475e-iot01a/src/stm32_userleds.c diff --git a/boards/arm/nucleo-l432kc/Kconfig b/boards/arm/stm32l4/nucleo-l432kc/Kconfig similarity index 100% rename from boards/arm/nucleo-l432kc/Kconfig rename to boards/arm/stm32l4/nucleo-l432kc/Kconfig diff --git a/boards/arm/nucleo-l432kc/README.txt b/boards/arm/stm32l4/nucleo-l432kc/README.txt similarity index 100% rename from boards/arm/nucleo-l432kc/README.txt rename to boards/arm/stm32l4/nucleo-l432kc/README.txt diff --git a/boards/arm/nucleo-l432kc/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig similarity index 98% rename from boards/arm/nucleo-l432kc/configs/nsh/defconfig rename to boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig index 98eb2acbc92..bc5d467b330 100644 --- a/boards/arm/nucleo-l432kc/configs/nsh/defconfig +++ b/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-l432kc" CONFIG_ARCH_BOARD_NUCLEO_L432KC=y +CONFIG_ARCH_CHIP="stm32l4" CONFIG_ARCH_CHIP_STM32L432KC=y CONFIG_ARCH_CHIP_STM32L4=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/nucleo-l432kc/include/board.h b/boards/arm/stm32l4/nucleo-l432kc/include/board.h similarity index 100% rename from boards/arm/nucleo-l432kc/include/board.h rename to boards/arm/stm32l4/nucleo-l432kc/include/board.h diff --git a/boards/arm/nucleo-l432kc/include/nucleo-l432kc.h b/boards/arm/stm32l4/nucleo-l432kc/include/nucleo-l432kc.h similarity index 100% rename from boards/arm/nucleo-l432kc/include/nucleo-l432kc.h rename to boards/arm/stm32l4/nucleo-l432kc/include/nucleo-l432kc.h diff --git a/boards/arm/nucleo-l432kc/scripts/Make.defs b/boards/arm/stm32l4/nucleo-l432kc/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-l432kc/scripts/Make.defs rename to boards/arm/stm32l4/nucleo-l432kc/scripts/Make.defs index 301481810d8..26b56ee5241 100644 --- a/boards/arm/nucleo-l432kc/scripts/Make.defs +++ b/boards/arm/stm32l4/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-l432kc/scripts/l432kc.ld b/boards/arm/stm32l4/nucleo-l432kc/scripts/l432kc.ld similarity index 100% rename from boards/arm/nucleo-l432kc/scripts/l432kc.ld rename to boards/arm/stm32l4/nucleo-l432kc/scripts/l432kc.ld diff --git a/boards/arm/nucleo-l432kc/src/Makefile b/boards/arm/stm32l4/nucleo-l432kc/src/Makefile similarity index 100% rename from boards/arm/nucleo-l432kc/src/Makefile rename to boards/arm/stm32l4/nucleo-l432kc/src/Makefile diff --git a/boards/arm/nucleo-l432kc/src/nucleo-l432kc.h b/boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h similarity index 100% rename from boards/arm/nucleo-l432kc/src/nucleo-l432kc.h rename to boards/arm/stm32l4/nucleo-l432kc/src/nucleo-l432kc.h diff --git a/boards/arm/nucleo-l432kc/src/stm32_adc.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_adc.c similarity index 100% rename from boards/arm/nucleo-l432kc/src/stm32_adc.c rename to boards/arm/stm32l4/nucleo-l432kc/src/stm32_adc.c diff --git a/boards/arm/nucleo-l432kc/src/stm32_appinit.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c similarity index 100% rename from boards/arm/nucleo-l432kc/src/stm32_appinit.c rename to boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c diff --git a/boards/arm/nucleo-l432kc/src/stm32_at45db.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_at45db.c similarity index 100% rename from boards/arm/nucleo-l432kc/src/stm32_at45db.c rename to boards/arm/stm32l4/nucleo-l432kc/src/stm32_at45db.c diff --git a/boards/arm/nucleo-l432kc/src/stm32_autoleds.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-l432kc/src/stm32_autoleds.c rename to boards/arm/stm32l4/nucleo-l432kc/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-l432kc/src/stm32_boot.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-l432kc/src/stm32_boot.c rename to boards/arm/stm32l4/nucleo-l432kc/src/stm32_boot.c diff --git a/boards/arm/nucleo-l432kc/src/stm32_buttons.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-l432kc/src/stm32_buttons.c rename to boards/arm/stm32l4/nucleo-l432kc/src/stm32_buttons.c diff --git a/boards/arm/nucleo-l432kc/src/stm32_dac7571.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac7571.c similarity index 100% rename from boards/arm/nucleo-l432kc/src/stm32_dac7571.c rename to boards/arm/stm32l4/nucleo-l432kc/src/stm32_dac7571.c diff --git a/boards/arm/nucleo-l432kc/src/stm32_gpio.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_gpio.c similarity index 100% rename from boards/arm/nucleo-l432kc/src/stm32_gpio.c rename to boards/arm/stm32l4/nucleo-l432kc/src/stm32_gpio.c diff --git a/boards/arm/nucleo-l432kc/src/stm32_ina219.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_ina219.c similarity index 100% rename from boards/arm/nucleo-l432kc/src/stm32_ina219.c rename to boards/arm/stm32l4/nucleo-l432kc/src/stm32_ina219.c diff --git a/boards/arm/nucleo-l432kc/src/stm32_ina226.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_ina226.c similarity index 100% rename from boards/arm/nucleo-l432kc/src/stm32_ina226.c rename to boards/arm/stm32l4/nucleo-l432kc/src/stm32_ina226.c diff --git a/boards/arm/nucleo-l432kc/src/stm32_pwm.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_pwm.c similarity index 100% rename from boards/arm/nucleo-l432kc/src/stm32_pwm.c rename to boards/arm/stm32l4/nucleo-l432kc/src/stm32_pwm.c diff --git a/boards/arm/nucleo-l432kc/src/stm32_qencoder.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_qencoder.c similarity index 100% rename from boards/arm/nucleo-l432kc/src/stm32_qencoder.c rename to boards/arm/stm32l4/nucleo-l432kc/src/stm32_qencoder.c diff --git a/boards/arm/nucleo-l432kc/src/stm32_spi.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spi.c similarity index 100% rename from boards/arm/nucleo-l432kc/src/stm32_spi.c rename to boards/arm/stm32l4/nucleo-l432kc/src/stm32_spi.c diff --git a/boards/arm/nucleo-l432kc/src/stm32_timer.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_timer.c similarity index 100% rename from boards/arm/nucleo-l432kc/src/stm32_timer.c rename to boards/arm/stm32l4/nucleo-l432kc/src/stm32_timer.c diff --git a/boards/arm/nucleo-l432kc/src/stm32_userleds.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-l432kc/src/stm32_userleds.c rename to boards/arm/stm32l4/nucleo-l432kc/src/stm32_userleds.c diff --git a/boards/arm/nucleo-l432kc/src/stm32_zerocross.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_zerocross.c similarity index 100% rename from boards/arm/nucleo-l432kc/src/stm32_zerocross.c rename to boards/arm/stm32l4/nucleo-l432kc/src/stm32_zerocross.c diff --git a/boards/arm/nucleo-l452re/Kconfig b/boards/arm/stm32l4/nucleo-l452re/Kconfig similarity index 100% rename from boards/arm/nucleo-l452re/Kconfig rename to boards/arm/stm32l4/nucleo-l452re/Kconfig diff --git a/boards/arm/nucleo-l452re/README.txt b/boards/arm/stm32l4/nucleo-l452re/README.txt similarity index 100% rename from boards/arm/nucleo-l452re/README.txt rename to boards/arm/stm32l4/nucleo-l452re/README.txt diff --git a/boards/arm/nucleo-l452re/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig similarity index 98% rename from boards/arm/nucleo-l452re/configs/nsh/defconfig rename to boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig index f2a3146af44..84b52253887 100644 --- a/boards/arm/nucleo-l452re/configs/nsh/defconfig +++ b/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-l452re" CONFIG_ARCH_BOARD_NUCLEO_L452RE=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32l4" CONFIG_ARCH_CHIP_STM32L452RE=y CONFIG_ARCH_CHIP_STM32L4=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/nucleo-l452re/include/board.h b/boards/arm/stm32l4/nucleo-l452re/include/board.h similarity index 100% rename from boards/arm/nucleo-l452re/include/board.h rename to boards/arm/stm32l4/nucleo-l452re/include/board.h diff --git a/boards/arm/nucleo-l452re/include/nucleo-l452re.h b/boards/arm/stm32l4/nucleo-l452re/include/nucleo-l452re.h similarity index 100% rename from boards/arm/nucleo-l452re/include/nucleo-l452re.h rename to boards/arm/stm32l4/nucleo-l452re/include/nucleo-l452re.h diff --git a/boards/arm/nucleo-l452re/scripts/Make.defs b/boards/arm/stm32l4/nucleo-l452re/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-l452re/scripts/Make.defs rename to boards/arm/stm32l4/nucleo-l452re/scripts/Make.defs index a47e382d6a0..e3407963717 100644 --- a/boards/arm/nucleo-l452re/scripts/Make.defs +++ b/boards/arm/stm32l4/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-l452re/scripts/l452re-flash.ld b/boards/arm/stm32l4/nucleo-l452re/scripts/l452re-flash.ld similarity index 100% rename from boards/arm/nucleo-l452re/scripts/l452re-flash.ld rename to boards/arm/stm32l4/nucleo-l452re/scripts/l452re-flash.ld diff --git a/boards/arm/stm32f746g-disco/src/.gitignore b/boards/arm/stm32l4/nucleo-l452re/src/.gitignore similarity index 100% rename from boards/arm/stm32f746g-disco/src/.gitignore rename to boards/arm/stm32l4/nucleo-l452re/src/.gitignore diff --git a/boards/arm/nucleo-l452re/src/Makefile b/boards/arm/stm32l4/nucleo-l452re/src/Makefile similarity index 100% rename from boards/arm/nucleo-l452re/src/Makefile rename to boards/arm/stm32l4/nucleo-l452re/src/Makefile diff --git a/boards/arm/nucleo-l452re/src/nucleo-l452re.h b/boards/arm/stm32l4/nucleo-l452re/src/nucleo-l452re.h similarity index 100% rename from boards/arm/nucleo-l452re/src/nucleo-l452re.h rename to boards/arm/stm32l4/nucleo-l452re/src/nucleo-l452re.h diff --git a/boards/arm/nucleo-l452re/src/stm32_adc.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_adc.c similarity index 100% rename from boards/arm/nucleo-l452re/src/stm32_adc.c rename to boards/arm/stm32l4/nucleo-l452re/src/stm32_adc.c diff --git a/boards/arm/nucleo-l452re/src/stm32_appinit.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_appinit.c similarity index 100% rename from boards/arm/nucleo-l452re/src/stm32_appinit.c rename to boards/arm/stm32l4/nucleo-l452re/src/stm32_appinit.c diff --git a/boards/arm/nucleo-l452re/src/stm32_autoleds.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-l452re/src/stm32_autoleds.c rename to boards/arm/stm32l4/nucleo-l452re/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-l452re/src/stm32_boot.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-l452re/src/stm32_boot.c rename to boards/arm/stm32l4/nucleo-l452re/src/stm32_boot.c diff --git a/boards/arm/nucleo-l452re/src/stm32_bringup.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_bringup.c similarity index 100% rename from boards/arm/nucleo-l452re/src/stm32_bringup.c rename to boards/arm/stm32l4/nucleo-l452re/src/stm32_bringup.c diff --git a/boards/arm/nucleo-l452re/src/stm32_buttons.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-l452re/src/stm32_buttons.c rename to boards/arm/stm32l4/nucleo-l452re/src/stm32_buttons.c diff --git a/boards/arm/nucleo-l452re/src/stm32_dac.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_dac.c similarity index 100% rename from boards/arm/nucleo-l452re/src/stm32_dac.c rename to boards/arm/stm32l4/nucleo-l452re/src/stm32_dac.c diff --git a/boards/arm/nucleo-l452re/src/stm32_spi.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_spi.c similarity index 100% rename from boards/arm/nucleo-l452re/src/stm32_spi.c rename to boards/arm/stm32l4/nucleo-l452re/src/stm32_spi.c diff --git a/boards/arm/nucleo-l452re/src/stm32_userleds.c b/boards/arm/stm32l4/nucleo-l452re/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-l452re/src/stm32_userleds.c rename to boards/arm/stm32l4/nucleo-l452re/src/stm32_userleds.c diff --git a/boards/arm/nucleo-l476rg/Kconfig b/boards/arm/stm32l4/nucleo-l476rg/Kconfig similarity index 100% rename from boards/arm/nucleo-l476rg/Kconfig rename to boards/arm/stm32l4/nucleo-l476rg/Kconfig diff --git a/boards/arm/nucleo-l476rg/README.txt b/boards/arm/stm32l4/nucleo-l476rg/README.txt similarity index 100% rename from boards/arm/nucleo-l476rg/README.txt rename to boards/arm/stm32l4/nucleo-l476rg/README.txt diff --git a/boards/arm/nucleo-l476rg/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig similarity index 98% rename from boards/arm/nucleo-l476rg/configs/nsh/defconfig rename to boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig index eca703604b2..7679951656c 100644 --- a/boards/arm/nucleo-l476rg/configs/nsh/defconfig +++ b/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-l476rg" CONFIG_ARCH_BOARD_NUCLEO_L476RG=y +CONFIG_ARCH_CHIP="stm32l4" CONFIG_ARCH_CHIP_STM32L476RG=y CONFIG_ARCH_CHIP_STM32L4=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/nucleo-l476rg/configs/nxdemo/defconfig b/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig similarity index 98% rename from boards/arm/nucleo-l476rg/configs/nxdemo/defconfig rename to boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig index f0fdf6ce4b7..c6b10b46367 100644 --- a/boards/arm/nucleo-l476rg/configs/nxdemo/defconfig +++ b/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig @@ -15,6 +15,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-l476rg" CONFIG_ARCH_BOARD_NUCLEO_L476RG=y +CONFIG_ARCH_CHIP="stm32l4" CONFIG_ARCH_CHIP_STM32L476RG=y CONFIG_ARCH_CHIP_STM32L4=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/nucleo-l476rg/include/board.h b/boards/arm/stm32l4/nucleo-l476rg/include/board.h similarity index 100% rename from boards/arm/nucleo-l476rg/include/board.h rename to boards/arm/stm32l4/nucleo-l476rg/include/board.h diff --git a/boards/arm/nucleo-l476rg/include/nucleo-l476rg.h b/boards/arm/stm32l4/nucleo-l476rg/include/nucleo-l476rg.h similarity index 100% rename from boards/arm/nucleo-l476rg/include/nucleo-l476rg.h rename to boards/arm/stm32l4/nucleo-l476rg/include/nucleo-l476rg.h diff --git a/boards/arm/nucleo-l476rg/scripts/Make.defs b/boards/arm/stm32l4/nucleo-l476rg/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-l476rg/scripts/Make.defs rename to boards/arm/stm32l4/nucleo-l476rg/scripts/Make.defs index 08069187e5c..049d5f64980 100644 --- a/boards/arm/nucleo-l476rg/scripts/Make.defs +++ b/boards/arm/stm32l4/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-l476rg/scripts/l476rg.ld b/boards/arm/stm32l4/nucleo-l476rg/scripts/l476rg.ld similarity index 100% rename from boards/arm/nucleo-l476rg/scripts/l476rg.ld rename to boards/arm/stm32l4/nucleo-l476rg/scripts/l476rg.ld diff --git a/boards/arm/nucleo-l476rg/src/Makefile b/boards/arm/stm32l4/nucleo-l476rg/src/Makefile similarity index 100% rename from boards/arm/nucleo-l476rg/src/Makefile rename to boards/arm/stm32l4/nucleo-l476rg/src/Makefile diff --git a/boards/arm/nucleo-l476rg/src/nucleo-l476rg.h b/boards/arm/stm32l4/nucleo-l476rg/src/nucleo-l476rg.h similarity index 100% rename from boards/arm/nucleo-l476rg/src/nucleo-l476rg.h rename to boards/arm/stm32l4/nucleo-l476rg/src/nucleo-l476rg.h diff --git a/boards/arm/nucleo-l476rg/src/stm32_adc.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_adc.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_adc.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_adc.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_ajoystick.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_ajoystick.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_ajoystick.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_ajoystick.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_appinit.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_appinit.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_appinit.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_appinit.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_as726x.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_as726x.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_as726x.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_as726x.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_autoleds.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_autoleds.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_bmp180.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_bmp180.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_bmp180.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_bmp180.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_boot.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_boot.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_boot.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_buttons.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_buttons.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_buttons.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_can.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_can.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_can.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_can.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_cc1101.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_cc1101.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_cc1101.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_cc1101.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_gpio.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_gpio.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_gpio.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_gpio.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_lsm303agr.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_lsm303agr.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_lsm303agr.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_lsm303agr.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_lsm6dsl.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_lsm6dsl.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_lsm6dsl.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_lsm6dsl.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_pcd8544.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_pcd8544.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_pcd8544.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_pcd8544.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_pwm.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_pwm.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_pwm.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_pwm.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_qencoder.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_qencoder.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_qencoder.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_qencoder.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_spi.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spi.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_spi.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_spi.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_spimmcsd.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_spimmcsd.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_spimmcsd.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_spimmcsd.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_timer.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_timer.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_timer.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_timer.c diff --git a/boards/arm/nucleo-l476rg/src/stm32_userleds.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-l476rg/src/stm32_userleds.c rename to boards/arm/stm32l4/nucleo-l476rg/src/stm32_userleds.c diff --git a/boards/arm/nucleo-l496zg/Kconfig b/boards/arm/stm32l4/nucleo-l496zg/Kconfig similarity index 100% rename from boards/arm/nucleo-l496zg/Kconfig rename to boards/arm/stm32l4/nucleo-l496zg/Kconfig diff --git a/boards/arm/nucleo-l496zg/README.txt b/boards/arm/stm32l4/nucleo-l496zg/README.txt similarity index 100% rename from boards/arm/nucleo-l496zg/README.txt rename to boards/arm/stm32l4/nucleo-l496zg/README.txt diff --git a/boards/arm/nucleo-l496zg/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig similarity index 98% rename from boards/arm/nucleo-l496zg/configs/nsh/defconfig rename to boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig index af593f83a19..8414de28aea 100644 --- a/boards/arm/nucleo-l496zg/configs/nsh/defconfig +++ b/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="nucleo-l496zg" CONFIG_ARCH_BOARD_NUCLEO_L496ZG=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32l4" CONFIG_ARCH_CHIP_STM32L496ZG=y CONFIG_ARCH_CHIP_STM32L4=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/nucleo-l496zg/include/board.h b/boards/arm/stm32l4/nucleo-l496zg/include/board.h similarity index 100% rename from boards/arm/nucleo-l496zg/include/board.h rename to boards/arm/stm32l4/nucleo-l496zg/include/board.h diff --git a/boards/arm/nucleo-l496zg/scripts/Make.defs b/boards/arm/stm32l4/nucleo-l496zg/scripts/Make.defs similarity index 96% rename from boards/arm/nucleo-l496zg/scripts/Make.defs rename to boards/arm/stm32l4/nucleo-l496zg/scripts/Make.defs index 39856cc227d..59ac0ab6244 100644 --- a/boards/arm/nucleo-l496zg/scripts/Make.defs +++ b/boards/arm/stm32l4/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/nucleo-l496zg/scripts/kernel-space.ld b/boards/arm/stm32l4/nucleo-l496zg/scripts/kernel-space.ld similarity index 100% rename from boards/arm/nucleo-l496zg/scripts/kernel-space.ld rename to boards/arm/stm32l4/nucleo-l496zg/scripts/kernel-space.ld diff --git a/boards/arm/nucleo-l496zg/scripts/l496zg-flash.ld b/boards/arm/stm32l4/nucleo-l496zg/scripts/l496zg-flash.ld similarity index 100% rename from boards/arm/nucleo-l496zg/scripts/l496zg-flash.ld rename to boards/arm/stm32l4/nucleo-l496zg/scripts/l496zg-flash.ld diff --git a/boards/arm/nucleo-l496zg/scripts/memory.ld b/boards/arm/stm32l4/nucleo-l496zg/scripts/memory.ld similarity index 100% rename from boards/arm/nucleo-l496zg/scripts/memory.ld rename to boards/arm/stm32l4/nucleo-l496zg/scripts/memory.ld diff --git a/boards/arm/nucleo-l496zg/scripts/user-space.ld b/boards/arm/stm32l4/nucleo-l496zg/scripts/user-space.ld similarity index 100% rename from boards/arm/nucleo-l496zg/scripts/user-space.ld rename to boards/arm/stm32l4/nucleo-l496zg/scripts/user-space.ld diff --git a/boards/arm/stm32f769i-disco/src/.gitignore b/boards/arm/stm32l4/nucleo-l496zg/src/.gitignore similarity index 100% rename from boards/arm/stm32f769i-disco/src/.gitignore rename to boards/arm/stm32l4/nucleo-l496zg/src/.gitignore diff --git a/boards/arm/nucleo-l496zg/src/Makefile b/boards/arm/stm32l4/nucleo-l496zg/src/Makefile similarity index 100% rename from boards/arm/nucleo-l496zg/src/Makefile rename to boards/arm/stm32l4/nucleo-l496zg/src/Makefile diff --git a/boards/arm/nucleo-l496zg/src/nucleo-144.h b/boards/arm/stm32l4/nucleo-l496zg/src/nucleo-144.h similarity index 100% rename from boards/arm/nucleo-l496zg/src/nucleo-144.h rename to boards/arm/stm32l4/nucleo-l496zg/src/nucleo-144.h diff --git a/boards/arm/nucleo-l496zg/src/stm32_adc.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_adc.c similarity index 100% rename from boards/arm/nucleo-l496zg/src/stm32_adc.c rename to boards/arm/stm32l4/nucleo-l496zg/src/stm32_adc.c diff --git a/boards/arm/nucleo-l496zg/src/stm32_appinitialize.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_appinitialize.c similarity index 100% rename from boards/arm/nucleo-l496zg/src/stm32_appinitialize.c rename to boards/arm/stm32l4/nucleo-l496zg/src/stm32_appinitialize.c diff --git a/boards/arm/nucleo-l496zg/src/stm32_autoleds.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_autoleds.c similarity index 100% rename from boards/arm/nucleo-l496zg/src/stm32_autoleds.c rename to boards/arm/stm32l4/nucleo-l496zg/src/stm32_autoleds.c diff --git a/boards/arm/nucleo-l496zg/src/stm32_boot.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c similarity index 100% rename from boards/arm/nucleo-l496zg/src/stm32_boot.c rename to boards/arm/stm32l4/nucleo-l496zg/src/stm32_boot.c diff --git a/boards/arm/nucleo-l496zg/src/stm32_buttons.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_buttons.c similarity index 100% rename from boards/arm/nucleo-l496zg/src/stm32_buttons.c rename to boards/arm/stm32l4/nucleo-l496zg/src/stm32_buttons.c diff --git a/boards/arm/nucleo-l496zg/src/stm32_dac.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_dac.c similarity index 100% rename from boards/arm/nucleo-l496zg/src/stm32_dac.c rename to boards/arm/stm32l4/nucleo-l496zg/src/stm32_dac.c diff --git a/boards/arm/nucleo-l496zg/src/stm32_dfsdm.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_dfsdm.c similarity index 100% rename from boards/arm/nucleo-l496zg/src/stm32_dfsdm.c rename to boards/arm/stm32l4/nucleo-l496zg/src/stm32_dfsdm.c diff --git a/boards/arm/nucleo-l496zg/src/stm32_dma_alloc.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_dma_alloc.c similarity index 100% rename from boards/arm/nucleo-l496zg/src/stm32_dma_alloc.c rename to boards/arm/stm32l4/nucleo-l496zg/src/stm32_dma_alloc.c diff --git a/boards/arm/nucleo-l496zg/src/stm32_sdio.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_sdio.c similarity index 100% rename from boards/arm/nucleo-l496zg/src/stm32_sdio.c rename to boards/arm/stm32l4/nucleo-l496zg/src/stm32_sdio.c diff --git a/boards/arm/nucleo-l496zg/src/stm32_spi.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_spi.c similarity index 100% rename from boards/arm/nucleo-l496zg/src/stm32_spi.c rename to boards/arm/stm32l4/nucleo-l496zg/src/stm32_spi.c diff --git a/boards/arm/nucleo-l496zg/src/stm32_usb.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_usb.c similarity index 100% rename from boards/arm/nucleo-l496zg/src/stm32_usb.c rename to boards/arm/stm32l4/nucleo-l496zg/src/stm32_usb.c diff --git a/boards/arm/nucleo-l496zg/src/stm32_userleds.c b/boards/arm/stm32l4/nucleo-l496zg/src/stm32_userleds.c similarity index 100% rename from boards/arm/nucleo-l496zg/src/stm32_userleds.c rename to boards/arm/stm32l4/nucleo-l496zg/src/stm32_userleds.c diff --git a/boards/arm/stm32l476-mdk/Kconfig b/boards/arm/stm32l4/stm32l476-mdk/Kconfig similarity index 100% rename from boards/arm/stm32l476-mdk/Kconfig rename to boards/arm/stm32l4/stm32l476-mdk/Kconfig diff --git a/boards/arm/stm32l476-mdk/README.txt b/boards/arm/stm32l4/stm32l476-mdk/README.txt similarity index 100% rename from boards/arm/stm32l476-mdk/README.txt rename to boards/arm/stm32l4/stm32l476-mdk/README.txt diff --git a/boards/arm/stm32l476-mdk/configs/nsh/defconfig b/boards/arm/stm32l4/stm32l476-mdk/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm32l476-mdk/configs/nsh/defconfig rename to boards/arm/stm32l4/stm32l476-mdk/configs/nsh/defconfig index e3f68a7ed8a..05fe4793286 100644 --- a/boards/arm/stm32l476-mdk/configs/nsh/defconfig +++ b/boards/arm/stm32l4/stm32l476-mdk/configs/nsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32l476-mdk" CONFIG_ARCH_BOARD_STM32L476_MDK=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32l4" CONFIG_ARCH_CHIP_STM32L476RG=y CONFIG_ARCH_CHIP_STM32L4=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/stm32l476-mdk/include/board.h b/boards/arm/stm32l4/stm32l476-mdk/include/board.h similarity index 100% rename from boards/arm/stm32l476-mdk/include/board.h rename to boards/arm/stm32l4/stm32l476-mdk/include/board.h diff --git a/boards/arm/stm32l476-mdk/include/stm32l476-mdk-clocking.h b/boards/arm/stm32l4/stm32l476-mdk/include/stm32l476-mdk-clocking.h similarity index 100% rename from boards/arm/stm32l476-mdk/include/stm32l476-mdk-clocking.h rename to boards/arm/stm32l4/stm32l476-mdk/include/stm32l476-mdk-clocking.h diff --git a/boards/arm/stm32l476-mdk/scripts/Make.defs b/boards/arm/stm32l4/stm32l476-mdk/scripts/Make.defs similarity index 96% rename from boards/arm/stm32l476-mdk/scripts/Make.defs rename to boards/arm/stm32l4/stm32l476-mdk/scripts/Make.defs index c2e36b701cc..834dccc533d 100644 --- a/boards/arm/stm32l476-mdk/scripts/Make.defs +++ b/boards/arm/stm32l4/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32l476-mdk/scripts/stm32l476-mdk.ld b/boards/arm/stm32l4/stm32l476-mdk/scripts/stm32l476-mdk.ld similarity index 100% rename from boards/arm/stm32l476-mdk/scripts/stm32l476-mdk.ld rename to boards/arm/stm32l4/stm32l476-mdk/scripts/stm32l476-mdk.ld diff --git a/boards/arm/stm32l476-mdk/src/Makefile b/boards/arm/stm32l4/stm32l476-mdk/src/Makefile similarity index 100% rename from boards/arm/stm32l476-mdk/src/Makefile rename to boards/arm/stm32l4/stm32l476-mdk/src/Makefile diff --git a/boards/arm/stm32l476-mdk/src/stm32_appinit.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_appinit.c similarity index 100% rename from boards/arm/stm32l476-mdk/src/stm32_appinit.c rename to boards/arm/stm32l4/stm32l476-mdk/src/stm32_appinit.c diff --git a/boards/arm/stm32l476-mdk/src/stm32_autoleds.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_autoleds.c similarity index 100% rename from boards/arm/stm32l476-mdk/src/stm32_autoleds.c rename to boards/arm/stm32l4/stm32l476-mdk/src/stm32_autoleds.c diff --git a/boards/arm/stm32l476-mdk/src/stm32_boot.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32l476-mdk/src/stm32_boot.c rename to boards/arm/stm32l4/stm32l476-mdk/src/stm32_boot.c diff --git a/boards/arm/stm32l476-mdk/src/stm32_bringup.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_bringup.c similarity index 100% rename from boards/arm/stm32l476-mdk/src/stm32_bringup.c rename to boards/arm/stm32l4/stm32l476-mdk/src/stm32_bringup.c diff --git a/boards/arm/stm32l476-mdk/src/stm32_buttons.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm32l476-mdk/src/stm32_buttons.c rename to boards/arm/stm32l4/stm32l476-mdk/src/stm32_buttons.c diff --git a/boards/arm/stm32l476-mdk/src/stm32_clockconfig.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_clockconfig.c similarity index 100% rename from boards/arm/stm32l476-mdk/src/stm32_clockconfig.c rename to boards/arm/stm32l4/stm32l476-mdk/src/stm32_clockconfig.c diff --git a/boards/arm/stm32l476-mdk/src/stm32_spi.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_spi.c similarity index 100% rename from boards/arm/stm32l476-mdk/src/stm32_spi.c rename to boards/arm/stm32l4/stm32l476-mdk/src/stm32_spi.c diff --git a/boards/arm/stm32l476-mdk/src/stm32_userleds.c b/boards/arm/stm32l4/stm32l476-mdk/src/stm32_userleds.c similarity index 100% rename from boards/arm/stm32l476-mdk/src/stm32_userleds.c rename to boards/arm/stm32l4/stm32l476-mdk/src/stm32_userleds.c diff --git a/boards/arm/stm32l476-mdk/src/stm32l476-mdk.h b/boards/arm/stm32l4/stm32l476-mdk/src/stm32l476-mdk.h similarity index 100% rename from boards/arm/stm32l476-mdk/src/stm32l476-mdk.h rename to boards/arm/stm32l4/stm32l476-mdk/src/stm32l476-mdk.h diff --git a/boards/arm/stm32l476vg-disco/Kconfig b/boards/arm/stm32l4/stm32l476vg-disco/Kconfig similarity index 100% rename from boards/arm/stm32l476vg-disco/Kconfig rename to boards/arm/stm32l4/stm32l476vg-disco/Kconfig diff --git a/boards/arm/stm32l476vg-disco/README.txt b/boards/arm/stm32l4/stm32l476vg-disco/README.txt similarity index 100% rename from boards/arm/stm32l476vg-disco/README.txt rename to boards/arm/stm32l4/stm32l476vg-disco/README.txt diff --git a/boards/arm/stm32l476vg-disco/configs/knsh/Make.defs b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/Make.defs similarity index 93% rename from boards/arm/stm32l476vg-disco/configs/knsh/Make.defs rename to boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/Make.defs index 410c507a305..f8133496010 100644 --- a/boards/arm/stm32l476vg-disco/configs/knsh/Make.defs +++ b/boards/arm/stm32l4/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) - ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) + ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32l476vg-disco/configs/knsh/defconfig b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig similarity index 98% rename from boards/arm/stm32l476vg-disco/configs/knsh/defconfig rename to boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig index 585c93736d3..d30d71e8c1a 100644 --- a/boards/arm/stm32l476vg-disco/configs/knsh/defconfig +++ b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32l476vg-disco" CONFIG_ARCH_BOARD_STM32L476VG_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32l4" CONFIG_ARCH_CHIP_STM32L476RG=y CONFIG_ARCH_CHIP_STM32L4=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/stm32l476vg-disco/configs/nsh/defconfig b/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm32l476vg-disco/configs/nsh/defconfig rename to boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig index 52988a44d15..ed080110a95 100644 --- a/boards/arm/stm32l476vg-disco/configs/nsh/defconfig +++ b/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32l476vg-disco" CONFIG_ARCH_BOARD_STM32L476VG_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32l4" CONFIG_ARCH_CHIP_STM32L476RG=y CONFIG_ARCH_CHIP_STM32L4=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/stm32l476vg-disco/include/board.h b/boards/arm/stm32l4/stm32l476vg-disco/include/board.h similarity index 100% rename from boards/arm/stm32l476vg-disco/include/board.h rename to boards/arm/stm32l4/stm32l476vg-disco/include/board.h diff --git a/boards/arm/stm32l476vg-disco/include/boardctl.h b/boards/arm/stm32l4/stm32l476vg-disco/include/boardctl.h similarity index 100% rename from boards/arm/stm32l476vg-disco/include/boardctl.h rename to boards/arm/stm32l4/stm32l476vg-disco/include/boardctl.h diff --git a/boards/arm/stm32l476vg-disco/include/nsh_romfsimg.h b/boards/arm/stm32l4/stm32l476vg-disco/include/nsh_romfsimg.h similarity index 100% rename from boards/arm/stm32l476vg-disco/include/nsh_romfsimg.h rename to boards/arm/stm32l4/stm32l476vg-disco/include/nsh_romfsimg.h diff --git a/boards/arm/stm32l476vg-disco/include/rcS.template b/boards/arm/stm32l4/stm32l476vg-disco/include/rcS.template similarity index 100% rename from boards/arm/stm32l476vg-disco/include/rcS.template rename to boards/arm/stm32l4/stm32l476vg-disco/include/rcS.template diff --git a/boards/arm/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h b/boards/arm/stm32l4/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h similarity index 100% rename from boards/arm/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h rename to boards/arm/stm32l4/stm32l476vg-disco/include/stm32l476vg-disco-clocking.h diff --git a/boards/arm/stm32l476vg-disco/kernel/.gitignore b/boards/arm/stm32l4/stm32l476vg-disco/kernel/.gitignore similarity index 100% rename from boards/arm/stm32l476vg-disco/kernel/.gitignore rename to boards/arm/stm32l4/stm32l476vg-disco/kernel/.gitignore diff --git a/boards/arm/stm32l476vg-disco/kernel/Makefile b/boards/arm/stm32l4/stm32l476vg-disco/kernel/Makefile similarity index 90% rename from boards/arm/stm32l476vg-disco/kernel/Makefile rename to boards/arm/stm32l4/stm32l476vg-disco/kernel/Makefile index d8441622ca4..0d08f2d500e 100644 --- a/boards/arm/stm32l476vg-disco/kernel/Makefile +++ b/boards/arm/stm32l4/stm32l476vg-disco/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/stm32l476vg-disco/kernel/stm32l4_userspace.c b/boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c similarity index 100% rename from boards/arm/stm32l476vg-disco/kernel/stm32l4_userspace.c rename to boards/arm/stm32l4/stm32l476vg-disco/kernel/stm32l4_userspace.c diff --git a/boards/arm/stm32l476vg-disco/scripts/Make.defs b/boards/arm/stm32l4/stm32l476vg-disco/scripts/Make.defs similarity index 96% rename from boards/arm/stm32l476vg-disco/scripts/Make.defs rename to boards/arm/stm32l4/stm32l476vg-disco/scripts/Make.defs index e9dd1004639..3de8172c20a 100644 --- a/boards/arm/stm32l476vg-disco/scripts/Make.defs +++ b/boards/arm/stm32l4/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32l476vg-disco/scripts/kernel-space.ld b/boards/arm/stm32l4/stm32l476vg-disco/scripts/kernel-space.ld similarity index 100% rename from boards/arm/stm32l476vg-disco/scripts/kernel-space.ld rename to boards/arm/stm32l4/stm32l476vg-disco/scripts/kernel-space.ld diff --git a/boards/arm/stm32l476vg-disco/scripts/memory.ld b/boards/arm/stm32l4/stm32l476vg-disco/scripts/memory.ld similarity index 100% rename from boards/arm/stm32l476vg-disco/scripts/memory.ld rename to boards/arm/stm32l4/stm32l476vg-disco/scripts/memory.ld diff --git a/boards/arm/stm32l476vg-disco/scripts/stm32l476vg-disco.ld b/boards/arm/stm32l4/stm32l476vg-disco/scripts/stm32l476vg-disco.ld similarity index 100% rename from boards/arm/stm32l476vg-disco/scripts/stm32l476vg-disco.ld rename to boards/arm/stm32l4/stm32l476vg-disco/scripts/stm32l476vg-disco.ld diff --git a/boards/arm/stm32l476vg-disco/scripts/user-space.ld b/boards/arm/stm32l4/stm32l476vg-disco/scripts/user-space.ld similarity index 100% rename from boards/arm/stm32l476vg-disco/scripts/user-space.ld rename to boards/arm/stm32l4/stm32l476vg-disco/scripts/user-space.ld diff --git a/boards/arm/stm32l476vg-disco/src/Makefile b/boards/arm/stm32l4/stm32l476vg-disco/src/Makefile similarity index 100% rename from boards/arm/stm32l476vg-disco/src/Makefile rename to boards/arm/stm32l4/stm32l476vg-disco/src/Makefile diff --git a/boards/arm/stm32l476vg-disco/src/stm32_appinit.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_appinit.c similarity index 100% rename from boards/arm/stm32l476vg-disco/src/stm32_appinit.c rename to boards/arm/stm32l4/stm32l476vg-disco/src/stm32_appinit.c diff --git a/boards/arm/stm32l476vg-disco/src/stm32_autoleds.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_autoleds.c similarity index 100% rename from boards/arm/stm32l476vg-disco/src/stm32_autoleds.c rename to boards/arm/stm32l4/stm32l476vg-disco/src/stm32_autoleds.c diff --git a/boards/arm/stm32l476vg-disco/src/stm32_boot.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32l476vg-disco/src/stm32_boot.c rename to boards/arm/stm32l4/stm32l476vg-disco/src/stm32_boot.c diff --git a/boards/arm/stm32l476vg-disco/src/stm32_buttons.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm32l476vg-disco/src/stm32_buttons.c rename to boards/arm/stm32l4/stm32l476vg-disco/src/stm32_buttons.c diff --git a/boards/arm/stm32l476vg-disco/src/stm32_clockconfig.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_clockconfig.c similarity index 100% rename from boards/arm/stm32l476vg-disco/src/stm32_clockconfig.c rename to boards/arm/stm32l4/stm32l476vg-disco/src/stm32_clockconfig.c diff --git a/boards/arm/stm32l476vg-disco/src/stm32_spi.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_spi.c similarity index 100% rename from boards/arm/stm32l476vg-disco/src/stm32_spi.c rename to boards/arm/stm32l4/stm32l476vg-disco/src/stm32_spi.c diff --git a/boards/arm/stm32l476vg-disco/src/stm32_usb.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_usb.c similarity index 100% rename from boards/arm/stm32l476vg-disco/src/stm32_usb.c rename to boards/arm/stm32l4/stm32l476vg-disco/src/stm32_usb.c diff --git a/boards/arm/stm32l476vg-disco/src/stm32_userleds.c b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32_userleds.c similarity index 100% rename from boards/arm/stm32l476vg-disco/src/stm32_userleds.c rename to boards/arm/stm32l4/stm32l476vg-disco/src/stm32_userleds.c diff --git a/boards/arm/stm32l476vg-disco/src/stm32l476vg-disco.h b/boards/arm/stm32l4/stm32l476vg-disco/src/stm32l476vg-disco.h similarity index 100% rename from boards/arm/stm32l476vg-disco/src/stm32l476vg-disco.h rename to boards/arm/stm32l4/stm32l476vg-disco/src/stm32l476vg-disco.h diff --git a/boards/arm/stm32l4r9ai-disco/Kconfig b/boards/arm/stm32l4/stm32l4r9ai-disco/Kconfig similarity index 100% rename from boards/arm/stm32l4r9ai-disco/Kconfig rename to boards/arm/stm32l4/stm32l4r9ai-disco/Kconfig diff --git a/boards/arm/stm32l4r9ai-disco/README.txt b/boards/arm/stm32l4/stm32l4r9ai-disco/README.txt similarity index 100% rename from boards/arm/stm32l4r9ai-disco/README.txt rename to boards/arm/stm32l4/stm32l4r9ai-disco/README.txt diff --git a/boards/arm/stm32l4r9ai-disco/configs/knsh/Make.defs b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/Make.defs similarity index 93% rename from boards/arm/stm32l4r9ai-disco/configs/knsh/Make.defs rename to boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/Make.defs index 17feb3dfba6..44de47eca2b 100644 --- a/boards/arm/stm32l4r9ai-disco/configs/knsh/Make.defs +++ b/boards/arm/stm32l4/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" - ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1)}" + ARCHSCRIPT += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) - ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT1) + ARCHSCRIPT += -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT2) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32l4r9ai-disco/configs/knsh/defconfig b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig similarity index 98% rename from boards/arm/stm32l4r9ai-disco/configs/knsh/defconfig rename to boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig index 22f10410f5f..1d22b13d576 100644 --- a/boards/arm/stm32l4r9ai-disco/configs/knsh/defconfig +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32l4r9ai-disco" CONFIG_ARCH_BOARD_STM32L4R9AI_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32l4" CONFIG_ARCH_CHIP_STM32L4=y CONFIG_ARCH_CHIP_STM32L4R9AI=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/stm32l4r9ai-disco/configs/nsh/defconfig b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig similarity index 98% rename from boards/arm/stm32l4r9ai-disco/configs/nsh/defconfig rename to boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig index 8c551c0e259..767781ca6cd 100644 --- a/boards/arm/stm32l4r9ai-disco/configs/nsh/defconfig +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="stm32l4r9ai-disco" CONFIG_ARCH_BOARD_STM32L4R9AI_DISCO=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="stm32l4" CONFIG_ARCH_CHIP_STM32L4=y CONFIG_ARCH_CHIP_STM32L4R9AI=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/stm32l4r9ai-disco/include/board.h b/boards/arm/stm32l4/stm32l4r9ai-disco/include/board.h similarity index 100% rename from boards/arm/stm32l4r9ai-disco/include/board.h rename to boards/arm/stm32l4/stm32l4r9ai-disco/include/board.h diff --git a/boards/arm/stm32l4r9ai-disco/include/boardctl.h b/boards/arm/stm32l4/stm32l4r9ai-disco/include/boardctl.h similarity index 100% rename from boards/arm/stm32l4r9ai-disco/include/boardctl.h rename to boards/arm/stm32l4/stm32l4r9ai-disco/include/boardctl.h diff --git a/boards/arm/stm32l4r9ai-disco/include/nsh_romfsimg.h b/boards/arm/stm32l4/stm32l4r9ai-disco/include/nsh_romfsimg.h similarity index 100% rename from boards/arm/stm32l4r9ai-disco/include/nsh_romfsimg.h rename to boards/arm/stm32l4/stm32l4r9ai-disco/include/nsh_romfsimg.h diff --git a/boards/arm/stm32l4r9ai-disco/include/rcS.template b/boards/arm/stm32l4/stm32l4r9ai-disco/include/rcS.template similarity index 100% rename from boards/arm/stm32l4r9ai-disco/include/rcS.template rename to boards/arm/stm32l4/stm32l4r9ai-disco/include/rcS.template diff --git a/boards/arm/stm32l4r9ai-disco/include/stm32l4r9ai-disco-clocking.h b/boards/arm/stm32l4/stm32l4r9ai-disco/include/stm32l4r9ai-disco-clocking.h similarity index 100% rename from boards/arm/stm32l4r9ai-disco/include/stm32l4r9ai-disco-clocking.h rename to boards/arm/stm32l4/stm32l4r9ai-disco/include/stm32l4r9ai-disco-clocking.h diff --git a/boards/arm/stm32l4r9ai-disco/kernel/.gitignore b/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/.gitignore similarity index 100% rename from boards/arm/stm32l4r9ai-disco/kernel/.gitignore rename to boards/arm/stm32l4/stm32l4r9ai-disco/kernel/.gitignore diff --git a/boards/arm/stm32l4r9ai-disco/kernel/Makefile b/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/Makefile similarity index 90% rename from boards/arm/stm32l4r9ai-disco/kernel/Makefile rename to boards/arm/stm32l4/stm32l4r9ai-disco/kernel/Makefile index 6e16b7a67f4..08c60b84335 100644 --- a/boards/arm/stm32l4r9ai-disco/kernel/Makefile +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/Makefile @@ -37,7 +37,7 @@ # This is the directory for the board-specific header files -BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include +BOARD_INCLUDE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)include # The entry point name (if none is provided in the .config file) @@ -50,16 +50,16 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" - USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld}" + USER_LDSCRIPT += -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" USER_HEXFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.hex}" USER_SRECFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.srec}" USER_BINFILE += "${shell cygpath -w $(TOPDIR)$(DELIM)nuttx_user.bin}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld - USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)memory.ld + USER_LDSCRIPT += -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld USER_HEXFILE += "$(TOPDIR)$(DELIM)nuttx_user.hex" USER_SRECFILE += "$(TOPDIR)$(DELIM)nuttx_user.srec" USER_BINFILE += "$(TOPDIR)$(DELIM)nuttx_user.bin" diff --git a/boards/arm/stm32l4r9ai-disco/kernel/stm32l4_userspace.c b/boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c similarity index 100% rename from boards/arm/stm32l4r9ai-disco/kernel/stm32l4_userspace.c rename to boards/arm/stm32l4/stm32l4r9ai-disco/kernel/stm32l4_userspace.c diff --git a/boards/arm/stm32l4r9ai-disco/scripts/Make.defs b/boards/arm/stm32l4/stm32l4r9ai-disco/scripts/Make.defs similarity index 96% rename from boards/arm/stm32l4r9ai-disco/scripts/Make.defs rename to boards/arm/stm32l4/stm32l4r9ai-disco/scripts/Make.defs index 997389e53de..2be34e50804 100644 --- a/boards/arm/stm32l4r9ai-disco/scripts/Make.defs +++ b/boards/arm/stm32l4/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/stm32l4r9ai-disco/scripts/kernel-space.ld b/boards/arm/stm32l4/stm32l4r9ai-disco/scripts/kernel-space.ld similarity index 100% rename from boards/arm/stm32l4r9ai-disco/scripts/kernel-space.ld rename to boards/arm/stm32l4/stm32l4r9ai-disco/scripts/kernel-space.ld diff --git a/boards/arm/stm32l4r9ai-disco/scripts/memory.ld b/boards/arm/stm32l4/stm32l4r9ai-disco/scripts/memory.ld similarity index 100% rename from boards/arm/stm32l4r9ai-disco/scripts/memory.ld rename to boards/arm/stm32l4/stm32l4r9ai-disco/scripts/memory.ld diff --git a/boards/arm/stm32l4r9ai-disco/scripts/stm32l4r9ai-disco.ld b/boards/arm/stm32l4/stm32l4r9ai-disco/scripts/stm32l4r9ai-disco.ld similarity index 100% rename from boards/arm/stm32l4r9ai-disco/scripts/stm32l4r9ai-disco.ld rename to boards/arm/stm32l4/stm32l4r9ai-disco/scripts/stm32l4r9ai-disco.ld diff --git a/boards/arm/stm32l4r9ai-disco/scripts/user-space.ld b/boards/arm/stm32l4/stm32l4r9ai-disco/scripts/user-space.ld similarity index 100% rename from boards/arm/stm32l4r9ai-disco/scripts/user-space.ld rename to boards/arm/stm32l4/stm32l4r9ai-disco/scripts/user-space.ld diff --git a/boards/arm/stm32l4r9ai-disco/src/.gitignore b/boards/arm/stm32l4/stm32l4r9ai-disco/src/.gitignore similarity index 100% rename from boards/arm/stm32l4r9ai-disco/src/.gitignore rename to boards/arm/stm32l4/stm32l4r9ai-disco/src/.gitignore diff --git a/boards/arm/stm32l4r9ai-disco/src/Makefile b/boards/arm/stm32l4/stm32l4r9ai-disco/src/Makefile similarity index 100% rename from boards/arm/stm32l4r9ai-disco/src/Makefile rename to boards/arm/stm32l4/stm32l4r9ai-disco/src/Makefile diff --git a/boards/arm/stm32l4r9ai-disco/src/stm32_adc.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_adc.c similarity index 100% rename from boards/arm/stm32l4r9ai-disco/src/stm32_adc.c rename to boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_adc.c diff --git a/boards/arm/stm32l4r9ai-disco/src/stm32_appinit.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_appinit.c similarity index 100% rename from boards/arm/stm32l4r9ai-disco/src/stm32_appinit.c rename to boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_appinit.c diff --git a/boards/arm/stm32l4r9ai-disco/src/stm32_autoleds.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_autoleds.c similarity index 100% rename from boards/arm/stm32l4r9ai-disco/src/stm32_autoleds.c rename to boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_autoleds.c diff --git a/boards/arm/stm32l4r9ai-disco/src/stm32_boot.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_boot.c similarity index 100% rename from boards/arm/stm32l4r9ai-disco/src/stm32_boot.c rename to boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_boot.c diff --git a/boards/arm/stm32l4r9ai-disco/src/stm32_buttons.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_buttons.c similarity index 100% rename from boards/arm/stm32l4r9ai-disco/src/stm32_buttons.c rename to boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_buttons.c diff --git a/boards/arm/stm32l4r9ai-disco/src/stm32_clockconfig.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_clockconfig.c similarity index 100% rename from boards/arm/stm32l4r9ai-disco/src/stm32_clockconfig.c rename to boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_clockconfig.c diff --git a/boards/arm/stm32l4r9ai-disco/src/stm32_dac.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_dac.c similarity index 100% rename from boards/arm/stm32l4r9ai-disco/src/stm32_dac.c rename to boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_dac.c diff --git a/boards/arm/stm32l4r9ai-disco/src/stm32_dfsdm.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_dfsdm.c similarity index 100% rename from boards/arm/stm32l4r9ai-disco/src/stm32_dfsdm.c rename to boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_dfsdm.c diff --git a/boards/arm/stm32l4r9ai-disco/src/stm32_spi.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_spi.c similarity index 100% rename from boards/arm/stm32l4r9ai-disco/src/stm32_spi.c rename to boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_spi.c diff --git a/boards/arm/stm32l4r9ai-disco/src/stm32_usb.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_usb.c similarity index 100% rename from boards/arm/stm32l4r9ai-disco/src/stm32_usb.c rename to boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_usb.c diff --git a/boards/arm/stm32l4r9ai-disco/src/stm32_userleds.c b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_userleds.c similarity index 100% rename from boards/arm/stm32l4r9ai-disco/src/stm32_userleds.c rename to boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32_userleds.c diff --git a/boards/arm/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h b/boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h similarity index 100% rename from boards/arm/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h rename to boards/arm/stm32l4/stm32l4r9ai-disco/src/stm32l4r9ai-disco.h diff --git a/boards/arm/olimex-strp711/Kconfig b/boards/arm/str71x/olimex-strp711/Kconfig similarity index 100% rename from boards/arm/olimex-strp711/Kconfig rename to boards/arm/str71x/olimex-strp711/Kconfig diff --git a/boards/arm/olimex-strp711/README.txt b/boards/arm/str71x/olimex-strp711/README.txt similarity index 100% rename from boards/arm/olimex-strp711/README.txt rename to boards/arm/str71x/olimex-strp711/README.txt diff --git a/boards/arm/olimex-strp711/configs/nettest/defconfig b/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig similarity index 98% rename from boards/arm/olimex-strp711/configs/nettest/defconfig rename to boards/arm/str71x/olimex-strp711/configs/nettest/defconfig index f6b19b0df8a..235c67f9da6 100644 --- a/boards/arm/olimex-strp711/configs/nettest/defconfig +++ b/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-strp711" CONFIG_ARCH_BOARD_OLIMEX_STRP711=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="str71x" CONFIG_ARCH_CHIP_STR71X=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_TOOLCHAIN_BUILDROOT=y diff --git a/boards/arm/olimex-strp711/configs/nsh/defconfig b/boards/arm/str71x/olimex-strp711/configs/nsh/defconfig similarity index 98% rename from boards/arm/olimex-strp711/configs/nsh/defconfig rename to boards/arm/str71x/olimex-strp711/configs/nsh/defconfig index 14285aaa674..7ab5d85dffe 100644 --- a/boards/arm/olimex-strp711/configs/nsh/defconfig +++ b/boards/arm/str71x/olimex-strp711/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="olimex-strp711" CONFIG_ARCH_BOARD_OLIMEX_STRP711=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="str71x" CONFIG_ARCH_CHIP_STR71X=y CONFIG_ARCH_STACKDUMP=y CONFIG_ARM_TOOLCHAIN_BUILDROOT=y diff --git a/boards/arm/olimex-strp711/include/board.h b/boards/arm/str71x/olimex-strp711/include/board.h similarity index 100% rename from boards/arm/olimex-strp711/include/board.h rename to boards/arm/str71x/olimex-strp711/include/board.h diff --git a/boards/arm/olimex-strp711/scripts/Make.defs b/boards/arm/str71x/olimex-strp711/scripts/Make.defs similarity index 96% rename from boards/arm/olimex-strp711/scripts/Make.defs rename to boards/arm/str71x/olimex-strp711/scripts/Make.defs index 731a529ea87..83dc4eddbf9 100644 --- a/boards/arm/olimex-strp711/scripts/Make.defs +++ b/boards/arm/str71x/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/olimex-strp711/scripts/ld.script b/boards/arm/str71x/olimex-strp711/scripts/ld.script similarity index 100% rename from boards/arm/olimex-strp711/scripts/ld.script rename to boards/arm/str71x/olimex-strp711/scripts/ld.script diff --git a/boards/arm/olimex-strp711/scripts/oocd-reset b/boards/arm/str71x/olimex-strp711/scripts/oocd-reset similarity index 100% rename from boards/arm/olimex-strp711/scripts/oocd-reset rename to boards/arm/str71x/olimex-strp711/scripts/oocd-reset diff --git a/boards/arm/olimex-strp711/scripts/oocd.sh b/boards/arm/str71x/olimex-strp711/scripts/oocd.sh similarity index 100% rename from boards/arm/olimex-strp711/scripts/oocd.sh rename to boards/arm/str71x/olimex-strp711/scripts/oocd.sh diff --git a/boards/arm/olimex-strp711/scripts/oocd_flash.script b/boards/arm/str71x/olimex-strp711/scripts/oocd_flash.script similarity index 100% rename from boards/arm/olimex-strp711/scripts/oocd_flash.script rename to boards/arm/str71x/olimex-strp711/scripts/oocd_flash.script diff --git a/boards/arm/olimex-strp711/scripts/oocd_ft2xx.cfg b/boards/arm/str71x/olimex-strp711/scripts/oocd_ft2xx.cfg similarity index 100% rename from boards/arm/olimex-strp711/scripts/oocd_ft2xx.cfg rename to boards/arm/str71x/olimex-strp711/scripts/oocd_ft2xx.cfg diff --git a/boards/arm/olimex-strp711/scripts/oocd_wiggler.cfg b/boards/arm/str71x/olimex-strp711/scripts/oocd_wiggler.cfg similarity index 100% rename from boards/arm/olimex-strp711/scripts/oocd_wiggler.cfg rename to boards/arm/str71x/olimex-strp711/scripts/oocd_wiggler.cfg diff --git a/boards/arm/stm3220g-eval/tools/usb-driver.txt b/boards/arm/str71x/olimex-strp711/scripts/usb-driver.txt similarity index 100% rename from boards/arm/stm3220g-eval/tools/usb-driver.txt rename to boards/arm/str71x/olimex-strp711/scripts/usb-driver.txt diff --git a/boards/arm/stm32ldiscovery/src/.gitignore b/boards/arm/str71x/olimex-strp711/src/.gitignore similarity index 100% rename from boards/arm/stm32ldiscovery/src/.gitignore rename to boards/arm/str71x/olimex-strp711/src/.gitignore diff --git a/boards/arm/olimex-strp711/src/Makefile b/boards/arm/str71x/olimex-strp711/src/Makefile similarity index 100% rename from boards/arm/olimex-strp711/src/Makefile rename to boards/arm/str71x/olimex-strp711/src/Makefile diff --git a/boards/arm/olimex-strp711/src/str71_appinit.c b/boards/arm/str71x/olimex-strp711/src/str71_appinit.c similarity index 100% rename from boards/arm/olimex-strp711/src/str71_appinit.c rename to boards/arm/str71x/olimex-strp711/src/str71_appinit.c diff --git a/boards/arm/olimex-strp711/src/str71_buttons.c b/boards/arm/str71x/olimex-strp711/src/str71_buttons.c similarity index 100% rename from boards/arm/olimex-strp711/src/str71_buttons.c rename to boards/arm/str71x/olimex-strp711/src/str71_buttons.c diff --git a/boards/arm/olimex-strp711/src/str71_enc28j60.c b/boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c similarity index 100% rename from boards/arm/olimex-strp711/src/str71_enc28j60.c rename to boards/arm/str71x/olimex-strp711/src/str71_enc28j60.c diff --git a/boards/arm/olimex-strp711/src/str71_leds.c b/boards/arm/str71x/olimex-strp711/src/str71_leds.c similarity index 100% rename from boards/arm/olimex-strp711/src/str71_leds.c rename to boards/arm/str71x/olimex-strp711/src/str71_leds.c diff --git a/boards/arm/olimex-strp711/src/str71_spi.c b/boards/arm/str71x/olimex-strp711/src/str71_spi.c similarity index 100% rename from boards/arm/olimex-strp711/src/str71_spi.c rename to boards/arm/str71x/olimex-strp711/src/str71_spi.c diff --git a/boards/arm/dk-tm4c129x/Kconfig b/boards/arm/tiva/dk-tm4c129x/Kconfig similarity index 100% rename from boards/arm/dk-tm4c129x/Kconfig rename to boards/arm/tiva/dk-tm4c129x/Kconfig diff --git a/boards/arm/dk-tm4c129x/README.txt b/boards/arm/tiva/dk-tm4c129x/README.txt similarity index 100% rename from boards/arm/dk-tm4c129x/README.txt rename to boards/arm/tiva/dk-tm4c129x/README.txt diff --git a/boards/arm/dk-tm4c129x/configs/ipv6/defconfig b/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig similarity index 98% rename from boards/arm/dk-tm4c129x/configs/ipv6/defconfig rename to boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig index 03018684350..65b03390d5c 100644 --- a/boards/arm/dk-tm4c129x/configs/ipv6/defconfig +++ b/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig @@ -14,6 +14,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="dk-tm4c129x" CONFIG_ARCH_BOARD_DK_TM4C129X=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_TIVA=y CONFIG_ARCH_CHIP_TM4C129=y CONFIG_ARCH_CHIP_TM4C129XNC=y diff --git a/boards/arm/dk-tm4c129x/configs/nsh/defconfig b/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig similarity index 98% rename from boards/arm/dk-tm4c129x/configs/nsh/defconfig rename to boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig index c5c48b7ebbb..85b85384f5e 100644 --- a/boards/arm/dk-tm4c129x/configs/nsh/defconfig +++ b/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="dk-tm4c129x" CONFIG_ARCH_BOARD_DK_TM4C129X=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_TIVA=y CONFIG_ARCH_CHIP_TM4C129=y CONFIG_ARCH_CHIP_TM4C129XNC=y diff --git a/boards/arm/dk-tm4c129x/include/board.h b/boards/arm/tiva/dk-tm4c129x/include/board.h similarity index 100% rename from boards/arm/dk-tm4c129x/include/board.h rename to boards/arm/tiva/dk-tm4c129x/include/board.h diff --git a/boards/arm/dk-tm4c129x/scripts/Make.defs b/boards/arm/tiva/dk-tm4c129x/scripts/Make.defs similarity index 96% rename from boards/arm/dk-tm4c129x/scripts/Make.defs rename to boards/arm/tiva/dk-tm4c129x/scripts/Make.defs index 71ea473f347..b76ecf23f71 100644 --- a/boards/arm/dk-tm4c129x/scripts/Make.defs +++ b/boards/arm/tiva/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/dk-tm4c129x/scripts/ld.script b/boards/arm/tiva/dk-tm4c129x/scripts/ld.script similarity index 100% rename from boards/arm/dk-tm4c129x/scripts/ld.script rename to boards/arm/tiva/dk-tm4c129x/scripts/ld.script diff --git a/boards/arm/stm32vldiscovery/src/.gitignore b/boards/arm/tiva/dk-tm4c129x/src/.gitignore similarity index 100% rename from boards/arm/stm32vldiscovery/src/.gitignore rename to boards/arm/tiva/dk-tm4c129x/src/.gitignore diff --git a/boards/arm/dk-tm4c129x/src/Makefile b/boards/arm/tiva/dk-tm4c129x/src/Makefile similarity index 100% rename from boards/arm/dk-tm4c129x/src/Makefile rename to boards/arm/tiva/dk-tm4c129x/src/Makefile diff --git a/boards/arm/dk-tm4c129x/src/dk-tm4c129x.h b/boards/arm/tiva/dk-tm4c129x/src/dk-tm4c129x.h similarity index 100% rename from boards/arm/dk-tm4c129x/src/dk-tm4c129x.h rename to boards/arm/tiva/dk-tm4c129x/src/dk-tm4c129x.h diff --git a/boards/arm/dk-tm4c129x/src/tm4c_appinit.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_appinit.c similarity index 100% rename from boards/arm/dk-tm4c129x/src/tm4c_appinit.c rename to boards/arm/tiva/dk-tm4c129x/src/tm4c_appinit.c diff --git a/boards/arm/dk-tm4c129x/src/tm4c_autoleds.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_autoleds.c similarity index 100% rename from boards/arm/dk-tm4c129x/src/tm4c_autoleds.c rename to boards/arm/tiva/dk-tm4c129x/src/tm4c_autoleds.c diff --git a/boards/arm/dk-tm4c129x/src/tm4c_boot.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_boot.c similarity index 100% rename from boards/arm/dk-tm4c129x/src/tm4c_boot.c rename to boards/arm/tiva/dk-tm4c129x/src/tm4c_boot.c diff --git a/boards/arm/dk-tm4c129x/src/tm4c_bringup.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_bringup.c similarity index 100% rename from boards/arm/dk-tm4c129x/src/tm4c_bringup.c rename to boards/arm/tiva/dk-tm4c129x/src/tm4c_bringup.c diff --git a/boards/arm/dk-tm4c129x/src/tm4c_buttons.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_buttons.c similarity index 100% rename from boards/arm/dk-tm4c129x/src/tm4c_buttons.c rename to boards/arm/tiva/dk-tm4c129x/src/tm4c_buttons.c diff --git a/boards/arm/dk-tm4c129x/src/tm4c_ethernet.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_ethernet.c similarity index 100% rename from boards/arm/dk-tm4c129x/src/tm4c_ethernet.c rename to boards/arm/tiva/dk-tm4c129x/src/tm4c_ethernet.c diff --git a/boards/arm/dk-tm4c129x/src/tm4c_ssi.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_ssi.c similarity index 100% rename from boards/arm/dk-tm4c129x/src/tm4c_ssi.c rename to boards/arm/tiva/dk-tm4c129x/src/tm4c_ssi.c diff --git a/boards/arm/dk-tm4c129x/src/tm4c_timer.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_timer.c similarity index 100% rename from boards/arm/dk-tm4c129x/src/tm4c_timer.c rename to boards/arm/tiva/dk-tm4c129x/src/tm4c_timer.c diff --git a/boards/arm/dk-tm4c129x/src/tm4c_tmp100.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_tmp100.c similarity index 100% rename from boards/arm/dk-tm4c129x/src/tm4c_tmp100.c rename to boards/arm/tiva/dk-tm4c129x/src/tm4c_tmp100.c diff --git a/boards/arm/dk-tm4c129x/src/tm4c_userleds.c b/boards/arm/tiva/dk-tm4c129x/src/tm4c_userleds.c similarity index 100% rename from boards/arm/dk-tm4c129x/src/tm4c_userleds.c rename to boards/arm/tiva/dk-tm4c129x/src/tm4c_userleds.c diff --git a/boards/arm/dk-tm4c129x/tools/dk-tm4c129x.cfg b/boards/arm/tiva/dk-tm4c129x/tools/dk-tm4c129x.cfg similarity index 100% rename from boards/arm/dk-tm4c129x/tools/dk-tm4c129x.cfg rename to boards/arm/tiva/dk-tm4c129x/tools/dk-tm4c129x.cfg diff --git a/boards/arm/dk-tm4c129x/tools/oocd.sh b/boards/arm/tiva/dk-tm4c129x/tools/oocd.sh similarity index 100% rename from boards/arm/dk-tm4c129x/tools/oocd.sh rename to boards/arm/tiva/dk-tm4c129x/tools/oocd.sh diff --git a/boards/arm/eagle100/Kconfig b/boards/arm/tiva/eagle100/Kconfig similarity index 100% rename from boards/arm/eagle100/Kconfig rename to boards/arm/tiva/eagle100/Kconfig diff --git a/boards/arm/eagle100/README.txt b/boards/arm/tiva/eagle100/README.txt similarity index 100% rename from boards/arm/eagle100/README.txt rename to boards/arm/tiva/eagle100/README.txt diff --git a/boards/arm/eagle100/configs/httpd/defconfig b/boards/arm/tiva/eagle100/configs/httpd/defconfig similarity index 98% rename from boards/arm/eagle100/configs/httpd/defconfig rename to boards/arm/tiva/eagle100/configs/httpd/defconfig index 2a30fe42e77..c551b517315 100644 --- a/boards/arm/eagle100/configs/httpd/defconfig +++ b/boards/arm/tiva/eagle100/configs/httpd/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="eagle100" CONFIG_ARCH_BOARD_EAGLE100=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_LM3S6918=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y diff --git a/boards/arm/eagle100/configs/nettest/defconfig b/boards/arm/tiva/eagle100/configs/nettest/defconfig similarity index 98% rename from boards/arm/eagle100/configs/nettest/defconfig rename to boards/arm/tiva/eagle100/configs/nettest/defconfig index d1eae910105..e6b2f333d11 100644 --- a/boards/arm/eagle100/configs/nettest/defconfig +++ b/boards/arm/tiva/eagle100/configs/nettest/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="eagle100" CONFIG_ARCH_BOARD_EAGLE100=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_LM3S6918=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y diff --git a/boards/arm/eagle100/configs/nsh/defconfig b/boards/arm/tiva/eagle100/configs/nsh/defconfig similarity index 98% rename from boards/arm/eagle100/configs/nsh/defconfig rename to boards/arm/tiva/eagle100/configs/nsh/defconfig index 211beb66c55..b967ff10d5d 100644 --- a/boards/arm/eagle100/configs/nsh/defconfig +++ b/boards/arm/tiva/eagle100/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="eagle100" CONFIG_ARCH_BOARD_EAGLE100=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_LM3S6918=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y diff --git a/boards/arm/eagle100/configs/nxflat/defconfig b/boards/arm/tiva/eagle100/configs/nxflat/defconfig similarity index 98% rename from boards/arm/eagle100/configs/nxflat/defconfig rename to boards/arm/tiva/eagle100/configs/nxflat/defconfig index 27a0960b949..8e46c3e08fd 100644 --- a/boards/arm/eagle100/configs/nxflat/defconfig +++ b/boards/arm/tiva/eagle100/configs/nxflat/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="eagle100" CONFIG_ARCH_BOARD_EAGLE100=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_LM3S6918=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y diff --git a/boards/arm/eagle100/configs/thttpd/defconfig b/boards/arm/tiva/eagle100/configs/thttpd/defconfig similarity index 98% rename from boards/arm/eagle100/configs/thttpd/defconfig rename to boards/arm/tiva/eagle100/configs/thttpd/defconfig index bf9537f7c22..85d839a64cf 100644 --- a/boards/arm/eagle100/configs/thttpd/defconfig +++ b/boards/arm/tiva/eagle100/configs/thttpd/defconfig @@ -8,6 +8,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="eagle100" CONFIG_ARCH_BOARD_EAGLE100=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_LM3S6918=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y diff --git a/boards/arm/eagle100/include/board.h b/boards/arm/tiva/eagle100/include/board.h similarity index 100% rename from boards/arm/eagle100/include/board.h rename to boards/arm/tiva/eagle100/include/board.h diff --git a/boards/arm/eagle100/scripts/Make.defs b/boards/arm/tiva/eagle100/scripts/Make.defs similarity index 96% rename from boards/arm/eagle100/scripts/Make.defs rename to boards/arm/tiva/eagle100/scripts/Make.defs index e2e9e70d135..10126426696 100644 --- a/boards/arm/eagle100/scripts/Make.defs +++ b/boards/arm/tiva/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/eagle100/scripts/ld.script b/boards/arm/tiva/eagle100/scripts/ld.script similarity index 100% rename from boards/arm/eagle100/scripts/ld.script rename to boards/arm/tiva/eagle100/scripts/ld.script diff --git a/boards/arm/teensy-3.x/src/.gitignore b/boards/arm/tiva/eagle100/src/.gitignore similarity index 100% rename from boards/arm/teensy-3.x/src/.gitignore rename to boards/arm/tiva/eagle100/src/.gitignore diff --git a/boards/arm/eagle100/src/Makefile b/boards/arm/tiva/eagle100/src/Makefile similarity index 100% rename from boards/arm/eagle100/src/Makefile rename to boards/arm/tiva/eagle100/src/Makefile diff --git a/boards/arm/eagle100/src/eagle100.h b/boards/arm/tiva/eagle100/src/eagle100.h similarity index 100% rename from boards/arm/eagle100/src/eagle100.h rename to boards/arm/tiva/eagle100/src/eagle100.h diff --git a/boards/arm/eagle100/src/lm_appinit.c b/boards/arm/tiva/eagle100/src/lm_appinit.c similarity index 100% rename from boards/arm/eagle100/src/lm_appinit.c rename to boards/arm/tiva/eagle100/src/lm_appinit.c diff --git a/boards/arm/eagle100/src/lm_boot.c b/boards/arm/tiva/eagle100/src/lm_boot.c similarity index 100% rename from boards/arm/eagle100/src/lm_boot.c rename to boards/arm/tiva/eagle100/src/lm_boot.c diff --git a/boards/arm/eagle100/src/lm_ethernet.c b/boards/arm/tiva/eagle100/src/lm_ethernet.c similarity index 100% rename from boards/arm/eagle100/src/lm_ethernet.c rename to boards/arm/tiva/eagle100/src/lm_ethernet.c diff --git a/boards/arm/eagle100/src/lm_leds.c b/boards/arm/tiva/eagle100/src/lm_leds.c similarity index 100% rename from boards/arm/eagle100/src/lm_leds.c rename to boards/arm/tiva/eagle100/src/lm_leds.c diff --git a/boards/arm/eagle100/src/lm_ssi.c b/boards/arm/tiva/eagle100/src/lm_ssi.c similarity index 100% rename from boards/arm/eagle100/src/lm_ssi.c rename to boards/arm/tiva/eagle100/src/lm_ssi.c diff --git a/boards/arm/ekk-lm3s9b96/Kconfig b/boards/arm/tiva/ekk-lm3s9b96/Kconfig similarity index 100% rename from boards/arm/ekk-lm3s9b96/Kconfig rename to boards/arm/tiva/ekk-lm3s9b96/Kconfig diff --git a/boards/arm/ekk-lm3s9b96/README.txt b/boards/arm/tiva/ekk-lm3s9b96/README.txt similarity index 100% rename from boards/arm/ekk-lm3s9b96/README.txt rename to boards/arm/tiva/ekk-lm3s9b96/README.txt diff --git a/boards/arm/ekk-lm3s9b96/configs/nsh/defconfig b/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig similarity index 98% rename from boards/arm/ekk-lm3s9b96/configs/nsh/defconfig rename to boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig index dfb7097b185..2a88f126b81 100644 --- a/boards/arm/ekk-lm3s9b96/configs/nsh/defconfig +++ b/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="ekk-lm3s9b96" CONFIG_ARCH_BOARD_EKKLM3S9B96=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_LM3S9B96=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y diff --git a/boards/arm/ekk-lm3s9b96/include/board.h b/boards/arm/tiva/ekk-lm3s9b96/include/board.h similarity index 100% rename from boards/arm/ekk-lm3s9b96/include/board.h rename to boards/arm/tiva/ekk-lm3s9b96/include/board.h diff --git a/boards/arm/ekk-lm3s9b96/scripts/Make.defs b/boards/arm/tiva/ekk-lm3s9b96/scripts/Make.defs similarity index 95% rename from boards/arm/ekk-lm3s9b96/scripts/Make.defs rename to boards/arm/tiva/ekk-lm3s9b96/scripts/Make.defs index 4dfd70d6137..ad092060ce5 100644 --- a/boards/arm/ekk-lm3s9b96/scripts/Make.defs +++ b/boards/arm/tiva/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)/$(CONFIG_ARCH_BOARD)/scripts/ekk-lm3s9b96.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ekk-lm3s9b96.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ekk-lm3s9b96.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/ekk-lm3s9b96/scripts/ekk-lm3s9b96.ld b/boards/arm/tiva/ekk-lm3s9b96/scripts/ekk-lm3s9b96.ld similarity index 100% rename from boards/arm/ekk-lm3s9b96/scripts/ekk-lm3s9b96.ld rename to boards/arm/tiva/ekk-lm3s9b96/scripts/ekk-lm3s9b96.ld diff --git a/boards/arm/teensy-lc/src/.gitignore b/boards/arm/tiva/ekk-lm3s9b96/src/.gitignore similarity index 100% rename from boards/arm/teensy-lc/src/.gitignore rename to boards/arm/tiva/ekk-lm3s9b96/src/.gitignore diff --git a/boards/arm/ekk-lm3s9b96/src/Makefile b/boards/arm/tiva/ekk-lm3s9b96/src/Makefile similarity index 100% rename from boards/arm/ekk-lm3s9b96/src/Makefile rename to boards/arm/tiva/ekk-lm3s9b96/src/Makefile diff --git a/boards/arm/ekk-lm3s9b96/src/ekk-lm3s9b96.h b/boards/arm/tiva/ekk-lm3s9b96/src/ekk-lm3s9b96.h similarity index 100% rename from boards/arm/ekk-lm3s9b96/src/ekk-lm3s9b96.h rename to boards/arm/tiva/ekk-lm3s9b96/src/ekk-lm3s9b96.h diff --git a/boards/arm/ekk-lm3s9b96/src/lm_appinit.c b/boards/arm/tiva/ekk-lm3s9b96/src/lm_appinit.c similarity index 100% rename from boards/arm/ekk-lm3s9b96/src/lm_appinit.c rename to boards/arm/tiva/ekk-lm3s9b96/src/lm_appinit.c diff --git a/boards/arm/ekk-lm3s9b96/src/lm_boot.c b/boards/arm/tiva/ekk-lm3s9b96/src/lm_boot.c similarity index 100% rename from boards/arm/ekk-lm3s9b96/src/lm_boot.c rename to boards/arm/tiva/ekk-lm3s9b96/src/lm_boot.c diff --git a/boards/arm/ekk-lm3s9b96/src/lm_ethernet.c b/boards/arm/tiva/ekk-lm3s9b96/src/lm_ethernet.c similarity index 100% rename from boards/arm/ekk-lm3s9b96/src/lm_ethernet.c rename to boards/arm/tiva/ekk-lm3s9b96/src/lm_ethernet.c diff --git a/boards/arm/ekk-lm3s9b96/src/lm_leds.c b/boards/arm/tiva/ekk-lm3s9b96/src/lm_leds.c similarity index 100% rename from boards/arm/ekk-lm3s9b96/src/lm_leds.c rename to boards/arm/tiva/ekk-lm3s9b96/src/lm_leds.c diff --git a/boards/arm/ekk-lm3s9b96/src/lm_ssi.c b/boards/arm/tiva/ekk-lm3s9b96/src/lm_ssi.c similarity index 100% rename from boards/arm/ekk-lm3s9b96/src/lm_ssi.c rename to boards/arm/tiva/ekk-lm3s9b96/src/lm_ssi.c diff --git a/boards/arm/launchxl-cc1310/Kconfig b/boards/arm/tiva/launchxl-cc1310/Kconfig similarity index 100% rename from boards/arm/launchxl-cc1310/Kconfig rename to boards/arm/tiva/launchxl-cc1310/Kconfig diff --git a/boards/arm/launchxl-cc1310/README.txt b/boards/arm/tiva/launchxl-cc1310/README.txt similarity index 100% rename from boards/arm/launchxl-cc1310/README.txt rename to boards/arm/tiva/launchxl-cc1310/README.txt diff --git a/boards/arm/launchxl-cc1310/configs/nsh/defconfig b/boards/arm/tiva/launchxl-cc1310/configs/nsh/defconfig similarity index 98% rename from boards/arm/launchxl-cc1310/configs/nsh/defconfig rename to boards/arm/tiva/launchxl-cc1310/configs/nsh/defconfig index 70a3bf91ac6..964e5fbaf34 100644 --- a/boards/arm/launchxl-cc1310/configs/nsh/defconfig +++ b/boards/arm/tiva/launchxl-cc1310/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="launchxl-cc1310" CONFIG_ARCH_BOARD_LAUNCHXL_CC1310=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_CC1310=y CONFIG_ARCH_CHIP_CC13X0=y CONFIG_ARCH_CHIP_CC13XX_V2=y diff --git a/boards/arm/launchxl-cc1310/include/board.h b/boards/arm/tiva/launchxl-cc1310/include/board.h similarity index 100% rename from boards/arm/launchxl-cc1310/include/board.h rename to boards/arm/tiva/launchxl-cc1310/include/board.h diff --git a/boards/arm/launchxl-cc1310/scripts/Make.defs b/boards/arm/tiva/launchxl-cc1310/scripts/Make.defs similarity index 96% rename from boards/arm/launchxl-cc1310/scripts/Make.defs rename to boards/arm/tiva/launchxl-cc1310/scripts/Make.defs index d9ff47d8a5c..2e94d0b8636 100644 --- a/boards/arm/launchxl-cc1310/scripts/Make.defs +++ b/boards/arm/tiva/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/launchxl-cc1310/scripts/flash.ld b/boards/arm/tiva/launchxl-cc1310/scripts/flash.ld similarity index 100% rename from boards/arm/launchxl-cc1310/scripts/flash.ld rename to boards/arm/tiva/launchxl-cc1310/scripts/flash.ld diff --git a/boards/arm/launchxl-cc1310/src/Makefile b/boards/arm/tiva/launchxl-cc1310/src/Makefile similarity index 100% rename from boards/arm/launchxl-cc1310/src/Makefile rename to boards/arm/tiva/launchxl-cc1310/src/Makefile diff --git a/boards/arm/launchxl-cc1310/src/cc1310_appinit.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_appinit.c similarity index 100% rename from boards/arm/launchxl-cc1310/src/cc1310_appinit.c rename to boards/arm/tiva/launchxl-cc1310/src/cc1310_appinit.c diff --git a/boards/arm/launchxl-cc1310/src/cc1310_autoleds.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_autoleds.c similarity index 100% rename from boards/arm/launchxl-cc1310/src/cc1310_autoleds.c rename to boards/arm/tiva/launchxl-cc1310/src/cc1310_autoleds.c diff --git a/boards/arm/launchxl-cc1310/src/cc1310_boot.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_boot.c similarity index 100% rename from boards/arm/launchxl-cc1310/src/cc1310_boot.c rename to boards/arm/tiva/launchxl-cc1310/src/cc1310_boot.c diff --git a/boards/arm/launchxl-cc1310/src/cc1310_bringup.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_bringup.c similarity index 100% rename from boards/arm/launchxl-cc1310/src/cc1310_bringup.c rename to boards/arm/tiva/launchxl-cc1310/src/cc1310_bringup.c diff --git a/boards/arm/launchxl-cc1310/src/cc1310_buttons.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_buttons.c similarity index 100% rename from boards/arm/launchxl-cc1310/src/cc1310_buttons.c rename to boards/arm/tiva/launchxl-cc1310/src/cc1310_buttons.c diff --git a/boards/arm/launchxl-cc1310/src/cc1310_pinconfig.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_pinconfig.c similarity index 100% rename from boards/arm/launchxl-cc1310/src/cc1310_pinconfig.c rename to boards/arm/tiva/launchxl-cc1310/src/cc1310_pinconfig.c diff --git a/boards/arm/launchxl-cc1310/src/cc1310_ssi.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_ssi.c similarity index 100% rename from boards/arm/launchxl-cc1310/src/cc1310_ssi.c rename to boards/arm/tiva/launchxl-cc1310/src/cc1310_ssi.c diff --git a/boards/arm/launchxl-cc1310/src/cc1310_userleds.c b/boards/arm/tiva/launchxl-cc1310/src/cc1310_userleds.c similarity index 100% rename from boards/arm/launchxl-cc1310/src/cc1310_userleds.c rename to boards/arm/tiva/launchxl-cc1310/src/cc1310_userleds.c diff --git a/boards/arm/launchxl-cc1310/src/launchxl-cc1310.h b/boards/arm/tiva/launchxl-cc1310/src/launchxl-cc1310.h similarity index 100% rename from boards/arm/launchxl-cc1310/src/launchxl-cc1310.h rename to boards/arm/tiva/launchxl-cc1310/src/launchxl-cc1310.h diff --git a/boards/arm/launchxl-cc1312r1/Kconfig b/boards/arm/tiva/launchxl-cc1312r1/Kconfig similarity index 100% rename from boards/arm/launchxl-cc1312r1/Kconfig rename to boards/arm/tiva/launchxl-cc1312r1/Kconfig diff --git a/boards/arm/launchxl-cc1312r1/README.txt b/boards/arm/tiva/launchxl-cc1312r1/README.txt similarity index 100% rename from boards/arm/launchxl-cc1312r1/README.txt rename to boards/arm/tiva/launchxl-cc1312r1/README.txt diff --git a/boards/arm/launchxl-cc1312r1/configs/nsh/defconfig b/boards/arm/tiva/launchxl-cc1312r1/configs/nsh/defconfig similarity index 98% rename from boards/arm/launchxl-cc1312r1/configs/nsh/defconfig rename to boards/arm/tiva/launchxl-cc1312r1/configs/nsh/defconfig index 88410627eda..d4d71510cd7 100644 --- a/boards/arm/launchxl-cc1312r1/configs/nsh/defconfig +++ b/boards/arm/tiva/launchxl-cc1312r1/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="launchxl-cc1312r1" CONFIG_ARCH_BOARD_LAUNCHXL_CC1312R1=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_CC1312R1=y CONFIG_ARCH_CHIP_CC13X2=y CONFIG_ARCH_CHIP_CC13XX_V1=y diff --git a/boards/arm/launchxl-cc1312r1/include/board.h b/boards/arm/tiva/launchxl-cc1312r1/include/board.h similarity index 100% rename from boards/arm/launchxl-cc1312r1/include/board.h rename to boards/arm/tiva/launchxl-cc1312r1/include/board.h diff --git a/boards/arm/launchxl-cc1312r1/scripts/Make.defs b/boards/arm/tiva/launchxl-cc1312r1/scripts/Make.defs similarity index 96% rename from boards/arm/launchxl-cc1312r1/scripts/Make.defs rename to boards/arm/tiva/launchxl-cc1312r1/scripts/Make.defs index e6f27eb9376..1fd1f7f59c1 100644 --- a/boards/arm/launchxl-cc1312r1/scripts/Make.defs +++ b/boards/arm/tiva/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/launchxl-cc1312r1/scripts/flash.ld b/boards/arm/tiva/launchxl-cc1312r1/scripts/flash.ld similarity index 100% rename from boards/arm/launchxl-cc1312r1/scripts/flash.ld rename to boards/arm/tiva/launchxl-cc1312r1/scripts/flash.ld diff --git a/boards/arm/launchxl-cc1312r1/scripts/sram.ld b/boards/arm/tiva/launchxl-cc1312r1/scripts/sram.ld similarity index 100% rename from boards/arm/launchxl-cc1312r1/scripts/sram.ld rename to boards/arm/tiva/launchxl-cc1312r1/scripts/sram.ld diff --git a/boards/arm/launchxl-cc1312r1/src/Makefile b/boards/arm/tiva/launchxl-cc1312r1/src/Makefile similarity index 100% rename from boards/arm/launchxl-cc1312r1/src/Makefile rename to boards/arm/tiva/launchxl-cc1312r1/src/Makefile diff --git a/boards/arm/launchxl-cc1312r1/src/cc1312_appinit.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_appinit.c similarity index 100% rename from boards/arm/launchxl-cc1312r1/src/cc1312_appinit.c rename to boards/arm/tiva/launchxl-cc1312r1/src/cc1312_appinit.c diff --git a/boards/arm/launchxl-cc1312r1/src/cc1312_autoleds.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_autoleds.c similarity index 100% rename from boards/arm/launchxl-cc1312r1/src/cc1312_autoleds.c rename to boards/arm/tiva/launchxl-cc1312r1/src/cc1312_autoleds.c diff --git a/boards/arm/launchxl-cc1312r1/src/cc1312_boot.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_boot.c similarity index 100% rename from boards/arm/launchxl-cc1312r1/src/cc1312_boot.c rename to boards/arm/tiva/launchxl-cc1312r1/src/cc1312_boot.c diff --git a/boards/arm/launchxl-cc1312r1/src/cc1312_bringup.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_bringup.c similarity index 100% rename from boards/arm/launchxl-cc1312r1/src/cc1312_bringup.c rename to boards/arm/tiva/launchxl-cc1312r1/src/cc1312_bringup.c diff --git a/boards/arm/launchxl-cc1312r1/src/cc1312_buttons.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_buttons.c similarity index 100% rename from boards/arm/launchxl-cc1312r1/src/cc1312_buttons.c rename to boards/arm/tiva/launchxl-cc1312r1/src/cc1312_buttons.c diff --git a/boards/arm/launchxl-cc1312r1/src/cc1312_pinconfig.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_pinconfig.c similarity index 100% rename from boards/arm/launchxl-cc1312r1/src/cc1312_pinconfig.c rename to boards/arm/tiva/launchxl-cc1312r1/src/cc1312_pinconfig.c diff --git a/boards/arm/launchxl-cc1312r1/src/cc1312_ssi.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_ssi.c similarity index 100% rename from boards/arm/launchxl-cc1312r1/src/cc1312_ssi.c rename to boards/arm/tiva/launchxl-cc1312r1/src/cc1312_ssi.c diff --git a/boards/arm/launchxl-cc1312r1/src/cc1312_userleds.c b/boards/arm/tiva/launchxl-cc1312r1/src/cc1312_userleds.c similarity index 100% rename from boards/arm/launchxl-cc1312r1/src/cc1312_userleds.c rename to boards/arm/tiva/launchxl-cc1312r1/src/cc1312_userleds.c diff --git a/boards/arm/launchxl-cc1312r1/src/launchxl-cc1312r1.h b/boards/arm/tiva/launchxl-cc1312r1/src/launchxl-cc1312r1.h similarity index 100% rename from boards/arm/launchxl-cc1312r1/src/launchxl-cc1312r1.h rename to boards/arm/tiva/launchxl-cc1312r1/src/launchxl-cc1312r1.h diff --git a/boards/arm/lm3s6432-s2e/Kconfig b/boards/arm/tiva/lm3s6432-s2e/Kconfig similarity index 100% rename from boards/arm/lm3s6432-s2e/Kconfig rename to boards/arm/tiva/lm3s6432-s2e/Kconfig diff --git a/boards/arm/lm3s6432-s2e/README.txt b/boards/arm/tiva/lm3s6432-s2e/README.txt similarity index 100% rename from boards/arm/lm3s6432-s2e/README.txt rename to boards/arm/tiva/lm3s6432-s2e/README.txt diff --git a/boards/arm/lm3s6432-s2e/configs/nsh/defconfig b/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig similarity index 98% rename from boards/arm/lm3s6432-s2e/configs/nsh/defconfig rename to boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig index c6332e45f6e..e1d18e276b2 100644 --- a/boards/arm/lm3s6432-s2e/configs/nsh/defconfig +++ b/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lm3s6432-s2e" CONFIG_ARCH_BOARD_LM3S6432S2E=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_LM3S6432=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y diff --git a/boards/arm/lm3s6432-s2e/include/board.h b/boards/arm/tiva/lm3s6432-s2e/include/board.h similarity index 100% rename from boards/arm/lm3s6432-s2e/include/board.h rename to boards/arm/tiva/lm3s6432-s2e/include/board.h diff --git a/boards/arm/lm3s6432-s2e/scripts/Make.defs b/boards/arm/tiva/lm3s6432-s2e/scripts/Make.defs similarity index 95% rename from boards/arm/lm3s6432-s2e/scripts/Make.defs rename to boards/arm/tiva/lm3s6432-s2e/scripts/Make.defs index 47b320b37fc..1a7ffa5cd14 100644 --- a/boards/arm/lm3s6432-s2e/scripts/Make.defs +++ b/boards/arm/tiva/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)/$(CONFIG_ARCH_BOARD)/scripts/lm3s6432-s2e.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/lm3s6432-s2e.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/lm3s6432-s2e.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/lm3s6432-s2e/scripts/lm3s6432-s2e.ld b/boards/arm/tiva/lm3s6432-s2e/scripts/lm3s6432-s2e.ld similarity index 100% rename from boards/arm/lm3s6432-s2e/scripts/lm3s6432-s2e.ld rename to boards/arm/tiva/lm3s6432-s2e/scripts/lm3s6432-s2e.ld diff --git a/boards/arm/tm4c123g-launchpad/src/.gitignore b/boards/arm/tiva/lm3s6432-s2e/src/.gitignore similarity index 100% rename from boards/arm/tm4c123g-launchpad/src/.gitignore rename to boards/arm/tiva/lm3s6432-s2e/src/.gitignore diff --git a/boards/arm/lm3s6432-s2e/src/Makefile b/boards/arm/tiva/lm3s6432-s2e/src/Makefile similarity index 100% rename from boards/arm/lm3s6432-s2e/src/Makefile rename to boards/arm/tiva/lm3s6432-s2e/src/Makefile diff --git a/boards/arm/lm3s6432-s2e/src/lm3s6432-s2e.h b/boards/arm/tiva/lm3s6432-s2e/src/lm3s6432-s2e.h similarity index 100% rename from boards/arm/lm3s6432-s2e/src/lm3s6432-s2e.h rename to boards/arm/tiva/lm3s6432-s2e/src/lm3s6432-s2e.h diff --git a/boards/arm/lm3s6432-s2e/src/lm_appinit.c b/boards/arm/tiva/lm3s6432-s2e/src/lm_appinit.c similarity index 100% rename from boards/arm/lm3s6432-s2e/src/lm_appinit.c rename to boards/arm/tiva/lm3s6432-s2e/src/lm_appinit.c diff --git a/boards/arm/lm3s6432-s2e/src/lm_boot.c b/boards/arm/tiva/lm3s6432-s2e/src/lm_boot.c similarity index 100% rename from boards/arm/lm3s6432-s2e/src/lm_boot.c rename to boards/arm/tiva/lm3s6432-s2e/src/lm_boot.c diff --git a/boards/arm/lm3s6432-s2e/src/lm_ethernet.c b/boards/arm/tiva/lm3s6432-s2e/src/lm_ethernet.c similarity index 100% rename from boards/arm/lm3s6432-s2e/src/lm_ethernet.c rename to boards/arm/tiva/lm3s6432-s2e/src/lm_ethernet.c diff --git a/boards/arm/lm3s6432-s2e/src/lm_leds.c b/boards/arm/tiva/lm3s6432-s2e/src/lm_leds.c similarity index 100% rename from boards/arm/lm3s6432-s2e/src/lm_leds.c rename to boards/arm/tiva/lm3s6432-s2e/src/lm_leds.c diff --git a/boards/arm/lm3s6432-s2e/src/lm_ssi.c b/boards/arm/tiva/lm3s6432-s2e/src/lm_ssi.c similarity index 100% rename from boards/arm/lm3s6432-s2e/src/lm_ssi.c rename to boards/arm/tiva/lm3s6432-s2e/src/lm_ssi.c diff --git a/boards/arm/lm3s6965-ek/Kconfig b/boards/arm/tiva/lm3s6965-ek/Kconfig similarity index 100% rename from boards/arm/lm3s6965-ek/Kconfig rename to boards/arm/tiva/lm3s6965-ek/Kconfig diff --git a/boards/arm/lm3s6965-ek/README.txt b/boards/arm/tiva/lm3s6965-ek/README.txt similarity index 100% rename from boards/arm/lm3s6965-ek/README.txt rename to boards/arm/tiva/lm3s6965-ek/README.txt diff --git a/boards/arm/lm3s6965-ek/configs/nsh/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/discover/defconfig similarity index 98% rename from boards/arm/lm3s6965-ek/configs/nsh/defconfig rename to boards/arm/tiva/lm3s6965-ek/configs/discover/defconfig index 94e0e34824c..d6b014efc10 100644 --- a/boards/arm/lm3s6965-ek/configs/nsh/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/discover/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lm3s6965-ek" CONFIG_ARCH_BOARD_LM3S6965EK=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_LM3S6965=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y diff --git a/boards/arm/lm3s6965-ek/configs/discover/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig similarity index 98% rename from boards/arm/lm3s6965-ek/configs/discover/defconfig rename to boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig index 94e0e34824c..d6b014efc10 100644 --- a/boards/arm/lm3s6965-ek/configs/discover/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lm3s6965-ek" CONFIG_ARCH_BOARD_LM3S6965EK=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_LM3S6965=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y diff --git a/boards/arm/lm3s6965-ek/configs/nx/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig similarity index 98% rename from boards/arm/lm3s6965-ek/configs/nx/defconfig rename to boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig index ed093cbcc89..27017dcdd09 100644 --- a/boards/arm/lm3s6965-ek/configs/nx/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lm3s6965-ek" CONFIG_ARCH_BOARD_LM3S6965EK=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_LM3S6965=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y diff --git a/boards/arm/lm3s6965-ek/configs/tcpecho/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig similarity index 98% rename from boards/arm/lm3s6965-ek/configs/tcpecho/defconfig rename to boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig index d8f626fc17d..78f67630a61 100644 --- a/boards/arm/lm3s6965-ek/configs/tcpecho/defconfig +++ b/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lm3s6965-ek" CONFIG_ARCH_BOARD_LM3S6965EK=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_LM3S6965=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y diff --git a/boards/arm/lm3s6965-ek/include/board.h b/boards/arm/tiva/lm3s6965-ek/include/board.h similarity index 100% rename from boards/arm/lm3s6965-ek/include/board.h rename to boards/arm/tiva/lm3s6965-ek/include/board.h diff --git a/boards/arm/lm3s6965-ek/scripts/Make.defs b/boards/arm/tiva/lm3s6965-ek/scripts/Make.defs similarity index 96% rename from boards/arm/lm3s6965-ek/scripts/Make.defs rename to boards/arm/tiva/lm3s6965-ek/scripts/Make.defs index 524f75287fe..99850e05100 100644 --- a/boards/arm/lm3s6965-ek/scripts/Make.defs +++ b/boards/arm/tiva/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/lm3s6965-ek/scripts/ld.script b/boards/arm/tiva/lm3s6965-ek/scripts/ld.script similarity index 100% rename from boards/arm/lm3s6965-ek/scripts/ld.script rename to boards/arm/tiva/lm3s6965-ek/scripts/ld.script diff --git a/boards/arm/tm4c1294-launchpad/src/.gitignore b/boards/arm/tiva/lm3s6965-ek/src/.gitignore similarity index 100% rename from boards/arm/tm4c1294-launchpad/src/.gitignore rename to boards/arm/tiva/lm3s6965-ek/src/.gitignore diff --git a/boards/arm/lm3s6965-ek/src/Makefile b/boards/arm/tiva/lm3s6965-ek/src/Makefile similarity index 100% rename from boards/arm/lm3s6965-ek/src/Makefile rename to boards/arm/tiva/lm3s6965-ek/src/Makefile diff --git a/boards/arm/lm3s6965-ek/src/lm3s6965-ek.h b/boards/arm/tiva/lm3s6965-ek/src/lm3s6965-ek.h similarity index 100% rename from boards/arm/lm3s6965-ek/src/lm3s6965-ek.h rename to boards/arm/tiva/lm3s6965-ek/src/lm3s6965-ek.h diff --git a/boards/arm/lm3s6965-ek/src/lm_appinit.c b/boards/arm/tiva/lm3s6965-ek/src/lm_appinit.c similarity index 100% rename from boards/arm/lm3s6965-ek/src/lm_appinit.c rename to boards/arm/tiva/lm3s6965-ek/src/lm_appinit.c diff --git a/boards/arm/lm3s6965-ek/src/lm_boot.c b/boards/arm/tiva/lm3s6965-ek/src/lm_boot.c similarity index 100% rename from boards/arm/lm3s6965-ek/src/lm_boot.c rename to boards/arm/tiva/lm3s6965-ek/src/lm_boot.c diff --git a/boards/arm/lm3s6965-ek/src/lm_ethernet.c b/boards/arm/tiva/lm3s6965-ek/src/lm_ethernet.c similarity index 100% rename from boards/arm/lm3s6965-ek/src/lm_ethernet.c rename to boards/arm/tiva/lm3s6965-ek/src/lm_ethernet.c diff --git a/boards/arm/lm3s6965-ek/src/lm_leds.c b/boards/arm/tiva/lm3s6965-ek/src/lm_leds.c similarity index 100% rename from boards/arm/lm3s6965-ek/src/lm_leds.c rename to boards/arm/tiva/lm3s6965-ek/src/lm_leds.c diff --git a/boards/arm/lm3s6965-ek/src/lm_oled.c b/boards/arm/tiva/lm3s6965-ek/src/lm_oled.c similarity index 100% rename from boards/arm/lm3s6965-ek/src/lm_oled.c rename to boards/arm/tiva/lm3s6965-ek/src/lm_oled.c diff --git a/boards/arm/lm3s6965-ek/src/lm_ssi.c b/boards/arm/tiva/lm3s6965-ek/src/lm_ssi.c similarity index 100% rename from boards/arm/lm3s6965-ek/src/lm_ssi.c rename to boards/arm/tiva/lm3s6965-ek/src/lm_ssi.c diff --git a/boards/arm/lm3s6965-ek/tools/lm3s6965-ek.cfg b/boards/arm/tiva/lm3s6965-ek/tools/lm3s6965-ek.cfg similarity index 100% rename from boards/arm/lm3s6965-ek/tools/lm3s6965-ek.cfg rename to boards/arm/tiva/lm3s6965-ek/tools/lm3s6965-ek.cfg diff --git a/boards/arm/lm3s6965-ek/tools/oocd.sh b/boards/arm/tiva/lm3s6965-ek/tools/oocd.sh similarity index 100% rename from boards/arm/lm3s6965-ek/tools/oocd.sh rename to boards/arm/tiva/lm3s6965-ek/tools/oocd.sh diff --git a/boards/arm/lm3s8962-ek/Kconfig b/boards/arm/tiva/lm3s8962-ek/Kconfig similarity index 100% rename from boards/arm/lm3s8962-ek/Kconfig rename to boards/arm/tiva/lm3s8962-ek/Kconfig diff --git a/boards/arm/lm3s8962-ek/README.txt b/boards/arm/tiva/lm3s8962-ek/README.txt similarity index 100% rename from boards/arm/lm3s8962-ek/README.txt rename to boards/arm/tiva/lm3s8962-ek/README.txt diff --git a/boards/arm/lm3s8962-ek/configs/nsh/defconfig b/boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig similarity index 98% rename from boards/arm/lm3s8962-ek/configs/nsh/defconfig rename to boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig index 22449c8d4f8..eef1a18531d 100644 --- a/boards/arm/lm3s8962-ek/configs/nsh/defconfig +++ b/boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lm3s8962-ek" CONFIG_ARCH_BOARD_LM3S8962EK=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_LM3S8962=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y diff --git a/boards/arm/lm3s8962-ek/configs/nx/defconfig b/boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig similarity index 98% rename from boards/arm/lm3s8962-ek/configs/nx/defconfig rename to boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig index c5fc22a8851..9c4b6927222 100644 --- a/boards/arm/lm3s8962-ek/configs/nx/defconfig +++ b/boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lm3s8962-ek" CONFIG_ARCH_BOARD_LM3S8962EK=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_LM3S8962=y CONFIG_ARCH_CHIP_LM3S=y CONFIG_ARCH_CHIP_LM=y diff --git a/boards/arm/lm3s8962-ek/include/board.h b/boards/arm/tiva/lm3s8962-ek/include/board.h similarity index 100% rename from boards/arm/lm3s8962-ek/include/board.h rename to boards/arm/tiva/lm3s8962-ek/include/board.h diff --git a/boards/arm/lm3s8962-ek/scripts/Make.defs b/boards/arm/tiva/lm3s8962-ek/scripts/Make.defs similarity index 96% rename from boards/arm/lm3s8962-ek/scripts/Make.defs rename to boards/arm/tiva/lm3s8962-ek/scripts/Make.defs index 48aa9a0b6c8..23b9ad98364 100644 --- a/boards/arm/lm3s8962-ek/scripts/Make.defs +++ b/boards/arm/tiva/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/lm3s8962-ek/scripts/ld.script b/boards/arm/tiva/lm3s8962-ek/scripts/ld.script similarity index 100% rename from boards/arm/lm3s8962-ek/scripts/ld.script rename to boards/arm/tiva/lm3s8962-ek/scripts/ld.script diff --git a/boards/arm/twr-k60n512/src/.gitignore b/boards/arm/tiva/lm3s8962-ek/src/.gitignore similarity index 100% rename from boards/arm/twr-k60n512/src/.gitignore rename to boards/arm/tiva/lm3s8962-ek/src/.gitignore diff --git a/boards/arm/lm3s8962-ek/src/Makefile b/boards/arm/tiva/lm3s8962-ek/src/Makefile similarity index 100% rename from boards/arm/lm3s8962-ek/src/Makefile rename to boards/arm/tiva/lm3s8962-ek/src/Makefile diff --git a/boards/arm/lm3s8962-ek/src/lm3s8962-ek.h b/boards/arm/tiva/lm3s8962-ek/src/lm3s8962-ek.h similarity index 100% rename from boards/arm/lm3s8962-ek/src/lm3s8962-ek.h rename to boards/arm/tiva/lm3s8962-ek/src/lm3s8962-ek.h diff --git a/boards/arm/lm3s8962-ek/src/lm_appinit.c b/boards/arm/tiva/lm3s8962-ek/src/lm_appinit.c similarity index 100% rename from boards/arm/lm3s8962-ek/src/lm_appinit.c rename to boards/arm/tiva/lm3s8962-ek/src/lm_appinit.c diff --git a/boards/arm/lm3s8962-ek/src/lm_boot.c b/boards/arm/tiva/lm3s8962-ek/src/lm_boot.c similarity index 100% rename from boards/arm/lm3s8962-ek/src/lm_boot.c rename to boards/arm/tiva/lm3s8962-ek/src/lm_boot.c diff --git a/boards/arm/lm3s8962-ek/src/lm_ethernet.c b/boards/arm/tiva/lm3s8962-ek/src/lm_ethernet.c similarity index 100% rename from boards/arm/lm3s8962-ek/src/lm_ethernet.c rename to boards/arm/tiva/lm3s8962-ek/src/lm_ethernet.c diff --git a/boards/arm/lm3s8962-ek/src/lm_leds.c b/boards/arm/tiva/lm3s8962-ek/src/lm_leds.c similarity index 100% rename from boards/arm/lm3s8962-ek/src/lm_leds.c rename to boards/arm/tiva/lm3s8962-ek/src/lm_leds.c diff --git a/boards/arm/lm3s8962-ek/src/lm_oled.c b/boards/arm/tiva/lm3s8962-ek/src/lm_oled.c similarity index 100% rename from boards/arm/lm3s8962-ek/src/lm_oled.c rename to boards/arm/tiva/lm3s8962-ek/src/lm_oled.c diff --git a/boards/arm/lm3s8962-ek/src/lm_ssi.c b/boards/arm/tiva/lm3s8962-ek/src/lm_ssi.c similarity index 100% rename from boards/arm/lm3s8962-ek/src/lm_ssi.c rename to boards/arm/tiva/lm3s8962-ek/src/lm_ssi.c diff --git a/boards/arm/lm4f120-launchpad/Kconfig b/boards/arm/tiva/lm4f120-launchpad/Kconfig similarity index 100% rename from boards/arm/lm4f120-launchpad/Kconfig rename to boards/arm/tiva/lm4f120-launchpad/Kconfig diff --git a/boards/arm/lm4f120-launchpad/README.txt b/boards/arm/tiva/lm4f120-launchpad/README.txt similarity index 100% rename from boards/arm/lm4f120-launchpad/README.txt rename to boards/arm/tiva/lm4f120-launchpad/README.txt diff --git a/boards/arm/lm4f120-launchpad/configs/nsh/defconfig b/boards/arm/tiva/lm4f120-launchpad/configs/nsh/defconfig similarity index 98% rename from boards/arm/lm4f120-launchpad/configs/nsh/defconfig rename to boards/arm/tiva/lm4f120-launchpad/configs/nsh/defconfig index 017a3e8fb20..2ddb8c5e4b9 100644 --- a/boards/arm/lm4f120-launchpad/configs/nsh/defconfig +++ b/boards/arm/tiva/lm4f120-launchpad/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="lm4f120-launchpad" CONFIG_ARCH_BOARD_LM4F120_LAUNCHPAD=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_LM4F120=y CONFIG_ARCH_CHIP_LM4F=y CONFIG_ARCH_CHIP_LM=y diff --git a/boards/arm/lm4f120-launchpad/include/board.h b/boards/arm/tiva/lm4f120-launchpad/include/board.h similarity index 100% rename from boards/arm/lm4f120-launchpad/include/board.h rename to boards/arm/tiva/lm4f120-launchpad/include/board.h diff --git a/boards/arm/lm4f120-launchpad/scripts/Make.defs b/boards/arm/tiva/lm4f120-launchpad/scripts/Make.defs similarity index 95% rename from boards/arm/lm4f120-launchpad/scripts/Make.defs rename to boards/arm/tiva/lm4f120-launchpad/scripts/Make.defs index 9e9ead41491..9ddc963ed29 100644 --- a/boards/arm/lm4f120-launchpad/scripts/Make.defs +++ b/boards/arm/tiva/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)/$(CONFIG_ARCH_BOARD)/scripts/lm4f120-launchpad.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/lm4f120-launchpad.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/lm4f120-launchpad.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/lm4f120-launchpad/scripts/lm4f120-launchpad.ld b/boards/arm/tiva/lm4f120-launchpad/scripts/lm4f120-launchpad.ld similarity index 100% rename from boards/arm/lm4f120-launchpad/scripts/lm4f120-launchpad.ld rename to boards/arm/tiva/lm4f120-launchpad/scripts/lm4f120-launchpad.ld diff --git a/boards/arm/u-blox-c027/src/.gitignore b/boards/arm/tiva/lm4f120-launchpad/src/.gitignore similarity index 100% rename from boards/arm/u-blox-c027/src/.gitignore rename to boards/arm/tiva/lm4f120-launchpad/src/.gitignore diff --git a/boards/arm/lm4f120-launchpad/src/Makefile b/boards/arm/tiva/lm4f120-launchpad/src/Makefile similarity index 100% rename from boards/arm/lm4f120-launchpad/src/Makefile rename to boards/arm/tiva/lm4f120-launchpad/src/Makefile diff --git a/boards/arm/lm4f120-launchpad/src/lm4f_appinit.c b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_appinit.c similarity index 100% rename from boards/arm/lm4f120-launchpad/src/lm4f_appinit.c rename to boards/arm/tiva/lm4f120-launchpad/src/lm4f_appinit.c diff --git a/boards/arm/lm4f120-launchpad/src/lm4f_autoleds.c b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_autoleds.c similarity index 100% rename from boards/arm/lm4f120-launchpad/src/lm4f_autoleds.c rename to boards/arm/tiva/lm4f120-launchpad/src/lm4f_autoleds.c diff --git a/boards/arm/lm4f120-launchpad/src/lm4f_boot.c b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_boot.c similarity index 100% rename from boards/arm/lm4f120-launchpad/src/lm4f_boot.c rename to boards/arm/tiva/lm4f120-launchpad/src/lm4f_boot.c diff --git a/boards/arm/lm4f120-launchpad/src/lm4f_ssi.c b/boards/arm/tiva/lm4f120-launchpad/src/lm4f_ssi.c similarity index 100% rename from boards/arm/lm4f120-launchpad/src/lm4f_ssi.c rename to boards/arm/tiva/lm4f120-launchpad/src/lm4f_ssi.c diff --git a/boards/arm/lm4f120-launchpad/src/lmf4120-launchpad.h b/boards/arm/tiva/lm4f120-launchpad/src/lmf4120-launchpad.h similarity index 100% rename from boards/arm/lm4f120-launchpad/src/lmf4120-launchpad.h rename to boards/arm/tiva/lm4f120-launchpad/src/lmf4120-launchpad.h diff --git a/boards/arm/lm4f120-launchpad/tools/lm4f120-launchpad.cfg b/boards/arm/tiva/lm4f120-launchpad/tools/lm4f120-launchpad.cfg similarity index 100% rename from boards/arm/lm4f120-launchpad/tools/lm4f120-launchpad.cfg rename to boards/arm/tiva/lm4f120-launchpad/tools/lm4f120-launchpad.cfg diff --git a/boards/arm/lm4f120-launchpad/tools/oocd.sh b/boards/arm/tiva/lm4f120-launchpad/tools/oocd.sh similarity index 100% rename from boards/arm/lm4f120-launchpad/tools/oocd.sh rename to boards/arm/tiva/lm4f120-launchpad/tools/oocd.sh diff --git a/boards/arm/tm4c123g-launchpad/Kconfig b/boards/arm/tiva/tm4c123g-launchpad/Kconfig similarity index 100% rename from boards/arm/tm4c123g-launchpad/Kconfig rename to boards/arm/tiva/tm4c123g-launchpad/Kconfig diff --git a/boards/arm/tm4c123g-launchpad/README.txt b/boards/arm/tiva/tm4c123g-launchpad/README.txt similarity index 100% rename from boards/arm/tm4c123g-launchpad/README.txt rename to boards/arm/tiva/tm4c123g-launchpad/README.txt diff --git a/boards/arm/tm4c123g-launchpad/configs/nsh/defconfig b/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig similarity index 98% rename from boards/arm/tm4c123g-launchpad/configs/nsh/defconfig rename to boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig index 7562d7332be..405d0d68fbd 100644 --- a/boards/arm/tm4c123g-launchpad/configs/nsh/defconfig +++ b/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="tm4c123g-launchpad" CONFIG_ARCH_BOARD_TM4C123G_LAUNCHPAD=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_TIVA=y CONFIG_ARCH_CHIP_TM4C123=y CONFIG_ARCH_CHIP_TM4C123GH6PM=y diff --git a/boards/arm/tm4c123g-launchpad/include/board.h b/boards/arm/tiva/tm4c123g-launchpad/include/board.h similarity index 100% rename from boards/arm/tm4c123g-launchpad/include/board.h rename to boards/arm/tiva/tm4c123g-launchpad/include/board.h diff --git a/boards/arm/tm4c123g-launchpad/scripts/Make.defs b/boards/arm/tiva/tm4c123g-launchpad/scripts/Make.defs similarity index 95% rename from boards/arm/tm4c123g-launchpad/scripts/Make.defs rename to boards/arm/tiva/tm4c123g-launchpad/scripts/Make.defs index 35d9df3a0ae..bc167772b99 100644 --- a/boards/arm/tm4c123g-launchpad/scripts/Make.defs +++ b/boards/arm/tiva/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)/$(CONFIG_ARCH_BOARD)/scripts/tm4c123g-launchpad.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/tm4c123g-launchpad.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/tm4c123g-launchpad.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/tm4c123g-launchpad/scripts/tm4c123g-launchpad.ld b/boards/arm/tiva/tm4c123g-launchpad/scripts/tm4c123g-launchpad.ld similarity index 100% rename from boards/arm/tm4c123g-launchpad/scripts/tm4c123g-launchpad.ld rename to boards/arm/tiva/tm4c123g-launchpad/scripts/tm4c123g-launchpad.ld diff --git a/boards/arm/viewtool-stm32f107/src/.gitignore b/boards/arm/tiva/tm4c123g-launchpad/src/.gitignore similarity index 100% rename from boards/arm/viewtool-stm32f107/src/.gitignore rename to boards/arm/tiva/tm4c123g-launchpad/src/.gitignore diff --git a/boards/arm/tm4c123g-launchpad/src/Makefile b/boards/arm/tiva/tm4c123g-launchpad/src/Makefile similarity index 100% rename from boards/arm/tm4c123g-launchpad/src/Makefile rename to boards/arm/tiva/tm4c123g-launchpad/src/Makefile diff --git a/boards/arm/tm4c123g-launchpad/src/tm4c123g-launchpad.h b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c123g-launchpad.h similarity index 100% rename from boards/arm/tm4c123g-launchpad/src/tm4c123g-launchpad.h rename to boards/arm/tiva/tm4c123g-launchpad/src/tm4c123g-launchpad.h diff --git a/boards/arm/tm4c123g-launchpad/src/tm4c_adc.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_adc.c similarity index 100% rename from boards/arm/tm4c123g-launchpad/src/tm4c_adc.c rename to boards/arm/tiva/tm4c123g-launchpad/src/tm4c_adc.c diff --git a/boards/arm/tm4c123g-launchpad/src/tm4c_appinit.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_appinit.c similarity index 100% rename from boards/arm/tm4c123g-launchpad/src/tm4c_appinit.c rename to boards/arm/tiva/tm4c123g-launchpad/src/tm4c_appinit.c diff --git a/boards/arm/tm4c123g-launchpad/src/tm4c_at24.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_at24.c similarity index 100% rename from boards/arm/tm4c123g-launchpad/src/tm4c_at24.c rename to boards/arm/tiva/tm4c123g-launchpad/src/tm4c_at24.c diff --git a/boards/arm/tm4c123g-launchpad/src/tm4c_autoleds.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_autoleds.c similarity index 100% rename from boards/arm/tm4c123g-launchpad/src/tm4c_autoleds.c rename to boards/arm/tiva/tm4c123g-launchpad/src/tm4c_autoleds.c diff --git a/boards/arm/tm4c123g-launchpad/src/tm4c_boot.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c similarity index 100% rename from boards/arm/tm4c123g-launchpad/src/tm4c_boot.c rename to boards/arm/tiva/tm4c123g-launchpad/src/tm4c_boot.c diff --git a/boards/arm/tm4c123g-launchpad/src/tm4c_bringup.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_bringup.c similarity index 100% rename from boards/arm/tm4c123g-launchpad/src/tm4c_bringup.c rename to boards/arm/tiva/tm4c123g-launchpad/src/tm4c_bringup.c diff --git a/boards/arm/tm4c123g-launchpad/src/tm4c_buttons.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_buttons.c similarity index 100% rename from boards/arm/tm4c123g-launchpad/src/tm4c_buttons.c rename to boards/arm/tiva/tm4c123g-launchpad/src/tm4c_buttons.c diff --git a/boards/arm/tm4c123g-launchpad/src/tm4c_ssi.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c similarity index 100% rename from boards/arm/tm4c123g-launchpad/src/tm4c_ssi.c rename to boards/arm/tiva/tm4c123g-launchpad/src/tm4c_ssi.c diff --git a/boards/arm/tm4c123g-launchpad/src/tm4c_timer.c b/boards/arm/tiva/tm4c123g-launchpad/src/tm4c_timer.c similarity index 100% rename from boards/arm/tm4c123g-launchpad/src/tm4c_timer.c rename to boards/arm/tiva/tm4c123g-launchpad/src/tm4c_timer.c diff --git a/boards/arm/tm4c123g-launchpad/tools/oocd.sh b/boards/arm/tiva/tm4c123g-launchpad/tools/oocd.sh similarity index 100% rename from boards/arm/tm4c123g-launchpad/tools/oocd.sh rename to boards/arm/tiva/tm4c123g-launchpad/tools/oocd.sh diff --git a/boards/arm/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg b/boards/arm/tiva/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg similarity index 100% rename from boards/arm/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg rename to boards/arm/tiva/tm4c123g-launchpad/tools/tm4c123g-launchpad.cfg diff --git a/boards/arm/tm4c1294-launchpad/Kconfig b/boards/arm/tiva/tm4c1294-launchpad/Kconfig similarity index 100% rename from boards/arm/tm4c1294-launchpad/Kconfig rename to boards/arm/tiva/tm4c1294-launchpad/Kconfig diff --git a/boards/arm/tm4c1294-launchpad/README.txt b/boards/arm/tiva/tm4c1294-launchpad/README.txt similarity index 100% rename from boards/arm/tm4c1294-launchpad/README.txt rename to boards/arm/tiva/tm4c1294-launchpad/README.txt diff --git a/boards/arm/tm4c1294-launchpad/configs/ipv6/defconfig b/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig similarity index 98% rename from boards/arm/tm4c1294-launchpad/configs/ipv6/defconfig rename to boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig index cfca6d1662e..681e1ac0679 100644 --- a/boards/arm/tm4c1294-launchpad/configs/ipv6/defconfig +++ b/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig @@ -13,6 +13,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="tm4c1294-launchpad" CONFIG_ARCH_BOARD_TM4C1294_LAUNCHPAD=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_TIVA=y CONFIG_ARCH_CHIP_TM4C1294NCPDT=y CONFIG_ARCH_CHIP_TM4C129=y diff --git a/boards/arm/tm4c1294-launchpad/configs/nsh/defconfig b/boards/arm/tiva/tm4c1294-launchpad/configs/nsh/defconfig similarity index 98% rename from boards/arm/tm4c1294-launchpad/configs/nsh/defconfig rename to boards/arm/tiva/tm4c1294-launchpad/configs/nsh/defconfig index 490e132effd..f540da1c916 100644 --- a/boards/arm/tm4c1294-launchpad/configs/nsh/defconfig +++ b/boards/arm/tiva/tm4c1294-launchpad/configs/nsh/defconfig @@ -11,6 +11,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="tm4c1294-launchpad" CONFIG_ARCH_BOARD_TM4C1294_LAUNCHPAD=y +CONFIG_ARCH_CHIP="tiva" CONFIG_ARCH_CHIP_TIVA=y CONFIG_ARCH_CHIP_TM4C1294NCPDT=y CONFIG_ARCH_CHIP_TM4C129=y diff --git a/boards/arm/tm4c1294-launchpad/include/board.h b/boards/arm/tiva/tm4c1294-launchpad/include/board.h similarity index 100% rename from boards/arm/tm4c1294-launchpad/include/board.h rename to boards/arm/tiva/tm4c1294-launchpad/include/board.h diff --git a/boards/arm/tm4c1294-launchpad/scripts/Make.defs b/boards/arm/tiva/tm4c1294-launchpad/scripts/Make.defs similarity index 96% rename from boards/arm/tm4c1294-launchpad/scripts/Make.defs rename to boards/arm/tiva/tm4c1294-launchpad/scripts/Make.defs index ad51c31ea47..175b58e68d7 100644 --- a/boards/arm/tm4c1294-launchpad/scripts/Make.defs +++ b/boards/arm/tiva/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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/tm4c1294-launchpad/scripts/ld.script b/boards/arm/tiva/tm4c1294-launchpad/scripts/ld.script similarity index 100% rename from boards/arm/tm4c1294-launchpad/scripts/ld.script rename to boards/arm/tiva/tm4c1294-launchpad/scripts/ld.script diff --git a/boards/arm/zkit-arm-1769/src/.gitignore b/boards/arm/tiva/tm4c1294-launchpad/src/.gitignore similarity index 100% rename from boards/arm/zkit-arm-1769/src/.gitignore rename to boards/arm/tiva/tm4c1294-launchpad/src/.gitignore diff --git a/boards/arm/tm4c1294-launchpad/src/Makefile b/boards/arm/tiva/tm4c1294-launchpad/src/Makefile similarity index 100% rename from boards/arm/tm4c1294-launchpad/src/Makefile rename to boards/arm/tiva/tm4c1294-launchpad/src/Makefile diff --git a/boards/arm/tm4c1294-launchpad/src/tm4c1294-launchpad.h b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c1294-launchpad.h similarity index 100% rename from boards/arm/tm4c1294-launchpad/src/tm4c1294-launchpad.h rename to boards/arm/tiva/tm4c1294-launchpad/src/tm4c1294-launchpad.h diff --git a/boards/arm/tm4c1294-launchpad/src/tm4c_appinit.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_appinit.c similarity index 100% rename from boards/arm/tm4c1294-launchpad/src/tm4c_appinit.c rename to boards/arm/tiva/tm4c1294-launchpad/src/tm4c_appinit.c diff --git a/boards/arm/tm4c1294-launchpad/src/tm4c_autoleds.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_autoleds.c similarity index 100% rename from boards/arm/tm4c1294-launchpad/src/tm4c_autoleds.c rename to boards/arm/tiva/tm4c1294-launchpad/src/tm4c_autoleds.c diff --git a/boards/arm/tm4c1294-launchpad/src/tm4c_boot.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_boot.c similarity index 100% rename from boards/arm/tm4c1294-launchpad/src/tm4c_boot.c rename to boards/arm/tiva/tm4c1294-launchpad/src/tm4c_boot.c diff --git a/boards/arm/tm4c1294-launchpad/src/tm4c_bringup.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_bringup.c similarity index 100% rename from boards/arm/tm4c1294-launchpad/src/tm4c_bringup.c rename to boards/arm/tiva/tm4c1294-launchpad/src/tm4c_bringup.c diff --git a/boards/arm/tm4c1294-launchpad/src/tm4c_buttons.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_buttons.c similarity index 100% rename from boards/arm/tm4c1294-launchpad/src/tm4c_buttons.c rename to boards/arm/tiva/tm4c1294-launchpad/src/tm4c_buttons.c diff --git a/boards/arm/tm4c1294-launchpad/src/tm4c_ethernet.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_ethernet.c similarity index 100% rename from boards/arm/tm4c1294-launchpad/src/tm4c_ethernet.c rename to boards/arm/tiva/tm4c1294-launchpad/src/tm4c_ethernet.c diff --git a/boards/arm/tm4c1294-launchpad/src/tm4c_hciuart.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_hciuart.c similarity index 100% rename from boards/arm/tm4c1294-launchpad/src/tm4c_hciuart.c rename to boards/arm/tiva/tm4c1294-launchpad/src/tm4c_hciuart.c diff --git a/boards/arm/tm4c1294-launchpad/src/tm4c_timer.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_timer.c similarity index 100% rename from boards/arm/tm4c1294-launchpad/src/tm4c_timer.c rename to boards/arm/tiva/tm4c1294-launchpad/src/tm4c_timer.c diff --git a/boards/arm/tm4c1294-launchpad/src/tm4c_userleds.c b/boards/arm/tiva/tm4c1294-launchpad/src/tm4c_userleds.c similarity index 100% rename from boards/arm/tm4c1294-launchpad/src/tm4c_userleds.c rename to boards/arm/tiva/tm4c1294-launchpad/src/tm4c_userleds.c diff --git a/boards/arm/tm4c1294-launchpad/tools/ek-tm4c1294xl.cfg b/boards/arm/tiva/tm4c1294-launchpad/tools/ek-tm4c1294xl.cfg similarity index 100% rename from boards/arm/tm4c1294-launchpad/tools/ek-tm4c1294xl.cfg rename to boards/arm/tiva/tm4c1294-launchpad/tools/ek-tm4c1294xl.cfg diff --git a/boards/arm/tm4c1294-launchpad/tools/oocd.sh b/boards/arm/tiva/tm4c1294-launchpad/tools/oocd.sh similarity index 100% rename from boards/arm/tm4c1294-launchpad/tools/oocd.sh rename to boards/arm/tiva/tm4c1294-launchpad/tools/oocd.sh diff --git a/boards/arm/launchxl-tms57004/Kconfig b/boards/arm/tms570/launchxl-tms57004/Kconfig similarity index 100% rename from boards/arm/launchxl-tms57004/Kconfig rename to boards/arm/tms570/launchxl-tms57004/Kconfig diff --git a/boards/arm/launchxl-tms57004/README.txt b/boards/arm/tms570/launchxl-tms57004/README.txt similarity index 100% rename from boards/arm/launchxl-tms57004/README.txt rename to boards/arm/tms570/launchxl-tms57004/README.txt diff --git a/boards/arm/launchxl-tms57004/configs/nsh/defconfig b/boards/arm/tms570/launchxl-tms57004/configs/nsh/defconfig similarity index 98% rename from boards/arm/launchxl-tms57004/configs/nsh/defconfig rename to boards/arm/tms570/launchxl-tms57004/configs/nsh/defconfig index 2464fea1ab6..c3258f0382c 100644 --- a/boards/arm/launchxl-tms57004/configs/nsh/defconfig +++ b/boards/arm/tms570/launchxl-tms57004/configs/nsh/defconfig @@ -10,6 +10,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="launchxl-tms57004" CONFIG_ARCH_BOARD_LAUNCHXL_TMS57004=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="tms570" CONFIG_ARCH_CHIP_TMS570=y CONFIG_ARCH_CHIP_TMS570LS0432PZ=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/launchxl-tms57004/include/board.h b/boards/arm/tms570/launchxl-tms57004/include/board.h similarity index 100% rename from boards/arm/launchxl-tms57004/include/board.h rename to boards/arm/tms570/launchxl-tms57004/include/board.h diff --git a/boards/arm/launchxl-tms57004/scripts/Make.defs b/boards/arm/tms570/launchxl-tms57004/scripts/Make.defs similarity index 94% rename from boards/arm/launchxl-tms57004/scripts/Make.defs rename to boards/arm/tms570/launchxl-tms57004/scripts/Make.defs index aa752b967f7..0c3688e8123 100644 --- a/boards/arm/launchxl-tms57004/scripts/Make.defs +++ b/boards/arm/tms570/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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/arm/launchxl-tms57004/scripts/flash-sram.ld b/boards/arm/tms570/launchxl-tms57004/scripts/flash-sram.ld similarity index 100% rename from boards/arm/launchxl-tms57004/scripts/flash-sram.ld rename to boards/arm/tms570/launchxl-tms57004/scripts/flash-sram.ld diff --git a/boards/arm/launchxl-tms57004/src/Makefile b/boards/arm/tms570/launchxl-tms57004/src/Makefile similarity index 100% rename from boards/arm/launchxl-tms57004/src/Makefile rename to boards/arm/tms570/launchxl-tms57004/src/Makefile diff --git a/boards/arm/launchxl-tms57004/src/launchxl-tms57004.h b/boards/arm/tms570/launchxl-tms57004/src/launchxl-tms57004.h similarity index 100% rename from boards/arm/launchxl-tms57004/src/launchxl-tms57004.h rename to boards/arm/tms570/launchxl-tms57004/src/launchxl-tms57004.h diff --git a/boards/arm/launchxl-tms57004/src/tms570_appinit.c b/boards/arm/tms570/launchxl-tms57004/src/tms570_appinit.c similarity index 100% rename from boards/arm/launchxl-tms57004/src/tms570_appinit.c rename to boards/arm/tms570/launchxl-tms57004/src/tms570_appinit.c diff --git a/boards/arm/launchxl-tms57004/src/tms570_autoleds.c b/boards/arm/tms570/launchxl-tms57004/src/tms570_autoleds.c similarity index 100% rename from boards/arm/launchxl-tms57004/src/tms570_autoleds.c rename to boards/arm/tms570/launchxl-tms57004/src/tms570_autoleds.c diff --git a/boards/arm/launchxl-tms57004/src/tms570_bringup.c b/boards/arm/tms570/launchxl-tms57004/src/tms570_bringup.c similarity index 100% rename from boards/arm/launchxl-tms57004/src/tms570_bringup.c rename to boards/arm/tms570/launchxl-tms57004/src/tms570_bringup.c diff --git a/boards/arm/launchxl-tms57004/src/tms570_buttons.c b/boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c similarity index 100% rename from boards/arm/launchxl-tms57004/src/tms570_buttons.c rename to boards/arm/tms570/launchxl-tms57004/src/tms570_buttons.c diff --git a/boards/arm/launchxl-tms57004/src/tms570_initialize.c b/boards/arm/tms570/launchxl-tms57004/src/tms570_initialize.c similarity index 100% rename from boards/arm/launchxl-tms57004/src/tms570_initialize.c rename to boards/arm/tms570/launchxl-tms57004/src/tms570_initialize.c diff --git a/boards/arm/launchxl-tms57004/src/tms570_userleds.c b/boards/arm/tms570/launchxl-tms57004/src/tms570_userleds.c similarity index 100% rename from boards/arm/launchxl-tms57004/src/tms570_userleds.c rename to boards/arm/tms570/launchxl-tms57004/src/tms570_userleds.c diff --git a/boards/arm/tms570ls31x-usb-kit/Kconfig b/boards/arm/tms570/tms570ls31x-usb-kit/Kconfig similarity index 100% rename from boards/arm/tms570ls31x-usb-kit/Kconfig rename to boards/arm/tms570/tms570ls31x-usb-kit/Kconfig diff --git a/boards/arm/tms570ls31x-usb-kit/README.txt b/boards/arm/tms570/tms570ls31x-usb-kit/README.txt similarity index 100% rename from boards/arm/tms570ls31x-usb-kit/README.txt rename to boards/arm/tms570/tms570ls31x-usb-kit/README.txt diff --git a/boards/arm/tms570ls31x-usb-kit/configs/nsh/defconfig b/boards/arm/tms570/tms570ls31x-usb-kit/configs/nsh/defconfig similarity index 98% rename from boards/arm/tms570ls31x-usb-kit/configs/nsh/defconfig rename to boards/arm/tms570/tms570ls31x-usb-kit/configs/nsh/defconfig index 237942f9c22..aebedd9cf77 100644 --- a/boards/arm/tms570ls31x-usb-kit/configs/nsh/defconfig +++ b/boards/arm/tms570/tms570ls31x-usb-kit/configs/nsh/defconfig @@ -9,6 +9,7 @@ CONFIG_ARCH_BOARD_TMS570LS31X_USB_KIT=y CONFIG_ARCH_BOARD="tms570ls31x-usb-kit" CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="tms570" CONFIG_ARCH_CHIP_TMS570=y CONFIG_ARCH_CHIP_TMS570LS3137ZWT=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/tms570ls31x-usb-kit/include/board.h b/boards/arm/tms570/tms570ls31x-usb-kit/include/board.h similarity index 100% rename from boards/arm/tms570ls31x-usb-kit/include/board.h rename to boards/arm/tms570/tms570ls31x-usb-kit/include/board.h diff --git a/boards/arm/tms570ls31x-usb-kit/include/nsh_romfsimg.h b/boards/arm/tms570/tms570ls31x-usb-kit/include/nsh_romfsimg.h similarity index 100% rename from boards/arm/tms570ls31x-usb-kit/include/nsh_romfsimg.h rename to boards/arm/tms570/tms570ls31x-usb-kit/include/nsh_romfsimg.h diff --git a/boards/arm/tms570ls31x-usb-kit/scripts/Make.defs b/boards/arm/tms570/tms570ls31x-usb-kit/scripts/Make.defs similarity index 94% rename from boards/arm/tms570ls31x-usb-kit/scripts/Make.defs rename to boards/arm/tms570/tms570ls31x-usb-kit/scripts/Make.defs index 6bb6825b3fa..343ac9747ab 100644 --- a/boards/arm/tms570ls31x-usb-kit/scripts/Make.defs +++ b/boards/arm/tms570/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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(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)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif ASMEXT = .S diff --git a/boards/arm/tms570ls31x-usb-kit/scripts/flash-sram.ld b/boards/arm/tms570/tms570ls31x-usb-kit/scripts/flash-sram.ld similarity index 100% rename from boards/arm/tms570ls31x-usb-kit/scripts/flash-sram.ld rename to boards/arm/tms570/tms570ls31x-usb-kit/scripts/flash-sram.ld diff --git a/boards/arm/tms570ls31x-usb-kit/src/Makefile b/boards/arm/tms570/tms570ls31x-usb-kit/src/Makefile similarity index 100% rename from boards/arm/tms570ls31x-usb-kit/src/Makefile rename to boards/arm/tms570/tms570ls31x-usb-kit/src/Makefile diff --git a/boards/arm/tms570ls31x-usb-kit/src/tms570_appinit.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_appinit.c similarity index 100% rename from boards/arm/tms570ls31x-usb-kit/src/tms570_appinit.c rename to boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_appinit.c diff --git a/boards/arm/tms570ls31x-usb-kit/src/tms570_autoleds.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_autoleds.c similarity index 100% rename from boards/arm/tms570ls31x-usb-kit/src/tms570_autoleds.c rename to boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_autoleds.c diff --git a/boards/arm/tms570ls31x-usb-kit/src/tms570_bringup.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_bringup.c similarity index 100% rename from boards/arm/tms570ls31x-usb-kit/src/tms570_bringup.c rename to boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_bringup.c diff --git a/boards/arm/tms570ls31x-usb-kit/src/tms570_buttons.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c similarity index 100% rename from boards/arm/tms570ls31x-usb-kit/src/tms570_buttons.c rename to boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_buttons.c diff --git a/boards/arm/tms570ls31x-usb-kit/src/tms570_initialize.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_initialize.c similarity index 100% rename from boards/arm/tms570ls31x-usb-kit/src/tms570_initialize.c rename to boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_initialize.c diff --git a/boards/arm/tms570ls31x-usb-kit/src/tms570_sdmmc.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_sdmmc.c similarity index 100% rename from boards/arm/tms570ls31x-usb-kit/src/tms570_sdmmc.c rename to boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_sdmmc.c diff --git a/boards/arm/tms570ls31x-usb-kit/src/tms570_spi.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_spi.c similarity index 100% rename from boards/arm/tms570ls31x-usb-kit/src/tms570_spi.c rename to boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_spi.c diff --git a/boards/arm/tms570ls31x-usb-kit/src/tms570_userleds.c b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_userleds.c similarity index 100% rename from boards/arm/tms570ls31x-usb-kit/src/tms570_userleds.c rename to boards/arm/tms570/tms570ls31x-usb-kit/src/tms570_userleds.c diff --git a/boards/arm/tms570ls31x-usb-kit/src/tms570ls31x_usb_kit.h b/boards/arm/tms570/tms570ls31x-usb-kit/src/tms570ls31x_usb_kit.h similarity index 100% rename from boards/arm/tms570ls31x-usb-kit/src/tms570ls31x_usb_kit.h rename to boards/arm/tms570/tms570ls31x-usb-kit/src/tms570ls31x_usb_kit.h diff --git a/boards/arm/p112/Kconfig b/boards/arm/xmc4/xmc4500-relax/Kconfig similarity index 100% rename from boards/arm/p112/Kconfig rename to boards/arm/xmc4/xmc4500-relax/Kconfig diff --git a/boards/arm/xmc4500-relax/README.txt b/boards/arm/xmc4/xmc4500-relax/README.txt similarity index 100% rename from boards/arm/xmc4500-relax/README.txt rename to boards/arm/xmc4/xmc4500-relax/README.txt diff --git a/boards/arm/xmc4500-relax/configs/nsh/defconfig b/boards/arm/xmc4/xmc4500-relax/configs/nsh/defconfig similarity index 98% rename from boards/arm/xmc4500-relax/configs/nsh/defconfig rename to boards/arm/xmc4/xmc4500-relax/configs/nsh/defconfig index fd9a2f2d592..bd415b7b8d2 100644 --- a/boards/arm/xmc4500-relax/configs/nsh/defconfig +++ b/boards/arm/xmc4/xmc4500-relax/configs/nsh/defconfig @@ -12,6 +12,7 @@ CONFIG_ARCH="arm" CONFIG_ARCH_BOARD="xmc4500-relax" CONFIG_ARCH_BOARD_XMC4500RELAX=y CONFIG_ARCH_BUTTONS=y +CONFIG_ARCH_CHIP="xmc4" CONFIG_ARCH_CHIP_XMC4500=y CONFIG_ARCH_CHIP_XMC4=y CONFIG_ARCH_INTERRUPTSTACK=2048 diff --git a/boards/arm/xmc4500-relax/include/board.h b/boards/arm/xmc4/xmc4500-relax/include/board.h similarity index 100% rename from boards/arm/xmc4500-relax/include/board.h rename to boards/arm/xmc4/xmc4500-relax/include/board.h diff --git a/boards/arm/xmc4500-relax/scripts/Make.defs b/boards/arm/xmc4/xmc4500-relax/scripts/Make.defs similarity index 96% rename from boards/arm/xmc4500-relax/scripts/Make.defs rename to boards/arm/xmc4/xmc4500-relax/scripts/Make.defs index 0539c95543a..1e5254ae3b8 100644 --- a/boards/arm/xmc4500-relax/scripts/Make.defs +++ b/boards/arm/xmc4/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/arm/xmc4500-relax/scripts/flash.ld b/boards/arm/xmc4/xmc4500-relax/scripts/flash.ld similarity index 100% rename from boards/arm/xmc4500-relax/scripts/flash.ld rename to boards/arm/xmc4/xmc4500-relax/scripts/flash.ld diff --git a/boards/arm/xmc4500-relax/src/Makefile b/boards/arm/xmc4/xmc4500-relax/src/Makefile similarity index 100% rename from boards/arm/xmc4500-relax/src/Makefile rename to boards/arm/xmc4/xmc4500-relax/src/Makefile diff --git a/boards/arm/xmc4500-relax/src/xmc4500-relax.h b/boards/arm/xmc4/xmc4500-relax/src/xmc4500-relax.h similarity index 100% rename from boards/arm/xmc4500-relax/src/xmc4500-relax.h rename to boards/arm/xmc4/xmc4500-relax/src/xmc4500-relax.h diff --git a/boards/arm/xmc4500-relax/src/xmc4_appinit.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_appinit.c similarity index 100% rename from boards/arm/xmc4500-relax/src/xmc4_appinit.c rename to boards/arm/xmc4/xmc4500-relax/src/xmc4_appinit.c diff --git a/boards/arm/xmc4500-relax/src/xmc4_autoleds.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_autoleds.c similarity index 100% rename from boards/arm/xmc4500-relax/src/xmc4_autoleds.c rename to boards/arm/xmc4/xmc4500-relax/src/xmc4_autoleds.c diff --git a/boards/arm/xmc4500-relax/src/xmc4_boot.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_boot.c similarity index 100% rename from boards/arm/xmc4500-relax/src/xmc4_boot.c rename to boards/arm/xmc4/xmc4500-relax/src/xmc4_boot.c diff --git a/boards/arm/xmc4500-relax/src/xmc4_bringup.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_bringup.c similarity index 100% rename from boards/arm/xmc4500-relax/src/xmc4_bringup.c rename to boards/arm/xmc4/xmc4500-relax/src/xmc4_bringup.c diff --git a/boards/arm/xmc4500-relax/src/xmc4_buttons.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_buttons.c similarity index 100% rename from boards/arm/xmc4500-relax/src/xmc4_buttons.c rename to boards/arm/xmc4/xmc4500-relax/src/xmc4_buttons.c diff --git a/boards/arm/xmc4500-relax/src/xmc4_max6675.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_max6675.c similarity index 100% rename from boards/arm/xmc4500-relax/src/xmc4_max6675.c rename to boards/arm/xmc4/xmc4500-relax/src/xmc4_max6675.c diff --git a/boards/arm/xmc4500-relax/src/xmc4_ostest.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_ostest.c similarity index 100% rename from boards/arm/xmc4500-relax/src/xmc4_ostest.c rename to boards/arm/xmc4/xmc4500-relax/src/xmc4_ostest.c diff --git a/boards/arm/xmc4500-relax/src/xmc4_spi.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_spi.c similarity index 100% rename from boards/arm/xmc4500-relax/src/xmc4_spi.c rename to boards/arm/xmc4/xmc4500-relax/src/xmc4_spi.c diff --git a/boards/arm/xmc4500-relax/src/xmc4_userleds.c b/boards/arm/xmc4/xmc4500-relax/src/xmc4_userleds.c similarity index 100% rename from boards/arm/xmc4500-relax/src/xmc4_userleds.c rename to boards/arm/xmc4/xmc4500-relax/src/xmc4_userleds.c diff --git a/boards/avr/avr32dev1/Kconfig b/boards/avr/at32uc3/avr32dev1/Kconfig similarity index 100% rename from boards/avr/avr32dev1/Kconfig rename to boards/avr/at32uc3/avr32dev1/Kconfig diff --git a/boards/avr/avr32dev1/README.txt b/boards/avr/at32uc3/avr32dev1/README.txt similarity index 100% rename from boards/avr/avr32dev1/README.txt rename to boards/avr/at32uc3/avr32dev1/README.txt diff --git a/boards/avr/avr32dev1/configs/nsh/defconfig b/boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig similarity index 100% rename from boards/avr/avr32dev1/configs/nsh/defconfig rename to boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig diff --git a/boards/avr/avr32dev1/configs/ostest/defconfig b/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig similarity index 100% rename from boards/avr/avr32dev1/configs/ostest/defconfig rename to boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig diff --git a/boards/avr/avr32dev1/include/board.h b/boards/avr/at32uc3/avr32dev1/include/board.h similarity index 100% rename from boards/avr/avr32dev1/include/board.h rename to boards/avr/at32uc3/avr32dev1/include/board.h diff --git a/boards/avr/avr32dev1/scripts/Make.defs b/boards/avr/at32uc3/avr32dev1/scripts/Make.defs similarity index 95% rename from boards/avr/avr32dev1/scripts/Make.defs rename to boards/avr/at32uc3/avr32dev1/scripts/Make.defs index 612dee409af..53e3ec9c73a 100644 --- a/boards/avr/avr32dev1/scripts/Make.defs +++ b/boards/avr/at32uc3/avr32dev1/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)/$(CONFIG_ARCH_BOARD)/scripts/avr32dev1.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/avr32dev1.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/avr32dev1.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/avr/avr32dev1/scripts/avr32dev1.ld b/boards/avr/at32uc3/avr32dev1/scripts/avr32dev1.ld similarity index 100% rename from boards/avr/avr32dev1/scripts/avr32dev1.ld rename to boards/avr/at32uc3/avr32dev1/scripts/avr32dev1.ld diff --git a/boards/arm/zp214xpa/src/.gitignore b/boards/avr/at32uc3/avr32dev1/src/.gitignore similarity index 100% rename from boards/arm/zp214xpa/src/.gitignore rename to boards/avr/at32uc3/avr32dev1/src/.gitignore diff --git a/boards/avr/avr32dev1/src/Makefile b/boards/avr/at32uc3/avr32dev1/src/Makefile similarity index 100% rename from boards/avr/avr32dev1/src/Makefile rename to boards/avr/at32uc3/avr32dev1/src/Makefile diff --git a/boards/avr/avr32dev1/src/avr32_boot.c b/boards/avr/at32uc3/avr32dev1/src/avr32_boot.c similarity index 100% rename from boards/avr/avr32dev1/src/avr32_boot.c rename to boards/avr/at32uc3/avr32dev1/src/avr32_boot.c diff --git a/boards/avr/avr32dev1/src/avr32_buttons.c b/boards/avr/at32uc3/avr32dev1/src/avr32_buttons.c similarity index 100% rename from boards/avr/avr32dev1/src/avr32_buttons.c rename to boards/avr/at32uc3/avr32dev1/src/avr32_buttons.c diff --git a/boards/avr/avr32dev1/src/avr32_leds.c b/boards/avr/at32uc3/avr32dev1/src/avr32_leds.c similarity index 100% rename from boards/avr/avr32dev1/src/avr32_leds.c rename to boards/avr/at32uc3/avr32dev1/src/avr32_leds.c diff --git a/boards/avr/avr32dev1/src/avr32dev1.h b/boards/avr/at32uc3/avr32dev1/src/avr32dev1.h similarity index 100% rename from boards/avr/avr32dev1/src/avr32dev1.h rename to boards/avr/at32uc3/avr32dev1/src/avr32dev1.h diff --git a/boards/avr/avr32dev1/tools/doisp.sh b/boards/avr/at32uc3/avr32dev1/tools/doisp.sh similarity index 100% rename from boards/avr/avr32dev1/tools/doisp.sh rename to boards/avr/at32uc3/avr32dev1/tools/doisp.sh diff --git a/boards/arm/xmc4500-relax/Kconfig b/boards/avr/at90usb/micropendous3/Kconfig similarity index 100% rename from boards/arm/xmc4500-relax/Kconfig rename to boards/avr/at90usb/micropendous3/Kconfig diff --git a/boards/avr/micropendous3/README.txt b/boards/avr/at90usb/micropendous3/README.txt similarity index 100% rename from boards/avr/micropendous3/README.txt rename to boards/avr/at90usb/micropendous3/README.txt diff --git a/boards/avr/micropendous3/configs/hello/defconfig b/boards/avr/at90usb/micropendous3/configs/hello/defconfig similarity index 100% rename from boards/avr/micropendous3/configs/hello/defconfig rename to boards/avr/at90usb/micropendous3/configs/hello/defconfig diff --git a/boards/avr/micropendous3/include/board.h b/boards/avr/at90usb/micropendous3/include/board.h similarity index 100% rename from boards/avr/micropendous3/include/board.h rename to boards/avr/at90usb/micropendous3/include/board.h diff --git a/boards/avr/micropendous3/scripts/Make.defs b/boards/avr/at90usb/micropendous3/scripts/Make.defs similarity index 95% rename from boards/avr/micropendous3/scripts/Make.defs rename to boards/avr/at90usb/micropendous3/scripts/Make.defs index b74270720a9..d1310933f95 100644 --- a/boards/avr/micropendous3/scripts/Make.defs +++ b/boards/avr/at90usb/micropendous3/scripts/Make.defs @@ -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)/$(CONFIG_ARCH_BOARD)/scripts/micropendous3.ld" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/micropendous3.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/micropendous3.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/avr/micropendous3/scripts/micropendous3.ld b/boards/avr/at90usb/micropendous3/scripts/micropendous3.ld similarity index 100% rename from boards/avr/micropendous3/scripts/micropendous3.ld rename to boards/avr/at90usb/micropendous3/scripts/micropendous3.ld diff --git a/boards/avr/amber/src/.gitignore b/boards/avr/at90usb/micropendous3/src/.gitignore similarity index 100% rename from boards/avr/amber/src/.gitignore rename to boards/avr/at90usb/micropendous3/src/.gitignore diff --git a/boards/avr/micropendous3/src/Makefile b/boards/avr/at90usb/micropendous3/src/Makefile similarity index 100% rename from boards/avr/micropendous3/src/Makefile rename to boards/avr/at90usb/micropendous3/src/Makefile diff --git a/boards/avr/micropendous3/src/at90usb_boot.c b/boards/avr/at90usb/micropendous3/src/at90usb_boot.c similarity index 100% rename from boards/avr/micropendous3/src/at90usb_boot.c rename to boards/avr/at90usb/micropendous3/src/at90usb_boot.c diff --git a/boards/avr/micropendous3/src/micropendous3.h b/boards/avr/at90usb/micropendous3/src/micropendous3.h similarity index 100% rename from boards/avr/micropendous3/src/micropendous3.h rename to boards/avr/at90usb/micropendous3/src/micropendous3.h diff --git a/boards/avr/teensy-2.0/Kconfig b/boards/avr/at90usb/teensy-2.0/Kconfig similarity index 100% rename from boards/avr/teensy-2.0/Kconfig rename to boards/avr/at90usb/teensy-2.0/Kconfig diff --git a/boards/avr/teensy-2.0/README.txt b/boards/avr/at90usb/teensy-2.0/README.txt similarity index 100% rename from boards/avr/teensy-2.0/README.txt rename to boards/avr/at90usb/teensy-2.0/README.txt diff --git a/boards/avr/teensy-2.0/configs/hello/defconfig b/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig similarity index 100% rename from boards/avr/teensy-2.0/configs/hello/defconfig rename to boards/avr/at90usb/teensy-2.0/configs/hello/defconfig diff --git a/boards/avr/teensy-2.0/configs/nsh/defconfig b/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig similarity index 100% rename from boards/avr/teensy-2.0/configs/nsh/defconfig rename to boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig diff --git a/boards/avr/teensy-2.0/configs/usbmsc/defconfig b/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig similarity index 100% rename from boards/avr/teensy-2.0/configs/usbmsc/defconfig rename to boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig diff --git a/boards/avr/teensy-2.0/include/board.h b/boards/avr/at90usb/teensy-2.0/include/board.h similarity index 100% rename from boards/avr/teensy-2.0/include/board.h rename to boards/avr/at90usb/teensy-2.0/include/board.h diff --git a/boards/avr/teensy-2.0/scripts/Make.defs b/boards/avr/at90usb/teensy-2.0/scripts/Make.defs similarity index 95% rename from boards/avr/teensy-2.0/scripts/Make.defs rename to boards/avr/at90usb/teensy-2.0/scripts/Make.defs index a8e38d105d4..55bfe3d0e56 100644 --- a/boards/avr/teensy-2.0/scripts/Make.defs +++ b/boards/avr/at90usb/teensy-2.0/scripts/Make.defs @@ -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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/avr/teensy-2.0/scripts/flash.ld b/boards/avr/at90usb/teensy-2.0/scripts/flash.ld similarity index 100% rename from boards/avr/teensy-2.0/scripts/flash.ld rename to boards/avr/at90usb/teensy-2.0/scripts/flash.ld diff --git a/boards/avr/avr32dev1/src/.gitignore b/boards/avr/at90usb/teensy-2.0/src/.gitignore similarity index 100% rename from boards/avr/avr32dev1/src/.gitignore rename to boards/avr/at90usb/teensy-2.0/src/.gitignore diff --git a/boards/avr/teensy-2.0/src/Makefile b/boards/avr/at90usb/teensy-2.0/src/Makefile similarity index 100% rename from boards/avr/teensy-2.0/src/Makefile rename to boards/avr/at90usb/teensy-2.0/src/Makefile diff --git a/boards/avr/teensy-2.0/src/at90usb_appinit.c b/boards/avr/at90usb/teensy-2.0/src/at90usb_appinit.c similarity index 100% rename from boards/avr/teensy-2.0/src/at90usb_appinit.c rename to boards/avr/at90usb/teensy-2.0/src/at90usb_appinit.c diff --git a/boards/avr/teensy-2.0/src/at90usb_boot.c b/boards/avr/at90usb/teensy-2.0/src/at90usb_boot.c similarity index 100% rename from boards/avr/teensy-2.0/src/at90usb_boot.c rename to boards/avr/at90usb/teensy-2.0/src/at90usb_boot.c diff --git a/boards/avr/teensy-2.0/src/at90usb_leds.c b/boards/avr/at90usb/teensy-2.0/src/at90usb_leds.c similarity index 100% rename from boards/avr/teensy-2.0/src/at90usb_leds.c rename to boards/avr/at90usb/teensy-2.0/src/at90usb_leds.c diff --git a/boards/avr/teensy-2.0/src/at90usb_spi.c b/boards/avr/at90usb/teensy-2.0/src/at90usb_spi.c similarity index 100% rename from boards/avr/teensy-2.0/src/at90usb_spi.c rename to boards/avr/at90usb/teensy-2.0/src/at90usb_spi.c diff --git a/boards/avr/teensy-2.0/src/at90usb_usbmsc.c b/boards/avr/at90usb/teensy-2.0/src/at90usb_usbmsc.c similarity index 100% rename from boards/avr/teensy-2.0/src/at90usb_usbmsc.c rename to boards/avr/at90usb/teensy-2.0/src/at90usb_usbmsc.c diff --git a/boards/avr/teensy-2.0/src/teensy-20.h b/boards/avr/at90usb/teensy-2.0/src/teensy-20.h similarity index 100% rename from boards/avr/teensy-2.0/src/teensy-20.h rename to boards/avr/at90usb/teensy-2.0/src/teensy-20.h diff --git a/boards/avr/amber/Kconfig b/boards/avr/atmega/amber/Kconfig similarity index 100% rename from boards/avr/amber/Kconfig rename to boards/avr/atmega/amber/Kconfig diff --git a/boards/avr/amber/README.txt b/boards/avr/atmega/amber/README.txt similarity index 100% rename from boards/avr/amber/README.txt rename to boards/avr/atmega/amber/README.txt diff --git a/boards/avr/amber/configs/hello/defconfig b/boards/avr/atmega/amber/configs/hello/defconfig similarity index 100% rename from boards/avr/amber/configs/hello/defconfig rename to boards/avr/atmega/amber/configs/hello/defconfig diff --git a/boards/avr/amber/include/board.h b/boards/avr/atmega/amber/include/board.h similarity index 100% rename from boards/avr/amber/include/board.h rename to boards/avr/atmega/amber/include/board.h diff --git a/boards/avr/amber/scripts/Make.defs b/boards/avr/atmega/amber/scripts/Make.defs similarity index 100% rename from boards/avr/amber/scripts/Make.defs rename to boards/avr/atmega/amber/scripts/Make.defs diff --git a/boards/avr/amber/scripts/amber.ld b/boards/avr/atmega/amber/scripts/amber.ld similarity index 100% rename from boards/avr/amber/scripts/amber.ld rename to boards/avr/atmega/amber/scripts/amber.ld diff --git a/boards/avr/micropendous3/src/.gitignore b/boards/avr/atmega/amber/src/.gitignore similarity index 100% rename from boards/avr/micropendous3/src/.gitignore rename to boards/avr/atmega/amber/src/.gitignore diff --git a/boards/avr/amber/src/Makefile b/boards/avr/atmega/amber/src/Makefile similarity index 100% rename from boards/avr/amber/src/Makefile rename to boards/avr/atmega/amber/src/Makefile diff --git a/boards/avr/amber/src/amber.h b/boards/avr/atmega/amber/src/amber.h similarity index 100% rename from boards/avr/amber/src/amber.h rename to boards/avr/atmega/amber/src/amber.h diff --git a/boards/avr/amber/src/atmega_boot.c b/boards/avr/atmega/amber/src/atmega_boot.c similarity index 100% rename from boards/avr/amber/src/atmega_boot.c rename to boards/avr/atmega/amber/src/atmega_boot.c diff --git a/boards/avr/arduino-mega2560/Kconfig b/boards/avr/atmega/arduino-mega2560/Kconfig similarity index 100% rename from boards/avr/arduino-mega2560/Kconfig rename to boards/avr/atmega/arduino-mega2560/Kconfig diff --git a/boards/avr/arduino-mega2560/README.txt b/boards/avr/atmega/arduino-mega2560/README.txt similarity index 100% rename from boards/avr/arduino-mega2560/README.txt rename to boards/avr/atmega/arduino-mega2560/README.txt diff --git a/boards/avr/arduino-mega2560/configs/hello/defconfig b/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig similarity index 100% rename from boards/avr/arduino-mega2560/configs/hello/defconfig rename to boards/avr/atmega/arduino-mega2560/configs/hello/defconfig diff --git a/boards/avr/arduino-mega2560/configs/nsh/defconfig b/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig similarity index 100% rename from boards/avr/arduino-mega2560/configs/nsh/defconfig rename to boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig diff --git a/boards/avr/arduino-mega2560/include/board.h b/boards/avr/atmega/arduino-mega2560/include/board.h similarity index 100% rename from boards/avr/arduino-mega2560/include/board.h rename to boards/avr/atmega/arduino-mega2560/include/board.h diff --git a/boards/avr/arduino-mega2560/scripts/Make.defs b/boards/avr/atmega/arduino-mega2560/scripts/Make.defs similarity index 97% rename from boards/avr/arduino-mega2560/scripts/Make.defs rename to boards/avr/atmega/arduino-mega2560/scripts/Make.defs index a567195afa1..919436a7114 100644 --- a/boards/avr/arduino-mega2560/scripts/Make.defs +++ b/boards/avr/atmega/arduino-mega2560/scripts/Make.defs @@ -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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards)/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/avr/arduino-mega2560/scripts/flash.ld b/boards/avr/atmega/arduino-mega2560/scripts/flash.ld similarity index 100% rename from boards/avr/arduino-mega2560/scripts/flash.ld rename to boards/avr/atmega/arduino-mega2560/scripts/flash.ld diff --git a/boards/avr/arduino-mega2560/src/Makefile b/boards/avr/atmega/arduino-mega2560/src/Makefile similarity index 100% rename from boards/avr/arduino-mega2560/src/Makefile rename to boards/avr/atmega/arduino-mega2560/src/Makefile diff --git a/boards/avr/arduino-mega2560/src/arduino_mega2560.h b/boards/avr/atmega/arduino-mega2560/src/arduino_mega2560.h similarity index 100% rename from boards/avr/arduino-mega2560/src/arduino_mega2560.h rename to boards/avr/atmega/arduino-mega2560/src/arduino_mega2560.h diff --git a/boards/avr/arduino-mega2560/src/avr_boot.c b/boards/avr/atmega/arduino-mega2560/src/avr_boot.c similarity index 100% rename from boards/avr/arduino-mega2560/src/avr_boot.c rename to boards/avr/atmega/arduino-mega2560/src/avr_boot.c diff --git a/boards/avr/arduino-mega2560/src/avr_leds.c b/boards/avr/atmega/arduino-mega2560/src/avr_leds.c similarity index 100% rename from boards/avr/arduino-mega2560/src/avr_leds.c rename to boards/avr/atmega/arduino-mega2560/src/avr_leds.c diff --git a/boards/avr/micropendous3/Kconfig b/boards/avr/atmega/moteino-mega/Kconfig similarity index 100% rename from boards/avr/micropendous3/Kconfig rename to boards/avr/atmega/moteino-mega/Kconfig diff --git a/boards/avr/moteino-mega/README.txt b/boards/avr/atmega/moteino-mega/README.txt similarity index 100% rename from boards/avr/moteino-mega/README.txt rename to boards/avr/atmega/moteino-mega/README.txt diff --git a/boards/avr/moteino-mega/configs/hello/defconfig b/boards/avr/atmega/moteino-mega/configs/hello/defconfig similarity index 100% rename from boards/avr/moteino-mega/configs/hello/defconfig rename to boards/avr/atmega/moteino-mega/configs/hello/defconfig diff --git a/boards/avr/moteino-mega/configs/nsh/defconfig b/boards/avr/atmega/moteino-mega/configs/nsh/defconfig similarity index 100% rename from boards/avr/moteino-mega/configs/nsh/defconfig rename to boards/avr/atmega/moteino-mega/configs/nsh/defconfig diff --git a/boards/avr/moteino-mega/include/board.h b/boards/avr/atmega/moteino-mega/include/board.h similarity index 100% rename from boards/avr/moteino-mega/include/board.h rename to boards/avr/atmega/moteino-mega/include/board.h diff --git a/boards/avr/moteino-mega/scripts/Make.defs b/boards/avr/atmega/moteino-mega/scripts/Make.defs similarity index 97% rename from boards/avr/moteino-mega/scripts/Make.defs rename to boards/avr/atmega/moteino-mega/scripts/Make.defs index 4b66f3f87ee..96973442491 100644 --- a/boards/avr/moteino-mega/scripts/Make.defs +++ b/boards/avr/atmega/moteino-mega/scripts/Make.defs @@ -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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/boards)/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc diff --git a/boards/avr/moteino-mega/scripts/ld.script b/boards/avr/atmega/moteino-mega/scripts/ld.script similarity index 100% rename from boards/avr/moteino-mega/scripts/ld.script rename to boards/avr/atmega/moteino-mega/scripts/ld.script diff --git a/boards/avr/moteino-mega/src/.gitignore b/boards/avr/atmega/moteino-mega/src/.gitignore similarity index 100% rename from boards/avr/moteino-mega/src/.gitignore rename to boards/avr/atmega/moteino-mega/src/.gitignore diff --git a/boards/avr/moteino-mega/src/Makefile b/boards/avr/atmega/moteino-mega/src/Makefile similarity index 100% rename from boards/avr/moteino-mega/src/Makefile rename to boards/avr/atmega/moteino-mega/src/Makefile diff --git a/boards/avr/moteino-mega/src/avr_boot.c b/boards/avr/atmega/moteino-mega/src/avr_boot.c similarity index 100% rename from boards/avr/moteino-mega/src/avr_boot.c rename to boards/avr/atmega/moteino-mega/src/avr_boot.c diff --git a/boards/avr/moteino-mega/src/avr_leds.c b/boards/avr/atmega/moteino-mega/src/avr_leds.c similarity index 100% rename from boards/avr/moteino-mega/src/avr_leds.c rename to boards/avr/atmega/moteino-mega/src/avr_leds.c diff --git a/boards/avr/moteino-mega/src/moteino_mega.h b/boards/avr/atmega/moteino-mega/src/moteino_mega.h similarity index 100% rename from boards/avr/moteino-mega/src/moteino_mega.h rename to boards/avr/atmega/moteino-mega/src/moteino_mega.h diff --git a/boards/hc/demo9s12ne64/Kconfig b/boards/hc/mcs92s12ne64/demo9s12ne64/Kconfig similarity index 100% rename from boards/hc/demo9s12ne64/Kconfig rename to boards/hc/mcs92s12ne64/demo9s12ne64/Kconfig diff --git a/boards/hc/demo9s12ne64/README.txt b/boards/hc/mcs92s12ne64/demo9s12ne64/README.txt similarity index 100% rename from boards/hc/demo9s12ne64/README.txt rename to boards/hc/mcs92s12ne64/demo9s12ne64/README.txt diff --git a/boards/hc/demo9s12ne64/configs/ostest/defconfig b/boards/hc/mcs92s12ne64/demo9s12ne64/configs/ostest/defconfig similarity index 100% rename from boards/hc/demo9s12ne64/configs/ostest/defconfig rename to boards/hc/mcs92s12ne64/demo9s12ne64/configs/ostest/defconfig diff --git a/boards/hc/demo9s12ne64/include/board.h b/boards/hc/mcs92s12ne64/demo9s12ne64/include/board.h similarity index 100% rename from boards/hc/demo9s12ne64/include/board.h rename to boards/hc/mcs92s12ne64/demo9s12ne64/include/board.h diff --git a/boards/hc/demo9s12ne64/scripts/Make.defs b/boards/hc/mcs92s12ne64/demo9s12ne64/scripts/Make.defs similarity index 96% rename from boards/hc/demo9s12ne64/scripts/Make.defs rename to boards/hc/mcs92s12ne64/demo9s12ne64/scripts/Make.defs index 50b6f0b7205..d4be853582f 100644 --- a/boards/hc/demo9s12ne64/scripts/Make.defs +++ b/boards/hc/mcs92s12ne64/demo9s12ne64/scripts/Make.defs @@ -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)/$(CONFIG_ARCH_BOARD)/ostest/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/ostest/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/ostest/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/hc/demo9s12ne64/scripts/demo9s12ne64-banked.ld b/boards/hc/mcs92s12ne64/demo9s12ne64/scripts/demo9s12ne64-banked.ld similarity index 100% rename from boards/hc/demo9s12ne64/scripts/demo9s12ne64-banked.ld rename to boards/hc/mcs92s12ne64/demo9s12ne64/scripts/demo9s12ne64-banked.ld diff --git a/boards/hc/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld b/boards/hc/mcs92s12ne64/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld similarity index 100% rename from boards/hc/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld rename to boards/hc/mcs92s12ne64/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld diff --git a/boards/avr/teensy-2.0/src/.gitignore b/boards/hc/mcs92s12ne64/demo9s12ne64/src/.gitignore similarity index 100% rename from boards/avr/teensy-2.0/src/.gitignore rename to boards/hc/mcs92s12ne64/demo9s12ne64/src/.gitignore diff --git a/boards/hc/demo9s12ne64/src/Makefile b/boards/hc/mcs92s12ne64/demo9s12ne64/src/Makefile similarity index 100% rename from boards/hc/demo9s12ne64/src/Makefile rename to boards/hc/mcs92s12ne64/demo9s12ne64/src/Makefile diff --git a/boards/hc/demo9s12ne64/src/demo9s12ne64.h b/boards/hc/mcs92s12ne64/demo9s12ne64/src/demo9s12ne64.h similarity index 100% rename from boards/hc/demo9s12ne64/src/demo9s12ne64.h rename to boards/hc/mcs92s12ne64/demo9s12ne64/src/demo9s12ne64.h diff --git a/boards/hc/demo9s12ne64/src/m9s12_appinit.c b/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_appinit.c similarity index 100% rename from boards/hc/demo9s12ne64/src/m9s12_appinit.c rename to boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_appinit.c diff --git a/boards/hc/demo9s12ne64/src/m9s12_boot.c b/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_boot.c similarity index 100% rename from boards/hc/demo9s12ne64/src/m9s12_boot.c rename to boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_boot.c diff --git a/boards/hc/demo9s12ne64/src/m9s12_buttons.c b/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_buttons.c similarity index 100% rename from boards/hc/demo9s12ne64/src/m9s12_buttons.c rename to boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_buttons.c diff --git a/boards/hc/demo9s12ne64/src/m9s12_leds.c b/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_leds.c similarity index 100% rename from boards/hc/demo9s12ne64/src/m9s12_leds.c rename to boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_leds.c diff --git a/boards/hc/demo9s12ne64/src/m9s12_spi.c b/boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_spi.c similarity index 100% rename from boards/hc/demo9s12ne64/src/m9s12_spi.c rename to boards/hc/mcs92s12ne64/demo9s12ne64/src/m9s12_spi.c diff --git a/boards/hc/ne64badge/Kconfig b/boards/hc/mcs92s12ne64/ne64badge/Kconfig similarity index 100% rename from boards/hc/ne64badge/Kconfig rename to boards/hc/mcs92s12ne64/ne64badge/Kconfig diff --git a/boards/hc/ne64badge/README.txt b/boards/hc/mcs92s12ne64/ne64badge/README.txt similarity index 100% rename from boards/hc/ne64badge/README.txt rename to boards/hc/mcs92s12ne64/ne64badge/README.txt diff --git a/boards/hc/ne64badge/configs/ostest/defconfig b/boards/hc/mcs92s12ne64/ne64badge/configs/ostest/defconfig similarity index 100% rename from boards/hc/ne64badge/configs/ostest/defconfig rename to boards/hc/mcs92s12ne64/ne64badge/configs/ostest/defconfig diff --git a/boards/hc/ne64badge/include/board.h b/boards/hc/mcs92s12ne64/ne64badge/include/board.h similarity index 100% rename from boards/hc/ne64badge/include/board.h rename to boards/hc/mcs92s12ne64/ne64badge/include/board.h diff --git a/boards/hc/ne64badge/scripts/Make.defs b/boards/hc/mcs92s12ne64/ne64badge/scripts/Make.defs similarity index 96% rename from boards/hc/ne64badge/scripts/Make.defs rename to boards/hc/mcs92s12ne64/ne64badge/scripts/Make.defs index 9eb34457f7d..b92a52136b7 100644 --- a/boards/hc/ne64badge/scripts/Make.defs +++ b/boards/hc/mcs92s12ne64/ne64badge/scripts/Make.defs @@ -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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/hc/ne64badge/scripts/ne64badge-banked.ld b/boards/hc/mcs92s12ne64/ne64badge/scripts/ne64badge-banked.ld similarity index 100% rename from boards/hc/ne64badge/scripts/ne64badge-banked.ld rename to boards/hc/mcs92s12ne64/ne64badge/scripts/ne64badge-banked.ld diff --git a/boards/hc/ne64badge/scripts/ne64badge-nonbanked.ld b/boards/hc/mcs92s12ne64/ne64badge/scripts/ne64badge-nonbanked.ld similarity index 100% rename from boards/hc/ne64badge/scripts/ne64badge-nonbanked.ld rename to boards/hc/mcs92s12ne64/ne64badge/scripts/ne64badge-nonbanked.ld diff --git a/boards/hc/demo9s12ne64/src/.gitignore b/boards/hc/mcs92s12ne64/ne64badge/src/.gitignore similarity index 100% rename from boards/hc/demo9s12ne64/src/.gitignore rename to boards/hc/mcs92s12ne64/ne64badge/src/.gitignore diff --git a/boards/hc/ne64badge/src/Makefile b/boards/hc/mcs92s12ne64/ne64badge/src/Makefile similarity index 100% rename from boards/hc/ne64badge/src/Makefile rename to boards/hc/mcs92s12ne64/ne64badge/src/Makefile diff --git a/boards/hc/ne64badge/src/m9s12_appinit.c b/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_appinit.c similarity index 100% rename from boards/hc/ne64badge/src/m9s12_appinit.c rename to boards/hc/mcs92s12ne64/ne64badge/src/m9s12_appinit.c diff --git a/boards/hc/ne64badge/src/m9s12_boot.c b/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_boot.c similarity index 100% rename from boards/hc/ne64badge/src/m9s12_boot.c rename to boards/hc/mcs92s12ne64/ne64badge/src/m9s12_boot.c diff --git a/boards/hc/ne64badge/src/m9s12_buttons.c b/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_buttons.c similarity index 100% rename from boards/hc/ne64badge/src/m9s12_buttons.c rename to boards/hc/mcs92s12ne64/ne64badge/src/m9s12_buttons.c diff --git a/boards/hc/ne64badge/src/m9s12_leds.c b/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_leds.c similarity index 100% rename from boards/hc/ne64badge/src/m9s12_leds.c rename to boards/hc/mcs92s12ne64/ne64badge/src/m9s12_leds.c diff --git a/boards/hc/ne64badge/src/m9s12_spi.c b/boards/hc/mcs92s12ne64/ne64badge/src/m9s12_spi.c similarity index 100% rename from boards/hc/ne64badge/src/m9s12_spi.c rename to boards/hc/mcs92s12ne64/ne64badge/src/m9s12_spi.c diff --git a/boards/hc/ne64badge/src/ne64badge.h b/boards/hc/mcs92s12ne64/ne64badge/src/ne64badge.h similarity index 100% rename from boards/hc/ne64badge/src/ne64badge.h rename to boards/hc/mcs92s12ne64/ne64badge/src/ne64badge.h diff --git a/boards/mips/mirtoo/Kconfig b/boards/mips/pic32mx/mirtoo/Kconfig similarity index 100% rename from boards/mips/mirtoo/Kconfig rename to boards/mips/pic32mx/mirtoo/Kconfig diff --git a/boards/mips/mirtoo/README.txt b/boards/mips/pic32mx/mirtoo/README.txt similarity index 100% rename from boards/mips/mirtoo/README.txt rename to boards/mips/pic32mx/mirtoo/README.txt diff --git a/boards/mips/mirtoo/configs/nsh/defconfig b/boards/mips/pic32mx/mirtoo/configs/nsh/defconfig similarity index 100% rename from boards/mips/mirtoo/configs/nsh/defconfig rename to boards/mips/pic32mx/mirtoo/configs/nsh/defconfig diff --git a/boards/mips/mirtoo/configs/nxffs/defconfig b/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig similarity index 100% rename from boards/mips/mirtoo/configs/nxffs/defconfig rename to boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig diff --git a/boards/mips/mirtoo/include/board.h b/boards/mips/pic32mx/mirtoo/include/board.h similarity index 100% rename from boards/mips/mirtoo/include/board.h rename to boards/mips/pic32mx/mirtoo/include/board.h diff --git a/boards/mips/mirtoo/scripts/Make.defs b/boards/mips/pic32mx/mirtoo/scripts/Make.defs similarity index 95% rename from boards/mips/mirtoo/scripts/Make.defs rename to boards/mips/pic32mx/mirtoo/scripts/Make.defs index 8c408ac5e8a..3cfa6d957de 100644 --- a/boards/mips/mirtoo/scripts/Make.defs +++ b/boards/mips/pic32mx/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/mips/mirtoo/scripts/c32-debug.ld b/boards/mips/pic32mx/mirtoo/scripts/c32-debug.ld similarity index 100% rename from boards/mips/mirtoo/scripts/c32-debug.ld rename to boards/mips/pic32mx/mirtoo/scripts/c32-debug.ld diff --git a/boards/mips/mirtoo/scripts/c32-release.ld b/boards/mips/pic32mx/mirtoo/scripts/c32-release.ld similarity index 100% rename from boards/mips/mirtoo/scripts/c32-release.ld rename to boards/mips/pic32mx/mirtoo/scripts/c32-release.ld diff --git a/boards/mips/mirtoo/scripts/mips-elf-debug.ld b/boards/mips/pic32mx/mirtoo/scripts/mips-elf-debug.ld similarity index 100% rename from boards/mips/mirtoo/scripts/mips-elf-debug.ld rename to boards/mips/pic32mx/mirtoo/scripts/mips-elf-debug.ld diff --git a/boards/mips/mirtoo/scripts/mips-elf-release.ld b/boards/mips/pic32mx/mirtoo/scripts/mips-elf-release.ld similarity index 100% rename from boards/mips/mirtoo/scripts/mips-elf-release.ld rename to boards/mips/pic32mx/mirtoo/scripts/mips-elf-release.ld diff --git a/boards/mips/mirtoo/scripts/xc32-debug.ld b/boards/mips/pic32mx/mirtoo/scripts/xc32-debug.ld similarity index 100% rename from boards/mips/mirtoo/scripts/xc32-debug.ld rename to boards/mips/pic32mx/mirtoo/scripts/xc32-debug.ld diff --git a/boards/mips/mirtoo/scripts/xc32-release.ld b/boards/mips/pic32mx/mirtoo/scripts/xc32-release.ld similarity index 100% rename from boards/mips/mirtoo/scripts/xc32-release.ld rename to boards/mips/pic32mx/mirtoo/scripts/xc32-release.ld diff --git a/boards/hc/ne64badge/src/.gitignore b/boards/mips/pic32mx/mirtoo/src/.gitignore similarity index 100% rename from boards/hc/ne64badge/src/.gitignore rename to boards/mips/pic32mx/mirtoo/src/.gitignore diff --git a/boards/mips/mirtoo/src/Makefile b/boards/mips/pic32mx/mirtoo/src/Makefile similarity index 100% rename from boards/mips/mirtoo/src/Makefile rename to boards/mips/pic32mx/mirtoo/src/Makefile diff --git a/boards/mips/mirtoo/src/mirtoo.h b/boards/mips/pic32mx/mirtoo/src/mirtoo.h similarity index 100% rename from boards/mips/mirtoo/src/mirtoo.h rename to boards/mips/pic32mx/mirtoo/src/mirtoo.h diff --git a/boards/mips/mirtoo/src/pic32_adc.c b/boards/mips/pic32mx/mirtoo/src/pic32_adc.c similarity index 100% rename from boards/mips/mirtoo/src/pic32_adc.c rename to boards/mips/pic32mx/mirtoo/src/pic32_adc.c diff --git a/boards/mips/mirtoo/src/pic32_appinit.c b/boards/mips/pic32mx/mirtoo/src/pic32_appinit.c similarity index 100% rename from boards/mips/mirtoo/src/pic32_appinit.c rename to boards/mips/pic32mx/mirtoo/src/pic32_appinit.c diff --git a/boards/mips/mirtoo/src/pic32_boot.c b/boards/mips/pic32mx/mirtoo/src/pic32_boot.c similarity index 100% rename from boards/mips/mirtoo/src/pic32_boot.c rename to boards/mips/pic32mx/mirtoo/src/pic32_boot.c diff --git a/boards/mips/mirtoo/src/pic32_leds.c b/boards/mips/pic32mx/mirtoo/src/pic32_leds.c similarity index 100% rename from boards/mips/mirtoo/src/pic32_leds.c rename to boards/mips/pic32mx/mirtoo/src/pic32_leds.c diff --git a/boards/mips/mirtoo/src/pic32_spi2.c b/boards/mips/pic32mx/mirtoo/src/pic32_spi2.c similarity index 100% rename from boards/mips/mirtoo/src/pic32_spi2.c rename to boards/mips/pic32mx/mirtoo/src/pic32_spi2.c diff --git a/boards/mips/pic32mx-starterkit/Kconfig b/boards/mips/pic32mx/pic32mx-starterkit/Kconfig similarity index 100% rename from boards/mips/pic32mx-starterkit/Kconfig rename to boards/mips/pic32mx/pic32mx-starterkit/Kconfig diff --git a/boards/mips/pic32mx-starterkit/README.txt b/boards/mips/pic32mx/pic32mx-starterkit/README.txt similarity index 100% rename from boards/mips/pic32mx-starterkit/README.txt rename to boards/mips/pic32mx/pic32mx-starterkit/README.txt diff --git a/boards/mips/pic32mx-starterkit/configs/nsh/defconfig b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh/defconfig similarity index 100% rename from boards/mips/pic32mx-starterkit/configs/nsh/defconfig rename to boards/mips/pic32mx/pic32mx-starterkit/configs/nsh/defconfig diff --git a/boards/mips/pic32mx-starterkit/configs/nsh2/defconfig b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig similarity index 100% rename from boards/mips/pic32mx-starterkit/configs/nsh2/defconfig rename to boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig diff --git a/boards/mips/pic32mx-starterkit/include/board.h b/boards/mips/pic32mx/pic32mx-starterkit/include/board.h similarity index 100% rename from boards/mips/pic32mx-starterkit/include/board.h rename to boards/mips/pic32mx/pic32mx-starterkit/include/board.h diff --git a/boards/mips/pic32mx-starterkit/scripts/Make.defs b/boards/mips/pic32mx/pic32mx-starterkit/scripts/Make.defs similarity index 95% rename from boards/mips/pic32mx-starterkit/scripts/Make.defs rename to boards/mips/pic32mx/pic32mx-starterkit/scripts/Make.defs index 36483e6d9cc..6dff8148b6e 100644 --- a/boards/mips/pic32mx-starterkit/scripts/Make.defs +++ b/boards/mips/pic32mx/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/mips/pic32mx-starterkit/scripts/c32-release.ld b/boards/mips/pic32mx/pic32mx-starterkit/scripts/c32-release.ld similarity index 100% rename from boards/mips/pic32mx-starterkit/scripts/c32-release.ld rename to boards/mips/pic32mx/pic32mx-starterkit/scripts/c32-release.ld diff --git a/boards/mips/pic32mx-starterkit/scripts/mips-release.ld b/boards/mips/pic32mx/pic32mx-starterkit/scripts/mips-release.ld similarity index 100% rename from boards/mips/pic32mx-starterkit/scripts/mips-release.ld rename to boards/mips/pic32mx/pic32mx-starterkit/scripts/mips-release.ld diff --git a/boards/mips/flipnclick-pic32mz/src/.gitignore b/boards/mips/pic32mx/pic32mx-starterkit/src/.gitignore similarity index 100% rename from boards/mips/flipnclick-pic32mz/src/.gitignore rename to boards/mips/pic32mx/pic32mx-starterkit/src/.gitignore diff --git a/boards/mips/pic32mx-starterkit/src/Makefile b/boards/mips/pic32mx/pic32mx-starterkit/src/Makefile similarity index 100% rename from boards/mips/pic32mx-starterkit/src/Makefile rename to boards/mips/pic32mx/pic32mx-starterkit/src/Makefile diff --git a/boards/mips/pic32mx-starterkit/src/pic32mx-starterkit.h b/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx-starterkit.h similarity index 100% rename from boards/mips/pic32mx-starterkit/src/pic32mx-starterkit.h rename to boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx-starterkit.h diff --git a/boards/mips/pic32mx-starterkit/src/pic32mx_appinit.c b/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_appinit.c similarity index 100% rename from boards/mips/pic32mx-starterkit/src/pic32mx_appinit.c rename to boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_appinit.c diff --git a/boards/mips/pic32mx-starterkit/src/pic32mx_boot.c b/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_boot.c similarity index 100% rename from boards/mips/pic32mx-starterkit/src/pic32mx_boot.c rename to boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_boot.c diff --git a/boards/mips/pic32mx-starterkit/src/pic32mx_leds.c b/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_leds.c similarity index 100% rename from boards/mips/pic32mx-starterkit/src/pic32mx_leds.c rename to boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_leds.c diff --git a/boards/mips/pic32mx-starterkit/src/pic32mx_spi.c b/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_spi.c similarity index 100% rename from boards/mips/pic32mx-starterkit/src/pic32mx_spi.c rename to boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_spi.c diff --git a/boards/mips/pic32mx-starterkit/src/pic32mx_usbdev.c b/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_usbdev.c similarity index 100% rename from boards/mips/pic32mx-starterkit/src/pic32mx_usbdev.c rename to boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_usbdev.c diff --git a/boards/mips/pic32mx-starterkit/src/pic32mx_usbmsc.c b/boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_usbmsc.c similarity index 100% rename from boards/mips/pic32mx-starterkit/src/pic32mx_usbmsc.c rename to boards/mips/pic32mx/pic32mx-starterkit/src/pic32mx_usbmsc.c diff --git a/boards/mips/pic32mx7mmb/Kconfig b/boards/mips/pic32mx/pic32mx7mmb/Kconfig similarity index 100% rename from boards/mips/pic32mx7mmb/Kconfig rename to boards/mips/pic32mx/pic32mx7mmb/Kconfig diff --git a/boards/mips/pic32mx7mmb/README.txt b/boards/mips/pic32mx/pic32mx7mmb/README.txt similarity index 100% rename from boards/mips/pic32mx7mmb/README.txt rename to boards/mips/pic32mx/pic32mx7mmb/README.txt diff --git a/boards/mips/pic32mx7mmb/configs/nsh/defconfig b/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig similarity index 100% rename from boards/mips/pic32mx7mmb/configs/nsh/defconfig rename to boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig diff --git a/boards/mips/pic32mx7mmb/include/board.h b/boards/mips/pic32mx/pic32mx7mmb/include/board.h similarity index 100% rename from boards/mips/pic32mx7mmb/include/board.h rename to boards/mips/pic32mx/pic32mx7mmb/include/board.h diff --git a/boards/mips/pic32mx7mmb/scripts/Make.defs b/boards/mips/pic32mx/pic32mx7mmb/scripts/Make.defs similarity index 95% rename from boards/mips/pic32mx7mmb/scripts/Make.defs rename to boards/mips/pic32mx/pic32mx7mmb/scripts/Make.defs index 9aaf346d049..6af7320c176 100644 --- a/boards/mips/pic32mx7mmb/scripts/Make.defs +++ b/boards/mips/pic32mx/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/mips/pic32mx7mmb/scripts/c32-release.ld b/boards/mips/pic32mx/pic32mx7mmb/scripts/c32-release.ld similarity index 100% rename from boards/mips/pic32mx7mmb/scripts/c32-release.ld rename to boards/mips/pic32mx/pic32mx7mmb/scripts/c32-release.ld diff --git a/boards/mips/pic32mx7mmb/scripts/mips-release.ld b/boards/mips/pic32mx/pic32mx7mmb/scripts/mips-release.ld similarity index 100% rename from boards/mips/pic32mx7mmb/scripts/mips-release.ld rename to boards/mips/pic32mx/pic32mx7mmb/scripts/mips-release.ld diff --git a/boards/mips/mirtoo/src/.gitignore b/boards/mips/pic32mx/pic32mx7mmb/src/.gitignore similarity index 100% rename from boards/mips/mirtoo/src/.gitignore rename to boards/mips/pic32mx/pic32mx7mmb/src/.gitignore diff --git a/boards/mips/pic32mx7mmb/src/Makefile b/boards/mips/pic32mx/pic32mx7mmb/src/Makefile similarity index 100% rename from boards/mips/pic32mx7mmb/src/Makefile rename to boards/mips/pic32mx/pic32mx7mmb/src/Makefile diff --git a/boards/mips/pic32mx7mmb/src/pic32_appinit.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_appinit.c similarity index 100% rename from boards/mips/pic32mx7mmb/src/pic32_appinit.c rename to boards/mips/pic32mx/pic32mx7mmb/src/pic32_appinit.c diff --git a/boards/mips/pic32mx7mmb/src/pic32_boot.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_boot.c similarity index 100% rename from boards/mips/pic32mx7mmb/src/pic32_boot.c rename to boards/mips/pic32mx/pic32mx7mmb/src/pic32_boot.c diff --git a/boards/mips/pic32mx7mmb/src/pic32_bringup.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_bringup.c similarity index 100% rename from boards/mips/pic32mx7mmb/src/pic32_bringup.c rename to boards/mips/pic32mx/pic32mx7mmb/src/pic32_bringup.c diff --git a/boards/mips/pic32mx7mmb/src/pic32_leds.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_leds.c similarity index 100% rename from boards/mips/pic32mx7mmb/src/pic32_leds.c rename to boards/mips/pic32mx/pic32mx7mmb/src/pic32_leds.c diff --git a/boards/mips/pic32mx7mmb/src/pic32_mio283qt2.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_mio283qt2.c similarity index 100% rename from boards/mips/pic32mx7mmb/src/pic32_mio283qt2.c rename to boards/mips/pic32mx/pic32mx7mmb/src/pic32_mio283qt2.c diff --git a/boards/mips/pic32mx7mmb/src/pic32_spi.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_spi.c similarity index 100% rename from boards/mips/pic32mx7mmb/src/pic32_spi.c rename to boards/mips/pic32mx/pic32mx7mmb/src/pic32_spi.c diff --git a/boards/mips/pic32mx7mmb/src/pic32_touchscreen.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_touchscreen.c similarity index 100% rename from boards/mips/pic32mx7mmb/src/pic32_touchscreen.c rename to boards/mips/pic32mx/pic32mx7mmb/src/pic32_touchscreen.c diff --git a/boards/mips/pic32mx7mmb/src/pic32_usbdev.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_usbdev.c similarity index 100% rename from boards/mips/pic32mx7mmb/src/pic32_usbdev.c rename to boards/mips/pic32mx/pic32mx7mmb/src/pic32_usbdev.c diff --git a/boards/mips/pic32mx7mmb/src/pic32_usbmsc.c b/boards/mips/pic32mx/pic32mx7mmb/src/pic32_usbmsc.c similarity index 100% rename from boards/mips/pic32mx7mmb/src/pic32_usbmsc.c rename to boards/mips/pic32mx/pic32mx7mmb/src/pic32_usbmsc.c diff --git a/boards/mips/pic32mx7mmb/src/pic32mx7mmb.h b/boards/mips/pic32mx/pic32mx7mmb/src/pic32mx7mmb.h similarity index 100% rename from boards/mips/pic32mx7mmb/src/pic32mx7mmb.h rename to boards/mips/pic32mx/pic32mx7mmb/src/pic32mx7mmb.h diff --git a/boards/mips/sure-pic32mx/Kconfig b/boards/mips/pic32mx/sure-pic32mx/Kconfig similarity index 100% rename from boards/mips/sure-pic32mx/Kconfig rename to boards/mips/pic32mx/sure-pic32mx/Kconfig diff --git a/boards/mips/sure-pic32mx/README.txt b/boards/mips/pic32mx/sure-pic32mx/README.txt similarity index 100% rename from boards/mips/sure-pic32mx/README.txt rename to boards/mips/pic32mx/sure-pic32mx/README.txt diff --git a/boards/mips/sure-pic32mx/configs/nsh/defconfig b/boards/mips/pic32mx/sure-pic32mx/configs/nsh/defconfig similarity index 100% rename from boards/mips/sure-pic32mx/configs/nsh/defconfig rename to boards/mips/pic32mx/sure-pic32mx/configs/nsh/defconfig diff --git a/boards/mips/sure-pic32mx/configs/usbnsh/defconfig b/boards/mips/pic32mx/sure-pic32mx/configs/usbnsh/defconfig similarity index 100% rename from boards/mips/sure-pic32mx/configs/usbnsh/defconfig rename to boards/mips/pic32mx/sure-pic32mx/configs/usbnsh/defconfig diff --git a/boards/mips/sure-pic32mx/include/board.h b/boards/mips/pic32mx/sure-pic32mx/include/board.h similarity index 100% rename from boards/mips/sure-pic32mx/include/board.h rename to boards/mips/pic32mx/sure-pic32mx/include/board.h diff --git a/boards/mips/sure-pic32mx/scripts/Make.defs b/boards/mips/pic32mx/sure-pic32mx/scripts/Make.defs similarity index 95% rename from boards/mips/sure-pic32mx/scripts/Make.defs rename to boards/mips/pic32mx/sure-pic32mx/scripts/Make.defs index ac20eeb0fff..449175d91d2 100644 --- a/boards/mips/sure-pic32mx/scripts/Make.defs +++ b/boards/mips/pic32mx/sure-pic32mx/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/mips/sure-pic32mx/scripts/c32-release.ld b/boards/mips/pic32mx/sure-pic32mx/scripts/c32-release.ld similarity index 100% rename from boards/mips/sure-pic32mx/scripts/c32-release.ld rename to boards/mips/pic32mx/sure-pic32mx/scripts/c32-release.ld diff --git a/boards/mips/sure-pic32mx/scripts/mips-release.ld b/boards/mips/pic32mx/sure-pic32mx/scripts/mips-release.ld similarity index 100% rename from boards/mips/sure-pic32mx/scripts/mips-release.ld rename to boards/mips/pic32mx/sure-pic32mx/scripts/mips-release.ld diff --git a/boards/mips/pic32mx-starterkit/src/.gitignore b/boards/mips/pic32mx/sure-pic32mx/src/.gitignore similarity index 100% rename from boards/mips/pic32mx-starterkit/src/.gitignore rename to boards/mips/pic32mx/sure-pic32mx/src/.gitignore diff --git a/boards/mips/sure-pic32mx/src/Makefile b/boards/mips/pic32mx/sure-pic32mx/src/Makefile similarity index 100% rename from boards/mips/sure-pic32mx/src/Makefile rename to boards/mips/pic32mx/sure-pic32mx/src/Makefile diff --git a/boards/mips/sure-pic32mx/src/pic32mx_appinit.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_appinit.c similarity index 100% rename from boards/mips/sure-pic32mx/src/pic32mx_appinit.c rename to boards/mips/pic32mx/sure-pic32mx/src/pic32mx_appinit.c diff --git a/boards/mips/sure-pic32mx/src/pic32mx_autoleds.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_autoleds.c similarity index 100% rename from boards/mips/sure-pic32mx/src/pic32mx_autoleds.c rename to boards/mips/pic32mx/sure-pic32mx/src/pic32mx_autoleds.c diff --git a/boards/mips/sure-pic32mx/src/pic32mx_boot.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_boot.c similarity index 100% rename from boards/mips/sure-pic32mx/src/pic32mx_boot.c rename to boards/mips/pic32mx/sure-pic32mx/src/pic32mx_boot.c diff --git a/boards/mips/sure-pic32mx/src/pic32mx_buttons.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_buttons.c similarity index 100% rename from boards/mips/sure-pic32mx/src/pic32mx_buttons.c rename to boards/mips/pic32mx/sure-pic32mx/src/pic32mx_buttons.c diff --git a/boards/mips/sure-pic32mx/src/pic32mx_lcd1602.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c similarity index 100% rename from boards/mips/sure-pic32mx/src/pic32mx_lcd1602.c rename to boards/mips/pic32mx/sure-pic32mx/src/pic32mx_lcd1602.c diff --git a/boards/mips/sure-pic32mx/src/pic32mx_spi.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_spi.c similarity index 100% rename from boards/mips/sure-pic32mx/src/pic32mx_spi.c rename to boards/mips/pic32mx/sure-pic32mx/src/pic32mx_spi.c diff --git a/boards/mips/sure-pic32mx/src/pic32mx_usbdev.c b/boards/mips/pic32mx/sure-pic32mx/src/pic32mx_usbdev.c similarity index 100% rename from boards/mips/sure-pic32mx/src/pic32mx_usbdev.c rename to boards/mips/pic32mx/sure-pic32mx/src/pic32mx_usbdev.c diff --git a/boards/mips/sure-pic32mx/src/sure-pic32mx.h b/boards/mips/pic32mx/sure-pic32mx/src/sure-pic32mx.h similarity index 100% rename from boards/mips/sure-pic32mx/src/sure-pic32mx.h rename to boards/mips/pic32mx/sure-pic32mx/src/sure-pic32mx.h diff --git a/boards/mips/ubw32/Kconfig b/boards/mips/pic32mx/ubw32/Kconfig similarity index 100% rename from boards/mips/ubw32/Kconfig rename to boards/mips/pic32mx/ubw32/Kconfig diff --git a/boards/mips/ubw32/README.txt b/boards/mips/pic32mx/ubw32/README.txt similarity index 100% rename from boards/mips/ubw32/README.txt rename to boards/mips/pic32mx/ubw32/README.txt diff --git a/boards/mips/ubw32/configs/nsh/defconfig b/boards/mips/pic32mx/ubw32/configs/nsh/defconfig similarity index 100% rename from boards/mips/ubw32/configs/nsh/defconfig rename to boards/mips/pic32mx/ubw32/configs/nsh/defconfig diff --git a/boards/mips/ubw32/include/board.h b/boards/mips/pic32mx/ubw32/include/board.h similarity index 100% rename from boards/mips/ubw32/include/board.h rename to boards/mips/pic32mx/ubw32/include/board.h diff --git a/boards/mips/ubw32/scripts/Make.defs b/boards/mips/pic32mx/ubw32/scripts/Make.defs similarity index 95% rename from boards/mips/ubw32/scripts/Make.defs rename to boards/mips/pic32mx/ubw32/scripts/Make.defs index b1fc3f6be73..09575ac6725 100644 --- a/boards/mips/ubw32/scripts/Make.defs +++ b/boards/mips/pic32mx/ubw32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/mips/ubw32/scripts/c32-release.ld b/boards/mips/pic32mx/ubw32/scripts/c32-release.ld similarity index 100% rename from boards/mips/ubw32/scripts/c32-release.ld rename to boards/mips/pic32mx/ubw32/scripts/c32-release.ld diff --git a/boards/mips/ubw32/scripts/mips-release.ld b/boards/mips/pic32mx/ubw32/scripts/mips-release.ld similarity index 100% rename from boards/mips/ubw32/scripts/mips-release.ld rename to boards/mips/pic32mx/ubw32/scripts/mips-release.ld diff --git a/boards/mips/pic32mx7mmb/src/.gitignore b/boards/mips/pic32mx/ubw32/src/.gitignore similarity index 100% rename from boards/mips/pic32mx7mmb/src/.gitignore rename to boards/mips/pic32mx/ubw32/src/.gitignore diff --git a/boards/mips/ubw32/src/Makefile b/boards/mips/pic32mx/ubw32/src/Makefile similarity index 100% rename from boards/mips/ubw32/src/Makefile rename to boards/mips/pic32mx/ubw32/src/Makefile diff --git a/boards/mips/ubw32/src/pic32_appinit.c b/boards/mips/pic32mx/ubw32/src/pic32_appinit.c similarity index 100% rename from boards/mips/ubw32/src/pic32_appinit.c rename to boards/mips/pic32mx/ubw32/src/pic32_appinit.c diff --git a/boards/mips/ubw32/src/pic32_boot.c b/boards/mips/pic32mx/ubw32/src/pic32_boot.c similarity index 100% rename from boards/mips/ubw32/src/pic32_boot.c rename to boards/mips/pic32mx/ubw32/src/pic32_boot.c diff --git a/boards/mips/ubw32/src/pic32_buttons.c b/boards/mips/pic32mx/ubw32/src/pic32_buttons.c similarity index 100% rename from boards/mips/ubw32/src/pic32_buttons.c rename to boards/mips/pic32mx/ubw32/src/pic32_buttons.c diff --git a/boards/mips/ubw32/src/pic32_leds.c b/boards/mips/pic32mx/ubw32/src/pic32_leds.c similarity index 100% rename from boards/mips/ubw32/src/pic32_leds.c rename to boards/mips/pic32mx/ubw32/src/pic32_leds.c diff --git a/boards/mips/ubw32/src/pic32_usbdev.c b/boards/mips/pic32mx/ubw32/src/pic32_usbdev.c similarity index 100% rename from boards/mips/ubw32/src/pic32_usbdev.c rename to boards/mips/pic32mx/ubw32/src/pic32_usbdev.c diff --git a/boards/mips/ubw32/src/ubw32.h b/boards/mips/pic32mx/ubw32/src/ubw32.h similarity index 100% rename from boards/mips/ubw32/src/ubw32.h rename to boards/mips/pic32mx/ubw32/src/ubw32.h diff --git a/boards/mips/flipnclick-pic32mz/Kconfig b/boards/mips/pic32mz/flipnclick-pic32mz/Kconfig similarity index 100% rename from boards/mips/flipnclick-pic32mz/Kconfig rename to boards/mips/pic32mz/flipnclick-pic32mz/Kconfig diff --git a/boards/mips/flipnclick-pic32mz/README.txt b/boards/mips/pic32mz/flipnclick-pic32mz/README.txt similarity index 100% rename from boards/mips/flipnclick-pic32mz/README.txt rename to boards/mips/pic32mz/flipnclick-pic32mz/README.txt diff --git a/boards/mips/flipnclick-pic32mz/configs/nsh/defconfig b/boards/mips/pic32mz/flipnclick-pic32mz/configs/nsh/defconfig similarity index 100% rename from boards/mips/flipnclick-pic32mz/configs/nsh/defconfig rename to boards/mips/pic32mz/flipnclick-pic32mz/configs/nsh/defconfig diff --git a/boards/mips/flipnclick-pic32mz/configs/nxlines/defconfig b/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig similarity index 100% rename from boards/mips/flipnclick-pic32mz/configs/nxlines/defconfig rename to boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig diff --git a/boards/mips/flipnclick-pic32mz/include/board.h b/boards/mips/pic32mz/flipnclick-pic32mz/include/board.h similarity index 100% rename from boards/mips/flipnclick-pic32mz/include/board.h rename to boards/mips/pic32mz/flipnclick-pic32mz/include/board.h diff --git a/boards/mips/flipnclick-pic32mz/scripts/Make.defs b/boards/mips/pic32mz/flipnclick-pic32mz/scripts/Make.defs similarity index 96% rename from boards/mips/flipnclick-pic32mz/scripts/Make.defs rename to boards/mips/pic32mz/flipnclick-pic32mz/scripts/Make.defs index 7412d0a3618..ceadc87c669 100644 --- a/boards/mips/flipnclick-pic32mz/scripts/Make.defs +++ b/boards/mips/pic32mz/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/mips/flipnclick-pic32mz/scripts/c32-debug.ld b/boards/mips/pic32mz/flipnclick-pic32mz/scripts/c32-debug.ld similarity index 100% rename from boards/mips/flipnclick-pic32mz/scripts/c32-debug.ld rename to boards/mips/pic32mz/flipnclick-pic32mz/scripts/c32-debug.ld diff --git a/boards/mips/flipnclick-pic32mz/scripts/mips-debug.ld b/boards/mips/pic32mz/flipnclick-pic32mz/scripts/mips-debug.ld similarity index 100% rename from boards/mips/flipnclick-pic32mz/scripts/mips-debug.ld rename to boards/mips/pic32mz/flipnclick-pic32mz/scripts/mips-debug.ld diff --git a/boards/mips/flipnclick-pic32mz/scripts/pinguino-debug.ld b/boards/mips/pic32mz/flipnclick-pic32mz/scripts/pinguino-debug.ld similarity index 100% rename from boards/mips/flipnclick-pic32mz/scripts/pinguino-debug.ld rename to boards/mips/pic32mz/flipnclick-pic32mz/scripts/pinguino-debug.ld diff --git a/boards/mips/flipnclick-pic32mz/scripts/xc32-debug.ld b/boards/mips/pic32mz/flipnclick-pic32mz/scripts/xc32-debug.ld similarity index 100% rename from boards/mips/flipnclick-pic32mz/scripts/xc32-debug.ld rename to boards/mips/pic32mz/flipnclick-pic32mz/scripts/xc32-debug.ld diff --git a/boards/mips/pic32mz-starterkit/src/.gitignore b/boards/mips/pic32mz/flipnclick-pic32mz/src/.gitignore similarity index 100% rename from boards/mips/pic32mz-starterkit/src/.gitignore rename to boards/mips/pic32mz/flipnclick-pic32mz/src/.gitignore diff --git a/boards/mips/flipnclick-pic32mz/src/Makefile b/boards/mips/pic32mz/flipnclick-pic32mz/src/Makefile similarity index 100% rename from boards/mips/flipnclick-pic32mz/src/Makefile rename to boards/mips/pic32mz/flipnclick-pic32mz/src/Makefile diff --git a/boards/mips/flipnclick-pic32mz/src/flipnclick-pic32mz.h b/boards/mips/pic32mz/flipnclick-pic32mz/src/flipnclick-pic32mz.h similarity index 100% rename from boards/mips/flipnclick-pic32mz/src/flipnclick-pic32mz.h rename to boards/mips/pic32mz/flipnclick-pic32mz/src/flipnclick-pic32mz.h diff --git a/boards/mips/flipnclick-pic32mz/src/pic32mz_appinit.c b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_appinit.c similarity index 100% rename from boards/mips/flipnclick-pic32mz/src/pic32mz_appinit.c rename to boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_appinit.c diff --git a/boards/mips/flipnclick-pic32mz/src/pic32mz_autoleds.c b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_autoleds.c similarity index 100% rename from boards/mips/flipnclick-pic32mz/src/pic32mz_autoleds.c rename to boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_autoleds.c diff --git a/boards/mips/flipnclick-pic32mz/src/pic32mz_boot.c b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_boot.c similarity index 100% rename from boards/mips/flipnclick-pic32mz/src/pic32mz_boot.c rename to boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_boot.c diff --git a/boards/mips/flipnclick-pic32mz/src/pic32mz_bringup.c b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_bringup.c similarity index 100% rename from boards/mips/flipnclick-pic32mz/src/pic32mz_bringup.c rename to boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_bringup.c diff --git a/boards/mips/flipnclick-pic32mz/src/pic32mz_buttons.c b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_buttons.c similarity index 100% rename from boards/mips/flipnclick-pic32mz/src/pic32mz_buttons.c rename to boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_buttons.c diff --git a/boards/mips/flipnclick-pic32mz/src/pic32mz_spi.c b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_spi.c similarity index 100% rename from boards/mips/flipnclick-pic32mz/src/pic32mz_spi.c rename to boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_spi.c diff --git a/boards/mips/flipnclick-pic32mz/src/pic32mz_ssd1306.c b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_ssd1306.c similarity index 100% rename from boards/mips/flipnclick-pic32mz/src/pic32mz_ssd1306.c rename to boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_ssd1306.c diff --git a/boards/mips/flipnclick-pic32mz/src/pic32mz_userleds.c b/boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_userleds.c similarity index 100% rename from boards/mips/flipnclick-pic32mz/src/pic32mz_userleds.c rename to boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_userleds.c diff --git a/boards/mips/pic32mz-starterkit/Kconfig b/boards/mips/pic32mz/pic32mz-starterkit/Kconfig similarity index 100% rename from boards/mips/pic32mz-starterkit/Kconfig rename to boards/mips/pic32mz/pic32mz-starterkit/Kconfig diff --git a/boards/mips/pic32mz-starterkit/README.txt b/boards/mips/pic32mz/pic32mz-starterkit/README.txt similarity index 100% rename from boards/mips/pic32mz-starterkit/README.txt rename to boards/mips/pic32mz/pic32mz-starterkit/README.txt diff --git a/boards/mips/pic32mz-starterkit/configs/nsh/defconfig b/boards/mips/pic32mz/pic32mz-starterkit/configs/nsh/defconfig similarity index 100% rename from boards/mips/pic32mz-starterkit/configs/nsh/defconfig rename to boards/mips/pic32mz/pic32mz-starterkit/configs/nsh/defconfig diff --git a/boards/mips/pic32mz-starterkit/include/board.h b/boards/mips/pic32mz/pic32mz-starterkit/include/board.h similarity index 100% rename from boards/mips/pic32mz-starterkit/include/board.h rename to boards/mips/pic32mz/pic32mz-starterkit/include/board.h diff --git a/boards/mips/pic32mz-starterkit/scripts/Make.defs b/boards/mips/pic32mz/pic32mz-starterkit/scripts/Make.defs similarity index 96% rename from boards/mips/pic32mz-starterkit/scripts/Make.defs rename to boards/mips/pic32mz/pic32mz-starterkit/scripts/Make.defs index dc373f52e8a..d451dd9a3bb 100644 --- a/boards/mips/pic32mz-starterkit/scripts/Make.defs +++ b/boards/mips/pic32mz/pic32mz-starterkit/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/mips/pic32mz-starterkit/scripts/c32-debug.ld b/boards/mips/pic32mz/pic32mz-starterkit/scripts/c32-debug.ld similarity index 100% rename from boards/mips/pic32mz-starterkit/scripts/c32-debug.ld rename to boards/mips/pic32mz/pic32mz-starterkit/scripts/c32-debug.ld diff --git a/boards/mips/pic32mz-starterkit/scripts/mips-debug.ld b/boards/mips/pic32mz/pic32mz-starterkit/scripts/mips-debug.ld similarity index 100% rename from boards/mips/pic32mz-starterkit/scripts/mips-debug.ld rename to boards/mips/pic32mz/pic32mz-starterkit/scripts/mips-debug.ld diff --git a/boards/mips/pic32mz-starterkit/scripts/pinguino-debug.ld b/boards/mips/pic32mz/pic32mz-starterkit/scripts/pinguino-debug.ld similarity index 100% rename from boards/mips/pic32mz-starterkit/scripts/pinguino-debug.ld rename to boards/mips/pic32mz/pic32mz-starterkit/scripts/pinguino-debug.ld diff --git a/boards/mips/pic32mz-starterkit/scripts/xc32-debug.ld b/boards/mips/pic32mz/pic32mz-starterkit/scripts/xc32-debug.ld similarity index 100% rename from boards/mips/pic32mz-starterkit/scripts/xc32-debug.ld rename to boards/mips/pic32mz/pic32mz-starterkit/scripts/xc32-debug.ld diff --git a/boards/mips/sure-pic32mx/src/.gitignore b/boards/mips/pic32mz/pic32mz-starterkit/src/.gitignore similarity index 100% rename from boards/mips/sure-pic32mx/src/.gitignore rename to boards/mips/pic32mz/pic32mz-starterkit/src/.gitignore diff --git a/boards/mips/pic32mz-starterkit/src/Makefile b/boards/mips/pic32mz/pic32mz-starterkit/src/Makefile similarity index 100% rename from boards/mips/pic32mz-starterkit/src/Makefile rename to boards/mips/pic32mz/pic32mz-starterkit/src/Makefile diff --git a/boards/mips/pic32mz-starterkit/src/pic32mz-starterkit.h b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz-starterkit.h similarity index 100% rename from boards/mips/pic32mz-starterkit/src/pic32mz-starterkit.h rename to boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz-starterkit.h diff --git a/boards/mips/pic32mz-starterkit/src/pic32mz_appinit.c b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_appinit.c similarity index 100% rename from boards/mips/pic32mz-starterkit/src/pic32mz_appinit.c rename to boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_appinit.c diff --git a/boards/mips/pic32mz-starterkit/src/pic32mz_autoleds.c b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_autoleds.c similarity index 100% rename from boards/mips/pic32mz-starterkit/src/pic32mz_autoleds.c rename to boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_autoleds.c diff --git a/boards/mips/pic32mz-starterkit/src/pic32mz_boot.c b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_boot.c similarity index 100% rename from boards/mips/pic32mz-starterkit/src/pic32mz_boot.c rename to boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_boot.c diff --git a/boards/mips/pic32mz-starterkit/src/pic32mz_bringup.c b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_bringup.c similarity index 100% rename from boards/mips/pic32mz-starterkit/src/pic32mz_bringup.c rename to boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_bringup.c diff --git a/boards/mips/pic32mz-starterkit/src/pic32mz_buttons.c b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_buttons.c similarity index 100% rename from boards/mips/pic32mz-starterkit/src/pic32mz_buttons.c rename to boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_buttons.c diff --git a/boards/mips/pic32mz-starterkit/src/pic32mz_spi.c b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_spi.c similarity index 100% rename from boards/mips/pic32mz-starterkit/src/pic32mz_spi.c rename to boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_spi.c diff --git a/boards/mips/pic32mz-starterkit/src/pic32mz_userleds.c b/boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_userleds.c similarity index 100% rename from boards/mips/pic32mz-starterkit/src/pic32mz_userleds.c rename to boards/mips/pic32mz/pic32mz-starterkit/src/pic32mz_userleds.c diff --git a/boards/avr/moteino-mega/Kconfig b/boards/misoc/lm32/misoc/Kconfig similarity index 100% rename from boards/avr/moteino-mega/Kconfig rename to boards/misoc/lm32/misoc/Kconfig diff --git a/boards/misoc/misoc/README.txt b/boards/misoc/lm32/misoc/README.txt similarity index 100% rename from boards/misoc/misoc/README.txt rename to boards/misoc/lm32/misoc/README.txt diff --git a/boards/misoc/misoc/configs/hello/defconfig b/boards/misoc/lm32/misoc/configs/hello/defconfig similarity index 100% rename from boards/misoc/misoc/configs/hello/defconfig rename to boards/misoc/lm32/misoc/configs/hello/defconfig diff --git a/boards/misoc/misoc/configs/nsh/defconfig b/boards/misoc/lm32/misoc/configs/nsh/defconfig similarity index 100% rename from boards/misoc/misoc/configs/nsh/defconfig rename to boards/misoc/lm32/misoc/configs/nsh/defconfig diff --git a/boards/misoc/misoc/include/.gitignore b/boards/misoc/lm32/misoc/include/.gitignore similarity index 100% rename from boards/misoc/misoc/include/.gitignore rename to boards/misoc/lm32/misoc/include/.gitignore diff --git a/boards/misoc/misoc/include/board.h b/boards/misoc/lm32/misoc/include/board.h similarity index 100% rename from boards/misoc/misoc/include/board.h rename to boards/misoc/lm32/misoc/include/board.h diff --git a/boards/misoc/misoc/scripts/Make.defs b/boards/misoc/lm32/misoc/scripts/Make.defs similarity index 95% rename from boards/misoc/misoc/scripts/Make.defs rename to boards/misoc/lm32/misoc/scripts/Make.defs index c1dc31963fa..9eadf9fbc76 100644 --- a/boards/misoc/misoc/scripts/Make.defs +++ b/boards/misoc/lm32/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD_CUSTOM_NAME)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD_CUSTOM_NAME)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/misoc/misoc/scripts/lm32.ld b/boards/misoc/lm32/misoc/scripts/lm32.ld similarity index 100% rename from boards/misoc/misoc/scripts/lm32.ld rename to boards/misoc/lm32/misoc/scripts/lm32.ld diff --git a/boards/misoc/misoc/scripts/minerva.ld b/boards/misoc/lm32/misoc/scripts/minerva.ld similarity index 100% rename from boards/misoc/misoc/scripts/minerva.ld rename to boards/misoc/lm32/misoc/scripts/minerva.ld diff --git a/boards/mips/ubw32/src/.gitignore b/boards/misoc/lm32/misoc/src/.gitignore similarity index 100% rename from boards/mips/ubw32/src/.gitignore rename to boards/misoc/lm32/misoc/src/.gitignore diff --git a/boards/misoc/misoc/src/Makefile b/boards/misoc/lm32/misoc/src/Makefile similarity index 100% rename from boards/misoc/misoc/src/Makefile rename to boards/misoc/lm32/misoc/src/Makefile diff --git a/boards/misoc/misoc/src/lm32_boot.c b/boards/misoc/lm32/misoc/src/lm32_boot.c similarity index 100% rename from boards/misoc/misoc/src/lm32_boot.c rename to boards/misoc/lm32/misoc/src/lm32_boot.c diff --git a/boards/misoc/misoc/src/misoc.h b/boards/misoc/lm32/misoc/src/misoc.h similarity index 100% rename from boards/misoc/misoc/src/misoc.h rename to boards/misoc/lm32/misoc/src/misoc.h diff --git a/boards/or1k/or1k/Kconfig b/boards/or1k/mor1kx/or1k/Kconfig similarity index 100% rename from boards/or1k/or1k/Kconfig rename to boards/or1k/mor1kx/or1k/Kconfig diff --git a/boards/or1k/or1k/README.txt b/boards/or1k/mor1kx/or1k/README.txt similarity index 100% rename from boards/or1k/or1k/README.txt rename to boards/or1k/mor1kx/or1k/README.txt diff --git a/boards/or1k/or1k/configs/nsh/defconfig b/boards/or1k/mor1kx/or1k/configs/nsh/defconfig similarity index 100% rename from boards/or1k/or1k/configs/nsh/defconfig rename to boards/or1k/mor1kx/or1k/configs/nsh/defconfig diff --git a/boards/or1k/or1k/include/board.h b/boards/or1k/mor1kx/or1k/include/board.h similarity index 100% rename from boards/or1k/or1k/include/board.h rename to boards/or1k/mor1kx/or1k/include/board.h diff --git a/boards/or1k/or1k/scripts/Make.defs b/boards/or1k/mor1kx/or1k/scripts/Make.defs similarity index 96% rename from boards/or1k/or1k/scripts/Make.defs rename to boards/or1k/mor1kx/or1k/scripts/Make.defs index 5f75a87fa4c..b3b8c76615e 100644 --- a/boards/or1k/or1k/scripts/Make.defs +++ b/boards/or1k/mor1kx/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/or1k/or1k/scripts/flash.ld b/boards/or1k/mor1kx/or1k/scripts/flash.ld similarity index 100% rename from boards/or1k/or1k/scripts/flash.ld rename to boards/or1k/mor1kx/or1k/scripts/flash.ld diff --git a/boards/arm/p112/src/.gitignore b/boards/or1k/mor1kx/or1k/src/.gitignore similarity index 100% rename from boards/arm/p112/src/.gitignore rename to boards/or1k/mor1kx/or1k/src/.gitignore diff --git a/boards/or1k/or1k/src/Makefile b/boards/or1k/mor1kx/or1k/src/Makefile similarity index 100% rename from boards/or1k/or1k/src/Makefile rename to boards/or1k/mor1kx/or1k/src/Makefile diff --git a/boards/or1k/or1k/src/or1k.h b/boards/or1k/mor1kx/or1k/src/or1k.h similarity index 100% rename from boards/or1k/or1k/src/or1k.h rename to boards/or1k/mor1kx/or1k/src/or1k.h diff --git a/boards/or1k/or1k/src/or1k_appinit.c b/boards/or1k/mor1kx/or1k/src/or1k_appinit.c similarity index 100% rename from boards/or1k/or1k/src/or1k_appinit.c rename to boards/or1k/mor1kx/or1k/src/or1k_appinit.c diff --git a/boards/or1k/or1k/src/or1k_autoled.c b/boards/or1k/mor1kx/or1k/src/or1k_autoled.c similarity index 100% rename from boards/or1k/or1k/src/or1k_autoled.c rename to boards/or1k/mor1kx/or1k/src/or1k_autoled.c diff --git a/boards/or1k/or1k/src/or1k_boot.c b/boards/or1k/mor1kx/or1k/src/or1k_boot.c similarity index 100% rename from boards/or1k/or1k/src/or1k_boot.c rename to boards/or1k/mor1kx/or1k/src/or1k_boot.c diff --git a/boards/or1k/or1k/src/or1k_bringup.c b/boards/or1k/mor1kx/or1k/src/or1k_bringup.c similarity index 100% rename from boards/or1k/or1k/src/or1k_bringup.c rename to boards/or1k/mor1kx/or1k/src/or1k_bringup.c diff --git a/boards/renesas/skp16c26/Kconfig b/boards/renesas/m32262f8/skp16c26/Kconfig similarity index 100% rename from boards/renesas/skp16c26/Kconfig rename to boards/renesas/m32262f8/skp16c26/Kconfig diff --git a/boards/renesas/skp16c26/README.txt b/boards/renesas/m32262f8/skp16c26/README.txt similarity index 100% rename from boards/renesas/skp16c26/README.txt rename to boards/renesas/m32262f8/skp16c26/README.txt diff --git a/boards/renesas/skp16c26/configs/ostest/defconfig b/boards/renesas/m32262f8/skp16c26/configs/ostest/defconfig similarity index 100% rename from boards/renesas/skp16c26/configs/ostest/defconfig rename to boards/renesas/m32262f8/skp16c26/configs/ostest/defconfig diff --git a/boards/renesas/skp16c26/include/board.h b/boards/renesas/m32262f8/skp16c26/include/board.h similarity index 100% rename from boards/renesas/skp16c26/include/board.h rename to boards/renesas/m32262f8/skp16c26/include/board.h diff --git a/boards/renesas/skp16c26/scripts/Make.defs b/boards/renesas/m32262f8/skp16c26/scripts/Make.defs similarity index 96% rename from boards/renesas/skp16c26/scripts/Make.defs rename to boards/renesas/m32262f8/skp16c26/scripts/Make.defs index 074ebb4e11d..9fec23bcb93 100644 --- a/boards/renesas/skp16c26/scripts/Make.defs +++ b/boards/renesas/m32262f8/skp16c26/scripts/Make.defs @@ -61,7 +61,7 @@ ARCHPICFLAGS = -fpic ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef ARCHDEFINES = ARCHINCLUDES = -I. -isystem $(TOPDIR)/include -ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/skp16c26.ld +ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/skp16c26.ld CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \ $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe diff --git a/boards/renesas/skp16c26/scripts/skp16c26.ld b/boards/renesas/m32262f8/skp16c26/scripts/skp16c26.ld similarity index 100% rename from boards/renesas/skp16c26/scripts/skp16c26.ld rename to boards/renesas/m32262f8/skp16c26/scripts/skp16c26.ld diff --git a/boards/misoc/misoc/src/.gitignore b/boards/renesas/m32262f8/skp16c26/src/.gitignore similarity index 100% rename from boards/misoc/misoc/src/.gitignore rename to boards/renesas/m32262f8/skp16c26/src/.gitignore diff --git a/boards/renesas/skp16c26/src/Makefile b/boards/renesas/m32262f8/skp16c26/src/Makefile similarity index 100% rename from boards/renesas/skp16c26/src/Makefile rename to boards/renesas/m32262f8/skp16c26/src/Makefile diff --git a/boards/renesas/skp16c26/src/m16c_buttons.c b/boards/renesas/m32262f8/skp16c26/src/m16c_buttons.c similarity index 100% rename from boards/renesas/skp16c26/src/m16c_buttons.c rename to boards/renesas/m32262f8/skp16c26/src/m16c_buttons.c diff --git a/boards/renesas/skp16c26/src/m16c_lcd.c b/boards/renesas/m32262f8/skp16c26/src/m16c_lcd.c similarity index 100% rename from boards/renesas/skp16c26/src/m16c_lcd.c rename to boards/renesas/m32262f8/skp16c26/src/m16c_lcd.c diff --git a/boards/renesas/skp16c26/src/m16c_lcdconsole.c b/boards/renesas/m32262f8/skp16c26/src/m16c_lcdconsole.c similarity index 100% rename from boards/renesas/skp16c26/src/m16c_lcdconsole.c rename to boards/renesas/m32262f8/skp16c26/src/m16c_lcdconsole.c diff --git a/boards/renesas/skp16c26/src/m16c_leds.c b/boards/renesas/m32262f8/skp16c26/src/m16c_leds.c similarity index 100% rename from boards/renesas/skp16c26/src/m16c_leds.c rename to boards/renesas/m32262f8/skp16c26/src/m16c_leds.c diff --git a/boards/renesas/skp16c26/src/skp16c26.h b/boards/renesas/m32262f8/skp16c26/src/skp16c26.h similarity index 100% rename from boards/renesas/skp16c26/src/skp16c26.h rename to boards/renesas/m32262f8/skp16c26/src/skp16c26.h diff --git a/boards/renesas/us7032evb1/Kconfig b/boards/renesas/sh7032/us7032evb1/Kconfig similarity index 100% rename from boards/renesas/us7032evb1/Kconfig rename to boards/renesas/sh7032/us7032evb1/Kconfig diff --git a/boards/renesas/us7032evb1/README.txt b/boards/renesas/sh7032/us7032evb1/README.txt similarity index 100% rename from boards/renesas/us7032evb1/README.txt rename to boards/renesas/sh7032/us7032evb1/README.txt diff --git a/boards/renesas/us7032evb1/bin/.gitignore b/boards/renesas/sh7032/us7032evb1/bin/.gitignore similarity index 100% rename from boards/renesas/us7032evb1/bin/.gitignore rename to boards/renesas/sh7032/us7032evb1/bin/.gitignore diff --git a/boards/renesas/us7032evb1/configs/nsh/defconfig b/boards/renesas/sh7032/us7032evb1/configs/nsh/defconfig similarity index 100% rename from boards/renesas/us7032evb1/configs/nsh/defconfig rename to boards/renesas/sh7032/us7032evb1/configs/nsh/defconfig diff --git a/boards/renesas/us7032evb1/configs/ostest/defconfig b/boards/renesas/sh7032/us7032evb1/configs/ostest/defconfig similarity index 100% rename from boards/renesas/us7032evb1/configs/ostest/defconfig rename to boards/renesas/sh7032/us7032evb1/configs/ostest/defconfig diff --git a/boards/renesas/us7032evb1/configs/ostest/ld.script b/boards/renesas/sh7032/us7032evb1/configs/ostest/ld.script similarity index 100% rename from boards/renesas/us7032evb1/configs/ostest/ld.script rename to boards/renesas/sh7032/us7032evb1/configs/ostest/ld.script diff --git a/boards/renesas/us7032evb1/include/board.h b/boards/renesas/sh7032/us7032evb1/include/board.h similarity index 100% rename from boards/renesas/us7032evb1/include/board.h rename to boards/renesas/sh7032/us7032evb1/include/board.h diff --git a/boards/renesas/us7032evb1/scripts/Make.defs b/boards/renesas/sh7032/us7032evb1/scripts/Make.defs similarity index 96% rename from boards/renesas/us7032evb1/scripts/Make.defs rename to boards/renesas/sh7032/us7032evb1/scripts/Make.defs index 51103376c84..eca0ee1246e 100644 --- a/boards/renesas/us7032evb1/scripts/Make.defs +++ b/boards/renesas/sh7032/us7032evb1/scripts/Make.defs @@ -49,7 +49,7 @@ ARCHPICFLAGS = -fpic ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef ARCHDEFINES = ARCHINCLUDES = -I. -isystem $(TOPDIR)/include -ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/sdram.ld +ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/sdram.ld CROSSDEV = sh-nuttx-elf- CC = $(CROSSDEV)gcc diff --git a/boards/renesas/us7032evb1/scripts/sram.ld b/boards/renesas/sh7032/us7032evb1/scripts/sram.ld similarity index 100% rename from boards/renesas/us7032evb1/scripts/sram.ld rename to boards/renesas/sh7032/us7032evb1/scripts/sram.ld diff --git a/boards/renesas/us7032evb1/shterm/.gitignore b/boards/renesas/sh7032/us7032evb1/shterm/.gitignore similarity index 100% rename from boards/renesas/us7032evb1/shterm/.gitignore rename to boards/renesas/sh7032/us7032evb1/shterm/.gitignore diff --git a/boards/renesas/us7032evb1/shterm/Makefile b/boards/renesas/sh7032/us7032evb1/shterm/Makefile similarity index 100% rename from boards/renesas/us7032evb1/shterm/Makefile rename to boards/renesas/sh7032/us7032evb1/shterm/Makefile diff --git a/boards/renesas/us7032evb1/shterm/shterm.c b/boards/renesas/sh7032/us7032evb1/shterm/shterm.c similarity index 100% rename from boards/renesas/us7032evb1/shterm/shterm.c rename to boards/renesas/sh7032/us7032evb1/shterm/shterm.c diff --git a/boards/renesas/skp16c26/src/.gitignore b/boards/renesas/sh7032/us7032evb1/src/.gitignore similarity index 100% rename from boards/renesas/skp16c26/src/.gitignore rename to boards/renesas/sh7032/us7032evb1/src/.gitignore diff --git a/boards/renesas/us7032evb1/src/Makefile b/boards/renesas/sh7032/us7032evb1/src/Makefile similarity index 100% rename from boards/renesas/us7032evb1/src/Makefile rename to boards/renesas/sh7032/us7032evb1/src/Makefile diff --git a/boards/renesas/us7032evb1/src/sh1_leds.c b/boards/renesas/sh7032/us7032evb1/src/sh1_leds.c similarity index 100% rename from boards/renesas/us7032evb1/src/sh1_leds.c rename to boards/renesas/sh7032/us7032evb1/src/sh1_leds.c diff --git a/boards/risc-v/gapuino/Kconfig b/boards/risc-v/gap8/gapuino/Kconfig similarity index 100% rename from boards/risc-v/gapuino/Kconfig rename to boards/risc-v/gap8/gapuino/Kconfig diff --git a/boards/risc-v/gapuino/README.txt b/boards/risc-v/gap8/gapuino/README.txt similarity index 100% rename from boards/risc-v/gapuino/README.txt rename to boards/risc-v/gap8/gapuino/README.txt diff --git a/boards/risc-v/gapuino/configs/nsh/defconfig b/boards/risc-v/gap8/gapuino/configs/nsh/defconfig similarity index 100% rename from boards/risc-v/gapuino/configs/nsh/defconfig rename to boards/risc-v/gap8/gapuino/configs/nsh/defconfig diff --git a/boards/risc-v/gapuino/include/board.h b/boards/risc-v/gap8/gapuino/include/board.h similarity index 100% rename from boards/risc-v/gapuino/include/board.h rename to boards/risc-v/gap8/gapuino/include/board.h diff --git a/boards/risc-v/gapuino/scripts/Make.defs b/boards/risc-v/gap8/gapuino/scripts/Make.defs similarity index 96% rename from boards/risc-v/gapuino/scripts/Make.defs rename to boards/risc-v/gap8/gapuino/scripts/Make.defs index a27531aa68a..0910b12d9b6 100644 --- a/boards/risc-v/gapuino/scripts/Make.defs +++ b/boards/risc-v/gap8/gapuino/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/risc-v/gapuino/scripts/ld.script b/boards/risc-v/gap8/gapuino/scripts/ld.script similarity index 100% rename from boards/risc-v/gapuino/scripts/ld.script rename to boards/risc-v/gap8/gapuino/scripts/ld.script diff --git a/boards/risc-v/gapuino/src/Makefile b/boards/risc-v/gap8/gapuino/src/Makefile similarity index 100% rename from boards/risc-v/gapuino/src/Makefile rename to boards/risc-v/gap8/gapuino/src/Makefile diff --git a/boards/risc-v/gapuino/src/gapuino_appinit.c b/boards/risc-v/gap8/gapuino/src/gapuino_appinit.c similarity index 100% rename from boards/risc-v/gapuino/src/gapuino_appinit.c rename to boards/risc-v/gap8/gapuino/src/gapuino_appinit.c diff --git a/boards/risc-v/gapuino/src/gapuino_sysinit.c b/boards/risc-v/gap8/gapuino/src/gapuino_sysinit.c similarity index 100% rename from boards/risc-v/gapuino/src/gapuino_sysinit.c rename to boards/risc-v/gap8/gapuino/src/gapuino_sysinit.c diff --git a/boards/risc-v/nr5m100-nexys4/Kconfig b/boards/risc-v/nr5m100/nr5m100-nexys4/Kconfig similarity index 100% rename from boards/risc-v/nr5m100-nexys4/Kconfig rename to boards/risc-v/nr5m100/nr5m100-nexys4/Kconfig diff --git a/boards/risc-v/nr5m100-nexys4/README.txt b/boards/risc-v/nr5m100/nr5m100-nexys4/README.txt similarity index 100% rename from boards/risc-v/nr5m100-nexys4/README.txt rename to boards/risc-v/nr5m100/nr5m100-nexys4/README.txt diff --git a/boards/risc-v/nr5m100-nexys4/configs/nsh/defconfig b/boards/risc-v/nr5m100/nr5m100-nexys4/configs/nsh/defconfig similarity index 100% rename from boards/risc-v/nr5m100-nexys4/configs/nsh/defconfig rename to boards/risc-v/nr5m100/nr5m100-nexys4/configs/nsh/defconfig diff --git a/boards/risc-v/nr5m100-nexys4/include/board.h b/boards/risc-v/nr5m100/nr5m100-nexys4/include/board.h similarity index 100% rename from boards/risc-v/nr5m100-nexys4/include/board.h rename to boards/risc-v/nr5m100/nr5m100-nexys4/include/board.h diff --git a/boards/risc-v/nr5m100-nexys4/scripts/Make.defs b/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/Make.defs similarity index 96% rename from boards/risc-v/nr5m100-nexys4/scripts/Make.defs rename to boards/risc-v/nr5m100/nr5m100-nexys4/scripts/Make.defs index a2cac65ce9a..17cbb8e7a8b 100644 --- a/boards/risc-v/nr5m100-nexys4/scripts/Make.defs +++ b/boards/risc-v/nr5m100/nr5m100-nexys4/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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT) endif CC = $(CROSSDEV)gcc diff --git a/boards/risc-v/nr5m100-nexys4/scripts/ld.script b/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/ld.script similarity index 100% rename from boards/risc-v/nr5m100-nexys4/scripts/ld.script rename to boards/risc-v/nr5m100/nr5m100-nexys4/scripts/ld.script diff --git a/boards/risc-v/nr5m100-nexys4/scripts/nr5m1xx.cfg b/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/nr5m1xx.cfg similarity index 100% rename from boards/risc-v/nr5m100-nexys4/scripts/nr5m1xx.cfg rename to boards/risc-v/nr5m100/nr5m100-nexys4/scripts/nr5m1xx.cfg diff --git a/boards/risc-v/nr5m100-nexys4/scripts/openocd.cfg b/boards/risc-v/nr5m100/nr5m100-nexys4/scripts/openocd.cfg similarity index 100% rename from boards/risc-v/nr5m100-nexys4/scripts/openocd.cfg rename to boards/risc-v/nr5m100/nr5m100-nexys4/scripts/openocd.cfg diff --git a/boards/risc-v/nr5m100-nexys4/src/Makefile b/boards/risc-v/nr5m100/nr5m100-nexys4/src/Makefile similarity index 100% rename from boards/risc-v/nr5m100-nexys4/src/Makefile rename to boards/risc-v/nr5m100/nr5m100-nexys4/src/Makefile diff --git a/boards/risc-v/nr5m100-nexys4/src/nr5_appinit.c b/boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_appinit.c similarity index 100% rename from boards/risc-v/nr5m100-nexys4/src/nr5_appinit.c rename to boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_appinit.c diff --git a/boards/risc-v/nr5m100-nexys4/src/nr5_autoleds.c b/boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_autoleds.c similarity index 100% rename from boards/risc-v/nr5m100-nexys4/src/nr5_autoleds.c rename to boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_autoleds.c diff --git a/boards/risc-v/nr5m100-nexys4/src/nr5_boot.c b/boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_boot.c similarity index 100% rename from boards/risc-v/nr5m100-nexys4/src/nr5_boot.c rename to boards/risc-v/nr5m100/nr5m100-nexys4/src/nr5_boot.c diff --git a/boards/sim/sim/Kconfig b/boards/sim/sim/sim/Kconfig similarity index 100% rename from boards/sim/sim/Kconfig rename to boards/sim/sim/sim/Kconfig diff --git a/boards/sim/sim/NETWORK-LINUX.txt b/boards/sim/sim/sim/NETWORK-LINUX.txt similarity index 100% rename from boards/sim/sim/NETWORK-LINUX.txt rename to boards/sim/sim/sim/NETWORK-LINUX.txt diff --git a/boards/sim/sim/README.txt b/boards/sim/sim/sim/README.txt similarity index 100% rename from boards/sim/sim/README.txt rename to boards/sim/sim/sim/README.txt diff --git a/boards/sim/sim/configs/bas/defconfig b/boards/sim/sim/sim/configs/bas/defconfig similarity index 100% rename from boards/sim/sim/configs/bas/defconfig rename to boards/sim/sim/sim/configs/bas/defconfig diff --git a/boards/sim/sim/configs/bluetooth/defconfig b/boards/sim/sim/sim/configs/bluetooth/defconfig similarity index 100% rename from boards/sim/sim/configs/bluetooth/defconfig rename to boards/sim/sim/sim/configs/bluetooth/defconfig diff --git a/boards/sim/sim/configs/configdata/defconfig b/boards/sim/sim/sim/configs/configdata/defconfig similarity index 100% rename from boards/sim/sim/configs/configdata/defconfig rename to boards/sim/sim/sim/configs/configdata/defconfig diff --git a/boards/sim/sim/configs/cxxtest/Make.defs b/boards/sim/sim/sim/configs/cxxtest/Make.defs similarity index 100% rename from boards/sim/sim/configs/cxxtest/Make.defs rename to boards/sim/sim/sim/configs/cxxtest/Make.defs diff --git a/boards/sim/sim/configs/cxxtest/defconfig b/boards/sim/sim/sim/configs/cxxtest/defconfig similarity index 100% rename from boards/sim/sim/configs/cxxtest/defconfig rename to boards/sim/sim/sim/configs/cxxtest/defconfig diff --git a/boards/sim/sim/configs/dsptest/defconfig b/boards/sim/sim/sim/configs/dsptest/defconfig similarity index 100% rename from boards/sim/sim/configs/dsptest/defconfig rename to boards/sim/sim/sim/configs/dsptest/defconfig diff --git a/boards/sim/sim/configs/fb/defconfig b/boards/sim/sim/sim/configs/fb/defconfig similarity index 100% rename from boards/sim/sim/configs/fb/defconfig rename to boards/sim/sim/sim/configs/fb/defconfig diff --git a/boards/sim/sim/configs/ipforward/defconfig b/boards/sim/sim/sim/configs/ipforward/defconfig similarity index 100% rename from boards/sim/sim/configs/ipforward/defconfig rename to boards/sim/sim/sim/configs/ipforward/defconfig diff --git a/boards/sim/sim/configs/loadable/defconfig b/boards/sim/sim/sim/configs/loadable/defconfig similarity index 100% rename from boards/sim/sim/configs/loadable/defconfig rename to boards/sim/sim/sim/configs/loadable/defconfig diff --git a/boards/sim/sim/configs/minibasic/defconfig b/boards/sim/sim/sim/configs/minibasic/defconfig similarity index 100% rename from boards/sim/sim/configs/minibasic/defconfig rename to boards/sim/sim/sim/configs/minibasic/defconfig diff --git a/boards/sim/sim/configs/mount/defconfig b/boards/sim/sim/sim/configs/mount/defconfig similarity index 100% rename from boards/sim/sim/configs/mount/defconfig rename to boards/sim/sim/sim/configs/mount/defconfig diff --git a/boards/sim/sim/configs/mtdpart/defconfig b/boards/sim/sim/sim/configs/mtdpart/defconfig similarity index 100% rename from boards/sim/sim/configs/mtdpart/defconfig rename to boards/sim/sim/sim/configs/mtdpart/defconfig diff --git a/boards/sim/sim/configs/mtdrwb/defconfig b/boards/sim/sim/sim/configs/mtdrwb/defconfig similarity index 100% rename from boards/sim/sim/configs/mtdrwb/defconfig rename to boards/sim/sim/sim/configs/mtdrwb/defconfig diff --git a/boards/sim/sim/configs/nettest/defconfig b/boards/sim/sim/sim/configs/nettest/defconfig similarity index 100% rename from boards/sim/sim/configs/nettest/defconfig rename to boards/sim/sim/sim/configs/nettest/defconfig diff --git a/boards/sim/sim/configs/nsh/defconfig b/boards/sim/sim/sim/configs/nsh/defconfig similarity index 100% rename from boards/sim/sim/configs/nsh/defconfig rename to boards/sim/sim/sim/configs/nsh/defconfig diff --git a/boards/sim/sim/configs/nsh2/Make.defs b/boards/sim/sim/sim/configs/nsh2/Make.defs similarity index 100% rename from boards/sim/sim/configs/nsh2/Make.defs rename to boards/sim/sim/sim/configs/nsh2/Make.defs diff --git a/boards/sim/sim/configs/nsh2/defconfig b/boards/sim/sim/sim/configs/nsh2/defconfig similarity index 100% rename from boards/sim/sim/configs/nsh2/defconfig rename to boards/sim/sim/sim/configs/nsh2/defconfig diff --git a/boards/sim/sim/configs/nx/defconfig b/boards/sim/sim/sim/configs/nx/defconfig similarity index 100% rename from boards/sim/sim/configs/nx/defconfig rename to boards/sim/sim/sim/configs/nx/defconfig diff --git a/boards/sim/sim/configs/nx11/defconfig b/boards/sim/sim/sim/configs/nx11/defconfig similarity index 100% rename from boards/sim/sim/configs/nx11/defconfig rename to boards/sim/sim/sim/configs/nx11/defconfig diff --git a/boards/sim/sim/configs/nxffs/defconfig b/boards/sim/sim/sim/configs/nxffs/defconfig similarity index 100% rename from boards/sim/sim/configs/nxffs/defconfig rename to boards/sim/sim/sim/configs/nxffs/defconfig diff --git a/boards/sim/sim/configs/nxlines/defconfig b/boards/sim/sim/sim/configs/nxlines/defconfig similarity index 100% rename from boards/sim/sim/configs/nxlines/defconfig rename to boards/sim/sim/sim/configs/nxlines/defconfig diff --git a/boards/sim/sim/configs/nxwm/defconfig b/boards/sim/sim/sim/configs/nxwm/defconfig similarity index 100% rename from boards/sim/sim/configs/nxwm/defconfig rename to boards/sim/sim/sim/configs/nxwm/defconfig diff --git a/boards/sim/sim/configs/ostest/defconfig b/boards/sim/sim/sim/configs/ostest/defconfig similarity index 100% rename from boards/sim/sim/configs/ostest/defconfig rename to boards/sim/sim/sim/configs/ostest/defconfig diff --git a/boards/sim/sim/configs/pashello/defconfig b/boards/sim/sim/sim/configs/pashello/defconfig similarity index 100% rename from boards/sim/sim/configs/pashello/defconfig rename to boards/sim/sim/sim/configs/pashello/defconfig diff --git a/boards/sim/sim/configs/pf_ieee802154/defconfig b/boards/sim/sim/sim/configs/pf_ieee802154/defconfig similarity index 100% rename from boards/sim/sim/configs/pf_ieee802154/defconfig rename to boards/sim/sim/sim/configs/pf_ieee802154/defconfig diff --git a/boards/sim/sim/configs/pktradio/defconfig b/boards/sim/sim/sim/configs/pktradio/defconfig similarity index 100% rename from boards/sim/sim/configs/pktradio/defconfig rename to boards/sim/sim/sim/configs/pktradio/defconfig diff --git a/boards/sim/sim/configs/sixlowpan/defconfig b/boards/sim/sim/sim/configs/sixlowpan/defconfig similarity index 100% rename from boards/sim/sim/configs/sixlowpan/defconfig rename to boards/sim/sim/sim/configs/sixlowpan/defconfig diff --git a/boards/sim/sim/configs/spiffs/defconfig b/boards/sim/sim/sim/configs/spiffs/defconfig similarity index 100% rename from boards/sim/sim/configs/spiffs/defconfig rename to boards/sim/sim/sim/configs/spiffs/defconfig diff --git a/boards/sim/sim/configs/touchscreen/defconfig b/boards/sim/sim/sim/configs/touchscreen/defconfig similarity index 100% rename from boards/sim/sim/configs/touchscreen/defconfig rename to boards/sim/sim/sim/configs/touchscreen/defconfig diff --git a/boards/sim/sim/configs/traveler/defconfig b/boards/sim/sim/sim/configs/traveler/defconfig similarity index 100% rename from boards/sim/sim/configs/traveler/defconfig rename to boards/sim/sim/sim/configs/traveler/defconfig diff --git a/boards/sim/sim/configs/udgram/defconfig b/boards/sim/sim/sim/configs/udgram/defconfig similarity index 100% rename from boards/sim/sim/configs/udgram/defconfig rename to boards/sim/sim/sim/configs/udgram/defconfig diff --git a/boards/sim/sim/configs/unionfs/defconfig b/boards/sim/sim/sim/configs/unionfs/defconfig similarity index 100% rename from boards/sim/sim/configs/unionfs/defconfig rename to boards/sim/sim/sim/configs/unionfs/defconfig diff --git a/boards/sim/sim/configs/userfs/defconfig b/boards/sim/sim/sim/configs/userfs/defconfig similarity index 100% rename from boards/sim/sim/configs/userfs/defconfig rename to boards/sim/sim/sim/configs/userfs/defconfig diff --git a/boards/sim/sim/configs/ustream/defconfig b/boards/sim/sim/sim/configs/ustream/defconfig similarity index 100% rename from boards/sim/sim/configs/ustream/defconfig rename to boards/sim/sim/sim/configs/ustream/defconfig diff --git a/boards/sim/sim/include/.gitignore b/boards/sim/sim/sim/include/.gitignore similarity index 100% rename from boards/sim/sim/include/.gitignore rename to boards/sim/sim/sim/include/.gitignore diff --git a/boards/sim/sim/include/README.txt b/boards/sim/sim/sim/include/README.txt similarity index 100% rename from boards/sim/sim/include/README.txt rename to boards/sim/sim/sim/include/README.txt diff --git a/boards/sim/sim/include/board.h b/boards/sim/sim/sim/include/board.h similarity index 100% rename from boards/sim/sim/include/board.h rename to boards/sim/sim/sim/include/board.h diff --git a/boards/sim/sim/include/etc.tar.gz b/boards/sim/sim/sim/include/etc.tar.gz similarity index 100% rename from boards/sim/sim/include/etc.tar.gz rename to boards/sim/sim/sim/include/etc.tar.gz diff --git a/boards/sim/sim/include/nsh_romfsimg.h b/boards/sim/sim/sim/include/nsh_romfsimg.h similarity index 100% rename from boards/sim/sim/include/nsh_romfsimg.h rename to boards/sim/sim/sim/include/nsh_romfsimg.h diff --git a/boards/sim/sim/scripts/Make.defs b/boards/sim/sim/sim/scripts/Make.defs similarity index 97% rename from boards/sim/sim/scripts/Make.defs rename to boards/sim/sim/sim/scripts/Make.defs index a9c6fd2026b..ee77ac577a8 100644 --- a/boards/sim/sim/scripts/Make.defs +++ b/boards/sim/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)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif diff --git a/boards/sim/sim/scripts/gnu-elf.ld b/boards/sim/sim/sim/scripts/gnu-elf.ld similarity index 100% rename from boards/sim/sim/scripts/gnu-elf.ld rename to boards/sim/sim/sim/scripts/gnu-elf.ld diff --git a/boards/renesas/us7032evb1/src/.gitignore b/boards/sim/sim/sim/src/.gitignore similarity index 100% rename from boards/renesas/us7032evb1/src/.gitignore rename to boards/sim/sim/sim/src/.gitignore diff --git a/boards/sim/sim/src/Makefile b/boards/sim/sim/sim/src/Makefile similarity index 100% rename from boards/sim/sim/src/Makefile rename to boards/sim/sim/sim/src/Makefile diff --git a/boards/sim/sim/src/sim.h b/boards/sim/sim/sim/src/sim.h similarity index 100% rename from boards/sim/sim/src/sim.h rename to boards/sim/sim/sim/src/sim.h diff --git a/boards/sim/sim/src/sim_appinit.c b/boards/sim/sim/sim/src/sim_appinit.c similarity index 100% rename from boards/sim/sim/src/sim_appinit.c rename to boards/sim/sim/sim/src/sim_appinit.c diff --git a/boards/sim/sim/src/sim_boot.c b/boards/sim/sim/sim/src/sim_boot.c similarity index 100% rename from boards/sim/sim/src/sim_boot.c rename to boards/sim/sim/sim/src/sim_boot.c diff --git a/boards/sim/sim/src/sim_bringup.c b/boards/sim/sim/sim/src/sim_bringup.c similarity index 100% rename from boards/sim/sim/src/sim_bringup.c rename to boards/sim/sim/sim/src/sim_bringup.c diff --git a/boards/sim/sim/src/sim_gpio.c b/boards/sim/sim/sim/src/sim_gpio.c similarity index 100% rename from boards/sim/sim/src/sim_gpio.c rename to boards/sim/sim/sim/src/sim_gpio.c diff --git a/boards/sim/sim/src/sim_ioexpander.c b/boards/sim/sim/sim/src/sim_ioexpander.c similarity index 100% rename from boards/sim/sim/src/sim_ioexpander.c rename to boards/sim/sim/sim/src/sim_ioexpander.c diff --git a/boards/sim/sim/src/sim_touchscreen.c b/boards/sim/sim/sim/src/sim_touchscreen.c similarity index 100% rename from boards/sim/sim/src/sim_touchscreen.c rename to boards/sim/sim/sim/src/sim_touchscreen.c diff --git a/boards/sim/sim/src/sim_zoneinfo.c b/boards/sim/sim/sim/src/sim_zoneinfo.c similarity index 100% rename from boards/sim/sim/src/sim_zoneinfo.c rename to boards/sim/sim/sim/src/sim_zoneinfo.c diff --git a/boards/misoc/misoc/Kconfig b/boards/x86/qemu/qemu-i486/Kconfig similarity index 100% rename from boards/misoc/misoc/Kconfig rename to boards/x86/qemu/qemu-i486/Kconfig diff --git a/boards/x86/qemu-i486/README.txt b/boards/x86/qemu/qemu-i486/README.txt similarity index 100% rename from boards/x86/qemu-i486/README.txt rename to boards/x86/qemu/qemu-i486/README.txt diff --git a/boards/x86/qemu-i486/configs/nsh/defconfig b/boards/x86/qemu/qemu-i486/configs/nsh/defconfig similarity index 100% rename from boards/x86/qemu-i486/configs/nsh/defconfig rename to boards/x86/qemu/qemu-i486/configs/nsh/defconfig diff --git a/boards/x86/qemu-i486/configs/ostest/defconfig b/boards/x86/qemu/qemu-i486/configs/ostest/defconfig similarity index 100% rename from boards/x86/qemu-i486/configs/ostest/defconfig rename to boards/x86/qemu/qemu-i486/configs/ostest/defconfig diff --git a/boards/x86/qemu-i486/include/board.h b/boards/x86/qemu/qemu-i486/include/board.h similarity index 100% rename from boards/x86/qemu-i486/include/board.h rename to boards/x86/qemu/qemu-i486/include/board.h diff --git a/boards/x86/qemu-i486/scripts/Make.defs b/boards/x86/qemu/qemu-i486/scripts/Make.defs similarity index 95% rename from boards/x86/qemu-i486/scripts/Make.defs rename to boards/x86/qemu/qemu-i486/scripts/Make.defs index 467c811725b..ac8f2de135e 100644 --- a/boards/x86/qemu-i486/scripts/Make.defs +++ b/boards/x86/qemu/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)/$(CONFIG_ARCH_BOARD)/scripts/qemu.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(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)/$(CONFIG_ARCH_BOARD)/scripts/qemu.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/qemu.ld endif ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin -fno-stack-protector diff --git a/boards/x86/qemu-i486/scripts/qemu.ld b/boards/x86/qemu/qemu-i486/scripts/qemu.ld similarity index 100% rename from boards/x86/qemu-i486/scripts/qemu.ld rename to boards/x86/qemu/qemu-i486/scripts/qemu.ld diff --git a/boards/sim/sim/src/.gitignore b/boards/x86/qemu/qemu-i486/src/.gitignore similarity index 100% rename from boards/sim/sim/src/.gitignore rename to boards/x86/qemu/qemu-i486/src/.gitignore diff --git a/boards/x86/qemu-i486/src/Makefile b/boards/x86/qemu/qemu-i486/src/Makefile similarity index 100% rename from boards/x86/qemu-i486/src/Makefile rename to boards/x86/qemu/qemu-i486/src/Makefile diff --git a/boards/x86/qemu-i486/src/qemu_boot.c b/boards/x86/qemu/qemu-i486/src/qemu_boot.c similarity index 100% rename from boards/x86/qemu-i486/src/qemu_boot.c rename to boards/x86/qemu/qemu-i486/src/qemu_boot.c diff --git a/boards/x86/qemu-i486/src/qemu_i486.h b/boards/x86/qemu/qemu-i486/src/qemu_i486.h similarity index 100% rename from boards/x86/qemu-i486/src/qemu_i486.h rename to boards/x86/qemu/qemu-i486/src/qemu_i486.h diff --git a/boards/xtensa/esp32-core/src/.gitignore b/boards/xtensa/esp32-core/src/.gitignore deleted file mode 100644 index 726d936e1e3..00000000000 --- a/boards/xtensa/esp32-core/src/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/.depend -/Make.dep diff --git a/boards/xtensa/esp32-core/Kconfig b/boards/xtensa/esp32/esp32-core/Kconfig similarity index 100% rename from boards/xtensa/esp32-core/Kconfig rename to boards/xtensa/esp32/esp32-core/Kconfig diff --git a/boards/xtensa/esp32-core/README.txt b/boards/xtensa/esp32/esp32-core/README.txt similarity index 100% rename from boards/xtensa/esp32-core/README.txt rename to boards/xtensa/esp32/esp32-core/README.txt diff --git a/boards/xtensa/esp32-core/configs/nsh/defconfig b/boards/xtensa/esp32/esp32-core/configs/nsh/defconfig similarity index 100% rename from boards/xtensa/esp32-core/configs/nsh/defconfig rename to boards/xtensa/esp32/esp32-core/configs/nsh/defconfig diff --git a/boards/xtensa/esp32-core/configs/ostest/defconfig b/boards/xtensa/esp32/esp32-core/configs/ostest/defconfig similarity index 100% rename from boards/xtensa/esp32-core/configs/ostest/defconfig rename to boards/xtensa/esp32/esp32-core/configs/ostest/defconfig diff --git a/boards/xtensa/esp32-core/configs/smp/defconfig b/boards/xtensa/esp32/esp32-core/configs/smp/defconfig similarity index 100% rename from boards/xtensa/esp32-core/configs/smp/defconfig rename to boards/xtensa/esp32/esp32-core/configs/smp/defconfig diff --git a/boards/xtensa/esp32-core/include/board.h b/boards/xtensa/esp32/esp32-core/include/board.h similarity index 100% rename from boards/xtensa/esp32-core/include/board.h rename to boards/xtensa/esp32/esp32-core/include/board.h diff --git a/boards/xtensa/esp32-core/scripts/.gitignore b/boards/xtensa/esp32/esp32-core/scripts/.gitignore similarity index 100% rename from boards/xtensa/esp32-core/scripts/.gitignore rename to boards/xtensa/esp32/esp32-core/scripts/.gitignore diff --git a/boards/xtensa/esp32-core/scripts/Make.defs b/boards/xtensa/esp32/esp32-core/scripts/Make.defs similarity index 89% rename from boards/xtensa/esp32-core/scripts/Make.defs rename to boards/xtensa/esp32/esp32-core/scripts/Make.defs index 0394f14d5bb..2356c2af6f9 100644 --- a/boards/xtensa/esp32-core/scripts/Make.defs +++ b/boards/xtensa/esp32/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)/$(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 +LDSCRIPT1 = $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/esp32_out.ld +LDSCRIPT3 = $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/esp32_rom.ld +LDSCRIPT4 = $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/esp32_peripherals.ld ifeq ($(CONFIG_ESP32CORE_RUN_IRAM),y) - LDSCRIPT2 = $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/esp32_iram.ld + LDSCRIPT2 = $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/esp32_iram.ld else - LDSCRIPT2 = $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/esp32_flash.ld + LDSCRIPT2 = $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/esp32_flash.ld endif ifeq ($(WINTOOL),y) diff --git a/boards/xtensa/esp32-core/scripts/esp32.cfg b/boards/xtensa/esp32/esp32-core/scripts/esp32.cfg similarity index 100% rename from boards/xtensa/esp32-core/scripts/esp32.cfg rename to boards/xtensa/esp32/esp32-core/scripts/esp32.cfg diff --git a/boards/xtensa/esp32-core/scripts/esp32.template b/boards/xtensa/esp32/esp32-core/scripts/esp32.template similarity index 100% rename from boards/xtensa/esp32-core/scripts/esp32.template rename to boards/xtensa/esp32/esp32-core/scripts/esp32.template diff --git a/boards/xtensa/esp32-core/scripts/esp32_flash.ld b/boards/xtensa/esp32/esp32-core/scripts/esp32_flash.ld similarity index 100% rename from boards/xtensa/esp32-core/scripts/esp32_flash.ld rename to boards/xtensa/esp32/esp32-core/scripts/esp32_flash.ld diff --git a/boards/xtensa/esp32-core/scripts/esp32_iram.ld b/boards/xtensa/esp32/esp32-core/scripts/esp32_iram.ld similarity index 100% rename from boards/xtensa/esp32-core/scripts/esp32_iram.ld rename to boards/xtensa/esp32/esp32-core/scripts/esp32_iram.ld diff --git a/boards/xtensa/esp32-core/scripts/esp32_peripherals.ld b/boards/xtensa/esp32/esp32-core/scripts/esp32_peripherals.ld similarity index 100% rename from boards/xtensa/esp32-core/scripts/esp32_peripherals.ld rename to boards/xtensa/esp32/esp32-core/scripts/esp32_peripherals.ld diff --git a/boards/xtensa/esp32-core/scripts/esp32_rom.ld b/boards/xtensa/esp32/esp32-core/scripts/esp32_rom.ld similarity index 100% rename from boards/xtensa/esp32-core/scripts/esp32_rom.ld rename to boards/xtensa/esp32/esp32-core/scripts/esp32_rom.ld diff --git a/boards/x86/qemu-i486/src/.gitignore b/boards/xtensa/esp32/esp32-core/src/.gitignore similarity index 100% rename from boards/x86/qemu-i486/src/.gitignore rename to boards/xtensa/esp32/esp32-core/src/.gitignore diff --git a/boards/xtensa/esp32-core/src/Makefile b/boards/xtensa/esp32/esp32-core/src/Makefile similarity index 100% rename from boards/xtensa/esp32-core/src/Makefile rename to boards/xtensa/esp32/esp32-core/src/Makefile diff --git a/boards/xtensa/esp32-core/src/esp32-core.h b/boards/xtensa/esp32/esp32-core/src/esp32-core.h similarity index 100% rename from boards/xtensa/esp32-core/src/esp32-core.h rename to boards/xtensa/esp32/esp32-core/src/esp32-core.h diff --git a/boards/xtensa/esp32-core/src/esp32_appinit.c b/boards/xtensa/esp32/esp32-core/src/esp32_appinit.c similarity index 100% rename from boards/xtensa/esp32-core/src/esp32_appinit.c rename to boards/xtensa/esp32/esp32-core/src/esp32_appinit.c diff --git a/boards/xtensa/esp32-core/src/esp32_boot.c b/boards/xtensa/esp32/esp32-core/src/esp32_boot.c similarity index 100% rename from boards/xtensa/esp32-core/src/esp32_boot.c rename to boards/xtensa/esp32/esp32-core/src/esp32_boot.c diff --git a/boards/xtensa/esp32-core/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-core/src/esp32_bringup.c similarity index 100% rename from boards/xtensa/esp32-core/src/esp32_bringup.c rename to boards/xtensa/esp32/esp32-core/src/esp32_bringup.c diff --git a/boards/x86/qemu-i486/Kconfig b/boards/z16/z16f2811/z16f2800100zcog/Kconfig similarity index 100% rename from boards/x86/qemu-i486/Kconfig rename to boards/z16/z16f2811/z16f2800100zcog/Kconfig diff --git a/boards/z16/z16f2800100zcog/README.txt b/boards/z16/z16f2811/z16f2800100zcog/README.txt similarity index 100% rename from boards/z16/z16f2800100zcog/README.txt rename to boards/z16/z16f2811/z16f2800100zcog/README.txt diff --git a/boards/z16/z16f2800100zcog/configs/nsh/.gitignore b/boards/z16/z16f2811/z16f2800100zcog/configs/nsh/.gitignore similarity index 100% rename from boards/z16/z16f2800100zcog/configs/nsh/.gitignore rename to boards/z16/z16f2811/z16f2800100zcog/configs/nsh/.gitignore diff --git a/boards/z16/z16f2800100zcog/configs/nsh/README.txt b/boards/z16/z16f2811/z16f2800100zcog/configs/nsh/README.txt similarity index 100% rename from boards/z16/z16f2800100zcog/configs/nsh/README.txt rename to boards/z16/z16f2811/z16f2800100zcog/configs/nsh/README.txt diff --git a/boards/z16/z16f2800100zcog/configs/nsh/defconfig b/boards/z16/z16f2811/z16f2800100zcog/configs/nsh/defconfig similarity index 100% rename from boards/z16/z16f2800100zcog/configs/nsh/defconfig rename to boards/z16/z16f2811/z16f2800100zcog/configs/nsh/defconfig diff --git a/boards/z16/z16f2800100zcog/configs/nsh/nsh.zfpproj b/boards/z16/z16f2811/z16f2800100zcog/configs/nsh/nsh.zfpproj similarity index 100% rename from boards/z16/z16f2800100zcog/configs/nsh/nsh.zfpproj rename to boards/z16/z16f2811/z16f2800100zcog/configs/nsh/nsh.zfpproj diff --git a/boards/z16/z16f2800100zcog/configs/ostest/.gitignore b/boards/z16/z16f2811/z16f2800100zcog/configs/ostest/.gitignore similarity index 100% rename from boards/z16/z16f2800100zcog/configs/ostest/.gitignore rename to boards/z16/z16f2811/z16f2800100zcog/configs/ostest/.gitignore diff --git a/boards/z16/z16f2800100zcog/configs/ostest/README.txt b/boards/z16/z16f2811/z16f2800100zcog/configs/ostest/README.txt similarity index 100% rename from boards/z16/z16f2800100zcog/configs/ostest/README.txt rename to boards/z16/z16f2811/z16f2800100zcog/configs/ostest/README.txt diff --git a/boards/z16/z16f2800100zcog/configs/ostest/defconfig b/boards/z16/z16f2811/z16f2800100zcog/configs/ostest/defconfig similarity index 100% rename from boards/z16/z16f2800100zcog/configs/ostest/defconfig rename to boards/z16/z16f2811/z16f2800100zcog/configs/ostest/defconfig diff --git a/boards/z16/z16f2800100zcog/configs/ostest/ostest.zfpproj b/boards/z16/z16f2811/z16f2800100zcog/configs/ostest/ostest.zfpproj similarity index 100% rename from boards/z16/z16f2800100zcog/configs/ostest/ostest.zfpproj rename to boards/z16/z16f2811/z16f2800100zcog/configs/ostest/ostest.zfpproj diff --git a/boards/z16/z16f2800100zcog/configs/pashello/.gitignore b/boards/z16/z16f2811/z16f2800100zcog/configs/pashello/.gitignore similarity index 100% rename from boards/z16/z16f2800100zcog/configs/pashello/.gitignore rename to boards/z16/z16f2811/z16f2800100zcog/configs/pashello/.gitignore diff --git a/boards/z16/z16f2800100zcog/configs/pashello/README.txt b/boards/z16/z16f2811/z16f2800100zcog/configs/pashello/README.txt similarity index 100% rename from boards/z16/z16f2800100zcog/configs/pashello/README.txt rename to boards/z16/z16f2811/z16f2800100zcog/configs/pashello/README.txt diff --git a/boards/z16/z16f2800100zcog/configs/pashello/defconfig b/boards/z16/z16f2811/z16f2800100zcog/configs/pashello/defconfig similarity index 100% rename from boards/z16/z16f2800100zcog/configs/pashello/defconfig rename to boards/z16/z16f2811/z16f2800100zcog/configs/pashello/defconfig diff --git a/boards/z16/z16f2800100zcog/configs/pashello/pashello.zfpproj b/boards/z16/z16f2811/z16f2800100zcog/configs/pashello/pashello.zfpproj similarity index 100% rename from boards/z16/z16f2800100zcog/configs/pashello/pashello.zfpproj rename to boards/z16/z16f2811/z16f2800100zcog/configs/pashello/pashello.zfpproj diff --git a/boards/z16/z16f2800100zcog/include/board.h b/boards/z16/z16f2811/z16f2800100zcog/include/board.h similarity index 100% rename from boards/z16/z16f2800100zcog/include/board.h rename to boards/z16/z16f2811/z16f2800100zcog/include/board.h diff --git a/boards/z16/z16f2800100zcog/scripts/Make.defs b/boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs similarity index 98% rename from boards/z16/z16f2800100zcog/scripts/Make.defs rename to boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs index bf1fd968087..811cd1eba49 100644 --- a/boards/z16/z16f2800100zcog/scripts/Make.defs +++ b/boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs @@ -151,7 +151,7 @@ ARFLAGS = -quiet -warn # Linker definitions -LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)boards$(DELIM)z16f2800100zcog$(DELIM)scripts$(DELIM)z16f2800100zcog.linkcmd +LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)z16f2800100zcog$(DELIM)scripts$(DELIM)z16f2800100zcog.linkcmd # Tool names/pathes diff --git a/boards/z16/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd b/boards/z16/z16f2811/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd similarity index 100% rename from boards/z16/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd rename to boards/z16/z16f2811/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd diff --git a/boards/z16/z16f2800100zcog/src/.gitignore b/boards/z16/z16f2811/z16f2800100zcog/src/.gitignore similarity index 100% rename from boards/z16/z16f2800100zcog/src/.gitignore rename to boards/z16/z16f2811/z16f2800100zcog/src/.gitignore diff --git a/boards/z16/z16f2800100zcog/src/Makefile b/boards/z16/z16f2811/z16f2800100zcog/src/Makefile similarity index 100% rename from boards/z16/z16f2800100zcog/src/Makefile rename to boards/z16/z16f2811/z16f2800100zcog/src/Makefile diff --git a/boards/z16/z16f2800100zcog/src/z16f_boot.c b/boards/z16/z16f2811/z16f2800100zcog/src/z16f_boot.c similarity index 100% rename from boards/z16/z16f2800100zcog/src/z16f_boot.c rename to boards/z16/z16f2811/z16f2800100zcog/src/z16f_boot.c diff --git a/boards/z16/z16f2800100zcog/src/z16f_leds.c b/boards/z16/z16f2811/z16f2800100zcog/src/z16f_leds.c similarity index 100% rename from boards/z16/z16f2800100zcog/src/z16f_leds.c rename to boards/z16/z16f2811/z16f2800100zcog/src/z16f_leds.c diff --git a/boards/z16/z16f2800100zcog/tools/dopatch.sh b/boards/z16/z16f2811/z16f2800100zcog/tools/dopatch.sh similarity index 100% rename from boards/z16/z16f2800100zcog/tools/dopatch.sh rename to boards/z16/z16f2811/z16f2800100zcog/tools/dopatch.sh diff --git a/boards/z16/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/boards/z16/z16f2811/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch similarity index 100% rename from boards/z16/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch rename to boards/z16/z16f2811/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch diff --git a/boards/z16/z16f2800100zcog/Kconfig b/boards/z80/ez80/ez80f910200kitg/Kconfig similarity index 100% rename from boards/z16/z16f2800100zcog/Kconfig rename to boards/z80/ez80/ez80f910200kitg/Kconfig diff --git a/boards/z80/ez80f910200kitg/README.txt b/boards/z80/ez80/ez80f910200kitg/README.txt similarity index 100% rename from boards/z80/ez80f910200kitg/README.txt rename to boards/z80/ez80/ez80f910200kitg/README.txt diff --git a/boards/z80/ez80f910200kitg/configs/ostest/.gitignore b/boards/z80/ez80/ez80f910200kitg/configs/ostest/.gitignore similarity index 100% rename from boards/z80/ez80f910200kitg/configs/ostest/.gitignore rename to boards/z80/ez80/ez80f910200kitg/configs/ostest/.gitignore diff --git a/boards/z80/ez80f910200kitg/configs/ostest/README.txt b/boards/z80/ez80/ez80f910200kitg/configs/ostest/README.txt similarity index 100% rename from boards/z80/ez80f910200kitg/configs/ostest/README.txt rename to boards/z80/ez80/ez80f910200kitg/configs/ostest/README.txt diff --git a/boards/z80/ez80f910200kitg/configs/ostest/defconfig b/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig similarity index 100% rename from boards/z80/ez80f910200kitg/configs/ostest/defconfig rename to boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig diff --git a/boards/z80/ez80f910200kitg/configs/ostest/ostest.zdsproj b/boards/z80/ez80/ez80f910200kitg/configs/ostest/ostest.zdsproj similarity index 100% rename from boards/z80/ez80f910200kitg/configs/ostest/ostest.zdsproj rename to boards/z80/ez80/ez80f910200kitg/configs/ostest/ostest.zdsproj diff --git a/boards/z80/ez80f910200kitg/include/board.h b/boards/z80/ez80/ez80f910200kitg/include/board.h similarity index 100% rename from boards/z80/ez80f910200kitg/include/board.h rename to boards/z80/ez80/ez80f910200kitg/include/board.h diff --git a/boards/z80/ez80f910200kitg/scripts/Make.defs b/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs similarity index 98% rename from boards/z80/ez80f910200kitg/scripts/Make.defs rename to boards/z80/ez80/ez80f910200kitg/scripts/Make.defs index c9c565eb7a4..ea1e95b8b95 100644 --- a/boards/z80/ez80f910200kitg/scripts/Make.defs +++ b/boards/z80/ez80/ez80f910200kitg/scripts/Make.defs @@ -160,7 +160,7 @@ ARFLAGS = -quiet -warn # Linker definitions -LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)boards$(DELIM)ez80f910200kitg$(DELIM)scripts$(DELIM)ez80f910200kitg.linkcmd.linkcmd +LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)boards$(DELIM)ez80$(DELIM)ez80f910200kitg$(DELIM)scripts$(DELIM)ez80f910200kitg.linkcmd.linkcmd # Tool names/paths. diff --git a/boards/z80/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd b/boards/z80/ez80/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd similarity index 100% rename from boards/z80/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd rename to boards/z80/ez80/ez80f910200kitg/scripts/ez80f910200kitg.linkcmd diff --git a/boards/z80/ez80f910200kitg/src/.gitignore b/boards/z80/ez80/ez80f910200kitg/src/.gitignore similarity index 100% rename from boards/z80/ez80f910200kitg/src/.gitignore rename to boards/z80/ez80/ez80f910200kitg/src/.gitignore diff --git a/boards/z80/ez80f910200kitg/src/Makefile b/boards/z80/ez80/ez80f910200kitg/src/Makefile similarity index 100% rename from boards/z80/ez80f910200kitg/src/Makefile rename to boards/z80/ez80/ez80f910200kitg/src/Makefile diff --git a/boards/z80/ez80f910200kitg/src/ez80_boot.c b/boards/z80/ez80/ez80f910200kitg/src/ez80_boot.c similarity index 100% rename from boards/z80/ez80f910200kitg/src/ez80_boot.c rename to boards/z80/ez80/ez80f910200kitg/src/ez80_boot.c diff --git a/boards/z80/ez80f910200kitg/src/ez80_leds.c b/boards/z80/ez80/ez80f910200kitg/src/ez80_leds.c similarity index 100% rename from boards/z80/ez80f910200kitg/src/ez80_leds.c rename to boards/z80/ez80/ez80f910200kitg/src/ez80_leds.c diff --git a/boards/z80/ez80f910200kitg/Kconfig b/boards/z80/ez80/ez80f910200zco/Kconfig similarity index 100% rename from boards/z80/ez80f910200kitg/Kconfig rename to boards/z80/ez80/ez80f910200zco/Kconfig diff --git a/boards/z80/ez80f910200zco/README.txt b/boards/z80/ez80/ez80f910200zco/README.txt similarity index 100% rename from boards/z80/ez80f910200zco/README.txt rename to boards/z80/ez80/ez80f910200zco/README.txt diff --git a/boards/z80/ez80f910200zco/configs/dhcpd/.gitignore b/boards/z80/ez80/ez80f910200zco/configs/dhcpd/.gitignore similarity index 100% rename from boards/z80/ez80f910200zco/configs/dhcpd/.gitignore rename to boards/z80/ez80/ez80f910200zco/configs/dhcpd/.gitignore diff --git a/boards/z80/ez80f910200zco/configs/dhcpd/README.txt b/boards/z80/ez80/ez80f910200zco/configs/dhcpd/README.txt similarity index 100% rename from boards/z80/ez80f910200zco/configs/dhcpd/README.txt rename to boards/z80/ez80/ez80f910200zco/configs/dhcpd/README.txt diff --git a/boards/z80/ez80f910200zco/configs/dhcpd/defconfig b/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig similarity index 100% rename from boards/z80/ez80f910200zco/configs/dhcpd/defconfig rename to boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig diff --git a/boards/z80/ez80f910200zco/configs/dhcpd/dhcpd.zdsproj b/boards/z80/ez80/ez80f910200zco/configs/dhcpd/dhcpd.zdsproj similarity index 100% rename from boards/z80/ez80f910200zco/configs/dhcpd/dhcpd.zdsproj rename to boards/z80/ez80/ez80f910200zco/configs/dhcpd/dhcpd.zdsproj diff --git a/boards/z80/ez80f910200zco/configs/httpd/.gitignore b/boards/z80/ez80/ez80f910200zco/configs/httpd/.gitignore similarity index 100% rename from boards/z80/ez80f910200zco/configs/httpd/.gitignore rename to boards/z80/ez80/ez80f910200zco/configs/httpd/.gitignore diff --git a/boards/z80/ez80f910200zco/configs/httpd/README.txt b/boards/z80/ez80/ez80f910200zco/configs/httpd/README.txt similarity index 100% rename from boards/z80/ez80f910200zco/configs/httpd/README.txt rename to boards/z80/ez80/ez80f910200zco/configs/httpd/README.txt diff --git a/boards/z80/ez80f910200zco/configs/httpd/defconfig b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig similarity index 100% rename from boards/z80/ez80f910200zco/configs/httpd/defconfig rename to boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig diff --git a/boards/z80/ez80f910200zco/configs/httpd/httpd.zdsproj b/boards/z80/ez80/ez80f910200zco/configs/httpd/httpd.zdsproj similarity index 100% rename from boards/z80/ez80f910200zco/configs/httpd/httpd.zdsproj rename to boards/z80/ez80/ez80f910200zco/configs/httpd/httpd.zdsproj diff --git a/boards/z80/ez80f910200zco/configs/nettest/.gitignore b/boards/z80/ez80/ez80f910200zco/configs/nettest/.gitignore similarity index 100% rename from boards/z80/ez80f910200zco/configs/nettest/.gitignore rename to boards/z80/ez80/ez80f910200zco/configs/nettest/.gitignore diff --git a/boards/z80/ez80f910200zco/configs/nettest/README.txt b/boards/z80/ez80/ez80f910200zco/configs/nettest/README.txt similarity index 100% rename from boards/z80/ez80f910200zco/configs/nettest/README.txt rename to boards/z80/ez80/ez80f910200zco/configs/nettest/README.txt diff --git a/boards/z80/ez80f910200zco/configs/nettest/defconfig b/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig similarity index 100% rename from boards/z80/ez80f910200zco/configs/nettest/defconfig rename to boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig diff --git a/boards/z80/ez80f910200zco/configs/nettest/nettest.zdsproj b/boards/z80/ez80/ez80f910200zco/configs/nettest/nettest.zdsproj similarity index 100% rename from boards/z80/ez80f910200zco/configs/nettest/nettest.zdsproj rename to boards/z80/ez80/ez80f910200zco/configs/nettest/nettest.zdsproj diff --git a/boards/z80/ez80f910200zco/configs/nsh/.gitignore b/boards/z80/ez80/ez80f910200zco/configs/nsh/.gitignore similarity index 100% rename from boards/z80/ez80f910200zco/configs/nsh/.gitignore rename to boards/z80/ez80/ez80f910200zco/configs/nsh/.gitignore diff --git a/boards/z80/ez80f910200zco/configs/nsh/README.txt b/boards/z80/ez80/ez80f910200zco/configs/nsh/README.txt similarity index 100% rename from boards/z80/ez80f910200zco/configs/nsh/README.txt rename to boards/z80/ez80/ez80f910200zco/configs/nsh/README.txt diff --git a/boards/z80/ez80f910200zco/configs/nsh/defconfig b/boards/z80/ez80/ez80f910200zco/configs/nsh/defconfig similarity index 100% rename from boards/z80/ez80f910200zco/configs/nsh/defconfig rename to boards/z80/ez80/ez80f910200zco/configs/nsh/defconfig diff --git a/boards/z80/ez80f910200zco/configs/nsh/nsh.zdsproj b/boards/z80/ez80/ez80f910200zco/configs/nsh/nsh.zdsproj similarity index 100% rename from boards/z80/ez80f910200zco/configs/nsh/nsh.zdsproj rename to boards/z80/ez80/ez80f910200zco/configs/nsh/nsh.zdsproj diff --git a/boards/z80/ez80f910200zco/configs/poll/.gitignore b/boards/z80/ez80/ez80f910200zco/configs/poll/.gitignore similarity index 100% rename from boards/z80/ez80f910200zco/configs/poll/.gitignore rename to boards/z80/ez80/ez80f910200zco/configs/poll/.gitignore diff --git a/boards/z80/ez80f910200zco/configs/poll/README.txt b/boards/z80/ez80/ez80f910200zco/configs/poll/README.txt similarity index 100% rename from boards/z80/ez80f910200zco/configs/poll/README.txt rename to boards/z80/ez80/ez80f910200zco/configs/poll/README.txt diff --git a/boards/z80/ez80f910200zco/configs/poll/defconfig b/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig similarity index 100% rename from boards/z80/ez80f910200zco/configs/poll/defconfig rename to boards/z80/ez80/ez80f910200zco/configs/poll/defconfig diff --git a/boards/z80/ez80f910200zco/configs/poll/poll.zdsproj b/boards/z80/ez80/ez80f910200zco/configs/poll/poll.zdsproj similarity index 100% rename from boards/z80/ez80f910200zco/configs/poll/poll.zdsproj rename to boards/z80/ez80/ez80f910200zco/configs/poll/poll.zdsproj diff --git a/boards/z80/ez80f910200zco/include/board.h b/boards/z80/ez80/ez80f910200zco/include/board.h similarity index 100% rename from boards/z80/ez80f910200zco/include/board.h rename to boards/z80/ez80/ez80f910200zco/include/board.h diff --git a/boards/z80/ez80f910200zco/scripts/Make.defs b/boards/z80/ez80/ez80f910200zco/scripts/Make.defs similarity index 98% rename from boards/z80/ez80f910200zco/scripts/Make.defs rename to boards/z80/ez80/ez80f910200zco/scripts/Make.defs index 805d2f74bbf..4c518d53be2 100644 --- a/boards/z80/ez80f910200zco/scripts/Make.defs +++ b/boards/z80/ez80/ez80f910200zco/scripts/Make.defs @@ -160,7 +160,7 @@ ARFLAGS = -quiet -warn # Linker definitions -LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)boards$(DELIM)ez80f910200zco$(DELIM)scripts$(DELIM)ez80f910200zco.linkcmd +LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)boards$(DELIM)ez80$(DELIM)ez80f910200zco$(DELIM)scripts$(DELIM)ez80f910200zco.linkcmd # Tool names/paths. diff --git a/boards/z80/ez80f910200zco/scripts/ez80f910200zco.linkcmd b/boards/z80/ez80/ez80f910200zco/scripts/ez80f910200zco.linkcmd similarity index 100% rename from boards/z80/ez80f910200zco/scripts/ez80f910200zco.linkcmd rename to boards/z80/ez80/ez80f910200zco/scripts/ez80f910200zco.linkcmd diff --git a/boards/z80/ez80f910200zco/src/.gitignore b/boards/z80/ez80/ez80f910200zco/src/.gitignore similarity index 100% rename from boards/z80/ez80f910200zco/src/.gitignore rename to boards/z80/ez80/ez80f910200zco/src/.gitignore diff --git a/boards/z80/ez80f910200zco/src/Makefile b/boards/z80/ez80/ez80f910200zco/src/Makefile similarity index 100% rename from boards/z80/ez80f910200zco/src/Makefile rename to boards/z80/ez80/ez80f910200zco/src/Makefile diff --git a/boards/z80/ez80f910200zco/src/ez80_boot.c b/boards/z80/ez80/ez80f910200zco/src/ez80_boot.c similarity index 100% rename from boards/z80/ez80f910200zco/src/ez80_boot.c rename to boards/z80/ez80/ez80f910200zco/src/ez80_boot.c diff --git a/boards/z80/ez80f910200zco/src/ez80_buttons.c b/boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c similarity index 100% rename from boards/z80/ez80f910200zco/src/ez80_buttons.c rename to boards/z80/ez80/ez80f910200zco/src/ez80_buttons.c diff --git a/boards/z80/ez80f910200zco/src/ez80_leds.c b/boards/z80/ez80/ez80f910200zco/src/ez80_leds.c similarity index 100% rename from boards/z80/ez80f910200zco/src/ez80_leds.c rename to boards/z80/ez80/ez80f910200zco/src/ez80_leds.c diff --git a/boards/z80/ez80f910200zco/src/ez80f910200zco.h b/boards/z80/ez80/ez80f910200zco/src/ez80f910200zco.h similarity index 100% rename from boards/z80/ez80f910200zco/src/ez80f910200zco.h rename to boards/z80/ez80/ez80f910200zco/src/ez80f910200zco.h diff --git a/boards/z80/makerlisp/Kconfig b/boards/z80/ez80/makerlisp/Kconfig similarity index 100% rename from boards/z80/makerlisp/Kconfig rename to boards/z80/ez80/makerlisp/Kconfig diff --git a/boards/z80/makerlisp/README.txt b/boards/z80/ez80/makerlisp/README.txt similarity index 100% rename from boards/z80/makerlisp/README.txt rename to boards/z80/ez80/makerlisp/README.txt diff --git a/boards/z80/makerlisp/configs/nsh_flash/.gitignore b/boards/z80/ez80/makerlisp/configs/nsh_flash/.gitignore similarity index 100% rename from boards/z80/makerlisp/configs/nsh_flash/.gitignore rename to boards/z80/ez80/makerlisp/configs/nsh_flash/.gitignore diff --git a/boards/z80/makerlisp/configs/nsh_flash/README.txt b/boards/z80/ez80/makerlisp/configs/nsh_flash/README.txt similarity index 100% rename from boards/z80/makerlisp/configs/nsh_flash/README.txt rename to boards/z80/ez80/makerlisp/configs/nsh_flash/README.txt diff --git a/boards/z80/makerlisp/configs/nsh_flash/defconfig b/boards/z80/ez80/makerlisp/configs/nsh_flash/defconfig similarity index 100% rename from boards/z80/makerlisp/configs/nsh_flash/defconfig rename to boards/z80/ez80/makerlisp/configs/nsh_flash/defconfig diff --git a/boards/z80/makerlisp/configs/nsh_flash/nsh.zdsproj b/boards/z80/ez80/makerlisp/configs/nsh_flash/nsh.zdsproj similarity index 100% rename from boards/z80/makerlisp/configs/nsh_flash/nsh.zdsproj rename to boards/z80/ez80/makerlisp/configs/nsh_flash/nsh.zdsproj diff --git a/boards/z80/makerlisp/configs/nsh_flash/nsh.zfpproj b/boards/z80/ez80/makerlisp/configs/nsh_flash/nsh.zfpproj similarity index 100% rename from boards/z80/makerlisp/configs/nsh_flash/nsh.zfpproj rename to boards/z80/ez80/makerlisp/configs/nsh_flash/nsh.zfpproj diff --git a/boards/z80/makerlisp/configs/nsh_flash/nsh_flash.ztgt b/boards/z80/ez80/makerlisp/configs/nsh_flash/nsh_flash.ztgt similarity index 100% rename from boards/z80/makerlisp/configs/nsh_flash/nsh_flash.ztgt rename to boards/z80/ez80/makerlisp/configs/nsh_flash/nsh_flash.ztgt diff --git a/boards/z80/makerlisp/configs/nsh_flash/nsh_ram.ztgt b/boards/z80/ez80/makerlisp/configs/nsh_flash/nsh_ram.ztgt similarity index 100% rename from boards/z80/makerlisp/configs/nsh_flash/nsh_ram.ztgt rename to boards/z80/ez80/makerlisp/configs/nsh_flash/nsh_ram.ztgt diff --git a/boards/z80/makerlisp/configs/nsh_ram/.gitignore b/boards/z80/ez80/makerlisp/configs/nsh_ram/.gitignore similarity index 100% rename from boards/z80/makerlisp/configs/nsh_ram/.gitignore rename to boards/z80/ez80/makerlisp/configs/nsh_ram/.gitignore diff --git a/boards/z80/makerlisp/configs/nsh_ram/README.txt b/boards/z80/ez80/makerlisp/configs/nsh_ram/README.txt similarity index 100% rename from boards/z80/makerlisp/configs/nsh_ram/README.txt rename to boards/z80/ez80/makerlisp/configs/nsh_ram/README.txt diff --git a/boards/z80/makerlisp/configs/nsh_ram/defconfig b/boards/z80/ez80/makerlisp/configs/nsh_ram/defconfig similarity index 100% rename from boards/z80/makerlisp/configs/nsh_ram/defconfig rename to boards/z80/ez80/makerlisp/configs/nsh_ram/defconfig diff --git a/boards/z80/makerlisp/configs/nsh_ram/nsh.zdsproj b/boards/z80/ez80/makerlisp/configs/nsh_ram/nsh.zdsproj similarity index 100% rename from boards/z80/makerlisp/configs/nsh_ram/nsh.zdsproj rename to boards/z80/ez80/makerlisp/configs/nsh_ram/nsh.zdsproj diff --git a/boards/z80/makerlisp/configs/nsh_ram/nsh.zfpproj b/boards/z80/ez80/makerlisp/configs/nsh_ram/nsh.zfpproj similarity index 100% rename from boards/z80/makerlisp/configs/nsh_ram/nsh.zfpproj rename to boards/z80/ez80/makerlisp/configs/nsh_ram/nsh.zfpproj diff --git a/boards/z80/makerlisp/configs/nsh_ram/nsh_flash.ztgt b/boards/z80/ez80/makerlisp/configs/nsh_ram/nsh_flash.ztgt similarity index 100% rename from boards/z80/makerlisp/configs/nsh_ram/nsh_flash.ztgt rename to boards/z80/ez80/makerlisp/configs/nsh_ram/nsh_flash.ztgt diff --git a/boards/z80/makerlisp/configs/nsh_ram/nsh_ram.ztgt b/boards/z80/ez80/makerlisp/configs/nsh_ram/nsh_ram.ztgt similarity index 100% rename from boards/z80/makerlisp/configs/nsh_ram/nsh_ram.ztgt rename to boards/z80/ez80/makerlisp/configs/nsh_ram/nsh_ram.ztgt diff --git a/boards/z80/makerlisp/configs/sdboot/.gitignore b/boards/z80/ez80/makerlisp/configs/sdboot/.gitignore similarity index 100% rename from boards/z80/makerlisp/configs/sdboot/.gitignore rename to boards/z80/ez80/makerlisp/configs/sdboot/.gitignore diff --git a/boards/z80/makerlisp/configs/sdboot/README.txt b/boards/z80/ez80/makerlisp/configs/sdboot/README.txt similarity index 100% rename from boards/z80/makerlisp/configs/sdboot/README.txt rename to boards/z80/ez80/makerlisp/configs/sdboot/README.txt diff --git a/boards/z80/makerlisp/configs/sdboot/defconfig b/boards/z80/ez80/makerlisp/configs/sdboot/defconfig similarity index 100% rename from boards/z80/makerlisp/configs/sdboot/defconfig rename to boards/z80/ez80/makerlisp/configs/sdboot/defconfig diff --git a/boards/z80/makerlisp/configs/sdboot/sdboot.zdsproj b/boards/z80/ez80/makerlisp/configs/sdboot/sdboot.zdsproj similarity index 100% rename from boards/z80/makerlisp/configs/sdboot/sdboot.zdsproj rename to boards/z80/ez80/makerlisp/configs/sdboot/sdboot.zdsproj diff --git a/boards/z80/makerlisp/configs/sdboot/sdboot.zfpproj b/boards/z80/ez80/makerlisp/configs/sdboot/sdboot.zfpproj similarity index 100% rename from boards/z80/makerlisp/configs/sdboot/sdboot.zfpproj rename to boards/z80/ez80/makerlisp/configs/sdboot/sdboot.zfpproj diff --git a/boards/z80/makerlisp/configs/sdboot/sdboot_flash.ztgt b/boards/z80/ez80/makerlisp/configs/sdboot/sdboot_flash.ztgt similarity index 100% rename from boards/z80/makerlisp/configs/sdboot/sdboot_flash.ztgt rename to boards/z80/ez80/makerlisp/configs/sdboot/sdboot_flash.ztgt diff --git a/boards/z80/makerlisp/configs/sdboot/sdboot_ram.ztgt b/boards/z80/ez80/makerlisp/configs/sdboot/sdboot_ram.ztgt similarity index 100% rename from boards/z80/makerlisp/configs/sdboot/sdboot_ram.ztgt rename to boards/z80/ez80/makerlisp/configs/sdboot/sdboot_ram.ztgt diff --git a/boards/z80/makerlisp/include/board.h b/boards/z80/ez80/makerlisp/include/board.h similarity index 100% rename from boards/z80/makerlisp/include/board.h rename to boards/z80/ez80/makerlisp/include/board.h diff --git a/boards/z80/makerlisp/scripts/Make.defs b/boards/z80/ez80/makerlisp/scripts/Make.defs similarity index 98% rename from boards/z80/makerlisp/scripts/Make.defs rename to boards/z80/ez80/makerlisp/scripts/Make.defs index 452e6e792fe..ccc11877321 100644 --- a/boards/z80/makerlisp/scripts/Make.defs +++ b/boards/z80/ez80/makerlisp/scripts/Make.defs @@ -168,7 +168,7 @@ else # ifeq ($(CONFIG_BOOT_RUNFROMEXTSRAM),y) LDSCRIPT = makerlisp_ram.linkcmd endif -LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)boards$(DELIM)makerlisp$(DELIM)scripts$(DELIM)$(LDSCRIPT) +LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)boards$(DELIM)ez80$(DELIM)makerlisp$(DELIM)scripts$(DELIM)$(LDSCRIPT) # Tool names/paths. diff --git a/boards/z80/makerlisp/scripts/makerlisp_copytoram.linkcmd b/boards/z80/ez80/makerlisp/scripts/makerlisp_copytoram.linkcmd similarity index 100% rename from boards/z80/makerlisp/scripts/makerlisp_copytoram.linkcmd rename to boards/z80/ez80/makerlisp/scripts/makerlisp_copytoram.linkcmd diff --git a/boards/z80/makerlisp/scripts/makerlisp_flash.linkcmd b/boards/z80/ez80/makerlisp/scripts/makerlisp_flash.linkcmd similarity index 100% rename from boards/z80/makerlisp/scripts/makerlisp_flash.linkcmd rename to boards/z80/ez80/makerlisp/scripts/makerlisp_flash.linkcmd diff --git a/boards/z80/makerlisp/scripts/makerlisp_flash.ztgt b/boards/z80/ez80/makerlisp/scripts/makerlisp_flash.ztgt similarity index 100% rename from boards/z80/makerlisp/scripts/makerlisp_flash.ztgt rename to boards/z80/ez80/makerlisp/scripts/makerlisp_flash.ztgt diff --git a/boards/z80/makerlisp/scripts/makerlisp_ram.linkcmd b/boards/z80/ez80/makerlisp/scripts/makerlisp_ram.linkcmd similarity index 100% rename from boards/z80/makerlisp/scripts/makerlisp_ram.linkcmd rename to boards/z80/ez80/makerlisp/scripts/makerlisp_ram.linkcmd diff --git a/boards/z80/makerlisp/scripts/makerlisp_ram.ztgt b/boards/z80/ez80/makerlisp/scripts/makerlisp_ram.ztgt similarity index 100% rename from boards/z80/makerlisp/scripts/makerlisp_ram.ztgt rename to boards/z80/ez80/makerlisp/scripts/makerlisp_ram.ztgt diff --git a/boards/z80/makerlisp/src/.gitignore b/boards/z80/ez80/makerlisp/src/.gitignore similarity index 100% rename from boards/z80/makerlisp/src/.gitignore rename to boards/z80/ez80/makerlisp/src/.gitignore diff --git a/boards/z80/makerlisp/src/Makefile b/boards/z80/ez80/makerlisp/src/Makefile similarity index 100% rename from boards/z80/makerlisp/src/Makefile rename to boards/z80/ez80/makerlisp/src/Makefile diff --git a/boards/z80/makerlisp/src/ez80_appinit.c b/boards/z80/ez80/makerlisp/src/ez80_appinit.c similarity index 100% rename from boards/z80/makerlisp/src/ez80_appinit.c rename to boards/z80/ez80/makerlisp/src/ez80_appinit.c diff --git a/boards/z80/makerlisp/src/ez80_boot.c b/boards/z80/ez80/makerlisp/src/ez80_boot.c similarity index 100% rename from boards/z80/makerlisp/src/ez80_boot.c rename to boards/z80/ez80/makerlisp/src/ez80_boot.c diff --git a/boards/z80/makerlisp/src/ez80_bringup.c b/boards/z80/ez80/makerlisp/src/ez80_bringup.c similarity index 100% rename from boards/z80/makerlisp/src/ez80_bringup.c rename to boards/z80/ez80/makerlisp/src/ez80_bringup.c diff --git a/boards/z80/makerlisp/src/ez80_leds.c b/boards/z80/ez80/makerlisp/src/ez80_leds.c similarity index 100% rename from boards/z80/makerlisp/src/ez80_leds.c rename to boards/z80/ez80/makerlisp/src/ez80_leds.c diff --git a/boards/z80/makerlisp/src/ez80_spi.c b/boards/z80/ez80/makerlisp/src/ez80_spi.c similarity index 100% rename from boards/z80/makerlisp/src/ez80_spi.c rename to boards/z80/ez80/makerlisp/src/ez80_spi.c diff --git a/boards/z80/makerlisp/src/ez80_spimmcsd.c b/boards/z80/ez80/makerlisp/src/ez80_spimmcsd.c similarity index 100% rename from boards/z80/makerlisp/src/ez80_spimmcsd.c rename to boards/z80/ez80/makerlisp/src/ez80_spimmcsd.c diff --git a/boards/z80/makerlisp/src/makerlisp.h b/boards/z80/ez80/makerlisp/src/makerlisp.h similarity index 100% rename from boards/z80/makerlisp/src/makerlisp.h rename to boards/z80/ez80/makerlisp/src/makerlisp.h diff --git a/boards/z80/makerlisp/src/sd_main.c b/boards/z80/ez80/makerlisp/src/sd_main.c similarity index 100% rename from boards/z80/makerlisp/src/sd_main.c rename to boards/z80/ez80/makerlisp/src/sd_main.c diff --git a/boards/z80/ez80f910200zco/Kconfig b/boards/z80/z180/p112/Kconfig similarity index 100% rename from boards/z80/ez80f910200zco/Kconfig rename to boards/z80/z180/p112/Kconfig diff --git a/boards/arm/p112/README.txt b/boards/z80/z180/p112/README.txt similarity index 100% rename from boards/arm/p112/README.txt rename to boards/z80/z180/p112/README.txt diff --git a/boards/arm/p112/configs/ostest/defconfig b/boards/z80/z180/p112/configs/ostest/defconfig similarity index 100% rename from boards/arm/p112/configs/ostest/defconfig rename to boards/z80/z180/p112/configs/ostest/defconfig diff --git a/boards/arm/p112/include/board.h b/boards/z80/z180/p112/include/board.h similarity index 95% rename from boards/arm/p112/include/board.h rename to boards/z80/z180/p112/include/board.h index aff9da4fe89..0a7ef80f848 100644 --- a/boards/arm/p112/include/board.h +++ b/boards/z80/z180/p112/include/board.h @@ -33,8 +33,8 @@ * ****************************************************************************/ -#ifndef __BOARDS_ARM_P112_INCLUDE_BOARD_H -#define __BOARDS_ARM_P112_INCLUDE_BOARD_H +#ifndef __BOARDS_Z80_P112_INCLUDE_BOARD_H +#define __BOARDS_Z80_P112_INCLUDE_BOARD_H /**************************************************************************** * Included Files @@ -63,4 +63,4 @@ extern "C" } #endif -#endif /* __BOARDS_ARM_P112_INCLUDE_BOARD_H */ +#endif /* __BOARDS_Z80_P112_INCLUDE_BOARD_H */ diff --git a/boards/arm/p112/scripts/Make.defs b/boards/z80/z180/p112/scripts/Make.defs similarity index 100% rename from boards/arm/p112/scripts/Make.defs rename to boards/z80/z180/p112/scripts/Make.defs diff --git a/boards/or1k/or1k/src/.gitignore b/boards/z80/z180/p112/src/.gitignore similarity index 100% rename from boards/or1k/or1k/src/.gitignore rename to boards/z80/z180/p112/src/.gitignore diff --git a/boards/arm/p112/src/Makefile b/boards/z80/z180/p112/src/Makefile similarity index 100% rename from boards/arm/p112/src/Makefile rename to boards/z80/z180/p112/src/Makefile diff --git a/boards/z80/z80sim/Kconfig b/boards/z80/z8/z8encore000zco/Kconfig similarity index 100% rename from boards/z80/z80sim/Kconfig rename to boards/z80/z8/z8encore000zco/Kconfig diff --git a/boards/z80/z8encore000zco/README.txt b/boards/z80/z8/z8encore000zco/README.txt similarity index 100% rename from boards/z80/z8encore000zco/README.txt rename to boards/z80/z8/z8encore000zco/README.txt diff --git a/boards/z80/z8encore000zco/configs/ostest/.gitignore b/boards/z80/z8/z8encore000zco/configs/ostest/.gitignore similarity index 100% rename from boards/z80/z8encore000zco/configs/ostest/.gitignore rename to boards/z80/z8/z8encore000zco/configs/ostest/.gitignore diff --git a/boards/z80/z8encore000zco/configs/ostest/Make.defs b/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs similarity index 100% rename from boards/z80/z8encore000zco/configs/ostest/Make.defs rename to boards/z80/z8/z8encore000zco/configs/ostest/Make.defs diff --git a/boards/z80/z8encore000zco/configs/ostest/README.txt b/boards/z80/z8/z8encore000zco/configs/ostest/README.txt similarity index 100% rename from boards/z80/z8encore000zco/configs/ostest/README.txt rename to boards/z80/z8/z8encore000zco/configs/ostest/README.txt diff --git a/boards/z80/z8encore000zco/configs/ostest/defconfig b/boards/z80/z8/z8encore000zco/configs/ostest/defconfig similarity index 100% rename from boards/z80/z8encore000zco/configs/ostest/defconfig rename to boards/z80/z8/z8encore000zco/configs/ostest/defconfig diff --git a/boards/z80/z8encore000zco/configs/ostest/ostest.linkcmd b/boards/z80/z8/z8encore000zco/configs/ostest/ostest.linkcmd similarity index 100% rename from boards/z80/z8encore000zco/configs/ostest/ostest.linkcmd rename to boards/z80/z8/z8encore000zco/configs/ostest/ostest.linkcmd diff --git a/boards/z80/z8encore000zco/configs/ostest/ostest.zdsproj b/boards/z80/z8/z8encore000zco/configs/ostest/ostest.zdsproj similarity index 100% rename from boards/z80/z8encore000zco/configs/ostest/ostest.zdsproj rename to boards/z80/z8/z8encore000zco/configs/ostest/ostest.zdsproj diff --git a/boards/z80/z8encore000zco/include/board.h b/boards/z80/z8/z8encore000zco/include/board.h similarity index 100% rename from boards/z80/z8encore000zco/include/board.h rename to boards/z80/z8/z8encore000zco/include/board.h diff --git a/boards/z80/z8encore000zco/src/.gitignore b/boards/z80/z8/z8encore000zco/src/.gitignore similarity index 100% rename from boards/z80/z8encore000zco/src/.gitignore rename to boards/z80/z8/z8encore000zco/src/.gitignore diff --git a/boards/z80/z8encore000zco/src/Makefile b/boards/z80/z8/z8encore000zco/src/Makefile similarity index 100% rename from boards/z80/z8encore000zco/src/Makefile rename to boards/z80/z8/z8encore000zco/src/Makefile diff --git a/boards/z80/z8encore000zco/src/z8_boot.c b/boards/z80/z8/z8encore000zco/src/z8_boot.c similarity index 100% rename from boards/z80/z8encore000zco/src/z8_boot.c rename to boards/z80/z8/z8encore000zco/src/z8_boot.c diff --git a/boards/z80/z8encore000zco/src/z8_leds.c b/boards/z80/z8/z8encore000zco/src/z8_leds.c similarity index 100% rename from boards/z80/z8encore000zco/src/z8_leds.c rename to boards/z80/z8/z8encore000zco/src/z8_leds.c diff --git a/boards/z80/z8encore000zco/Kconfig b/boards/z80/z8/z8f64200100kit/Kconfig similarity index 100% rename from boards/z80/z8encore000zco/Kconfig rename to boards/z80/z8/z8f64200100kit/Kconfig diff --git a/boards/z80/z8f64200100kit/README.txt b/boards/z80/z8/z8f64200100kit/README.txt similarity index 100% rename from boards/z80/z8f64200100kit/README.txt rename to boards/z80/z8/z8f64200100kit/README.txt diff --git a/boards/z80/z8f64200100kit/configs/ostest/.gitignore b/boards/z80/z8/z8f64200100kit/configs/ostest/.gitignore similarity index 100% rename from boards/z80/z8f64200100kit/configs/ostest/.gitignore rename to boards/z80/z8/z8f64200100kit/configs/ostest/.gitignore diff --git a/boards/z80/z8f64200100kit/configs/ostest/Make.defs b/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs similarity index 100% rename from boards/z80/z8f64200100kit/configs/ostest/Make.defs rename to boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs diff --git a/boards/z80/z8f64200100kit/configs/ostest/README.txt b/boards/z80/z8/z8f64200100kit/configs/ostest/README.txt similarity index 100% rename from boards/z80/z8f64200100kit/configs/ostest/README.txt rename to boards/z80/z8/z8f64200100kit/configs/ostest/README.txt diff --git a/boards/z80/z8f64200100kit/configs/ostest/defconfig b/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig similarity index 100% rename from boards/z80/z8f64200100kit/configs/ostest/defconfig rename to boards/z80/z8/z8f64200100kit/configs/ostest/defconfig diff --git a/boards/z80/z8f64200100kit/configs/ostest/ostest.linkcmd b/boards/z80/z8/z8f64200100kit/configs/ostest/ostest.linkcmd similarity index 100% rename from boards/z80/z8f64200100kit/configs/ostest/ostest.linkcmd rename to boards/z80/z8/z8f64200100kit/configs/ostest/ostest.linkcmd diff --git a/boards/z80/z8f64200100kit/configs/ostest/ostest.zdsproj b/boards/z80/z8/z8f64200100kit/configs/ostest/ostest.zdsproj similarity index 100% rename from boards/z80/z8f64200100kit/configs/ostest/ostest.zdsproj rename to boards/z80/z8/z8f64200100kit/configs/ostest/ostest.zdsproj diff --git a/boards/z80/z8f64200100kit/include/board.h b/boards/z80/z8/z8f64200100kit/include/board.h similarity index 100% rename from boards/z80/z8f64200100kit/include/board.h rename to boards/z80/z8/z8f64200100kit/include/board.h diff --git a/boards/z80/z8f64200100kit/src/.gitignore b/boards/z80/z8/z8f64200100kit/src/.gitignore similarity index 100% rename from boards/z80/z8f64200100kit/src/.gitignore rename to boards/z80/z8/z8f64200100kit/src/.gitignore diff --git a/boards/z80/z8f64200100kit/src/Makefile b/boards/z80/z8/z8f64200100kit/src/Makefile similarity index 100% rename from boards/z80/z8f64200100kit/src/Makefile rename to boards/z80/z8/z8f64200100kit/src/Makefile diff --git a/boards/z80/z8f64200100kit/src/z8_boot.c b/boards/z80/z8/z8f64200100kit/src/z8_boot.c similarity index 100% rename from boards/z80/z8f64200100kit/src/z8_boot.c rename to boards/z80/z8/z8f64200100kit/src/z8_boot.c diff --git a/boards/z80/z8f64200100kit/src/z8_leds.c b/boards/z80/z8/z8f64200100kit/src/z8_leds.c similarity index 100% rename from boards/z80/z8f64200100kit/src/z8_leds.c rename to boards/z80/z8/z8f64200100kit/src/z8_leds.c diff --git a/boards/z80/z8f64200100kit/Kconfig b/boards/z80/z80/z80sim/Kconfig similarity index 100% rename from boards/z80/z8f64200100kit/Kconfig rename to boards/z80/z80/z80sim/Kconfig diff --git a/boards/z80/z80sim/README.txt b/boards/z80/z80/z80sim/README.txt similarity index 100% rename from boards/z80/z80sim/README.txt rename to boards/z80/z80/z80sim/README.txt diff --git a/boards/z80/z80sim/configs/nsh/defconfig b/boards/z80/z80/z80sim/configs/nsh/defconfig similarity index 100% rename from boards/z80/z80sim/configs/nsh/defconfig rename to boards/z80/z80/z80sim/configs/nsh/defconfig diff --git a/boards/z80/z80sim/configs/ostest/defconfig b/boards/z80/z80/z80sim/configs/ostest/defconfig similarity index 100% rename from boards/z80/z80sim/configs/ostest/defconfig rename to boards/z80/z80/z80sim/configs/ostest/defconfig diff --git a/boards/z80/z80sim/configs/pashello/defconfig b/boards/z80/z80/z80sim/configs/pashello/defconfig similarity index 100% rename from boards/z80/z80sim/configs/pashello/defconfig rename to boards/z80/z80/z80sim/configs/pashello/defconfig diff --git a/boards/z80/z80sim/include/board.h b/boards/z80/z80/z80sim/include/board.h similarity index 100% rename from boards/z80/z80sim/include/board.h rename to boards/z80/z80/z80sim/include/board.h diff --git a/boards/z80/z80sim/scripts/Make.defs b/boards/z80/z80/z80sim/scripts/Make.defs similarity index 100% rename from boards/z80/z80sim/scripts/Make.defs rename to boards/z80/z80/z80sim/scripts/Make.defs diff --git a/boards/z80/z80sim/src/.gitignore b/boards/z80/z80/z80sim/src/.gitignore similarity index 100% rename from boards/z80/z80sim/src/.gitignore rename to boards/z80/z80/z80sim/src/.gitignore diff --git a/boards/z80/z80sim/src/Makefile b/boards/z80/z80/z80sim/src/Makefile similarity index 100% rename from boards/z80/z80sim/src/Makefile rename to boards/z80/z80/z80sim/src/Makefile diff --git a/boards/z80/z80sim/src/z80_irq.c b/boards/z80/z80/z80sim/src/z80_irq.c similarity index 100% rename from boards/z80/z80sim/src/z80_irq.c rename to boards/z80/z80/z80sim/src/z80_irq.c diff --git a/boards/z80/z80sim/src/z80_lowputc.c b/boards/z80/z80/z80sim/src/z80_lowputc.c similarity index 100% rename from boards/z80/z80sim/src/z80_lowputc.c rename to boards/z80/z80/z80sim/src/z80_lowputc.c diff --git a/boards/z80/z80sim/src/z80_serial.c b/boards/z80/z80/z80sim/src/z80_serial.c similarity index 100% rename from boards/z80/z80sim/src/z80_serial.c rename to boards/z80/z80/z80sim/src/z80_serial.c diff --git a/boards/z80/z80sim/src/z80_timerisr.c b/boards/z80/z80/z80sim/src/z80_timerisr.c similarity index 100% rename from boards/z80/z80sim/src/z80_timerisr.c rename to boards/z80/z80/z80sim/src/z80_timerisr.c diff --git a/tools/Makefile.unix b/tools/Makefile.unix index fcaabf5f589..d61010cd6d5 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)$(DELIM)$(CONFIG_ARCH_BOARD) +BOARD_DIR = $(TOPDIR)$(DELIM)boards$(DELIM)$(CONFIG_ARCH)$(DELIM)$(CONFIG_ARCH_CHIP)$(DELIM)$(CONFIG_ARCH_BOARD) endif # CONFIG_APPS_DIR can be over-ridden from the command line or in the .config file. @@ -558,6 +558,7 @@ savedefconfig: do_savedefconfig $(Q) sed -i -e "/CONFIG_APPS_DIR=/d" defconfig.tmp $(Q) grep "CONFIG_ARCH=" .config >> defconfig.tmp $(Q) grep "^CONFIG_ARCH_CHIP_" .config >> defconfig.tmp; true + $(Q) grep "^CONFIG_ARCH_CHIP=" .config >> defconfig.tmp; true $(Q) grep "CONFIG_ARCH_BOARD=" .config && grep "CONFIG_ARCH_BOARD=" .config >> defconfig.tmp; true $(Q) grep "^CONFIG_ARCH_CUSTOM" .config && grep "^CONFIG_ARCH_CUSTOM" .config >> defconfig.tmp; true $(Q) export LC_ALL=C; cat defconfig.tmp | sort | uniq > sortedconfig.tmp diff --git a/tools/Makefile.win b/tools/Makefile.win index 96306588c59..0f4845458eb 100644 --- a/tools/Makefile.win +++ b/tools/Makefile.win @@ -545,6 +545,7 @@ savedefconfig: do_savedefconfig $(Q) sed -i -e "/CONFIG_APPS_DIR=/d" defconfig.tmp $(Q) grep "CONFIG_ARCH=" .config >> defconfig.tmp -$(Q) grep "^CONFIG_ARCH_CHIP_" .config >> defconfig.tmp + -$(Q) grep "^CONFIG_ARCH_CHIP=" .config >> defconfig.tmp -$(Q) grep "CONFIG_ARCH_BOARD=" .config >> defconfig.tmp -$(Q) grep "^CONFIG_ARCH_CUSTOM" .config >> defconfig.tmp $(Q) cat defconfig.tmp | sort | uniq > sortedconfig.tmp diff --git a/tools/configure.sh b/tools/configure.sh index 25c7502ce6b..16bf458e32b 100755 --- a/tools/configure.sh +++ b/tools/configure.sh @@ -138,15 +138,26 @@ fi # Try to detect architecture for convenience. archs="arm avr hc mips misoc or1k renesas risc-v sim x86 xtensa z16 z80" +chips="a1x am335x c5471 cxd56xx dm320 efm32 imx6 imxrt kinetis kl lc823450 + lpc17xx_40xx lpc214x lpc2378 lpc31xx lpc43xx lpc54xx max326xx moxart nrf52 + nuc1xx sam34 sama5 samd2l2 samd5e5 samv7 stm32 stm32f0l0g0 stm32f7 stm32h7 + stm32l4 str71x tiva tms570 xmc4 at32uc3 at90usb atmega mcs92s12ne64 pic32mx + pic32mz lm32 mor1kx m32262f8 sh7032 gap8 nr5m100 sim qemu esp32 z16f2811 + ez80 z180 z8 z80" for arc in ${archs}; do - if [ -f ${TOPDIR}/boards/${arc}/${boarddir}/Kconfig ]; then +for chip in ${chips}; do + if [ -f ${TOPDIR}/boards/${arc}/${chip}/${boarddir}/Kconfig ]; then archdir=${arc} + chipdir=${chip} echo " Detected ${archdir} Architecture" + echo " Detected ${chipdir} Chip" + echo "" fi done +done -configpath=${TOPDIR}/boards/${archdir}/${boarddir}/configs/${configdir} +configpath=${TOPDIR}/boards/${archdir}/${chipdir}/${boarddir}/configs/${configdir} if [ ! -d "${configpath}" ]; then # Try direct path used with custom configurations. @@ -168,11 +179,11 @@ if [ ! -d "${configpath}" ]; then fi fi -src_makedefs="${TOPDIR}/boards/${archdir}/${boarddir}/configs/${configdir}/Make.defs" +src_makedefs="${TOPDIR}/boards/${archdir}/${chipdir}/${boarddir}/configs/${configdir}/Make.defs" dest_makedefs="${TOPDIR}/Make.defs" if [ ! -r "${src_makedefs}" ]; then - src_makedefs="${TOPDIR}/boards/${archdir}/${boarddir}/scripts/Make.defs" + src_makedefs="${TOPDIR}/boards/${archdir}/${chipdir}/${boarddir}/scripts/Make.defs" if [ ! -r "${src_makedefs}" ]; then src_makedefs="${TOPDIR}/${boardconfig}/Make.defs"