Changeset ea28272 in mainline for boot


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
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    rd70d80ed rea28272  
    100100        $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \
    101101        $(USPACE_PATH)/srv/net/netif/lo/lo \
     102        $(USPACE_PATH)/srv/net/nil/eth/eth \
     103        $(USPACE_PATH)/srv/net/nil/nildummy/nildummy \
    102104        $(USPACE_PATH)/srv/net/il/arp/arp \
    103105        $(USPACE_PATH)/srv/net/il/ip/ip \
    … …  
    109111       
    110112RD_DRVS = \
    111         root
     113        root \
     114        rootvirt \
     115        test1 \
     116        test2
    112117
    113118RD_DRV_CFG =
    114 
    115 ifneq ($(CONFIG_NETIF_NIL_BUNDLE),y)
    116         RD_SRVS_NON_ESSENTIAL += \
    117                 $(USPACE_PATH)/srv/net/nil/eth/eth \
    118                 $(USPACE_PATH)/srv/net/nil/nildummy/nildummy
    119 endif
    120119
    121120RD_APPS_ESSENTIAL = \
    … …  
    126125RD_APPS_NON_ESSENTIAL = \
    127126        $(USPACE_PATH)/app/edit/edit \
     127        $(USPACE_PATH)/app/kill/kill \
    128128        $(USPACE_PATH)/app/mkfat/mkfat \
    129129        $(USPACE_PATH)/app/sbi/sbi \
    … …  
    141141        $(USPACE_PATH)/app/stats/stats \
    142142        $(USPACE_PATH)/app/tasks/tasks \
    143         $(USPACE_PATH)/app/top/top
     143        $(USPACE_PATH)/app/top/top \
     144        $(USPACE_PATH)/app/sysinfo/sysinfo \
     145        $(USPACE_PATH)/app/websrv/websrv
    144146
    145147ifneq ($(CONFIG_BAREBONE),y)

  • 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

  • boot/genarch/include/ofw.h

    rd70d80ed rea28272  
    4040#define OFW_TREE_PROPERTY_MAX_VALUELEN  64
    4141
    42 typedef unative_t ofw_arg_t;
     42typedef sysarg_t ofw_arg_t;
    4343typedef native_t ofw_ret_t;
    4444typedef uint32_t ofw_prop_t;
Note: See TracChangeset for help on using the changeset viewer.