[oe-commits] Paul Eggleton : h1940: prefer linux 2.6.39, switch to uImage

[git version control]

Module: openembedded.git
Branch: master
Commit: be2cf0661b6b3fbbd359698ad067ce6f9892d200
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=be2cf0661b6b3fbbd359698ad067ce6f9892d200

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Mon Jun  6 00:05:10 2011 +0100

h1940: prefer linux 2.6.39, switch to uImage

Mainline linux as of 2.6.39 has almost all support pieces integrated for
h1940. In addition switch to uImage to allow booting from u-boot
(especially as booting directly from HaRET seems to be problematic at the
moment.)

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>

---

 conf/machine/h1940.conf |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
index eec87a3..19e7662 100644
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -6,7 +6,11 @@ TARGET_ARCH = "arm"
 
 # Set preferred providers
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-h1940"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_LOADADDRESS = "0x30108000"
+UBOOT_ENTRYPOINT = "0x30108000"
 
 # Set features for task-base
 MACHINE_GUI_CLASS = "smallscreen"