Changeset 5ebdf94 in mainline


Ignore:
Timestamp:
2009-11-22T11:44:57Z (14 years ago)
Author:
Lenka Trochtova <trochtova.lenka@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3f085132
Parents:
1787e527
Message:

dd branch merged with head

Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/amd64/Makefile.inc

    r1787e527 r5ebdf94  
    4444
    4545RD_SRVS = \
    46         $(USPACEDIR)/srv/pci/pci \
     46        $(USPACEDIR)/srv/dd/dd \
    4747        $(USPACEDIR)/srv/fb/fb \
    4848        $(USPACEDIR)/srv/kbd/kbd \
    … …  
    6161        $(USPACEDIR)/app/tetris/tetris \
    6262        $(USPACEDIR)/app/tester/tester \
     63        $(USPACEDIR)/app/test_serial/test_serial \
    6364        $(USPACEDIR)/app/trace/trace \
    6465        $(USPACEDIR)/app/klog/klog \
    65         $(USPACEDIR)/app/bdsh/bdsh
     66        $(USPACEDIR)/app/bdsh/bdsh 
    6667
    6768build: $(BASE)/image.iso

  • uspace/Makefile

    r1787e527 r5ebdf94  
    6262ifeq ($(UARCH),amd64)
    6363        DIRS += \
    64                 srv/pci \
    65                 app/lspci
     64                srv/dd
    6665endif
    6766
    6867ifeq ($(UARCH),ia32)
    6968        DIRS += \
    70                 srv/pci \
    71                 app/lspci
     69                srv/dd
    7270endif
    7371
    7472ifeq ($(UARCH),sparc64)
    7573        DIRS += \
    76                 srv/pci \
    77                 app/lspci \
     74                srv/dd \
    7875                srv/cir/fhc \
    7976                srv/cir/obio

  • uspace/app/init/init.c

    r1787e527 r5ebdf94  
    264264       
    265265        usleep(1000000);
    266         spawn("/srv/pci");
     266        spawn("/srv/dd");
    267267       
    268268        return 0;

  • uspace/app/shutters/Makefile

    r1787e527 r5ebdf94  
    1 LIBC_PREFIX = ../../lib/libc
    2 SOFTINT_PREFIX = ../../lib/softint
     1#
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
     4# All rights reserved.
     5#
     6# Redistribution and use in source and binary forms, with or without
     7# modification, are permitted provided that the following conditions
     8# are met:
     9#
     10# - Redistributions of source code must retain the above copyright
     11#   notice, this list of conditions and the following disclaimer.
     12# - Redistributions in binary form must reproduce the above copyright
     13#   notice, this list of conditions and the following disclaimer in the
     14#   documentation and/or other materials provided with the distribution.
     15# - The name of the author may not be used to endorse or promote products
     16#   derived from this software without specific prior written permission.
     17#
     18# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
     19# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
     20# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
     21# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
     22# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
     23# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
     24# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
     25# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     26# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
     27# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     28#
    329
    4 include $(LIBC_PREFIX)/Makefile.toolchain
     30include Makefile.common
    531
    6 LIBS = $(LIBC_PREFIX)/libc.a
     32.PHONY: all clean
    733
    8 OUTPUT = shutters
    9 SOURCES = shutters.c
    10 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    11 
    12 .PHONY: all clean depend disasm
    13 
    14 all: $(OUTPUT) $(OUTPUT).disasm
    15 
    16 -include Makefile.depend
    17 
    18 depend:
    19         $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
    20 
    21 $(OUTPUT): $(OBJECTS) $(LIBS)
    22         $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     34all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
     35        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
     36        $(MAKE) -f Makefile.build
    2337
    2438clean:
    25         -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend *.o
    26 
    27 disasm: $(OUTPUT).disasm
    28 
    29 $(OUTPUT).disasm: $(OUTPUT)
    30         $(OBJDUMP) -d $< >$@
    31 
    32 %.o: %.S
    33         $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
    34 
    35 %.o: %.s
    36         $(AS) $(AFLAGS) $< -o $@
    37 
    38 %.o: %.c
    39         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/app/test_serial/Makefile

    r1787e527 r5ebdf94  
    1 LIBC_PREFIX = ../../lib/libc
    2 SOFTINT_PREFIX = ../../lib/softint
     1#
     2# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
     4# All rights reserved.
     5#
     6# Redistribution and use in source and binary forms, with or without
     7# modification, are permitted provided that the following conditions
     8# are met:
     9#
     10# - Redistributions of source code must retain the above copyright
     11#   notice, this list of conditions and the following disclaimer.
     12# - Redistributions in binary form must reproduce the above copyright
     13#   notice, this list of conditions and the following disclaimer in the
     14#   documentation and/or other materials provided with the distribution.
     15# - The name of the author may not be used to endorse or promote products
     16#   derived from this software without specific prior written permission.
     17#
     18# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
     19# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
     20# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
     21# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
     22# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
     23# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
     24# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
     25# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
     26# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
     27# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     28#
    329
    4 include $(LIBC_PREFIX)/Makefile.toolchain
     30include Makefile.common
    531
    6 LIBS = $(LIBC_PREFIX)/libc.a
     32.PHONY: all clean
    733
    8 OUTPUT = test_serial
    9 SOURCES = test_serial.c
    10 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    11 
    12 .PHONY: all clean depend disasm
    13 
    14 all: $(OUTPUT) $(OUTPUT).disasm
    15 
    16 -include Makefile.depend
    17 
    18 depend:
    19         $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
    20 
    21 $(OUTPUT): $(OBJECTS) $(LIBS)
    22         $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     34all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
     35        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
     36        $(MAKE) -f Makefile.build
    2337
    2438clean:
    25         -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend *.o
    26 
    27 disasm: $(OUTPUT).disasm
    28 
    29 $(OUTPUT).disasm: $(OUTPUT)
    30         $(OBJDUMP) -d $< >$@
    31 
    32 %.o: %.S
    33         $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
    34 
    35 %.o: %.s
    36         $(AS) $(AFLAGS) $< -o $@
    37 
    38 %.o: %.c
    39         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;

  • uspace/srv/dd/Makefile

    r1787e527 r5ebdf94  
    11#
    22# Copyright (c) 2005 Martin Decky
     3# Copyright (c) 2007 Jakub Jermar
    34# All rights reserved.
    45#
    … …  
    2728#
    2829
    29 ## Setup toolchain
    30 #
     30include Makefile.common
    3131
    32 LIBC_PREFIX = ../../lib/libc
    33 SOFTINT_PREFIX = ../../lib/softint
     32.PHONY: all clean
    3433
    35 include $(LIBC_PREFIX)/Makefile.toolchain
    36 
    37 CFLAGS += -I../libipc/include
    38 
    39 LIBS =  $(LIBC_PREFIX)/libc.a
    40 
    41 ## Sources
    42 #
    43 
    44 OUTPUT = pci
    45 SOURCES = \
    46         main.c \
    47         pic.c \
    48         pci.c \
    49         intel_piix3.c \
    50         isa.c \
    51         serial.c
    52 
    53 ifeq ($(PROCESSOR), us)
    54         SOURCES += psycho.c
    55 endif
    56 
    57 ifeq ($(UARCH), ia32)
    58         SOURCES += intel_method1.c
    59 endif
    60 
    61 CFLAGS += -D$(UARCH)
    62 
    63 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
    64 
    65 .PHONY: all clean depend disasm
    66 
    67 all: $(OUTPUT) $(OUTPUT).disasm
    68 
    69 -include Makefile.depend
     34all: $(LIBC_PREFIX)/../../../Makefile.config $(LIBC_PREFIX)/../../../config.h $(LIBC_PREFIX)/../../../config.defs $(LIBS)
     35        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
     36        $(MAKE) -f Makefile.build
    7037
    7138clean:
    72         -rm -f $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm Makefile.depend $(OBJECTS)
    73 
    74 depend:
    75         $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
    76 
    77 $(OUTPUT): $(OBJECTS) $(LIBS)
    78         $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    79 
    80 disasm: $(OUTPUT).disasm
    81 
    82 $(OUTPUT).disasm: $(OUTPUT)
    83         $(OBJDUMP) -d $< >$@
    84 
    85 %.o: %.S
    86         $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
    87 
    88 %.o: %.s
    89         $(AS) $(AFLAGS) $< -o $@
    90 
    91 %.o: %.c
    92         $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     39        rm -f $(DEPEND) $(DEPEND_PREV) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     40        find . -name '*.o' -follow -exec rm \{\} \;
Note: See TracChangeset for help on using the changeset viewer.