Merge branch 'depends/rmk/devel-stable' into imx/imx6q

	select HAVE_GENERIC_HARDIRQS

	select HAVE_SPARSE_IRQ

	select GENERIC_IRQ_SHOW

	select CPU_PM if (SUSPEND || CPU_IDLE)

	help

	  The ARM series is a line of low-power-consumption RISC chip designs

	  licensed by ARM Ltd and targeted at embedded applications and

endchoice

config ARM_APPENDED_DTB

	bool "Use appended device tree blob to zImage (EXPERIMENTAL)"

	depends on OF && !ZBOOT_ROM && EXPERIMENTAL

	help

	  With this option, the boot code will look for a device tree binary

	  (DTB) appended to zImage

	  (e.g. cat zImage <filename>.dtb > zImage_w_dtb).

	  This is meant as a backward compatibility convenience for those

	  systems with a bootloader that can't be upgraded to accommodate

	  the documented boot protocol using a device tree.

	  Beware that there is very little in terms of protection against

	  this option being confused by leftover garbage in memory that might

	  look like a DTB header after a reboot if no actual DTB is appended

	  to zImage.  Do not leave this option active in a production kernel

	  if you don't intend to always append a DTB.  Proper passing of the

	  location into r2 of a bootloader provided DTB is always preferable

	  to this option.

config ARM_ATAG_DTB_COMPAT

	bool "Supplement the appended DTB with traditional ATAG information"

	depends on ARM_APPENDED_DTB

	help

	  Some old bootloaders can't be updated to a DTB capable one, yet

	  they provide ATAGs with memory configuration, the ramdisk address,

	  the kernel cmdline string, etc.  Such information is dynamically

	  provided by the bootloader and can't always be stored in a static

	  DTB.  To allow a device tree enabled kernel to be used with such

	  bootloaders, this option allows zImage to extract the information

	  from the ATAG list and store it at run time into the appended DTB.

config CMDLINE

	string "Default kernel command string"

	default ""

	  The uncompressor code port configuration is now handled

	  by CONFIG_S3C_LOWLEVEL_UART_PORT.

config ARM_KPROBES_TEST

	tristate "Kprobes test module"

	depends on KPROBES && MODULES

	help

	  Perform tests of kprobes API and instruction set simulation.

endmenu

piggy.lzma

vmlinux

vmlinux.lds

# borrowed libfdt files

fdt.c

fdt.h

fdt_ro.c

fdt_rw.c

fdt_wip.c

libfdt.h

libfdt_internal.h

OBJS	+= misc.o decompress.o

FONTC	= $(srctree)/drivers/video/console/font_acorn_8x8.c

# string library code (-Os is enforced to keep it much smaller)

OBJS		+= string.o

CFLAGS_string.o	:= -Os

#

# Architecture dependencies

#

suffix_$(CONFIG_KERNEL_LZO)  = lzo

suffix_$(CONFIG_KERNEL_LZMA) = lzma

# Borrowed libfdt files for the ATAG compatibility mode

libfdt		:= fdt_rw.c fdt_ro.c fdt_wip.c fdt.c

libfdt_hdrs	:= fdt.h libfdt.h libfdt_internal.h

libfdt_objs	:= $(addsuffix .o, $(basename $(libfdt)))

$(addprefix $(obj)/,$(libfdt) $(libfdt_hdrs)): $(obj)/%: $(srctree)/scripts/dtc/libfdt/%

	$(call cmd,shipped)

$(addprefix $(obj)/,$(libfdt_objs) atags_to_fdt.o): \

	$(addprefix $(obj)/,$(libfdt_hdrs))

ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y)

OBJS	+= $(libfdt_objs) atags_to_fdt.o

endif

targets       := vmlinux vmlinux.lds \

		 piggy.$(suffix_y) piggy.$(suffix_y).o \

		 font.o font.c head.o misc.o $(OBJS)

		 lib1funcs.o lib1funcs.S font.o font.c head.o misc.o $(OBJS)

# Make sure files are removed during clean

extra-y       += piggy.gzip piggy.lzo piggy.lzma lib1funcs.S

extra-y       += piggy.gzip piggy.lzo piggy.lzma lib1funcs.S $(libfdt) $(libfdt_hdrs)

ifeq ($(CONFIG_FUNCTION_TRACER),y)

ORIG_CFLAGS := $(KBUILD_CFLAGS)

KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))

endif

ccflags-y := -fpic -fno-builtin

ccflags-y := -fpic -fno-builtin -I$(obj)

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

# Supply kernel BSS size to the decompressor via a linker symbol.

KBSS_SZ = $(shell size $(obj)/../../../../vmlinux | awk 'END{print $$3}')

LDFLAGS_vmlinux = --defsym _kernel_bss_size=$(KBSS_SZ)

# Supply ZRELADDR to the decompressor via a linker symbol.

ifneq ($(CONFIG_AUTO_ZRELADDR),y)

LDFLAGS_vmlinux += --defsym zreladdr=$(ZRELADDR)

# For __aeabi_uidivmod

lib1funcs = $(obj)/lib1funcs.o

$(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S FORCE

$(obj)/lib1funcs.S: $(srctree)/arch/$(SRCARCH)/lib/lib1funcs.S

	$(call cmd,shipped)

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

#include <asm/setup.h>

#include <libfdt.h>

static int node_offset(void *fdt, const char *node_path)

{

	int offset = fdt_path_offset(fdt, node_path);

	if (offset == -FDT_ERR_NOTFOUND)

		offset = fdt_add_subnode(fdt, 0, node_path);

	return offset;

}

static int setprop(void *fdt, const char *node_path, const char *property,

		   uint32_t *val_array, int size)

{

	int offset = node_offset(fdt, node_path);

	if (offset < 0)

		return offset;

	return fdt_setprop(fdt, offset, property, val_array, size);

}

static int setprop_string(void *fdt, const char *node_path,

			  const char *property, const char *string)

{

	int offset = node_offset(fdt, node_path);

	if (offset < 0)

		return offset;

	return fdt_setprop_string(fdt, offset, property, string);

}

static int setprop_cell(void *fdt, const char *node_path,

			const char *property, uint32_t val)

{

	int offset = node_offset(fdt, node_path);

	if (offset < 0)

		return offset;

	return fdt_setprop_cell(fdt, offset, property, val);

}

/*

 * Convert and fold provided ATAGs into the provided FDT.

 *

 * REturn values:

 *    = 0 -> pretend success

 *    = 1 -> bad ATAG (may retry with another possible ATAG pointer)

 *    < 0 -> error from libfdt

 */

int atags_to_fdt(void *atag_list, void *fdt, int total_space)

{

	struct tag *atag = atag_list;

	uint32_t mem_reg_property[2 * NR_BANKS];

	int memcount = 0;

	int ret;

	/* make sure we've got an aligned pointer */

	if ((u32)atag_list & 0x3)

		return 1;

	/* if we get a DTB here we're done already */

	if (*(u32 *)atag_list == fdt32_to_cpu(FDT_MAGIC))

	       return 0;

	/* validate the ATAG */

	if (atag->hdr.tag != ATAG_CORE ||

	    (atag->hdr.size != tag_size(tag_core) &&

	     atag->hdr.size != 2))

		return 1;

	/* let's give it all the room it could need */

	ret = fdt_open_into(fdt, fdt, total_space);

	if (ret < 0)

		return ret;

	for_each_tag(atag, atag_list) {

		if (atag->hdr.tag == ATAG_CMDLINE) {

			setprop_string(fdt, "/chosen", "bootargs",

					atag->u.cmdline.cmdline);

		} else if (atag->hdr.tag == ATAG_MEM) {

			if (memcount >= sizeof(mem_reg_property)/4)

				continue;

			mem_reg_property[memcount++] = cpu_to_fdt32(atag->u.mem.start);

			mem_reg_property[memcount++] = cpu_to_fdt32(atag->u.mem.size);

		} else if (atag->hdr.tag == ATAG_INITRD2) {

			uint32_t initrd_start, initrd_size;

			initrd_start = atag->u.initrd.start;

			initrd_size = atag->u.initrd.size;

			setprop_cell(fdt, "/chosen", "linux,initrd-start",

					initrd_start);

			setprop_cell(fdt, "/chosen", "linux,initrd-end",

					initrd_start + initrd_size);

		}

	}

	if (memcount)

		setprop(fdt, "/memory", "reg", mem_reg_property, 4*memcount);

	return fdt_pack(fdt);

}