tegra: Move checkboard() into the board code

This is only used by Nvidia boards, so move it into nvidia/common to simplify things. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>

tegra: Move checkboard() into the board code
This is only used by Nvidia boards, so move it into nvidia/common to simplify things. Signed-off-by: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Warren <twarren@nvidia.com>
Simon Glass · Tom Warren
1 parent db043785bb
Showing 2 changed files with 9 additions and 12 deletions Side-by-side Diff
arch/arm/mach-tegra/board.c
board/nvidia/common/board.c
@@ -98,14 +98,6 @@
 	return 0;
 }
  
-#ifdef CONFIG_DISPLAY_BOARDINFO
-int checkboard(void)
-{
-	printf("Board: %s\n", sysinfo.board_string);
-	return 0;
-}
-#endif	/* CONFIG_DISPLAY_BOARDINFO */
-
 static int uart_configs[] = {
 #if defined(CONFIG_TEGRA20)
  #if defined(CONFIG_TEGRA_UARTA_UAA_UAB)
@@ -53,10 +53,6 @@
 };
 #endif
  
-const struct tegra_sysinfo sysinfo = {
-	CONFIG_TEGRA_BOARD_STRING
-};
-
 __weak void pinmux_init(void) {}
 __weak void pin_mux_usb(void) {}
 __weak void pin_mux_spi(void) {}
@@ -84,6 +80,15 @@
 	writel(0, &pmc->pmc_pwr_det);
 #endif
 }
+
+#ifdef CONFIG_DISPLAY_BOARDINFO
+int checkboard(void)
+{
+	printf("Board: %s\n", CONFIG_TEGRA_BOARD_STRING);
+
+	return 0;
+}
+#endif	/* CONFIG_DISPLAY_BOARDINFO */
  
 /*
  * Routine: board_init
...	...	@@ -98,14 +98,6 @@
98	98	return 0;
99	99	}
100	100
101		-#ifdef CONFIG_DISPLAY_BOARDINFO
102		-int checkboard(void)
103		-{
104		- printf("Board: %s\n", sysinfo.board_string);
105		- return 0;
106		-}
107		-#endif /* CONFIG_DISPLAY_BOARDINFO */
108		-
109	101	static int uart_configs[] = {
110	102	#if defined(CONFIG_TEGRA20)
111	103	#if defined(CONFIG_TEGRA_UARTA_UAA_UAB)
...	...	@@ -53,10 +53,6 @@
53	53	};
54	54	#endif
55	55
56		-const struct tegra_sysinfo sysinfo = {
57		- CONFIG_TEGRA_BOARD_STRING
58		-};
59		-
60	56	__weak void pinmux_init(void) {}
61	57	__weak void pin_mux_usb(void) {}
62	58	__weak void pin_mux_spi(void) {}
...	...	@@ -84,6 +80,15 @@
84	80	writel(0, &pmc->pmc_pwr_det);
85	81	#endif
86	82	}
	83	+
	84	+#ifdef CONFIG_DISPLAY_BOARDINFO
	85	+int checkboard(void)
	86	+{
	87	+ printf("Board: %s\n", CONFIG_TEGRA_BOARD_STRING);
	88	+
	89	+ return 0;
	90	+}
	91	+#endif /* CONFIG_DISPLAY_BOARDINFO */
87	92
88	93	/*
89	94	* Routine: board_init