diff options
| author | Olof Johansson <olof@lixom.net> | 2018-12-12 13:52:48 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-12-12 13:52:48 -0800 |
| commit | c8730395ea515e9592c0cdc474e0aa61fa9a7902 (patch) | |
| tree | 27982a9a5821ed1e3535eeb998624e889d4b7553 /arch/arm/Kconfig.debug | |
| parent | 3aab54033a8506af70cabb7c7db81442ea63944e (diff) | |
| parent | 167e63702d090b831c513d726b11a412b70aab09 (diff) | |
| download | linux-stable-c8730395ea515e9592c0cdc474e0aa61fa9a7902.tar.gz linux-stable-c8730395ea515e9592c0cdc474e0aa61fa9a7902.tar.bz2 linux-stable-c8730395ea515e9592c0cdc474e0aa61fa9a7902.zip | |
Merge tag 'imx-soc-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc
i.MX SoC changes for 4.21:
- An improvement on i.MX debugging options that only defines
DEBUG_IMX_UART_PORT if needed, so that the option will not be present
in the kernel config when DEBUG_LL is disabled.
- Adds the necessary platform support for i.MX7ULP SoC and configures
power mode to Partial Stop mode 3 with system/bus clock enabled.
Otherwise the default STOP mode will gate off system/bus clock when
WFI gets executed on i.MX7ULP.
- A fix from Arnd on SOC_IMX7ULP option dependency.
* tag 'imx-soc-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx: fix dependencies on imx7ulp
ARM: imx: add initial support for imx7ulp
ARM: debug-imx: only define DEBUG_IMX_UART_PORT if needed
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig.debug')
| -rw-r--r-- | arch/arm/Kconfig.debug | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index e2afacba6bc2..6d6e0330930b 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1469,21 +1469,21 @@ config DEBUG_OMAP2PLUS_UART depends on ARCH_OMAP2PLUS config DEBUG_IMX_UART_PORT - int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \ - DEBUG_IMX25_UART || \ - DEBUG_IMX21_IMX27_UART || \ - DEBUG_IMX31_UART || \ - DEBUG_IMX35_UART || \ - DEBUG_IMX50_UART || \ - DEBUG_IMX51_UART || \ - DEBUG_IMX53_UART || \ - DEBUG_IMX6Q_UART || \ - DEBUG_IMX6SL_UART || \ - DEBUG_IMX6SX_UART || \ - DEBUG_IMX6UL_UART || \ - DEBUG_IMX7D_UART + int "i.MX Debug UART Port Selection" + depends on DEBUG_IMX1_UART || \ + DEBUG_IMX25_UART || \ + DEBUG_IMX21_IMX27_UART || \ + DEBUG_IMX31_UART || \ + DEBUG_IMX35_UART || \ + DEBUG_IMX50_UART || \ + DEBUG_IMX51_UART || \ + DEBUG_IMX53_UART || \ + DEBUG_IMX6Q_UART || \ + DEBUG_IMX6SL_UART || \ + DEBUG_IMX6SX_UART || \ + DEBUG_IMX6UL_UART || \ + DEBUG_IMX7D_UART default 1 - depends on ARCH_MXC help Choose UART port on which kernel low-level debug messages should be output. |