Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12aae309 authored by Haifeng Yan's avatar Haifeng Yan Committed by Olof Johansson
Browse files

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: default avatarHaifeng Yan <yanhaifeng@gmail.com>
Signed-off-by: default avatarJiancheng Xue <jchxue@gmail.com>
Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@linaro.org>
Acked-by: default avatarWei Xu <xuwei5@hisilicon.com>
[olof: fixed description typos]
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 06cc5c1d
Loading
Loading
Loading
Loading
+10 −2
Original line number Diff line number Diff line
@@ -223,6 +223,14 @@ choice
		  Say Y here if you want kernel low-level debugging support
		  on HI3716 UART.

	config DEBUG_HIX5HD2_UART
		bool "Hisilicon Hix5hd2 Debug UART"
		depends on ARCH_HIX5HD2
		select DEBUG_UART_PL01X
		help
		  Say Y here if you want kernel low-level debugging support
		  on Hix5hd2 UART.

	config DEBUG_HIGHBANK_UART
		bool "Kernel low-level debugging messages via Highbank UART"
		depends on ARCH_HIGHBANK
@@ -1097,7 +1105,7 @@ config DEBUG_UART_PHYS
	default 0xf1012000 if ARCH_DOVE || ARCH_MV78XX0 || \
				ARCH_ORION5X
	default 0xf7fc9000 if DEBUG_BERLIN_UART
	default 0xf8b00000 if DEBUG_HI3716_UART
	default 0xf8b00000 if DEBUG_HIX5HD2_UART
	default 0xf991e000 if DEBUG_QCOM_UARTDM
	default 0xfcb00000 if DEBUG_HI3620_UART
	default 0xfe800000 if ARCH_IOP32X
@@ -1150,7 +1158,7 @@ config DEBUG_UART_VIRT
	default 0xfe230000 if DEBUG_PICOXCELL_UART
	default 0xfe300000 if DEBUG_BCM_KONA_UART
	default 0xfe800000 if ARCH_IOP32X
	default 0xfeb00000 if DEBUG_HI3620_UART || DEBUG_HI3716_UART
	default 0xfeb00000 if DEBUG_HI3620_UART || DEBUG_HIX5HD2_UART
	default 0xfeb24000 if DEBUG_RK3X_UART0
	default 0xfeb26000 if DEBUG_RK3X_UART1
	default 0xfeb30c00 if DEBUG_KEYSTONE_UART0