On recent make, commit 1449fb96, "arm/dt: Add a make rule to build
dtb for enabled boards" breaks build of the kernel immediately:
/projects/linaro/linux-2.6/arch/arm/Makefile:292: *** mixed implicit
and normal rules. Stop.
> $ rpm -q make
> make-3.82-4.fc15.x86_64
>
> ''The previous behavior of mixing implicit and pattern rules in one line
> like that was never supported or documented, but due to a "hole" in the
> parser it worked for certain specific cases (for example, reversing that
> line so the pattern comes first would not work, nor would adding extra
> explicit targets after the pattern target).
>
> In 3.82, the parser was tightened in this respect and that "hole" was
> closed, hence you see this error.''
This patch splits the rule to fix the bug.
Reported-by: Andy Green <andy.green(a)linaro.org>
Signed-off-by: Grant Likely <grant.likely(a)secretlab.ca>
---
arch/arm/Makefile | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 1be856a..4570ca7 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -289,7 +289,10 @@ zImage Image xipImage bootpImage uImage: vmlinux
zinstall uinstall install: vmlinux
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
-dtbs %.dtb:
+%.dtb:
+ $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
+
+dtbs:
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
# We use MRPROPER_FILES and CLEAN_FILES now
@@ -308,6 +311,7 @@ define archhelp
echo ' uImage - U-Boot wrapped zImage'
echo ' bootpImage - Combined zImage and initial RAM disk'
echo ' (supply initrd image via make variable INITRD=<path>)'
+ echo ' dtbs - Build device tree blobs for enabled boards'
echo ' install - Install uncompressed kernel'
echo ' zinstall - Install compressed kernel'
echo ' uinstall - Install U-Boot wrapped compressed kernel'
== Thomas Abraham <thomas_ab> ==
=== Highlights ===
* Tested kexec-reboot on s5pv310.
- Works if L2 cache is disabled.
- Debugging kernel reboot failure with L2 cache enabled.
* Tested kexec-crashdump on s5pv310.
- Works fine if capture kernel uses slab allocator but fails when
using slub allocator.
- With slub allocator, capture kernel crashes accessing a invalid
virtual memory location.
- Debugging the cause of capture kernel crash.
=== Plans ===
* Fix issues with kexec-reboot and kexec-crashdump for s5pv310 platform.
=== Issues ===
* None.
== m-y ==
=== Highlights ===
* Patch set for DMA support in USB for U8500 still waiting for the
maintainer's attention
* Currently helping out the landing team to support USB on Snowball
with kernel v2.6.38. Both host and peripheral sides are working.
Further testing is in progress.
=== Plans ===
* Add battery charging support in AB8500-usb driver.
Thanks,
--
Mian Yousaf Kaukab
== Device Tree ==
* The patch of dtb-make-rule got merged on Nico's tree, and sent
a follow-up patch to address the mixing rules issue with make 3.82
reported by Andy Green.
* Added .dtb files into linaro-image-*.deb package and sent
John Rigby the patch for including in the next release of linaro
natty tree.
* Added lmc dtb support for omap and mx5 based boards, and the patch
is being reviewed.
== Misc ==
* Had the Hungary VISA interview
--
Regards,
Shawn
Hi Loic,
I have lmc dtb support added for omap and mx5 at branch [1]. Can you
please help review the changes? I believe you will have comments
there :) Here are some notes I want to share.
* I chose not to add any argument to lmc for differentiating the
boards which do not support dt yet from those which already do.
Instead, I use board properties 'dtb_addr' and 'dtb_name'. With
this approach, all the changes will be limited in boards.py. And
also considering that the current solution may be temporary and we
will ultimately support dtb by appending it to kernel image, it may
be reasonable to save one lmc argument for temporary dtb support.
* Board 'igep' is being split into 'igepv2' and 'igepv3', as they get
different .dtb files.
* Boards 'vexpress' and 'ux500' do not get supported, as there is no
dt support for them yet in kernel tree (no .dts for the boards).
* Though dt support for 'smdkv310' has been available in kernel tree,
I did not add the dtb support in lmc for it, because bug 727978
makes the board so unique in terms of installing and loading boot
files. And I'm seeing some recent activity of addressing the bug,
so I would hold this board for a while.
* Boards 'tegra-harmony', 'versatile-ab' and 'versatile-pb' have
already got dt support in kernel tree, but lmc does not support
them at all.
* This branch can not be merged into trunk for working with daily
build hwpack before John Rigby gets .dtb files be there.
[1] lp:~shawnguo/linaro-image-tools/add-dtb
--
Regards,
Shawn
== John Stultz <jstultz_*> ==
=== Highlights ===
* Got Linaro Android kernel working with HDMI on PandaBoard!
* Added capability limits to Posix Alarm Timer patches
* Lots of tweaking and practicing of my ELC presentation.
* Worked with Alexander to add some Linaro Android Platform items to
the presentation
* Thomas pulled in a bunch of timekeeping cleanups for 2.6.40
* Nagged tglx to pull RTC fixes for 2.6.39
* Ran into a weird OMAP4 display issue that was later not reproducible.
* jcrigby hit it later and figured it out.
* Assisted with internal IBM bugs.
=== Plans ===
* Attending & Presenting at ELC next week, will be online occasionally
* Planning on meeting with some of the Android devs at ELC to talk
about upstreaming.
* Work on timerfd support for alarm timers.
=== Issues ===
* OMAP3 USB issue is still holding back Linaro Android kernel.
* https://bugs.edge.launchpad.net/linux-linaro/+bug/747639
* Spent some time trying to figure this out myself, but no luck.
* Ping'ed Keshava at TI, but he's out next week, so little progress
expected.
== Paul E. McKenney <paulmck> ==
=== Highlights ==
* Working RCU priority boosting bug: continue debugging
* Coded and tested more diagnostics to track down this bug
* Found and fixed another bug, more bugs remain
* More Power preemption bugs exposed, improved diagnostics and chasing these (no 16-PCU ARM systems available)
* Worked another stuck TSC license request, now caught up
* Worked ARM subarchitecture maintainership issue
== Miscellaneous ==
* RCU_PREEMPT inlining patches from Lai Jiangshan met resistance, helping to work out a solution (good resistance, solution will have pure C code instead of automatically generated numerical offsets)
FYI -- new ARM reference manual! This may be downloaded from:
https://wiki.linaro.org/Internal/OfficeofCTO
Please pass any feedback to David Rusling.
Thanx, Paul
----- Forwarded message from David Rusling <david.rusling(a)linaro.org> -----
Date: Tue, 5 Apr 2011 14:02:39 +0100
From: David Rusling <david.rusling(a)linaro.org>
To: octo(a)linaro.org, Linaro Tech Leads <techleads(a)linaro.org>,
"Paul E. McKenney" <paulmck(a)linux.vnet.ibm.com>,
Arnd Bergmann <arnd(a)arndb.de>,
Nicolas Pitre <nicolas.pitre(a)linaro.org>
Subject: Cortex ARMv7 Programmer's Guide / Memory Management / Kernel patch
coordination
X-Mailer: Apple Mail (2.1084)
All,
several topics in one, please see https://wiki.linaro.org/Internal/OfficeofCTO:
[1] Programmer's guide - available to everyone in Linaro, not to be redistributed outside. This is a beta and will be released once comments have been collected. Please pass it on to your team members.
[2] Memory management - I've outlined the problem and the solution, please give feedback. Jesse owns the execution.
[3] Kernel patch coordination - I've outlined the problem and the solution, please give feedback. Based on comments, discussions etc. Please feed any comments to Paul McAteer <Paul.McAteer(a)arm.com>
[2] and [3] are not completely disconnected
Dave
David Rusling, CTO
http://www.linaro.org
Linaro
Lockton House
Clarendon Rd
Cambridge
CB2 8FH
----- End forwarded message -----