From: Russell King Date: Mon, 19 Aug 2013 23:31:55 +0000 (+0100) Subject: Merge branches 'fixes' and 'misc' into for-next X-Git-Tag: next-20130822~122^2~1 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3ca3185a7b47a266cb511453c7d9ed48c467b355;p=karo-tx-linux.git Merge branches 'fixes' and 'misc' into for-next --- 3ca3185a7b47a266cb511453c7d9ed48c467b355 diff --cc arch/arm/Kconfig.debug index cd72bbfb58db,583f4a00ec32,e401a766c0bd..2d57da324562 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@@@ -495,58 -413,9 -413,9 +495,58 @@@@ choic their output to the standard serial port on the RealView PB1176 platform. -- config DEBUG_ROCKCHIP_UART -- bool "Kernel low-level debugging messages via Rockchip UART" ++ config DEBUG_RK29_UART0 ++ bool "Kernel low-level debugging messages via Rockchip RK29 UART0" ++ depends on ARCH_ROCKCHIP ++ select DEBUG_UART_8250 ++ help ++ Say Y here if you want kernel low-level debugging support ++ on Rockchip based platforms. ++ ++ config DEBUG_RK29_UART1 ++ bool "Kernel low-level debugging messages via Rockchip RK29 UART1" ++ depends on ARCH_ROCKCHIP ++ select DEBUG_UART_8250 ++ help ++ Say Y here if you want kernel low-level debugging support ++ on Rockchip based platforms. ++ ++ config DEBUG_RK29_UART2 ++ bool "Kernel low-level debugging messages via Rockchip RK29 UART2" + depends on ARCH_ROCKCHIP ++ select DEBUG_UART_8250 ++ help ++ Say Y here if you want kernel low-level debugging support ++ on Rockchip based platforms. ++ ++ config DEBUG_RK3X_UART0 ++ bool "Kernel low-level debugging messages via Rockchip RK3X UART0" ++ depends on ARCH_ROCKCHIP ++ select DEBUG_UART_8250 ++ help ++ Say Y here if you want kernel low-level debugging support ++ on Rockchip based platforms. ++ ++ config DEBUG_RK3X_UART1 ++ bool "Kernel low-level debugging messages via Rockchip RK3X UART1" ++ depends on ARCH_ROCKCHIP ++ select DEBUG_UART_8250 ++ help ++ Say Y here if you want kernel low-level debugging support ++ on Rockchip based platforms. ++ ++ config DEBUG_RK3X_UART2 ++ bool "Kernel low-level debugging messages via Rockchip RK3X UART2" ++ depends on ARCH_ROCKCHIP ++ select DEBUG_UART_8250 ++ help ++ Say Y here if you want kernel low-level debugging support ++ on Rockchip based platforms. ++ ++ config DEBUG_RK3X_UART3 ++ bool "Kernel low-level debugging messages via Rockchip RK3X UART3" + depends on ARCH_ROCKCHIP ++ select DEBUG_UART_8250 help Say Y here if you want kernel low-level debugging support on Rockchip based platforms. @@@@ -623,54 -489,9 -489,9 +623,54 @@@@ Say Y here if you want kernel low-level debugging support on Allwinner A1X based platforms on the UART1. -- config DEBUG_TEGRA_UART ++ config TEGRA_DEBUG_UART_AUTO_ODMDATA ++ bool "Kernel low-level debugging messages via Tegra UART via ODMDATA" + depends on ARCH_TEGRA - bool "Use Tegra UART for low-level debug" ++ select DEBUG_TEGRA_UART ++ help ++ Automatically determines which UART to use for low-level ++ debug based on the ODMDATA value. This value is part of ++ the BCT, and is written to the boot memory device using ++ nvflash, or other flashing tool. When bits 19:18 are 3, ++ then bits 17:15 indicate which UART to use; 0/1/2/3/4 ++ are UART A/B/C/D/E. ++ ++ config TEGRA_DEBUG_UARTA ++ bool "Kernel low-level debugging messages via Tegra UART A" ++ depends on ARCH_TEGRA ++ select DEBUG_TEGRA_UART ++ help ++ Say Y here if you want kernel low-level debugging support ++ on Tegra based platforms. ++ ++ config TEGRA_DEBUG_UARTB ++ bool "Kernel low-level debugging messages via Tegra UART B" ++ depends on ARCH_TEGRA ++ select DEBUG_TEGRA_UART ++ help ++ Say Y here if you want kernel low-level debugging support ++ on Tegra based platforms. ++ ++ config TEGRA_DEBUG_UARTC ++ bool "Kernel low-level debugging messages via Tegra UART C" + depends on ARCH_TEGRA - bool "Use Tegra UART for low-level debug" ++ select DEBUG_TEGRA_UART ++ help ++ Say Y here if you want kernel low-level debugging support ++ on Tegra based platforms. ++ ++ config TEGRA_DEBUG_UARTD ++ bool "Kernel low-level debugging messages via Tegra UART D" ++ depends on ARCH_TEGRA ++ select DEBUG_TEGRA_UART ++ help ++ Say Y here if you want kernel low-level debugging support ++ on Tegra based platforms. ++ ++ config TEGRA_DEBUG_UARTE ++ bool "Kernel low-level debugging messages via Tegra UART E" ++ depends on ARCH_TEGRA ++ select DEBUG_TEGRA_UART help Say Y here if you want kernel low-level debugging support on Tegra based platforms. @@@@ -689,25 -510,13 -510,13 +689,25 @@@@ Say Y here if you want the debug print routines to direct their output to the uart1 port on SiRFmarco devices. -- config DEBUG_STI_UART ++ config STIH41X_DEBUG_ASC2 ++ bool "Use StiH415/416 ASC2 UART for low-level debug" + depends on ARCH_STI - bool "Use StiH415/416 ASC for low-level debug" ++ select DEBUG_STI_UART + help + Say Y here if you want kernel low-level debugging support - on StiH415/416 based platforms like B2000, B2020. - It support UART2 and SBC_UART1. ++ on STiH415/416 based platforms like b2000, which has ++ default UART wired up to ASC2. ++ ++ If unsure, say N. ++ ++ config STIH41X_DEBUG_SBC_ASC1 ++ bool "Use StiH415/416 SBC ASC1 UART for low-level debug" + depends on ARCH_STI - bool "Use StiH415/416 ASC for low-level debug" ++ select DEBUG_STI_UART + help + Say Y here if you want kernel low-level debugging support - on StiH415/416 based platforms like B2000, B2020. - It support UART2 and SBC_UART1. ++ on STiH415/416 based platforms like b2020. which has ++ default UART wired up to SBC ASC1. If unsure, say N. @@@@ -889,157 -802,21 -802,11 +889,167 @@@@ config DEBUG_LL_INCLUD default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1 default "mach/debug-macro.S" ++# Compatibility options for PL01x ++config DEBUG_UART_PL01X ++ def_bool ARCH_EP93XX || \ ++ ARCH_INTEGRATOR || \ ++ ARCH_SPEAR3XX || \ ++ ARCH_SPEAR6XX || \ ++ ARCH_SPEAR13XX || \ ++ ARCH_VERSATILE ++ ++# Compatibility options for 8250 ++config DEBUG_UART_8250 ++ def_bool ARCH_DOVE || ARCH_EBSA110 || \ ++ (FOOTBRIDGE && !DEBUG_DC21285_PORT) || \ ++ ARCH_GEMINI || ARCH_IOP13XX || ARCH_IOP32X || \ ++ ARCH_IOP33X || ARCH_IXP4XX || ARCH_KIRKWOOD || \ ++ ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC ++ ++config DEBUG_UART_PHYS ++ hex "Physical base address of debug UART" ++ default 0x01c20000 if DEBUG_DAVINCI_DMx_UART0 ++ default 0x01c28000 if DEBUG_SUNXI_UART0 ++ default 0x01c28400 if DEBUG_SUNXI_UART1 ++ default 0x01d0c000 if DEBUG_DAVINCI_DA8XX_UART1 ++ default 0x01d0d000 if DEBUG_DAVINCI_DA8XX_UART2 ++ default 0x02530c00 if DEBUG_KEYSTONE_UART0 ++ default 0x02531000 if DEBUG_KEYSTONE_UART1 ++ default 0x03010fe0 if ARCH_RPC ++ default 0x08108300 if DEBUG_DAVINCI_TNETV107X_UART1 ++ default 0x10009000 if DEBUG_REALVIEW_STD_PORT || DEBUG_CNS3XXX || \ ++ DEBUG_VEXPRESS_UART0_CA9 ++ default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT ++ default 0x10124000 if DEBUG_RK3X_UART0 ++ default 0x10126000 if DEBUG_RK3X_UART1 ++ default 0x101f1000 if ARCH_VERSATILE ++ default 0x101fb000 if DEBUG_NOMADIK_UART ++ default 0x16000000 if ARCH_INTEGRATOR ++ default 0x1c090000 if DEBUG_VEXPRESS_UART0_RS1 ++ default 0x20060000 if DEBUG_RK29_UART0 ++ default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2 ++ default 0x20068000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3 ++ default 0x20201000 if DEBUG_BCM2835 ++ default 0x40090000 if ARCH_LPC32XX ++ default 0x40100000 if DEBUG_PXA_UART1 ++ default 0x42000000 if ARCH_GEMINI ++ default 0x7c0003f8 if FOOTBRIDGE ++ default 0x80230000 if DEBUG_PICOXCELL_UART ++ default 0x80070000 if DEBUG_IMX23_UART ++ default 0x80074000 if DEBUG_IMX28_UART ++ default 0x808c0000 if ARCH_EP93XX ++ default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART ++ default 0xb0090000 if DEBUG_VEXPRESS_UART0_CRX ++ default 0xc0013000 if DEBUG_U300_UART ++ default 0xc8000000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN ++ default 0xc8000003 if ARCH_IXP4XX && CPU_BIG_ENDIAN ++ default 0xd0000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX ++ default 0xd0012000 if DEBUG_MVEBU_UART ++ default 0xd4017000 if DEBUG_MMP_UART2 ++ default 0xd4018000 if DEBUG_MMP_UART3 ++ default 0xe0000000 if ARCH_SPEAR13XX ++ default 0xf0000be0 if ARCH_EBSA110 ++ default 0xf1012000 if DEBUG_MVEBU_UART_ALTERNATE ++ default 0xf1012000 if ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \ ++ ARCH_ORION5X ++ default 0xfe800000 if ARCH_IOP32X ++ default 0xffc02000 if DEBUG_SOCFPGA_UART ++ default 0xffd82340 if ARCH_IOP13XX ++ default 0xfff36000 if DEBUG_HIGHBANK_UART ++ default 0xfffff700 if ARCH_IOP33X ++ depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \ ++ DEBUG_UART_8250 || DEBUG_UART_PL01X ++ ++config DEBUG_UART_VIRT ++ hex "Virtual base address of debug UART" ++ default 0xe0010fe0 if ARCH_RPC ++ default 0xf0000be0 if ARCH_EBSA110 ++ default 0xf0009000 if DEBUG_CNS3XXX ++ default 0xf01fb000 if DEBUG_NOMADIK_UART ++ default 0xf0201000 if DEBUG_BCM2835 ++ default 0xf11f1000 if ARCH_VERSATILE ++ default 0xf1600000 if ARCH_INTEGRATOR ++ default 0xf1c28000 if DEBUG_SUNXI_UART0 ++ default 0xf1c28400 if DEBUG_SUNXI_UART1 ++ default 0xf2100000 if DEBUG_PXA_UART1 ++ default 0xf4090000 if ARCH_LPC32XX ++ default 0xf4200000 if ARCH_GEMINI ++ default 0xf8009000 if DEBUG_VEXPRESS_UART0_CA9 ++ default 0xf8090000 if DEBUG_VEXPRESS_UART0_RS1 ++ default 0xfb009000 if DEBUG_REALVIEW_STD_PORT ++ default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT ++ default 0xfd000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX ++ default 0xfd000000 if ARCH_SPEAR13XX ++ default 0xfd012000 if ARCH_MV78XX0 ++ default 0xfde12000 if ARCH_DOVE ++ default 0xfe012000 if ARCH_ORION5X ++ default 0xfe017000 if DEBUG_MMP_UART2 ++ default 0xfe018000 if DEBUG_MMP_UART3 ++ default 0xfe100000 if DEBUG_IMX23_UART || DEBUG_IMX28_UART ++ default 0xfe230000 if DEBUG_PICOXCELL_UART ++ default 0xfe800000 if ARCH_IOP32X ++ default 0xfeb24000 if DEBUG_RK3X_UART0 ++ default 0xfeb26000 if DEBUG_RK3X_UART1 ++ default 0xfeb30c00 if DEBUG_KEYSTONE_UART0 ++ default 0xfeb31000 if DEBUG_KEYSTONE_UART1 ++ default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE ++ default 0xfed60000 if DEBUG_RK29_UART0 ++ default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2 ++ default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3 ++ default 0xfec02000 if DEBUG_SOCFPGA_UART ++ default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0 ++ default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1 ++ default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2 ++ default 0xfed12000 if ARCH_KIRKWOOD ++ default 0xfedc0000 if ARCH_EP93XX ++ default 0xfee003f8 if FOOTBRIDGE ++ default 0xfee08300 if DEBUG_DAVINCI_TNETV107X_UART1 ++ default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART ++ default 0xfee36000 if DEBUG_HIGHBANK_UART ++ default 0xfee82340 if ARCH_IOP13XX ++ default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN ++ default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN ++ default 0xfefff700 if ARCH_IOP33X ++ default 0xff003000 if DEBUG_U300_UART ++ default DEBUG_UART_PHYS if !MMU ++ depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \ ++ DEBUG_UART_8250 || DEBUG_UART_PL01X ++ ++config DEBUG_UART_8250_SHIFT ++ int "Register offset shift for the 8250 debug UART" ++ depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250 ++ default 0 if FOOTBRIDGE || ARCH_IOP32X ++ default 2 ++ ++config DEBUG_UART_8250_WORD ++ bool "Use 32-bit accesses for 8250 UART" ++ depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250 ++ depends on DEBUG_UART_8250_SHIFT >= 2 ++ default y if DEBUG_PICOXCELL_UART || DEBUG_SOCFPGA_UART || \ ++ ARCH_KEYSTONE || \ ++ DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \ ++ DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_DAVINCI_TNETV107X_UART1 ++ ++config DEBUG_UART_8250_FLOW_CONTROL ++ bool "Enable flow control for 8250 UART" ++ depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250 ++ default y if ARCH_EBSA110 || FOOTBRIDGE || ARCH_GEMINI || ARCH_RPC ++ config DEBUG_UNCOMPRESS bool - - default y if ARCH_MULTIPLATFORM && DEBUG_LL && \ - - !DEBUG_OMAP2PLUS_UART && \ + + depends on ARCH_MULTIPLATFORM + + default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \ !DEBUG_TEGRA_UART + + help + + This option influences the normal decompressor output for + + multiplatform kernels. Normally, multiplatform kernels disable + + decompressor output because it is not possible to know where to + + send the decompressor output. + + + + When this option is set, the selected DEBUG_LL output method + + will be re-used for normal decompressor output on multiplatform + + kernels. + + config UNCOMPRESS_INCLUDE string