From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 27 Mar 2012 10:30:31 +0000 (+0100)
Subject: Merge branch 'devel-stable' into for-linus
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b0df89868006517417251e02cc4ce5d4b0165885;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'devel-stable' into for-linus

Conflicts:
	arch/arm/Kconfig.debug
	arch/arm/plat-versatile/Kconfig
Merge fixes:
	arch/arm/mach-integrator/Kconfig
	drivers/clocksource/Kconfig
---

b0df89868006517417251e02cc4ce5d4b0165885
diff --cc arch/arm/Kconfig.debug
index 755d9fbe3238,03646c4c13d1..f279ba9acfd5
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -255,59 -273,25 +273,41 @@@ choic
  		  The uncompressor code port configuration is now handled
  		  by CONFIG_S3C_LOWLEVEL_UART_PORT.
  
- 	config DEBUG_REALVIEW_STD_PORT
- 		bool "RealView Default UART"
- 		depends on ARCH_REALVIEW
- 		help
- 		  Say Y here if you want the debug print routines to direct
- 		  their output to the serial port on RealView EB, PB11MP, PBA8
- 		  and PBX platforms.
- 
- 	config DEBUG_REALVIEW_PB1176_PORT
- 		bool "RealView PB1176 UART"
- 		depends on MACH_REALVIEW_PB1176
+ 	config DEBUG_LL_UART_NONE
+ 		bool "No low-level debugging UART"
  		help
- 		  Say Y here if you want the debug print routines to direct
- 		  their output to the standard serial port on the RealView
- 		  PB1176 platform.
+ 		  Say Y here if your platform doesn't provide a UART option
+ 		  below. This relies on your platform choosing the right UART
+ 		  definition internally in order for low-level debugging to
+ 		  work.
  
- 	config DEBUG_MSM_UART1
- 		bool "Kernel low-level debugging messages via MSM UART1"
- 		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
+ 	config DEBUG_ICEDCC
+ 		bool "Kernel low-level debugging via EmbeddedICE DCC channel"
  		help
  		  Say Y here if you want the debug print routines to direct
- 		  their output to the first serial port on MSM devices.
+ 		  their output to the EmbeddedICE macrocell's DCC channel using
+ 		  co-processor 14. This is known to work on the ARM9 style ICE
+ 		  channel and on the XScale with the PEEDI.
  
- 	config DEBUG_MSM_UART2
- 		bool "Kernel low-level debugging messages via MSM UART2"
- 		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
- 		help
- 		  Say Y here if you want the debug print routines to direct
- 		  their output to the second serial port on MSM devices.
+ 		  Note that the system will appear to hang during boot if there
+ 		  is nothing connected to read from the DCC.
  
- 	config DEBUG_MSM_UART3
- 		bool "Kernel low-level debugging messages via MSM UART3"
- 		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50
++	config DEBUG_SEMIHOSTING
++		bool "Kernel low-level debug output via semihosting I"
 +		help
- 		  Say Y here if you want the debug print routines to direct
- 		  their output to the third serial port on MSM devices.
++		  Semihosting enables code running on an ARM target to use
++		  the I/O facilities on a host debugger/emulator through a
++		  simple SVC calls. The host debugger or emulator must have
++		  semihosting enabled for the special svc call to be trapped
++		  otherwise the kernel will crash.
 +
- 	config DEBUG_MSM8660_UART
- 		bool "Kernel low-level debugging messages via MSM 8660 UART"
- 		depends on ARCH_MSM8X60
- 		select MSM_HAS_DEBUG_UART_HS
- 		help
- 		  Say Y here if you want the debug print routines to direct
- 		  their output to the serial port on MSM 8660 devices.
++		  This is known to work with OpenOCD, as wellas
++		  ARM's Fast Models, or any other controlling environment
++		  that implements semihosting.
 +
- 	config DEBUG_MSM8960_UART
- 		bool "Kernel low-level debugging messages via MSM 8960 UART"
- 		depends on ARCH_MSM8960
- 		select MSM_HAS_DEBUG_UART_HS
- 		help
- 		  Say Y here if you want the debug print routines to direct
- 		  their output to the serial port on MSM 8960 devices.
++		  For more details about semihosting, please see
++		  chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd.
 +
  endchoice
  
  config EARLY_PRINTK
diff --cc arch/arm/plat-versatile/Kconfig
index aa63f38f2848,c6f4b9625e71..043f7b02a9e7
--- a/arch/arm/plat-versatile/Kconfig
+++ b/arch/arm/plat-versatile/Kconfig
@@@ -11,7 -11,6 +11,6 @@@ config PLAT_VERSATILE_LED
  	depends on ARCH_REALVIEW || ARCH_VERSATILE
  
  config PLAT_VERSATILE_SCHED_CLOCK
 -	def_bool y if !ARCH_INTEGRATOR_AP
 +	def_bool y
- 	select HAVE_SCHED_CLOCK
  
  endif
diff --cc drivers/clocksource/Kconfig
index 999d6a03e436,999d6a03e436..5138927a416c
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@@ -26,7 -26,7 +26,6 @@@ config CLKSRC_DBX500_PRCM
  config CLKSRC_DBX500_PRCMU_SCHED_CLOCK
  	bool "Clocksource PRCMU Timer sched_clock"
  	depends on (CLKSRC_DBX500_PRCMU && !NOMADIK_MTU_SCHED_CLOCK)
--	select HAVE_SCHED_CLOCK
  	default y
  	help
  	  Use the always on PRCMU Timer as sched_clock