diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-25 08:18:50 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-25 08:18:50 -0400 |
| commit | 078656186f1037894c45682ca74d0921de8a7010 (patch) | |
| tree | 20a323869e7d79f9da8996259066c7446beb292a /include | |
| parent | 8ee3a24fdc237c76cead618a173740594287dd96 (diff) | |
| parent | c92b50a44b95e706b9c0c97544bd7504fe6d36e9 (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-riscv
- Sipeed Maix support S-mode.
- Provide command sbi.
- Use fdtdec_get_addr_size_auto_parent to get fu540 cache base address.
- Fix a compiler error with CONFIG_SPL_SMP=n.
- Fix sifive ram driver 32 compiler warnings.
- Fix kendryte/pll.h redefine nop() warning.
Diffstat (limited to 'include')
| -rw-r--r-- | include/kendryte/pll.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/kendryte/pll.h b/include/kendryte/pll.h index c8e3200799..55a40b9c97 100644 --- a/include/kendryte/pll.h +++ b/include/kendryte/pll.h @@ -7,6 +7,7 @@ #include <clk.h> #include <test/export.h> +#include <asm/io.h> #define K210_PLL_CLKR GENMASK(3, 0) #define K210_PLL_CLKF GENMASK(9, 4) @@ -43,9 +44,13 @@ struct k210_pll_config { #ifdef CONFIG_UNIT_TEST TEST_STATIC int k210_pll_calc_config(u32 rate, u32 rate_in, struct k210_pll_config *best); + +#ifndef nop #define nop() #endif +#endif + extern const struct clk_ops k210_pll_ops; struct clk *k210_register_pll_struct(const char *name, const char *parent_name, |