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/tegra-common | |
| parent | 3064f322783241f83b8e25b5acdd97a0d898a970 (diff) | |
| download | talos-obmc-uboot-150c24936b70ce36e11069038ba8e955704cab3a.tar.gz talos-obmc-uboot-150c24936b70ce36e11069038ba8e955704cab3a.zip | |
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/tegra-common')
| -rw-r--r-- | arch/arm/cpu/tegra-common/ap.c | 12 | ||||
| -rw-r--r-- | arch/arm/cpu/tegra-common/board.c | 8 | ||||
| -rw-r--r-- | arch/arm/cpu/tegra-common/timer.c | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/cpu/tegra-common/ap.c b/arch/arm/cpu/tegra-common/ap.c index c0ca6eb379..c4eb137480 100644 --- a/arch/arm/cpu/tegra-common/ap.c +++ b/arch/arm/cpu/tegra-common/ap.c @@ -20,14 +20,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA */ +#include <common.h> #include <asm/io.h> -#include <asm/arch/ap20.h> -#include <asm/arch/fuse.h> #include <asm/arch/gp_padctrl.h> -#include <asm/arch/pmc.h> -#include <asm/arch/scu.h> -#include <asm/arch/warmboot.h> -#include <common.h> +#include <asm/arch-tegra/ap.h> +#include <asm/arch-tegra/fuse.h> +#include <asm/arch-tegra/pmc.h> +#include <asm/arch-tegra/scu.h> +#include <asm/arch-tegra/warmboot.h> int tegra_get_chip_type(void) { diff --git a/arch/arm/cpu/tegra-common/board.c b/arch/arm/cpu/tegra-common/board.c index 8a8d3384ac..ff90a529f7 100644 --- a/arch/arm/cpu/tegra-common/board.c +++ b/arch/arm/cpu/tegra-common/board.c @@ -25,10 +25,10 @@ #include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/funcmux.h> -#include <asm/arch/pmc.h> -#include <asm/arch/sys_proto.h> -#include <asm/arch/tegra20.h> -#include <asm/arch/warmboot.h> +#include <asm/arch/tegra.h> +#include <asm/arch-tegra/pmc.h> +#include <asm/arch-tegra/sys_proto.h> +#include <asm/arch-tegra/warmboot.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/tegra-common/timer.c b/arch/arm/cpu/tegra-common/timer.c index 562e414012..034ea5ad28 100644 --- a/arch/arm/cpu/tegra-common/timer.c +++ b/arch/arm/cpu/tegra-common/timer.c @@ -37,8 +37,8 @@ #include <common.h> #include <asm/io.h> -#include <asm/arch/tegra20.h> -#include <asm/arch/timer.h> +#include <asm/arch/tegra.h> +#include <asm/arch-tegra/timer.h> DECLARE_GLOBAL_DATA_PTR; |
