Changeset 8e7c9fe in mainline for boot/arch/ia64/Makefile.inc

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• boot/arch/ia64/Makefile.inc (modified) (2 diffs)

boot/arch/ia64/Makefile.inc

@@ -31 +31 @@
 BFD_ARCH = ia64
 
-#
-# FIXME:
-#
-# The -fno-selective-scheduling and -fno-selective-scheduling2 options
-# should be removed as soon as a bug in GCC concerning unchecked
-# speculative loads is fixed.
-#
-# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53975 for reference.
-#
-
 BITS = 64
 ENDIANESS = LE
-EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata -fno-selective-scheduling -fno-selective-scheduling2
+EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata
 
 RD_SRVS_NON_ESSENTIAL +=
@@ -74 +64 @@
         arch/$(BARCH)/src/ski.c
 endif
+
+RD_DRVS_ESSENTIAL += \
+        platform/pc \
+        bus/pci/pciintel \
+        bus/isa \
+        char/i8042 \
+        char/xtkbd
+
+RD_DRVS_NON_ESSENTIAL += \
+        char/ns8250 \
+        time/cmos-rtc \
+        bus/usb/ehci\
+        bus/usb/ohci \
+        bus/usb/uhci \
+        bus/usb/uhcirh \
+        bus/usb/usbflbk \
+        bus/usb/usbhub \
+        bus/usb/usbhid \
+        bus/usb/usbmast \
+        bus/usb/usbmid \
+        bus/usb/vhc
+
+RD_DRV_CFG += \
+        bus/isa
+