* [PATCH 1/2] MIPS: Octeon: Update struct cvmx_bootinfo to v3.
@ 2011-11-10 23:09 ddaney.cavm
2011-11-15 13:59 ` Ralf Baechle
0 siblings, 1 reply; 2+ messages in thread
From: ddaney.cavm @ 2011-11-10 23:09 UTC (permalink / raw)
To: linux-mips, ralf; +Cc: David Daney
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] MIPS: Octeon: Update struct cvmx_bootinfo to v3.
2011-11-10 23:09 [PATCH 1/2] MIPS: Octeon: Update struct cvmx_bootinfo to v3 ddaney.cavm
@ 2011-11-15 13:59 ` Ralf Baechle
0 siblings, 0 replies; 2+ messages in thread
From: Ralf Baechle @ 2011-11-15 13:59 UTC (permalink / raw)
To: ddaney.cavm; +Cc: linux-mips, David Daney
Queued for 3.3. Thanks,
Ralf
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-11-15 13:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-10 23:09 [PATCH 1/2] MIPS: Octeon: Update struct cvmx_bootinfo to v3 ddaney.cavm
2011-11-15 13:59 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox