The check for CONFIG_SANDBOX_SDL in config.mk does not work since the
build config is not available by the time that file is included. Remove it
so that we always call sdl-config except when NO_SDL is used.
Signed-off-by: Simon Glass <s...@chromium.org>
---
arch/sandbox/config.mk | 2 --
arch/sandbox/cpu/sdl.c | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk
index 07ede076b83..3be1c0361e5 100644
--- a/arch/sandbox/config.mk
+++ b/arch/sandbox/config.mk
@@ -12,11 +12,9 @@ SDL_CONFIG ?= sdl-config
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
cmd_u-boot__ = $(CC) -o $@ -Wl,-T u-boot.lds \
u-boot.o $(u-boot-init) \
diff --git a/arch/sandbox/cpu/sdl.c b/arch/sandbox/cpu/sdl.c
index c7a8d945492..3abe718a417 100644
--- a/arch/sandbox/cpu/sdl.c
+++ b/arch/sandbox/cpu/sdl.c
@@ -5,7 +5,7 @@
#include <errno.h>
#include <linux/input.h>
-#include <SDL/SDL.h>
+#include <SDL.h>
#include <sound.h>
#include <asm/state.h>
--
2.20.0.405.gbc1bbc6f85-goog
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
