diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2015-07-23 16:02:25 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-07-28 23:26:59 -0300 |
commit | 6a868a671472d454b407a165fc31c5f7dfe783c6 (patch) | |
tree | 7bd2ab13a04d14215264cc992501970cacfb20ef /recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch | |
parent | 62e212fe4812a6c726df4ac8e77d4a77e0e54247 (diff) | |
download | meta-freescale-6a868a671472d454b407a165fc31c5f7dfe783c6.tar.gz |
Move meta-fsl-ppc content to layer root
This commit is just a rename of all contents of meta-fsl-ppc
subdirectory to this layer's root, merging the contents of common
files, subsequent changes are based on top of that.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch')
-rw-r--r-- | recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch b/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch new file mode 100644 index 00000000..1ddc6675 --- /dev/null +++ b/recipes-bsp/u-boot/files/Fix-the-depend-race-issue.patch | |||
@@ -0,0 +1,38 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | From 301832414369b749918e0d5db850eed19b81c0fc Mon Sep 17 00:00:00 2001 | ||
4 | From: Zhenhua Luo <zhenhua.luo@freescale.com> | ||
5 | Date: Tue, 24 Sep 2013 00:54:40 -0500 | ||
6 | Subject: [PATCH] Fix the depend race issue | ||
7 | |||
8 | | make[3]: Entering directory `/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/arch/powerpc/cpu/mpc85xx' | ||
9 | | /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/.depend:125: *** missing separator. Stop. | ||
10 | | make[3]: Leaving directory `/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/arch/powerpc/cpu/mpc85xx' | ||
11 | | make[2]: *** [/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-fsl-ppc/build/build/tmp/work/p1022ds-poky-linux-gnuspe/u-boot/git-r30/git/P1022DS_NAND/spl/arch/powerpc/cpu/mpc85xx/start.o] Error 2 | ||
12 | | make[2]: *** Waiting for unfinished jobs.... | ||
13 | |||
14 | Signed-off-by: Zhenhua Luo <zhenhua.luo@freescale.com> | ||
15 | --- | ||
16 | spl/Makefile | 6 +++++- | ||
17 | 1 file changed, 5 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/spl/Makefile b/spl/Makefile | ||
20 | index 6dbb105..3156d87 100644 | ||
21 | --- a/spl/Makefile | ||
22 | +++ b/spl/Makefile | ||
23 | @@ -185,7 +185,11 @@ $(eval $(call make_u_boot_list, $(obj)u-boot.lst, $(LIBS))) | ||
24 | $(obj)u-boot-spl.lds: $(LDSCRIPT) $(obj)u-boot.lst depend | ||
25 | $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -I$(obj). -ansi -D__ASSEMBLY__ -P - < $< > $@ | ||
26 | |||
27 | -depend: $(obj).depend | ||
28 | +# Explicitly make _depend in subdirs containing multiple targets to prevent | ||
29 | +# parallel sub-makes creating .depend files simultaneously. | ||
30 | +depend dep: $(obj).depend | ||
31 | + for dir in $(SUBDIRS) $(CPUDIR) $(LDSCRIPT_MAKEFILE_DIR) ; do \ | ||
32 | + $(MAKE) -C $(SRCTREE)/$$dir _depend ; done | ||
33 | .PHONY: depend | ||
34 | |||
35 | # defines $(obj).depend target | ||
36 | -- | ||
37 | 1.8.2.1 | ||
38 | |||