From 04a85e087ad6cdcb7d06f10c114b8256fdfac783 Mon Sep 17 00:00:00 2001
From: Paul Burton <paul.burton@imgtec.com>
Date: Mon, 7 Aug 2017 15:37:23 -0700
Subject: [PATCH] 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>
---
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 50c8ad58b5f15..f5312dfa81840 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 0000000000000..d12e12fe90bec
--- /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 811a5c7eb3eef..f67fbf1c85417 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 */
--
GitLab