patch-2.4.1 linux/arch/ppc/kernel/prep_nvram.c

• Lines: 57
• Date: Mon Jan 22 15:41:15 2001
• Orig file: v2.4.0/linux/arch/ppc/kernel/prep_nvram.c
• Orig date: Thu Oct 7 10:17:08 1999

diff -u --recursive --new-file v2.4.0/linux/arch/ppc/kernel/prep_nvram.c linux/arch/ppc/kernel/prep_nvram.c
@@ -16,19 +16,9 @@
 #include <asm/machdep.h>
 #include <asm/prep_nvram.h>
 
-/*
- * Allow for a maximum of 32K of PReP NvRAM data
- */
-#define MAX_PREP_NVRAM 0x8000
 static char nvramData[MAX_PREP_NVRAM];
 static NVRAM_MAP *nvram=(NVRAM_MAP *)&nvramData[0];
 
-#define PREP_NVRAM_AS0	0x74
-#define PREP_NVRAM_AS1	0x75
-#define PREP_NVRAM_DATA	0x77
-
-unsigned char *rs_pcNvRAM;
-
 unsigned char __prep prep_nvram_read_val(int addr)
 {
 	outb(addr, PREP_NVRAM_AS0);
@@ -44,36 +34,12 @@
    	outb(val, PREP_NVRAM_DATA);
 }
   
-/*
- * Most Radstone boards have NvRAM memory mapped at offset 8M in ISA space
- */
-unsigned char __prep rs_nvram_read_val(int addr)
-{
-	return rs_pcNvRAM[addr];
-}
-  
-void __prep rs_nvram_write_val(int addr,
-			unsigned char val)
-{
-	rs_pcNvRAM[addr]=val;
-}
-  
 void __init init_prep_nvram(void)
 {
 	unsigned char *nvp;
 	int  i;
 	int  nvramSize;
 
-	/*
-	 * I'm making the assumption that 32k will always cover the
-	 * nvramsize.  If this isn't the case please let me know and we can
-	 * map the header, then get the size from the header, then map
-	 * the whole size. -- Cort
-	 */
-	if ( _prep_type == _PREP_Radstone )
-		rs_pcNvRAM = (unsigned char *)ioremap(_ISA_MEM_BASE+0x00800000,
-						      32<<10);
-	request_region(PREP_NVRAM_AS0, 0x8, "PReP NVRAM");
 	/*
 	 * The following could fail if the NvRAM were corrupt but
 	 * we expect the boot firmware to have checked its checksum