linux-mips
[Top] [All Lists]

[PATCH 1/2] MIPS: Octeon: Update struct cvmx_bootinfo to v3.

To: linux-mips@linux-mips.org, ralf@linux-mips.org
Subject: [PATCH 1/2] MIPS: Octeon: Update struct cvmx_bootinfo to v3.
From: ddaney.cavm@gmail.com
Date: Thu, 10 Nov 2011 15:09:10 -0800
Cc: David Daney <david.daney@cavium.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=yyEoXXxKt011ZaIxsCU9nV2aFC2ATjrNR7uzjhIkZu8=; b=T/d+RXTFXHl6mNAWBqmKUBFw9gEze+mQDm87Z5Gbn/AC+34dJfvDOi1x0VvdlnbAZJ lzXU+gVGPjFS6eFpP1E45DKnPHw71LNtDgwZkWKFIIDk8VW73tN+YoISM7N9jYv+hi71 psz785pV62iC42svulH+zShuN1sMnptocdH2Q=
Sender: linux-mips-bounce@linux-mips.org
From: David Daney <david.daney@cavium.com>

Bootloaders can pass version 3 of this structure.  Add the new fields
so we can support the Device Tree.

Signed-off-by: David Daney <david.daney@cavium.com>
---
 arch/mips/include/asm/octeon/cvmx-bootinfo.h |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h 
b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
index 4e4c3a8..d9d1668 100644
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
@@ -39,7 +39,7 @@
  * versions.
  */
 #define CVMX_BOOTINFO_MAJ_VER 1
-#define CVMX_BOOTINFO_MIN_VER 2
+#define CVMX_BOOTINFO_MIN_VER 3
 
 #if (CVMX_BOOTINFO_MAJ_VER == 1)
 #define CVMX_BOOTINFO_OCTEON_SERIAL_LEN 20
@@ -116,7 +116,13 @@ struct cvmx_bootinfo {
         */
        uint32_t config_flags;
 #endif
-
+#if (CVMX_BOOTINFO_MIN_VER >= 3)
+       /*
+        * Address of the OF Flattened Device Tree structure
+        * describing the board.
+        */
+       uint64_t fdt_addr;
+#endif
 };
 
 #define CVMX_BOOTINFO_CFG_FLAG_PCI_HOST                        (1ull << 0)
-- 
1.7.2.3


<Prev in Thread] Current Thread [Next in Thread>