Makefile: fix HAVE_VENDOR_COMMON_LIB

PATCH New Scott Wood 4 participants 4 messages Aug 14, 2012 – Aug 17, 2012 Kbuild

Share & tools

Scott Wood

author

2012-08-14 00:50 UTC #0 lore raw

PATCH 1/1 Makefile: fix HAVE_VENDOR_COMMON_LIB

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 <[email protected]>

---
 Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Makefile +1 -1

index 5ce5cc3..947f3ff 100644
@@ -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

Signature · 1 line

1.7.9.5

Daniel Schwierzeck

2012-08-14 11:44 UTC #1 lore raw

PATCH v2 1/1 Makefile: fix HAVE_VENDOR_COMMON_LIB

From: Scott Wood <[email protected]>

Signed-off-by Scott Wood <[email protected]>

Signed-off-by Daniel Schwierzeck <[email protected]>

---
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(-)

Makefile +1 -1

index 5ce5cc3..947f3ff 100644
@@ -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

spl/Makefile +1 -1

index e9ecb9b..2cf7bda 100644
@@ -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))

--
1.7.11.3

Kim Phillips

2012-08-15 01:12 UTC #2 lore raw

PATCH v2 1/1 Makefile: fix HAVE_VENDOR_COMMON_LIB

Quoted 13 lines · On Tue, 14 Aug 2012 13:44:29 +0200 Daniel Schwierzeck…

From: Scott Wood <[email protected]>
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 <[email protected]>
Signed-off-by Daniel Schwierzeck <[email protected]>
---
Changes vor v2:
- fix the wrong spaces also in spl/Makefile

Quoted 5 lines

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 <[email protected]>

Kim

Detlev Zundel

Applied

2012-08-17 16:18 UTC #3 lore raw

PATCH v2 1/1 Makefile: fix HAVE_VENDOR_COMMON_LIB

Hi,

Quoted 34 lines

Quoted 13 lines · On Tue, 14 Aug 2012 13:44:29 +0200 Daniel Schwierzeck…
From: Scott Wood <[email protected]>
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 <[email protected]>
Signed-off-by Daniel Schwierzeck <[email protected]>
---
Changes vor v2:
- fix the wrong spaces also in spl/Makefile
Quoted 5 lines
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

Quoted 3 lines

So,
Acked-by Kim Phillips <[email protected]>

Applied, thanks.

Cheers
Detlev

Signature · 7 lines

Science is a way of thinking
much more than it is a body of knowledge.
             -- Carl Sagan
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de