[coreboot] Patch set updated for coreboot: 2fc3a58 Remove assembly coded log2 function

Ronald G. Minnich (rminnich@gmail.com) gerrit at coreboot.org
Tue Nov 27 22:22:12 CET 2012


Ronald G. Minnich (rminnich at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1928

-gerrit

commit 2fc3a58afca32eeca2f5a91c583f6b913b454471
Author: Ronald G. Minnich <rminnich at gmail.com>
Date:   Tue Nov 27 11:32:38 2012 -0800

    Remove assembly coded log2 function
    
    As we move to supporting other systems we need to get rid of assembly
    where we can. The log2 function in src/lib is identical to the assembly
    one (tested for all 32-bit signed integers :-) and takes about 10 ns
    to run as opposed to 5ns for the non-portable assemby version. While speed
    is good, I think we can spare the 15 ns or so we add to boot time
    by using the C version only.
    
    Change-Id: Icafa565eae282c85fa5fc01b3bd1f110cd9aaa91
    Signed-off-by: Ronald G. Minnich <rminnich at gmail.com>
---
 src/arch/x86/include/bitops.h                      | 20 --------------------
 src/cpu/amd/geode_gx2/cpubug.c                     |  2 +-
 src/cpu/amd/geode_lx/cpubug.c                      |  2 +-
 src/cpu/amd/sc520/sc520.c                          |  2 +-
 src/devices/device.c                               |  2 +-
 src/devices/hypertransport.c                       |  2 +-
 src/devices/pci_device.c                           |  2 +-
 src/devices/pnp_device.c                           |  2 +-
 src/mainboard/emulation/qemu-x86/northbridge.c     |  2 +-
 src/northbridge/amd/agesa/family10/northbridge.c   |  2 +-
 src/northbridge/amd/agesa/family12/northbridge.c   |  2 +-
 src/northbridge/amd/agesa/family14/northbridge.c   |  2 +-
 src/northbridge/amd/agesa/family15/northbridge.c   |  2 +-
 src/northbridge/amd/agesa/family15tn/northbridge.c |  2 +-
 src/northbridge/amd/amdfam10/misc_control.c        |  2 +-
 src/northbridge/amd/amdfam10/northbridge.c         |  2 +-
 src/northbridge/amd/amdk8/misc_control.c           |  2 +-
 src/northbridge/amd/amdk8/northbridge.c            |  2 +-
 src/northbridge/amd/gx1/northbridge.c              |  2 +-
 src/northbridge/amd/gx2/northbridge.c              |  2 +-
 src/northbridge/amd/gx2/northbridgeinit.c          |  2 +-
 src/northbridge/amd/lx/northbridge.c               |  2 +-
 src/northbridge/amd/lx/northbridgeinit.c           |  2 +-
 src/northbridge/intel/e7501/northbridge.c          |  2 +-
 src/northbridge/intel/e7505/northbridge.c          |  2 +-
 src/northbridge/intel/e7520/northbridge.c          |  2 +-
 src/northbridge/intel/e7525/northbridge.c          |  2 +-
 src/northbridge/intel/gm45/northbridge.c           |  2 +-
 src/northbridge/intel/i3100/northbridge.c          |  2 +-
 src/northbridge/intel/i440bx/northbridge.c         |  2 +-
 src/northbridge/intel/i440lx/northbridge.c         |  2 +-
 src/northbridge/intel/i5000/northbridge.c          |  2 +-
 src/northbridge/intel/i82810/northbridge.c         |  2 +-
 src/northbridge/intel/i82830/northbridge.c         |  2 +-
 src/northbridge/intel/i855/northbridge.c           |  2 +-
 src/northbridge/intel/i945/northbridge.c           |  2 +-
 src/northbridge/intel/sandybridge/northbridge.c    |  2 +-
 src/northbridge/intel/sch/northbridge.c            |  2 +-
 src/northbridge/rdc/r8610/northbridge.c            |  2 +-
 src/northbridge/via/cn400/northbridge.c            |  2 +-
 src/northbridge/via/cn400/vga.c                    |  2 +-
 src/northbridge/via/cn700/northbridge.c            |  2 +-
 src/northbridge/via/cn700/vga.c                    |  2 +-
 src/northbridge/via/cx700/northbridge.c            |  2 +-
 src/northbridge/via/cx700/vga.c                    |  2 +-
 src/northbridge/via/vt8601/northbridge.c           |  2 +-
 src/northbridge/via/vt8623/northbridge.c           |  2 +-
 src/northbridge/via/vt8623/vga.c                   |  2 +-
 src/northbridge/via/vx800/northbridge.c            |  2 +-
 src/northbridge/via/vx800/vga.c                    |  2 +-
 src/southbridge/amd/agesa/hudson/lpc.c             |  2 +-
 src/southbridge/amd/agesa/hudson/sm.c              |  2 +-
 src/southbridge/amd/amd8111/acpi.c                 |  2 +-
 src/southbridge/amd/cimx/sb700/lpc.c               |  2 +-
 src/southbridge/amd/cimx/sb800/lpc.c               |  2 +-
 src/southbridge/amd/cs5535/chipsetinit.c           |  2 +-
 src/southbridge/amd/sb600/lpc.c                    |  2 +-
 src/southbridge/amd/sb600/sm.c                     |  2 +-
 src/southbridge/amd/sb700/lpc.c                    |  2 +-
 src/southbridge/amd/sb700/sm.c                     |  2 +-
 src/southbridge/amd/sb800/lpc.c                    |  2 +-
 src/southbridge/amd/sb800/sm.c                     |  2 +-
 src/southbridge/broadcom/bcm5785/lpc.c             |  2 +-
 src/southbridge/broadcom/bcm5785/sb_pci_main.c     |  2 +-
 src/southbridge/nvidia/ck804/lpc.c                 |  2 +-
 src/southbridge/nvidia/ck804/smbus.c               |  2 +-
 src/southbridge/nvidia/mcp55/lpc.c                 |  2 +-
 src/southbridge/nvidia/mcp55/smbus.c               |  2 +-
 src/southbridge/sis/sis966/lpc.c                   |  2 +-
 src/southbridge/sis/sis966/sis761.c                |  2 +-
 src/southbridge/via/k8t890/dram.c                  |  2 +-
 src/superio/nsc/pc8374/superio.c                   |  2 +-
 src/superio/nsc/pc87351/superio.c                  |  2 +-
 src/superio/nsc/pc87360/superio.c                  |  2 +-
 src/superio/nsc/pc87366/superio.c                  |  2 +-
 src/superio/nsc/pc87382/superio.c                  |  2 +-
 src/superio/nsc/pc87384/superio.c                  |  2 +-
 src/superio/nsc/pc87392/superio.c                  |  2 +-
 src/superio/nsc/pc87417/superio.c                  |  2 +-
 src/superio/nsc/pc87427/superio.c                  |  2 +-
 src/superio/nuvoton/wpcm450/superio.c              |  2 +-
 src/superio/renesas/m3885x/superio.c               |  2 +-
 src/superio/smsc/kbc1100/superio.c                 |  2 +-
 src/superio/smsc/lpc47b272/superio.c               |  2 +-
 src/superio/smsc/lpc47b397/superio.c               |  2 +-
 src/superio/smsc/lpc47m10x/superio.c               |  2 +-
 src/superio/smsc/lpc47m15x/superio.c               |  2 +-
 src/superio/smsc/lpc47n217/superio.c               |  2 +-
 src/superio/smsc/lpc47n227/superio.c               |  2 +-
 src/superio/smsc/mec1308/superio.c                 |  2 +-
 src/superio/smsc/sch4037/superio.c                 |  2 +-
 src/superio/smsc/sio1036/superio.c                 |  2 +-
 src/superio/winbond/w83627ehg/superio.c            |  2 +-
 src/superio/winbond/w83627hf/superio.c             |  2 +-
 src/superio/winbond/w83627thg/superio.c            |  2 +-
 src/superio/winbond/w83627uhg/superio.c            |  2 +-
 src/superio/winbond/w83697hf/superio.c             |  2 +-
 src/superio/winbond/w83977f/superio.c              |  2 +-
 src/superio/winbond/w83977tf/superio.c             |  2 +-
 99 files changed, 98 insertions(+), 118 deletions(-)

diff --git a/src/arch/x86/include/bitops.h b/src/arch/x86/include/bitops.h
deleted file mode 100644
index 9206465..0000000
--- a/src/arch/x86/include/bitops.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef I386_BITOPS_H
-#define I386_BITOPS_H
-
-/**
- * log2 - Find the truncated log base 2 of x
- */
-
-static inline unsigned long log2(unsigned long x)
-{
-	unsigned long r = 0;
-	__asm__(
-		"bsrl %1, %0\n\t"
-		"jnz 1f\n\t"
-		"movl $-1, %0\n\t"
-		"1:\n\t"
-		: "=r" (r) : "r" (x));
-	return r;
-
-}
-#endif /* I386_BITOPS_H */
diff --git a/src/cpu/amd/geode_gx2/cpubug.c b/src/cpu/amd/geode_gx2/cpubug.c
index 473766c..c53ea1c 100644
--- a/src/cpu/amd/geode_gx2/cpubug.c
+++ b/src/cpu/amd/geode_gx2/cpubug.c
@@ -6,7 +6,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/amd/gx2def.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/cache.h>
diff --git a/src/cpu/amd/geode_lx/cpubug.c b/src/cpu/amd/geode_lx/cpubug.c
index e3b6e51..0e7ded8 100644
--- a/src/cpu/amd/geode_lx/cpubug.c
+++ b/src/cpu/amd/geode_lx/cpubug.c
@@ -26,7 +26,7 @@
 #include <device/device.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/lxdef.h>
 
diff --git a/src/cpu/amd/sc520/sc520.c b/src/cpu/amd/sc520/sc520.c
index 382eb87..923712c 100644
--- a/src/cpu/amd/sc520/sc520.c
+++ b/src/cpu/amd/sc520/sc520.c
@@ -12,7 +12,7 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <delay.h>
 
 /*
diff --git a/src/devices/device.c b/src/devices/device.c
index 03e7ea7..a0bcc72 100644
--- a/src/devices/device.c
+++ b/src/devices/device.c
@@ -33,7 +33,7 @@
  */
 
 #include <console/console.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pci.h>
diff --git a/src/devices/hypertransport.c b/src/devices/hypertransport.c
index 420054e..a6320fe 100644
--- a/src/devices/hypertransport.c
+++ b/src/devices/hypertransport.c
@@ -23,7 +23,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <bitops.h>
+#include <lib.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/path.h>
diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c
index e2a4940..af844cd 100644
--- a/src/devices/pci_device.c
+++ b/src/devices/pci_device.c
@@ -26,7 +26,7 @@
 #include <console/console.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <bitops.h>
+#include <lib.h>
 #include <string.h>
 #include <arch/io.h>
 #include <device/device.h>
diff --git a/src/devices/pnp_device.c b/src/devices/pnp_device.c
index fb6c9d6..0c509a9 100644
--- a/src/devices/pnp_device.c
+++ b/src/devices/pnp_device.c
@@ -24,7 +24,7 @@
 #include <console/console.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <bitops.h>
+#include <lib.h>
 #include <string.h>
 #include <arch/io.h>
 #include <device/device.h>
diff --git a/src/mainboard/emulation/qemu-x86/northbridge.c b/src/mainboard/emulation/qemu-x86/northbridge.c
index 6103229..c88d20b 100644
--- a/src/mainboard/emulation/qemu-x86/northbridge.c
+++ b/src/mainboard/emulation/qemu-x86/northbridge.c
@@ -7,7 +7,7 @@
 #include <device/pci.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <delay.h>
 #include <smbios.h>
 
diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c
index f1ed610..4bdc7b4 100644
--- a/src/northbridge/amd/agesa/family10/northbridge.c
+++ b/src/northbridge/amd/agesa/family10/northbridge.c
@@ -26,7 +26,7 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/lapic.h>
 #include <cbmem.h>
diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c
index ac3f308..c4b43c5 100644
--- a/src/northbridge/amd/agesa/family12/northbridge.c
+++ b/src/northbridge/amd/agesa/family12/northbridge.c
@@ -26,7 +26,7 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <cbmem.h>
 
diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index 74473c0..5e8d89b 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -26,7 +26,7 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <cbmem.h>
 
diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c
index 78986e4..abd53b2 100644
--- a/src/northbridge/amd/agesa/family15/northbridge.c
+++ b/src/northbridge/amd/agesa/family15/northbridge.c
@@ -26,7 +26,7 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <cbmem.h>
 
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index ac605b0..5659ac6 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -26,7 +26,7 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <cbmem.h>
 
diff --git a/src/northbridge/amd/amdfam10/misc_control.c b/src/northbridge/amd/amdfam10/misc_control.c
index 472382c..3975005 100644
--- a/src/northbridge/amd/amdfam10/misc_control.c
+++ b/src/northbridge/amd/amdfam10/misc_control.c
@@ -31,7 +31,7 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/amd/model_10xxx_rev.h>
 
 #include "amdfam10.h"
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index 7f05b46..6bac585 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -26,7 +26,7 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 
 #include <cpu/x86/lapic.h>
diff --git a/src/northbridge/amd/amdk8/misc_control.c b/src/northbridge/amd/amdk8/misc_control.c
index cc69883..030c992 100644
--- a/src/northbridge/amd/amdk8/misc_control.c
+++ b/src/northbridge/amd/amdk8/misc_control.c
@@ -16,7 +16,7 @@
 #include <device/pci_ops.h>
 #include <reset.h>
 #include <pc80/mc146818rtc.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/amd/model_fxx_rev.h>
 
 #include "amdk8.h"
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index 4d14efa..2f3d778 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -14,7 +14,7 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 
 #include <cpu/x86/lapic.h>
diff --git a/src/northbridge/amd/gx1/northbridge.c b/src/northbridge/amd/gx1/northbridge.c
index fbea3b5..3d163ff 100644
--- a/src/northbridge/amd/gx1/northbridge.c
+++ b/src/northbridge/amd/gx1/northbridge.c
@@ -6,7 +6,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include "northbridge.h"
 #include <cpu/amd/gx1def.h>
 #include <cpu/x86/cache.h>
diff --git a/src/northbridge/amd/gx2/northbridge.c b/src/northbridge/amd/gx2/northbridge.c
index 12096d8..493da38 100644
--- a/src/northbridge/amd/gx2/northbridge.c
+++ b/src/northbridge/amd/gx2/northbridge.c
@@ -26,7 +26,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include "northbridge.h"
 #include <cpu/x86/msr.h>
 #include <cpu/x86/cache.h>
diff --git a/src/northbridge/amd/gx2/northbridgeinit.c b/src/northbridge/amd/gx2/northbridgeinit.c
index f51bcc6..fdb0c4c 100644
--- a/src/northbridge/amd/gx2/northbridgeinit.c
+++ b/src/northbridge/amd/gx2/northbridgeinit.c
@@ -26,7 +26,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include "northbridge.h"
 #include <cpu/amd/gx2def.h>
 #include <cpu/x86/msr.h>
diff --git a/src/northbridge/amd/lx/northbridge.c b/src/northbridge/amd/lx/northbridge.c
index 5f98b40..5db256c 100644
--- a/src/northbridge/amd/lx/northbridge.c
+++ b/src/northbridge/amd/lx/northbridge.c
@@ -26,7 +26,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <cpu/amd/lxdef.h>
 #include <cpu/x86/msr.h>
diff --git a/src/northbridge/amd/lx/northbridgeinit.c b/src/northbridge/amd/lx/northbridgeinit.c
index 6288608..13f650e 100644
--- a/src/northbridge/amd/lx/northbridgeinit.c
+++ b/src/northbridge/amd/lx/northbridgeinit.c
@@ -26,7 +26,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include "northbridge.h"
 #include <cpu/amd/lxdef.h>
 #include <cpu/x86/msr.h>
diff --git a/src/northbridge/intel/e7501/northbridge.c b/src/northbridge/intel/e7501/northbridge.c
index c70f032..0b8b92f 100644
--- a/src/northbridge/intel/e7501/northbridge.c
+++ b/src/northbridge/intel/e7501/northbridge.c
@@ -6,7 +6,7 @@
 #include <cpu/cpu.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 
 #if CONFIG_WRITE_HIGH_TABLES
 #include <cbmem.h>
diff --git a/src/northbridge/intel/e7505/northbridge.c b/src/northbridge/intel/e7505/northbridge.c
index b6d24fa..23ae14b 100644
--- a/src/northbridge/intel/e7505/northbridge.c
+++ b/src/northbridge/intel/e7505/northbridge.c
@@ -6,7 +6,7 @@
 #include <cpu/cpu.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include "e7505.h"
 
 #if CONFIG_WRITE_HIGH_TABLES
diff --git a/src/northbridge/intel/e7520/northbridge.c b/src/northbridge/intel/e7520/northbridge.c
index 3b92aa8..0ef90ec 100644
--- a/src/northbridge/intel/e7520/northbridge.c
+++ b/src/northbridge/intel/e7520/northbridge.c
@@ -7,7 +7,7 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include "chip.h"
 #include "northbridge.h"
diff --git a/src/northbridge/intel/e7525/northbridge.c b/src/northbridge/intel/e7525/northbridge.c
index ab88899..dd1ed4d 100644
--- a/src/northbridge/intel/e7525/northbridge.c
+++ b/src/northbridge/intel/e7525/northbridge.c
@@ -7,7 +7,7 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include "chip.h"
 #include "northbridge.h"
diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c
index 8c80f86..5e96a98 100644
--- a/src/northbridge/intel/gm45/northbridge.c
+++ b/src/northbridge/intel/gm45/northbridge.c
@@ -26,7 +26,7 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <boot/tables.h>
 #include <arch/acpi.h>
diff --git a/src/northbridge/intel/i3100/northbridge.c b/src/northbridge/intel/i3100/northbridge.c
index db35b85..6205384 100644
--- a/src/northbridge/intel/i3100/northbridge.c
+++ b/src/northbridge/intel/i3100/northbridge.c
@@ -29,7 +29,7 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include "chip.h"
 #include "i3100.h"
diff --git a/src/northbridge/intel/i440bx/northbridge.c b/src/northbridge/intel/i440bx/northbridge.c
index 39bd6b9..714769d 100644
--- a/src/northbridge/intel/i440bx/northbridge.c
+++ b/src/northbridge/intel/i440bx/northbridge.c
@@ -6,7 +6,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <pc80/keyboard.h>
 #include "northbridge.h"
diff --git a/src/northbridge/intel/i440lx/northbridge.c b/src/northbridge/intel/i440lx/northbridge.c
index 57fcfcb..93d1c27 100644
--- a/src/northbridge/intel/i440lx/northbridge.c
+++ b/src/northbridge/intel/i440lx/northbridge.c
@@ -27,7 +27,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <pc80/keyboard.h>
 #include "northbridge.h"
diff --git a/src/northbridge/intel/i5000/northbridge.c b/src/northbridge/intel/i5000/northbridge.c
index 1548f19..3c998de 100644
--- a/src/northbridge/intel/i5000/northbridge.c
+++ b/src/northbridge/intel/i5000/northbridge.c
@@ -25,7 +25,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <arch/acpi.h>
 #include <cbmem.h>
diff --git a/src/northbridge/intel/i82810/northbridge.c b/src/northbridge/intel/i82810/northbridge.c
index 4c09d44..dba863d 100644
--- a/src/northbridge/intel/i82810/northbridge.c
+++ b/src/northbridge/intel/i82810/northbridge.c
@@ -27,7 +27,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include "northbridge.h"
 #include "i82810.h"
diff --git a/src/northbridge/intel/i82830/northbridge.c b/src/northbridge/intel/i82830/northbridge.c
index 95ac2ed..3af2378 100644
--- a/src/northbridge/intel/i82830/northbridge.c
+++ b/src/northbridge/intel/i82830/northbridge.c
@@ -27,7 +27,7 @@
 #include <cpu/cpu.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include "i82830.h"
 
 static void northbridge_init(device_t dev)
diff --git a/src/northbridge/intel/i855/northbridge.c b/src/northbridge/intel/i855/northbridge.c
index 74e2c76..d5635a1 100644
--- a/src/northbridge/intel/i855/northbridge.c
+++ b/src/northbridge/intel/i855/northbridge.c
@@ -28,7 +28,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/x86/cache.h>
 #include <cpu/cpu.h>
 
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index 684bb71..16890d5 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -26,7 +26,7 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <arch/acpi.h>
 #include "i945.h"
diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index 4b5a03a..7674573 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -31,7 +31,7 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <cbmem.h>
 #include "chip.h"
diff --git a/src/northbridge/intel/sch/northbridge.c b/src/northbridge/intel/sch/northbridge.c
index 4c41d68..4194e01 100644
--- a/src/northbridge/intel/sch/northbridge.c
+++ b/src/northbridge/intel/sch/northbridge.c
@@ -26,7 +26,7 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <arch/acpi.h>
 #include "sch.h"
diff --git a/src/northbridge/rdc/r8610/northbridge.c b/src/northbridge/rdc/r8610/northbridge.c
index 65fd5eb..e4c58b6 100644
--- a/src/northbridge/rdc/r8610/northbridge.c
+++ b/src/northbridge/rdc/r8610/northbridge.c
@@ -28,7 +28,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <smbios.h>
 
 #if CONFIG_WRITE_HIGH_TABLES
diff --git a/src/northbridge/via/cn400/northbridge.c b/src/northbridge/via/cn400/northbridge.c
index 61d7345..ab9f084 100644
--- a/src/northbridge/via/cn400/northbridge.c
+++ b/src/northbridge/via/cn400/northbridge.c
@@ -28,7 +28,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include "northbridge.h"
 #include "cn400.h"
diff --git a/src/northbridge/via/cn400/vga.c b/src/northbridge/via/cn400/vga.c
index d8c921a..5c34430 100644
--- a/src/northbridge/via/cn400/vga.c
+++ b/src/northbridge/via/cn400/vga.c
@@ -31,7 +31,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <arch/interrupt.h>
 #include "northbridge.h"
diff --git a/src/northbridge/via/cn700/northbridge.c b/src/northbridge/via/cn700/northbridge.c
index 837ec85..86c11a8 100644
--- a/src/northbridge/via/cn700/northbridge.c
+++ b/src/northbridge/via/cn700/northbridge.c
@@ -28,7 +28,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include "northbridge.h"
 #include "cn700.h"
diff --git a/src/northbridge/via/cn700/vga.c b/src/northbridge/via/cn700/vga.c
index 0f96b2c..0e779c8 100644
--- a/src/northbridge/via/cn700/vga.c
+++ b/src/northbridge/via/cn700/vga.c
@@ -31,7 +31,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <arch/interrupt.h>
 #include "northbridge.h"
diff --git a/src/northbridge/via/cx700/northbridge.c b/src/northbridge/via/cx700/northbridge.c
index 3d7137e..d3aab92 100644
--- a/src/northbridge/via/cx700/northbridge.c
+++ b/src/northbridge/via/cx700/northbridge.c
@@ -26,7 +26,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 
diff --git a/src/northbridge/via/cx700/vga.c b/src/northbridge/via/cx700/vga.c
index 6b60354..3c93f37 100644
--- a/src/northbridge/via/cx700/vga.c
+++ b/src/northbridge/via/cx700/vga.c
@@ -25,7 +25,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>
diff --git a/src/northbridge/via/vt8601/northbridge.c b/src/northbridge/via/vt8601/northbridge.c
index f5f084c..ad8a80c 100644
--- a/src/northbridge/via/vt8601/northbridge.c
+++ b/src/northbridge/via/vt8601/northbridge.c
@@ -8,7 +8,7 @@
 #include <cpu/cpu.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include "northbridge.h"
 
 /*
diff --git a/src/northbridge/via/vt8623/northbridge.c b/src/northbridge/via/vt8623/northbridge.c
index 42864e0..d1212ba 100644
--- a/src/northbridge/via/vt8623/northbridge.c
+++ b/src/northbridge/via/vt8623/northbridge.c
@@ -7,7 +7,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>
diff --git a/src/northbridge/via/vt8623/vga.c b/src/northbridge/via/vt8623/vga.c
index 954ff47..00b1134 100644
--- a/src/northbridge/via/vt8623/vga.c
+++ b/src/northbridge/via/vt8623/vga.c
@@ -25,7 +25,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>
diff --git a/src/northbridge/via/vx800/northbridge.c b/src/northbridge/via/vx800/northbridge.c
index 5fcff76..a67fe6f 100644
--- a/src/northbridge/via/vx800/northbridge.c
+++ b/src/northbridge/via/vx800/northbridge.c
@@ -29,7 +29,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include "vx800.h"
 
diff --git a/src/northbridge/via/vx800/vga.c b/src/northbridge/via/vx800/vga.c
index 319dbda..79ba088 100644
--- a/src/northbridge/via/vx800/vga.c
+++ b/src/northbridge/via/vx800/vga.c
@@ -28,7 +28,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>
diff --git a/src/southbridge/amd/agesa/hudson/lpc.c b/src/southbridge/amd/agesa/hudson/lpc.c
index 97f27d0..10b55c3 100644
--- a/src/southbridge/amd/agesa/hudson/lpc.c
+++ b/src/southbridge/amd/agesa/hudson/lpc.c
@@ -25,7 +25,7 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include "hudson.h"
 
diff --git a/src/southbridge/amd/agesa/hudson/sm.c b/src/southbridge/amd/agesa/hudson/sm.c
index 36742aa..23fb547 100644
--- a/src/southbridge/amd/agesa/hudson/sm.c
+++ b/src/southbridge/amd/agesa/hudson/sm.c
@@ -24,7 +24,7 @@
 #include <device/pci_ops.h>
 #include <device/smbus.h>
 #include <pc80/mc146818rtc.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include <cpu/x86/lapic.h>
 #include <arch/ioapic.h>
diff --git a/src/southbridge/amd/amd8111/acpi.c b/src/southbridge/amd/amd8111/acpi.c
index df57a7e..b734846 100644
--- a/src/southbridge/amd/amd8111/acpi.c
+++ b/src/southbridge/amd/amd8111/acpi.c
@@ -5,7 +5,7 @@
 #include <device/pci_ops.h>
 #include <device/smbus.h>
 #include <pc80/mc146818rtc.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include "amd8111.h"
 #include "amd8111_smbus.h"
diff --git a/src/southbridge/amd/cimx/sb700/lpc.c b/src/southbridge/amd/cimx/sb700/lpc.c
index 7157a55..b5c4626 100644
--- a/src/southbridge/amd/cimx/sb700/lpc.c
+++ b/src/southbridge/amd/cimx/sb700/lpc.c
@@ -19,7 +19,7 @@
 
 #include <device/pci.h>
 #include "lpc.h"
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <console/console.h>	/* printk */
diff --git a/src/southbridge/amd/cimx/sb800/lpc.c b/src/southbridge/amd/cimx/sb800/lpc.c
index 59d74c0..8ac5fc9 100644
--- a/src/southbridge/amd/cimx/sb800/lpc.c
+++ b/src/southbridge/amd/cimx/sb800/lpc.c
@@ -21,7 +21,7 @@
 #include <device/pci.h>
 #include <arch/ioapic.h>
 #include "lpc.h"
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include <cbmem.h>
 
diff --git a/src/southbridge/amd/cs5535/chipsetinit.c b/src/southbridge/amd/cs5535/chipsetinit.c
index 2fceefa..8e13501 100644
--- a/src/southbridge/amd/cs5535/chipsetinit.c
+++ b/src/southbridge/amd/cs5535/chipsetinit.c
@@ -6,7 +6,7 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include "chip.h"
 #include "northbridge/amd/gx2/northbridge.h"
 #include <cpu/amd/gx2def.h>
diff --git a/src/southbridge/amd/sb600/lpc.c b/src/southbridge/amd/sb600/lpc.c
index 22945a7..8e9c7db 100644
--- a/src/southbridge/amd/sb600/lpc.c
+++ b/src/southbridge/amd/sb600/lpc.c
@@ -25,7 +25,7 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include "sb600.h"
diff --git a/src/southbridge/amd/sb600/sm.c b/src/southbridge/amd/sb600/sm.c
index 8c1dc90..e7fd56a 100644
--- a/src/southbridge/amd/sb600/sm.c
+++ b/src/southbridge/amd/sb600/sm.c
@@ -24,7 +24,7 @@
 #include <device/pci_ops.h>
 #include <device/smbus.h>
 #include <pc80/mc146818rtc.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include <cpu/x86/lapic.h>
 #include <arch/ioapic.h>
diff --git a/src/southbridge/amd/sb700/lpc.c b/src/southbridge/amd/sb700/lpc.c
index be940e3..4c68228 100644
--- a/src/southbridge/amd/sb700/lpc.c
+++ b/src/southbridge/amd/sb700/lpc.c
@@ -25,7 +25,7 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <cbmem.h>
diff --git a/src/southbridge/amd/sb700/sm.c b/src/southbridge/amd/sb700/sm.c
index 05065b6..2c21d9b 100644
--- a/src/southbridge/amd/sb700/sm.c
+++ b/src/southbridge/amd/sb700/sm.c
@@ -24,7 +24,7 @@
 #include <device/pci_ops.h>
 #include <device/smbus.h>
 #include <pc80/mc146818rtc.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include <cpu/x86/lapic.h>
 #include <arch/ioapic.h>
diff --git a/src/southbridge/amd/sb800/lpc.c b/src/southbridge/amd/sb800/lpc.c
index 3cb0789..00851bc 100644
--- a/src/southbridge/amd/sb800/lpc.c
+++ b/src/southbridge/amd/sb800/lpc.c
@@ -25,7 +25,7 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include "sb800.h"
 
diff --git a/src/southbridge/amd/sb800/sm.c b/src/southbridge/amd/sb800/sm.c
index 50a8f0b..a24bc92 100644
--- a/src/southbridge/amd/sb800/sm.c
+++ b/src/southbridge/amd/sb800/sm.c
@@ -24,7 +24,7 @@
 #include <device/pci_ops.h>
 #include <device/smbus.h>
 #include <pc80/mc146818rtc.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include <cpu/x86/lapic.h>
 #include <arch/ioapic.h>
diff --git a/src/southbridge/broadcom/bcm5785/lpc.c b/src/southbridge/broadcom/bcm5785/lpc.c
index adf5462..5e5a73e 100644
--- a/src/southbridge/broadcom/bcm5785/lpc.c
+++ b/src/southbridge/broadcom/bcm5785/lpc.c
@@ -26,7 +26,7 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include "bcm5785.h"
diff --git a/src/southbridge/broadcom/bcm5785/sb_pci_main.c b/src/southbridge/broadcom/bcm5785/sb_pci_main.c
index fe809c4..29676f7 100644
--- a/src/southbridge/broadcom/bcm5785/sb_pci_main.c
+++ b/src/southbridge/broadcom/bcm5785/sb_pci_main.c
@@ -26,7 +26,7 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include <device/smbus.h>
 #include "bcm5785.h"
diff --git a/src/southbridge/nvidia/ck804/lpc.c b/src/southbridge/nvidia/ck804/lpc.c
index d371882..fd3735a 100644
--- a/src/southbridge/nvidia/ck804/lpc.c
+++ b/src/southbridge/nvidia/ck804/lpc.c
@@ -28,7 +28,7 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/southbridge/nvidia/ck804/smbus.c b/src/southbridge/nvidia/ck804/smbus.c
index 011faf8..0b9b240 100644
--- a/src/southbridge/nvidia/ck804/smbus.c
+++ b/src/southbridge/nvidia/ck804/smbus.c
@@ -24,7 +24,7 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <device/smbus.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include "ck804.h"
 #include "smbus.h"
diff --git a/src/southbridge/nvidia/mcp55/lpc.c b/src/southbridge/nvidia/mcp55/lpc.c
index d16e3cc..c66c272 100644
--- a/src/southbridge/nvidia/mcp55/lpc.c
+++ b/src/southbridge/nvidia/mcp55/lpc.c
@@ -31,7 +31,7 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/southbridge/nvidia/mcp55/smbus.c b/src/southbridge/nvidia/mcp55/smbus.c
index a945f23..408443a 100644
--- a/src/southbridge/nvidia/mcp55/smbus.c
+++ b/src/southbridge/nvidia/mcp55/smbus.c
@@ -27,7 +27,7 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <device/smbus.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include "mcp55.h"
 #include "smbus.h"
diff --git a/src/southbridge/sis/sis966/lpc.c b/src/southbridge/sis/sis966/lpc.c
index 26f60dd..093b626 100644
--- a/src/southbridge/sis/sis966/lpc.c
+++ b/src/southbridge/sis/sis966/lpc.c
@@ -33,7 +33,7 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
+#include <lib.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <cpu/x86/lapic.h>
diff --git a/src/southbridge/sis/sis966/sis761.c b/src/southbridge/sis/sis966/sis761.c
index 3d7bc47..0746586 100644
--- a/src/southbridge/sis/sis966/sis761.c
+++ b/src/southbridge/sis/sis966/sis761.c
@@ -37,7 +37,7 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
-#include <bitops.h>
+#include <lib.h>
 #include <cpu/amd/model_fxx_rev.h>
 #include <arch/io.h>
 
diff --git a/src/southbridge/via/k8t890/dram.c b/src/southbridge/via/k8t890/dram.c
index 11c8481..088b3d2 100644
--- a/src/southbridge/via/k8t890/dram.c
+++ b/src/southbridge/via/k8t890/dram.c
@@ -25,7 +25,7 @@
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <pc80/mc146818rtc.h>
-#include <bitops.h>
+#include <lib.h>
 #include "k8x8xx.h"
 
 static void dram_enable(struct device *dev)
diff --git a/src/superio/nsc/pc8374/superio.c b/src/superio/nsc/pc8374/superio.c
index d5060c4..905a01f 100644
--- a/src/superio/nsc/pc8374/superio.c
+++ b/src/superio/nsc/pc8374/superio.c
@@ -24,7 +24,7 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/nsc/pc87351/superio.c b/src/superio/nsc/pc87351/superio.c
index 259430e..e31ab25 100644
--- a/src/superio/nsc/pc87351/superio.c
+++ b/src/superio/nsc/pc87351/superio.c
@@ -24,7 +24,7 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index 5da68e2..6224a3d 100644
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -24,7 +24,7 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index b5f2870..2ffb4cc 100644
--- a/src/superio/nsc/pc87366/superio.c
+++ b/src/superio/nsc/pc87366/superio.c
@@ -24,7 +24,7 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/nsc/pc87382/superio.c b/src/superio/nsc/pc87382/superio.c
index 9d4bee0..7d1a381 100644
--- a/src/superio/nsc/pc87382/superio.c
+++ b/src/superio/nsc/pc87382/superio.c
@@ -23,7 +23,7 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/nsc/pc87384/superio.c b/src/superio/nsc/pc87384/superio.c
index 39177fd..ed9026a 100644
--- a/src/superio/nsc/pc87384/superio.c
+++ b/src/superio/nsc/pc87384/superio.c
@@ -23,7 +23,7 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/nsc/pc87392/superio.c b/src/superio/nsc/pc87392/superio.c
index 81c679c..b0c32b4 100644
--- a/src/superio/nsc/pc87392/superio.c
+++ b/src/superio/nsc/pc87392/superio.c
@@ -23,7 +23,7 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <stdlib.h>
 #include "pc87392.h"
diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index 9cd0e6b..94a34dc 100644
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -25,7 +25,7 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/nsc/pc87427/superio.c b/src/superio/nsc/pc87427/superio.c
index 3646fd1..2d7b5a4 100644
--- a/src/superio/nsc/pc87427/superio.c
+++ b/src/superio/nsc/pc87427/superio.c
@@ -24,7 +24,7 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <stdlib.h>
 #include "chip.h"
 #include "pc87427.h"
diff --git a/src/superio/nuvoton/wpcm450/superio.c b/src/superio/nuvoton/wpcm450/superio.c
index 879f405..ccfc2ed 100644
--- a/src/superio/nuvoton/wpcm450/superio.c
+++ b/src/superio/nuvoton/wpcm450/superio.c
@@ -23,7 +23,7 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/renesas/m3885x/superio.c b/src/superio/renesas/m3885x/superio.c
index 1a5fbe6..312ecbf 100644
--- a/src/superio/renesas/m3885x/superio.c
+++ b/src/superio/renesas/m3885x/superio.c
@@ -23,7 +23,7 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c
index c4fde95..a5529c6 100644
--- a/src/superio/smsc/kbc1100/superio.c
+++ b/src/superio/smsc/kbc1100/superio.c
@@ -25,7 +25,7 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index f57c306..9d51ae9 100644
--- a/src/superio/smsc/lpc47b272/superio.c
+++ b/src/superio/smsc/lpc47b272/superio.c
@@ -29,7 +29,7 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c
index fa549db..7a0d027 100644
--- a/src/superio/smsc/lpc47b397/superio.c
+++ b/src/superio/smsc/lpc47b397/superio.c
@@ -26,7 +26,7 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index 3d6a8ed..fa8e5ca 100644
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -28,7 +28,7 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c
index 222e3c9..72824d1 100644
--- a/src/superio/smsc/lpc47m15x/superio.c
+++ b/src/superio/smsc/lpc47m15x/superio.c
@@ -25,7 +25,7 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c
index 2658831..83f7b14 100644
--- a/src/superio/smsc/lpc47n217/superio.c
+++ b/src/superio/smsc/lpc47n217/superio.c
@@ -29,7 +29,7 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c
index a241eb6..444e392 100644
--- a/src/superio/smsc/lpc47n227/superio.c
+++ b/src/superio/smsc/lpc47n227/superio.c
@@ -26,7 +26,7 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/superio/smsc/mec1308/superio.c b/src/superio/smsc/mec1308/superio.c
index 070871d..ca0f27f 100644
--- a/src/superio/smsc/mec1308/superio.c
+++ b/src/superio/smsc/mec1308/superio.c
@@ -25,7 +25,7 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"
diff --git a/src/superio/smsc/sch4037/superio.c b/src/superio/smsc/sch4037/superio.c
index eebcacd..e44a7a7 100644
--- a/src/superio/smsc/sch4037/superio.c
+++ b/src/superio/smsc/sch4037/superio.c
@@ -25,7 +25,7 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/smsc/sio1036/superio.c b/src/superio/smsc/sio1036/superio.c
index 2522d92..aeab466 100644
--- a/src/superio/smsc/sio1036/superio.c
+++ b/src/superio/smsc/sio1036/superio.c
@@ -25,7 +25,7 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index 85747f2..8ae9a21 100644
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -26,7 +26,7 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <pc80/mc146818rtc.h>
diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index 1d1b169..5fb63c3 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -26,7 +26,7 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <pc80/mc146818rtc.h>
diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c
index 40a2326..c8d6f27 100644
--- a/src/superio/winbond/w83627thg/superio.c
+++ b/src/superio/winbond/w83627thg/superio.c
@@ -25,7 +25,7 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include "chip.h"
diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c
index 933bde6..23b5840 100644
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -25,7 +25,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include "chip.h"
diff --git a/src/superio/winbond/w83697hf/superio.c b/src/superio/winbond/w83697hf/superio.c
index 8f090d0..cdf7ecd 100644
--- a/src/superio/winbond/w83697hf/superio.c
+++ b/src/superio/winbond/w83697hf/superio.c
@@ -23,7 +23,7 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/mc146818rtc.h>
 #include <stdlib.h>
diff --git a/src/superio/winbond/w83977f/superio.c b/src/superio/winbond/w83977f/superio.c
index e197b37..75980d2 100644
--- a/src/superio/winbond/w83977f/superio.c
+++ b/src/superio/winbond/w83977f/superio.c
@@ -23,7 +23,7 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index 40952d2..ad71125 100644
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -25,7 +25,7 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
+#include <lib.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>




More information about the coreboot mailing list