[U-Boot] [PATCH 22/60] ARM: tegra: move warmboot.h

Stephen Warren
2016-04-19T20:59:02Z

From: Stephen Warren <swarren@nvidia.com>

This header is only needed by code local to mach-tegra, so move it there
to avoid polluting the global include path.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
arch/arm/mach-tegra/ap.c | 1 -
arch/arm/mach-tegra/board.c | 1 -
arch/arm/mach-tegra/board2.c | 4 +++-
arch/arm/mach-tegra/tegra20/warmboot.c | 2 +-
arch/arm/{include/asm/arch-tegra => mach-tegra/tegra20}/warmboot.h | 4 ++--
arch/arm/mach-tegra/tegra20/warmboot_avp.c | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
rename arch/arm/{include/asm/arch-tegra => mach-tegra/tegra20}/warmboot.h (98%)

diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c
index 386ca72707e8..4cb6367cd0a4 100644
--- a/arch/arm/mach-tegra/ap.c
+++ b/arch/arm/mach-tegra/ap.c
@@ -14,7 +14,6 @@
#include <asm/arch/mc.h>
#include <asm/arch-tegra/clock.h>
#include <asm/arch-tegra/tegra.h>
-#include <asm/arch-tegra/warmboot.h>
#include "cpu.h"
#include "fuse.h"
#include "pmc.h"
diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index 2f80e2e0c696..cf65ece060dd 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -16,7 +16,6 @@
#include <asm/arch/tegra.h>
#include <asm/arch-tegra/board.h>
#include <asm/arch-tegra/sys_proto.h>
-#include <asm/arch-tegra/warmboot.h>
#include "pmc.h"

void save_boot_params_ret(void);
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c
index c630fd18fdfe..b1db5febd199 100644
--- a/arch/arm/mach-tegra/board2.c
+++ b/arch/arm/mach-tegra/board2.c
@@ -20,7 +20,6 @@
#include <asm/arch-tegra/board.h>
#include <asm/arch-tegra/clk_rst.h>
#include <asm/arch-tegra/sys_proto.h>
-#include <asm/arch-tegra/warmboot.h>
#ifdef CONFIG_TEGRA_CLOCK_SCALING
#include <asm/arch/emc.h>
#endif
@@ -38,6 +37,9 @@
#include "emc.h"
#include "gpu.h"
#include "pmc.h"
+#ifdef CONFIG_TEGRA_LP0
+#include "tegra20/warmboot.h"
+#endif

DECLARE_GLOBAL_DATA_PTR;

diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c
index 5a0390b72a4a..956eb96f027f 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot.c
@@ -15,11 +15,11 @@
#include <asm/arch/sdram_param.h>
#include <asm/arch/tegra.h>
#include <asm/arch-tegra/clk_rst.h>
-#include <asm/arch-tegra/warmboot.h>
#include "../apb_misc.h"
#include "../fuse.h"
#include "../pmc.h"
#include "crypto.h"
+#include "warmboot.h"

DECLARE_GLOBAL_DATA_PTR;

diff --git a/arch/arm/include/asm/arch-tegra/warmboot.h b/arch/arm/mach-tegra/tegra20/warmboot.h
similarity index 98%
rename from arch/arm/include/asm/arch-tegra/warmboot.h
rename to arch/arm/mach-tegra/tegra20/warmboot.h
index b6326c8f7b11..5651d28ad487 100644
--- a/arch/arm/include/asm/arch-tegra/warmboot.h
+++ b/arch/arm/mach-tegra/tegra20/warmboot.h
@@ -5,8 +5,8 @@
* SPDX-License-Identifier: GPL-2.0+
*/

-#ifndef _WARM_BOOT_H_
-#define _WARM_BOOT_H_
+#ifndef _TEGRA20_WARMBOOT_H
+#define _TEGRA20_WARMBOOT_H

#define STRAP_OPT_A_RAM_CODE_SHIFT 4
#define STRAP_OPT_A_RAM_CODE_MASK (0xf << STRAP_OPT_A_RAM_CODE_SHIFT)
diff --git a/arch/arm/mach-tegra/tegra20/warmboot_avp.c b/arch/arm/mach-tegra/tegra20/warmboot_avp.c
index d7f03c29df86..f204582b99b8 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot_avp.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot_avp.c
@@ -12,10 +12,10 @@
#include <asm/arch/pinmux.h>
#include <asm/arch/tegra.h>
#include <asm/arch-tegra/clk_rst.h>
-#include <asm/arch-tegra/warmboot.h>
#include "../apb_misc.h"
#include "../cpu.h"
#include "../pmc.h"
+#include "warmboot.h"
#include "warmboot_avp.h"

#define DEBUG_RESET_CORESIGHT
--
2.8.1