[PATCH v3.18,v4.4] powerpc/boot: Fix random libfdt related build errors

[PATCH v3.18,v4.4] powerpc/boot: Fix random libfdt related build errors

[Guenter Roeck]

[ Upstream commit 64c3f648c25d108f346fdc96c15180c6b7d250e9 ]

Once in a while I see build errors similar to the following
when building images from a clean tree.

  Building powerpc:virtex-ml507:44x/virtex5_defconfig ... failed
  ------------
  Error log:
  arch/powerpc/boot/treeboot-akebono.c:37:20: fatal error:
  	libfdt.h: No such file or directory

  Building powerpc:bamboo:smpdev:44x/bamboo_defconfig ... failed
  ------------
  Error log:
  arch/powerpc/boot/treeboot-akebono.c:37:20: fatal error:
  	libfdt.h: No such file or directory

  arch/powerpc/boot/treeboot-currituck.c:35:20: fatal error:
       libfdt.h: No such file or directory

Rebuilds will succeed.

Turns out that several source files in arch/powerpc/boot/ include
libfdt.h, but Makefile dependencies are incomplete. Let's fix that.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[groeck: Backport to v4.4.y]
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
For some reason I see the build error fixed with this patch more often
lately. It would be great if you can apply it to v3.18.y and v4.4.y.
Tested on both v3.18.y and v4.4.y.

 arch/powerpc/boot/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 99e4487248ff..57003d1bd243 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -70,7 +70,8 @@ $(addprefix $(obj)/,$(zlib) cuboot-c2k.o gunzip_util.o main.o): \
 libfdt       := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
 libfdtheader := fdt.h libfdt.h libfdt_internal.h
 
-$(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o epapr.o): \
+$(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o epapr.o \
+	treeboot-akebono.o treeboot-currituck.o treeboot-iss4xx.o): \
 	$(addprefix $(obj)/,$(libfdtheader))
 
 src-wlib-y := string.S crt0.S crtsavres.S stdio.c main.c \
-- 
2.7.4

Re: [PATCH v3.18,v4.4] powerpc/boot: Fix random libfdt related build errors

[Sasha Levin]

On Sat, Dec 15, 2018 at 07:30:39AM -0800, Guenter Roeck wrote:
>[ Upstream commit 64c3f648c25d108f346fdc96c15180c6b7d250e9 ]
>
>Once in a while I see build errors similar to the following
>when building images from a clean tree.
>
>  Building powerpc:virtex-ml507:44x/virtex5_defconfig ... failed
>  ------------
>  Error log:
>  arch/powerpc/boot/treeboot-akebono.c:37:20: fatal error:
>  	libfdt.h: No such file or directory
>
>  Building powerpc:bamboo:smpdev:44x/bamboo_defconfig ... failed
>  ------------
>  Error log:
>  arch/powerpc/boot/treeboot-akebono.c:37:20: fatal error:
>  	libfdt.h: No such file or directory
>
>  arch/powerpc/boot/treeboot-currituck.c:35:20: fatal error:
>       libfdt.h: No such file or directory
>
>Rebuilds will succeed.
>
>Turns out that several source files in arch/powerpc/boot/ include
>libfdt.h, but Makefile dependencies are incomplete. Let's fix that.
>
>Signed-off-by: Guenter Roeck <linux@roeck-us.net>
>Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
>Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
>Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>[groeck: Backport to v4.4.y]
>Signed-off-by: Guenter Roeck <linux@roeck-us.net>
>---
>For some reason I see the build error fixed with this patch more often
>lately. It would be great if you can apply it to v3.18.y and v4.4.y.
>Tested on both v3.18.y and v4.4.y.

Queued for both trees, thank you.

--
Thanks,
Sasha