board: organize boards based on architecture
Introduce an architecture sorting of boards. This is to allow for easier maintenance going forward as the number of boards grows. It will be easier for any scripts to know the board/arch mapping without having to maintain an explicit list of what boards are associated with which arch. We can also do things like have architecture maintainers cover reviews and branches for arch/${ARCH} and boards/${ARCH} going forward. Change-Id: I02e0a30292b31fad58fb5dfab2682ad1c5a7d5a7 Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
parent
fc0fa86a85
commit
8d35760fec
143 changed files with 54 additions and 46 deletions
|
@ -48,4 +48,4 @@ source "tests/Kconfig"
|
|||
# because board usually overrides SoC values.
|
||||
#
|
||||
source "arch/*/soc/*/Kconfig.defconfig"
|
||||
source "boards/*/Kconfig.defconfig"
|
||||
source "boards/*/*/Kconfig.defconfig"
|
||||
|
|
76
MAINTAINERS
76
MAINTAINERS
|
@ -80,57 +80,65 @@ M: Kumar Gala <kumar.gala@linaro.org>
|
|||
S: Supported
|
||||
F: ext/hal/cmsis/
|
||||
|
||||
BOARDS - ALTERA MAX10
|
||||
M: Andrew Boie <andrew.p.boie@intel.com>
|
||||
S: Supported
|
||||
F: boards/altera_max10/
|
||||
|
||||
BOARDS - ARDUINO 101
|
||||
BOARDS/ARC - ARDUINO 101 SSS
|
||||
M: Anas Nashif <anas.nashif@intel.com>
|
||||
S: Supported
|
||||
F: boards/arduino_101/
|
||||
F: boards/arduino_101_sss/
|
||||
F: boards/arc/arduino_101_sss/
|
||||
|
||||
BOARDS - EM Starterkit
|
||||
BOARDS/ARC - EM Starterkit
|
||||
M: Chuck Jordan <Chuck.Jordan@synopsys.com>
|
||||
S: Supported
|
||||
F: boards/em_starterkit/
|
||||
F: boards/arc/em_starterkit/
|
||||
|
||||
BOARDS - NXP FRDM-K64F
|
||||
M: Maureen Helm <maureen.helm@nxp.com>
|
||||
S: Supported
|
||||
F: boards/frdm_k64f/
|
||||
|
||||
BOARDS - Galileo
|
||||
BOARDS/ARC - QUARK SE C1000 SS Devboard
|
||||
M: Anas Nashif <anas.nashif@intel.com>
|
||||
S: Supported
|
||||
F: boards/galileo/
|
||||
F: boards/arc/quark_se_c1000_ss_devboard/
|
||||
|
||||
BOARDS - NXP Hexiwear
|
||||
M: Maureen Helm <maureen.helm@nxp.com>
|
||||
S: Supported
|
||||
F: boards/hexiwear_k64/
|
||||
|
||||
BOARDS - NORDIC NRF52 PCA10040
|
||||
M: Carles Cufi <carles.cufi@nordicsemi.no>
|
||||
S: Supported
|
||||
F: boards/nrf52_pca10040/
|
||||
|
||||
BOARDS - 96Boards NITROGEN
|
||||
BOARDS/ARM - 96Boards NITROGEN
|
||||
M: Amit Kucheria <amit.kucheria@linaro.org>
|
||||
S: Supported
|
||||
F: boards/96b_nitrogen/
|
||||
F: boards/arm/96b_nitrogen/
|
||||
|
||||
BOARDS - QUARK SE C1000 Devboard
|
||||
BOARDS/ARM - NXP FRDM-K64F
|
||||
M: Maureen Helm <maureen.helm@nxp.com>
|
||||
S: Supported
|
||||
F: boards/arm/frdm_k64f/
|
||||
|
||||
BOARDS/ARM - NXP Hexiwear
|
||||
M: Maureen Helm <maureen.helm@nxp.com>
|
||||
S: Supported
|
||||
F: boards/arm/hexiwear_k64/
|
||||
|
||||
BOARDS/ARM - NORDIC NRF52 PCA10040
|
||||
M: Carles Cufi <carles.cufi@nordicsemi.no>
|
||||
S: Supported
|
||||
F: boards/arm/nrf52_pca10040/
|
||||
|
||||
BOARDS/NIOS2 - ALTERA MAX10
|
||||
M: Andrew Boie <andrew.p.boie@intel.com>
|
||||
S: Supported
|
||||
F: boards/nios2/altera_max10/
|
||||
|
||||
BOARDS/X86 - ARDUINO 101
|
||||
M: Anas Nashif <anas.nashif@intel.com>
|
||||
S: Supported
|
||||
F: boards/quark_se_c1000/
|
||||
F: boards/quark_se_c1000_ss/
|
||||
F: boards/x86/arduino_101/
|
||||
|
||||
BOARDS - QUARK D2000 Devboard
|
||||
BOARDS/X86 - Galileo
|
||||
M: Anas Nashif <anas.nashif@intel.com>
|
||||
S: Supported
|
||||
F: boards/quark_d2000/
|
||||
F: boards/x86/galileo/
|
||||
|
||||
BOARDS/X86 - QUARK D2000 Devboard
|
||||
M: Anas Nashif <anas.nashif@intel.com>
|
||||
S: Supported
|
||||
F: boards/x86/quark_d2000/
|
||||
|
||||
BOARDS/X86 - QUARK SE C1000 Devboard
|
||||
M: Anas Nashif <anas.nashif@intel.com>
|
||||
S: Supported
|
||||
F: boards/x86/quark_se_c1000/
|
||||
|
||||
BLUETOOTH
|
||||
M: Johan Hedberg <johan.hedberg@intel.com>
|
||||
|
|
10
Makefile
10
Makefile
|
@ -361,7 +361,7 @@ export ARCH KERNEL_NAME KERNEL_ELF_NAME KERNEL_BIN_NAME KERNEL_HEX_NAME
|
|||
ZEPHYRINCLUDE = \
|
||||
-I$(srctree)/arch/$(ARCH)/include \
|
||||
-I$(srctree)/arch/$(ARCH)/soc/$(SOC_PATH) \
|
||||
-I$(srctree)/boards/$(BOARD_NAME) \
|
||||
-I$(srctree)/boards/$(ARCH)/$(BOARD_NAME) \
|
||||
$(if $(KBUILD_SRC), -I$(srctree)/include) \
|
||||
-I$(srctree)/include \
|
||||
-I$(CURDIR)/include/generated \
|
||||
|
@ -732,7 +732,7 @@ KBUILD_LDS := $(subst $(DQUOTE),,$(CONFIG_CUSTOM_LINKER_SCRIPT))
|
|||
endif
|
||||
else
|
||||
# Try a board specific linker file
|
||||
KBUILD_LDS := $(srctree)/boards/$(BOARD_NAME)/linker.ld
|
||||
KBUILD_LDS := $(srctree)/boards/$(ARCH)/$(BOARD_NAME)/linker.ld
|
||||
|
||||
# If not available, try an SoC specific linker file
|
||||
ifeq ($(wildcard $(KBUILD_LDS)),)
|
||||
|
@ -1089,7 +1089,7 @@ distclean: mrproper
|
|||
# Brief documentation of the typical targets used
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
boards := $(wildcard $(srctree)/boards/*/*_defconfig)
|
||||
boards := $(wildcard $(srctree)/boards/*/*/*_defconfig)
|
||||
boards := $(sort $(notdir $(boards)))
|
||||
|
||||
kconfig-help:
|
||||
|
@ -1157,7 +1157,7 @@ help-board-dirs := $(addprefix help-,$(board-dirs))
|
|||
|
||||
help-boards: $(help-board-dirs)
|
||||
|
||||
boards-per-dir = $(sort $(notdir $(wildcard $(srctree)/boards/$*/*_defconfig)))
|
||||
boards-per-dir = $(sort $(notdir $(wildcard $(srctree)/boards/*/$*/*_defconfig)))
|
||||
|
||||
$(help-board-dirs): help-%:
|
||||
@echo 'Architecture specific targets ($(ARCH) $*):'
|
||||
|
@ -1237,7 +1237,7 @@ qemu: zephyr
|
|||
qemugdb: QEMU_EXTRA_FLAGS += -s -S
|
||||
qemugdb: qemu
|
||||
|
||||
-include $(srctree)/boards/$(BOARD_NAME)/Makefile.board
|
||||
-include $(srctree)/boards/$(ARCH)/$(BOARD_NAME)/Makefile.board
|
||||
ifneq ($(FLASH_SCRIPT),)
|
||||
flash: zephyr
|
||||
@echo "Flashing $(BOARD_NAME)"
|
||||
|
|
|
@ -13,7 +13,7 @@ PROJECT_BASE ?= $(CURDIR)
|
|||
endif
|
||||
|
||||
ifdef BOARD
|
||||
KBUILD_DEFCONFIG_PATH=$(wildcard $(ZEPHYR_BASE)/boards/*/$(BOARD)_defconfig)
|
||||
KBUILD_DEFCONFIG_PATH=$(wildcard $(ZEPHYR_BASE)/boards/*/*/$(BOARD)_defconfig)
|
||||
ifeq ($(KBUILD_DEFCONFIG_PATH),)
|
||||
$(error Board $(BOARD) not found!)
|
||||
endif
|
||||
|
@ -100,7 +100,7 @@ flash: $(DOTCONFIG)
|
|||
$(Q)$(call zephyrmake,$(O),$@)
|
||||
|
||||
ifeq ($(MAKECMDGOALS),debugserver)
|
||||
-include $(ZEPHYR_BASE)/boards/$(BOARD)/Makefile.board
|
||||
-include $(ZEPHYR_BASE)/boards/$(ARCH)/$(BOARD)/Makefile.board
|
||||
-include $(ZEPHYR_BASE)/scripts/Makefile.toolchain.$(ZEPHYR_GCC_VARIANT)
|
||||
BOARD_NAME = $(BOARD)
|
||||
export BOARD_NAME
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
|
||||
choice
|
||||
prompt "Board Selection"
|
||||
source "boards/*/Kconfig.board"
|
||||
source "boards/*/*/Kconfig.board"
|
||||
endchoice
|
||||
|
||||
|
||||
menu "Board Options"
|
||||
source "boards/*/Kconfig"
|
||||
source "boards/*/*/Kconfig"
|
||||
endmenu
|
||||
|
|
|
@ -1 +1 @@
|
|||
obj-y += $(BOARD_NAME)/
|
||||
obj-y += $(ARCH)/$(BOARD_NAME)/
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue