* Discussion to generalize the maintenance process of kernel branches
> for the periodic Linaro releases. This still needs documenting in the
> wiki.
>
> * Merged a set of patches put together by Anand Gadiyar to add display
> support to the PandaBoard.
>
> * Merged the following additional patches:
>
> * d983450 cpufreq: Add documentation for sampling_down_factor
> * 054fcd5 ARM: S5P: Fix end address in memory resource information for UART devices
> * bf47520 ARM: make SWP emulation explicit on !CPU_USE_DOMAINS
> * 459967a ARM: fixup SMP alternatives in modules
> * 7144fbc ARM: 6654/1: perf/oprofile: fix off-by-one in stack check
> * 067dfdf ARM: 6659/1: Thumb-2: Make CONFIG_OABI_COMPAT depend on !CONFIG_THUMB2_KERNEL
> * cc0f308 ARM: 6656/1: hw_breakpoint: avoid UNPREDICTABLE behaviour when reading DBGDSCR
> * 40ef21c ARM: 6657/1: hw_breakpoint: fix ptrace breakpoint advertising on unsupported arch
> * 9e97118 ARM: ptrace: remove single-step emulation code
>
== Upstream oriented activities ==
* Review of Arnd Bergmann's flash card article for LWN.
* Incorporation of feedback to the patch adding Thumb2 support to the
P2V branch.
* Another look at the Thumb-2 compatibility fixes for OMAP from Dave
Martin.
* Review of a patch series adding support for SDHCI v3.00.
* Posted patches:
* Rework of the kernel decompressor code to improve efficiency
* Removal of the 4x expansion presumption while decompressing the kernel
* kprobes insn decoding fix
* Ignore mdesc->boot_params if out of range
* Fold lookup_machine_type() into setup_machine()
== Linaro kernel activities ==
* Looked at some bugs:
* Bug 660811
* Bug 720055
* Merged 2.6.37.1 into linaro-2.6.37
* Merged Dave Martin's Thumb2 compatibility patches for OMAP.
* Merged core ARM ffixes from RMK.
* Merged OMAP fixes from Tony Lindgren.
* Opened up the linaro-2.6.38 branch.
Nicolas
Hi Jerry & Wolfgang,
The following series fixes a bug in the device tree code and
eliminates the CONFIG_OF_LIBFDT dependency on CONFIG_SYS_BOOTMAPSZ.
It also adds parsing of the reserved mem regions so that U-Boot
doesn't decide to use a regions set aside for another purpose.
Finally, the last patch adds CONFIG_OF_LIBFDT to a bunch of boards.
I'm not expecting the last patch to be picked up in mainline (yet),
but it will be picked up into the Linaro tree for the 11.05 release.
John, this same series applies cleanly on the linaro-stable u-boot
tree. Can you pick them up please? Or would you prefer me to send
you a pull request?
g.
---
Grant Likely (6):
Stop passing around bootmem_base value.
Default to bootm_size() when CONFIG_SYS_BOOTMAPSZ is not defined
Remove device tree booting dependency on CONFIG_SYS_BOOTMAPSZ
Fix off-by-one error in passing initrd end address via device tree
Respect memreserve regions specified in the device tree
Add CONFIG_OF_LIBFDT to more boards.
README | 16 ++++++++-
arch/arm/lib/bootm.c | 5 ++-
arch/m68k/lib/bootm.c | 7 +---
arch/powerpc/lib/bootm.c | 19 +++++-----
common/cmd_bootm.c | 7 ++--
common/fdt_support.c | 2 +
common/image.c | 72 +++++++++++++++++++++++++++++----------
include/configs/ca9x4_ct_vxp.h | 2 +
include/configs/devkit8000.h | 2 +
include/configs/efikamx.h | 2 +
include/configs/igep0020.h | 2 +
include/configs/igep0030.h | 2 +
include/configs/mx51evk.h | 2 +
include/configs/mx53evk.h | 2 +
include/configs/omap3_beagle.h | 7 ----
include/configs/omap3_overo.h | 2 +
include/configs/omap3_pandora.h | 2 +
include/configs/omap3_sdp3430.h | 2 +
include/configs/omap3_zoom1.h | 2 +
include/configs/omap3_zoom2.h | 2 +
include/configs/omap4_panda.h | 2 +
include/configs/omap4_sdp4430.h | 2 +
include/configs/tegra2-common.h | 1 +
include/image.h | 10 +++--
24 files changed, 122 insertions(+), 52 deletions(-)
--
Signature
Hi Nicolas,
Here are the device tree changes for 2.6.38 rebased onto your new
branch. I had to rebase instead of just asking you to pull directly
since I have a number of patches in my test tree that are merged in a
different form in your tree.
For those of you working on DT support for the 11.05 release, please
test against this branch and make sure everything is still working for
you.
g.
The following changes since commit f302d2ec52bfb0d9ae2bb7fbff957f3f6ea71f45:
ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support (2011-03-28 14:45:57 -0400)
are available in the git repository at:
git://git.secretlab.ca/git/linux-2.6 devicetree/arm-linaro-2.6.38-rebuilt
Grant Likely (15):
driver-core: remove conditionals around devicetree pointers
dt: Refactor of_platform_bus_probe()
dt: protect against NULL matches passed to of_match_node()
dt: eliminate OF_NO_DEEP_PROBE and test for NULL match table
dt: add of_platform_populate() for creating device from the device tree
dt: add of_platform_prepare() to match nodes with static platform_devices
tty/serial: Relax the device_type restriction from of_serial
arm/dt: Make __vet_atags also accept a dtb image
arm/dt: consolidate atags setup into setup_machine_atags
arm/dt: probe for platforms via the device tree
arm/dt: Basic versatile devicetree support
arm/dt: Basic tegra devicetree support
arm/dt: Add Pandaboard devicetree support
dt: add documentation of ARM dt boot interface
arm/dt: Add dt machine definition
Jeremy Kerr (1):
arm/dt: Allow CONFIG_OF on ARM
Jon Medhurst (1):
arm/dt: Add basic device tree support for Beagleboad
Rob Herring (1):
arm/dt: Add dtb make rule
Thomas Abraham (1):
dt/arm: Add basic device tree support for smdkv310 board
Documentation/arm/Booting | 33 ++-
Documentation/devicetree/booting-without-of.txt | 44 +++-
arch/arm/Kconfig | 7 +
arch/arm/Makefile | 3 +
arch/arm/boot/Makefile | 4 +
arch/arm/boot/dts/exynos4-smdkv310.dts | 31 ++
arch/arm/boot/dts/omap3-beagle.dts | 7 +
arch/arm/boot/dts/omap4-panda.dts | 11 +
arch/arm/boot/dts/skeleton.dtsi | 13 +
arch/arm/boot/dts/tegra-harmony.dts | 7 +
arch/arm/boot/dts/versatile-ab.dts | 7 +
arch/arm/boot/dts/versatile-pb.dts | 7 +
arch/arm/include/asm/mach/arch.h | 18 ++
arch/arm/include/asm/prom.h | 37 +++
arch/arm/include/asm/setup.h | 5 +
arch/arm/kernel/Makefile | 1 +
arch/arm/kernel/devtree.c | 147 ++++++++++
arch/arm/kernel/head-common.S | 24 ++-
arch/arm/kernel/head.S | 8 +-
arch/arm/kernel/setup.c | 97 ++++---
arch/arm/mach-exynos4/mach-smdkv310.c | 6 +
arch/arm/mach-omap2/board-omap3beagle.c | 6 +
arch/arm/mach-omap2/board-omap4panda.c | 6 +
arch/arm/mach-tegra/board-harmony.c | 6 +
arch/arm/mach-versatile/core.c | 1 +
arch/arm/mach-versatile/versatile_ab.c | 6 +
arch/arm/mach-versatile/versatile_pb.c | 6 +
arch/arm/mm/init.c | 11 +
arch/powerpc/platforms/52xx/mpc52xx_common.c | 10 +-
drivers/i2c/busses/i2c-ocores.c | 14 +-
drivers/i2c/i2c-core.c | 2 -
drivers/mmc/host/mmc_spi.c | 4 -
drivers/net/ethoc.c | 8 +-
drivers/of/address.c | 14 +
drivers/of/base.c | 3 +
drivers/of/platform.c | 347 +++++++++++++++++++----
drivers/spi/pxa2xx_spi.c | 2 -
drivers/spi/pxa2xx_spi_pci.c | 2 -
drivers/spi/xilinx_spi.c | 6 -
drivers/tty/serial/of_serial.c | 18 +-
include/linux/device.h | 7 +-
include/linux/i2c.h | 2 -
include/linux/of.h | 4 +-
include/linux/of_address.h | 1 +
include/linux/of_platform.h | 8 +-
45 files changed, 850 insertions(+), 161 deletions(-)
create mode 100755 arch/arm/boot/dts/exynos4-smdkv310.dts
create mode 100644 arch/arm/boot/dts/omap3-beagle.dts
create mode 100644 arch/arm/boot/dts/omap4-panda.dts
create mode 100644 arch/arm/boot/dts/skeleton.dtsi
create mode 100644 arch/arm/boot/dts/tegra-harmony.dts
create mode 100644 arch/arm/boot/dts/versatile-ab.dts
create mode 100644 arch/arm/boot/dts/versatile-pb.dts
create mode 100644 arch/arm/include/asm/prom.h
create mode 100644 arch/arm/kernel/devtree.c
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
Hello everyone,
As I've been working on the integration of the latest developments and
fixes from upstream into the linaro-2.6.38 kernel lately, it became
quickly evident that major merge conflicts were to be expected. The
problem stems from the fact that we opened the 2.6.38 branch early i.e.
around the 2.6.38-rc5 kernel. Many patches that were merged into the
Linaro kernel have been subsequently modified by their respective
maintainers until they were merged upstream, meaning that what we have
now in mainline is different from what the Linaro kernel tree has. This
creates several issues:
- It is hard to verify that what is in the Linaro tree is actually the
latest and the best version of a patch.
- Merging additional fixes from upstream often ends up in merge
conflicts requiring manual resolution, sometimes non-trivial ones,
which is in itself a bug hazard.
- People wanting to contribute patches to the Linaro kernel potentially
have to create a different patch than what they would submit
upstream.
Given those issues, I decided to rebuild the linaro-2.6.38 branch from
scratch to see where that would bring me. And as could be expected, the
result looks nicer and it is much easier to work with than the current
tree. For example, this allowed me to merge the latest OMAP support
from mainline as is, including the latest fixes, without any need for
backport work nor major conflict resolution. Another advantage is that
the commit SHA1 references are now identical in most cases to what can
be found into mainline.
So... my question is: should we switch to this rebuilt tree or not?
There are drawbacks with such a move of course:
- All the testing done so far would be void. This is however not as
bad as this may look as the rebuilt kernel contains fixes for existing
bugs in the current tree, and the rebuilt kernel is using patches
that have and still are being tested by a wider community.
- I didn't forward port a couple series of patches that are available
in the current Linaro tree and not in mainline yet, including:
* DT support (Grant Likely)
* DVFS and PM for OMAP (Vishwanath Sripathy, Vishwanath BS)
* Some ux500 fixups (Linus Walleij)
* clock debug information (Yong Shen)
* Samsung CPUIDLE (Amit Kachhap)
So I would prefer if the people responsible for those patches did
resubmit their patches once they apply to the new tree (that should
be even easier now to apply patches that were meant for mainline).
- The history of the rebuilt tree is obviously different from the
current tree's. This means special care when updating to the new
tree with Git.
But overall I think there are more advantages than disadvantages for
such a move. What other people think?
The current rebuilt tree can be seen at:
http://git.linaro.org/gitweb?p=kernel/linux-linaro-2.6.38.git;a=shortlog;h=…
or obtained from:
git://git.linaro.org/kernel/linux-linaro-2.6.38.git (the "rebuilt" branch)
Nicolas
== Device Tree ==
* Squash sdhci-pltfm-driver-self-registration series which becomes
one patch of sdhci-pltfm&OF-driver-consolidation series
* Sent a fec dt patch to fix build failure with pure non-dt kernel
* Tested dtb-append patch v3 from John Bonesio on mx51 babbage and
found non-dt kernel works fine, but dt kernel fails
== Misc ==
* Reviewed and tested fec improving patch from Lothar
--
Regards,
Shawn