make sure toplevel $(SUBDIRS) is always declared
The $(SUBDIRS) variable is only declared when U-Boot has been configured, but it gets used all the time. In the non-configured case, it is used to generate a helpful error message, but it needs to be set properly for that to occur. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
parent
5ec5529b82
commit
6d1ce38787
16
Makefile
16
Makefile
|
@ -137,6 +137,14 @@ ifeq ($(ARCH),powerpc)
|
||||||
ARCH = ppc
|
ARCH = ppc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# The "tools" are needed early, so put this first
|
||||||
|
# Don't include stuff already done in $(LIBS)
|
||||||
|
SUBDIRS = tools \
|
||||||
|
examples \
|
||||||
|
api_examples
|
||||||
|
|
||||||
|
.PHONY : $(SUBDIRS)
|
||||||
|
|
||||||
ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk))
|
ifeq ($(obj)include/config.mk,$(wildcard $(obj)include/config.mk))
|
||||||
|
|
||||||
# load ARCH, BOARD, and CPU configuration
|
# load ARCH, BOARD, and CPU configuration
|
||||||
|
@ -282,14 +290,6 @@ LIBBOARD := $(addprefix $(obj),$(LIBBOARD))
|
||||||
# Add GCC lib
|
# Add GCC lib
|
||||||
PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
|
PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc
|
||||||
|
|
||||||
# The "tools" are needed early, so put this first
|
|
||||||
# Don't include stuff already done in $(LIBS)
|
|
||||||
SUBDIRS = tools \
|
|
||||||
examples \
|
|
||||||
api_examples
|
|
||||||
|
|
||||||
.PHONY : $(SUBDIRS)
|
|
||||||
|
|
||||||
ifeq ($(CONFIG_NAND_U_BOOT),y)
|
ifeq ($(CONFIG_NAND_U_BOOT),y)
|
||||||
NAND_SPL = nand_spl
|
NAND_SPL = nand_spl
|
||||||
U_BOOT_NAND = $(obj)u-boot-nand.bin
|
U_BOOT_NAND = $(obj)u-boot-nand.bin
|
||||||
|
|
Loading…
Reference in New Issue