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

Commit f949c0ed authored by Russell King's avatar Russell King
Browse files

Merge branch 'master' into devel

parents 119c4b12 92d2040d

arch/arm/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -1421,6 +1421,17 @@ config CMDLINE 
	  time by entering them here. As a minimum, you should specify the

	  memory size and the root device (e.g., mem=64M root=/dev/nfs).



config CMDLINE_FORCE

	bool "Always use the default kernel command string"

	depends on CMDLINE != ""

	help

	  Always use the default kernel command string, even if the boot

	  loader passes other arguments to the kernel.

	  This is useful if you cannot or don't want to change the

	  command-line options your boot loader passes to the kernel.



	  If unsure, say N.



config XIP_KERNEL

	bool "Kernel Execute-In-Place from ROM"

	depends on !ZBOOT_ROM

arch/arm/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -593,6 +593,7 @@ static int __init parse_tag_revision(const struct tag *tag) 


__tagtable(ATAG_REVISION, parse_tag_revision);



#ifndef CONFIG_CMDLINE_FORCE

static int __init parse_tag_cmdline(const struct tag *tag)

{

	strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
@@ -600,6 +601,7 @@ static int __init parse_tag_cmdline(const struct tag *tag) 
}



__tagtable(ATAG_CMDLINE, parse_tag_cmdline);

#endif /* CONFIG_CMDLINE_FORCE */



/*

 * Scan the tag table for this tag, and call its parse function.

arch/arm/kernel/unwind.c

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
 * http://infocenter.arm.com/help/topic/com.arm.doc.subset.swdev.abi/index.html

 */



#ifndef __CHECKER__

#if !defined (__ARM_EABI__)

#warning Your compiler does not have EABI support.

#warning    ARM unwind is known to compile only with EABI compilers.
@@ -34,6 +35,7 @@ 
#warning Your compiler is too buggy; it is known to not compile ARM unwind support.

#warning    Change compiler or disable ARM_UNWIND option.

#endif

#endif /* __CHECKER__ */



#include <linux/kernel.h>

#include <linux/init.h>

arch/arm/mach-at91/board-sam9m10g45ek.c

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

#include <linux/clk.h>



#include <mach/hardware.h>

#include <video/atmel_lcdc.h>



#include <asm/setup.h>

arch/arm/mach-clps711x/Makefile.boot

+1 −2
Original line number Diff line number Diff line
@@ -4,4 +4,3 @@ params_phys-y := 0xc0000100 
# Should probably have some agreement on these...

initrd_phys-$(CONFIG_ARCH_P720T)	:= 0xc0400000

initrd_phys-$(CONFIG_ARCH_CDB89712)	:= 0x00700000