[PULL] misc (minor) kernel fixes

[PULL] misc (minor) kernel fixes

[Bruce Ashfield]

In preparation for some larger kernel changes being sent 
for review, I'm clearing my queue of a few minor changes
that were done while working on the 0.9 release.

The uImage one is particularly interesting, since it was
a fix for the default beagle board uImage being completely
unbootable. 

The force revisions is largely cosmetic, but it is used
by my upcoming kernel dev layer and I think it is more in
the spirit of other variables that are set from local
configurations.

The following changes since commit e417aa98e4b4170f4b4aaf805cc8ea20f8593604:
  Bruce Ashfield (1):
        wrs_meta: add USB options for wacom tablet support

are available in the git repository at:

  ssh://git@git.pokylinux.org/poky-contrib zedd/kernel-fixes

Bruce Ashfield (2):
      linux-wrs: rename force_revisions and allow override
      kernel: prefer the kernel produced uImage

 meta/classes/kernel.bbclass                |    4 +++-
 meta/recipes-kernel/linux/linux-wrs_git.bb |    6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

[poky][PULL] misc (minor) kernel fixes

[Bruce Ashfield]

In preparation for some larger kernel changes being sent 
for review, I'm clearing my queue of a few minor changes
that were done while working on the 0.9 release.

The uImage one is particularly interesting, since it was
a fix for the default beagle board uImage being completely
unbootable. 

The force revisions is largely cosmetic, but it is used
by my upcoming kernel dev layer and I think it is more in
the spirit of other variables that are set from local
configurations.

The following changes since commit e417aa98e4b4170f4b4aaf805cc8ea20f8593604:
  Bruce Ashfield (1):
        wrs_meta: add USB options for wacom tablet support

are available in the git repository at:

  ssh://git@git.pokylinux.org/poky-contrib zedd/kernel-fixes

Bruce Ashfield (2):
      linux-wrs: rename force_revisions and allow override
      kernel: prefer the kernel produced uImage

 meta/classes/kernel.bbclass                |    4 +++-
 meta/recipes-kernel/linux/linux-wrs_git.bb |    6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

[PATCH 1/2] linux-wrs: rename force_revisions and allow override

[Bruce Ashfield]

It is useful to override revision checking from a layer or other
recipe. In order to show the global nature of the variable rename
it KERNEL_REVISION_CHECKING and make it a weak assignment.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-wrs_git.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-wrs_git.bb b/meta/recipes-kernel/linux/linux-wrs_git.bb
index c43ae11..1f2b11e 100644
--- a/meta/recipes-kernel/linux/linux-wrs_git.bb
+++ b/meta/recipes-kernel/linux/linux-wrs_git.bb
@@ -34,7 +34,7 @@ S = "${WORKDIR}/linux"
 B = "${WORKDIR}/linux-${WRMACHINE}-${LINUX_KERNEL_TYPE}-build"
 
 # functionality flags
-force_revisions = "t"
+KERNEL_REVISION_CHECKING ?= "t"
 KERNEL_FEATURES=features/netfilter
 
 do_patch() {
@@ -75,7 +75,7 @@ validate_branches() {
 	target_meta_head="${SRCREV_meta}"
 
 	if [ -n "$target_branch_head" ] && [ "$branch_head" != "$target_branch_head" ]; then
-		if [ -n "${force_revisions}" ]; then
+		if [ -n "${KERNEL_REVISION_CHECKING}" ]; then
 			git show ${target_branch_head} > /dev/null 2>&1
 			if [ $? -eq 0 ]; then
 				echo "Forcing branch ${WRMACHINE}-${LINUX_KERNEL_TYPE} to ${target_branch_head}"
@@ -90,7 +90,7 @@ validate_branches() {
 	fi
 
 	if [ "$meta_head" != "$target_meta_head" ]; then
-		if [ -n "${force_revisions}" ]; then
+		if [ -n "${KERNEL_REVISION_CHECKING}" ]; then
 			git show ${target_meta_head} > /dev/null 2>&1
 			if [ $? -eq 0 ]; then
 				echo "Forcing branch wrs_meta to ${target_meta_head}"
-- 
1.7.0.4

[PATCH 2/2] kernel: prefer the kernel produced uImage

[Bruce Ashfield]

The custom uImage produced by the kernel classes by default
does not universally boot and working with existing uboot
configurations and setups.

This changes the preference to the uImage constructed by
the kbuild processes and falls back to the other techniques
if uImage is requested by the kernel does not produce one.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 4c79a98..bb76285 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -481,7 +481,9 @@ do_deploy() {
 	fi
 
 	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
-		if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
+		if test -e arch/${ARCH}/boot/uImage ; then
+			cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+		elif test -e arch/${ARCH}/boot/compressed/vmlinux ; then
 			${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
 			uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
 			rm -f linux.bin
-- 
1.7.0.4

Re: [PULL] misc (minor) kernel fixes

[Saul Wold]

On 11/08/2010 01:06 PM, Bruce Ashfield wrote:
> In preparation for some larger kernel changes being sent
> for review, I'm clearing my queue of a few minor changes
> that were done while working on the 0.9 release.
>
> The uImage one is particularly interesting, since it was
> a fix for the default beagle board uImage being completely
> unbootable.
>
> The force revisions is largely cosmetic, but it is used
> by my upcoming kernel dev layer and I think it is more in
> the spirit of other variables that are set from local
> configurations.
>
> The following changes since commit e417aa98e4b4170f4b4aaf805cc8ea20f8593604:
>    Bruce Ashfield (1):
>          wrs_meta: add USB options for wacom tablet support
>
> are available in the git repository at:
>
>    ssh://git@git.pokylinux.org/poky-contrib zedd/kernel-fixes
>
> Bruce Ashfield (2):
>        linux-wrs: rename force_revisions and allow override
>        kernel: prefer the kernel produced uImage
>
>   meta/classes/kernel.bbclass                |    4 +++-
>   meta/recipes-kernel/linux/linux-wrs_git.bb |    6 +++---
>   2 files changed, 6 insertions(+), 4 deletions(-)
>
>
Merged into Master

Thanks
	Sau!

Re: [poky][PULL] misc (minor) kernel fixes

[Saul Wold]

On 11/08/2010 01:06 PM, Bruce Ashfield wrote:
> In preparation for some larger kernel changes being sent
> for review, I'm clearing my queue of a few minor changes
> that were done while working on the 0.9 release.
>
> The uImage one is particularly interesting, since it was
> a fix for the default beagle board uImage being completely
> unbootable.
>
> The force revisions is largely cosmetic, but it is used
> by my upcoming kernel dev layer and I think it is more in
> the spirit of other variables that are set from local
> configurations.
>
> The following changes since commit e417aa98e4b4170f4b4aaf805cc8ea20f8593604:
>    Bruce Ashfield (1):
>          wrs_meta: add USB options for wacom tablet support
>
> are available in the git repository at:
>
>    ssh://git@git.pokylinux.org/poky-contrib zedd/kernel-fixes
>
> Bruce Ashfield (2):
>        linux-wrs: rename force_revisions and allow override
>        kernel: prefer the kernel produced uImage
>
>   meta/classes/kernel.bbclass                |    4 +++-
>   meta/recipes-kernel/linux/linux-wrs_git.bb |    6 +++---
>   2 files changed, 6 insertions(+), 4 deletions(-)
>
>
Merged into Master

Thanks
	Sau!