From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Mon, 30 Mar 2015 18:04:18 -0600 Subject: [U-Boot] [PATCH v4 05/25] tegra: Move checkboard() into the board code In-Reply-To: <1427760278-4573-1-git-send-email-sjg@chromium.org> References: <1427760278-4573-1-git-send-email-sjg@chromium.org> Message-ID: <1427760278-4573-6-git-send-email-sjg@chromium.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de This is only used by Nvidia boards, so move it into nvidia/common to simplify things. Signed-off-by: Simon Glass --- Changes in v4: None Changes in v3: None Changes in v2: None arch/arm/mach-tegra/board.c | 8 -------- board/nvidia/common/board.c | 13 +++++++++---- 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. -- 2.2.0.rc0.207.ga3a616c