brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-07-05 18:56:15 +09:00
Code Issues Projects Releases Wiki Activity

rockchip: rk3128: use ARM arch timer instead of rk_timer

Browse Source 
We prefer to use ARM arch timer instead of rockchip timer, so that
we are using the same timer for SPL, U-Boot and Kernel, which will
make things simple and easy to track to boot time.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Kever Yang 2019-07-09 22:00:27 +08:00
parent ae5a3659f3
commit 1e72a757bb
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-rockchip/Makefile
View File

@ -41,12 +41,6 @@ endif
obj-$(CONFIG_$(SPL_TPL_)RAM) += sdram_common.o obj-$(CONFIG_$(SPL_TPL_)RAM) += sdram_common.o
ifndef CONFIG_ARM64
ifeq ($(CONFIG_ROCKCHIP_RK3188)$(CONFIG_ROCKCHIP_RK322X)$(CONFIG_ROCKCHIP_RK3036)$(CONFIG_ROCKCHIP_RK3288),)
obj-y += rk_timer.o
endif
endif
obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036/ obj-$(CONFIG_ROCKCHIP_RK3036) += rk3036/
obj-$(CONFIG_ROCKCHIP_RK3128) += rk3128/ obj-$(CONFIG_ROCKCHIP_RK3128) += rk3128/
ifndef CONFIG_TPL_BUILD ifndef CONFIG_TPL_BUILD

3
arch/arm/mach-rockchip/rk3128-board.c
View File

@ -12,7 +12,6 @@
#include <asm/arch-rockchip/periph.h> #include <asm/arch-rockchip/periph.h>
#include <asm/arch-rockchip/grf_rk3128.h> #include <asm/arch-rockchip/grf_rk3128.h>
#include <asm/arch-rockchip/boot_mode.h> #include <asm/arch-rockchip/boot_mode.h>
#include <asm/arch-rockchip/timer.h>
#include <power/regulator.h> #include <power/regulator.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -33,8 +32,6 @@ int board_init(void)
{ {
int ret = 0; int ret = 0;
rockchip_timer_init();
ret = regulators_enable_boot_on(false); ret = regulators_enable_boot_on(false);
if (ret) { if (ret) {
debug("%s: Cannot enable boot on regulator\n", __func__); debug("%s: Cannot enable boot on regulator\n", __func__);

7
include/configs/rk3128_common.h
View File

@ -14,9 +14,10 @@
#define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_CBSIZE 1024
#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_SKIP_LOWLEVEL_INIT
#define CONFIG_SYS_TIMER_RATE (24 * 1000 * 1000) #define CONFIG_ROCKCHIP_STIMER_BASE 0x200440a0
#define CONFIG_SYS_TIMER_BASE 0x200440a0 /* TIMER5 */ #define COUNTER_FREQUENCY 24000000
#define CONFIG_SYS_TIMER_COUNTER (CONFIG_SYS_TIMER_BASE + 8) #define CONFIG_SYS_ARCH_TIMER
#define CONFIG_SYS_HZ_CLOCK 24000000
#define CONFIG_SYS_INIT_SP_ADDR 0x60100000 #define CONFIG_SYS_INIT_SP_ADDR 0x60100000
#define CONFIG_SYS_LOAD_ADDR 0x60800800 #define CONFIG_SYS_LOAD_ADDR 0x60800800