Changeset e28175d in mainline for meson/arch/ppc32/meson.build

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (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:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

File:

• meson/arch/ppc32/meson.build (moved) (moved from boot/arch/amd64/Makefile.inc ) (2 diffs)

meson/arch/ppc32/meson.build

@@ -1 +1 @@
 #
-# Copyright (c) 2006 Martin Decky
+# Copyright (c) 2019 Jiří Zárevúcky
 # All rights reserved.
 #
@@ -27 +27 @@
 #
 
-RD_SRVS_ESSENTIAL += \
-        audio/hound \
-        devman
+# FIXME: enable --gc-sections
 
-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
+_common_c_args = [ '-D__BE__', '-fno-omit-frame-pointer', '-m32', '-Wa,-a32', '-mcpu=powerpc' ]
 
-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
+arch_kernel_c_args = _common_c_args + [ '-msoft-float', '-fno-function-sections' ]
+arch_uspace_c_args = _common_c_args + [ CONFIG_FPU ? '-mhard-float' : '-msoft-float' ]
+arch_boot_c_args = arch_kernel_c_args
+arch_kernel_link_args = [ '-nostdlib', '-Wl,-z,max-page-size=0x1000', '-Wl,--no-check-sections', '-Wl,--no-gc-sections' ]
+arch_uspace_link_args = [ '-nostdlib', '-lgcc', '-Wl,-z,max-page-size=0x1000' ]
+arch_boot_link_args = []
 
-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
-GRUB_LOADER = multiboot
+rd_essential += [
+        'drv/platform/mac',
+        'drv/bus/adb/cuda_adb',
+        'drv/bus/pci/pciintel',
+        'drv/bus/usb/ohci',
+        'drv/bus/usb/usbdiag',
+        'drv/bus/usb/usbflbk',
+        'drv/bus/usb/usbhub',
+        'drv/bus/usb/usbmid',
+        'drv/bus/usb/vhc',
+        'drv/block/usbmast',
+        'drv/hid/adb-kbd',
+        'drv/hid/adb-mouse',
+        'drv/hid/usbhid',
+]