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

Commit 9a55d975 authored by Russell King's avatar Russell King
Browse files

Merge branch 'devel-stable' into for-linus 

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-ns9xxx/include/mach/uncompress.h
parents ec19628d dc7ad3b3

arch/arm/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ config ARCH_IXP4XX 


config ARCH_DOVE

	bool "Marvell Dove"

	select CPU_V6K

	select CPU_V7

	select PCI

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_CLOCKEVENTS
@@ -850,6 +850,7 @@ config ARCH_DAVINCI 
	select HAVE_IDE

	select CLKDEV_LOOKUP

	select GENERIC_ALLOCATOR

	select GENERIC_IRQ_CHIP

	select ARCH_HAS_HOLES_MEMORYMODEL

	help

	  Support for TI's DaVinci platform.
@@ -1027,6 +1028,7 @@ config PLAT_IOP 
config PLAT_ORION

	bool

	select CLKSRC_MMIO

	select GENERIC_IRQ_CHIP

	select HAVE_SCHED_CLOCK



config PLAT_PXA

arch/arm/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -158,9 +158,8 @@ machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 
machine-$(CONFIG_ARCH_MX1)		:= imx

machine-$(CONFIG_ARCH_MX2)		:= imx

machine-$(CONFIG_ARCH_MX25)		:= imx

machine-$(CONFIG_ARCH_MX3)		:= mx3

machine-$(CONFIG_ARCH_MX3)		:= imx

machine-$(CONFIG_ARCH_MX5)		:= mx5

machine-$(CONFIG_ARCH_MXC91231)		:= mxc91231

machine-$(CONFIG_ARCH_MXS)		:= mxs

machine-$(CONFIG_ARCH_NETX)		:= netx

machine-$(CONFIG_ARCH_NOMADIK)		:= nomadik

arch/arm/boot/compressed/Makefile

+14 −3
Original line number Diff line number Diff line
@@ -98,8 +98,6 @@ endif 
ccflags-y := -fpic -fno-builtin

asflags-y := -Wa,-march=all



# Provide size of uncompressed kernel to the decompressor via a linker symbol.

LDFLAGS_vmlinux = --defsym _image_size=$(shell stat -c "%s" $(obj)/../Image)

# Supply ZRELADDR to the decompressor via a linker symbol.

ifneq ($(CONFIG_AUTO_ZRELADDR),y)

LDFLAGS_vmlinux += --defsym zreladdr=$(ZRELADDR)
@@ -122,10 +120,23 @@ lib1funcs = $(obj)/lib1funcs.o 
$(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S FORCE

	$(call cmd,shipped)



# We need to prevent any GOTOFF relocs being used with references

# to symbols in the .bss section since we cannot relocate them

# independently from the rest at run time.  This can be achieved by

# ensuring that no private .bss symbols exist, as global symbols

# always have a GOT entry which is what we need.

# The .data section is already discarded by the linker script so no need

# to bother about it here.

check_for_bad_syms = \

bad_syms=$$($(CROSS_COMPILE)nm $@ | sed -n 's/^.\{8\} [bc] \(.*\)/\1/p') && \

[ -z "$$bad_syms" ] || \

  ( echo "following symbols must have non local/private scope:" >&2; \

    echo "$$bad_syms" >&2; rm -f $@; false )



$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.$(suffix_y).o \

	 	$(addprefix $(obj)/, $(OBJS)) $(lib1funcs) FORCE

	$(call if_changed,ld)

	@:

	@$(check_for_bad_syms)



$(obj)/piggy.$(suffix_y): $(obj)/../Image FORCE

	$(call if_changed,$(suffix_y))

arch/arm/boot/compressed/decompress.c

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ extern void error(char *); 
#include "../../../../lib/decompress_unlzma.c"

#endif



void do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x))

int do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x))

{

	decompress(input, len, NULL, NULL, output, NULL, error);

	return decompress(input, len, NULL, NULL, output, NULL, error);

}

arch/arm/boot/compressed/head.S

+19 −11
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ not_angel: 
		bl	cache_on



restart:	adr	r0, LC0

		ldmia	r0, {r1, r2, r3, r6, r9, r11, r12}

		ldmia	r0, {r1, r2, r3, r6, r10, r11, r12}

		ldr	sp, [r0, #28]



		/*
@@ -188,6 +188,20 @@ restart: adr r0, LC0 
		 */

		sub	r0, r0, r1		@ calculate the delta offset

		add	r6, r6, r0		@ _edata

		add	r10, r10, r0		@ inflated kernel size location



		/*

		 * The kernel build system appends the size of the

		 * decompressed kernel at the end of the compressed data

		 * in little-endian form.

		 */

		ldrb	r9, [r10, #0]

		ldrb	lr, [r10, #1]

		orr	r9, r9, lr, lsl #8

		ldrb	lr, [r10, #2]

		ldrb	r10, [r10, #3]

		orr	r9, r9, lr, lsl #16

		orr	r9, r9, r10, lsl #24



#ifndef CONFIG_ZBOOT_ROM

		/* malloc space is above the relocated stack (64k max) */
@@ -347,10 +361,10 @@ LC0: .word LC0 @ r1 
		.word	__bss_start		@ r2

		.word	_end			@ r3

		.word	_edata			@ r6

		.word	_image_size		@ r9

		.word	input_data_end - 4	@ r10 (inflated size location)

		.word	_got_start		@ r11

		.word	_got_end		@ ip

		.word	user_stack_end		@ sp

		.word	.L_user_stack_end	@ sp

		.size	LC0, . - LC0



#ifdef CONFIG_ARCH_RPC
@@ -763,12 +777,6 @@ proc_types: 
		W(b)	__armv4_mmu_cache_off

		W(b)	__armv6_mmu_cache_flush



		.word	0x560f5810		@ Marvell PJ4 ARMv6

		.word	0xff0ffff0

		W(b)	__armv4_mmu_cache_on

		W(b)	__armv4_mmu_cache_off

		W(b)	__armv6_mmu_cache_flush



		.word	0x000f0000		@ new CPU Id

		.word	0x000f0000

		W(b)	__armv7_mmu_cache_on
@@ -1094,5 +1102,5 @@ reloc_code_end: 


		.align

		.section ".stack", "aw", %nobits

user_stack:	.space	4096

user_stack_end:
 
.L_user_stack:	.space	4096

.L_user_stack_end: