Author: stepan Date: 2007-02-06 20:47:50 +0100 (Tue, 06 Feb 2007) New Revision: 2550
Modified: trunk/LinuxBIOSv2/util/flashrom/82802ab.c trunk/LinuxBIOSv2/util/flashrom/Makefile trunk/LinuxBIOSv2/util/flashrom/flash.h trunk/LinuxBIOSv2/util/flashrom/flash_enable.c trunk/LinuxBIOSv2/util/flashrom/flash_rom.c trunk/LinuxBIOSv2/util/flashrom/lbtable.c trunk/LinuxBIOSv2/util/flashrom/sharplhf00l04.c trunk/LinuxBIOSv2/util/flashrom/sst49lfxxxc.c trunk/LinuxBIOSv2/util/flashrom/sst_fwhub.c Log: This patch is a rework of Adam Kaufman's Solaris patch.
* flash.h: - add a license header - add system definitions * flash_enable.c: - put io priviledge access in one single place - add includes required for Solaris. * lbtable.c, flash_rom.c, 82802ab.c: - use MEM_DEV so it works on Solaris * sst49lfxxxc.c, sharplhf00l04.c, sst_fwhub.c, 82802ab.c - drop unneeded include to sys/io.h * Makefile - adapt to Solaris specifics.
Signed-off-by: Adam Kaufman adam.kaufman@pinnacle.com Signed-off-by: Stefan Reinauer stepan@coresystems.de Acked-by: Stefan Reinauer stepan@coresystems.de Acked-by: Adam Kaufman adam.kaufman@pinnacle.com
Modified: trunk/LinuxBIOSv2/util/flashrom/82802ab.c =================================================================== --- trunk/LinuxBIOSv2/util/flashrom/82802ab.c 2007-02-03 15:28:20 UTC (rev 2549) +++ trunk/LinuxBIOSv2/util/flashrom/82802ab.c 2007-02-06 19:47:50 UTC (rev 2550) @@ -26,7 +26,6 @@ #include <errno.h> #include <fcntl.h> #include <sys/mman.h> -#include <sys/io.h> #include <unistd.h> #include <stdio.h> #include <stdlib.h> @@ -83,7 +82,7 @@ flash->fd_mem, (off_t) (0 - 0x400000 - size)); if (bios == MAP_FAILED) { // it's this part but we can't map it ... - perror("Error MMAP /dev/mem"); + perror("Error MMAP memory using " MEM_DEV ); exit(1); }
Modified: trunk/LinuxBIOSv2/util/flashrom/Makefile =================================================================== --- trunk/LinuxBIOSv2/util/flashrom/Makefile 2007-02-03 15:28:20 UTC (rev 2549) +++ trunk/LinuxBIOSv2/util/flashrom/Makefile 2007-02-06 19:47:50 UTC (rev 2550) @@ -12,9 +12,14 @@ PREFIX = /usr/local #CFLAGS = -O2 -g -Wall -Werror CFLAGS = -Os -Wall -Werror -DDISABLE_DOC # -DTS5300 +OS_ARCH = $(shell uname) +ifeq ($(OS_ARCH), SunOS) +LDFLAGS = -lpci -lz +else LDFLAGS = -lpci -lz -static +STRIP_ARGS = -s +endif
- OBJS = flash_enable.o udelay.o jedec.o sst28sf040.o am29f040b.o mx29f002.o \ sst39sf020.o m29f400bt.o w49f002u.o 82802ab.o msys_doc.o pm49fl004.o \ sst49lf040.o sst49lfxxxc.o sst_fwhub.o layout.o lbtable.o \ @@ -24,7 +29,7 @@
$(PROGRAM): $(OBJS) $(CC) -o $(PROGRAM) $(OBJS) $(LDFLAGS) - $(STRIP) -s $(PROGRAM) + $(STRIP) $(STRIP_ARGS) $(PROGRAM)
clean: rm -f *.o *~
Modified: trunk/LinuxBIOSv2/util/flashrom/flash.h =================================================================== --- trunk/LinuxBIOSv2/util/flashrom/flash.h 2007-02-03 15:28:20 UTC (rev 2549) +++ trunk/LinuxBIOSv2/util/flashrom/flash.h 2007-02-06 19:47:50 UTC (rev 2550) @@ -1,7 +1,34 @@ +/* + * flash.h: flash programming utility - central include file + * + * Copyright 2000 Silicon Integrated System Corporation + * Copyright 2000 Ronald G. Minnich rminnich@gmail.com + * Copyright 2005 coresystems GmbH stepan@coresystems.de + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + + #ifndef __FLASH_H__ #define __FLASH_H__ 1
+#if defined(__GLIBC__) #include <sys/io.h> +#endif + #include <unistd.h> #include <stdint.h>
@@ -92,7 +119,18 @@ #define S29C51004T 0x03 /* SyncMOS S29C51004T/B */ #define S29C31004T 0x63 /* SyncMOS S29C31004T */
+/* function prototypes from udelay.h */ + extern void myusec_delay(int time); extern void myusec_calibrate_delay(); extern int enable_flash_write(void); + +/* physical memory mapping device */ + +#if defined (__sun) && (defined(__i386) || defined(__amd64)) +# define MEM_DEV "/dev/xsvc" +#else +# define MEM_DEV "/dev/mem" +#endif + #endif /* !__FLASH_H__ */
Modified: trunk/LinuxBIOSv2/util/flashrom/flash_enable.c =================================================================== --- trunk/LinuxBIOSv2/util/flashrom/flash_enable.c 2007-02-03 15:28:20 UTC (rev 2549) +++ trunk/LinuxBIOSv2/util/flashrom/flash_enable.c 2007-02-06 19:47:50 UTC (rev 2550) @@ -11,12 +11,18 @@ * */
-#include <sys/io.h> #include <stdio.h> #include <pci/pci.h> #include <stdlib.h> #include <stdint.h> #include <string.h> +#if defined (__sun) && (defined(__i386) || defined(__amd64)) +#include <strings.h> +#include <sys/sysi86.h> +#include <sys/psw.h> +#include <asm/sunddi.h> +#endif +#include "flash.h" #include "lbtable.h" #include "debug.h"
@@ -27,12 +33,6 @@ { char b;
- /* get io privilege access PCI configuration space */ - if (iopl(3) != 0) { - perror("Can not set io priviliage"); - exit(1); - } - /* Enable 0xFFF8000~0xFFFF0000 decoding on SiS 540/630 */ outl(0x80000840, 0x0cf8); b = inb(0x0cfc) | 0x0b; @@ -164,12 +164,6 @@ unsigned int base; int ok;
- /* get io privilege access PCI configuration space */ - if (iopl(3) != 0) { - perror("Can not set io priviliage"); - exit(1); - } - old = pci_read_byte(dev, 0x40);
new = old | 0x10; @@ -347,12 +341,6 @@ struct pci_filter f; struct pci_dev *smbusdev;
- /* get io privilege access */ - if (iopl(3) != 0) { - perror("Can not set io priviliage"); - exit(1); - } - /* then look for the smbus device */ pci_filter_init((struct pci_access *) 0, &f); f.vendor = 0x1002; @@ -491,12 +479,6 @@ * connected to the WinBond w83627hf GPIO 24. */
- /* get io privilege access winbond config space */ - if (iopl(3) != 0) { - perror("Can not set io priviliage"); - exit(1); - } - printf("Disabling mainboard flash write protection.\n");
outb(0x87, EFIR); // sequence to unlock extended functions @@ -552,6 +534,18 @@ struct pci_dev *dev = 0; FLASH_ENABLE *enable = 0;
+ /* get io privilege access PCI configuration space */ +#if defined (__sun) && (defined(__i386) || defined(__amd64)) + if (sysi86(SI86V86, V86SC_IOPL, PS_IOPL) != 0){ +#else + if (iopl(3) != 0) { +#endif + perror("Can not set io privilege"); + exit(1); + } + + + /* Initialize PCI access */ pacc = pci_alloc(); /* Get the pci_access structure */ /* Set all options you want -- here we stick with the defaults */ pci_init(pacc); /* Initialize the PCI library */
Modified: trunk/LinuxBIOSv2/util/flashrom/flash_rom.c =================================================================== --- trunk/LinuxBIOSv2/util/flashrom/flash_rom.c 2007-02-03 15:28:20 UTC (rev 2549) +++ trunk/LinuxBIOSv2/util/flashrom/flash_rom.c 2007-02-06 19:47:50 UTC (rev 2550) @@ -52,8 +52,8 @@ volatile uint8_t *bios; unsigned long size;
- if ((fd_mem = open("/dev/mem", O_RDWR)) < 0) { - perror("Error: Can not open /dev/mem. You need to be root."); + if ((fd_mem = open(MEM_DEV, O_RDWR)) < 0) { + perror("Error: Can not access memory using " MEM_DEV ". You need to be root."); exit(1); }
Modified: trunk/LinuxBIOSv2/util/flashrom/lbtable.c =================================================================== --- trunk/LinuxBIOSv2/util/flashrom/lbtable.c 2007-02-03 15:28:20 UTC (rev 2549) +++ trunk/LinuxBIOSv2/util/flashrom/lbtable.c 2007-02-06 19:47:50 UTC (rev 2550) @@ -7,6 +7,7 @@ #include <string.h> #include <errno.h> #include <sys/mman.h> +#include "flash.h" #include "../../src/include/boot/linuxbios_tables.h" #include "debug.h"
@@ -158,14 +159,14 @@ struct lb_record *rec, *last; int fd; - fd = open("/dev/mem", O_RDONLY); + fd = open(MEM_DEV, O_RDONLY); if (fd < 0) { - fprintf(stderr, "Can not open /dev/mem\n"); + fprintf(stderr, "Can not access memory using " MEM_DEV "\n"); exit(-1); } low_1MB = mmap(0, 1024*1024, PROT_READ, MAP_SHARED, fd, 0x00000000); if (low_1MB == ((void *) -1)) { - fprintf(stderr, "Can not mmap /dev/mem at %08lx errno(%d):%s\n", + fprintf(stderr, "Can not mmap " MEM_DEV " at %08lx errno(%d):%s\n", 0x00000000UL, errno, strerror(errno)); exit(-2); }
Modified: trunk/LinuxBIOSv2/util/flashrom/sharplhf00l04.c =================================================================== --- trunk/LinuxBIOSv2/util/flashrom/sharplhf00l04.c 2007-02-03 15:28:20 UTC (rev 2549) +++ trunk/LinuxBIOSv2/util/flashrom/sharplhf00l04.c 2007-02-06 19:47:50 UTC (rev 2550) @@ -25,7 +25,6 @@ #include <errno.h> #include <fcntl.h> #include <sys/mman.h> -#include <sys/io.h> #include <unistd.h> #include <stdio.h> #include <stdlib.h>
Modified: trunk/LinuxBIOSv2/util/flashrom/sst49lfxxxc.c =================================================================== --- trunk/LinuxBIOSv2/util/flashrom/sst49lfxxxc.c 2007-02-03 15:28:20 UTC (rev 2549) +++ trunk/LinuxBIOSv2/util/flashrom/sst49lfxxxc.c 2007-02-06 19:47:50 UTC (rev 2550) @@ -28,11 +28,11 @@ #include <errno.h> #include <fcntl.h> #include <sys/mman.h> -#include <sys/io.h> #include <unistd.h> #include <stdio.h> #include <stdlib.h> #include <stdint.h> + #include "flash.h" #include "jedec.h" #include "debug.h"
Modified: trunk/LinuxBIOSv2/util/flashrom/sst_fwhub.c =================================================================== --- trunk/LinuxBIOSv2/util/flashrom/sst_fwhub.c 2007-02-03 15:28:20 UTC (rev 2549) +++ trunk/LinuxBIOSv2/util/flashrom/sst_fwhub.c 2007-02-06 19:47:50 UTC (rev 2550) @@ -23,7 +23,6 @@ #include <errno.h> #include <fcntl.h> #include <sys/mman.h> -#include <sys/io.h> #include <unistd.h> #include <stdio.h> #include <stdlib.h>
-
svn＠openbios.org