summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-05-30 01:02:03 -0400
committerWolfgang Denk <wd@denx.de>2009-06-14 23:12:30 +0200
commit6d1ce387874c1060f27656f70151a52c511cd0e3 (patch)
tree61b74f6a206ec0598fc637f71a066e7dd2e6c025 /Makefile
parent5ec5529b82f314ca2cf9c262cdfc985d5fc468a0 (diff)
downloadu-boot-imx-6d1ce387874c1060f27656f70151a52c511cd0e3.zip
u-boot-imx-6d1ce387874c1060f27656f70151a52c511cd0e3.tar.gz
u-boot-imx-6d1ce387874c1060f27656f70151a52c511cd0e3.tar.bz2
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 8689560..285f116 100644
--- a/Makefile
+++ b/Makefile
@@ -137,6 +137,14 @@ ifeq ($(ARCH),powerpc)
ARCH = ppc
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))
# load ARCH, BOARD, and CPU configuration
@@ -282,14 +290,6 @@ LIBBOARD := $(addprefix $(obj),$(LIBBOARD))
# Add GCC lib
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)
NAND_SPL = nand_spl
U_BOOT_NAND = $(obj)u-boot-nand.bin