diff options
| author | Kever Yang <kever.yang@rock-chips.com> | 2020-07-20 13:34:12 +0300 |
|---|---|---|
| committer | Kever Yang <kever.yang@rock-chips.com> | 2020-07-22 15:22:33 +0300 |
| commit | b32858ca510183f61c803595492230ea840e5499 (patch) | |
| tree | 6b7ae2f4bd8a53395b4c8f0c69d29d3e1017b42c | |
| parent | 40794c825f17881180852d4d010cacb3b45ce08e (diff) | |
| download | u-boot-b32858ca510183f61c803595492230ea840e5499.tar.xz | |
rockchip: ram: fix debug funcfion define when RAM_ROCKCHIP_DEBUG not set
The empty function define should not be in the header file, or else the
build will error with function multi definition after CONFIG_RAM_ROCKCHIP_DEBUG
is disabled.
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
| -rw-r--r-- | arch/arm/include/asm/arch-rockchip/sdram_common.h | 15 | ||||
| -rw-r--r-- | drivers/ram/rockchip/sdram_common.c | 13 |
2 files changed, 13 insertions, 15 deletions
diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h index 36d31156be..5efa6e9445 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -114,25 +114,10 @@ struct sdram_base_params { #define SYS_REG_ENC_CS1_COL(n, ch) (((n) - 9) << (0 + 2 * (ch))) #define SYS_REG_DEC_CS1_COL(n, ch) (9 + (((n) >> (0 + 2 * (ch))) & 0x3)) -#if !defined(CONFIG_RAM_ROCKCHIP_DEBUG) -inline void sdram_print_dram_type(unsigned char dramtype) -{ -} - -inline void sdram_print_ddr_info(struct sdram_cap_info *cap_info, - struct sdram_base_params *base) -{ -} - -inline void sdram_print_stride(unsigned int stride) -{ -} -#else void sdram_print_dram_type(unsigned char dramtype); void sdram_print_ddr_info(struct sdram_cap_info *cap_info, struct sdram_base_params *base); void sdram_print_stride(unsigned int stride); -#endif /* CONFIG_RAM_ROCKCHIP_DEBUG */ void sdram_org_config(struct sdram_cap_info *cap_info, struct sdram_base_params *base, diff --git a/drivers/ram/rockchip/sdram_common.c b/drivers/ram/rockchip/sdram_common.c index 6bc51572b2..b3e7421d08 100644 --- a/drivers/ram/rockchip/sdram_common.c +++ b/drivers/ram/rockchip/sdram_common.c @@ -117,6 +117,19 @@ void sdram_print_stride(unsigned int stride) printf("no stride\n"); } } +#else +inline void sdram_print_dram_type(unsigned char dramtype) +{ +} + +inline void sdram_print_ddr_info(struct sdram_cap_info *cap_info, + struct sdram_base_params *base) +{ +} + +inline void sdram_print_stride(unsigned int stride) +{ +} #endif /* |