nand_spl: fix u-boot.lst breakage

PATCH New Scott Wood 4 participants 4 messages Nov 13, 2012 – Nov 14, 2012

Share & tools

Scott Wood

author

2012-11-13 22:30 UTC #0 lore raw

PATCH 1/1 nand_spl: fix u-boot.lst breakage

Commit 97b24d3d51a92cb8c0c1e1a74abf22fe1a1807a3 "common: Add symbol handling for generic lists into Makefile" introduced build errors in many nand_spl targets, complaining of a missing u-boot.lst. When not doing an out-of-tree build, $(obj) expands to nothing, so GCC ended up being given -I with no argument (or rather, -ansi was the argument). The failure didn't show up during a -j1 build because it was picking up the non-SPL version of u-boot.lst.

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

---
I didn't fix p1_p2_rdb_pc because that will just conflict with the patchset that migrates that target away from nand_spl.

 nand_spl/board/freescale/mpc8536ds/Makefile  |    3 ++-
 nand_spl/board/freescale/mpc8569mds/Makefile |    3 ++-
 nand_spl/board/freescale/mpc8572ds/Makefile  |    3 ++-
 nand_spl/board/freescale/mx31pdk/Makefile    |    3 ++-
 nand_spl/board/freescale/p1010rdb/Makefile   |    3 ++-
 nand_spl/board/freescale/p1023rds/Makefile   |    3 ++-
 nand_spl/board/freescale/p1_p2_rdb/Makefile  |    3 ++-
 nand_spl/board/karo/tx25/Makefile            |    3 ++-
 8 files changed, 16 insertions(+), 8 deletions(-)

nand_spl/board/freescale/mpc8536ds/Makefile +2 -1

index c923557..9c77826 100644
@@ -67,7 +67,8 @@ $(nandobj)u-boot-spl:	$(OBJS) $(nandobj)u-boot-nand_spl.lds
 # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file.
 $(eval $(call make_u_boot_list, $(LSTSCRIPT), $(OBJS)))
 $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(LSTSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj) -ansi -D__ASSEMBLY__ -P - <$< >$@
+	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
+		-ansi -D__ASSEMBLY__ -P - <$< >$@
 
 # create symbolic links for common files

nand_spl/board/freescale/mpc8569mds/Makefile +2 -1

index c923557..9c77826 100644
@@ -67,7 +67,8 @@ $(nandobj)u-boot-spl:	$(OBJS) $(nandobj)u-boot-nand_spl.lds
 # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file.
 $(eval $(call make_u_boot_list, $(LSTSCRIPT), $(OBJS)))
 $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(LSTSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj) -ansi -D__ASSEMBLY__ -P - <$< >$@
+	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
+		-ansi -D__ASSEMBLY__ -P - <$< >$@
 
 # create symbolic links for common files

nand_spl/board/freescale/mpc8572ds/Makefile +2 -1

index c923557..9c77826 100644
@@ -67,7 +67,8 @@ $(nandobj)u-boot-spl:	$(OBJS) $(nandobj)u-boot-nand_spl.lds
 # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file.
 $(eval $(call make_u_boot_list, $(LSTSCRIPT), $(OBJS)))
 $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(LSTSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj) -ansi -D__ASSEMBLY__ -P - <$< >$@
+	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
+		-ansi -D__ASSEMBLY__ -P - <$< >$@
 
 # create symbolic links for common files

nand_spl/board/freescale/mx31pdk/Makefile +2 -1

index 43e72c4..f67ed09 100644
@@ -42,7 +42,8 @@ $(nandobj)u-boot-spl:	$(OBJS) $(nandobj)u-boot.lds
 # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file.
 $(eval $(call make_u_boot_list, $(LSTSCRIPT), $(OBJS)))
 $(nandobj)u-boot.lds: $(LDSCRIPT) $(LSTSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj) -ansi -D__ASSEMBLY__ -P - <$< >$@
+	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
+		-ansi -D__ASSEMBLY__ -P - <$< >$@
 
 #########################################################################

nand_spl/board/freescale/p1010rdb/Makefile +2 -1

index ccff1c7..c3495ec 100644
@@ -67,7 +67,8 @@ $(nandobj)u-boot-spl:	$(OBJS) $(nandobj)u-boot-nand_spl.lds
 # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file.
 $(eval $(call make_u_boot_list, $(LSTSCRIPT), $(OBJS)))
 $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(LSTSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj) -ansi -D__ASSEMBLY__ -P - <$< >$@
+	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)board/$(BOARDDIR) \
+		 -ansi -D__ASSEMBLY__ -P - <$< >$@
 
 # create symbolic links for common files

nand_spl/board/freescale/p1023rds/Makefile +2 -1

index ffe29c8..9b2c0d7 100644
@@ -62,7 +62,8 @@ $(nandobj)u-boot-spl:	$(OBJS) $(nandobj)u-boot-nand_spl.lds
 # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file.
 $(eval $(call make_u_boot_list, $(LSTSCRIPT), $(OBJS)))
 $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(LSTSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj) -ansi -D__ASSEMBLY__ -P - <$< >$@
+	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
+		-ansi -D__ASSEMBLY__ -P - <$< >$@
 
 # create symbolic links for common files

nand_spl/board/freescale/p1_p2_rdb/Makefile +2 -1

index c923557..9c77826 100644
@@ -67,7 +67,8 @@ $(nandobj)u-boot-spl:	$(OBJS) $(nandobj)u-boot-nand_spl.lds
 # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file.
 $(eval $(call make_u_boot_list, $(LSTSCRIPT), $(OBJS)))
 $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(LSTSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj) -ansi -D__ASSEMBLY__ -P - <$< >$@
+	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
+		-ansi -D__ASSEMBLY__ -P - <$< >$@
 
 # create symbolic links for common files

nand_spl/board/karo/tx25/Makefile +2 -1

index becf7fa..b27189d 100644
@@ -63,7 +63,8 @@ $(nandobj)u-boot-spl:	$(OBJS) $(nandobj)u-boot.lds
 # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file.
 $(eval $(call make_u_boot_list, $(LSTSCRIPT), $(OBJS)))
 $(nandobj)u-boot.lds: $(LDSCRIPT) $(LSTSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj) -ansi -D__ASSEMBLY__ -P - <$< >$@
+	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
+		-ansi -D__ASSEMBLY__ -P - <$< >$@
 
 #########################################################################

Signature · 1 line

1.7.9.5

Marek Vasut

2012-11-13 23:17 UTC #1 lore raw

PATCH 1/1 nand_spl: fix u-boot.lst breakage

Dear Scott Wood,

Quoted 5 lines

Commit 97b24d3d51a92cb8c0c1e1a74abf22fe1a1807a3 "common: Add symbol handling for generic lists into Makefile" introduced build errors in many nand_spl targets, complaining of a missing u-boot.lst. When not doing an out-of-tree build, $(obj) expands to nothing, so GCC ended up being given -I with no argument (or rather, -ansi was the argument).

Here comes Wolfgangs' "in-tree builds have no benefit" ;)

Quoted 3 lines

The failure
didn't show up during a -j1 build because it was picking up the non-SPL version of u-boot.lst.

ICK ... thanks for fixing it.

It seems my warm stop under the rock won't get cold any soon due to my recent changes to uboot source ... crawl crawl crawl ...

Quoted 136 lines

Signed-off-by Scott Wood <[email protected]>
---
I didn't fix p1_p2_rdb_pc because that will just conflict with the patchset that migrates that target away from nand_spl.
 nand_spl/board/freescale/mpc8536ds/Makefile  |    3 ++-
 nand_spl/board/freescale/mpc8569mds/Makefile |    3 ++-
 nand_spl/board/freescale/mpc8572ds/Makefile  |    3 ++-
 nand_spl/board/freescale/mx31pdk/Makefile    |    3 ++-
 nand_spl/board/freescale/p1010rdb/Makefile   |    3 ++-
 nand_spl/board/freescale/p1023rds/Makefile   |    3 ++-
 nand_spl/board/freescale/p1_p2_rdb/Makefile  |    3 ++-
 nand_spl/board/karo/tx25/Makefile            |    3 ++-
 8 files changed, 16 insertions(+), 8 deletions(-)
(quoted diff) +0 -0
b/nand_spl/board/freescale/mpc8536ds/Makefile index c923557..9c77826 100644
nand_spl/board/freescale/mpc8536ds/Makefile +0 -0
@@ -67,7 +67,8 @@ $(nandobj)u-boot-spl:	$(OBJS)
$(nandobj)u-boot-nand_spl.lds # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file. $(eval $(call make_u_boot_list, $(LSTSCRIPT), $(OBJS)))
$(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(LSTSCRIPT)
nand_spl/board/freescale/mpc8536ds/Makefile +0 -1
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj) -ansi -D__ASSEMBLY__ -P - <$<
Quoted 1 line
$@ + $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
nand_spl/board/freescale/mpc8536ds/Makefile +1 -0
+		-ansi -D__ASSEMBLY__ -P - <$< >$@
 
 # create symbolic links for common files
(quoted diff) +0 -0
b/nand_spl/board/freescale/mpc8569mds/Makefile index c923557..9c77826 100644
nand_spl/board/freescale/mpc8569mds/Makefile +0 -0
@@ -67,7 +67,8 @@ $(nandobj)u-boot-spl:	$(OBJS)
$(nandobj)u-boot-nand_spl.lds # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file. $(eval $(call make_u_boot_list, $(LSTSCRIPT), $(OBJS)))
$(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(LSTSCRIPT)
nand_spl/board/freescale/mpc8569mds/Makefile +0 -1
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj) -ansi -D__ASSEMBLY__ -P - <$<
Quoted 1 line
$@ + $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
nand_spl/board/freescale/mpc8569mds/Makefile +1 -0
+		-ansi -D__ASSEMBLY__ -P - <$< >$@
 
 # create symbolic links for common files
(quoted diff) +0 -0
b/nand_spl/board/freescale/mpc8572ds/Makefile index c923557..9c77826 100644
nand_spl/board/freescale/mpc8572ds/Makefile +0 -0
@@ -67,7 +67,8 @@ $(nandobj)u-boot-spl:	$(OBJS)
$(nandobj)u-boot-nand_spl.lds # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file. $(eval $(call make_u_boot_list, $(LSTSCRIPT), $(OBJS)))
$(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(LSTSCRIPT)
nand_spl/board/freescale/mpc8572ds/Makefile +0 -1
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj) -ansi -D__ASSEMBLY__ -P - <$<
Quoted 1 line
$@ + $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
nand_spl/board/freescale/mpc8572ds/Makefile +1 -0
+		-ansi -D__ASSEMBLY__ -P - <$< >$@
 
 # create symbolic links for common files
(quoted diff) +0 -0
b/nand_spl/board/freescale/mx31pdk/Makefile index 43e72c4..f67ed09 100644
nand_spl/board/freescale/mx31pdk/Makefile +1 -1
@@ -42,7 +42,8 @@ $(nandobj)u-boot-spl:	$(OBJS) $(nandobj)u-boot.lds
 # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file.
 $(eval $(call make_u_boot_list, $(LSTSCRIPT), $(OBJS)))
 $(nandobj)u-boot.lds: $(LDSCRIPT) $(LSTSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj) -ansi -D__ASSEMBLY__ -P - <$<
 >$@ +	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
+		-ansi -D__ASSEMBLY__ -P - <$< >$@
 
 #########################################################################
(quoted diff) +0 -0
b/nand_spl/board/freescale/p1010rdb/Makefile index ccff1c7..c3495ec 100644
nand_spl/board/freescale/p1010rdb/Makefile +0 -0
@@ -67,7 +67,8 @@ $(nandobj)u-boot-spl:	$(OBJS)
$(nandobj)u-boot-nand_spl.lds # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file. $(eval $(call make_u_boot_list, $(LSTSCRIPT), $(OBJS)))
$(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(LSTSCRIPT)
nand_spl/board/freescale/p1010rdb/Makefile +0 -1
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj) -ansi -D__ASSEMBLY__ -P - <$<
Quoted 1 line
$@ + $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)board/$(BOARDDIR) \
nand_spl/board/freescale/p1010rdb/Makefile +1 -0
+		 -ansi -D__ASSEMBLY__ -P - <$< >$@
 
 # create symbolic links for common files
(quoted diff) +0 -0
b/nand_spl/board/freescale/p1023rds/Makefile index ffe29c8..9b2c0d7 100644
nand_spl/board/freescale/p1023rds/Makefile +0 -0
@@ -62,7 +62,8 @@ $(nandobj)u-boot-spl:	$(OBJS)
$(nandobj)u-boot-nand_spl.lds # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file. $(eval $(call make_u_boot_list, $(LSTSCRIPT), $(OBJS)))
$(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(LSTSCRIPT)
nand_spl/board/freescale/p1023rds/Makefile +0 -1
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj) -ansi -D__ASSEMBLY__ -P - <$<
Quoted 1 line
$@ + $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
nand_spl/board/freescale/p1023rds/Makefile +1 -0
+		-ansi -D__ASSEMBLY__ -P - <$< >$@
 
 # create symbolic links for common files
(quoted diff) +0 -0
b/nand_spl/board/freescale/p1_p2_rdb/Makefile index c923557..9c77826 100644
nand_spl/board/freescale/p1_p2_rdb/Makefile +0 -0
@@ -67,7 +67,8 @@ $(nandobj)u-boot-spl:	$(OBJS)
$(nandobj)u-boot-nand_spl.lds # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file. $(eval $(call make_u_boot_list, $(LSTSCRIPT), $(OBJS)))
$(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT) $(LSTSCRIPT)
nand_spl/board/freescale/p1_p2_rdb/Makefile +0 -1
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj) -ansi -D__ASSEMBLY__ -P - <$<
Quoted 1 line
$@ + $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
nand_spl/board/freescale/p1_p2_rdb/Makefile +1 -0
+		-ansi -D__ASSEMBLY__ -P - <$< >$@
 
 # create symbolic links for common files
(quoted diff) +0 -0
b/nand_spl/board/karo/tx25/Makefile index becf7fa..b27189d 100644
nand_spl/board/karo/tx25/Makefile +1 -1
@@ -63,7 +63,8 @@ $(nandobj)u-boot-spl:	$(OBJS) $(nandobj)u-boot.lds
 # $(LDSCRIPT). The function make_u_boot_list is defined in helper.mk file.
 $(eval $(call make_u_boot_list, $(LSTSCRIPT), $(OBJS)))
 $(nandobj)u-boot.lds: $(LDSCRIPT) $(LSTSCRIPT)
-	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj) -ansi -D__ASSEMBLY__ -P - <$<
 >$@ +	$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(nandobj)/board/$(BOARDDIR) \
+		-ansi -D__ASSEMBLY__ -P - <$< >$@
 
 #########################################################################

Wolfgang Denk

2012-11-14 06:49 UTC #2 lore raw

PATCH 1/1 nand_spl: fix u-boot.lst breakage

Dear Marek Vasut,

Quoted 8 lines · In message <[email protected]> you wrote:

Quoted 6 lines
Commit 97b24d3d51a92cb8c0c1e1a74abf22fe1a1807a3 "common: Add symbol handling for generic lists into Makefile" introduced build errors in many nand_spl targets, complaining of a missing u-boot.lst. When not doing an out-of-tree build, $(obj) expands to nothing, so GCC ended up being given -I with no argument (or rather, -ansi was the argument).
Here comes Wolfgangs' "in-tree builds have no benefit" ;)

Please do not misquote me. I never said anything like that.

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"If the code and  the  comments  disagree,  then  both  are  probably
wrong."                                                - Norm Schryer

Anatolij Gustschin

2012-11-14 10:18 UTC #3 lore raw

PATCH 1/1 nand_spl: fix u-boot.lst breakage

In reply to Scott Wood

Hi,

Quoted 13 lines · On Tue, 13 Nov 2012 16:30:39 -0600 Scott Wood <[email protected]> wrote:

Commit 97b24d3d51a92cb8c0c1e1a74abf22fe1a1807a3 "common: Add symbol handling for generic lists into Makefile" introduced build errors in many nand_spl targets, complaining of a missing u-boot.lst. When not doing an out-of-tree build, $(obj) expands to nothing, so GCC ended up being given -I with no argument (or rather, -ansi was the argument). The failure didn't show up during a -j1 build because it was picking up the non-SPL version of u-boot.lst.
Signed-off-by Scott Wood <[email protected]>
---
I didn't fix p1_p2_rdb_pc because that will just conflict with the patchset that migrates that target away from nand_spl.

Quoted 9 lines

 nand_spl/board/freescale/mpc8536ds/Makefile  |    3 ++-
 nand_spl/board/freescale/mpc8569mds/Makefile |    3 ++-
 nand_spl/board/freescale/mpc8572ds/Makefile  |    3 ++-
 nand_spl/board/freescale/mx31pdk/Makefile    |    3 ++-
 nand_spl/board/freescale/p1010rdb/Makefile   |    3 ++-
 nand_spl/board/freescale/p1023rds/Makefile   |    3 ++-
 nand_spl/board/freescale/p1_p2_rdb/Makefile  |    3 ++-
 nand_spl/board/karo/tx25/Makefile            |    3 ++-
 8 files changed, 16 insertions(+), 8 deletions(-)

Appied to staging/agust at denx.de, thanks!

Anatolij