Skip to contentSkip to conversation

sandbox: Adjust the order of the NO_SDL check

PATCH New Simon Glass 2 participants 3 messages Feb 11, 2015 – Feb 15, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

 arch/sandbox/config.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/sandbox/config.mk +6 -6
index e38a44b..7b84f02 100644
@@ -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
Signature · 1 line
2.2.0.rc0.207.ga3a616c
#1 lore raw

PATCH 1/1 sandbox: Adjust the order of the NO_SDL check

Hello Simon,

Quoted 34 lines · Simon Glass

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.

---

  arch/sandbox/config.mk | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
arch/sandbox/config.mk +6 -0
index e38a44b..7b84f02 100644
@@ -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

arch/sandbox/config.mk cmd_u-boot__ = $(CC) -o $@ -T u-boot.lds \ · line 26

Quoted 9 lines
arch/sandbox/config.mk +0 -6
@@ -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

yup, feel free to commit this (it can't do any harm just prevents some warnings). Which I guess translates to

Regards,
Jeroen

#2 lore raw

PATCH 1/1 sandbox: Adjust the order of the NO_SDL check

Quoted 50 lines · Jeroen Hofstee

Hello Simon,

Quoted 33 lines · Simon Glass

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.

---

  arch/sandbox/config.mk | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
arch/sandbox/config.mk +5 -0
index e38a44b..7b84f02 100644
@@ -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

arch/sandbox/config.mk cmd_u-boot__ = $(CC) -o $@ -T u-boot.lds \ · line 25

Quoted 8 lines
arch/sandbox/config.mk +0 -6
@@ -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

yup, feel free to commit this (it can't do any harm just prevents some warnings). Which I guess translates to

Quoted 1 line

Applied to u-boot-x86/sandbox.