aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaifeng Yan <yanhaifeng@gmail.com>2014-04-10 23:40:58 -0400
committerOlof Johansson <olof@lixom.net>2014-07-31 01:32:20 -0400
commit12aae30974546921c45c7c1b347cbc4ae206bf72 (patch)
tree7f8fca3978ddfea9b2f49ed76058bb5afbf20b83
parent06cc5c1d4d7313bc864e9aac1d1cbd63d8b9ca4c (diff)
ARM: debug: Rename Hi3716 to HIX5HD2
Rename Hisilicon HI3716 to HIX5HD2 and add dependency on ARCH_HIX5HD2. HiX5HD2 is a SoC with dual Cortex A9 cores for STB market, and original Hi3xxx SoC is for mobile market. To avoid confusing the two types of SoCs and also because of different implementation (SMP, IPs integrated and earlycon config), rename Hi3716 to HIX5HD2 and add ARCH_HIX5HD2. Signed-off-by: Haifeng Yan <yanhaifeng@gmail.com> Signed-off-by: Jiancheng Xue <jchxue@gmail.com> Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org> Acked-by: Wei Xu <xuwei5@hisilicon.com> [olof: fixed description typos] Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/Kconfig.debug12
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 640770c7b6d2..a81d4893fada 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -223,6 +223,14 @@ choice
223 Say Y here if you want kernel low-level debugging support 223 Say Y here if you want kernel low-level debugging support
224 on HI3716 UART. 224 on HI3716 UART.
225 225
226 config DEBUG_HIX5HD2_UART
227 bool "Hisilicon Hix5hd2 Debug UART"
228 depends on ARCH_HIX5HD2
229 select DEBUG_UART_PL01X
230 help
231 Say Y here if you want kernel low-level debugging support
232 on Hix5hd2 UART.
233
226 config DEBUG_HIGHBANK_UART 234 config DEBUG_HIGHBANK_UART
227 bool "Kernel low-level debugging messages via Highbank UART" 235 bool "Kernel low-level debugging messages via Highbank UART"
228 depends on ARCH_HIGHBANK 236 depends on ARCH_HIGHBANK
@@ -1097,7 +1105,7 @@ config DEBUG_UART_PHYS
1097 default 0xf1012000 if ARCH_DOVE || ARCH_MV78XX0 || \ 1105 default 0xf1012000 if ARCH_DOVE || ARCH_MV78XX0 || \
1098 ARCH_ORION5X 1106 ARCH_ORION5X
1099 default 0xf7fc9000 if DEBUG_BERLIN_UART 1107 default 0xf7fc9000 if DEBUG_BERLIN_UART
1100 default 0xf8b00000 if DEBUG_HI3716_UART 1108 default 0xf8b00000 if DEBUG_HIX5HD2_UART
1101 default 0xf991e000 if DEBUG_QCOM_UARTDM 1109 default 0xf991e000 if DEBUG_QCOM_UARTDM
1102 default 0xfcb00000 if DEBUG_HI3620_UART 1110 default 0xfcb00000 if DEBUG_HI3620_UART
1103 default 0xfe800000 if ARCH_IOP32X 1111 default 0xfe800000 if ARCH_IOP32X
@@ -1150,7 +1158,7 @@ config DEBUG_UART_VIRT
1150 default 0xfe230000 if DEBUG_PICOXCELL_UART 1158 default 0xfe230000 if DEBUG_PICOXCELL_UART
1151 default 0xfe300000 if DEBUG_BCM_KONA_UART 1159 default 0xfe300000 if DEBUG_BCM_KONA_UART
1152 default 0xfe800000 if ARCH_IOP32X 1160 default 0xfe800000 if ARCH_IOP32X
1153 default 0xfeb00000 if DEBUG_HI3620_UART || DEBUG_HI3716_UART 1161 default 0xfeb00000 if DEBUG_HI3620_UART || DEBUG_HIX5HD2_UART
1154 default 0xfeb24000 if DEBUG_RK3X_UART0 1162 default 0xfeb24000 if DEBUG_RK3X_UART0
1155 default 0xfeb26000 if DEBUG_RK3X_UART1 1163 default 0xfeb26000 if DEBUG_RK3X_UART1
1156 default 0xfeb30c00 if DEBUG_KEYSTONE_UART0 1164 default 0xfeb30c00 if DEBUG_KEYSTONE_UART0