[flashrom] [commit] r1095 - trunk

[repository service]

Author: hailfinger
Date: Wed Jul 21 17:12:07 2010
New Revision: 1095
URL: http://flashrom.org/trac/coreboot/changeset/1095

Log:
Add nicnatsemi to print.c and print_wiki.c.
Change the nicnatsemi address mask to use MA0-MA16 and set the maximum
decode size to 128KB.

Signed-off-by: Andrew Morgan 
Acked-by: Carl-Daniel Hailfinger

Modified:
   trunk/nicnatsemi.c
   trunk/print.c
   trunk/print_wiki.c

Modified: trunk/nicnatsemi.c
==============================================================================
--- trunk/nicnatsemi.c	Wed Jul 21 17:02:22 2010	(r1094)
+++ trunk/nicnatsemi.c	Wed Jul 21 17:12:07 2010	(r1095)
@@ -43,6 +43,14 @@

buses_supported = CHIP_BUSTYPE_PARALLEL;

+	/* The datasheet shows address lines MA0-MA16 in one place and MA0-MA15
+	 * in another. My NIC has MA16 connected to A16 on the boot ROM socket
+	 * so I'm assuming it is accessible. If not then next line wants to be
+	 * max_rom_decode.parallel = 65536; and the mask in the read/write
+	 * functions below wants to be 0x0000FFFF.
+	 */
+	max_rom_decode.parallel = 131072;
+
    return 0;
 }

@@ -55,7 +63,7 @@

void nicnatsemi_chip_writeb(uint8_t val, chipaddr addr)
 {
-	OUTL((uint32_t)addr & 0x0000FFFF, io_base_addr + BOOT_ROM_ADDR);
+	OUTL((uint32_t)addr & 0x0001FFFF, io_base_addr + BOOT_ROM_ADDR);
    /*
     * The datasheet requires 32 bit accesses to this register, but it seems
     * that requirement might only apply if the register is memory mapped.
@@ -69,7 +77,7 @@

uint8_t nicnatsemi_chip_readb(const chipaddr addr)
 {
-	OUTL(((uint32_t)addr & 0x0000FFFF), io_base_addr + BOOT_ROM_ADDR);
+	OUTL(((uint32_t)addr & 0x0001FFFF), io_base_addr + BOOT_ROM_ADDR);
    /*
     * The datasheet requires 32 bit accesses to this register, but it seems
     * that requirement might only apply if the register is memory mapped.

Modified: trunk/print.c
==============================================================================
--- trunk/print.c	Wed Jul 21 17:02:22 2010	(r1094)
+++ trunk/print.c	Wed Jul 21 17:12:07 2010	(r1095)
@@ -228,7 +228,7 @@
    	print_supported_boards_helper(boards_known, "boards");
    	print_supported_boards_helper(laptops_known, "laptops");
 #endif
-#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT >= 1
+#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT >= 1
    	printf("\nSupported PCI devices flashrom can use "
    	       "as programmer:\n\n");
 #endif
@@ -239,6 +239,9 @@
    	print_supported_pcidevs(nics_realtek);
    	print_supported_pcidevs(nics_realteksmc1211);
 #endif
+#if CONFIG_NICNATSEMI == 1
+		print_supported_pcidevs(nics_natsemi);
+#endif
 #if CONFIG_GFXNVIDIA == 1
    	print_supported_pcidevs(gfx_nvidia);
 #endif

Modified: trunk/print_wiki.c
==============================================================================
--- trunk/print_wiki.c	Wed Jul 21 17:02:22 2010	(r1094)
+++ trunk/print_wiki.c	Wed Jul 21 17:12:07 2010	(r1095)
@@ -280,6 +280,9 @@
    print_supported_pcidevs_wiki(nics_realtek);
    print_supported_pcidevs_wiki(nics_realteksmc1211);
 #endif
+#if CONFIG_NICNATSEMI == 1
+	print_supported_pcidevs_wiki(nics_natsemi);
+#endif
 #if CONFIG_GFXNVIDIA == 1
    print_supported_pcidevs_wiki(gfx_nvidia);
 #endif