Changeset b50b5af2 in mainline for boot/arch/ppc32/loader/ofwarch.c

Timestamp:

2009-08-22T10:48:00Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• boot/arch/ppc32/loader/ofwarch.c (modified) (2 diffs)

boot/arch/ppc32/loader/ofwarch.c

@@ -31 +31 @@
 #include <printf.h>
 
-typedef int (* ofw_entry_t)(ofw_args_t *args);
+typedef int (*ofw_entry_t)(ofw_args_t *args);
 
 int ofw(ofw_args_t *args)
@@ -49 +49 @@
 }
 
-int ofw_macio(macio_t *macio)
-{
-        char device_name[BUF_SIZE];
-        
-        if ((ofw_get_property(ofw_aliases, "macio", device_name, sizeof(device_name)) <= 0)
-            && (ofw_get_property(ofw_aliases, "mac-io", device_name, sizeof(device_name)) <= 0))
-                return false;
-        
-        phandle device = ofw_find_device(device_name);
-        if (device == -1)
-                return false;
-        
-        pci_reg_t pci_reg;
-        if (ofw_get_property(device, "assigned-addresses", &pci_reg, sizeof(pci_reg)) <= 0)
-                return false;
-        
-        macio->addr = (void *) pci_reg.addr.addr_lo;
-        macio->size = pci_reg.size_lo;
-
-        return true;
-}
-
 int ofw_translate_failed(ofw_arg_t flag)
 {
+        /* PearPC returns buggy flag */
         return 0;
 }