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

Changeset 25a76ab8 in mainline for boot/arch/ppc32/include/arch.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/arch.h

    r6c39a907 r25a76ab8  
    11/*
    22 * Copyright (c) 2006 Martin Decky
    3  * Copyright (c) 2006 Jakub Jermar
    43 * All rights reserved.
    54 *
     
    2827 */
    2928
    30 #ifndef BOOT_ia64_ASM_H_
    31 #define BOOT_ia64_ASM_H_
     29#ifndef BOOT_ppc32_ARCH_H_
     30#define BOOT_ppc32_ARCH_H_
    3231
    33 #include "types.h"
    34 #include "main.h"
    35 
    36 #define PAGE_WIDTH  14
     32#define PAGE_WIDTH  12
    3733#define PAGE_SIZE   (1 << PAGE_WIDTH)
    3834
    39 #define BALLOC_MAX_SIZE  (128 * 1024)
     35#define BOOT_OFFSET  0x8000
    4036
    41 extern void halt(void);
    42 extern void jump_to_kernel(void *) __attribute__((noreturn));
     37#define LOADER_ADDRESS  0x01000000
    4338
     39#ifndef __ASM__
     40        #define PA2KA(addr)  (((uintptr_t) (addr)) + 0x80000000)
     41#else
     42        #define PA2KA(addr)  ((addr) + 0x80000000)
     43#endif
    4444
    4545#endif
Note: See TracChangeset for help on using the changeset viewer.