summaryrefslogtreecommitdiff
path: root/arch/mips/generic
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2017-08-08 01:37:23 +0300
committerRalf Baechle <ralf@linux-mips.org>2017-08-29 16:21:52 +0300
commit04a85e087ad6cdcb7d06f10c114b8256fdfac783 (patch)
treec9219ae3ae7b1391067e238a0b99464ee546261e /arch/mips/generic
parent13d1ff2c8580eaa719e41a9bb22a953658e11d1d (diff)
downloadlinux-04a85e087ad6cdcb7d06f10c114b8256fdfac783.tar.xz
MIPS: generic: Move NI 169445 FIT image source to its own file
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: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/16940/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/generic')
-rw-r--r--arch/mips/generic/Platform1
-rw-r--r--arch/mips/generic/board-ni169445.its.S22
-rw-r--r--arch/mips/generic/vmlinux.its.S25
3 files changed, 23 insertions, 25 deletions
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 811a5c7eb3ee..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 */