sunxi: Also set Auxiliary Ctl SMP bit in SPL
authorHans de Goede <hdegoede@redhat.com>
Mon, 6 Apr 2015 18:16:36 +0000 (20:16 +0200)
committerHans de Goede <hdegoede@redhat.com>
Mon, 4 May 2015 09:59:21 +0000 (11:59 +0200)
There is no reason not to and this make the #ifdef-ery easier to read.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
arch/arm/cpu/armv7/sunxi/board.c

index c1b4cf5..6471c6b 100644 (file)
@@ -94,8 +94,9 @@ void s_init(void)
         * access gets messed up (seems cache related) */
        setbits_le32(SUNXI_SRAMC_BASE + 0x44, 0x1800);
 #endif
-#if !defined CONFIG_SPL_BUILD && (defined CONFIG_MACH_SUN7I || \
-               defined CONFIG_MACH_SUN6I || defined CONFIG_MACH_SUN8I)
+#if defined CONFIG_MACH_SUN6I || \
+    defined CONFIG_MACH_SUN7I || \
+    defined CONFIG_MACH_SUN8I
        /* Enable SMP mode for CPU0, by setting bit 6 of Auxiliary Ctl reg */
        asm volatile(
                "mrc p15, 0, r0, c1, c0, 1\n"