Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 25a76ab8 in mainline for boot/arch/ppc32/include/asm.h


Ignore:
Timestamp:
2010-05-08T07:53:23Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
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/ppc32/include/asm.h

    r6c39a907 r25a76ab8  
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28  
    29 #include "msim.h"
    30 #include <printf.h>
    3128
    32 #define MSIM_VIDEORAM            0xB0000000
     29#ifndef BOOT_ppc32_ASM_H_
     30#define BOOT_ppc32_ASM_H_
    3331
    34 void write(const char *str, const int len)
    35 {
    36         int i;
    37        
    38         for (i = 0; i < len; i++)
    39                 *((char *) MSIM_VIDEORAM) = str[i];
    40 }
     32#include <typedefs.h>
     33#include <arch/main.h>
     34
     35extern void jump_to_kernel(void *, void *, size_t, void *)
     36    __attribute__((noreturn));
     37extern void real_mode();
     38
     39#endif
Note: See TracChangeset for help on using the changeset viewer.