MIPS: generic: Move Boston FIT image source to its own file

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 <[email protected]>
Cc: [email protected]
Patchwork: https://patchwork.linux-mips.org/patch/16939/
Signed-off-by: Ralf Baechle <[email protected]>

diff --git a/arch/mips/generic/Platform b/arch/mips/generic/Platform
index 6f7ce7b0c5e297b2d3e53bdde093831d13919634..50c8ad58b5f15728c0177abb7fa6d60bf6816066 100644 (file)
--- 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 (file)
index 0000000..a7f51f9
--- /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 0083e1af9a9190deeac37d92f55066f1848e54bc..811a5c7eb3eef08125a836a10fb2d51cfc0b2e59 100644 (file)
--- 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 {