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/arm720t | |
| 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/arm720t')
| -rw-r--r-- | arch/arm/cpu/arm720t/tegra-common/spl.c | 12 | ||||
| -rw-r--r-- | arch/arm/cpu/arm720t/tegra20/cpu.c | 10 |
2 files changed, 10 insertions, 12 deletions
diff --git a/arch/arm/cpu/arm720t/tegra-common/spl.c b/arch/arm/cpu/arm720t/tegra-common/spl.c index 6c16dce..3139c65 100644 --- a/arch/arm/cpu/arm720t/tegra-common/spl.c +++ b/arch/arm/cpu/arm720t/tegra-common/spl.c @@ -25,8 +25,6 @@ #include <common.h> #include <asm/u-boot.h> #include <asm/utils.h> -#include <asm/arch/sys_proto.h> -#include <asm/arch/clock.h> #include <nand.h> #include <mmc.h> #include <fat.h> @@ -39,13 +37,13 @@ #include "cpu.h" #include <asm/io.h> -#include <asm/arch/tegra20.h> -#include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> -#include <asm/arch/pmc.h> #include <asm/arch/pinmux.h> -#include <asm/arch/scu.h> -#include <common.h> +#include <asm/arch/tegra.h> +#include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra/pmc.h> +#include <asm/arch-tegra/scu.h> +#include <asm/arch-tegra/sys_proto.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/cpu/arm720t/tegra20/cpu.c b/arch/arm/cpu/arm720t/tegra20/cpu.c index 8b72938..ef7f375 100644 --- a/arch/arm/cpu/arm720t/tegra20/cpu.c +++ b/arch/arm/cpu/arm720t/tegra20/cpu.c @@ -21,14 +21,14 @@ * MA 02111-1307 USA */ +#include <common.h> #include <asm/io.h> -#include <asm/arch/tegra20.h> -#include <asm/arch/clk_rst.h> #include <asm/arch/clock.h> -#include <asm/arch/pmc.h> #include <asm/arch/pinmux.h> -#include <asm/arch/scu.h> -#include <common.h> +#include <asm/arch/tegra.h> +#include <asm/arch-tegra/clk_rst.h> +#include <asm/arch-tegra/pmc.h> +#include <asm/arch-tegra/scu.h> #include "../tegra-common/cpu.h" /* Returns 1 if the current CPU executing is a Cortex-A9, else 0 */ |