Changeset 1203

Timestamp:

10/08/10 14:40:09 (20 months ago)

Author:

hailfinger

Message:

CONFIG_BITBANG_SPI was not selected if CONFIG_NICINTEL_SPI was on by
default.
Wiki output was missing all flash chips if CONFIG_INTERNAL was not
selected.
Use correct type for toupper()/tolower()/isspace() functions.
Specify software requirements in a generic way.
Non-x86 compilation does not work with the default programmer set, so
list the make parameters which result in a working build.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>
Acked-by: Michael Karcher <flashrom@…>

Location:

trunk

Files:

• Makefile (modified) (2 diffs)
• README (modified) (2 diffs)
• ft2232_spi.c (modified) (1 diff)
• print_wiki.c (modified) (1 diff)
• processor_enable.c (modified) (1 diff)
• serial.c (modified) (1 diff)

trunk/Makefile

@@ -116 +116 @@
 CONFIG_RAYER_SPI ?= yes
 
+# Always enable 3Com NICs for now.
+CONFIG_NIC3COM ?= yes
+
+# Enable NVIDIA graphics cards. Note: write and erase do not work properly.
+CONFIG_GFXNVIDIA ?= yes
+
+# Always enable SiI SATA controllers for now.
+CONFIG_SATASII ?= yes
+
+# Highpoint (HPT) ATA/RAID controller support.
+# IMPORTANT: This code is not yet working!
+CONFIG_ATAHPT ?= no
+
+# Always enable FT2232 SPI dongles for now.
+CONFIG_FT2232_SPI ?= yes
+
+# Always enable dummy tracing for now.
+CONFIG_DUMMY ?= yes
+
+# Always enable Dr. Kaiser for now.
+CONFIG_DRKAISER ?= yes
+
+# Always enable Realtek NICs for now.
+CONFIG_NICREALTEK ?= yes
+
+# Disable National Semiconductor NICs until support is complete and tested.
+CONFIG_NICNATSEMI ?= no
+
+# Always enable SPI on Intel NICs for now.
+CONFIG_NICINTEL_SPI ?= yes
+
+# Always enable Bus Pirate SPI for now.
+CONFIG_BUSPIRATE_SPI ?= yes
+
+# Disable Dediprog SF100 until support is complete and tested.
+CONFIG_DEDIPROG ?= no
+
+# Disable wiki printing by default. It is only useful if you have wiki access.
+CONFIG_PRINT_WIKI ?= no
+
 # Bitbanging SPI infrastructure, default off unless needed.
 ifeq ($(CONFIG_RAYER_SPI), yes)
@@ -130 +170 @@
 endif
 endif
-
-# Always enable 3Com NICs for now.
-CONFIG_NIC3COM ?= yes
-
-# Enable NVIDIA graphics cards. Note: write and erase do not work properly.
-CONFIG_GFXNVIDIA ?= yes
-
-# Always enable SiI SATA controllers for now.
-CONFIG_SATASII ?= yes
-
-# Highpoint (HPT) ATA/RAID controller support.
-# IMPORTANT: This code is not yet working!
-CONFIG_ATAHPT ?= no
-
-# Always enable FT2232 SPI dongles for now.
-CONFIG_FT2232_SPI ?= yes
-
-# Always enable dummy tracing for now.
-CONFIG_DUMMY ?= yes
-
-# Always enable Dr. Kaiser for now.
-CONFIG_DRKAISER ?= yes
-
-# Always enable Realtek NICs for now.
-CONFIG_NICREALTEK ?= yes
-
-# Disable National Semiconductor NICs until support is complete and tested.
-CONFIG_NICNATSEMI ?= no
-
-# Always enable SPI on Intel NICs for now.
-CONFIG_NICINTEL_SPI ?= yes
-
-# Always enable Bus Pirate SPI for now.
-CONFIG_BUSPIRATE_SPI ?= yes
-
-# Disable Dediprog SF100 until support is complete and tested.
-CONFIG_DEDIPROG ?= no
-
-# Disable wiki printing by default. It is only useful if you have wiki access.
-CONFIG_PRINT_WIKI ?= no
 
 ifeq ($(CONFIG_INTERNAL), yes)

trunk/README

@@ -43 +43 @@
 ------------------
 
-To build flashrom you need to install the following packages or ports:
+To build flashrom you need to install the following software:
+
+ * pciutils+libpci (if you want support for mainboard or PCI device flashing)
+ * libusb (if you want FT2232 or Dediprog support)
+ * libftdi (if you want FT2232 support)
 
 Linux et al:
@@ -112 +116 @@
  CWSDPMI.EXE is in the current directory.
 
+Processor architecture dependent features:
+
+ On non-x86 architectures you have to disable a few programmers because they
+ use port-based I/O which is not directly available on non-x86. Please add
+ CONFIG_RAYER_SPI=no CONFIG_NIC3COM=no CONFIG_ATAHPT=no CONFIG_NICREALTEK=no \
+ CONFIG_NICNATSEMI=no
+ as parameters to the "make" invocation.
+ Besides that, the internal programmer is only supported on x86 and MIPS. On
+ other architectures, please add
+ CONFIG_INTERNAL=no
+ as parameter to the "make" invocation.
+
 Installation
 ------------

trunk/ft2232_spi.c

@@ -149 +149 @@
         arg = extract_programmer_param("port");
         if (arg) {
-                switch (toupper(*arg)) {
+                switch (toupper((unsigned char)*arg)) {
                 case 'A':
                         ft2232_interface = INTERFACE_A;

trunk/print_wiki.c

@@ -269 +269 @@
 
         printf(wiki_header, ctime(&t), flashrom_version);
+        print_supported_chips_wiki(2);
 #if CONFIG_INTERNAL == 1
-        print_supported_chips_wiki(2);
         print_supported_chipsets_wiki(3);
         print_supported_boards_wiki();

trunk/processor_enable.c

@@ -54 +54 @@
                         break;
                 ptr = line;
-                while (*ptr && isspace(*ptr))
+                while (*ptr && isspace((unsigned char)*ptr))
                         ptr++;
                 /* "cpu" part appears only with some Linux versions.  */
                 if (strncmp(ptr, "cpu", sizeof("cpu") - 1) == 0)
                         ptr += sizeof("cpu") - 1;
-                while (*ptr && isspace(*ptr))
+                while (*ptr && isspace((unsigned char)*ptr))
                         ptr++;
                 if (strncmp(ptr, "model", sizeof("model") - 1) != 0)
                         continue;
                 ptr += sizeof("model") - 1;
-                while (*ptr && isspace(*ptr))
+                while (*ptr && isspace((unsigned char)*ptr))
                         ptr++;
                 if (*ptr != ':')
                         continue;
                 ptr++;
-                while (*ptr && isspace(*ptr))
+                while (*ptr && isspace((unsigned char)*ptr))
                         ptr++;
                 fclose(cpuinfo);

trunk/serial.c

@@ -107 +107 @@
         HANDLE fd;
         char *dev2 = dev;
-        if ((strlen(dev) > 3) && (tolower(dev[0]) == 'c')
-            && (tolower(dev[1]) == 'o') && (tolower(dev[2]) == 'm')) {
+        if ((strlen(dev) > 3) && (tolower((unsigned char)dev[0]) == 'c') &&
+            (tolower((unsigned char)dev[1]) == 'o') &&
+            (tolower((unsigned char)dev[2]) == 'm')) {
                 dev2 = malloc(strlen(dev) + 5);
                 strcpy(dev2, "\\\\.\\");