浏览代码

[POWERPC] Maple: use mmio nvram

Some systems supported by the maple platform (e.g. JS2x blades running
SLOF) are able to use the mmio_nvram backend for reading and writing
nvram.  This is an improvement over the current situation -- no nvram
access from userspace at all.

Select MMIO_NVRAM for the maple platform.

Initialize the mmio_nvram backend from maple setup code.

Signed-off-by: Nathan Lynch <ntl@pobox.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Nathan Lynch 18 年之前
父节点
当前提交
4297c9869b
共有 2 个文件被更改,包括 4 次插入0 次删除
  1. 1 0
      arch/powerpc/Kconfig
  2. 3 0
      arch/powerpc/platforms/maple/setup.c

+ 1 - 0
arch/powerpc/Kconfig

@@ -491,6 +491,7 @@ config PPC_MAPLE
 	select PPC_970_NAP
 	select PPC_970_NAP
 	select PPC_NATIVE
 	select PPC_NATIVE
 	select PPC_RTAS
 	select PPC_RTAS
+	select MMIO_NVRAM
 	default n
 	default n
 	help
 	help
           This option enables support for the Maple 970FX Evaluation Board.
           This option enables support for the Maple 970FX Evaluation Board.

+ 3 - 0
arch/powerpc/platforms/maple/setup.c

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