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

Commit fab1b6d5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge 'android-3.18.115' (6784e569) into 'msm-3.18'"

parents 8ccf18e2 36b22217

Makefile

+3 −4
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 113

SUBLEVEL = 115

EXTRAVERSION =

NAME = Diseased Newt
@@ -214,7 +214,6 @@ VPATH := $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD)) 


export srctree objtree VPATH





# SUBARCH tells the usermode build what the underlying arch is.  That is set

# first, and if a usermode build is happening, the "ARCH=um" on the command

# line overrides the setting of ARCH below.  If a native build is happening,
@@ -1523,11 +1522,11 @@ image_name: 
# Clear a bunch of variables before executing the submake

tools/: FORCE

	$(Q)mkdir -p $(objtree)/tools

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(objtree) subdir=tools -C $(src)/tools/

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(O) subdir=tools -C $(src)/tools/



tools/%: FORCE

	$(Q)mkdir -p $(objtree)/tools

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(objtree) subdir=tools -C $(src)/tools/ $*

	$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(O) subdir=tools -C $(src)/tools/ $*



# Single targets

# ---------------------------------------------------------------------------

arch/arm/boot/compressed/head.S

+8 −8
Original line number Diff line number Diff line
@@ -24,19 +24,19 @@ 
#if defined(CONFIG_DEBUG_ICEDCC)



#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_V6K) || defined(CONFIG_CPU_V7)

		.macro	loadsp, rb, tmp

		.macro	loadsp, rb, tmp1, tmp2

		.endm

		.macro	writeb, ch, rb

		mcr	p14, 0, \ch, c0, c5, 0

		.endm

#elif defined(CONFIG_CPU_XSCALE)

		.macro	loadsp, rb, tmp

		.macro	loadsp, rb, tmp1, tmp2

		.endm

		.macro	writeb, ch, rb

		mcr	p14, 0, \ch, c8, c0, 0

		.endm

#else

		.macro	loadsp, rb, tmp

		.macro	loadsp, rb, tmp1, tmp2

		.endm

		.macro	writeb, ch, rb

		mcr	p14, 0, \ch, c1, c0, 0
@@ -52,7 +52,7 @@ 
		.endm



#if defined(CONFIG_ARCH_SA1100)

		.macro	loadsp, rb, tmp

		.macro	loadsp, rb, tmp1, tmp2

		mov	\rb, #0x80000000	@ physical base address

#ifdef CONFIG_DEBUG_LL_SER3

		add	\rb, \rb, #0x00050000	@ Ser3
@@ -61,8 +61,8 @@ 
#endif

		.endm

#else

		.macro	loadsp,	rb, tmp

		addruart \rb, \tmp

		.macro	loadsp,	rb, tmp1, tmp2

		addruart \rb, \tmp1, \tmp2

		.endm

#endif

#endif
@@ -1223,7 +1223,7 @@ phex: adr r3, phexbuf 
		b	1b



@ puts corrupts {r0, r1, r2, r3}

puts:		loadsp	r3, r1

puts:		loadsp	r3, r2, r1

1:		ldrb	r2, [r0], #1

		teq	r2, #0

		moveq	pc, lr
@@ -1240,8 +1240,8 @@ puts: loadsp r3, r1 
@ putc corrupts {r0, r1, r2, r3}

putc:

		mov	r2, r0

		loadsp	r3, r1, r0

		mov	r0, #0

		loadsp	r3, r1

		b	2b



@ memdump corrupts {r0, r1, r2, r3, r10, r11, r12, lr}

arch/arm/include/asm/kgdb.h

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ extern int kgdb_fault_expected; 


#define KGDB_MAX_NO_CPUS	1

#define BUFMAX			400

#define NUMREGBYTES		(DBG_MAX_REG_NUM << 2)

#define NUMREGBYTES		(GDB_MAX_REGS << 2)

#define NUMCRITREGBYTES		(32 << 2)



#define _R0			0

arch/arm/mach-davinci/board-dm355-evm.c

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/i2c.h>

#include <linux/gpio.h>

#include <linux/clk.h>

#include <linux/dm9000.h>

#include <linux/videodev2.h>

#include <media/tvp514x.h>

#include <linux/spi/spi.h>
@@ -170,11 +171,16 @@ static struct resource dm355evm_dm9000_rsrc[] = { 
	},

};



static struct dm9000_plat_data dm335evm_dm9000_platdata;



static struct platform_device dm355evm_dm9000 = {

	.name		= "dm9000",

	.id		= -1,

	.resource	= dm355evm_dm9000_rsrc,

	.num_resources	= ARRAY_SIZE(dm355evm_dm9000_rsrc),

	.dev		= {

		.platform_data = &dm335evm_dm9000_platdata,

	},

};



static struct tvp514x_platform_data tvp5146_pdata = {

arch/arm/mach-davinci/board-dm646x-evm.c

+2 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ static struct vpif_display_config dm646x_vpif_display_config = { 
		.outputs = dm6467_ch0_outputs,

		.output_count = ARRAY_SIZE(dm6467_ch0_outputs),

	},

	.card_name	= "DM646x EVM",

	.card_name	= "DM646x EVM Video Display",

};



/**
@@ -696,6 +696,7 @@ static struct vpif_capture_config dm646x_vpif_capture_cfg = { 
			.fid_pol = 0,

		},

	},

	.card_name = "DM646x EVM Video Capture",

};



static void __init evm_init_video(void)