summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-04-14 21:03:24 -0600
committerTom Warren <twarren@nvidia.com>2015-05-13 09:24:07 -0700
commit7d874132c45ef21ea56350e941362b6a45f16747 (patch)
tree26ab28b455eedaade95f68a87c15590fc937b007
parentdb043785bbceb708a353593098d8af01cab35d05 (diff)
downloadu-boot-imx-7d874132c45ef21ea56350e941362b6a45f16747.zip
u-boot-imx-7d874132c45ef21ea56350e941362b6a45f16747.tar.gz
u-boot-imx-7d874132c45ef21ea56350e941362b6a45f16747.tar.bz2
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>
-rw-r--r--arch/arm/mach-tegra/board.c8
-rw-r--r--board/nvidia/common/board.c13
2 files changed, 9 insertions, 12 deletions
diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index 0ebaf19..222de6a 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -98,14 +98,6 @@ int dram_init(void)
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)
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
index 018dddb..f1a9496 100644
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@@ -53,10 +53,6 @@ U_BOOT_DEVICE(tegra_gpios) = {
};
#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) {}
@@ -85,6 +81,15 @@ static void power_det_init(void)
#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
* Description: Early hardware init.