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 /arch/arm/cpu/armv7 | |
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 'arch/arm/cpu/armv7')
-rw-r--r-- | arch/arm/cpu/armv7/tegra-common/cmd_enterrcm.c | 4 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/tegra20/usb.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/cpu/armv7/tegra-common/cmd_enterrcm.c b/arch/arm/cpu/armv7/tegra-common/cmd_enterrcm.c index 925f841..f74ddcb 100644 --- a/arch/arm/cpu/armv7/tegra-common/cmd_enterrcm.c +++ b/arch/arm/cpu/armv7/tegra-common/cmd_enterrcm.c @@ -40,8 +40,8 @@ */ #include <common.h> -#include <asm/arch/tegra20.h> -#include <asm/arch/pmc.h> +#include <asm/arch/tegra.h> +#include <asm/arch-tegra/pmc.h> static int do_enterrcm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) diff --git a/arch/arm/cpu/armv7/tegra20/usb.c b/arch/arm/cpu/armv7/tegra20/usb.c index 1b52b16..1bccf2b 100644 --- a/arch/arm/cpu/armv7/tegra20/usb.c +++ b/arch/arm/cpu/armv7/tegra20/usb.c @@ -24,15 +24,15 @@ #include <common.h> #include <asm/io.h> #include <asm-generic/gpio.h> -#include <asm/arch/tegra20.h> -#include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> #include <asm/arch/gpio.h> #include <asm/arch/pinmux.h> -#include <asm/arch/sys_proto.h> -#include <asm/arch/uart.h> +#include <asm/arch/tegra.h> #include <asm/arch/usb.h> #include <usb/ulpi.h> +#include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra/sys_proto.h> +#include <asm/arch-tegra/uart.h> #include <libfdt.h> #include <fdtdec.h> |