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>
This commit is contained in:
Lucas Stach
Tom Rini
parent
ac56d959a3
commit
516f00b324
|
|
@ -1,25 +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
|
||||
*/
|
||||
|
||||
void board_init_uart_f(void);
|
||||
void gpio_early_init_uart(void);
|
||||
|
|
@ -33,13 +33,13 @@
|
|||
#include <image.h>
|
||||
#include <malloc.h>
|
||||
#include <linux/compiler.h>
|
||||
#include "board.h"
|
||||
#include "cpu.h"
|
||||
|
||||
#include <asm/io.h>
|
||||
#include <asm/arch/clock.h>
|
||||
#include <asm/arch/pinmux.h>
|
||||
#include <asm/arch/tegra.h>
|
||||
#include <asm/arch-tegra/board.h>
|
||||
#include <asm/arch-tegra/clk_rst.h>
|
||||
#include <asm/arch-tegra/pmc.h>
|
||||
#include <asm/arch-tegra/scu.h>
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
#include <asm/arch/clock.h>
|
||||
#include <asm/arch/funcmux.h>
|
||||
#include <asm/arch/tegra.h>
|
||||
#include <asm/arch-tegra/board.h>
|
||||
#include <asm/arch-tegra/pmc.h>
|
||||
#include <asm/arch-tegra/sys_proto.h>
|
||||
#include <asm/arch-tegra/warmboot.h>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,24 @@
|
|||
#ifndef _TEGRA_BOARD_H_
|
||||
#define _TEGRA_BOARD_H_
|
||||
|
||||
/* Setup UARTs for the board according to the selected config */
|
||||
/* Set up pinmux to make UART usable */
|
||||
void gpio_config_uart(void); /* CONFIG_SPI_UART_SWITCH */
|
||||
void gpio_early_init_uart(void); /*!CONFIG_SPI_UART_SWITCH */
|
||||
|
||||
/* Set up early UART output */
|
||||
void board_init_uart_f(void);
|
||||
|
||||
/* Set up any early GPIOs the board might need for proper operation */
|
||||
void gpio_early_init(void); /* overrideable GPIO config */
|
||||
|
||||
/*
|
||||
* Hooks to allow boards to set up the pinmux for a specific function.
|
||||
* Has to be implemented in the board files as we don't yet support pinmux
|
||||
* setup from FTD. If a board file does not implement one of those functions
|
||||
* an empty stub function will be called.
|
||||
*/
|
||||
|
||||
void pin_mux_usb(void); /* overrideable USB pinmux setup */
|
||||
void pin_mux_spi(void); /* overrideable SPI pinmux setup */
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
|
|
@ -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 {
|
||||
|
|
|
|||
Loading…
Reference in New Issue