Changeset ea28272 in mainline for boot/arch


Ignore:
Timestamp:
2010-12-30T13:43:27Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d770deb
Parents:
d70d80ed (diff), f418e51 (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.

Location:
boot/arch
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/amd64/Makefile.inc

    rd70d80ed rea28272  
    3737
    3838RD_DRVS += \
    39         rootia32 \
     39        rootpc \
    4040        pciintel \
    4141        isa \

  • boot/arch/ia64/Makefile.inc

    rd70d80ed rea28272  
    3434ENDIANESS = LE
    3535PAGE_SIZE = 16384
    36 EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic
     36EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata
    3737
    3838RD_SRVS_NON_ESSENTIAL +=

  • boot/arch/ia64/include/types.h

    rd70d80ed rea28272  
    3535
    3636typedef uint64_t size_t;
    37 typedef uint64_t unative_t;
     37typedef uint64_t sysarg_t;
    3838typedef uint64_t uintptr_t;
    3939
    … …  
    6161        unsigned int memmap_items;
    6262
    63         unative_t *sapic;
     63        sysarg_t *sapic;
    6464        unsigned long sys_freq;
    6565        unsigned long freq_scale;

  • boot/arch/mips32/include/arch.h

    rd70d80ed rea28272  
    4040
    4141#define MSIM_VIDEORAM_ADDRESS  0xb0000000
    42 #define MSIM_DORDER_ADDRESS    0xb0000004
     42#define MSIM_DORDER_ADDRESS    0xb0000100
    4343
    4444#ifndef __ASM__

  • boot/arch/ppc32/include/types.h

    rd70d80ed rea28272  
    3535typedef uint32_t size_t;
    3636typedef uint32_t uintptr_t;
    37 typedef uint32_t unative_t;
     37typedef uint32_t sysarg_t;
    3838typedef int32_t native_t;
    3939

  • boot/arch/sparc64/include/types.h

    rd70d80ed rea28272  
    3535typedef uint64_t size_t;
    3636typedef uint64_t uintptr_t;
    37 typedef uint64_t unative_t;
     37typedef uint64_t sysarg_t;
    3838typedef int64_t native_t;
    3939
Note: See TracChangeset for help on using the changeset viewer.