diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-17 10:30:56 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-17 10:30:56 -0400 |
| commit | 8c650a9fed1395e50b011910084f25447ec661a5 (patch) | |
| tree | 017e61fb83129f75347fb9be74920b3b32badd3c | |
| parent | 3d240d89c4576e98fa04c8bf5c6fe64cf2f1e53a (diff) | |
| parent | a89441a74f6df1f75b942f6906724620fad2e8e1 (diff) | |
| download | u-boot-8c650a9fed1395e50b011910084f25447ec661a5.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
- Misc gen5 fixes
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/spl_gen5.c | 2 | ||||
| -rw-r--r-- | include/configs/socfpga_common.h | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index be2c96a93d..1cb89c6f15 100644 --- 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 87b76b47de..47e63709ad 100644 --- 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 d1034ac280..36b0ed5459 100644 --- 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 |