diff options
| author | Tom Warren <twarren@nvidia.com> | 2012-09-19 15:50:56 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-15 11:54:06 -0700 |
| commit | 150c24936b70ce36e11069038ba8e955704cab3a (patch) | |
| tree | 94d6182f158e0dd79bff1a79d05af0297cbba58b /board/nvidia/common | |
| parent | 3064f322783241f83b8e25b5acdd97a0d898a970 (diff) | |
| download | u-boot-imx-150c24936b70ce36e11069038ba8e955704cab3a.zip u-boot-imx-150c24936b70ce36e11069038ba8e955704cab3a.tar.gz u-boot-imx-150c24936b70ce36e11069038ba8e955704cab3a.tar.bz2 | |
Tegra20: Move some include files to arch-tegra for sharing with Tegra30
The move is pretty straight-forward. ap20.h and tegra20.h were renamed to ap.h and tegra.h.
Some files remain in arch-tegra20 but 'include' a file in 'arch-tegra' with #defines & structs
that will be common between T20 and T30 HW. HW-specific #defines, etc. stay in the 'arch-tegra20'
'root' file.
All boards build OK w/MAKEALL -s tegra20. Checkpatch.pl runs clean. Seaboard works OK.
Signed-off-by: Tom Warren <twarren@nvidia.com>
Diffstat (limited to 'board/nvidia/common')
| -rw-r--r-- | board/nvidia/common/board.c | 17 | ||||
| -rw-r--r-- | board/nvidia/common/emc.c | 8 | ||||
| -rw-r--r-- | board/nvidia/common/uart-spi-switch.c | 4 |
3 files changed, 14 insertions, 15 deletions
diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index afe832a..8821fdf 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -25,20 +25,19 @@ #include <ns16550.h> #include <linux/compiler.h> #include <asm/io.h> -#include <asm/arch/tegra20.h> -#include <asm/arch/sys_proto.h> - -#include <asm/arch/board.h> -#include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/emc.h> #include <asm/arch/pinmux.h> -#include <asm/arch/pmc.h> #include <asm/arch/pmu.h> -#include <asm/arch/uart.h> -#include <asm/arch/warmboot.h> -#include <spi.h> +#include <asm/arch/tegra.h> #include <asm/arch/usb.h> +#include <asm/arch-tegra/board.h> +#include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra/pmc.h> +#include <asm/arch-tegra/sys_proto.h> +#include <asm/arch-tegra/uart.h> +#include <asm/arch-tegra/warmboot.h> +#include <spi.h> #include <i2c.h> #include "board.h" #include "emc.h" diff --git a/board/nvidia/common/emc.c b/board/nvidia/common/emc.c index 739d4bd..26b6ec7 100644 --- a/board/nvidia/common/emc.c +++ b/board/nvidia/common/emc.c @@ -22,13 +22,13 @@ #include <common.h> #include <asm/io.h> -#include <asm/arch/ap20.h> -#include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/emc.h> #include <asm/arch/pmu.h> -#include <asm/arch/sys_proto.h> -#include <asm/arch/tegra20.h> +#include <asm/arch/tegra.h> +#include <asm/arch-tegra/ap.h> +#include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra/sys_proto.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/board/nvidia/common/uart-spi-switch.c b/board/nvidia/common/uart-spi-switch.c index 6b21758..a0aeb7f 100644 --- a/board/nvidia/common/uart-spi-switch.c +++ b/board/nvidia/common/uart-spi-switch.c @@ -24,8 +24,8 @@ #include <asm/gpio.h> #include <asm/arch/pinmux.h> #include <asm/arch/uart-spi-switch.h> -#include <asm/arch/tegra20.h> -#include <asm/arch/tegra_spi.h> +#include <asm/arch/tegra.h> +#include <asm/arch-tegra/tegra_spi.h> /* position of the UART/SPI select switch */ |