mirror of
https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git
synced 2025-09-06 18:35:43 -04:00
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 <scottwood@freescale.com>
This commit is contained in:
parent
b3141fdb9f
commit
a6d0f62a0c
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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 - <$< >$@
|
||||
|
||||
#########################################################################
|
||||
|
||||
|
@ -68,7 +68,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
|
||||
|
||||
|
@ -63,7 +63,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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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 - <$< >$@
|
||||
|
||||
#########################################################################
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user