* [PATCH 0/4] MIPS: Split generic board ITS source, fix NI 169445 build
@ 2017-08-07 22:37 ` Paul Burton
0 siblings, 0 replies; 11+ messages in thread
From: Paul Burton @ 2017-08-07 22:37 UTC (permalink / raw)
To: linux-mips; +Cc: Ralf Baechle, Paul Burton
This series splits the generic vmlinux.its.S flattened image tree
source, allowing boards to specify their device tree & configuration
nodes in a board-specific file that gets concatenated with others to
form the final image tree source that is used to build the flattened
image tree (.itb file).
Applies atop mips-for-linux-next at 246edadb70f7.
Paul Burton (4):
MIPS: Allow platform to specify multiple its.S files
MIPS: generic: Move Boston FIT image source to its own file
MIPS: generic: Move NI 169445 FIT image source to its own file
MIPS: NI 169445: Fix lack of ITS root node
arch/mips/Makefile | 3 +-
arch/mips/boot/Makefile | 16 +++++++----
arch/mips/generic/Platform | 4 +++
arch/mips/generic/board-boston.its.S | 22 +++++++++++++++
arch/mips/generic/board-ni169445.its.S | 22 +++++++++++++++
arch/mips/generic/vmlinux.its.S | 50 ----------------------------------
6 files changed, 61 insertions(+), 56 deletions(-)
create mode 100644 arch/mips/generic/board-boston.its.S
create mode 100644 arch/mips/generic/board-ni169445.its.S
--
2.14.0
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/4] MIPS: Allow platform to specify multiple its.S files
@ 2017-08-07 22:37 ` Paul Burton
0 siblings, 0 replies; 11+ messages in thread
From: Paul Burton @ 2017-08-07 22:37 UTC (permalink / raw)
To: linux-mips; +Cc: Ralf Baechle, Paul Burton
In preparation for splitting arch/mips/generic/vmlinux.its.S into
multiple files such that it doesn't become a conflict magnet as boards
are added, allow platforms to specify a list of image tree source files
which will be concatenated to form the final source used to build the
image tree.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
---
arch/mips/Makefile | 3 ++-
arch/mips/boot/Makefile | 16 +++++++++++-----
arch/mips/generic/Platform | 2 ++
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 876394554274..8b7aefd859cd 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -277,7 +277,8 @@ KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0)
bootvars-y = VMLINUX_LOAD_ADDRESS=$(load-y) \
VMLINUX_ENTRY_ADDRESS=$(entry-y) \
- PLATFORM="$(platform-y)"
+ PLATFORM="$(platform-y)" \
+ ITS_INPUTS="$(its-y)"
ifdef CONFIG_32BIT
bootvars-y += ADDR_BITS=32
endif
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile
index 145b5ce8eb7e..1bd5c4f00d19 100644
--- a/arch/mips/boot/Makefile
+++ b/arch/mips/boot/Makefile
@@ -118,6 +118,12 @@ ifeq ($(ADDR_BITS),64)
itb_addr_cells = 2
endif
+quiet_cmd_its_cat = CAT $@
+ cmd_its_cat = cat $^ >$@
+
+$(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS))
+ $(call if_changed,its_cat)
+
quiet_cmd_cpp_its_S = ITS $@
cmd_cpp_its_S = $(CPP) $(cpp_flags) -P -C -o $@ $< \
-DKERNEL_NAME="\"Linux $(KERNELRELEASE)\"" \
@@ -128,19 +134,19 @@ quiet_cmd_cpp_its_S = ITS $@
-DADDR_BITS=$(ADDR_BITS) \
-DADDR_CELLS=$(itb_addr_cells)
-$(obj)/vmlinux.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE
+$(obj)/vmlinux.its: $(obj)/vmlinux.its.S $(VMLINUX) FORCE
$(call if_changed_dep,cpp_its_S,none,vmlinux.bin)
-$(obj)/vmlinux.gz.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE
+$(obj)/vmlinux.gz.its: $(obj)/vmlinux.its.S $(VMLINUX) FORCE
$(call if_changed_dep,cpp_its_S,gzip,vmlinux.bin.gz)
-$(obj)/vmlinux.bz2.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE
+$(obj)/vmlinux.bz2.its: $(obj)/vmlinux.its.S $(VMLINUX) FORCE
$(call if_changed_dep,cpp_its_S,bzip2,vmlinux.bin.bz2)
-$(obj)/vmlinux.lzma.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE
+$(obj)/vmlinux.lzma.its: $(obj)/vmlinux.its.S $(VMLINUX) FORCE
$(call if_changed_dep,cpp_its_S,lzma,vmlinux.bin.lzma)
-$(obj)/vmlinux.lzo.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE
+$(obj)/vmlinux.lzo.its: $(obj)/vmlinux.its.S $(VMLINUX) FORCE
$(call if_changed_dep,cpp_its_S,lzo,vmlinux.bin.lzo)
quiet_cmd_itb-image = ITB $@
diff --git a/arch/mips/generic/Platform b/arch/mips/generic/Platform
index 9a30d69e2281..6f7ce7b0c5e2 100644
--- a/arch/mips/generic/Platform
+++ b/arch/mips/generic/Platform
@@ -12,3 +12,5 @@ platform-$(CONFIG_MIPS_GENERIC) += generic/
cflags-$(CONFIG_MIPS_GENERIC) += -I$(srctree)/arch/mips/include/asm/mach-generic
load-$(CONFIG_MIPS_GENERIC) += 0xffffffff80100000
all-$(CONFIG_MIPS_GENERIC) := vmlinux.gz.itb
+
+its-y := vmlinux.its.S
--
2.14.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 1/4] MIPS: Allow platform to specify multiple its.S files
@ 2017-08-07 22:37 ` Paul Burton
0 siblings, 0 replies; 11+ messages in thread
From: Paul Burton @ 2017-08-07 22:37 UTC (permalink / raw)
To: linux-mips; +Cc: Ralf Baechle, Paul Burton
In preparation for splitting arch/mips/generic/vmlinux.its.S into
multiple files such that it doesn't become a conflict magnet as boards
are added, allow platforms to specify a list of image tree source files
which will be concatenated to form the final source used to build the
image tree.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
---
arch/mips/Makefile | 3 ++-
arch/mips/boot/Makefile | 16 +++++++++++-----
arch/mips/generic/Platform | 2 ++
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 876394554274..8b7aefd859cd 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -277,7 +277,8 @@ KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0)
bootvars-y = VMLINUX_LOAD_ADDRESS=$(load-y) \
VMLINUX_ENTRY_ADDRESS=$(entry-y) \
- PLATFORM="$(platform-y)"
+ PLATFORM="$(platform-y)" \
+ ITS_INPUTS="$(its-y)"
ifdef CONFIG_32BIT
bootvars-y += ADDR_BITS=32
endif
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile
index 145b5ce8eb7e..1bd5c4f00d19 100644
--- a/arch/mips/boot/Makefile
+++ b/arch/mips/boot/Makefile
@@ -118,6 +118,12 @@ ifeq ($(ADDR_BITS),64)
itb_addr_cells = 2
endif
+quiet_cmd_its_cat = CAT $@
+ cmd_its_cat = cat $^ >$@
+
+$(obj)/vmlinux.its.S: $(addprefix $(srctree)/arch/mips/$(PLATFORM)/,$(ITS_INPUTS))
+ $(call if_changed,its_cat)
+
quiet_cmd_cpp_its_S = ITS $@
cmd_cpp_its_S = $(CPP) $(cpp_flags) -P -C -o $@ $< \
-DKERNEL_NAME="\"Linux $(KERNELRELEASE)\"" \
@@ -128,19 +134,19 @@ quiet_cmd_cpp_its_S = ITS $@
-DADDR_BITS=$(ADDR_BITS) \
-DADDR_CELLS=$(itb_addr_cells)
-$(obj)/vmlinux.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE
+$(obj)/vmlinux.its: $(obj)/vmlinux.its.S $(VMLINUX) FORCE
$(call if_changed_dep,cpp_its_S,none,vmlinux.bin)
-$(obj)/vmlinux.gz.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE
+$(obj)/vmlinux.gz.its: $(obj)/vmlinux.its.S $(VMLINUX) FORCE
$(call if_changed_dep,cpp_its_S,gzip,vmlinux.bin.gz)
-$(obj)/vmlinux.bz2.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE
+$(obj)/vmlinux.bz2.its: $(obj)/vmlinux.its.S $(VMLINUX) FORCE
$(call if_changed_dep,cpp_its_S,bzip2,vmlinux.bin.bz2)
-$(obj)/vmlinux.lzma.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE
+$(obj)/vmlinux.lzma.its: $(obj)/vmlinux.its.S $(VMLINUX) FORCE
$(call if_changed_dep,cpp_its_S,lzma,vmlinux.bin.lzma)
-$(obj)/vmlinux.lzo.its: $(srctree)/arch/mips/$(PLATFORM)/vmlinux.its.S $(VMLINUX) FORCE
+$(obj)/vmlinux.lzo.its: $(obj)/vmlinux.its.S $(VMLINUX) FORCE
$(call if_changed_dep,cpp_its_S,lzo,vmlinux.bin.lzo)
quiet_cmd_itb-image = ITB $@
diff --git a/arch/mips/generic/Platform b/arch/mips/generic/Platform
index 9a30d69e2281..6f7ce7b0c5e2 100644
--- a/arch/mips/generic/Platform
+++ b/arch/mips/generic/Platform
@@ -12,3 +12,5 @@ platform-$(CONFIG_MIPS_GENERIC) += generic/
cflags-$(CONFIG_MIPS_GENERIC) += -I$(srctree)/arch/mips/include/asm/mach-generic
load-$(CONFIG_MIPS_GENERIC) += 0xffffffff80100000
all-$(CONFIG_MIPS_GENERIC) := vmlinux.gz.itb
+
+its-y := vmlinux.its.S
--
2.14.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/4] MIPS: generic: Move Boston FIT image source to its own file
@ 2017-08-07 22:37 ` Paul Burton
0 siblings, 0 replies; 11+ messages in thread
From: Paul Burton @ 2017-08-07 22:37 UTC (permalink / raw)
To: linux-mips; +Cc: Ralf Baechle, Paul Burton
Move the Boston board flattened image tree source into its own file
which is concatenated into the final image tree source used to build the
flattened image tree. Separating boards into different files will help
us to avoid conflicts as boards are added.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
---
arch/mips/generic/Platform | 1 +
arch/mips/generic/board-boston.its.S | 22 ++++++++++++++++++++++
arch/mips/generic/vmlinux.its.S | 25 -------------------------
3 files changed, 23 insertions(+), 25 deletions(-)
create mode 100644 arch/mips/generic/board-boston.its.S
diff --git a/arch/mips/generic/Platform b/arch/mips/generic/Platform
index 6f7ce7b0c5e2..50c8ad58b5f1 100644
--- a/arch/mips/generic/Platform
+++ b/arch/mips/generic/Platform
@@ -14,3 +14,4 @@ load-$(CONFIG_MIPS_GENERIC) += 0xffffffff80100000
all-$(CONFIG_MIPS_GENERIC) := vmlinux.gz.itb
its-y := vmlinux.its.S
+its-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += board-boston.its.S
diff --git a/arch/mips/generic/board-boston.its.S b/arch/mips/generic/board-boston.its.S
new file mode 100644
index 000000000000..a7f51f97b910
--- /dev/null
+++ b/arch/mips/generic/board-boston.its.S
@@ -0,0 +1,22 @@
+/ {
+ images {
+ fdt@boston {
+ description = "img,boston Device Tree";
+ data = /incbin/("boot/dts/img/boston.dtb");
+ type = "flat_dt";
+ arch = "mips";
+ compression = "none";
+ hash@0 {
+ algo = "sha1";
+ };
+ };
+ };
+
+ configurations {
+ conf@boston {
+ description = "Boston Linux kernel";
+ kernel = "kernel@0";
+ fdt = "fdt@boston";
+ };
+ };
+};
diff --git a/arch/mips/generic/vmlinux.its.S b/arch/mips/generic/vmlinux.its.S
index ffc6f37759c0..4a142e746719 100644
--- a/arch/mips/generic/vmlinux.its.S
+++ b/arch/mips/generic/vmlinux.its.S
@@ -30,31 +30,6 @@
};
};
-#ifdef CONFIG_FIT_IMAGE_FDT_BOSTON
-/ {
- images {
- fdt@boston {
- description = "img,boston Device Tree";
- data = /incbin/("boot/dts/img/boston.dtb");
- type = "flat_dt";
- arch = "mips";
- compression = "none";
- hash@0 {
- algo = "sha1";
- };
- };
- };
-
- configurations {
- conf@boston {
- description = "Boston Linux kernel";
- kernel = "kernel@0";
- fdt = "fdt@boston";
- };
- };
-};
-#endif /* CONFIG_FIT_IMAGE_FDT_BOSTON */
-
#ifdef CONFIG_FIT_IMAGE_FDT_NI169445
{
images {
--
2.14.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/4] MIPS: generic: Move Boston FIT image source to its own file
@ 2017-08-07 22:37 ` Paul Burton
0 siblings, 0 replies; 11+ messages in thread
From: Paul Burton @ 2017-08-07 22:37 UTC (permalink / raw)
To: linux-mips; +Cc: Ralf Baechle, Paul Burton
Move the Boston board flattened image tree source into its own file
which is concatenated into the final image tree source used to build the
flattened image tree. Separating boards into different files will help
us to avoid conflicts as boards are added.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
---
arch/mips/generic/Platform | 1 +
arch/mips/generic/board-boston.its.S | 22 ++++++++++++++++++++++
arch/mips/generic/vmlinux.its.S | 25 -------------------------
3 files changed, 23 insertions(+), 25 deletions(-)
create mode 100644 arch/mips/generic/board-boston.its.S
diff --git a/arch/mips/generic/Platform b/arch/mips/generic/Platform
index 6f7ce7b0c5e2..50c8ad58b5f1 100644
--- a/arch/mips/generic/Platform
+++ b/arch/mips/generic/Platform
@@ -14,3 +14,4 @@ load-$(CONFIG_MIPS_GENERIC) += 0xffffffff80100000
all-$(CONFIG_MIPS_GENERIC) := vmlinux.gz.itb
its-y := vmlinux.its.S
+its-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += board-boston.its.S
diff --git a/arch/mips/generic/board-boston.its.S b/arch/mips/generic/board-boston.its.S
new file mode 100644
index 000000000000..a7f51f97b910
--- /dev/null
+++ b/arch/mips/generic/board-boston.its.S
@@ -0,0 +1,22 @@
+/ {
+ images {
+ fdt@boston {
+ description = "img,boston Device Tree";
+ data = /incbin/("boot/dts/img/boston.dtb");
+ type = "flat_dt";
+ arch = "mips";
+ compression = "none";
+ hash@0 {
+ algo = "sha1";
+ };
+ };
+ };
+
+ configurations {
+ conf@boston {
+ description = "Boston Linux kernel";
+ kernel = "kernel@0";
+ fdt = "fdt@boston";
+ };
+ };
+};
diff --git a/arch/mips/generic/vmlinux.its.S b/arch/mips/generic/vmlinux.its.S
index ffc6f37759c0..4a142e746719 100644
--- a/arch/mips/generic/vmlinux.its.S
+++ b/arch/mips/generic/vmlinux.its.S
@@ -30,31 +30,6 @@
};
};
-#ifdef CONFIG_FIT_IMAGE_FDT_BOSTON
-/ {
- images {
- fdt@boston {
- description = "img,boston Device Tree";
- data = /incbin/("boot/dts/img/boston.dtb");
- type = "flat_dt";
- arch = "mips";
- compression = "none";
- hash@0 {
- algo = "sha1";
- };
- };
- };
-
- configurations {
- conf@boston {
- description = "Boston Linux kernel";
- kernel = "kernel@0";
- fdt = "fdt@boston";
- };
- };
-};
-#endif /* CONFIG_FIT_IMAGE_FDT_BOSTON */
-
#ifdef CONFIG_FIT_IMAGE_FDT_NI169445
{
images {
--
2.14.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/4] MIPS: generic: Move NI 169445 FIT image source to its own file
@ 2017-08-07 22:37 ` Paul Burton
0 siblings, 0 replies; 11+ messages in thread
From: Paul Burton @ 2017-08-07 22:37 UTC (permalink / raw)
To: linux-mips; +Cc: Ralf Baechle, Paul Burton, Nathan Sullivan
Move the NI 169445 board flattened image tree source into its own file
which is concatenated into the final image tree source used to build the
flattened image tree. Separating boards into different files will help
us to avoid conflicts as boards are added.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Nathan Sullivan <nathan.sullivan@ni.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
---
arch/mips/generic/Platform | 1 +
arch/mips/generic/board-ni169445.its.S | 22 ++++++++++++++++++++++
arch/mips/generic/vmlinux.its.S | 25 -------------------------
3 files changed, 23 insertions(+), 25 deletions(-)
create mode 100644 arch/mips/generic/board-ni169445.its.S
diff --git a/arch/mips/generic/Platform b/arch/mips/generic/Platform
index 50c8ad58b5f1..f5312dfa8184 100644
--- a/arch/mips/generic/Platform
+++ b/arch/mips/generic/Platform
@@ -15,3 +15,4 @@ all-$(CONFIG_MIPS_GENERIC) := vmlinux.gz.itb
its-y := vmlinux.its.S
its-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += board-boston.its.S
+its-$(CONFIG_FIT_IMAGE_FDT_NI169445) += board-ni169445.its.S
diff --git a/arch/mips/generic/board-ni169445.its.S b/arch/mips/generic/board-ni169445.its.S
new file mode 100644
index 000000000000..d12e12fe90be
--- /dev/null
+++ b/arch/mips/generic/board-ni169445.its.S
@@ -0,0 +1,22 @@
+{
+ images {
+ fdt@ni169445 {
+ description = "NI 169445 device tree";
+ data = /incbin/("boot/dts/ni/169445.dtb");
+ type = "flat_dt";
+ arch = "mips";
+ compression = "none";
+ hash@0 {
+ algo = "sha1";
+ };
+ };
+ };
+
+ configurations {
+ conf@ni169445 {
+ description = "NI 169445 Linux Kernel";
+ kernel = "kernel@0";
+ fdt = "fdt@ni169445";
+ };
+ };
+};
diff --git a/arch/mips/generic/vmlinux.its.S b/arch/mips/generic/vmlinux.its.S
index 4a142e746719..f67fbf1c8541 100644
--- a/arch/mips/generic/vmlinux.its.S
+++ b/arch/mips/generic/vmlinux.its.S
@@ -29,28 +29,3 @@
};
};
};
-
-#ifdef CONFIG_FIT_IMAGE_FDT_NI169445
-{
- images {
- fdt@ni169445 {
- description = "NI 169445 device tree";
- data = /incbin/("boot/dts/ni/169445.dtb");
- type = "flat_dt";
- arch = "mips";
- compression = "none";
- hash@0 {
- algo = "sha1";
- };
- };
- };
-
- configurations {
- conf@ni169445 {
- description = "NI 169445 Linux Kernel";
- kernel = "kernel@0";
- fdt = "fdt@ni169445";
- };
- };
-};
-#endif /* CONFIG_FIT_IMAGE_FDT_NI169445 */
--
2.14.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 3/4] MIPS: generic: Move NI 169445 FIT image source to its own file
@ 2017-08-07 22:37 ` Paul Burton
0 siblings, 0 replies; 11+ messages in thread
From: Paul Burton @ 2017-08-07 22:37 UTC (permalink / raw)
To: linux-mips; +Cc: Ralf Baechle, Paul Burton, Nathan Sullivan
Move the NI 169445 board flattened image tree source into its own file
which is concatenated into the final image tree source used to build the
flattened image tree. Separating boards into different files will help
us to avoid conflicts as boards are added.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Nathan Sullivan <nathan.sullivan@ni.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
---
arch/mips/generic/Platform | 1 +
arch/mips/generic/board-ni169445.its.S | 22 ++++++++++++++++++++++
arch/mips/generic/vmlinux.its.S | 25 -------------------------
3 files changed, 23 insertions(+), 25 deletions(-)
create mode 100644 arch/mips/generic/board-ni169445.its.S
diff --git a/arch/mips/generic/Platform b/arch/mips/generic/Platform
index 50c8ad58b5f1..f5312dfa8184 100644
--- a/arch/mips/generic/Platform
+++ b/arch/mips/generic/Platform
@@ -15,3 +15,4 @@ all-$(CONFIG_MIPS_GENERIC) := vmlinux.gz.itb
its-y := vmlinux.its.S
its-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += board-boston.its.S
+its-$(CONFIG_FIT_IMAGE_FDT_NI169445) += board-ni169445.its.S
diff --git a/arch/mips/generic/board-ni169445.its.S b/arch/mips/generic/board-ni169445.its.S
new file mode 100644
index 000000000000..d12e12fe90be
--- /dev/null
+++ b/arch/mips/generic/board-ni169445.its.S
@@ -0,0 +1,22 @@
+{
+ images {
+ fdt@ni169445 {
+ description = "NI 169445 device tree";
+ data = /incbin/("boot/dts/ni/169445.dtb");
+ type = "flat_dt";
+ arch = "mips";
+ compression = "none";
+ hash@0 {
+ algo = "sha1";
+ };
+ };
+ };
+
+ configurations {
+ conf@ni169445 {
+ description = "NI 169445 Linux Kernel";
+ kernel = "kernel@0";
+ fdt = "fdt@ni169445";
+ };
+ };
+};
diff --git a/arch/mips/generic/vmlinux.its.S b/arch/mips/generic/vmlinux.its.S
index 4a142e746719..f67fbf1c8541 100644
--- a/arch/mips/generic/vmlinux.its.S
+++ b/arch/mips/generic/vmlinux.its.S
@@ -29,28 +29,3 @@
};
};
};
-
-#ifdef CONFIG_FIT_IMAGE_FDT_NI169445
-{
- images {
- fdt@ni169445 {
- description = "NI 169445 device tree";
- data = /incbin/("boot/dts/ni/169445.dtb");
- type = "flat_dt";
- arch = "mips";
- compression = "none";
- hash@0 {
- algo = "sha1";
- };
- };
- };
-
- configurations {
- conf@ni169445 {
- description = "NI 169445 Linux Kernel";
- kernel = "kernel@0";
- fdt = "fdt@ni169445";
- };
- };
-};
-#endif /* CONFIG_FIT_IMAGE_FDT_NI169445 */
--
2.14.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/4] MIPS: NI 169445: Fix lack of ITS root node
@ 2017-08-07 22:37 ` Paul Burton
0 siblings, 0 replies; 11+ messages in thread
From: Paul Burton @ 2017-08-07 22:37 UTC (permalink / raw)
To: linux-mips; +Cc: Ralf Baechle, Paul Burton, Nathan Sullivan
For some reason the root node was missing in the NI 169445 flattened
image tree source, leading to the following build error when attempting
to generate the flattened image tree binary:
ITB arch/mips/boot/vmlinux.gz.itb
Error: arch/mips/boot/vmlinux.gz.its:90.1-2 syntax error
FATAL ERROR: Unable to parse input tree
/usr/bin/mkimage: Can't read arch/mips/boot/vmlinux.gz.itb.tmp: Invalid argument
make[1]: *** [arch/mips/boot/Makefile:165: arch/mips/boot/vmlinux.gz.itb] Error 255
make: *** [arch/mips/Makefile:371: vmlinux.gz.itb] Error 2
Fix this by adding in the root node.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Fixes: 65dca6aed98d ("MIPS: NI 169445 board support")
Cc: Nathan Sullivan <nathan.sullivan@ni.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
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.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 4/4] MIPS: NI 169445: Fix lack of ITS root node
@ 2017-08-07 22:37 ` Paul Burton
0 siblings, 0 replies; 11+ messages in thread
From: Paul Burton @ 2017-08-07 22:37 UTC (permalink / raw)
To: linux-mips; +Cc: Ralf Baechle, Paul Burton, Nathan Sullivan
For some reason the root node was missing in the NI 169445 flattened
image tree source, leading to the following build error when attempting
to generate the flattened image tree binary:
ITB arch/mips/boot/vmlinux.gz.itb
Error: arch/mips/boot/vmlinux.gz.its:90.1-2 syntax error
FATAL ERROR: Unable to parse input tree
/usr/bin/mkimage: Can't read arch/mips/boot/vmlinux.gz.itb.tmp: Invalid argument
make[1]: *** [arch/mips/boot/Makefile:165: arch/mips/boot/vmlinux.gz.itb] Error 255
make: *** [arch/mips/Makefile:371: vmlinux.gz.itb] Error 2
Fix this by adding in the root node.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Fixes: 65dca6aed98d ("MIPS: NI 169445 board support")
Cc: Nathan Sullivan <nathan.sullivan@ni.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
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.0
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 4/4] MIPS: NI 169445: Fix lack of ITS root node
2017-08-07 22:37 ` Paul Burton
(?)
@ 2017-08-08 4:32 ` Ralf Baechle
-1 siblings, 0 replies; 11+ messages in thread
From: Ralf Baechle @ 2017-08-08 4:32 UTC (permalink / raw)
To: Paul Burton; +Cc: linux-mips, Nathan Sullivan
On Mon, Aug 07, 2017 at 03:37:24PM -0700, Paul Burton wrote:
> For some reason the root node was missing in the NI 169445 flattened
> image tree source, leading to the following build error when attempting
> to generate the flattened image tree binary:
>
> ITB arch/mips/boot/vmlinux.gz.itb
> Error: arch/mips/boot/vmlinux.gz.its:90.1-2 syntax error
> FATAL ERROR: Unable to parse input tree
> /usr/bin/mkimage: Can't read arch/mips/boot/vmlinux.gz.itb.tmp: Invalid argument
> make[1]: *** [arch/mips/boot/Makefile:165: arch/mips/boot/vmlinux.gz.itb] Error 255
> make: *** [arch/mips/Makefile:371: vmlinux.gz.itb] Error 2
>
> Fix this by adding in the root node.
My bad, I messed this up when fixing a merge conflict in
arch/mips/generic/vmlinux.its.S. I fixed the original
commit instead.
Thanks,
Ralf
^ permalink raw reply [flat|nested] 11+ messages in thread