diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-22 13:22:26 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-22 13:22:26 (GMT) |
| commit | 9f03247edc7761b608db31104821b4518a70e691 (patch) | |
| tree | 1f42f9d51050f960148adc49177f811b250588b9 /arch | |
| parent | 89ca873e2ddea859526f25f678fa53dda055e90f (diff) | |
| parent | 766d2609dd7fbad0faa89c7dff26edc108afa890 (diff) | |
| download | u-boot-9f03247edc7761b608db31104821b4518a70e691.tar.xz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv8/zynqmp/clk.c | 16 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-zynqmp/clk.h | 1 | ||||
| -rw-r--r-- | arch/arm/lib/spl.c | 2 |
4 files changed, 3 insertions, 18 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 585b408..397981a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -669,6 +669,8 @@ config ARCH_ZYNQMP select OF_CONTROL select DM_SERIAL select SUPPORT_SPL + select CLK + select SPL_CLK config TEGRA bool "NVIDIA Tegra" diff --git a/arch/arm/cpu/armv8/zynqmp/clk.c b/arch/arm/cpu/armv8/zynqmp/clk.c index 690c72d..f7e5ebf 100644 --- a/arch/arm/cpu/armv8/zynqmp/clk.c +++ b/arch/arm/cpu/armv8/zynqmp/clk.c @@ -12,22 +12,6 @@ DECLARE_GLOBAL_DATA_PTR; -unsigned long get_uart_clk(int dev_id) -{ - u32 ver = zynqmp_get_silicon_version(); - - switch (ver) { - case ZYNQMP_CSU_VERSION_VELOCE: - return 48000; - case ZYNQMP_CSU_VERSION_EP108: - return 25000000; - case ZYNQMP_CSU_VERSION_QEMU: - return 133000000; - } - - return 100000000; -} - unsigned long zynqmp_get_system_timer_freq(void) { u32 ver = zynqmp_get_silicon_version(); diff --git a/arch/arm/include/asm/arch-zynqmp/clk.h b/arch/arm/include/asm/arch-zynqmp/clk.h index b18333d..bfd53b5 100644 --- a/arch/arm/include/asm/arch-zynqmp/clk.h +++ b/arch/arm/include/asm/arch-zynqmp/clk.h @@ -8,7 +8,6 @@ #ifndef _ASM_ARCH_CLK_H_ #define _ASM_ARCH_CLK_H_ -unsigned long get_uart_clk(int dev_id); unsigned long zynqmp_get_system_timer_freq(void); #endif /* _ASM_ARCH_CLK_H_ */ diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index e428868..c1b8534 100644 --- a/arch/arm/lib/spl.c +++ b/arch/arm/lib/spl.c @@ -60,7 +60,7 @@ void __noreturn jump_to_image_linux(void *arg) typedef void (*image_entry_arg_t)(int, int, void *) __attribute__ ((noreturn)); image_entry_arg_t image_entry = - (image_entry_arg_t) spl_image.entry_point; + (image_entry_arg_t)(uintptr_t) spl_image.entry_point; cleanup_before_linux(); image_entry(0, machid, arg); } |