Changeset 8e7c9fe in mainline for kernel/arch/arm32/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/arm32/Makefile.inc (modified) (4 diffs)

kernel/arch/arm32/Makefile.inc

@@ -36 +36 @@
 
 ifeq ($(CONFIG_FPU),y)
-# This is necessary to allow vmsr insn and fpexc manipulation
-# Use vfp32 to allow context save/restore of d16-d31 regs.
-AFLAGS += -mfloat-abi=hard -mfpu=vfp3
+        # This is necessary to allow vmsr insn and fpexc manipulation
+        # Use vfp32 to allow context save/restore of d16-d31 regs.
+        AFLAGS += -mfloat-abi=hard -mfpu=vfp3
 endif
 
@@ -54 +54 @@
         arch/$(KARCH)/src/dummy.S \
         arch/$(KARCH)/src/cpu/cpu.c \
-        arch/$(KARCH)/src/ddi/ddi.c \
         arch/$(KARCH)/src/interrupt.c \
         arch/$(KARCH)/src/exception.c \
@@ -86 +85 @@
 
 ifeq ($(MACHINE),beaglebone)
-        ARCH_SOURCES += arch/$(KARCH)/src/mach/beaglebone/beaglebone.c
+        ARCH_SOURCES += arch/$(KARCH)/src/mach/beaglebone/beaglebone.c
 endif
 
@@ -96 +95 @@
         ARCH_SOURCES += genarch/src/drivers/pl050/pl050.c
 endif
+
+ARCH_AUTOGENS_AG = \
+        arch/$(KARCH)/include/arch/istate_struct.ag \
+        arch/$(KARCH)/include/arch/context_struct.ag
+