---

yaml --- r: 46877 b: refs/heads/master c: 4297c98 h: refs/heads/master i: 46875: 253c48a v: v3
git-mirror · Feb 7, 2007 · 890fc88 · 890fc88
1 parent 30bec3f
commit 890fc88
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 721e0c9037ef4e755f3bd87fee92beff452be420
+refs/heads/master: 4297c9869b3452860f1a2c588d43f9e62c701019
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
@@ -491,6 +491,7 @@ config PPC_MAPLE
 	select PPC_970_NAP
 	select PPC_NATIVE
 	select PPC_RTAS
+	select MMIO_NVRAM
 	default n
 	help
           This option enables support for the Maple 970FX Evaluation Board.

diff --git a/trunk/arch/powerpc/platforms/maple/setup.c b/trunk/arch/powerpc/platforms/maple/setup.c
@@ -62,6 +62,7 @@
 #include <asm/mpic.h>
 #include <asm/rtas.h>
 #include <asm/udbg.h>
+#include <asm/nvram.h>
 
 #include "maple.h"
 
@@ -195,6 +196,8 @@ void __init maple_setup_arch(void)
 	maple_use_rtas_reboot_and_halt_if_present();
 
 	printk(KERN_DEBUG "Using native/NAP idle loop\n");
+
+	mmio_nvram_init();
 }
 
 /*