diff options
| author | Simon Glass <sjg@chromium.org> | 2011-09-30 09:42:47 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-10-04 14:51:12 -0700 |
| commit | 4dff236509a08ed332c2ad6af4736a8e51611791 (patch) | |
| tree | 56612304e2cb5b8d2463cc96939791d0b3bdbe98 | |
| parent | fe36a067d1816560b5017bf8733346ba7171f84d (diff) | |
tegra: Make warmboot.h a common file
This is needed by both T2x and T3x.
BUG=chromium-os:19004
TEST=build and boot on seaboard
Change-Id: I896719336126346c540bbae0c0559302189460ef
Reviewed-on: http://gerrit.chromium.org/gerrit/8641
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | arch/arm/cpu/armv7/tegra-common/ap20.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra2/warmboot.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra2/warmboot_avp.c | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-tegra/warmboot.h (renamed from arch/arm/include/asm/arch-tegra2/warmboot.h) | 1 | ||||
| -rw-r--r-- | board/nvidia/common/board.c | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/cpu/armv7/tegra-common/ap20.c b/arch/arm/cpu/armv7/tegra-common/ap20.c index 59a3e8a5699..cc3afaa77a8 100644 --- a/arch/arm/cpu/armv7/tegra-common/ap20.c +++ b/arch/arm/cpu/armv7/tegra-common/ap20.c @@ -30,7 +30,7 @@ #include <asm/arch/pinmux.h> #include <asm/arch-tegra/scu.h> #include <common.h> -#include <asm/arch/warmboot.h> +#include <asm/arch-tegra/warmboot.h> #include <asm/arch-tegra/ap20.h> #include "../../../../../board/nvidia/common/board.h" diff --git a/arch/arm/cpu/armv7/tegra2/warmboot.c b/arch/arm/cpu/armv7/tegra2/warmboot.c index 0c79e3004dc..69c01d297b1 100644 --- a/arch/arm/cpu/armv7/tegra2/warmboot.c +++ b/arch/arm/cpu/armv7/tegra2/warmboot.c @@ -37,7 +37,7 @@ #include <asm/arch-tegra/pmc.h> #include <asm/arch/sdram_param.h> #include <asm/arch/tegra.h> -#include <asm/arch/warmboot.h> +#include <asm/arch-tegra/warmboot.h> #define BCT_OFFSET 0x100 /* BCT starts at 0x100 */ #define BCT_SDRAM_PARAMS_OFFSET (BCT_OFFSET + 0x88) diff --git a/arch/arm/cpu/armv7/tegra2/warmboot_avp.c b/arch/arm/cpu/armv7/tegra2/warmboot_avp.c index 66b829e06c3..34b19b03e16 100644 --- a/arch/arm/cpu/armv7/tegra2/warmboot_avp.c +++ b/arch/arm/cpu/armv7/tegra2/warmboot_avp.c @@ -29,7 +29,7 @@ #include <asm/arch-tegra/pmc.h> #include <asm/arch/tegra.h> #include <asm/arch/flow.h> -#include <asm/arch/warmboot.h> +#include <asm/arch-tegra/warmboot.h> #include <asm/arch-tegra/ap20.h> #include "warmboot_avp.h" diff --git a/arch/arm/include/asm/arch-tegra2/warmboot.h b/arch/arm/include/asm/arch-tegra/warmboot.h index 249a30dc51e..a47b21ef1a7 100644 --- a/arch/arm/include/asm/arch-tegra2/warmboot.h +++ b/arch/arm/include/asm/arch-tegra/warmboot.h @@ -78,4 +78,3 @@ void wb_start(void); /* Start of WB assembly code */ void wb_end(void); /* End of WB assembly code */ #endif - diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 0bc82d99f27..b6040ce9349 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -33,6 +33,7 @@ #include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/uart.h> +#include <asm/arch-tegra/warmboot.h> #include <asm/arch/clock.h> #ifdef CONFIG_TEGRA2 #include <asm/arch/emc.h> @@ -42,7 +43,6 @@ #include <asm/arch/sys_proto.h> #ifdef CONFIG_TEGRA2 #include <asm/arch/usb.h> -#include <asm/arch/warmboot.h> #endif #include <asm/arch/tegra.h> |