Patchwork [U-Boot,v2] Makefile: fix HAVE_VENDOR_COMMON_LIB

login
register
mail settings
Submitter Daniel Schwierzeck
Date Aug. 14, 2012, 11:44 a.m.
Message ID <1344944669-18062-1-git-send-email-daniel.schwierzeck@gmail.com>
Download mbox | patch
Permalink /patch/177235/
State Accepted
Headers show

Comments

Daniel Schwierzeck - Aug. 14, 2012, 11:44 a.m.
From: Scott Wood <scottwood@freescale.com>

Commit 8b5a02640adf77301f943e8754992c50df004e8a ("Makefile: cosmetic:
optimize usage of LIBS-y") broke the build of boards that have a board
vendor "common" directory, by introducing a space between "LIBS-" and
"y".

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
---
Changes vor v2:
- fix the wrong spaces also in spl/Makefile

Tested with:
MAKEALL spear600
MAKEALL -s omap3
MAKEALL -s omap4
---
 Makefile     | 2 +-
 spl/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--
1.7.11.3
Kim Phillips - Aug. 15, 2012, 1:12 a.m.
On Tue, 14 Aug 2012 13:44:29 +0200
Daniel Schwierzeck <daniel.schwierzeck@gmail.com> wrote:

> From: Scott Wood <scottwood@freescale.com>
> 
> Commit 8b5a02640adf77301f943e8754992c50df004e8a ("Makefile: cosmetic:
> optimize usage of LIBS-y") broke the build of boards that have a board
> vendor "common" directory, by introducing a space between "LIBS-" and
> "y".
> 
> Signed-off-by: Scott Wood <scottwood@freescale.com>
> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
> ---
> Changes vor v2:
> - fix the wrong spaces also in spl/Makefile
> 
> Tested with:
> MAKEALL spear600
> MAKEALL -s omap3
> MAKEALL -s omap4
> ---

this fixes newly broken mpc83xx builds, e.g.:

Configuring for MPC832XEMDS_ATM - Board: MPC832XEMDS, Options: PQ_MDS_PIB=1,PQ_MDS_PIB_ATM=1
make: *** [u-boot] Error 1
powerpc-fsl-linux-size: './u-boot': No such file
board/freescale/mpc832xemds/libmpc832xemds.o: In function `board_early_init_r':
/home/r1aaha/git/u-boot/board/freescale/mpc832xemds/mpc832xemds.c:90: undefined reference to `pib_init'
make: *** [u-boot] Error 1

So,

Acked-by: Kim Phillips <kim.phillips@freescale.com>

Kim
Detlev Zundel - Aug. 17, 2012, 4:18 p.m.
Hi,

> On Tue, 14 Aug 2012 13:44:29 +0200
> Daniel Schwierzeck <daniel.schwierzeck@gmail.com> wrote:
>
>> From: Scott Wood <scottwood@freescale.com>
>> 
>> Commit 8b5a02640adf77301f943e8754992c50df004e8a ("Makefile: cosmetic:
>> optimize usage of LIBS-y") broke the build of boards that have a board
>> vendor "common" directory, by introducing a space between "LIBS-" and
>> "y".
>> 
>> Signed-off-by: Scott Wood <scottwood@freescale.com>
>> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
>> ---
>> Changes vor v2:
>> - fix the wrong spaces also in spl/Makefile
>> 
>> Tested with:
>> MAKEALL spear600
>> MAKEALL -s omap3
>> MAKEALL -s omap4
>> ---
>
> this fixes newly broken mpc83xx builds, e.g.:
>
> Configuring for MPC832XEMDS_ATM - Board: MPC832XEMDS, Options:
> PQ_MDS_PIB=1,PQ_MDS_PIB_ATM=1
> make: *** [u-boot] Error 1
> powerpc-fsl-linux-size: './u-boot': No such file
> board/freescale/mpc832xemds/libmpc832xemds.o: In function
> board_early_init_r':
> /home/r1aaha/git/u-boot/board/freescale/mpc832xemds/mpc832xemds.c:90:
> undefined reference to `pib_init'
> make: *** [u-boot] Error 1
>
> So,
>
> Acked-by: Kim Phillips <kim.phillips@freescale.com>

Applied, thanks.

Cheers
  Detlev

Patch

diff --git a/Makefile b/Makefile
index 5ce5cc3..947f3ff 100644
--- a/Makefile
+++ b/Makefile
@@ -225,7 +225,7 @@  endif

 OBJS := $(addprefix $(obj),$(OBJS))

-HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile), y, n)
+HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n)

 LIBS-y += lib/libgeneric.o
 LIBS-y += lib/lzma/liblzma.o
diff --git a/spl/Makefile b/spl/Makefile
index e9ecb9b..2cf7bda 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -23,7 +23,7 @@  include $(TOPDIR)/config.mk
 # We want the final binaries in this directory
 obj := $(OBJTREE)/spl/

-HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(SRCTREE)/board/$(VENDOR)/common/Makefile), y, n)
+HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(SRCTREE)/board/$(VENDOR)/common/Makefile),y,n)

 ifdef	CONFIG_SPL_START_S_PATH
 START_PATH := $(subst ",,$(CONFIG_SPL_START_S_PATH))