Changeset b0b4592e in mainline for kernel/arch/arm32/Makefile.inc

Timestamp:

2014-03-15T19:21:53Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c773adc

Parents:

2034f98 (diff), 8cffdf5 (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

File:

• kernel/arch/arm32/Makefile.inc (modified) (2 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
 
@@ -86 +86 @@
 
 ifeq ($(MACHINE),beaglebone)
-        ARCH_SOURCES += arch/$(KARCH)/src/mach/beaglebone/beaglebone.c
+        ARCH_SOURCES += arch/$(KARCH)/src/mach/beaglebone/beaglebone.c
+endif
+
+ifeq ($(MACHINE),raspberrypi)
+        ARCH_SOURCES += arch/$(KARCH)/src/mach/raspberrypi/raspberrypi.c
 endif