summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/tegra20-common/warmboot_avp.c
diff options
context:
space:
mode:
authorTom Warren <twarren@nvidia.com>2012-09-19 15:50:56 -0700
committerTom Rini <trini@ti.com>2012-10-15 11:54:06 -0700
commit150c24936b70ce36e11069038ba8e955704cab3a (patch)
tree94d6182f158e0dd79bff1a79d05af0297cbba58b /arch/arm/cpu/tegra20-common/warmboot_avp.c
parent3064f322783241f83b8e25b5acdd97a0d898a970 (diff)
downloadu-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/tegra20-common/warmboot_avp.c')
-rw-r--r--arch/arm/cpu/tegra20-common/warmboot_avp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/cpu/tegra20-common/warmboot_avp.c b/arch/arm/cpu/tegra20-common/warmboot_avp.c
index 80a5a15..bc6281d 100644
--- a/arch/arm/cpu/tegra20-common/warmboot_avp.c
+++ b/arch/arm/cpu/tegra20-common/warmboot_avp.c
@@ -23,14 +23,14 @@
#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/flow.h>
#include <asm/arch/pinmux.h>
-#include <asm/arch/pmc.h>
-#include <asm/arch/tegra20.h>
-#include <asm/arch/warmboot.h>
+#include <asm/arch/tegra.h>
+#include <asm/arch-tegra/ap.h>
+#include <asm/arch-tegra/clk_rst.h>
+#include <asm/arch-tegra/pmc.h>
+#include <asm/arch-tegra/warmboot.h>
#include "warmboot_avp.h"
#define DEBUG_RESET_CORESIGHT
@@ -58,7 +58,7 @@ void wb_start(void)
/* no input, no clobber list */
);
- if (reg != AP20_WB_RUN_ADDRESS)
+ if (reg != NV_WB_RUN_ADDRESS)
goto do_reset;
/* Are we running with AVP? */