forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c 
 kernel/arch/arm/Kconfig.debug
....@@ -9,7 +9,7 @@
99 	depends on MMU
1010 	select ARM_PTDUMP_CORE
1111 	select DEBUG_FS
12
-	---help---
12
+	help
1313 	  Say Y here if you want to show the kernel pagetable layout in a
1414 	  debugfs file. This information is only useful for kernel developers
1515 	  who are working in architecture specific areas of the kernel.
....@@ -21,7 +21,7 @@
2121 	bool "Warn on W+X mappings at boot"
2222 	depends on MMU
2323 	select ARM_PTDUMP_CORE
24
-	---help---
24
+	help
2525 		Generate a warning if any W+X mappings are found at boot.
2626 
2727 		This is useful for discovering cases where the kernel is leaving
....@@ -45,35 +45,42 @@
4545 
4646 		If in doubt, say "Y".
4747 
48
-# RMK wants arm kernels compiled with frame pointers or stack unwinding.
49
-# If you know what you are doing and are willing to live without stack
50
-# traces, you can get a slightly smaller kernel by setting this option to
51
-# n, but then RMK will have to kill you ;).
52
-config FRAME_POINTER
53
-	bool
54
-	depends on !THUMB2_KERNEL
55
-	default y if !ARM_UNWIND || FUNCTION_GRAPH_TRACER
48
+choice
49
+	prompt "Choose kernel unwinder"
50
+	default UNWINDER_ARM if AEABI
51
+	default UNWINDER_FRAME_POINTER if !AEABI
5652 	help
57
-	  If you say N here, the resulting kernel will be slightly smaller and
58
-	  faster. However, if neither FRAME_POINTER nor ARM_UNWIND are enabled,
59
-	  when a problem occurs with the kernel, the information that is
60
-	  reported is severely limited.
53
+	  This determines which method will be used for unwinding kernel stack
54
+	  traces for panics, oopses, bugs, warnings, perf, /proc/<pid>/stack,
55
+	  livepatch, lockdep, and more.
6156 
62
-config ARM_UNWIND
63
-	bool "Enable stack unwinding support (EXPERIMENTAL)"
64
-	depends on AEABI
65
-	default y
57
+config UNWINDER_FRAME_POINTER
58
+	bool "Frame pointer unwinder"
59
+	depends on !THUMB2_KERNEL
60
+	select ARCH_WANT_FRAME_POINTERS
61
+	select FRAME_POINTER
62
+	help
63
+	  This option enables the frame pointer unwinder for unwinding
64
+	  kernel stack traces.
65
+
66
+config UNWINDER_ARM
67
+	bool "ARM EABI stack unwinder"
68
+	depends on AEABI && !FUNCTION_GRAPH_TRACER
69
+	select ARM_UNWIND
6670 	help
6771 	  This option enables stack unwinding support in the kernel
6872 	  using the information automatically generated by the
6973 	  compiler. The resulting kernel image is slightly bigger but
7074 	  the performance is not affected. Currently, this feature
71
-	  only works with EABI compilers. If unsure say Y.
75
+	  only works with EABI compilers.
7276 
73
-config OLD_MCOUNT
77
+endchoice
78
+
79
+config ARM_UNWIND
7480 	bool
75
-	depends on FUNCTION_TRACER && FRAME_POINTER
76
-	default y
81
+
82
+config FRAME_POINTER
83
+	bool
7784 
7885 config DEBUG_USER
7986 	bool "Verbose user fault messages"
....@@ -140,14 +147,14 @@
140147 		    0x80024000      | 0xf0024000     | UART9
141148 
142149 	config DEBUG_AT91_RM9200_DBGU
143
-		bool "Kernel low-level debugging on AT91RM9200, AT91SAM9 DBGU"
150
+		bool "Kernel low-level debugging on AT91RM9200, AT91SAM9, SAM9X60 DBGU"
144151 		select DEBUG_AT91_UART
145
-		depends on SOC_AT91RM9200 || SOC_AT91SAM9
152
+		depends on SOC_AT91RM9200 || SOC_AT91SAM9 || SOC_SAM9X60
146153 		help
147154 		  Say Y here if you want kernel low-level debugging support
148155 		  on the DBGU port of:
149156 		    at91rm9200, at91sam9260, at91sam9g20, at91sam9261,
150
-		    at91sam9g10, at91sam9n12, at91sam9rl64, at91sam9x5
157
+		    at91sam9g10, at91sam9n12, at91sam9rl64, at91sam9x5, sam9x60
151158 
152159 	config DEBUG_AT91_SAM9263_DBGU
153160 		bool "Kernel low-level debugging on AT91SAM{9263,9G45,A5D3} DBGU"
....@@ -393,12 +400,12 @@
393400 		  Say Y here if you want kernel low-level debugging support
394401 		  on i.MX25.
395402 
396
-	config DEBUG_IMX21_IMX27_UART
397
-		bool "i.MX21 and i.MX27 Debug UART"
398
-		depends on SOC_IMX21 || SOC_IMX27
403
+	config DEBUG_IMX27_UART
404
+		bool "i.MX27 Debug UART"
405
+		depends on SOC_IMX27
399406 		help
400407 		  Say Y here if you want kernel low-level debugging support
401
-		  on i.MX21 or i.MX27.
408
+		  on i.MX27.
402409 
403410 	config DEBUG_IMX28_UART
404411 		bool "i.MX28 Debug UART"
....@@ -501,13 +508,6 @@
501508 		help
502509 		  Say Y here if you want the debug print routines to direct
503510 		  their output to UART1 serial port on KEYSTONE2 devices.
504
-
505
-	config DEBUG_KS8695_UART
506
-		bool "KS8695 Debug UART"
507
-		depends on ARCH_KS8695
508
-		help
509
-		  Say Y here if you want kernel low-level debugging support
510
-		  on KS8695.
511511 
512512 	config DEBUG_LPC18XX_UART0
513513 		bool "Kernel low-level debugging via LPC18xx/43xx UART0"
....@@ -630,13 +630,6 @@
630630 		help
631631 		  Say Y here if you want kernel low-level debugging support
632632 		  for Mediatek mt8135 based platforms on UART3.
633
-
634
-	config DEBUG_NETX_UART
635
-		bool "Kernel low-level debugging messages via NetX UART"
636
-		depends on ARCH_NETX
637
-		help
638
-		  Say Y here if you want kernel low-level debugging support
639
-		  on Hilscher NetX based platforms.
640633 
641634 	config DEBUG_NOMADIK_UART
642635 		bool "Kernel low-level debugging messages via NOMADIK UART"
....@@ -924,6 +917,20 @@
924917 		  Say Y here if you want kernel low-level debugging support
925918 		  via SCIF2 on Renesas RZ/A1H (R7S72100).
926919 
920
+	config DEBUG_R7S9210_SCIF2
921
+		bool "Kernel low-level debugging messages via SCIF2 on R7S9210"
922
+		depends on ARCH_R7S9210
923
+		help
924
+		  Say Y here if you want kernel low-level debugging support
925
+		  via SCIF2 on Renesas RZ/A2M (R7S9210).
926
+
927
+	config DEBUG_R7S9210_SCIF4
928
+		bool "Kernel low-level debugging messages via SCIF4 on R7S9210"
929
+		depends on ARCH_R7S9210
930
+		help
931
+		  Say Y here if you want kernel low-level debugging support
932
+		  via SCIF4 on Renesas RZ/A2M (R7S9210).
933
+
927934 	config DEBUG_RCAR_GEN1_SCIF0
928935 		bool "Kernel low-level debugging messages via SCIF0 on R8A7778"
929936 		depends on ARCH_R8A7778
....@@ -940,12 +947,13 @@
940947 
941948 	config DEBUG_RCAR_GEN2_SCIF0
942949 		bool "Kernel low-level debugging messages via SCIF0 on R-Car Gen2 and RZ/G1"
943
-		depends on ARCH_R8A7743 || ARCH_R8A7790 || ARCH_R8A7791 || \
944
-			ARCH_R8A7792 || ARCH_R8A7793
950
+		depends on ARCH_R8A7743 || ARCH_R8A7744 || ARCH_R8A7790 || \
951
+			ARCH_R8A7791 || ARCH_R8A7792 || ARCH_R8A7793
945952 		help
946953 		  Say Y here if you want kernel low-level debugging support
947
-		  via SCIF0 on Renesas RZ/G1M (R8A7743), R-Car H2 (R8A7790),
948
-		  M2-W (R8A7791), V2H (R8A7792), or M2-N (R8A7793).
954
+		  via SCIF0 on Renesas RZ/G1M (R8A7743), RZ/G1N (R8A7744),
955
+		  R-Car H2 (R8A7790), M2-W (R8A7791), V2H (R8A7792), or
956
+		  M2-N (R8A7793).
949957 
950958 	config DEBUG_RCAR_GEN2_SCIF1
951959 		bool "Kernel low-level debugging messages via SCIF1 on R8A77470"
....@@ -967,6 +975,13 @@
967975 		help
968976 		  Say Y here if you want kernel low-level debugging support
969977 		  via SCIF4 on Renesas RZ/G1E (R8A7745).
978
+
979
+	config DEBUG_RCAR_GEN2_SCIFA2
980
+		bool "Kernel low-level debugging messages via SCIFA2 on R8A7742"
981
+		depends on ARCH_R8A7742
982
+		help
983
+		  Say Y here if you want kernel low-level debugging support
984
+		  via SCIFA2 on Renesas RZ/G1H (R8A7742).
970985 
971986 	config DEBUG_RMOBILE_SCIFA0
972987 		bool "Kernel low-level debugging messages via SCIFA0 on R8A73A4"
....@@ -990,7 +1005,7 @@
9901005 		  via SCIFA4 on Renesas SH-Mobile AG5 (SH73A0).
9911006 
9921007 	config DEBUG_S3C_UART0
993
-		depends on PLAT_SAMSUNG
1008
+		depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
9941009 		select DEBUG_EXYNOS_UART if ARCH_EXYNOS
9951010 		select DEBUG_S3C24XX_UART if ARCH_S3C24XX
9961011 		select DEBUG_S3C64XX_UART if ARCH_S3C64XX
....@@ -1002,7 +1017,7 @@
10021017 		  by the boot-loader before use.
10031018 
10041019 	config DEBUG_S3C_UART1
1005
-		depends on PLAT_SAMSUNG
1020
+		depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
10061021 		select DEBUG_EXYNOS_UART if ARCH_EXYNOS
10071022 		select DEBUG_S3C24XX_UART if ARCH_S3C24XX
10081023 		select DEBUG_S3C64XX_UART if ARCH_S3C64XX
....@@ -1014,7 +1029,7 @@
10141029 		  by the boot-loader before use.
10151030 
10161031 	config DEBUG_S3C_UART2
1017
-		depends on PLAT_SAMSUNG
1032
+		depends on PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS
10181033 		select DEBUG_EXYNOS_UART if ARCH_EXYNOS
10191034 		select DEBUG_S3C24XX_UART if ARCH_S3C24XX
10201035 		select DEBUG_S3C64XX_UART if ARCH_S3C64XX
....@@ -1026,7 +1041,7 @@
10261041 		  by the boot-loader before use.
10271042 
10281043 	config DEBUG_S3C_UART3
1029
-		depends on PLAT_SAMSUNG && (ARCH_EXYNOS || ARCH_S5PV210)
1044
+		depends on ARCH_EXYNOS || ARCH_S5PV210
10301045 		select DEBUG_EXYNOS_UART if ARCH_EXYNOS
10311046 		select DEBUG_S3C64XX_UART if ARCH_S3C64XX
10321047 		select DEBUG_S5PV210_UART if ARCH_S5PV210
....@@ -1070,6 +1085,14 @@
10701085 		  Say Y here if you want kernel low-level debugging support
10711086 		  on SA-11x0 UART ports. The kernel will check for the first
10721087 		  enabled UART in a sequence 3-1-2.
1088
+
1089
+	config DEBUG_SD5203_UART
1090
+		bool "Hisilicon SD5203 Debug UART"
1091
+		depends on ARCH_SD5203
1092
+		select DEBUG_UART_8250
1093
+		help
1094
+		  Say Y here if you want kernel low-level debugging support
1095
+		  on SD5203 UART.
10731096 
10741097 	config DEBUG_SOCFPGA_UART0
10751098 		depends on ARCH_SOCFPGA
....@@ -1188,6 +1211,54 @@
11881211 		  Say Y here if you want kernel low-level debugging support
11891212 		  on STiH415/416 based platforms like b2020. which has
11901213 		  default UART wired up to SBC ASC1.
1214
+
1215
+		  If unsure, say N.
1216
+
1217
+	config STM32F4_DEBUG_UART
1218
+		bool "Use STM32F4 UART for low-level debug"
1219
+		depends on MACH_STM32F429 || MACH_STM32F469
1220
+		select DEBUG_STM32_UART
1221
+		help
1222
+		  Say Y here if you want kernel low-level debugging support
1223
+		  on STM32F4 based platforms, which default UART is wired on
1224
+		  USART1, but another UART instance can be selected by modifying
1225
+		  CONFIG_DEBUG_UART_PHYS.
1226
+
1227
+		  If unsure, say N.
1228
+
1229
+	config STM32F7_DEBUG_UART
1230
+		bool "Use STM32F7 UART for low-level debug"
1231
+		depends on MACH_STM32F746 || MACH_STM32F769
1232
+		select DEBUG_STM32_UART
1233
+		help
1234
+		  Say Y here if you want kernel low-level debugging support
1235
+		  on STM32F7 based platforms, which default UART is wired on
1236
+		  USART1, but another UART instance can be selected by modifying
1237
+		  CONFIG_DEBUG_UART_PHYS.
1238
+
1239
+		  If unsure, say N.
1240
+
1241
+	config STM32H7_DEBUG_UART
1242
+		bool "Use STM32H7 UART for low-level debug"
1243
+		depends on MACH_STM32H743
1244
+		select DEBUG_STM32_UART
1245
+		help
1246
+		  Say Y here if you want kernel low-level debugging support
1247
+		  on STM32H7 based platforms, which default UART is wired on
1248
+		  USART1, but another UART instance can be selected by modifying
1249
+		  CONFIG_DEBUG_UART_PHYS.
1250
+
1251
+		  If unsure, say N.
1252
+
1253
+	config STM32MP1_DEBUG_UART
1254
+		bool "Use STM32MP1 UART for low-level debug"
1255
+		depends on MACH_STM32MP157
1256
+		select DEBUG_STM32_UART
1257
+		help
1258
+		  Say Y here if you want kernel low-level debugging support
1259
+		  on STM32MP1 based platforms, wich default UART is wired on
1260
+		  UART4, but another UART instance can be selected by modifying
1261
+		  CONFIG_DEBUG_UART_PHYS and CONFIG_DEBUG_UART_VIRT.
11911262 
11921263 		  If unsure, say N.
11931264 
....@@ -1434,6 +1505,16 @@
14341505 config DEBUG_S5PV210_UART
14351506 	bool
14361507 
1508
+config DEBUG_S3C_UART
1509
+	depends on DEBUG_S3C2410_UART || DEBUG_S3C24XX_UART || \
1510
+		   DEBUG_S3C64XX_UART ||  DEBUG_S5PV210_UART || \
1511
+		   DEBUG_EXYNOS_UART
1512
+	int
1513
+	default "0" if DEBUG_S3C_UART0
1514
+	default "1" if DEBUG_S3C_UART1
1515
+	default "2" if DEBUG_S3C_UART2
1516
+	default "3" if DEBUG_S3C_UART3
1517
+
14371518 config DEBUG_OMAP2PLUS_UART
14381519 	bool
14391520 	depends on ARCH_OMAP2PLUS
....@@ -1442,7 +1523,7 @@
14421523 	int "i.MX Debug UART Port Selection"
14431524 	depends on DEBUG_IMX1_UART || \
14441525 		   DEBUG_IMX25_UART || \
1445
-		   DEBUG_IMX21_IMX27_UART || \
1526
+		   DEBUG_IMX27_UART || \
14461527 		   DEBUG_IMX31_UART || \
14471528 		   DEBUG_IMX35_UART || \
14481529 		   DEBUG_IMX50_UART || \
....@@ -1475,9 +1556,24 @@
14751556 	bool
14761557 	depends on ARCH_STI
14771558 
1559
+config DEBUG_STM32_UART
1560
+	bool
1561
+	depends on ARCH_STM32
1562
+
14781563 config DEBUG_SIRFSOC_UART
14791564 	bool
14801565 	depends on ARCH_SIRF
1566
+
1567
+config DEBUG_UART_FLOW_CONTROL
1568
+	bool "Enable flow control (CTS) for the debug UART"
1569
+	depends on DEBUG_LL
1570
+	default y if ARCH_EBSA110 || DEBUG_FOOTBRIDGE_COM1 || DEBUG_GEMINI || ARCH_RPC
1571
+	help
1572
+	  Some UART ports are connected to terminals that will use modem
1573
+	  control signals to indicate whether they are ready to receive text.
1574
+	  In practice this means that the terminal is asserting the special
1575
+	  control signal CTS (Clear To Send). If your debug UART supports
1576
+	  this and your debug terminal will require it, enable this option.
14811577 
14821578 config DEBUG_LL_INCLUDE
14831579 	string
....@@ -1495,28 +1591,29 @@
14951591 	default "debug/icedcc.S" if DEBUG_ICEDCC
14961592 	default "debug/imx.S" if DEBUG_IMX1_UART || \
14971593 				 DEBUG_IMX25_UART || \
1498
-				 DEBUG_IMX21_IMX27_UART || \
1594
+				 DEBUG_IMX27_UART || \
14991595 				 DEBUG_IMX31_UART || \
15001596 				 DEBUG_IMX35_UART || \
15011597 				 DEBUG_IMX50_UART || \
15021598 				 DEBUG_IMX51_UART || \
1503
-				 DEBUG_IMX53_UART ||\
1599
+				 DEBUG_IMX53_UART || \
15041600 				 DEBUG_IMX6Q_UART || \
15051601 				 DEBUG_IMX6SL_UART || \
15061602 				 DEBUG_IMX6SX_UART || \
15071603 				 DEBUG_IMX6UL_UART || \
15081604 				 DEBUG_IMX7D_UART
1509
-	default "debug/ks8695.S" if DEBUG_KS8695_UART
15101605 	default "debug/msm.S" if DEBUG_QCOM_UARTDM
1511
-	default "debug/netx.S" if DEBUG_NETX_UART
15121606 	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
15131607 	default "debug/renesas-scif.S" if DEBUG_R7S72100_SCIF2
1608
+	default "debug/renesas-scif.S" if DEBUG_R7S9210_SCIF2
1609
+	default "debug/renesas-scif.S" if DEBUG_R7S9210_SCIF4
15141610 	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN1_SCIF0
15151611 	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN1_SCIF2
15161612 	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN2_SCIF0
15171613 	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN2_SCIF1
15181614 	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN2_SCIF2
15191615 	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN2_SCIF4
1616
+	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN2_SCIFA2
15201617 	default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA0
15211618 	default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA1
15221619 	default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA4
....@@ -1524,6 +1621,7 @@
15241621 	default "debug/s5pv210.S" if DEBUG_S5PV210_UART
15251622 	default "debug/sirf.S" if DEBUG_SIRFSOC_UART
15261623 	default "debug/sti.S" if DEBUG_STI_UART
1624
+	default "debug/stm32.S" if DEBUG_STM32_UART
15271625 	default "debug/tegra.S" if DEBUG_TEGRA_UART
15281626 	default "debug/ux500.S" if DEBUG_UX500_UART
15291627 	default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT
....@@ -1541,13 +1639,10 @@
15411639 
15421640 # Compatibility options for 8250
15431641 config DEBUG_UART_8250
1544
-	def_bool ARCH_EBSA110 || \
1545
-		ARCH_IOP13XX || ARCH_IOP32X || ARCH_IOP33X || ARCH_IXP4XX || \
1546
-		ARCH_RPC
1642
+	def_bool ARCH_EBSA110 || ARCH_IOP32X || ARCH_IXP4XX || ARCH_RPC
15471643 
15481644 config DEBUG_UART_PHYS
15491645 	hex "Physical base address of debug UART"
1550
-	default 0x00100a00 if DEBUG_NETX_UART
15511646 	default 0x01c20000 if DEBUG_DAVINCI_DMx_UART0
15521647 	default 0x01c28000 if DEBUG_SUNXI_UART0
15531648 	default 0x01c28400 if DEBUG_SUNXI_UART1
....@@ -1573,6 +1668,7 @@
15731668 	default 0x11006000 if DEBUG_MT6589_UART0
15741669 	default 0x11009000 if DEBUG_MT8135_UART3
15751670 	default 0x16000000 if DEBUG_INTEGRATOR
1671
+	default 0x1600d000 if DEBUG_SD5203_UART
15761672 	default 0x18000300 if DEBUG_BCM_5301X
15771673 	default 0x18000400 if DEBUG_BCM_HR2
15781674 	default 0x18010000 if DEBUG_SIRFATLAS7_UART0
....@@ -1587,6 +1683,9 @@
15871683 	default 0x3e000000 if DEBUG_BCM_KONA_UART
15881684 	default 0x3f201000 if DEBUG_BCM2836
15891685 	default 0x4000e400 if DEBUG_LL_UART_EFM32
1686
+	default 0x40010000 if STM32MP1_DEBUG_UART
1687
+	default 0x40011000 if STM32F4_DEBUG_UART || STM32F7_DEBUG_UART || \
1688
+				STM32H7_DEBUG_UART
15901689 	default 0x40028000 if DEBUG_AT91_SAMV7_USART1
15911690 	default 0x40081000 if DEBUG_LPC18XX_UART0
15921691 	default 0x40090000 if DEBUG_LPC32XX
....@@ -1635,12 +1734,15 @@
16351734 	default 0xe4007000 if DEBUG_HIP04_UART
16361735 	default 0xe6c40000 if DEBUG_RMOBILE_SCIFA0
16371736 	default 0xe6c50000 if DEBUG_RMOBILE_SCIFA1
1737
+	default 0xe6c60000 if DEBUG_RCAR_GEN2_SCIFA2
16381738 	default 0xe6c80000 if DEBUG_RMOBILE_SCIFA4
16391739 	default 0xe6e58000 if DEBUG_RCAR_GEN2_SCIF2
16401740 	default 0xe6e60000 if DEBUG_RCAR_GEN2_SCIF0
16411741 	default 0xe6e68000 if DEBUG_RCAR_GEN2_SCIF1
16421742 	default 0xe6ee0000 if DEBUG_RCAR_GEN2_SCIF4
1643
-	default 0xe8008000 if DEBUG_R7S72100_SCIF2
1743
+	default 0xe8008000 if DEBUG_R7S72100_SCIF2 || DEBUG_R7S9210_SCIF2
1744
+	default 0xe8009000 if DEBUG_R7S9210_SCIF4
1745
+	default 0xf0000000 if DEBUG_DIGICOLOR_UA0
16441746 	default 0xf0000be0 if ARCH_EBSA110
16451747 	default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE
16461748 	default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE
....@@ -1656,7 +1758,6 @@
16561758 	default 0xffc02000 if DEBUG_SOCFPGA_UART0
16571759 	default 0xffc02100 if DEBUG_SOCFPGA_ARRIA10_UART1
16581760 	default 0xffc03000 if DEBUG_SOCFPGA_CYCLONE5_UART1
1659
-	default 0xffd82340 if ARCH_IOP13XX
16601761 	default 0xffe40000 if DEBUG_RCAR_GEN1_SCIF0
16611762 	default 0xffe42000 if DEBUG_RCAR_GEN1_SCIF2
16621763 	default 0xfff36000 if DEBUG_HIGHBANK_UART
....@@ -1666,32 +1767,32 @@
16661767 	default 0xfffe8600 if DEBUG_BCM63XX_UART
16671768 	default 0xffffee00 if DEBUG_AT91_SAM9263_DBGU
16681769 	default 0xfffff200 if DEBUG_AT91_RM9200_DBGU
1669
-	default 0xfffff700 if ARCH_IOP33X
16701770 	depends on ARCH_EP93XX || \
16711771 	        DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
16721772 		DEBUG_LL_UART_EFM32 || \
16731773 		DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
1674
-		DEBUG_NETX_UART || \
16751774 		DEBUG_QCOM_UARTDM || DEBUG_R7S72100_SCIF2 || \
1775
+		DEBUG_R7S9210_SCIF2 || DEBUG_R7S9210_SCIF4 || \
16761776 		DEBUG_RCAR_GEN1_SCIF0 || DEBUG_RCAR_GEN1_SCIF2 || \
16771777 		DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF1 || \
16781778 		DEBUG_RCAR_GEN2_SCIF2 || DEBUG_RCAR_GEN2_SCIF4 || \
1779
+		DEBUG_RCAR_GEN2_SCIFA2 || \
16791780 		DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \
16801781 		DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \
16811782 		DEBUG_S3C64XX_UART || \
16821783 		DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
16831784 		DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
1684
-		DEBUG_AT91_UART
1785
+		DEBUG_AT91_UART || DEBUG_STM32_UART
16851786 
16861787 config DEBUG_UART_VIRT
16871788 	hex "Virtual base address of debug UART"
16881789 	default 0xc881f000 if DEBUG_RV1108_UART2
16891790 	default 0xc8821000 if DEBUG_RV1108_UART1
16901791 	default 0xc8912000 if DEBUG_RV1108_UART0
1691
-	default 0xe0000a00 if DEBUG_NETX_UART
16921792 	default 0xe0010fe0 if ARCH_RPC
16931793 	default 0xf0000be0 if ARCH_EBSA110
16941794 	default 0xf0010000 if DEBUG_ASM9260_UART
1795
+	default 0xf0100000 if DEBUG_DIGICOLOR_UA0
16951796 	default 0xf01fb000 if DEBUG_NOMADIK_UART
16961797 	default 0xf0201000 if DEBUG_BCM2835 || DEBUG_BCM2836
16971798 	default 0xf1000300 if DEBUG_BCM_5301X
....@@ -1746,10 +1847,8 @@
17461847 	default 0xfc705000 if DEBUG_ZTE_ZX
17471848 	default 0xfcfe8600 if DEBUG_BCM63XX_UART
17481849 	default 0xfd000000 if DEBUG_SPEAR3XX || DEBUG_SPEAR13XX
1749
-	default 0xfd012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_MV78XX0
17501850 	default 0xfd883000 if DEBUG_ALPINE_UART0
1751
-	default 0xfde12000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_DOVE
1752
-	default 0xfe012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_ORION5X
1851
+	default 0xfe010000 if STM32MP1_DEBUG_UART
17531852 	default 0xfe017000 if DEBUG_MMP_UART2
17541853 	default 0xfe018000 if DEBUG_MMP_UART3
17551854 	default 0xfe100000 if DEBUG_IMX23_UART || DEBUG_IMX28_UART
....@@ -1764,7 +1863,7 @@
17641863 	default 0xfec02000 if DEBUG_SOCFPGA_UART0
17651864 	default 0xfec02100 if DEBUG_SOCFPGA_ARRIA10_UART1
17661865 	default 0xfec03000 if DEBUG_SOCFPGA_CYCLONE5_UART1
1767
-	default 0xfec12000 if (DEBUG_MVEBU_UART0 || DEBUG_MVEBU_UART0_ALTERNATE) && ARCH_MVEBU
1866
+	default 0xfec12000 if DEBUG_MVEBU_UART0 || DEBUG_MVEBU_UART0_ALTERNATE
17681867 	default 0xfec12100 if DEBUG_MVEBU_UART1_ALTERNATE
17691868 	default 0xfec10000 if DEBUG_SIRFATLAS7_UART0
17701869 	default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0
....@@ -1772,32 +1871,29 @@
17721871 	default 0xfec60000 if DEBUG_SIRFPRIMA2_UART1
17731872 	default 0xfec90000 if DEBUG_RK32_UART2
17741873 	default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
1775
-	default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
1874
+	default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_SD5203_UART
17761875 	default 0xfed60000 if DEBUG_RK29_UART0
17771876 	default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
17781877 	default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
17791878 	default 0xfedc0000 if DEBUG_EP93XX
17801879 	default 0xfee003f8 if DEBUG_FOOTBRIDGE_COM1
17811880 	default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART
1782
-	default 0xfee82340 if ARCH_IOP13XX
17831881 	default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
17841882 	default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
17851883 	default 0xfef36000 if DEBUG_HIGHBANK_UART
17861884 	default 0xfefb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1
17871885 	default 0xfefb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2
17881886 	default 0xfefb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3
1789
-	default 0xfefff700 if ARCH_IOP33X
17901887 	default 0xff003000 if DEBUG_U300_UART
17911888 	default 0xffd01000 if DEBUG_HIP01_UART
17921889 	default DEBUG_UART_PHYS if !MMU
17931890 	depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
17941891 		DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
1795
-		DEBUG_NETX_UART || \
17961892 		DEBUG_QCOM_UARTDM || DEBUG_S3C24XX_UART || \
17971893 		DEBUG_S3C64XX_UART || \
17981894 		DEBUG_BCM63XX_UART || DEBUG_ASM9260_UART || \
17991895 		DEBUG_SIRFSOC_UART || DEBUG_DIGICOLOR_UA0 || \
1800
-		DEBUG_AT91_UART
1896
+		DEBUG_AT91_UART || DEBUG_STM32_UART
18011897 
18021898 config DEBUG_UART_8250_SHIFT
18031899 	int "Register offset shift for the 8250 debug UART"
....@@ -1826,11 +1922,6 @@
18261922 	  Palmchip provides a UART implementation compatible with 16550
18271923 	  except for having a different register layout.  Say Y here if
18281924 	  the debug UART is of this type.
1829
-
1830
-config DEBUG_UART_8250_FLOW_CONTROL
1831
-	bool "Enable flow control for 8250 UART"
1832
-	depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250
1833
-	default y if ARCH_EBSA110 || DEBUG_FOOTBRIDGE_COM1 || DEBUG_GEMINI || ARCH_RPC
18341925 
18351926 config DEBUG_UNCOMPRESS
18361927 	bool "Enable decompressor debugging via DEBUG_LL output"