Sfoglia il codice sorgente

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 10 anni fa
parent
commit
7d874132c4
2 ha cambiato i file con 9 aggiunte e 12 eliminazioni
  1. 0 8
      arch/arm/mach-tegra/board.c
  2. 9 4
      board/nvidia/common/board.c

+ 0 - 8
arch/arm/mach-tegra/board.c

@@ -98,14 +98,6 @@ int dram_init(void)
 	return 0;
 	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[] = {
 static int uart_configs[] = {
 #if defined(CONFIG_TEGRA20)
 #if defined(CONFIG_TEGRA20)
  #if defined(CONFIG_TEGRA_UARTA_UAA_UAB)
  #if defined(CONFIG_TEGRA_UARTA_UAA_UAB)

+ 9 - 4
board/nvidia/common/board.c

@@ -53,10 +53,6 @@ U_BOOT_DEVICE(tegra_gpios) = {
 };
 };
 #endif
 #endif
 
 
-const struct tegra_sysinfo sysinfo = {
-	CONFIG_TEGRA_BOARD_STRING
-};
-
 __weak void pinmux_init(void) {}
 __weak void pinmux_init(void) {}
 __weak void pin_mux_usb(void) {}
 __weak void pin_mux_usb(void) {}
 __weak void pin_mux_spi(void) {}
 __weak void pin_mux_spi(void) {}
@@ -85,6 +81,15 @@ static void power_det_init(void)
 #endif
 #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
  * Routine: board_init
  * Description: Early hardware init.
  * Description: Early hardware init.