diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-28 10:08:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-28 10:08:20 -0400 |
| commit | b4778ae94a42a86b34166606cd88c8dfc9899897 (patch) | |
| tree | 515e13fbf187ce27c392294ef558b01508304f07 | |
| parent | 545c747447706d9601cc5c65a85ec44e688bfe08 (diff) | |
| parent | b9d1671829b17f78c47f2d0d42a7f59767cdd84b (diff) | |
| download | u-boot-b4778ae94a42a86b34166606cd88c8dfc9899897.tar.gz | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
| -rw-r--r-- | arch/arm/mach-socfpga/include/mach/clock_manager_s10.h | 2 | ||||
| -rw-r--r-- | configs/socfpga_arria10_defconfig | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager_s10.h b/arch/arm/mach-socfpga/include/mach/clock_manager_s10.h index e710aa2f94..9d2b3babab 100644 --- a/arch/arm/mach-socfpga/include/mach/clock_manager_s10.h +++ b/arch/arm/mach-socfpga/include/mach/clock_manager_s10.h @@ -85,7 +85,7 @@ void cm_basic_init(const struct cm_config * const cfg); #define CLKMGR_S10_MAINPLL_VCOCALIB 0x8c /* Periphpll group */ #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_CNTR3CLK 0xc0 #define CLKMGR_S10_PERPLL_CNTR4CLK 0xc4 diff --git a/configs/socfpga_arria10_defconfig b/configs/socfpga_arria10_defconfig index ca34457ddd..35ae18fac0 100644 --- a/configs/socfpga_arria10_defconfig +++ b/configs/socfpga_arria10_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_GREPENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0" @@ -49,4 +50,7 @@ CONFIG_SPI=y CONFIG_TIMER=y CONFIG_SPL_TIMER=y CONFIG_DESIGNWARE_APB_TIMER=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_DWC2=y # CONFIG_SPL_WDT is not set |