Changeset 3e828ea in mainline for boot/arch/ia64/meson.build

Timestamp:

2019-09-23T12:49:29Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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.

git-author:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• boot/arch/ia64/meson.build (moved) (moved from boot/arch/amd64/Makefile.inc ) (1 diff)

boot/arch/ia64/meson.build

@@ -27 +27 @@
 #
 
-RD_SRVS_ESSENTIAL += \
-        audio/hound \
-        devman
+BUILD = true
+POSTBUILD = 'raw'
+boot_image_format = 'elf'
+POST_OUTPUT = 'image.boot'
 
-RD_DRVS_ESSENTIAL += \
-        intctl/apic \
-        intctl/i8259 \
-        platform/pc \
-        block/ata_bd \
-        bus/pci/pciintel \
-        bus/isa \
-        audio/sb16 \
-        char/i8042 \
-        hid/ps2mouse \
-        hid/xtkbd
+boot_src = files(
+        'src/boot.S',
+        'src/asm.S',
+        'src/main.c',
+        'src/sal.c',
+        'src/sal_asm.S',
+        'src/pal.c',
+        'src/pal_asm.S',
+        'src/putchar.c',
+        '../../genarch/src/efi.c',
+        '../../genarch/src/division.c',
+        '../../generic/src/balloc.c',
+        '../../generic/src/memstr.c',
+        '../../generic/src/printf_core.c',
+        '../../generic/src/vprintf.c',
+        '../../generic/src/printf.c',
+        '../../generic/src/str.c',
+        '../../generic/src/version.c',
+        '../../generic/src/inflate.c',
+        '../../generic/src/tar.c',
+        '../../generic/src/gzip.c',
+        '../../generic/src/kernel.c',
+        '../../generic/src/payload.c',
+)
 
-RD_DRVS_NON_ESSENTIAL += \
-        audio/hdaudio \
-        char/ns8250 \
-        char/pc-lpt \
-        time/cmos-rtc \
-        bus/usb/ehci\
-        bus/usb/ohci \
-        bus/usb/uhci \
-        bus/usb/usbdiag \
-        bus/usb/usbflbk \
-        bus/usb/usbhub \
-        bus/usb/usbmid \
-        bus/usb/vhc \
-        bus/usb/xhci \
-        block/usbmast \
-        hid/usbhid
-
-RD_DRV_CFG += \
-        bus/isa
-
-RD_APPS_ESSENTIAL += \
-        edit \
-        mixerctl \
-        wavplay
-
-RD_DATA_NON_ESSENTIAL += \
-        $(USPACE_PATH)/app/wavplay/demo.wav
-
-POST_OUTPUT = $(ROOT_PATH)/image.iso
-BUILD = Makefile.empty
-POSTBUILD = Makefile.grub
+if MACHINE == 'ski'
+        boot_src += files('src/ski.c')
+endif