Changeset 357b5f5 in mainline for boot


Ignore:
Timestamp:
2011-01-23T20:09:13Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fdb9982c
Parents:
cead2aa (diff), 7e36c8d (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

    rcead2aa r357b5f5  
    9898        $(USPACE_PATH)/srv/fs/fat/fat \
    9999        $(USPACE_PATH)/srv/taskmon/taskmon \
    100         $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \
     100        $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \
    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 \
     128        $(USPACE_PATH)/app/killall/killall \
    128129        $(USPACE_PATH)/app/mkfat/mkfat \
    129130        $(USPACE_PATH)/app/sbi/sbi \
    … …  
    131132        $(USPACE_PATH)/app/taskdump/taskdump \
    132133        $(USPACE_PATH)/app/tester/tester \
    133         $(USPACE_PATH)/app/test_serial/test_serial \
    134134        $(USPACE_PATH)/app/tetris/tetris \
    135135        $(USPACE_PATH)/app/trace/trace \
    136         $(USPACE_PATH)/app/netstart/netstart \
    137136        $(USPACE_PATH)/app/nettest1/nettest1 \
    138137        $(USPACE_PATH)/app/nettest2/nettest2 \
    … …  
    141140        $(USPACE_PATH)/app/stats/stats \
    142141        $(USPACE_PATH)/app/tasks/tasks \
    143         $(USPACE_PATH)/app/top/top
     142        $(USPACE_PATH)/app/top/top \
     143        $(USPACE_PATH)/app/sysinfo/sysinfo \
     144        $(USPACE_PATH)/app/websrv/websrv
    144145
    145146ifneq ($(CONFIG_BAREBONE),y)

  • boot/arch/amd64/Makefile.inc

    rcead2aa r357b5f5  
    3030
    3131RD_SRVS_ESSENTIAL += \
    32         $(USPACE_PATH)/srv/hw/char/i8042/i8042
     32        $(USPACE_PATH)/srv/hw/char/i8042/i8042 \
     33        $(USPACE_PATH)/srv/hw/irc/apic/apic \
     34        $(USPACE_PATH)/srv/hw/irc/i8259/i8259
    3335
    3436RD_SRVS_NON_ESSENTIAL += \
    … …  
    3739
    3840RD_DRVS += \
    39         rootia32 \
     41        rootpc \
    4042        pciintel \
    4143        isa \
    4244        ns8250
    43        
     45
    4446RD_DRV_CFG += \
    4547        isa/isa.dev

  • boot/arch/ia64/Makefile.inc

    rcead2aa r357b5f5  
    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

    rcead2aa r357b5f5  
    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/ppc32/include/types.h

    rcead2aa r357b5f5  
    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/Makefile.inc

    rcead2aa r357b5f5  
    4343
    4444RD_SRVS_ESSENTIAL += \
    45         $(USPACE_PATH)/srv/hw/cir/fhc/fhc \
    46         $(USPACE_PATH)/srv/hw/cir/obio/obio
     45        $(USPACE_PATH)/srv/hw/irc/fhc/fhc \
     46        $(USPACE_PATH)/srv/hw/irc/obio/obio
    4747
    4848SOURCES = \

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

    rcead2aa r357b5f5  
    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

    rcead2aa r357b5f5  
    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.