Changeset 646b996 in mainline for boot/arch/arm32/loader/Makefile

Timestamp:

2009-07-30T15:58:54Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

30885b9

Parents:

76093ae

Message:

cleanup some of the dirty hacks introduced into the arm32 port
add default configurations for the two supported arm32 variants

File:

• boot/arch/arm32/loader/Makefile (modified) (3 diffs)

boot/arch/arm32/loader/Makefile

@@ -41 +41 @@
 TARGET = arm-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/arm/bin
-
-ifeq ($(MACHINE), testarm)
-        DMACHINE = MACHINE_GXEMUL_TESTARM
-endif
-
-ifeq ($(MACHINE), integratorcp)
-        DMACHINE = MACHINE_ICP
-endif
-
 
 ifeq ($(COMPILER),gcc_native)
@@ -103 +94 @@
         $(USPACEDIR)/srv/fs/fat/fat \
         $(USPACEDIR)/srv/bd/file_bd/file_bd
-ifeq ($(MACHINE), testarm)
+ifeq ($(MACHINE),testarm)
         RD_SRVS += \
                 $(USPACEDIR)/srv/bd/gxe_bd/gxe_bd
@@ -161 +152 @@
 
 %.o: %.c
-        $(CC) -D$(DMACHINE) $(DEFS) $(CFLAGS) -c $< -o $@
+        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@