* [PATCH for-4.14] MIPS: generic: Fix NI 169445 its build
@ 2017-10-31 21:41 ` James Hogan
0 siblings, 0 replies; 6+ messages in thread
From: James Hogan @ 2017-10-31 21:41 UTC (permalink / raw)
To: Ralf Baechle, Paul Burton
Cc: James Hogan, James Hogan, Nathan Sullivan, linux-mips
From: James Hogan <jhogan@kernel.org>
Since commit 04a85e087ad6 ("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
This is because arch/mips/generic/board-ni169445.its.S doesn't include
the necessary "/" node path before the first open brace, which did
previously exist when it was in arch/mips/generic/vmlinux.its.S.
Fixes: 04a85e087ad6 ("MIPS: generic: Move NI 169445 FIT image source to its own file")
Signed-off-by: James Hogan <jhogan@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Nathan Sullivan <nathan.sullivan@ni.com>
Cc: linux-mips@linux-mips.org
---
arch/mips/generic/board-ni169445.its.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/generic/board-ni169445.its.S b/arch/mips/generic/board-ni169445.its.S
index d12e12fe90be..e4cb4f95a8cc 100644
--- a/arch/mips/generic/board-ni169445.its.S
+++ b/arch/mips/generic/board-ni169445.its.S
@@ -1,4 +1,4 @@
-{
+/ {
images {
fdt@ni169445 {
description = "NI 169445 device tree";
--
2.14.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH for-4.14] MIPS: generic: Fix NI 169445 its build
@ 2017-10-31 21:41 ` James Hogan
0 siblings, 0 replies; 6+ messages in thread
From: James Hogan @ 2017-10-31 21:41 UTC (permalink / raw)
To: Ralf Baechle, Paul Burton
Cc: James Hogan, James Hogan, Nathan Sullivan, linux-mips
From: James Hogan <jhogan@kernel.org>
Since commit 04a85e087ad6 ("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
This is because arch/mips/generic/board-ni169445.its.S doesn't include
the necessary "/" node path before the first open brace, which did
previously exist when it was in arch/mips/generic/vmlinux.its.S.
Fixes: 04a85e087ad6 ("MIPS: generic: Move NI 169445 FIT image source to its own file")
Signed-off-by: James Hogan <jhogan@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Nathan Sullivan <nathan.sullivan@ni.com>
Cc: linux-mips@linux-mips.org
---
arch/mips/generic/board-ni169445.its.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/generic/board-ni169445.its.S b/arch/mips/generic/board-ni169445.its.S
index d12e12fe90be..e4cb4f95a8cc 100644
--- a/arch/mips/generic/board-ni169445.its.S
+++ b/arch/mips/generic/board-ni169445.its.S
@@ -1,4 +1,4 @@
-{
+/ {
images {
fdt@ni169445 {
description = "NI 169445 device tree";
--
2.14.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH for-4.14] MIPS: generic: Fix NI 169445 its build
@ 2017-10-31 21:45 ` Paul Burton
0 siblings, 0 replies; 6+ messages in thread
From: Paul Burton @ 2017-10-31 21:45 UTC (permalink / raw)
To: James Hogan, Ralf Baechle; +Cc: James Hogan, Nathan Sullivan, linux-mips
Hi James,
On Tue, Oct 31, 2017 at 09:41:07PM +0000, James Hogan wrote:
> From: James Hogan <jhogan@kernel.org>
>
> Since commit 04a85e087ad6 ("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
Hmm - I fixed this up already here:
https://patchwork.linux-mips.org/patch/16941/
and Ralf said he was going to fix up the original commit. I guess it got lost
somewhere..?
Thanks,
Paul
> This is because arch/mips/generic/board-ni169445.its.S doesn't include
> the necessary "/" node path before the first open brace, which did
> previously exist when it was in arch/mips/generic/vmlinux.its.S.
>
> Fixes: 04a85e087ad6 ("MIPS: generic: Move NI 169445 FIT image source to its own file")
> Signed-off-by: James Hogan <jhogan@kernel.org>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Paul Burton <paul.burton@mips.com>
> Cc: Nathan Sullivan <nathan.sullivan@ni.com>
> Cc: linux-mips@linux-mips.org
> ---
> arch/mips/generic/board-ni169445.its.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/mips/generic/board-ni169445.its.S b/arch/mips/generic/board-ni169445.its.S
> index d12e12fe90be..e4cb4f95a8cc 100644
> --- a/arch/mips/generic/board-ni169445.its.S
> +++ b/arch/mips/generic/board-ni169445.its.S
> @@ -1,4 +1,4 @@
> -{
> +/ {
> images {
> fdt@ni169445 {
> description = "NI 169445 device tree";
> --
> 2.14.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH for-4.14] MIPS: generic: Fix NI 169445 its build
@ 2017-10-31 21:45 ` Paul Burton
0 siblings, 0 replies; 6+ messages in thread
From: Paul Burton @ 2017-10-31 21:45 UTC (permalink / raw)
To: James Hogan, Ralf Baechle; +Cc: James Hogan, Nathan Sullivan, linux-mips
Hi James,
On Tue, Oct 31, 2017 at 09:41:07PM +0000, James Hogan wrote:
> From: James Hogan <jhogan@kernel.org>
>
> Since commit 04a85e087ad6 ("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
Hmm - I fixed this up already here:
https://patchwork.linux-mips.org/patch/16941/
and Ralf said he was going to fix up the original commit. I guess it got lost
somewhere..?
Thanks,
Paul
> This is because arch/mips/generic/board-ni169445.its.S doesn't include
> the necessary "/" node path before the first open brace, which did
> previously exist when it was in arch/mips/generic/vmlinux.its.S.
>
> Fixes: 04a85e087ad6 ("MIPS: generic: Move NI 169445 FIT image source to its own file")
> Signed-off-by: James Hogan <jhogan@kernel.org>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Paul Burton <paul.burton@mips.com>
> Cc: Nathan Sullivan <nathan.sullivan@ni.com>
> Cc: linux-mips@linux-mips.org
> ---
> arch/mips/generic/board-ni169445.its.S | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/mips/generic/board-ni169445.its.S b/arch/mips/generic/board-ni169445.its.S
> index d12e12fe90be..e4cb4f95a8cc 100644
> --- a/arch/mips/generic/board-ni169445.its.S
> +++ b/arch/mips/generic/board-ni169445.its.S
> @@ -1,4 +1,4 @@
> -{
> +/ {
> images {
> fdt@ni169445 {
> description = "NI 169445 device tree";
> --
> 2.14.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH for-4.14] MIPS: generic: Fix NI 169445 its build
@ 2017-10-31 21:52 ` James Hogan
0 siblings, 0 replies; 6+ messages in thread
From: James Hogan @ 2017-10-31 21:52 UTC (permalink / raw)
To: Paul Burton; +Cc: Ralf Baechle, Nathan Sullivan, linux-mips
[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]
On Tue, Oct 31, 2017 at 02:45:39PM -0700, Paul Burton wrote:
> On Tue, Oct 31, 2017 at 09:41:07PM +0000, James Hogan wrote:
> > From: James Hogan <jhogan@kernel.org>
> >
> > Since commit 04a85e087ad6 ("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
>
> Hmm - I fixed this up already here:
>
> https://patchwork.linux-mips.org/patch/16941/
>
> and Ralf said he was going to fix up the original commit. I guess it got lost
> somewhere..?
Ah yes. It looks like Ralf did fix the original commit, i.e. commit
7aacf86b75bc ("MIPS: NI 169445 board support"), but the change wasn't
transferred to the separate file when the conflict in commit
04a85e087ad6 ("MIPS: generic: Move NI 169445 FIT image source to its own
file") was resolved.
I think my patch has a more correct commit message / Fixes tag now, so I
think this patch is still applicable.
Cheers
James
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH for-4.14] MIPS: generic: Fix NI 169445 its build
@ 2017-10-31 21:52 ` James Hogan
0 siblings, 0 replies; 6+ messages in thread
From: James Hogan @ 2017-10-31 21:52 UTC (permalink / raw)
To: Paul Burton; +Cc: Ralf Baechle, Nathan Sullivan, linux-mips
[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]
On Tue, Oct 31, 2017 at 02:45:39PM -0700, Paul Burton wrote:
> On Tue, Oct 31, 2017 at 09:41:07PM +0000, James Hogan wrote:
> > From: James Hogan <jhogan@kernel.org>
> >
> > Since commit 04a85e087ad6 ("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
>
> Hmm - I fixed this up already here:
>
> https://patchwork.linux-mips.org/patch/16941/
>
> and Ralf said he was going to fix up the original commit. I guess it got lost
> somewhere..?
Ah yes. It looks like Ralf did fix the original commit, i.e. commit
7aacf86b75bc ("MIPS: NI 169445 board support"), but the change wasn't
transferred to the separate file when the conflict in commit
04a85e087ad6 ("MIPS: generic: Move NI 169445 FIT image source to its own
file") was resolved.
I think my patch has a more correct commit message / Fixes tag now, so I
think this patch is still applicable.
Cheers
James
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-10-31 21:54 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-31 21:41 [PATCH for-4.14] MIPS: generic: Fix NI 169445 its build James Hogan
2017-10-31 21:41 ` James Hogan
2017-10-31 21:45 ` Paul Burton
2017-10-31 21:45 ` Paul Burton
2017-10-31 21:52 ` James Hogan
2017-10-31 21:52 ` James Hogan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.