summaryrefslogtreecommitdiffstats
path: root/arch/sandbox/config.mk
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-02-10 18:52:35 -0700
committerSimon Glass <sjg@chromium.org>2015-02-15 14:34:06 -0700
commite50ab22984ce90ffcc47bc620ed2caac0bcc02f7 (patch)
tree2b7663e7e2f1e5fe29d74e6354c6e83663517c08 /arch/sandbox/config.mk
parent88539e4431cd6a596da316f81b644c4df606dbd9 (diff)
downloadtalos-obmc-uboot-e50ab22984ce90ffcc47bc620ed2caac0bcc02f7.tar.gz
talos-obmc-uboot-e50ab22984ce90ffcc47bc620ed2caac0bcc02f7.zip
sandbox: Adjust the order of the NO_SDL check
An option is provided to avoid using SDL in U-Boot sandbox (and drop support for the LCD). However the check in the Makefile is too late and warnings are printed even if NO_SDL=y is given. Adjust the order to avoid this warning. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Jeroen Hofstee <jeroen@myspectrum.nl>
Diffstat (limited to 'arch/sandbox/config.mk')
-rw-r--r--arch/sandbox/config.mk12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk
index e38a44bd11..7b84f02a0a 100644
--- a/arch/sandbox/config.mk
+++ b/arch/sandbox/config.mk
@@ -5,10 +5,16 @@ PLATFORM_CPPFLAGS += -D__SANDBOX__ -U_FORTIFY_SOURCE
PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM -DCONFIG_SYS_GENERIC_BOARD
PLATFORM_LIBS += -lrt
+# Define this to avoid linking with SDL, which requires SDL libraries
+# This can solve 'sdl-config: Command not found' errors
+ifneq ($(NO_SDL),)
+PLATFORM_CPPFLAGS += -DSANDBOX_NO_SDL
+else
ifdef CONFIG_SANDBOX_SDL
PLATFORM_LIBS += $(shell sdl-config --libs)
PLATFORM_CPPFLAGS += $(shell sdl-config --cflags)
endif
+endif
# Support generic board on sandbox
__HAVE_ARCH_GENERIC_BOARD := y
@@ -18,9 +24,3 @@ cmd_u-boot__ = $(CC) -o $@ -T u-boot.lds \
$(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map
CONFIG_ARCH_DEVICE_TREE := sandbox
-
-# Define this to avoid linking with SDL, which requires SDL libraries
-# This can solve 'sdl-config: Command not found' errors
-ifneq ($(NO_SDL),)
-PLATFORM_CPPFLAGS += -DSANDBOX_NO_SDL
-endif
OpenPOWER on IntegriCloud