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

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

• kernel/arch/arm32/Makefile.inc (modified) (3 diffs)

kernel/arch/arm32/Makefile.inc

@@ -27 +27 @@
 #
 
-## Toolchain configuration
-#
-
 BFD_NAME = elf32-littlearm
 BFD_ARCH = arm
 BFD = binary
-TARGET = arm-linux-gnu
-TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm32
 
 ATSIGN = %
@@ -51 +46 @@
         arch/$(KARCH)/src/context.S \
         arch/$(KARCH)/src/dummy.S \
-        arch/$(KARCH)/src/panic.S \
         arch/$(KARCH)/src/cpu/cpu.c \
         arch/$(KARCH)/src/ddi/ddi.c \
@@ -66 +60 @@
         arch/$(KARCH)/src/ras.c
 
+ifeq ($(MACHINE),gta02)
+        ARCH_SOURCES += arch/$(KARCH)/src/mach/gta02/gta02.c
+endif
+
 ifeq ($(MACHINE),testarm)
         ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c