mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 13:11:31 +00:00
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
- Misc gen5 fixes
This commit is contained in:
commit
8c650a9fed
3 changed files with 2 additions and 4 deletions
|
@ -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
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue