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

Commit 9eb8f674 authored by Grant Likely's avatar Grant Likely
Browse files

arm/dt: Allow CONFIG_OF on ARM 



Add some basic empty infrastructure for DT support on ARM.

v5: - Fix off-by-one error in size calculation of initrd
    - Stop mucking with cmd_line, and load command line from dt into
      boot_command_line instead which matches the behaviour of ATAGS booting
v3: - moved cmd_line export and initrd setup to this patch to make the
      series bisectable.
    - switched to alloc_bootmem_align() for allocation when
      unflattening the device tree.  memblock_alloc() was not the
      right interface.

Signed-off-by: default avatarJeremy Kerr <jeremy.kerr@canonical.com>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 4c2896e8

arch/arm/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -1687,6 +1687,13 @@ endmenu 


menu "Boot options"



config USE_OF

	bool "Flattened Device Tree support"

	select OF

	select OF_EARLY_FLATTREE

	help

	  Include support for flattened device tree machine descriptions.



# Compressed boot loader in ROM.  Yes, we really want to ask about

# TEXT and BSS so we preserve their values in the config files.

config ZBOOT_ROM_TEXT

arch/arm/include/asm/prom.h

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 *  arch/arm/include/asm/prom.h

 *

 *  Copyright (C) 2009 Canonical Ltd. <jeremy.kerr@canonical.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 */

#ifndef __ASMARM_PROM_H

#define __ASMARM_PROM_H



#ifdef CONFIG_OF



#include <asm/setup.h>

#include <asm/irq.h>



static inline void irq_dispose_mapping(unsigned int virq)

{

	return;

}



#endif /* CONFIG_OF */

#endif /* ASMARM_PROM_H */

arch/arm/include/asm/setup.h

+2 −0
Original line number Diff line number Diff line
@@ -217,6 +217,8 @@ extern struct meminfo meminfo; 
#define bank_phys_end(bank)	((bank)->start + (bank)->size)

#define bank_phys_size(bank)	(bank)->size



extern int arm_add_memory(phys_addr_t start, unsigned long size);



#endif  /*  __KERNEL__  */



#endif

arch/arm/kernel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ obj-$(CONFIG_ARM_THUMBEE) += thumbee.o 
obj-$(CONFIG_KGDB)		+= kgdb.o

obj-$(CONFIG_ARM_UNWIND)	+= unwind.o

obj-$(CONFIG_HAVE_TCM)		+= tcm.o

obj-$(CONFIG_OF)		+= devtree.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_SWP_EMULATE)	+= swp_emulate.o

CFLAGS_swp_emulate.o		:= -Wa,-march=armv7-a

arch/arm/kernel/devtree.c

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/kernel/devtree.c

 *

 *  Copyright (C) 2009 Canonical Ltd. <jeremy.kerr@canonical.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#include <linux/init.h>

#include <linux/module.h>

#include <linux/errno.h>

#include <linux/types.h>

#include <linux/bootmem.h>

#include <linux/memblock.h>

#include <linux/of.h>

#include <linux/of_fdt.h>

#include <linux/of_irq.h>

#include <linux/of_platform.h>



#include <asm/setup.h>

#include <asm/page.h>



void __init early_init_dt_add_memory_arch(u64 base, u64 size)

{

	arm_add_memory(base, size);

}



void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)

{

	return alloc_bootmem_align(size, align);

}



/**

 * irq_create_of_mapping - Hook to resolve OF irq specifier into a Linux irq#

 *

 * Currently the mapping mechanism is trivial; simple flat hwirq numbers are

 * mapped 1:1 onto Linux irq numbers.  Cascaded irq controllers are not

 * supported.

 */

unsigned int irq_create_of_mapping(struct device_node *controller,

				   const u32 *intspec, unsigned int intsize)

{

	return intspec[0];

}

EXPORT_SYMBOL_GPL(irq_create_of_mapping);