summaryrefslogtreecommitdiffstats
path: root/board/nvidia/common
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2012-09-29 10:02:08 +0000
committerTom Rini <trini@ti.com>2012-10-15 11:54:07 -0700
commit516f00b3240b678947389ccfbff54a5ebcc9b941 (patch)
tree504881dc35b1c8302751d00eefa634080621ef30 /board/nvidia/common
parentac56d959a39cfe5310cd9394e65702a5cbc4c7a3 (diff)
downloadtalos-obmc-uboot-516f00b3240b678947389ccfbff54a5ebcc9b941.tar.gz
talos-obmc-uboot-516f00b3240b678947389ccfbff54a5ebcc9b941.zip
tegra: clean up board include hell
The prototypes used in board files were all scattered out, which lead to code duplication between SPL and normal U-Boot and some prototypes not actually being used. Consolidate this in a common board header. Signed-off-by: Lucas Stach <dev@lynxeye.de> Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'board/nvidia/common')
-rw-r--r--board/nvidia/common/board.c1
-rw-r--r--board/nvidia/common/board.h37
-rw-r--r--board/nvidia/common/uart-spi-switch.c2
3 files changed, 1 insertions, 39 deletions
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
index bd194bc966..dc301e741b 100644
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@@ -39,7 +39,6 @@
#include <asm/arch-tegra/warmboot.h>
#include <spi.h>
#include <i2c.h>
-#include "board.h"
#include "emc.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/board/nvidia/common/board.h b/board/nvidia/common/board.h
deleted file mode 100644
index dada4c4f9c..0000000000
--- a/board/nvidia/common/board.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * (C) Copyright 2010,2011
- * NVIDIA Corporation <www.nvidia.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef _BOARD_H_
-#define _BOARD_H_
-
-void gpio_config_uart(void);
-void gpio_early_init(void);
-void gpio_early_init_uart(void);
-
-/*
- * Set up any pin muxing needed for USB (for now, since fdt doesn't support
- * it). Boards can overwrite the default fucction which does nothing.
- */
-void pin_mux_usb(void);
-
-#endif /* BOARD_H */
diff --git a/board/nvidia/common/uart-spi-switch.c b/board/nvidia/common/uart-spi-switch.c
index a0aeb7f020..e9d445d9e2 100644
--- a/board/nvidia/common/uart-spi-switch.c
+++ b/board/nvidia/common/uart-spi-switch.c
@@ -26,7 +26,7 @@
#include <asm/arch/uart-spi-switch.h>
#include <asm/arch/tegra.h>
#include <asm/arch-tegra/tegra_spi.h>
-
+#include <asm/arch-tegra/board.h>
/* position of the UART/SPI select switch */
enum spi_uart_switch {
OpenPOWER on IntegriCloud