On Wed, Jan 26, 2011 at 2:49 PM, Nicolas Pitre <nicolas.pi...@linaro.org> wrote: > On Wed, 26 Jan 2011, Grant Likely wrote: > >> If I were able to get all the supported Linaro platforms modified and >> tested to support dt booting, would you be okay with picking up the >> current dt support series and having CONFIG_OF turned on by default >> for the next Linaro release? There are also some details to nail down >> with respect to packaging the .dtb files, but I'm working out those >> details with Loďc. > > May I ask you to create a linaro-2.6.37 branch in your repo based on > git://git.linaro.org/kernel/linux-linaro-2.6.37.git and merge your DT > branch in it? If the result look sane to you then I should be able to > merge it in the current Linaro kernel for people to play with.
Done. My branch is based on 2.6.38-rc1, so I cherry picked rather than rebased. The first two commits are in Linus' tree, the remainder are from devicetree/arm. You can find the result here: The following changes since commit 18fac29199a8cd9053adde99849c37dbf2a8b8d9: regulators: Moved define for number of regulators in ab8500 (2011-01-26 16:38:15 -0500) are available in the git repository at: git://git.secretlab.ca/git/linux-2.6 devicetree/arm-linaro-2.6.37 Grant Likely (7): dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch() of/flattree: Add of_flat_dt_match() helper function arm/dt: Make __vet_atags also accept a dtb image arm/dt: allow bootmem reservation for device tree blob and initrd arm/dt: consolidate atags setup into setup_machine_atags arm/dt: probe for platforms via the device tree arm/dt: Basic versatile devicetree support Jeremy Kerr (1): arm/dt: Allow CONFIG_OF on ARM arch/arm/Kconfig | 7 ++ arch/arm/include/asm/mach/arch.h | 2 + arch/arm/include/asm/prom.h | 34 ++++++++++ arch/arm/include/asm/setup.h | 4 + arch/arm/kernel/Makefile | 1 + arch/arm/kernel/devtree.c | 107 ++++++++++++++++++++++++++++++++ arch/arm/kernel/head-common.S | 24 +++++-- arch/arm/kernel/head.S | 8 +- arch/arm/kernel/setup.c | 78 +++++++++++++---------- arch/arm/mach-versatile/versatile_ab.c | 6 ++ arch/arm/mach-versatile/versatile_pb.c | 6 ++ arch/arm/mm/init.c | 23 +++++++ arch/microblaze/kernel/prom.c | 4 +- arch/mips/kernel/prom.c | 6 +- arch/powerpc/kernel/prom.c | 4 +- drivers/of/fdt.c | 33 ++++++++-- include/linux/of_fdt.h | 3 +- 17 files changed, 291 insertions(+), 59 deletions(-) create mode 100644 arch/arm/include/asm/prom.h create mode 100644 arch/arm/kernel/devtree.c _______________________________________________ linaro-dev mailing list linaro-dev@lists.linaro.org http://lists.linaro.org/mailman/listinfo/linaro-dev