arm: am57xx: cl-som-am57x: remove board support

[oweals/u-boot.git] / arch / arm / mach-socfpga / board.c

diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c
index cb6530f7e8feea57215940756b0a113ea6b5941c..7c8c05cc3194a61f2fbf1efe07f7459eb446d39b 100644 (file)
--- a/arch/arm/mach-socfpga/board.c
+++ b/arch/arm/mach-socfpga/board.c
@@ -19,16 +19,20 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 void s_init(void) {
+#ifndef CONFIG_ARM64
        /*
-        * Preconfigure ACTLR, make sure Write Full Line of Zeroes is disabled.
+        * Preconfigure ACTLR and CPACR, make sure Write Full Line of Zeroes
+        * is disabled in ACTLR.
         * This is optional on CycloneV / ArriaV.
         * This is mandatory on Arria10, otherwise Linux refuses to boot.
         */
        asm volatile(
                "mcr p15, 0, %0, c1, c0, 1\n"
+               "mcr p15, 0, %0, c1, c0, 2\n"
                "isb\n"
                "dsb\n"
        ::"r"(0x0));
+#endif
 }
 
 /*
@@ -39,14 +43,6 @@ int board_init(void)
        /* Address of boot parameters for ATAG (if ATAG is used) */
        gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 
-#if defined(CONFIG_TARGET_SOCFPGA_ARRIA10)
-       /* configuring the clock based on handoff */
-       cm_basic_init(gd->fdt_blob);
-
-       /* Add device descriptor to FPGA device table */
-       socfpga_fpga_add();
-#endif
-
        return 0;
 }