diff options
| author | Tom Rini <trini@konsulko.com> | 2018-08-24 16:11:12 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-08-24 16:11:12 -0400 |
| commit | a376702f761be51227bfc8d0ae06722ec40687d8 (patch) | |
| tree | c53eb4f6d480387f52b68f9688cb02a9919d1367 /arch/arm/mach-socfpga/include | |
| parent | 15fd1b7903a3090a03cfe453f661822a613a91ee (diff) | |
| parent | a029f540c54c39847c329fc70b1b2e0ab6dedbcd (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'arch/arm/mach-socfpga/include')
| -rw-r--r-- | arch/arm/mach-socfpga/include/mach/clock_manager_arria10.h | 3 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/include/mach/misc.h | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager_arria10.h b/arch/arm/mach-socfpga/include/mach/clock_manager_arria10.h index b3c8853aa3..de8c22540f 100644 --- a/arch/arm/mach-socfpga/include/mach/clock_manager_arria10.h +++ b/arch/arm/mach-socfpga/include/mach/clock_manager_arria10.h @@ -89,8 +89,9 @@ struct socfpga_clock_manager { struct socfpga_clock_manager_altera altera; }; -void cm_use_intosc(void); +#ifdef CONFIG_SPL_BUILD int cm_basic_init(const void *blob); +#endif unsigned int cm_get_l4_sp_clk_hz(void); unsigned long cm_get_mpu_clk_hz(void); diff --git a/arch/arm/mach-socfpga/include/mach/misc.h b/arch/arm/mach-socfpga/include/mach/misc.h index e7e08b72d2..4fc9570a04 100644 --- a/arch/arm/mach-socfpga/include/mach/misc.h +++ b/arch/arm/mach-socfpga/include/mach/misc.h @@ -25,6 +25,11 @@ static inline void socfpga_fpga_add(void) {} void socfpga_sdram_remap_zero(void); #endif +#ifdef CONFIG_TARGET_SOCFPGA_ARRIA10 +void socfpga_init_security_policies(void); +void socfpga_sdram_remap_zero(void); +#endif + void do_bridge_reset(int enable); #endif /* _MISC_H_ */ |