Changeset 5fd05862 in mainline for boot


Ignore:
Timestamp:
2019-08-17T12:49:43Z (6 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ecf56f80
Parents:
32355bc
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-15 13:55:37)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)
Message:

Convert uspace to meson

Location:
boot
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile

    r32355bc r5fd05862  
    3838
    3939build_dist: clean_dist
     40        cp -r -L -T -u "$(USPACE_PATH)/dist" "$(DIST_PATH)"
    4041        mkdir -p "$(DIST_PATH)/app/"
    4142        mkdir -p "$(DIST_PATH)/cfg/"
    … …  
    4950        mkdir -p "$(DIST_PATH)/w/"
    5051
    51         for srv in $(RD_SRVS) ; do \
    52                 srv_dir="`dirname "$$srv"`" ; \
    53                 srv_name="`basename "$$srv"`" ; \
    54                 mkdir -p "$(DIST_PATH)/srv/$$srv_dir" ; \
    55                 cp "$(USPACE_PATH)/srv/$$srv/$$srv_name" "$(DIST_PATH)/srv/$$srv" ; \
    56         done
    57 
    58         for file in $(RD_LIBS) ; do \
    59                 cp "$$file" "$(DIST_PATH)/lib/" ; \
    60         done
    61 
    6252ifeq ($(CONFIG_DEVEL_FILES), y)
    63         mkdir -p "$(DIST_PATH)/inc/c/"
    64         cp -r -L "$(USPACE_PATH)/lib/c/include/." "$(DIST_PATH)/inc/c/"
    65         cp -r -L "$(ROOT_PATH)/abi/include/." "$(DIST_PATH)/inc/c/"
    66         cp -r -L "$(USPACE_PATH)/lib/c/arch/$(UARCH)/include/." "$(DIST_PATH)/inc/c/"
    67         cp -L "$(USPACE_PATH)/lib/c/crt0.o" "$(DIST_PATH)/lib/"
    68         cp -L "$(USPACE_PATH)/lib/c/crt1.o" "$(DIST_PATH)/lib/"
    6953        cp -L "$(LIBGCC_PATH)" "$(DIST_PATH)/lib/"
    7054endif
    7155
    72         for app in $(RD_APPS) ; do \
    73                 app_dir="`dirname "$$app"`" ; \
    74                 app_name="`basename "$$app"`" ; \
    75                 mkdir -p "$(DIST_PATH)/app/$$app_dir" ; \
    76                 cp "$(USPACE_PATH)/app/$$app/$$app_name" "$(DIST_PATH)/app/$$app" ; \
    77         done
    78         for file in $(RD_DATA) ; do \
    79                 cp "$$file" "$(DIST_PATH)/" ; \
    80         done
    81 
    82 ifeq ($(CONFIG_PCUT_TESTS),y)
    83         for file in $(RD_TESTS) ; do \
    84                 cp "$$file" "$(DIST_PATH)/test/" ; \
    85         done
    86 endif
    87 
    88 ifeq ($(CONFIG_PCUT_SELF_TESTS),y)
    89         for file in $(USPACE_PATH)/lib/pcut/test-libpcut-*; do \
    90                 cp "$$file" "$(DIST_PATH)/test/" ; \
    91         done
    92 endif
    93 
    94         for drv in $(RD_DRVS) ; do \
    95                 drv_dir="`dirname "$$drv"`" ; \
    96                 drv_name="`basename "$$drv"`" ; \
    97                 mkdir -p "$(DIST_PATH)/$(DRVS_PATH)/$$drv_name" ; \
    98                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv_dir/$$drv_name/$$drv_name" "$(DIST_PATH)/$(DRVS_PATH)/$$drv_name/" ; \
    99                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$drv_dir/$$drv_name/$$drv_name.ma" "$(DIST_PATH)/$(DRVS_PATH)/$$drv_name/" ; \
    100         done
    101         for file in $(RD_DRV_CFG) ; do \
    102                 file_dir="`dirname "$$file"`" ; \
    103                 file_name="`basename "$$file"`" ; \
    104                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/"*".dev" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
    105         done
    106         for file in $(RD_DRVS_FW) ; do \
    107                 file_dir="`dirname "$$file"`" ; \
    108                 file_name="`basename "$$file"`" ; \
    109                 cp "$(USPACE_PATH)/$(DRVS_PATH)/$$file_dir/$$file_name/$$file_name.fw" "$(DIST_PATH)/$(DRVS_PATH)/$$file_name/" ; \
    110         done
    11156        if ls $(DIST_OVERLAY_PATH)/* >/dev/null 2>/dev/null; then \
    11257                cp -r -L $(DIST_OVERLAY_PATH)/* "$(DIST_PATH)"; \

  • boot/Makefile.common

    r32355bc r5fd05862  
    4545KERNEL_PATH = $(ROOT_PATH)/kernel
    4646USPACE_PATH = $(ROOT_PATH)/uspace
    47 DIST_PATH = $(USPACE_PATH)/dist
     47DIST_PATH = $(ROOT_PATH)/dist
    4848DIST_OVERLAY_PATH = $(USPACE_PATH)/overlay
    4949TOOLS_PATH = $(ROOT_PATH)/tools
    … …  
    6767
    6868INIT_TASKS = \
    69         $(USPACE_PATH)/srv/ns/ns \
    70         $(USPACE_PATH)/srv/loader/loader \
    71         $(USPACE_PATH)/app/init/init \
    72         $(USPACE_PATH)/srv/locsrv/locsrv \
    73         $(USPACE_PATH)/srv/bd/rd/rd \
    74         $(USPACE_PATH)/srv/vfs/vfs \
    75         $(USPACE_PATH)/srv/logger/logger
     69        srv/ns \
     70        srv/loader \
     71        app/init \
     72        srv/locsrv \
     73        srv/bd/rd \
     74        srv/vfs \
     75        srv/logger
    7676
    7777ifeq ($(RDFMT),tmpfs)
    78         INIT_TASKS += $(USPACE_PATH)/srv/fs/tmpfs/tmpfs
     78        INIT_TASKS += srv/fs/tmpfs
    7979endif
    8080
    8181ifeq ($(RDFMT),fat)
    82         INIT_TASKS += $(USPACE_PATH)/srv/fs/fat/fat
     82        INIT_TASKS += srv/fs/fat
    8383endif
    8484
    8585ifeq ($(RDFMT),ext4fs)
    86         INIT_TASKS += $(USPACE_PATH)/srv/fs/ext4fs/ext4fs
     86        INIT_TASKS += srv/fs/ext4fs
    8787endif
    8888
    … …  
    146146        block/ahci \
    147147        block/virtio-blk
    148 
    149 RD_DRV_CFG =
    150 
    151 RD_DRVS_FW_NON_ESSENTIAL = \
    152         nic/ar9271
    153 
    154 RD_LIBS =
    155 
    156 ifeq ($(CONFIG_DEVEL_FILES), y)
    157         RD_LIBS += \
    158                 $(USPACE_PATH)/lib/c/libc.a
    159 endif
    160 
    161 ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
    162         RD_LIBS += \
    163                 $(USPACE_PATH)/lib/c/libc.so.0 \
    164                 $(USPACE_PATH)/lib/math/libmath.so.0 \
    165                 $(USPACE_PATH)/lib/dltest/libdltest.so.0
    166 endif
    167148
    168149RD_APPS_ESSENTIAL = \
    … …  
    243224endif
    244225
    245 RD_TESTS = \
    246         $(USPACE_PATH)/lib/c/test-libc \
    247         $(USPACE_PATH)/lib/label/test-liblabel \
    248         $(USPACE_PATH)/lib/posix/test-libposix \
    249         $(USPACE_PATH)/lib/sif/test-libsif \
    250         $(USPACE_PATH)/lib/uri/test-liburi \
    251         $(USPACE_PATH)/lib/math/test-libmath \
    252         $(USPACE_PATH)/drv/bus/usb/xhci/test-xhci \
    253         $(USPACE_PATH)/app/bdsh/test-bdsh \
    254         $(USPACE_PATH)/srv/net/tcp/test-tcp \
    255         $(USPACE_PATH)/srv/volsrv/test-volsrv \
    256 
    257 RD_DATA_ESSENTIAL = \
    258         $(USPACE_PATH)/app/bdsh/demo.txt
    259 
    260 RD_DATA_NON_ESSENTIAL = \
    261         $(USPACE_PATH)/app/modplay/demo.xm \
    262         $(USPACE_PATH)/app/viewer/logo.tga
    263 
    264 
    265226COMPONENTS = \
    266227        $(KERNEL_PATH)/kernel.elf \
    267         $(INIT_TASKS) \
     228        $(addprefix $(DIST_PATH)/,$(INIT_TASKS)) \
    268229        $(INITRD).img
    269230
    … …  
    279240        RD_APPS = $(RD_APPS_ESSENTIAL)
    280241        RD_DRVS = $(RD_DRVS_ESSENTIAL)
    281         RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL)
    282         RD_DATA = $(RD_DATA_ESSENTIAL)
    283242else
    284243        RD_SRVS = $(RD_SRVS_ESSENTIAL) $(RD_SRVS_NON_ESSENTIAL)
    285244        RD_APPS = $(RD_APPS_ESSENTIAL) $(RD_APPS_NON_ESSENTIAL)
    286245        RD_DRVS = $(RD_DRVS_ESSENTIAL) $(RD_DRVS_NON_ESSENTIAL)
    287         RD_DRVS_FW = $(RD_DRVS_FW_ESSENTIAL) $(RD_DRVS_FW_NON_ESSENTIAL)
    288         RD_DATA = $(RD_DATA_ESSENTIAL) $(RD_DATA_NON_ESSENTIAL)
    289246endif
    290247

  • boot/Makefile.initrd

    r32355bc r5fd05862  
    2727#
    2828
     29INIT_FILES := $(addprefix $(DIST_PATH).initrd/,$(INIT_TASKS))
     30INIT_FILES := $(INIT_FILES) $(addsuffix .gz,$(INIT_FILES))
     31
    2932$(INITRD).img:
     33        rm -rf $(DIST_PATH).initrd
     34        cp -R $(DIST_PATH) $(DIST_PATH).initrd
     35        rm -f $(INIT_FILES)
     36        rm -rf $(DIST_PATH).initrd/boot
    3037ifeq ($(RDFMT),tmpfs)
    31         tar -c -f $@ -C $(DIST_PATH) .
     38        tar -c -f $@ -C $(DIST_PATH).initrd .
    3239endif
    3340ifeq ($(RDFMT),fat)
    34         $(MKFAT) 1048576 $(DIST_PATH) $@
     41        $(MKFAT) 1048576 $(DIST_PATH).initrd $@
    3542endif
    3643ifeq ($(RDFMT),ext4fs)
    37         $(MKEXT4) 1048576 $(DIST_PATH) $@
     44        $(MKEXT4) 1048576 $(DIST_PATH).initrd $@
    3845endif

  • boot/arch/amd64/Makefile.inc

    r32355bc r5fd05862  
    2727#
    2828
    29 RD_SRVS_ESSENTIAL += \
    30         audio/hound \
    31         devman
    32 
    33 RD_DRVS_ESSENTIAL += \
    34         intctl/apic \
    35         intctl/i8259 \
    36         platform/pc \
    37         block/ata_bd \
    38         bus/pci/pciintel \
    39         bus/isa \
    40         audio/sb16 \
    41         char/i8042 \
    42         hid/ps2mouse \
    43         hid/xtkbd
    44 
    45 RD_DRVS_NON_ESSENTIAL += \
    46         audio/hdaudio \
    47         char/ns8250 \
    48         char/pc-lpt \
    49         time/cmos-rtc \
    50         bus/usb/ehci\
    51         bus/usb/ohci \
    52         bus/usb/uhci \
    53         bus/usb/usbdiag \
    54         bus/usb/usbflbk \
    55         bus/usb/usbhub \
    56         bus/usb/usbmid \
    57         bus/usb/vhc \
    58         bus/usb/xhci \
    59         block/usbmast \
    60         hid/usbhid
    61 
    6229RD_DRV_CFG += \
    6330        bus/isa
    64 
    65 RD_APPS_ESSENTIAL += \
    66         edit \
    67         mixerctl \
    68         wavplay
    69 
    70 RD_DATA_NON_ESSENTIAL += \
    71         $(USPACE_PATH)/app/wavplay/demo.wav
    7231
    7332POST_OUTPUT = $(ROOT_PATH)/image.iso

  • boot/arch/arm32/Makefile.inc

    r32355bc r5fd05862  
    5858EXTRA_CFLAGS = -march=$(subst _,-,$(PROCESSOR_ARCH)) -mno-unaligned-access
    5959
    60 ifeq ($(MACHINE), gta02)
    61         RD_SRVS_ESSENTIAL += \
    62                 hid/s3c24xx_ts \
    63                 hw/char/s3c24xx_uart
    64 endif
    65 
    66 ifeq ($(MACHINE), $(filter $(MACHINE),beagleboardxm beaglebone))
    67         RD_DRVS_ESSENTIAL += \
    68                 platform/amdm37x \
    69                 fb/amdm37x_dispc
    70 endif
    71 
    72 ifeq ($(MACHINE), integratorcp)
    73         RD_DRVS_ESSENTIAL += \
    74                 char/pl050 \
    75                 hid/atkbd \
    76                 hid/ps2mouse \
    77                 intctl/icp-ic \
    78                 platform/icp
    79 endif
    80 
    81 RD_DRVS_ESSENTIAL += \
    82         bus/usb/ehci \
    83         bus/usb/ohci \
    84         bus/usb/usbdiag \
    85         bus/usb/usbflbk \
    86         bus/usb/usbhub \
    87         bus/usb/usbmid \
    88         block/usbmast \
    89         hid/usbhid
    90 
    9160SOURCES = \
    9261        arch/$(BARCH)/src/asm.S \

  • boot/arch/arm64/Makefile.inc

    r32355bc r5fd05862  
    5353EXTRA_LDFLAGS = -Wl,-shared
    5454
    55 ifeq ($(MACHINE), virt)
    56         RD_DRVS_ESSENTIAL += \
    57                 char/pl011 \
    58                 intctl/gicv2 \
    59                 platform/arm64virt
    60 endif
    61 
    6255SOURCES = \
    6356        arch/$(BARCH)/src/asm.S \

  • boot/arch/ia64/Makefile.inc

    r32355bc r5fd05862  
    3434EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata
    3535
    36 RD_SRVS_NON_ESSENTIAL +=
    37 
    38 RD_SRVS_ESSENTIAL +=
    39 
    4036SOURCES = \
    4137        arch/$(BARCH)/src/boot.S \
    … …  
    6763        arch/$(BARCH)/src/ski.c
    6864endif
    69 
    70 ifeq ($(MACHINE),i460GX)
    71 RD_DRVS_ESSENTIAL += \
    72         platform/pc \
    73         bus/pci/pciintel \
    74         bus/isa \
    75         char/i8042 \
    76         hid/xtkbd
    77 
    78 RD_DRVS_NON_ESSENTIAL += \
    79         char/ns8250 \
    80         time/cmos-rtc \
    81         bus/usb/ehci\
    82         bus/usb/ohci \
    83         bus/usb/uhci \
    84         bus/usb/usbdiag \
    85         bus/usb/usbflbk \
    86         bus/usb/usbhub \
    87         bus/usb/usbmid \
    88         bus/usb/vhc \
    89         block/usbmast \
    90         hid/usbhid
    91 
    92 RD_DRV_CFG += \
    93         bus/isa
    94 endif
    95 
    96 ifeq ($(MACHINE),ski)
    97 RD_DRVS_ESSENTIAL += \
    98         char/ski-con \
    99         platform/ski
    100 endif

  • boot/arch/mips32/Makefile.inc

    r32355bc r5fd05862  
    5050endif
    5151
    52 ifeq ($(MACHINE), $(filter $(MACHINE),bmalta lmalta))
    53         RD_DRVS_ESSENTIAL += \
    54                 platform/malta \
    55                 intctl/i8259 \
    56                 block/ata_bd \
    57                 bus/pci/pciintel \
    58                 bus/isa \
    59                 char/i8042 \
    60                 char/ns8250 \
    61                 hid/ps2mouse \
    62                 hid/xtkbd
    63 
    64         RD_DRV_CFG += \
    65                 bus/isa
    66 endif
    67 
    68 ifeq ($(MACHINE),msim)
    69         RD_DRVS_ESSENTIAL += \
    70                 platform/msim \
    71                 block/ddisk \
    72                 char/msim-con
    73 endif
    74 
    7552SOURCES = \
    7653        arch/$(BARCH)/src/asm.S \

  • boot/arch/ppc32/Makefile.inc

    r32355bc r5fd05862  
    3838EXTRA_CFLAGS = -mcpu=powerpc -msoft-float -m32
    3939
    40 RD_DRVS_ESSENTIAL += \
    41         platform/mac \
    42         bus/adb/cuda_adb \
    43         bus/pci/pciintel \
    44         bus/usb/ohci \
    45         bus/usb/usbdiag \
    46         bus/usb/usbflbk \
    47         bus/usb/usbhub \
    48         bus/usb/usbmid \
    49         bus/usb/vhc \
    50         block/usbmast \
    51         hid/adb-kbd \
    52         hid/adb-mouse \
    53         hid/usbhid
    54 
    5540SOURCES = \
    5641        arch/$(BARCH)/src/asm.S \

  • boot/arch/sparc64/Makefile.inc

    r32355bc r5fd05862  
    4949        intctl/obio \
    5050        char/ns8250
    51 
    52 RD_DRV_CFG += \
    53         bus/isa
    5451endif
    5552
Note: See TracChangeset for help on using the changeset viewer.