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 assembly 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@gmail.com>
Reviewed-on: http://review.coreboot.org/1928
Tested-by: build bot (Jenkins)

src/arch/x86/include/bitops.h

@@ -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 */

src/cpu/amd/geode_gx2/cpubug.c

@@ -6,7 +6,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/amd/gx2def.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/cache.h>

src/cpu/amd/geode_lx/cpubug.c

@@ -26,7 +26,6 @@
 #include <device/device.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/lxdef.h>
 

src/cpu/amd/sc520/sc520.c

@@ -12,7 +12,6 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <delay.h>
 
 /*

src/devices/device.c

@@ -33,7 +33,6 @@
  */
 
 #include <console/console.h>
-#include <bitops.h>
 #include <arch/io.h>
 #include <device/device.h>
 #include <device/pci.h>

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>

src/devices/pci_device.c

@@ -26,7 +26,6 @@
 #include <console/console.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <bitops.h>
 #include <string.h>
 #include <arch/io.h>
 #include <device/device.h>

src/devices/pnp_device.c

@@ -24,7 +24,6 @@
 #include <console/console.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <bitops.h>
 #include <string.h>
 #include <arch/io.h>
 #include <device/device.h>

src/mainboard/emulation/qemu-x86/northbridge.c

@@ -7,7 +7,6 @@
 #include <device/pci.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <delay.h>
 #include <smbios.h>
 

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>

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>
 

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>
 

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>
 

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>
 

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"

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>

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"

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>

src/northbridge/amd/gx1/northbridge.c

@@ -6,7 +6,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include "northbridge.h"
 #include <cpu/amd/gx1def.h>
 #include <cpu/x86/cache.h>

src/northbridge/amd/gx2/northbridge.c

@@ -26,7 +26,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include "northbridge.h"
 #include <cpu/x86/msr.h>
 #include <cpu/x86/cache.h>

src/northbridge/amd/gx2/northbridgeinit.c

@@ -26,7 +26,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include "northbridge.h"
 #include <cpu/amd/gx2def.h>
 #include <cpu/x86/msr.h>

src/northbridge/amd/lx/northbridge.c

@@ -26,7 +26,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include <cpu/amd/lxdef.h>
 #include <cpu/x86/msr.h>

src/northbridge/amd/lx/northbridgeinit.c

@@ -26,7 +26,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include "northbridge.h"
 #include <cpu/amd/lxdef.h>
 #include <cpu/x86/msr.h>

src/northbridge/intel/e7501/northbridge.c

@@ -6,7 +6,6 @@
 #include <cpu/cpu.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 
 #if CONFIG_WRITE_HIGH_TABLES
 #include <cbmem.h>

src/northbridge/intel/e7505/northbridge.c

@@ -6,7 +6,6 @@
 #include <cpu/cpu.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include "e7505.h"
 
 #if CONFIG_WRITE_HIGH_TABLES

src/northbridge/intel/e7520/northbridge.c

@@ -7,7 +7,6 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include "chip.h"
 #include "northbridge.h"

src/northbridge/intel/e7525/northbridge.c

@@ -7,7 +7,6 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include "chip.h"
 #include "northbridge.h"

src/northbridge/intel/gm45/northbridge.c

@@ -26,7 +26,6 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include <boot/tables.h>
 #include <arch/acpi.h>

src/northbridge/intel/i3100/northbridge.c

@@ -29,7 +29,6 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include "chip.h"
 #include "i3100.h"

src/northbridge/intel/i440bx/northbridge.c

@@ -6,7 +6,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include <pc80/keyboard.h>
 #include "northbridge.h"

src/northbridge/intel/i440lx/northbridge.c

@@ -27,7 +27,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include <pc80/keyboard.h>
 #include "northbridge.h"

src/northbridge/intel/i5000/northbridge.c

@@ -25,7 +25,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include <arch/acpi.h>
 #include <cbmem.h>

src/northbridge/intel/i82810/northbridge.c

@@ -27,7 +27,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include "northbridge.h"
 #include "i82810.h"

src/northbridge/intel/i82830/northbridge.c

@@ -27,7 +27,6 @@
 #include <cpu/cpu.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include "i82830.h"
 
 static void northbridge_init(device_t dev)

src/northbridge/intel/i855/northbridge.c

@@ -28,7 +28,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/x86/cache.h>
 #include <cpu/cpu.h>
 

src/northbridge/intel/i945/northbridge.c

@@ -26,7 +26,6 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include <arch/acpi.h>
 #include "i945.h"

src/northbridge/intel/sandybridge/northbridge.c

@@ -31,7 +31,6 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include <cbmem.h>
 #include "chip.h"

src/northbridge/intel/sch/northbridge.c

@@ -26,7 +26,6 @@
 #include <device/hypertransport.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include <arch/acpi.h>
 #include "sch.h"

src/northbridge/rdc/r8610/northbridge.c

@@ -28,7 +28,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <smbios.h>
 
 #if CONFIG_WRITE_HIGH_TABLES

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"

src/northbridge/via/cn400/vga.c

@@ -31,7 +31,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include <arch/interrupt.h>
 #include "northbridge.h"

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"

src/northbridge/via/cn700/vga.c

@@ -31,7 +31,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include <arch/interrupt.h>
 #include "northbridge.h"

src/northbridge/via/cx700/northbridge.c

@@ -26,7 +26,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 

src/northbridge/via/cx700/vga.c

@@ -25,7 +25,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>

src/northbridge/via/vt8601/northbridge.c

@@ -8,7 +8,6 @@
 #include <cpu/cpu.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include "northbridge.h"
 
 /*

src/northbridge/via/vt8623/northbridge.c

@@ -7,7 +7,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>

src/northbridge/via/vt8623/vga.c

@@ -25,7 +25,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>

src/northbridge/via/vx800/northbridge.c

@@ -29,7 +29,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include "vx800.h"
 

src/northbridge/via/vx800/vga.c

@@ -28,7 +28,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include <cpu/cpu.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>

src/southbridge/amd/agesa/hudson/lpc.c

@@ -25,7 +25,6 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
 #include <arch/io.h>
 #include "hudson.h"
 

src/southbridge/amd/agesa/hudson/sm.c

@@ -24,7 +24,6 @@
 #include <device/pci_ops.h>
 #include <device/smbus.h>
 #include <pc80/mc146818rtc.h>
-#include <bitops.h>
 #include <arch/io.h>
 #include <cpu/x86/lapic.h>
 #include <arch/ioapic.h>

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"

src/southbridge/amd/cimx/sb700/lpc.c

@@ -19,7 +19,6 @@
 
 #include <device/pci.h>
 #include "lpc.h"
-#include <bitops.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <console/console.h>	/* printk */

src/southbridge/amd/cimx/sb800/lpc.c

@@ -21,7 +21,6 @@
 #include <device/pci.h>
 #include <arch/ioapic.h>
 #include "lpc.h"
-#include <bitops.h>
 #include <arch/io.h>
 #include <cbmem.h>
 

src/southbridge/amd/cs5535/chipsetinit.c

@@ -6,7 +6,6 @@
 #include <device/pci_ids.h>
 #include <stdlib.h>
 #include <string.h>
-#include <bitops.h>
 #include "chip.h"
 #include "northbridge/amd/gx2/northbridge.h"
 #include <cpu/amd/gx2def.h>

src/southbridge/amd/sb600/lpc.c

@@ -25,7 +25,6 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include "sb600.h"

src/southbridge/amd/sb600/sm.c

@@ -24,7 +24,6 @@
 #include <device/pci_ops.h>
 #include <device/smbus.h>
 #include <pc80/mc146818rtc.h>
-#include <bitops.h>
 #include <arch/io.h>
 #include <cpu/x86/lapic.h>
 #include <arch/ioapic.h>

src/southbridge/amd/sb700/lpc.c

@@ -25,7 +25,6 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <cbmem.h>

src/southbridge/amd/sb700/sm.c

@@ -24,7 +24,6 @@
 #include <device/pci_ops.h>
 #include <device/smbus.h>
 #include <pc80/mc146818rtc.h>
-#include <bitops.h>
 #include <arch/io.h>
 #include <cpu/x86/lapic.h>
 #include <arch/ioapic.h>

src/southbridge/amd/sb800/lpc.c

@@ -25,7 +25,6 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
 #include <arch/io.h>
 #include "sb800.h"
 

src/southbridge/amd/sb800/sm.c

@@ -24,7 +24,6 @@
 #include <device/pci_ops.h>
 #include <device/smbus.h>
 #include <pc80/mc146818rtc.h>
-#include <bitops.h>
 #include <arch/io.h>
 #include <cpu/x86/lapic.h>
 #include <arch/ioapic.h>

src/southbridge/broadcom/bcm5785/lpc.c

@@ -26,7 +26,6 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include "bcm5785.h"

src/southbridge/broadcom/bcm5785/sb_pci_main.c

@@ -26,7 +26,6 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
 #include <arch/io.h>
 #include <device/smbus.h>
 #include "bcm5785.h"

src/southbridge/nvidia/ck804/lpc.c

@@ -28,7 +28,6 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <cpu/x86/lapic.h>

src/southbridge/nvidia/ck804/smbus.c

@@ -24,7 +24,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <device/smbus.h>
-#include <bitops.h>
 #include <arch/io.h>
 #include "ck804.h"
 #include "smbus.h"

src/southbridge/nvidia/mcp55/lpc.c

@@ -31,7 +31,6 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <cpu/x86/lapic.h>

src/southbridge/nvidia/mcp55/smbus.c

@@ -27,7 +27,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <device/smbus.h>
-#include <bitops.h>
 #include <arch/io.h>
 #include "mcp55.h"
 #include "smbus.h"

src/southbridge/sis/sis966/lpc.c

@@ -33,7 +33,6 @@
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
 #include <pc80/isa-dma.h>
-#include <bitops.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <cpu/x86/lapic.h>

src/southbridge/sis/sis966/sis761.c

@@ -37,7 +37,6 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <pc80/mc146818rtc.h>
-#include <bitops.h>
 #include <cpu/amd/model_fxx_rev.h>
 #include <arch/io.h>
 

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)

src/superio/nsc/pc8374/superio.c

@@ -24,7 +24,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>

src/superio/nsc/pc87351/superio.c

@@ -24,7 +24,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>

src/superio/nsc/pc87360/superio.c

@@ -24,7 +24,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>

src/superio/nsc/pc87366/superio.c

@@ -24,7 +24,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>

src/superio/nsc/pc87382/superio.c

@@ -23,7 +23,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>

src/superio/nsc/pc87384/superio.c

@@ -23,7 +23,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>

src/superio/nsc/pc87392/superio.c

@@ -23,7 +23,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <stdlib.h>
 #include "pc87392.h"

src/superio/nsc/pc87417/superio.c

@@ -25,7 +25,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>

src/superio/nsc/pc87427/superio.c

@@ -24,7 +24,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
 #include <stdlib.h>
 #include "chip.h"
 #include "pc87427.h"

src/superio/nuvoton/wpcm450/superio.c

@@ -23,7 +23,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>

src/superio/renesas/m3885x/superio.c

@@ -23,7 +23,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <assert.h>
 #include <stdlib.h>

src/superio/smsc/kbc1100/superio.c

@@ -25,7 +25,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>

src/superio/smsc/lpc47b272/superio.c

@@ -29,7 +29,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>

src/superio/smsc/lpc47b397/superio.c

@@ -26,7 +26,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>

src/superio/smsc/lpc47m10x/superio.c

@@ -28,7 +28,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>

src/superio/smsc/lpc47m15x/superio.c

@@ -25,7 +25,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>

src/superio/smsc/lpc47n217/superio.c

@@ -29,7 +29,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <assert.h>
 #include <stdlib.h>

src/superio/smsc/lpc47n227/superio.c

@@ -26,7 +26,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <assert.h>
 #include <stdlib.h>

src/superio/smsc/mec1308/superio.c

@@ -25,7 +25,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
 #include "chip.h"

src/superio/smsc/sch4037/superio.c

@@ -25,7 +25,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>

src/superio/smsc/sio1036/superio.c

@@ -25,7 +25,6 @@
 #include <console/console.h>
 #include <device/smbus.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>

src/superio/winbond/w83627ehg/superio.c

@@ -26,7 +26,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <pc80/mc146818rtc.h>

src/superio/winbond/w83627hf/superio.c

@@ -26,7 +26,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <pc80/mc146818rtc.h>

src/superio/winbond/w83627thg/superio.c

@@ -25,7 +25,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include "chip.h"

src/superio/winbond/w83627uhg/superio.c

@@ -25,7 +25,6 @@
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include "chip.h"

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>

src/superio/winbond/w83977f/superio.c

@@ -23,7 +23,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>

src/superio/winbond/w83977tf/superio.c

@@ -25,7 +25,6 @@
 #include <device/pnp.h>
 #include <console/console.h>
 #include <string.h>
-#include <bitops.h>
 #include <uart8250.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>