[flashrom] [commit] r671 - trunk
svn at flashrom.org
svn at flashrom.org
Sun Aug 9 14:44:09 CEST 2009
Author: hailfinger
Date: 2009-08-09 14:44:08 +0200 (Sun, 09 Aug 2009)
New Revision: 671
Modified:
trunk/Makefile
trunk/cbtable.c
trunk/chipset_enable.c
trunk/dummyflasher.c
trunk/ichspi.c
trunk/pcidev.c
trunk/sb600spi.c
trunk/serprog.c
trunk/sst49lfxxxc.c
Log:
Remove unnecessary #include files.
Serprog compilation is now controlled by a Makefile variable.
Replace munmap with physunmap where appropriate.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Stefan Reinauer <stepan at coresystems.de>
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2009-08-03 09:35:20 UTC (rev 670)
+++ trunk/Makefile 2009-08-09 12:44:08 UTC (rev 671)
@@ -68,6 +68,8 @@
$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS)
FEATURE_CFLAGS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'")
+# Always enable serprog for now. Needs to be disabled on Windows.
+FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1'
FEATURE_LIBS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-lftdi")
Modified: trunk/cbtable.c
===================================================================
--- trunk/cbtable.c 2009-08-03 09:35:20 UTC (rev 670)
+++ trunk/cbtable.c 2009-08-09 12:44:08 UTC (rev 671)
@@ -22,11 +22,8 @@
*/
#include <stdlib.h>
-#include <fcntl.h>
#include <sys/types.h>
#include <string.h>
-#include <errno.h>
-#include <sys/mman.h>
#include "flash.h"
#include "coreboot_tables.h"
Modified: trunk/chipset_enable.c
===================================================================
--- trunk/chipset_enable.c 2009-08-03 09:35:20 UTC (rev 670)
+++ trunk/chipset_enable.c 2009-08-09 12:44:08 UTC (rev 671)
@@ -29,7 +29,6 @@
#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/mman.h>
#include <fcntl.h>
#include "flash.h"
@@ -968,7 +967,7 @@
}
/* 4. Clean up */
- munmap(mmcr, getpagesize());
+ physunmap(mmcr, getpagesize());
return 0;
}
Modified: trunk/dummyflasher.c
===================================================================
--- trunk/dummyflasher.c 2009-08-03 09:35:20 UTC (rev 670)
+++ trunk/dummyflasher.c 2009-08-09 12:44:08 UTC (rev 671)
@@ -21,10 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
-#include <fcntl.h>
#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
#include "flash.h"
char *dummytype = NULL;
Modified: trunk/ichspi.c
===================================================================
--- trunk/ichspi.c 2009-08-03 09:35:20 UTC (rev 670)
+++ trunk/ichspi.c 2009-08-09 12:44:08 UTC (rev 671)
@@ -33,7 +33,6 @@
*/
#include <string.h>
-#include <sys/mman.h>
#include "flash.h"
#include "spi.h"
Modified: trunk/pcidev.c
===================================================================
--- trunk/pcidev.c 2009-08-03 09:35:20 UTC (rev 670)
+++ trunk/pcidev.c 2009-08-09 12:44:08 UTC (rev 671)
@@ -20,10 +20,7 @@
#include <stdlib.h>
#include <string.h>
-#include <fcntl.h>
#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
#include "flash.h"
uint32_t io_base_addr;
Modified: trunk/sb600spi.c
===================================================================
--- trunk/sb600spi.c 2009-08-03 09:35:20 UTC (rev 670)
+++ trunk/sb600spi.c 2009-08-09 12:44:08 UTC (rev 671)
@@ -21,7 +21,6 @@
*/
#include <string.h>
-#include <sys/mman.h>
#include "flash.h"
#include "spi.h"
Modified: trunk/serprog.c
===================================================================
--- trunk/serprog.c 2009-08-03 09:35:20 UTC (rev 670)
+++ trunk/serprog.c 2009-08-09 12:44:08 UTC (rev 671)
@@ -39,8 +39,6 @@
char *serprog_param = NULL;
-#define SERPROG_SUPPORT 1
-
#if SERPROG_SUPPORT == 1
#define MSGHEADER "serprog:"
Modified: trunk/sst49lfxxxc.c
===================================================================
--- trunk/sst49lfxxxc.c 2009-08-03 09:35:20 UTC (rev 670)
+++ trunk/sst49lfxxxc.c 2009-08-09 12:44:08 UTC (rev 671)
@@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/mman.h>
#include <stdlib.h>
#include "flash.h"
More information about the flashrom
mailing list