printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / northbridge / via / vx800 / northbridge.c

diff --git a/src/northbridge/via/vx800/northbridge.c b/src/northbridge/via/vx800/northbridge.c
index 3d855ec4b5e00d41b29563e96b10d010b85d24f4..9ec54da399dc7fc3bf3f0f5941dea71b23464052 100644 (file)
--- a/src/northbridge/via/vx800/northbridge.c
+++ b/src/northbridge/via/vx800/northbridge.c
@@ -35,10 +35,15 @@
 #include "northbridge.h"
 #include "vx800.h"
 
+/* !!FIXME!!  This was meant to be a CONFIG option */
+#define VIACONFIG_TOP_SM_SIZE_MB 32    // Set frame buffer 32M for default
+/* !!FIXME!!  I declared this to fix the build. */
+u8 acpi_sleep_type = 0;
+
 static void memctrl_init(device_t dev)
 {
 /*
-  set VGA in UMARamSetting.c, not in this function.
+  set VGA in uma_ram_setting.c, not in this function.
 */
 #if 0
        pci_write_config8(dev, 0x85, 0x20);
@@ -69,27 +74,6 @@ static const struct pci_driver memctrl_driver __pci_driver = {
        .device = PCI_DEVICE_ID_VIA_VX855_MEMCTRL,
 };
 
-static void pci_domain_read_resources(device_t dev)
-{
-       struct resource *resource;
-
-       printk_spew("Entering vx800 pci_domain_read_resources.\n");
-
-       /* Initialize the system wide io space constraints */
-       resource = new_resource(dev, IOINDEX_SUBTRACTIVE(0, 0));
-       resource->limit = 0xffffUL;
-       resource->flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE |
-           IORESOURCE_ASSIGNED;
-
-       /* Initialize the system wide memory resources constraints */
-       resource = new_resource(dev, IOINDEX_SUBTRACTIVE(1, 0));
-       resource->limit = 0xffffffffULL;
-       resource->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE |
-           IORESOURCE_ASSIGNED;
-
-       printk_spew("Leaving vx800 pci_domain_read_resources.\n");
-}
-
 static void ram_resource(device_t dev, unsigned long index,
                         unsigned long basek, unsigned long sizek)
 {
@@ -142,7 +126,7 @@ static void pci_domain_set_resources(device_t dev)
        u32 pci_tolm;
        u8 reg;
 
-       printk_spew("Entering vx800 pci_domain_set_resources.\n");
+       printk(BIOS_SPEW, "Entering vx800 pci_domain_set_resources.\n");
 
        pci_tolm = find_pci_tolm(&dev->link[0]);
        mc_dev = dev_find_device(PCI_VENDOR_ID_VIA,
@@ -178,7 +162,7 @@ if register with invalid value we set frame buffer size to 32M for default, but
                            (((rambits << 6) - (4 << reg) -
                              VIACONFIG_TOP_SM_SIZE_MB) * 1024);
 
-               printk_spew("tomk is 0x%x\n", tomk);
+               printk(BIOS_SPEW, "tomk is 0x%x\n", tomk);
                /* Compute the Top Of Low Memory, in Kb */
                tolmk = pci_tolm >> 10;
                if (tolmk >= tomk) {
@@ -195,14 +179,6 @@ if register with invalid value we set frame buffer size to 32M for default, but
        assign_resources(&dev->link[0]);
 }
 
-static unsigned int pci_domain_scan_bus(device_t dev, unsigned int max)
-{
-       printk_debug("Entering vx800 pci_domain_scan_bus.\n");
-
-       max = pci_scan_bus(&dev->link[0], PCI_DEVFN(0, 0), 0xff, max);
-       return max;
-}
-
 static const struct device_operations pci_domain_ops = {
        .read_resources = pci_domain_read_resources,
        .set_resources = pci_domain_set_resources,
@@ -230,7 +206,7 @@ static const struct device_operations cpu_bus_ops = {
 
 static void enable_dev(struct device *dev)
 {
-       printk_spew("In VX800 enable_dev for device %s.\n", dev_path(dev));
+       printk(BIOS_SPEW, "In VX800 enable_dev for device %s.\n", dev_path(dev));
 
        /* Set the operations if it is a special bus type */
        if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) {