kbuild: allow empty board directories

U-Boot has compelled all boards to have board/${BOARD}/ or board/${VENDOR}/${BOARD}/ directory. Sometimes it does not seem suitable for some boards, for example Sandbox. (Is it a board?) And arcangel4 board has nothing to compile under the board directory. This commit makes the build system more flexible: If '<none>' is given to the 6th column (=Board name) of boards.cfg, Kbuild will not descend into the board directory. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

kbuild: allow empty board directories
U-Boot has compelled all boards to have board/${BOARD}/ or board/${VENDOR}/${BOARD}/ directory. Sometimes it does not seem suitable for some boards, for example Sandbox. (Is it a board?) And arcangel4 board has nothing to compile under the board directory. This commit makes the build system more flexible: If '<none>' is given to the 6th column (=Board name) of boards.cfg, Kbuild will not descend into the board directory. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Masahiro Yamada · Tom Rini · Eric Lee · Eric Lee · Eric Lee · Eric Lee
1 parent 603f51cbd2
Showing 3 changed files with 7 additions and 3 deletions Side-by-side Diff
Makefile
config.mk
mkconfig
@@ -636,7 +636,7 @@
 libs-$(CONFIG_ARM) += arch/arm/cpu/
 libs-$(CONFIG_PPC) += arch/powerpc/cpu/
  
-libs-y += board/$(BOARDDIR)/
+libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/)
  
 libs-y := $(sort $(libs-y))
  
@@ -28,10 +28,12 @@
 ifdef	SOC
 sinclude $(TOPDIR)/$(CPUDIR)/$(SOC)/config.mk	# include  SoC	specific rules
 endif
+ifneq ($(BOARD),)
 ifdef	VENDOR
 BOARDDIR = $(VENDOR)/$(BOARD)
 else
 BOARDDIR = $(BOARD)
+endif
 endif
 ifdef	BOARD
 sinclude $(TOPDIR)/board/$(BOARDDIR)/config.mk	# include board specific rules
@@ -55,7 +55,9 @@
 arch="$2"
 cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $1}'`
 spl_cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $2}'`
-if [ "$6" = "-" ] ; then
+if [ "$6" = "<none>" ] ; then
+	board=
+elif [ "$6" = "-" ] ; then
 	board=${BOARD_NAME}
 else
 	board="$6"
  
@@ -177,8 +179,8 @@
  
 [ "${soc}"    ] && echo "#define CONFIG_SYS_SOC    \"${soc}\""    >> config.h
  
+[ "${board}"  ] && echo "#define CONFIG_BOARDDIR board/$BOARDDIR" >> config.h
 cat << EOF >> config.h
-#define CONFIG_BOARDDIR board/$BOARDDIR
 #include <config_cmd_defaults.h>
 #include <config_defaults.h>
 #include <configs/${CONFIG_NAME}.h>
...	...	@@ -636,7 +636,7 @@
636	636	libs-$(CONFIG_ARM) += arch/arm/cpu/
637	637	libs-$(CONFIG_PPC) += arch/powerpc/cpu/
638	638
639		-libs-y += board/$(BOARDDIR)/
	639	+libs-y += $(if $(BOARDDIR),board/$(BOARDDIR)/)
640	640
641	641	libs-y := $(sort $(libs-y))
642	642
...	...	@@ -28,10 +28,12 @@
28	28	ifdef SOC
29	29	sinclude $(TOPDIR)/$(CPUDIR)/$(SOC)/config.mk # include SoC specific rules
30	30	endif
	31	+ifneq ($(BOARD),)
31	32	ifdef VENDOR
32	33	BOARDDIR = $(VENDOR)/$(BOARD)
33	34	else
34	35	BOARDDIR = $(BOARD)
	36	+endif
35	37	endif
36	38	ifdef BOARD
37	39	sinclude $(TOPDIR)/board/$(BOARDDIR)/config.mk # include board specific rules
...	...	@@ -55,7 +55,9 @@
55	55	arch="$2"
56	56	cpu=`echo $3 \| awk 'BEGIN {FS = ":"} ; {print $1}'`
57	57	spl_cpu=`echo $3 \| awk 'BEGIN {FS = ":"} ; {print $2}'`
58		-if [ "$6" = "-" ] ; then
	58	+if [ "$6" = "<none>" ] ; then
	59	+ board=
	60	+elif [ "$6" = "-" ] ; then
59	61	board=${BOARD_NAME}
60	62	else
61	63	board="$6"
62	64
...	...	@@ -177,8 +179,8 @@
177	179
178	180	[ "${soc}" ] && echo "#define CONFIG_SYS_SOC \"${soc}\"" >> config.h
179	181
	182	+[ "${board}" ] && echo "#define CONFIG_BOARDDIR board/$BOARDDIR" >> config.h
180	183	cat << EOF >> config.h
181		-#define CONFIG_BOARDDIR board/$BOARDDIR
182	184	#include <config_cmd_defaults.h>
183	185	#include <config_defaults.h>
184	186	#include <configs/${CONFIG_NAME}.h>