Changeset a1e2df13 in mainline for boot


Ignore:
Timestamp:
2012-11-11T21:31:03Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
25eec4ef
Parents:
141a20d (diff), d1538a1 (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:
1 added
13 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    r141a20d ra1e2df13  
    4747        $(MKFAT) 1048576 $(DIST_PATH) $@
    4848endif
    49 ifeq ($(RDFMT),ext2fs)
    50         $(MKEXT2) 1048576 $(DIST_PATH) $@
     49ifeq ($(RDFMT),ext4fs)
     50        $(MKEXT4) 1048576 $(DIST_PATH) $@
    5151endif
    5252

  • boot/Makefile.common

    r141a20d ra1e2df13  
    5555MKTMPFS = $(TOOLS_PATH)/mktmpfs.py
    5656MKFAT = $(TOOLS_PATH)/mkfat.py
    57 MKEXT2 = $(TOOLS_PATH)/mkext2.py
     57MKEXT4 = $(TOOLS_PATH)/mkext4.py
    5858MKUIMAGE = $(TOOLS_PATH)/mkuimage.py
    5959
    … …  
    7474        $(USPACE_PATH)/srv/locsrv/locsrv \
    7575        $(USPACE_PATH)/srv/bd/rd/rd \
    76         $(USPACE_PATH)/srv/vfs/vfs
     76        $(USPACE_PATH)/srv/vfs/vfs \
     77        $(USPACE_PATH)/srv/logger/logger
    7778
    7879ifeq ($(RDFMT),tmpfs)
    … …  
    8485endif
    8586
    86 ifeq ($(RDFMT),ext2fs)
    87         INIT_TASKS += $(USPACE_PATH)/srv/fs/ext2fs/ext2fs
     87ifeq ($(RDFMT),ext4fs)
     88        INIT_TASKS += $(USPACE_PATH)/srv/fs/ext4fs/ext4fs
    8889endif
    8990
    9091RD_SRVS_ESSENTIAL = \
    91         $(USPACE_PATH)/srv/hid/fb/fb \
    9292        $(USPACE_PATH)/srv/hid/input/input \
     93        $(USPACE_PATH)/srv/hid/output/output \
    9394        $(USPACE_PATH)/srv/hid/console/console \
    94         $(USPACE_PATH)/srv/fs/locfs/locfs
     95        $(USPACE_PATH)/srv/devman/devman \
     96        $(USPACE_PATH)/srv/fs/locfs/locfs \
     97        $(USPACE_PATH)/srv/hid/compositor/compositor
    9598
    9699RD_SRVS_NON_ESSENTIAL = \
    … …  
    98101        $(USPACE_PATH)/srv/bd/part/guid_part/g_part \
    99102        $(USPACE_PATH)/srv/bd/part/mbr_part/mbr_part \
     103        $(USPACE_PATH)/srv/bd/sata_bd/sata_bd \
    100104        $(USPACE_PATH)/srv/clipboard/clipboard \
    101105        $(USPACE_PATH)/srv/fs/tmpfs/tmpfs \
    … …  
    104108        $(USPACE_PATH)/srv/fs/cdfs/cdfs \
    105109        $(USPACE_PATH)/srv/fs/exfat/exfat \
     110        $(USPACE_PATH)/srv/fs/udf/udf \
    106111        $(USPACE_PATH)/srv/fs/ext2fs/ext2fs \
     112        $(USPACE_PATH)/srv/fs/ext4fs/ext4fs \
    107113        $(USPACE_PATH)/srv/hid/remcons/remcons \
     114        $(USPACE_PATH)/srv/hid/isdv4_tablet/isdv4_tablet \
    108115        $(USPACE_PATH)/srv/net/dnsres/dnsres \
    109116        $(USPACE_PATH)/srv/net/ethip/ethip \
    … …  
    112119        $(USPACE_PATH)/srv/net/tcp/tcp \
    113120        $(USPACE_PATH)/srv/net/udp/udp \
    114         $(USPACE_PATH)/srv/taskmon/taskmon \
    115         $(USPACE_PATH)/srv/devman/devman
     121        $(USPACE_PATH)/srv/taskmon/taskmon
    116122
    117123RD_DRVS = \
    118124        infrastructure/root \
    119125        infrastructure/rootvirt \
     126        fb/kfb \
    120127        test/test1 \
    121128        test/test2 \
    … …  
    123130        nic/ne2k \
    124131        nic/e1k \
    125         nic/rtl8139
     132        nic/rtl8139 \
     133        block/ahci
    126134
    127135RD_DRV_CFG =
    … …  
    147155        $(USPACE_PATH)/app/bdsh/bdsh \
    148156        $(USPACE_PATH)/app/getterm/getterm \
    149         $(USPACE_PATH)/app/klog/klog
     157        $(USPACE_PATH)/app/klog/klog \
     158        $(USPACE_PATH)/app/vlaunch/vlaunch \
     159        $(USPACE_PATH)/app/vterm/vterm
    150160
    151161RD_APPS_NON_ESSENTIAL = \
     162        $(USPACE_PATH)/app/bithenge/bithenge \
    152163        $(USPACE_PATH)/app/blkdump/blkdump \
    153164        $(USPACE_PATH)/app/bnchmark/bnchmark \
    … …  
    162173        $(USPACE_PATH)/app/killall/killall \
    163174        $(USPACE_PATH)/app/loc/loc \
     175        $(USPACE_PATH)/app/logset/logset \
    164176        $(USPACE_PATH)/app/mkfat/mkfat \
    165177        $(USPACE_PATH)/app/mkexfat/mkexfat \
    166178        $(USPACE_PATH)/app/mkmfs/mkmfs \
    167         $(USPACE_PATH)/app/lsusb/lsusb \
    168179        $(USPACE_PATH)/app/sbi/sbi \
    169180        $(USPACE_PATH)/app/sportdmp/sportdmp \
    … …  
    172183        $(USPACE_PATH)/app/tester/tester \
    173184        $(USPACE_PATH)/app/testread/testread \
     185        $(USPACE_PATH)/app/testwrit/testwrit \
    174186        $(USPACE_PATH)/app/tetris/tetris \
    175187        $(USPACE_PATH)/app/trace/trace \
    … …  
    186198        $(USPACE_PATH)/app/vuhid/vuh \
    187199        $(USPACE_PATH)/app/mkbd/mkbd \
    188         $(USPACE_PATH)/app/websrv/websrv
     200        $(USPACE_PATH)/app/websrv/websrv \
     201        $(USPACE_PATH)/app/date/date \
     202        $(USPACE_PATH)/app/vdemo/vdemo
    189203
    190204ifeq ($(CONFIG_PCC),y)

  • boot/arch/amd64/Makefile.inc

    r141a20d ra1e2df13  
    4242        char/ps2mouse \
    4343        char/xtkbd \
     44        time/cmos-rtc \
    4445        bus/usb/ehci\
    4546        bus/usb/ohci \

  • boot/arch/arm32/include/main.h

    r141a20d ra1e2df13  
    5252
    5353/** GXemul testarm serial console output register */
    54 #define TESTARM_SCONS_ADDR      0x10000000
     54#define TESTARM_SCONS_ADDR      0x10000000
    5555
    5656/** IntegratorCP serial console output register */
    57 #define ICP_SCONS_ADDR          0x16000000
     57#define ICP_SCONS_ADDR          0x16000000
    5858
    5959extern void bootstrap(void);

  • boot/arch/ia64/Makefile.inc

    r141a20d ra1e2df13  
    3131BFD_ARCH = ia64
    3232
     33#
     34# FIXME:
     35#
     36# The -fno-selective-scheduling and -fno-selective-scheduling2 options
     37# should be removed as soon as a bug in GCC concerning unchecked
     38# speculative loads is fixed.
     39#
     40# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53975 for reference.
     41#
     42
    3343BITS = 64
    3444ENDIANESS = LE
    35 EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata
     45EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata -fno-selective-scheduling -fno-selective-scheduling2
    3646
    3747RD_SRVS_NON_ESSENTIAL +=

  • boot/arch/mips32/Makefile.inc

    r141a20d ra1e2df13  
    2929BFD_ARCH = mips
    3030BITS = 32
    31 EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32
     31EXTRA_CFLAGS = -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32
    3232
    3333RD_SRVS_NON_ESSENTIAL += \
    … …  
    4848        BFD_OUTPUT = binary
    4949        ENDIANESS = LE
    50         EXTRA_GCC_CFLAGS = -mhard-float
    5150endif
    5251

  • boot/arch/mips64/Makefile.inc

    r141a20d ra1e2df13  
    2929BFD_ARCH = mips:4000
    3030BITS = 64
    31 EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=64
     31EXTRA_CFLAGS = -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=64
    3232
    3333ifeq ($(MACHINE),msim)
    … …  
    3535        BFD_OUTPUT = binary
    3636        ENDIANESS = LE
    37         EXTRA_GCC_CFLAGS = -mhard-float
    3837endif
    3938

  • boot/arch/ppc32/Makefile.inc

    r141a20d ra1e2df13  
    4343
    4444RD_DRVS += \
    45         infrastructure/rootmac
     45        infrastructure/rootmac \
     46        bus/pci/pciintel \
     47        bus/usb/ohci \
     48        bus/usb/usbflbk \
     49        bus/usb/usbhub \
     50        bus/usb/usbhid \
     51        bus/usb/usbmast \
     52        bus/usb/usbmid \
     53        bus/usb/vhc
    4654
    4755SOURCES = \

  • boot/arch/ppc32/_link.ld.in

    r141a20d ra1e2df13  
    22
    33SECTIONS {
    4         . = 0x01000000;
     4        . = 0x02000000;
    55        .text : {
    66                *(BOOTSTRAP);

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

    r141a20d ra1e2df13  
    3535#define BOOT_OFFSET  0x8000
    3636
    37 #define LOADER_ADDRESS  0x01000000
     37#define LOADER_ADDRESS  0x02000000
    3838
    3939#ifndef __ASM__

  • boot/arch/ppc32/src/main.c

    r141a20d ra1e2df13  
    103103        }
    104104       
     105        if (top >= (size_t) loader_address_pa) {
     106                printf("Inflated components overlap loader area.\n");
     107                printf("The boot image is too large. Halting.\n");
     108                halt();
     109        }
     110       
    105111        void *balloc_base;
    106112        void *balloc_base_pa;

  • boot/generic/include/printf.h

    r141a20d ra1e2df13  
    3535#include <typedefs.h>
    3636#include <stdarg.h>
    37 
    38 #ifndef NVERIFY_PRINTF
    39 
    40 #define PRINTF_ATTRIBUTE(start, end) \
    41         __attribute__((format(gnu_printf, start, end)))
    42 
    43 #else /* NVERIFY_PRINTF */
    44 
    45 #define PRINTF_ATTRIBUTE(start, end)
    46 
    47 #endif /* NVERIFY_PRINTF */
     37#include <printf_verify.h>
    4838
    4939#define EOF  (-1)

  • boot/generic/src/str.c

    r141a20d ra1e2df13  
    354354 *
    355355 * Do a char-by-char comparison of two NULL-terminated strings.
    356  * The strings are considered equal iff they consist of the same
    357  * characters on the minimum of their lengths.
     356 * The strings are considered equal iff their length is equal
     357 * and both strings consist of the same sequence of characters.
     358 *
     359 * A string S1 is less than another string S2 if it has a character with
     360 * lower value at the first character position where the strings differ.
     361 * If the strings differ in length, the shorter one is treated as if
     362 * padded by characters with a value of zero.
    358363 *
    359364 * @param s1 First string to compare.
    360365 * @param s2 Second string to compare.
    361366 *
    362  * @return 0 if the strings are equal, -1 if first is smaller,
    363  *         1 if second smaller.
     367 * @return 0 if the strings are equal, -1 if the first is less than the second,
     368 *         1 if the second is less than the first.
    364369 *
    365370 */
Note: See TracChangeset for help on using the changeset viewer.