rockchip: Kconfig: move ROCKCHIP_BOOT_MODE_REG to soc Kconfig

Rockchip SoCs have different ROCKCHIP_BOOT_MODE_REG value,
move it to SoC's own Kconfig, and add address for rk3128 and
rk3328 so that all SoCs have available address.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 52b83fc61146e20b0fa8d7510fc4b008af5b0b75..85f88cea77982549e2896b974877b5459a016f95 100644 (file)
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -225,14 +225,6 @@ config TPL_ROCKCHIP_BACK_TO_BROM
 
 config ROCKCHIP_BOOT_MODE_REG
        hex "Rockchip boot mode flag register address"
-       default 0x200081c8 if ROCKCHIP_RK3036
-       default 0x20004040 if ROCKCHIP_RK3188
-       default 0x110005c8 if ROCKCHIP_RK322X
-       default 0xff730094 if ROCKCHIP_RK3288
-       default 0xff738200 if ROCKCHIP_RK3368
-       default 0xff320300 if ROCKCHIP_RK3399
-       default 0x10300580 if ROCKCHIP_RV1108
-       default 0
        help
          The Soc will enter to different boot mode(defined in asm/arch-rockchip/boot_mode.h)
          according to the value from this register.

diff --git a/arch/arm/mach-rockchip/rk3036/Kconfig b/arch/arm/mach-rockchip/rk3036/Kconfig
index 0f6b5c462933cc43cd5dbca8a3361ae4c68362dc..51cd43b396fae3c98c48e53ed8d5a73bcd4eeaeb 100644 (file)
--- a/arch/arm/mach-rockchip/rk3036/Kconfig
+++ b/arch/arm/mach-rockchip/rk3036/Kconfig
@@ -13,6 +13,9 @@ config TARGET_KYLIN_RK3036
 
 endchoice
 
+config ROCKCHIP_BOOT_MODE_REG
+       default 0x200081c8
+
 config SYS_SOC
        default "rk3036"
 

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

diff --git a/arch/arm/mach-rockchip/rk3188/Kconfig b/arch/arm/mach-rockchip/rk3188/Kconfig
index a6fc691fb6c784e89eaec4f98d1600875657df16..e24e68ea518ab087f72618da84ef3c82537d9bd1 100644 (file)
--- a/arch/arm/mach-rockchip/rk3188/Kconfig
+++ b/arch/arm/mach-rockchip/rk3188/Kconfig
@@ -9,6 +9,9 @@ config TARGET_ROCK
          Expansion connectors provide access to display pins, I2C, SPI,
          UART and GPIOs.
 
+config ROCKCHIP_BOOT_MODE_REG
+       default 0x20004040
+
 config SYS_SOC
        default "rk3188"
 

diff --git a/arch/arm/mach-rockchip/rk322x/Kconfig b/arch/arm/mach-rockchip/rk322x/Kconfig
index cffb53183b56ab1f88539dd9a5d21f2c0fe6929b..60e99a7e3bbb43f81cbbe767528b8a632cec8d57 100644 (file)
--- a/arch/arm/mach-rockchip/rk322x/Kconfig
+++ b/arch/arm/mach-rockchip/rk322x/Kconfig
@@ -5,6 +5,9 @@ config TARGET_EVB_RK3229
        bool "EVB_RK3229"
        select BOARD_LATE_INIT
 
+config ROCKCHIP_BOOT_MODE_REG
+       default 0x110005c8
+
 config SYS_SOC
        default "rk322x"
 

diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig
index 0dc5123fb65bf93adadd7638eff825125f260fb8..a03b36bff3f38d0b45b68dd195e64c25106402b5 100644 (file)
--- a/arch/arm/mach-rockchip/rk3288/Kconfig
+++ b/arch/arm/mach-rockchip/rk3288/Kconfig
@@ -139,6 +139,9 @@ config ROCKCHIP_FAST_SPL
          voltage. This option is only available on boards which support it
          and have the required PMIC code.
 
+config ROCKCHIP_BOOT_MODE_REG
+       default 0xff730094
+
 config SYS_SOC
        default "rk3288"
 

diff --git a/arch/arm/mach-rockchip/rk3328/Kconfig b/arch/arm/mach-rockchip/rk3328/Kconfig
index 6c5c4303a356edb3f1d69144bc1de12436133da4..8ad7f56cbf653405ea3d02abd1a290a01765dcaf 100644 (file)
--- a/arch/arm/mach-rockchip/rk3328/Kconfig
+++ b/arch/arm/mach-rockchip/rk3328/Kconfig
@@ -12,6 +12,9 @@ config TARGET_EVB_RK3328
 
 endchoice
 
+config ROCKCHIP_BOOT_MODE_REG
+       default 0xff1005c8
+
 config SYS_SOC
        default "rk3328"
 

diff --git a/arch/arm/mach-rockchip/rk3368/Kconfig b/arch/arm/mach-rockchip/rk3368/Kconfig
index 31ef243a75dcdd8f30414151ace027fa8fe9bb3f..141d2f67aa1e536b6ee1469abf51d8f67c4d2d3b 100644 (file)
--- a/arch/arm/mach-rockchip/rk3368/Kconfig
+++ b/arch/arm/mach-rockchip/rk3368/Kconfig
@@ -42,6 +42,9 @@ config TARGET_EVB_PX5
          sensor STK3410.
 endchoice
 
+config ROCKCHIP_BOOT_MODE_REG
+       default 0xff738200
+
 config SYS_SOC
        default "rk3368"
 

diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig
index 231ba14cca9334a5edeba9aa778b8a5b7109cd59..f582577d974de9c771ee74e7bfc99413c8ff9784 100644 (file)
--- a/arch/arm/mach-rockchip/rk3399/Kconfig
+++ b/arch/arm/mach-rockchip/rk3399/Kconfig
@@ -64,6 +64,9 @@ config TARGET_CHROMEBOOK_BOB
 
 endchoice
 
+config ROCKCHIP_BOOT_MODE_REG
+       default 0xff320300
+
 config SYS_SOC
        default "rk3399"
 

diff --git a/arch/arm/mach-rockchip/rv1108/Kconfig b/arch/arm/mach-rockchip/rv1108/Kconfig
index c5402ab1bd9d9007a40e4307319789fd8cb3affd..a12216dccf66c7a312661a110c9d98229eea6154 100644 (file)
--- a/arch/arm/mach-rockchip/rv1108/Kconfig
+++ b/arch/arm/mach-rockchip/rv1108/Kconfig
@@ -27,6 +27,9 @@ config TARGET_ELGIN_RV1108
 
 endchoice
 
+config ROCKCHIP_BOOT_MODE_REG
+       default 0x10300580
+
 config SYS_SOC
        default "rv1108"