aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2011-10-25 11:29:28 +0000
committerWolfgang Denk <wd@denx.de>2011-11-03 22:34:57 +0100
commitb5728756e8af5633cbda4a1ba08aa244d60e60b5 (patch)
treeb9295629cb28ca787f19b8fa3f366dd959a286c5 /Makefile
parentcceea66bfe1c6c654a1acd27eaf7b63048c97f09 (diff)
downloadu-boot-linaro-stable-b5728756e8af5633cbda4a1ba08aa244d60e60b5.tar.gz
sandbox: Adjust Makefile so that standalone/api are not built
The check for sandbox architecture is too early in the Makefile, so standalone and api are built regardless. This moves the check until after autoconf.mk has been read. This fixes a build breakage. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 82de62b01..bd722862d 100644
--- a/Makefile
+++ b/Makefile
@@ -142,9 +142,6 @@ unexport CDPATH
SUBDIR_TOOLS = tools
SUBDIR_EXAMPLES = examples/standalone examples/api
SUBDIRS = $(SUBDIR_TOOLS)
-ifndef CONFIG_SANDBOX
-SUBDIRS += $(SUBDIR_EXAMPLES)
-endif
.PHONY : $(SUBDIRS) $(VERSION_FILE) $(TIMESTAMP_FILE)
@@ -157,6 +154,10 @@ all:
sinclude $(obj)include/autoconf.mk.dep
sinclude $(obj)include/autoconf.mk
+ifndef CONFIG_SANDBOX
+SUBDIRS += $(SUBDIR_EXAMPLES)
+endif
+
# load ARCH, BOARD, and CPU configuration
include $(obj)include/config.mk
export ARCH CPU BOARD VENDOR SOC