aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/Kconfig.debug20
-rw-r--r--arch/arm/mach-mediatek/Kconfig4
2 files changed, 22 insertions, 2 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 6c23769318ac..08707ef1ad84 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -885,6 +885,22 @@ choice
885 Say Y here if you want kernel low-level debugging support 885 Say Y here if you want kernel low-level debugging support
886 for Mediatek mt6589 based platforms on UART0. 886 for Mediatek mt6589 based platforms on UART0.
887 887
888 config DEBUG_MT8127_UART0
889 bool "Mediatek mt8127 UART0"
890 depends on ARCH_MEDIATEK
891 select DEBUG_UART_8250
892 help
893 Say Y here if you want kernel low-level debugging support
894 for Mediatek mt8127 based platforms on UART0.
895
896 config DEBUG_MT8135_UART3
897 bool "Mediatek mt8135 UART3"
898 depends on ARCH_MEDIATEK
899 select DEBUG_UART_8250
900 help
901 Say Y here if you want kernel low-level debugging support
902 for Mediatek mt8135 based platforms on UART3.
903
888 config DEBUG_VEXPRESS_UART0_DETECT 904 config DEBUG_VEXPRESS_UART0_DETECT
889 bool "Autodetect UART0 on Versatile Express Cortex-A core tiles" 905 bool "Autodetect UART0 on Versatile Express Cortex-A core tiles"
890 depends on ARCH_VEXPRESS && CPU_CP15_MMU 906 depends on ARCH_VEXPRESS && CPU_CP15_MMU
@@ -1133,7 +1149,9 @@ config DEBUG_UART_PHYS
1133 default 0x10126000 if DEBUG_RK3X_UART1 1149 default 0x10126000 if DEBUG_RK3X_UART1
1134 default 0x101f1000 if ARCH_VERSATILE 1150 default 0x101f1000 if ARCH_VERSATILE
1135 default 0x101fb000 if DEBUG_NOMADIK_UART 1151 default 0x101fb000 if DEBUG_NOMADIK_UART
1152 default 0x11002000 if DEBUG_MT8127_UART0
1136 default 0x11006000 if DEBUG_MT6589_UART0 1153 default 0x11006000 if DEBUG_MT6589_UART0
1154 default 0x11009000 if DEBUG_MT8135_UART3
1137 default 0x16000000 if ARCH_INTEGRATOR 1155 default 0x16000000 if ARCH_INTEGRATOR
1138 default 0x18000300 if DEBUG_BCM_5301X 1156 default 0x18000300 if DEBUG_BCM_5301X
1139 default 0x1c090000 if DEBUG_VEXPRESS_UART0_RS1 1157 default 0x1c090000 if DEBUG_VEXPRESS_UART0_RS1
@@ -1202,7 +1220,9 @@ config DEBUG_UART_VIRT
1202 default 0xf01fb000 if DEBUG_NOMADIK_UART 1220 default 0xf01fb000 if DEBUG_NOMADIK_UART
1203 default 0xf0201000 if DEBUG_BCM2835 1221 default 0xf0201000 if DEBUG_BCM2835
1204 default 0xf1000300 if DEBUG_BCM_5301X 1222 default 0xf1000300 if DEBUG_BCM_5301X
1223 default 0xf1002000 if DEBUG_MT8127_UART0
1205 default 0xf1006000 if DEBUG_MT6589_UART0 1224 default 0xf1006000 if DEBUG_MT6589_UART0
1225 default 0xf1009000 if DEBUG_MT8135_UART3
1206 default 0xf11f1000 if ARCH_VERSATILE 1226 default 0xf11f1000 if ARCH_VERSATILE
1207 default 0xf1600000 if ARCH_INTEGRATOR 1227 default 0xf1600000 if ARCH_INTEGRATOR
1208 default 0xf1c28000 if DEBUG_SUNXI_UART0 1228 default 0xf1c28000 if DEBUG_SUNXI_UART0
diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig
index 2c043a210db0..f73f588f649c 100644
--- a/arch/arm/mach-mediatek/Kconfig
+++ b/arch/arm/mach-mediatek/Kconfig
@@ -1,6 +1,6 @@
1config ARCH_MEDIATEK 1config ARCH_MEDIATEK
2 bool "Mediatek MT6589 SoC" if ARCH_MULTI_V7 2 bool "Mediatek MT65xx & MT81xx SoC" if ARCH_MULTI_V7
3 select ARM_GIC 3 select ARM_GIC
4 select MTK_TIMER 4 select MTK_TIMER
5 help 5 help
6 Support for Mediatek Cortex-A7 Quad-Core-SoC MT6589. 6 Support for Mediatek MT65xx & MT81xx SoCs