Changeset 63cda71 in mainline for boot/arch/ppc64/loader


Ignore:
Timestamp:
2006-07-13T14:58:57Z (20 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
94d614e
Parents:
eda7bf81
Message:

Fix ofw_memmap() in boot infrastructure.
The cell size is 32-bit and not equal sizeof(ofw_arg_t).
Define architecture dependant #address-cells and #size-cells for cases
the respective properties are missing in the OpenFirmware device tree.
The algorithm now works both for ppc32 and sparc64.

Add memmap_t, screen_t and keyboard_t to sparc64 bootinfo structure.
Be more verbose during sparc64 boot.

Move ALIGN_UP to generic part of boot/.

Change header guards in several places so that they don't contain double underscore.

Location:
boot/arch/ppc64/loader
Files:
1 added
5 edited
1 moved

Legend:

Unmodified
Added
Removed

  • boot/arch/ppc64/loader/Makefile

    reda7bf81 r63cda71  
    5252SOURCES = \
    5353        main.c \
     54        ofwarch.c \
    5455        ../../../genarch/ofw.c \
    5556        ../../../generic/printf.c \

  • boot/arch/ppc64/loader/boot.S

    reda7bf81 r63cda71  
    3838        stw r5, 0(r4)
    3939       
    40         bl init
     40        bl ofw_init
    4141       
    4242        b bootstrap

  • boot/arch/ppc64/loader/main.c

    reda7bf81 r63cda71  
    3131#include "asm.h"
    3232#include "_components.h"
     33#include <ofw.h>
    3334
    3435#define HEAP_GAP 1024000

  • boot/arch/ppc64/loader/main.h

    reda7bf81 r63cda71  
    2727 */
    2828
    29 #ifndef __MAIN_H__
    30 #define __MAIN_H__
     29#ifndef BOOT_ppc64_MAIN_H_
     30#define BOOT_ppc64_MAIN_H_
    3131
    32 #include "ofw.h"
    33 
    34 /** Align to the nearest higher address.
    35  *
    36  * @param addr  Address or size to be aligned.
    37  * @param align Size of alignment, must be power of 2.
    38  */
    39 #define ALIGN_UP(addr, align) (((addr) + ((align) - 1)) & ~((align) - 1))
     32#include <ofw.h>
    4033
    4134#define TASKMAP_MAX_RECORDS 32

  • boot/arch/ppc64/loader/ofwarch.c

    reda7bf81 r63cda71  
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28  
     28
     29#include <ofwarch.h>
    2930#include <ofw.h>
    3031#include <printf.h>

  • boot/arch/ppc64/loader/types.h

    reda7bf81 r63cda71  
    2727 */
    2828
    29 #ifndef TYPES_H__
    30 #define TYPES_H__
     29#ifndef BOOT_ppc64_TYPES_H_
     30#define BOOT_ppc64_TYPES_H_
    3131
    3232#include <gentypes.h>
Note: See TracChangeset for help on using the changeset viewer.