From 42c23da437b457743645733170aa8fdcbb80c4ff Mon Sep 17 00:00:00 2001
From: tkasivajhula <tkasivajhula@nvidia.com>
Date: Tue, 19 Jan 2010 15:45:25 -0800
Subject: tegra power: Add Warmboot boot arg to the kernel

The new NvBootArg_Warmboot argument allows the bootloader to pass
a memory region containing the warm bootloader to the kernel.

Change-Id: Ib8c2a45c64ae9e61240152e91c5cbcff421ada21
---
 arch/arm/mach-tegra/include/nvbootargs.h | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'arch/arm/mach-tegra/include')

diff --git a/arch/arm/mach-tegra/include/nvbootargs.h b/arch/arm/mach-tegra/include/nvbootargs.h
index 7dc32a8a3204..908c26f0ea52 100644
--- a/arch/arm/mach-tegra/include/nvbootargs.h
+++ b/arch/arm/mach-tegra/include/nvbootargs.h
@@ -44,7 +44,7 @@
  * The maximum number of memory handles that may be preserved across the
  * bootloader-to-OS transition.  @see NvRmBootArg_PreservedMemHandle.
  */
-#define NV_BOOTARGS_MAX_PRESERVED_MEMHANDLES 2
+#define NV_BOOTARGS_MAX_PRESERVED_MEMHANDLES 3
 
 #if defined(__cplusplus)
 extern "C"
@@ -60,6 +60,7 @@ typedef enum
     NvBootArgKey_ChipShmoo,
     NvBootArgKey_ChipShmooPhys,
     NvBootArgKey_Carveout,
+    NvBootArgKey_WarmBoot,
     NvBootArgKey_PreservedMemHandle_0 = 0x10000,
     NvBootArgKey_PreservedMemHandle_Num = (NvBootArgKey_PreservedMemHandle_0 +
                                          NV_BOOTARGS_MAX_PRESERVED_MEMHANDLES),
@@ -86,6 +87,16 @@ typedef struct NvBootArgsCarveoutRec
     NvU32 size;
 } NvBootArgsCarveout;
 
+/**
+ * Warmbootloader boot args. This structure only contains
+ * a mem handle key to preserve the warm bootloader
+ * across the bootloader->os transition
+ */
+typedef struct NvBootArgsWarmbootRec
+{
+    NvU32 MemHandleKey;
+} NvBootArgsWarmboot;
+
 /**
  * PreservedMemHandle boot args, indexed by PreservedMemHandle_0 + n.
  * All values n from 0 to the first value which does not return NvSuccess will
@@ -212,6 +223,7 @@ typedef struct NvBootArgsRec
     NvBootArgsFramebuffer FramebufferArgs;
     NvBootArgsChipShmoo ChipShmooArgs;
     NvBootArgsChipShmooPhys ChipShmooPhysArgs;
+    NvBootArgsWarmboot WarmbootArgs;
     NvBootArgsPreservedMemHandle MemHandleArgs[NVBOOTARG_NUM_PRESERVED_HANDLES];
 } NvBootArgs;
 
-- 
cgit v1.2.3