rockchip: move ROCKCHIP_STIMER_BASE to Kconfig

Move ROCKCHIP_STIMER_BASE to Kconfig.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 308dc09b038989440ef4a528dc32723e8049e8ee..811964973ae924fc6b19bf910877bb1ef9986796 100644 (file)
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -339,6 +339,16 @@ config ROCKCHIP_BOOT_MODE_REG
          The Soc will enter to different boot mode(defined in asm/arch-rockchip/boot_mode.h)
          according to the value from this register.
 
+config ROCKCHIP_STIMER
+       bool "Rockchip STIMER support"
+       default y
+       help
+         Enable Rockchip STIMER support.
+
+config ROCKCHIP_STIMER_BASE
+       hex
+       depends on ROCKCHIP_STIMER
+
 config ROCKCHIP_SPL_RESERVE_IRAM
        hex "Size of IRAM reserved in SPL"
        default 0

diff --git a/arch/arm/mach-rockchip/px30/Kconfig b/arch/arm/mach-rockchip/px30/Kconfig
index 145bf3591ffb25b6ce62060c51ed9afd8d85b604..4886fe946e3a194eec3e6c7e05f7bdd1b84a54fb 100644 (file)
--- a/arch/arm/mach-rockchip/px30/Kconfig
+++ b/arch/arm/mach-rockchip/px30/Kconfig
@@ -38,6 +38,9 @@ config TARGET_PX30_CORE
 config ROCKCHIP_BOOT_MODE_REG
        default 0xff010200
 
+config ROCKCHIP_STIMER_BASE
+       default 0xff220020
+
 config SYS_SOC
        default "px30"
 

diff --git a/arch/arm/mach-rockchip/rk3036/Kconfig b/arch/arm/mach-rockchip/rk3036/Kconfig
index b746795d813f0087080744550cf5ea2272a1a472..111531be1ef4e084a72f7b098662f4ca3aacac2a 100644 (file)
--- a/arch/arm/mach-rockchip/rk3036/Kconfig
+++ b/arch/arm/mach-rockchip/rk3036/Kconfig
@@ -16,6 +16,9 @@ endchoice
 config ROCKCHIP_BOOT_MODE_REG
        default 0x200081c8
 
+config ROCKCHIP_STIMER_BASE
+       default 0x200440a0
+
 config SYS_SOC
        default "rk3036"
 

diff --git a/arch/arm/mach-rockchip/rk3128/Kconfig b/arch/arm/mach-rockchip/rk3128/Kconfig
index b867401c7f5bd603d1d6c0b024db32a0c17a1df2..9cc494eb4098831f018cdee410b3d8469ebcd598 100644 (file)
--- a/arch/arm/mach-rockchip/rk3128/Kconfig
+++ b/arch/arm/mach-rockchip/rk3128/Kconfig
@@ -16,6 +16,9 @@ endchoice
 config ROCKCHIP_BOOT_MODE_REG
        default 0x100a0038
 
+config ROCKCHIP_STIMER_BASE
+       default 0x200440a0
+
 config SYS_SOC
        default "rk3128"
 

diff --git a/arch/arm/mach-rockchip/rk322x/Kconfig b/arch/arm/mach-rockchip/rk322x/Kconfig
index 6458cd55814a7d88f05654c70e3720a39871de8f..058f848ddc703682f7e9075c16ac9221cced3427 100644 (file)
--- a/arch/arm/mach-rockchip/rk322x/Kconfig
+++ b/arch/arm/mach-rockchip/rk322x/Kconfig
@@ -8,6 +8,9 @@ config TARGET_EVB_RK3229
 config ROCKCHIP_BOOT_MODE_REG
        default 0x110005c8
 
+config ROCKCHIP_STIMER_BASE
+       default 0x110d0020
+
 config SYS_SOC
        default "rk322x"
 

diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig
index f37b1bdfd50a645be62e970c542c66f7485c5c06..dd8c7826fc10d6b4dcc48a455286bdddbbb24acd 100644 (file)
--- a/arch/arm/mach-rockchip/rk3288/Kconfig
+++ b/arch/arm/mach-rockchip/rk3288/Kconfig
@@ -148,6 +148,9 @@ config ROCKCHIP_FAST_SPL
 config ROCKCHIP_BOOT_MODE_REG
        default 0xff730094
 
+config ROCKCHIP_STIMER_BASE
+       default 0xff810020
+
 config SYS_SOC
        default "rk3288"
 

diff --git a/arch/arm/mach-rockchip/rk3308/Kconfig b/arch/arm/mach-rockchip/rk3308/Kconfig
index 8fa536e15dceba755d1837eda5fcf288b927fc7f..194353e4cd9a4d3b1db523b90d19b1c536ea22fd 100644 (file)
--- a/arch/arm/mach-rockchip/rk3308/Kconfig
+++ b/arch/arm/mach-rockchip/rk3308/Kconfig
@@ -8,6 +8,12 @@ config TARGET_ROC_RK3308_CC
        bool "Firefly roc-rk3308-cc"
        select BOARD_LATE_INIT
 
+config ROCKCHIP_BOOT_MODE_REG
+       default 0xff000500
+
+config ROCKCHIP_STIMER_BASE
+       default 0xff1b00a0
+
 config SYS_SOC
        default "rk3308"
 
@@ -17,10 +23,6 @@ config SYS_MALLOC_F_LEN
 config SPL_SERIAL
        default y
 
-config ROCKCHIP_BOOT_MODE_REG
-       default 0xff000500
-
-
 source "board/rockchip/evb_rk3308/Kconfig"
 source "board/firefly/firefly-rk3308/Kconfig"
 

diff --git a/arch/arm/mach-rockchip/rk3328/Kconfig b/arch/arm/mach-rockchip/rk3328/Kconfig
index d13a16902267a7495a7528451aa0e476e6c3cb38..f6f1e06a83fe9d86ba9202e81ec20274829a50d8 100644 (file)
--- a/arch/arm/mach-rockchip/rk3328/Kconfig
+++ b/arch/arm/mach-rockchip/rk3328/Kconfig
@@ -15,6 +15,9 @@ endchoice
 config ROCKCHIP_BOOT_MODE_REG
        default 0xff1005c8
 
+config ROCKCHIP_STIMER_BASE
+       default 0xff1d0020
+
 config SYS_SOC
        default "rk3328"
 

diff --git a/arch/arm/mach-rockchip/rk3368/Kconfig b/arch/arm/mach-rockchip/rk3368/Kconfig
index 78eb96df3d10c9f07396fcb74270d31ea614a123..104db36737bf77a87b86a8409b3b76462976063f 100644 (file)
--- a/arch/arm/mach-rockchip/rk3368/Kconfig
+++ b/arch/arm/mach-rockchip/rk3368/Kconfig
@@ -45,6 +45,9 @@ endchoice
 config ROCKCHIP_BOOT_MODE_REG
        default 0xff738200
 
+config ROCKCHIP_STIMER_BASE
+       default 0xff830020
+
 config SYS_SOC
        default "rk3368"
 

diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig
index 0833e083d9ef775a8c6a028f546264bad45c4435..c1f251316cb2f61dbef709af511239dcdd0dc995 100644 (file)
--- a/arch/arm/mach-rockchip/rk3399/Kconfig
+++ b/arch/arm/mach-rockchip/rk3399/Kconfig
@@ -125,6 +125,9 @@ endchoice
 config ROCKCHIP_BOOT_MODE_REG
        default 0xff320300
 
+config ROCKCHIP_STIMER_BASE
+       default 0xff8680a0
+
 config SYS_SOC
        default "rk3399"
 

diff --git a/arch/arm/mach-rockchip/rk3568/Kconfig b/arch/arm/mach-rockchip/rk3568/Kconfig
index 201c63c2a9cc05d6259a58d8525e438ffbfadc67..4e7c02cce0606354e8cf852eafde1c9744eea6f1 100644 (file)
--- a/arch/arm/mach-rockchip/rk3568/Kconfig
+++ b/arch/arm/mach-rockchip/rk3568/Kconfig
@@ -9,6 +9,9 @@ config TARGET_EVB_RK3568
 config ROCKCHIP_BOOT_MODE_REG
        default 0xfdc20200
 
+config ROCKCHIP_STIMER_BASE
+       default 0xfdd1c020
+
 config SYS_SOC
        default "rk3568"
 

diff --git a/configs/rock_defconfig b/configs/rock_defconfig
index 290f5afd7874162a60db9dedcfcd6b29b7450c2c..4aa4608f9042ef58e9c1fb64fe8417d30029e3bb 100644 (file)
--- a/configs/rock_defconfig
+++ b/configs/rock_defconfig
@@ -11,6 +11,7 @@ CONFIG_ENV_OFFSET=0x3F8000
 CONFIG_DEFAULT_DEVICE_TREE="rk3188-radxarock"
 CONFIG_SPL_TEXT_BASE=0x10080800
 CONFIG_ROCKCHIP_RK3188=y
+# CONFIG_ROCKCHIP_STIMER is not set
 CONFIG_TARGET_ROCK=y
 CONFIG_SPL_STACK_R_ADDR=0x60080000
 CONFIG_DEBUG_UART_BASE=0x20064000

diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h
index 099238715711d5fe0eeff6aa1f7ca555706f5a59..dc609013f32d4bfd29b4eb55914fc64cfa37a89b 100644 (file)
--- a/include/configs/px30_common.h
+++ b/include/configs/px30_common.h
@@ -12,7 +12,6 @@
 
 #define CONFIG_SYS_NS16550_MEM32
 
-#define CONFIG_ROCKCHIP_STIMER_BASE    0xff220020
 #define COUNTER_FREQUENCY              24000000
 
 /* FIXME: ff020000 is pmu_mem (10k), while ff0e0000 is regular int_mem */

diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h
index 00c453d739d301c1635ef2447d711f9db024cfaf..5905518edf1990fb89563b1c78200f1f5cac969f 100644 (file)
--- a/include/configs/rk3036_common.h
+++ b/include/configs/rk3036_common.h
@@ -10,7 +10,6 @@
 
 #define CONFIG_SYS_CBSIZE              1024
 
-#define CONFIG_ROCKCHIP_STIMER_BASE    0x200440a0
 #define COUNTER_FREQUENCY              24000000
 #define CONFIG_SYS_HZ_CLOCK            24000000
 

diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h
index 97caceacfe66c48bc660f42ed571b08900032e21..d77a7d7b098ad2ea6722fe4c6710cfe4728edc3e 100644 (file)
--- a/include/configs/rk3128_common.h
+++ b/include/configs/rk3128_common.h
@@ -11,7 +11,6 @@
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_CBSIZE              1024
 
-#define CONFIG_ROCKCHIP_STIMER_BASE    0x200440a0
 #define COUNTER_FREQUENCY              24000000
 #define CONFIG_SYS_HZ_CLOCK            24000000
 

diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
index ef55ef0a83bb8c11cd641c5430bf396e906d8f6c..3258820fcdc5a82158bffa46e2098f1a019c3393 100644 (file)
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -11,7 +11,6 @@
 #define CONFIG_SYS_CBSIZE              1024
 #define CONFIG_SYS_BOOTM_LEN   (64 << 20)      /*  64M */
 
-#define CONFIG_ROCKCHIP_STIMER_BASE    0x110d0020
 #define COUNTER_FREQUENCY              24000000
 #define CONFIG_SYS_HZ_CLOCK            24000000
 

diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index 490da7cb23b22450d4beff8ba18b183b6627807c..e2e0f70a70c56227dbab539b78e71435651bf8aa 100644 (file)
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -13,7 +13,6 @@
 
 #define CONFIG_SYS_CBSIZE              1024
 
-#define CONFIG_ROCKCHIP_STIMER_BASE    0xff810020
 #define COUNTER_FREQUENCY              24000000
 #define CONFIG_SYS_HZ_CLOCK            24000000
 

diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h
index 1664707ca6589031ac37265c76fa0f05c7849702..9cda8d9c48bed866624486056e46ae9800e6f7cd 100644 (file)
--- a/include/configs/rk3308_common.h
+++ b/include/configs/rk3308_common.h
@@ -15,7 +15,6 @@
 
 #define CONFIG_SYS_NS16550_MEM32
 
-#define CONFIG_ROCKCHIP_STIMER_BASE    0xff1b00a0
 #define CONFIG_IRAM_BASE               0xfff80000
 #define CONFIG_SYS_INIT_SP_ADDR                0x00800000
 #define CONFIG_SPL_STACK               0x00400000

diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index c1e26a019b57ee0c41df61693749315dcdde91c6..8a5f0c8999fab0db644e00913cb2631127fe019b 100644 (file)
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -10,7 +10,6 @@
 
 #define CONFIG_IRAM_BASE               0xff090000
 
-#define CONFIG_ROCKCHIP_STIMER_BASE    0xff1d0020
 #define COUNTER_FREQUENCY              24000000
 
 #define CONFIG_SYS_CBSIZE              1024

diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h
index 8b239ca07da85cf5bfd7961639d1c927e196eba8..239296c1d2238d8f09899e112cc0eae3188f0ca4 100644 (file)
--- a/include/configs/rk3368_common.h
+++ b/include/configs/rk3368_common.h
@@ -15,7 +15,6 @@
 #define SDRAM_MAX_SIZE                 0xff000000
 #define CONFIG_SYS_CBSIZE              1024
 
-#define CONFIG_ROCKCHIP_STIMER_BASE    0xff830020
 #define COUNTER_FREQUENCY              24000000
 
 #define CONFIG_IRAM_BASE               0xff8c0000

diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index ed72c8bb6b110b2fbcf9ab088a9512916ba80507..4037dba58cc59feb8f87bc6dd277753d953af230 100644 (file)
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -11,7 +11,6 @@
 #define CONFIG_SYS_CBSIZE              1024
 
 #define COUNTER_FREQUENCY               24000000
-#define CONFIG_ROCKCHIP_STIMER_BASE    0xff8680a0
 
 #define CONFIG_IRAM_BASE               0xff8c0000
 

diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h
index 25d7c5cc8ffff7d2913edfc057ed876abe207d0a..5649cd64e0e0b966c48b3f0bfce16f66f36b417f 100644 (file)
--- a/include/configs/rk3568_common.h
+++ b/include/configs/rk3568_common.h
@@ -11,7 +11,6 @@
 #define CONFIG_SYS_CBSIZE              1024
 
 #define COUNTER_FREQUENCY               24000000
-#define CONFIG_ROCKCHIP_STIMER_BASE    0xfdd1c020
 
 #define CONFIG_IRAM_BASE               0xfdcc0000