Changeset 4a46ccc in mainline

Timestamp:

2013-01-01T11:46:23Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1a3a632

Parents:

029e3cc

Message:

arm32,boot: Remove nested ifdef

File:

• boot/arch/arm32/src/mm.c (modified) (2 diffs)

boot/arch/arm32/src/mm.c

@@ -152 +152 @@
                  * see arch/arm32/src/cpu/cpu.c for reasoning */
                 "ldr r1, =0x00000805\n"
-#else
-#ifdef MACHINE_gta02
+#elif defined(MACHINE_gta02)
                 /* Mask to enable paging (bit 0),
                    D-cache (bit 2), I-cache (bit 12) */
@@ -160 +159 @@
                 /* Mask to enable paging and branch prediction */
                 "ldr r1, =0x00000801\n"
-#endif
 #endif
                 "orr r0, r0, r1\n"