Commit e50ab22984ce90ffcc47bc620ed2caac0bcc02f7
1 parent
88539e4431
Exists in
v2017.01-smarct4x
and in
37 other branches
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>
Showing 1 changed file with 6 additions and 6 deletions Side-by-side Diff
arch/sandbox/config.mk
| ... | ... | @@ -5,10 +5,16 @@ |
| 5 | 5 | PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM -DCONFIG_SYS_GENERIC_BOARD |
| 6 | 6 | PLATFORM_LIBS += -lrt |
| 7 | 7 | |
| 8 | +# Define this to avoid linking with SDL, which requires SDL libraries | |
| 9 | +# This can solve 'sdl-config: Command not found' errors | |
| 10 | +ifneq ($(NO_SDL),) | |
| 11 | +PLATFORM_CPPFLAGS += -DSANDBOX_NO_SDL | |
| 12 | +else | |
| 8 | 13 | ifdef CONFIG_SANDBOX_SDL |
| 9 | 14 | PLATFORM_LIBS += $(shell sdl-config --libs) |
| 10 | 15 | PLATFORM_CPPFLAGS += $(shell sdl-config --cflags) |
| 11 | 16 | endif |
| 17 | +endif | |
| 12 | 18 | |
| 13 | 19 | # Support generic board on sandbox |
| 14 | 20 | __HAVE_ARCH_GENERIC_BOARD := y |
| ... | ... | @@ -18,10 +24,4 @@ |
| 18 | 24 | $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map |
| 19 | 25 | |
| 20 | 26 | CONFIG_ARCH_DEVICE_TREE := sandbox |
| 21 | - | |
| 22 | -# Define this to avoid linking with SDL, which requires SDL libraries | |
| 23 | -# This can solve 'sdl-config: Command not found' errors | |
| 24 | -ifneq ($(NO_SDL),) | |
| 25 | -PLATFORM_CPPFLAGS += -DSANDBOX_NO_SDL | |
| 26 | -endif |