Changeset 25a76ab8 in mainline for boot/arch/sparc64/include/ofw.h


Ignore:
Timestamp:
2010-05-08T07:53:23Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
051bc69a
Parents:
6c39a907 (diff), 1317380 (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:
1 moved

Legend:

Unmodified
Added
Removed
  • boot/arch/sparc64/include/ofw.h

    r6c39a907 r25a76ab8  
    2727 */
    2828
    29 #ifndef BOOT_sparc64_OFWARCH_H_
    30 #define BOOT_sparc64_OFWARCH_H_
     29#ifndef BOOT_sparc64_OFW_H_
     30#define BOOT_sparc64_OFW_H_
    3131
    32 #include "main.h"
    33 #include "types.h"
     32#include <typedefs.h>
    3433
    3534#define OFW_ADDRESS_CELLS  2
    3635#define OFW_SIZE_CELLS     2
    3736
    38 extern int ofw_cpu(uint16_t mid_mask, uintptr_t physmem_start);
    39 extern int ofw_get_physmem_start(uintptr_t *start);
     37extern uintptr_t ofw_get_physmem_start(void);
     38extern void ofw_cpu(uint16_t, uintptr_t);
    4039
    4140#endif
Note: See TracChangeset for help on using the changeset viewer.