Skip to content

Commit

Permalink
MIPS: generic: Fix NI 169445 its build
Browse files Browse the repository at this point in the history
Since commit 04a85e0 ("MIPS: generic: Move NI 169445 FIT image
source to its own file"), a generic 32r2el_defconfig kernel fails to
build with the following build error:

  ITB     arch/mips/boot/vmlinux.gz.itb
Error: arch/mips/boot/vmlinux.gz.its:111.1-2 syntax error
FATAL ERROR: Unable to parse input tree
mkimage Can't read arch/mips/boot/vmlinux.gz.itb.tmp: Invalid argument

Fix arch/mips/generic/board-ni169445.its.S to include the necessary "/"
node path before the first open brace.

The original issue in arch/mips/generic/vmlinux.its.S was fixed directly
in the original commit 7aacf86 ("MIPS: NI 169445 board support")
after https://patchwork.linux-mips.org/patch/16941/ was submitted, but
the separate its.S file wasn't correctly fixed when resolving the
conflict in commit 04a85e0 ("MIPS: generic: Move NI 169445 FIT
image source to its own file").

Fixes: 04a85e0 ("MIPS: generic: Move NI 169445 FIT image source to its own file")
Signed-off-by: James Hogan <[email protected]>
Cc: Ralf Baechle <[email protected]>
Cc: Paul Burton <[email protected]>
Cc: Nathan Sullivan <[email protected]>
Cc: [email protected]
Patchwork: https://patchwork.linux-mips.org/patch/17561/
Signed-off-by: James Hogan <[email protected]>
  • Loading branch information
amalon committed Oct 31, 2017
1 parent 48c834b commit a128696
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/mips/generic/board-ni169445.its.S
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
/ {
images {
fdt@ni169445 {
description = "NI 169445 device tree";
Expand Down

0 comments on commit a128696

Please sign in to comment.