Merge branch 'master' of git://git.denx.de/u-boot-socfpga

- Misc gen5 fixes

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index be2c96a93d5e6a487b355c277bb3bd0473aeff89..1cb89c6f150358b66aadb2148912a5e56737cd85 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -902,7 +902,7 @@ config ARCH_SOCFPGA
        select SYS_THUMB_BUILD if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
        select SYSRESET
        select SYSRESET_SOCFPGA if TARGET_SOCFPGA_GEN5 || TARGET_SOCFPGA_ARRIA10
-       select SYSRESET_SOCFPGA_STRATIX10 if TARGET_SOCFPGA_STRATIX10
+       select SYSRESET_SOCFPGA_S10 if TARGET_SOCFPGA_STRATIX10
        imply CMD_DM
        imply CMD_MTDPARTS
        imply CRC32_VERIFY

diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c
index 87b76b47de31e7ade7a9f4d5e1f07a3731e26045..47e63709ad88dabd132cc0b94ab42d151ebfdf9b 100644 (file)
--- a/arch/arm/mach-socfpga/spl_gen5.c
+++ b/arch/arm/mach-socfpga/spl_gen5.c
@@ -79,8 +79,6 @@ void board_init_f(ulong dummy)
                writel(SYSMGR_ECC_OCRAM_DERR  | SYSMGR_ECC_OCRAM_EN,
                       &sysmgr_regs->eccgrp_ocram);
 
-       memset(__bss_start, 0, __bss_end - __bss_start);
-
        socfpga_sdram_remap_zero();
        socfpga_pl310_clear();
 

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index d1034ac280c52a85e389dce84febbe3a3f2a49cd..36b0ed54596c6ff150aee0e64a37bb3948d67c0e 100644 (file)
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -203,7 +203,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 /* SPL SDMMC boot support */
 #ifdef CONFIG_SPL_MMC_SUPPORT
 #if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_FS_EXT4)
-#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot-dtb.img"
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME                "u-boot.img"
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
 #endif
 #else