Changeset 8e7c9fe in mainline for kernel/arch/sparc64/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:

• kernel/arch/sparc64/Makefile.inc (modified) (2 diffs)

kernel/arch/sparc64/Makefile.inc

@@ -81 +81 @@
         arch/$(KARCH)/src/trap/exception.c \
         arch/$(KARCH)/src/trap/interrupt.c \
-        arch/$(KARCH)/src/ddi/ddi.c \
         arch/$(KARCH)/src/drivers/tick.c \
         arch/$(KARCH)/src/drivers/kbd.c \
@@ -108 +107 @@
                 arch/$(KARCH)/src/mm/$(USARCH)/tsb.c
 endif
+
+ARCH_AUTOGENS_AG = \
+        arch/$(KARCH)/include/arch/istate_struct.ag \
+        arch/$(KARCH)/include/arch/context_struct.ag
+