From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeroen Hofstee Date: Fri, 13 Feb 2015 00:12:12 +0100 Subject: [U-Boot] [PATCH] sandbox: Adjust the order of the NO_SDL check In-Reply-To: <1423619555-629-1-git-send-email-sjg@chromium.org> References: <1423619555-629-1-git-send-email-sjg@chromium.org> Message-ID: <54DD334C.8070906@myspectrum.nl> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Simon, On 11-02-15 02:52, Simon Glass wrote: > 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 > --- > > arch/sandbox/config.mk | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/sandbox/config.mk b/arch/sandbox/config.mk > index e38a44b..7b84f02 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 yup, feel free to commit this (it can't do any harm just prevents some warnings). Which I guess translates to Acked-by: Jeroen Hofstee Regards, Jeroen