Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b164b7b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'board' of git://github.com/hzhuang1/linux into next/boards 

* 'board' of git://github.com/hzhuang1/linux:
  ARM: mmp: enable debug uart port in defconfig
  ARM: mmp: implement DEBUG_LL port choice
parents f46e374c ec9b22ee

arch/arm/Kconfig.debug

+14 −0
Original line number Diff line number Diff line
@@ -224,6 +224,20 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on i.MX6Q UART4.



	config DEBUG_MMP_UART2

		bool "Kernel low-level debugging message via MMP UART2"

		depends on ARCH_MMP

		help

		  Say Y here if you want kernel low-level debugging support

		  on MMP UART2.



	config DEBUG_MMP_UART3

		bool "Kernel low-level debugging message via MMP UART3"

		depends on ARCH_MMP

		help

		  Say Y here if you want kernel low-level debugging support

		  on MMP UART3.



	config DEBUG_MSM_UART1

		bool "Kernel low-level debugging messages via MSM UART1"

		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50

arch/arm/configs/mmp2_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ CONFIG_PREEMPT=y 
CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs nfsroot=192.168.1.100:/nfsroot/ ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on console=ttyS2,38400 mem=128M user_debug=255"

CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs nfsroot=192.168.1.100:/nfsroot/ ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on console=ttyS2,38400 mem=128M user_debug=255 earlyprintk"

CONFIG_VFP=y

CONFIG_NET=y

CONFIG_PACKET=y
@@ -90,6 +90,9 @@ CONFIG_DEBUG_INFO=y 
# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_DYNAMIC_DEBUG is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

CONFIG_DEBUG_MMP_UART3=y

CONFIG_EARLY_PRINTK=y

CONFIG_DEBUG_ERRORS=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRC_CCITT=y

arch/arm/configs/pxa910_defconfig

+3 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ CONFIG_PREEMPT=y 
CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs nfsroot=192.168.2.100:/nfsroot/ ip=192.168.2.101:192.168.2.100::255.255.255.0::eth0:on console=ttyS0,115200 mem=128M"

CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs nfsroot=192.168.2.100:/nfsroot/ ip=192.168.2.101:192.168.2.100::255.255.255.0::eth0:on console=ttyS0,115200 mem=128M earlyprintk"

CONFIG_FPE_NWFPE=y

CONFIG_NET=y

CONFIG_PACKET=y
@@ -66,5 +66,7 @@ CONFIG_DEBUG_INFO=y 
CONFIG_DEBUG_USER=y

CONFIG_DEBUG_ERRORS=y

CONFIG_DEBUG_LL=y

CONFIG_DEBUG_MMP_UART2=y

CONFIG_EARLY_PRINTK=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRC_CCITT=y

arch/arm/mach-mmp/include/mach/debug-macro.S

+10 −2
Original line number Diff line number Diff line
@@ -9,13 +9,21 @@ 
 * published by the Free Software Foundation.

 */



#if defined(CONFIG_DEBUG_MMP_UART2)

#define MMP_UART_OFFSET	0x00017000

#elif defined(CONFIG_DEBUG_MMP_UART3)

#define MMP_UART_OFFSET	0x00018000

#else

#error "Select uart for DEBUG_LL"

#endif



#include <mach/addr-map.h>



		.macro	addruart, rp, rv, tmp

		ldr	\rp, =APB_PHYS_BASE		@ physical

		ldr	\rv, =APB_VIRT_BASE		@ virtual

		orr	\rp, \rp, #0x00017000

		orr	\rv, \rv, #0x00017000

		orr	\rp, \rp, #MMP_UART_OFFSET

		orr	\rv, \rv, #MMP_UART_OFFSET

		.endm



#define UART_SHIFT	2