]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
ARM: socfpga: Register the FPGA on A10 in SPL again
authorMarek Vasut <marex@denx.de>
Mon, 30 Jul 2018 11:58:54 +0000 (13:58 +0200)
committerMarek Vasut <marex@denx.de>
Mon, 13 Aug 2018 20:35:16 +0000 (22:35 +0200)
The restructuring of the SPL dropped registration of the FPGA in SPL,
readd it.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <chin.liang.see@intel.com>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Fixes: c859f2a77d98 ("arm: socfpga: Restructure the SPL file")
arch/arm/mach-socfpga/spl_a10.c

index fe4782c9cb6e3197fde610750968131cfd0de215..4164e4d31c3160b15ef3d35e329d4797babbcf10 100644 (file)
@@ -17,6 +17,7 @@
 #include <asm/arch/scan_manager.h>
 #include <asm/arch/sdram.h>
 #include <asm/arch/scu.h>
+#include <asm/arch/misc.h>
 #include <asm/arch/nic301.h>
 #include <asm/sections.h>
 #include <fdtdec.h>
@@ -79,6 +80,11 @@ void spl_board_init(void)
 
        /* enable console uart printing */
        preloader_console_init();
+
+       WATCHDOG_RESET();
+
+       /* Add device descriptor to FPGA device table */
+       socfpga_fpga_add();
 }
 
 void board_init_f(ulong dummy)