mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-08-19 05:31:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tom Rini 2020-04-28 10:08:20 -04:00
commit b4778ae94a
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-socfpga/include/mach/clock_manager_s10.h
View File

@ -85,7 +85,7 @@ void cm_basic_init(const struct cm_config * const cfg);
#define CLKMGR_S10_MAINPLL_VCOCALIB 0x8c #define CLKMGR_S10_MAINPLL_VCOCALIB 0x8c
/* Periphpll group */ /* Periphpll group */
#define CLKMGR_S10_PERPLL_EN 0xa4 #define CLKMGR_S10_PERPLL_EN 0xa4
#define CLKMGR_S10_PERPLL_BYPASS 0xac #define CLKMGR_S10_PERPLL_BYPASS 0xb0
#define CLKMGR_S10_PERPLL_CNTR2CLK 0xbc #define CLKMGR_S10_PERPLL_CNTR2CLK 0xbc
#define CLKMGR_S10_PERPLL_CNTR3CLK 0xc0 #define CLKMGR_S10_PERPLL_CNTR3CLK 0xc0
#define CLKMGR_S10_PERPLL_CNTR4CLK 0xc4 #define CLKMGR_S10_PERPLL_CNTR4CLK 0xc4

4
configs/socfpga_arria10_defconfig
View File

@ -27,6 +27,7 @@ CONFIG_CMD_GREPENV=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_EXT4_WRITE=y
CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0" CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
@ -49,4 +50,7 @@ CONFIG_SPI=y
CONFIG_TIMER=y CONFIG_TIMER=y
CONFIG_SPL_TIMER=y CONFIG_SPL_TIMER=y
CONFIG_DESIGNWARE_APB_TIMER=y CONFIG_DESIGNWARE_APB_TIMER=y
CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_DWC2=y
# CONFIG_SPL_WDT is not set # CONFIG_SPL_WDT is not set