Browse Source

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>
Paul Burton 8 years ago
parent
commit
04a85e087a
3 changed files with 23 additions and 25 deletions
  1. 1 0
      arch/mips/generic/Platform
  2. 22 0
      arch/mips/generic/board-ni169445.its.S
  3. 0 25
      arch/mips/generic/vmlinux.its.S

+ 1 - 0
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

+ 22 - 0
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";
+		};
+	};
+};

+ 0 - 25
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 */