r758 - coreboot-v3/device

Author: rminnich
Date: 2008-08-14 02:02:27 +0200 (Thu, 14 Aug 2008)
New Revision: 758

Modified:
   coreboot-v3/device/Kconfig
   coreboot-v3/device/Makefile
   coreboot-v3/device/device_util.c
Log:

Emergency patch for an ancient bug in device_util.c, self-acked: 
Signed-off-by: Ronald G. Minnich 
Acked-by: : Ronald G. Minnich 
smbus_ops patched
Acked-by: Carl-Daniel Hailfinger

Modified: coreboot-v3/device/Kconfig
===================================================================
--- coreboot-v3/device/Kconfig	2008-08-13 17:21:09 UTC (rev 757)
+++ coreboot-v3/device/Kconfig	2008-08-14 00:02:27 UTC (rev 758)
@@ -95,5 +95,19 @@
    help
      Enable support for Suspend-to-RAM (S3) functionality.

+config PCI_64BIT_PREF_MEM
+	bool "64 bit prefetchable memory addresses"
+	help
+		Enable support for 64-bit prefetchable memory addresses in PCI. 
+
+config HW_MEM_HOLE_SIZEK
+	hex "HW memory hole size in KB"
+	default 0x1000
+	help
+		Some chipsets support setting up a "hole" at the top of memory. It is essentially 
+		a hole torn in the physical address space so that you can fit non-memory resources
+		(e.g. flash) at the top of the 4G address space. Given that this only happens on machines
+		with lots of memory, the default 4 MB is a very reasonable value. 
+		
+
 endmenu
-

Modified: coreboot-v3/device/Makefile
===================================================================
--- coreboot-v3/device/Makefile	2008-08-13 17:21:09 UTC (rev 757)
+++ coreboot-v3/device/Makefile	2008-08-14 00:02:27 UTC (rev 758)
@@ -25,5 +25,6 @@
    $(Q)$(CC) $(INITCFLAGS) -c $< -o $@

STAGE2_DEVICE_SRC = device.c device_util.c root_device.c \
-		    pci_device.c pci_ops.c pci_rom.c pnp_device.c pnp_raw.c
+		    pci_device.c pci_ops.c pci_rom.c pnp_device.c pnp_raw.c \
+			smbus_ops.c

Modified: coreboot-v3/device/device_util.c
===================================================================
--- coreboot-v3/device/device_util.c	2008-08-13 17:21:09 UTC (rev 757)
+++ coreboot-v3/device/device_util.c	2008-08-14 00:02:27 UTC (rev 758)
@@ -432,7 +432,7 @@
    		/* Note: memmove() was used here. But this can never
    		 * overlap, right?
    		 */
-			memcpy(resource, resource + 1, dev->resources - i);
+			memcpy(resource, resource + 1, (dev->resources-i)* sizeof(*resource));
    		dev->resources -= 1;
    		memset(&dev->resource[dev->resources], 0,
    		       sizeof(*resource));