Patchwork [U-Boot] nand_spl: fix u-boot.lst breakage

login
register
mail settings
Submitter Scott Wood
Date Nov. 13, 2012, 10:30 p.m.
Message ID <20121113223039.GA9138@buserror.net>
Download mbox | patch
Permalink /patch/198793/
State Accepted
Delegated to: Anatolij Gustschin
Headers show

Comments

Scott Wood - Nov. 13, 2012, 10:30 p.m.
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 <scottwood@freescale.com>
---
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(-)
Marek Vasut - Nov. 13, 2012, 11:17 p.m.
Dear Scott Wood,

> 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" ;)

> 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 ...

> Signed-off-by: Scott Wood <scottwood@freescale.com>
> ---
> 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(-)
> 
> diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile
> b/nand_spl/board/freescale/mpc8536ds/Makefile index c923557..9c77826
> 100644
> --- a/nand_spl/board/freescale/mpc8536ds/Makefile
> +++ b/nand_spl/board/freescale/mpc8536ds/Makefile
> @@ -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
> 
> diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile
> b/nand_spl/board/freescale/mpc8569mds/Makefile index c923557..9c77826
> 100644
> --- a/nand_spl/board/freescale/mpc8569mds/Makefile
> +++ b/nand_spl/board/freescale/mpc8569mds/Makefile
> @@ -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
> 
> diff --git a/nand_spl/board/freescale/mpc8572ds/Makefile
> b/nand_spl/board/freescale/mpc8572ds/Makefile index c923557..9c77826
> 100644
> --- a/nand_spl/board/freescale/mpc8572ds/Makefile
> +++ b/nand_spl/board/freescale/mpc8572ds/Makefile
> @@ -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
> 
> diff --git a/nand_spl/board/freescale/mx31pdk/Makefile
> b/nand_spl/board/freescale/mx31pdk/Makefile index 43e72c4..f67ed09 100644
> --- a/nand_spl/board/freescale/mx31pdk/Makefile
> +++ b/nand_spl/board/freescale/mx31pdk/Makefile
> @@ -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 - <$< >$@
> 
>  #########################################################################
> 
> diff --git a/nand_spl/board/freescale/p1010rdb/Makefile
> b/nand_spl/board/freescale/p1010rdb/Makefile index ccff1c7..c3495ec 100644
> --- a/nand_spl/board/freescale/p1010rdb/Makefile
> +++ b/nand_spl/board/freescale/p1010rdb/Makefile
> @@ -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
> 
> diff --git a/nand_spl/board/freescale/p1023rds/Makefile
> b/nand_spl/board/freescale/p1023rds/Makefile index ffe29c8..9b2c0d7 100644
> --- a/nand_spl/board/freescale/p1023rds/Makefile
> +++ b/nand_spl/board/freescale/p1023rds/Makefile
> @@ -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
> 
> diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile
> b/nand_spl/board/freescale/p1_p2_rdb/Makefile index c923557..9c77826
> 100644
> --- a/nand_spl/board/freescale/p1_p2_rdb/Makefile
> +++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile
> @@ -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
> 
> diff --git a/nand_spl/board/karo/tx25/Makefile
> b/nand_spl/board/karo/tx25/Makefile index becf7fa..b27189d 100644
> --- a/nand_spl/board/karo/tx25/Makefile
> +++ b/nand_spl/board/karo/tx25/Makefile
> @@ -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 - Nov. 14, 2012, 6:49 a.m.
Dear Marek Vasut,

In message <201211140017.02013.marex@denx.de> you 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).
> 
> Here comes Wolfgangs' "in-tree builds have no benefit" ;)

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


Best regards,

Wolfgang Denk
Anatolij Gustschin - Nov. 14, 2012, 10:18 a.m.
Hi,

On Tue, 13 Nov 2012 16:30:39 -0600
Scott Wood <scottwood@freescale.com> 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 <scottwood@freescale.com>
> ---
> 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(-)

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

Anatolij

Patch

diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile
index c923557..9c77826 100644
--- a/nand_spl/board/freescale/mpc8536ds/Makefile
+++ b/nand_spl/board/freescale/mpc8536ds/Makefile
@@ -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
 
diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile
index c923557..9c77826 100644
--- a/nand_spl/board/freescale/mpc8569mds/Makefile
+++ b/nand_spl/board/freescale/mpc8569mds/Makefile
@@ -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
 
diff --git a/nand_spl/board/freescale/mpc8572ds/Makefile b/nand_spl/board/freescale/mpc8572ds/Makefile
index c923557..9c77826 100644
--- a/nand_spl/board/freescale/mpc8572ds/Makefile
+++ b/nand_spl/board/freescale/mpc8572ds/Makefile
@@ -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
 
diff --git a/nand_spl/board/freescale/mx31pdk/Makefile b/nand_spl/board/freescale/mx31pdk/Makefile
index 43e72c4..f67ed09 100644
--- a/nand_spl/board/freescale/mx31pdk/Makefile
+++ b/nand_spl/board/freescale/mx31pdk/Makefile
@@ -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 - <$< >$@
 
 #########################################################################
 
diff --git a/nand_spl/board/freescale/p1010rdb/Makefile b/nand_spl/board/freescale/p1010rdb/Makefile
index ccff1c7..c3495ec 100644
--- a/nand_spl/board/freescale/p1010rdb/Makefile
+++ b/nand_spl/board/freescale/p1010rdb/Makefile
@@ -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
 
diff --git a/nand_spl/board/freescale/p1023rds/Makefile b/nand_spl/board/freescale/p1023rds/Makefile
index ffe29c8..9b2c0d7 100644
--- a/nand_spl/board/freescale/p1023rds/Makefile
+++ b/nand_spl/board/freescale/p1023rds/Makefile
@@ -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
 
diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile
index c923557..9c77826 100644
--- a/nand_spl/board/freescale/p1_p2_rdb/Makefile
+++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile
@@ -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
 
diff --git a/nand_spl/board/karo/tx25/Makefile b/nand_spl/board/karo/tx25/Makefile
index becf7fa..b27189d 100644
--- a/nand_spl/board/karo/tx25/Makefile
+++ b/nand_spl/board/karo/tx25/Makefile
@@ -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 - <$< >$@
 
 #########################################################################