summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2016-09-13 14:56:05 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2016-09-13 14:56:05 +0200
commit0e1892b2e9348a94f58d1a4518e931c8ba46843e (patch)
tree46e8d250a917c5663aa5105b68408432bd4ff096 /common
parentdd534571bdabeea50e32399b7661b3204275e724 (diff)
parentff694ddc5105693253aef413eca077e36026e96d (diff)
downloadbarebox-0e1892b2e9348a94f58d1a4518e931c8ba46843e.tar.gz
barebox-0e1892b2e9348a94f58d1a4518e931c8ba46843e.tar.xz
Merge branch 'for-next/rockchip'
Diffstat (limited to 'common')
-rw-r--r--common/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/Kconfig b/common/Kconfig
index 5bd50cb66d..f2badc7707 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1093,11 +1093,11 @@ config DEBUG_AM33XX_UART
on AM33XX.
config DEBUG_ROCKCHIP_UART
- bool "RK31xx Debug UART"
+ bool "RK3xxx Debug UART"
depends on ARCH_ROCKCHIP
help
Say Y here if you want kernel low-level debugging support
- on RK31XX.
+ on RK3XXX.
endchoice
@@ -1132,7 +1132,7 @@ config DEBUG_OMAP_UART_PORT
AM33XX: 0 - 2
config DEBUG_ROCKCHIP_UART_PORT
- int "RK31xx UART debug port" if DEBUG_ROCKCHIP_UART
+ int "RK3xxx UART debug port" if DEBUG_ROCKCHIP_UART
default 2
depends on ARCH_ROCKCHIP
help