| From foo@baz Sun May 27 17:33:38 CEST 2018 |
| From: Guenter Roeck <linux@roeck-us.net> |
| Date: Fri, 23 Feb 2018 12:55:59 -0800 |
| Subject: powerpc/boot: Fix random libfdt related build errors |
| |
| From: Guenter Roeck <linux@roeck-us.net> |
| |
| [ 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> |
| --- |
| arch/powerpc/boot/Makefile | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/arch/powerpc/boot/Makefile |
| +++ b/arch/powerpc/boot/Makefile |
| @@ -92,7 +92,8 @@ $(addprefix $(obj)/,$(zlib-y)): \ |
| 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 opal.o): \ |
| +$(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o epapr.o opal.o \ |
| + treeboot-akebono.o treeboot-currituck.o treeboot-iss4xx.o): \ |
| $(addprefix $(obj)/,$(libfdtheader)) |
| |
| src-wlib-y := string.S crt0.S crtsavres.S stdio.c decompress.c main.c \ |
