mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
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>
This commit is contained in:
parent
88539e4431
commit
e50ab22984
1 changed files with 6 additions and 6 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue