summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiming Wang <liming.wang@windriver.com>2013-09-06 16:58:36 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-06 23:53:46 +0100
commit6727d1d3807fcf713cbe8bb696e0c27a56166a78 (patch)
treec6676d190f48505ab62e767f6a47f91922ff880d
parent8102de6a8ceb348295174c8ee796d52a37e7d202 (diff)
downloadpoky-6727d1d3807fcf713cbe8bb696e0c27a56166a78.tar.gz
beagleboard: upgrade the kernel to 3.10.x
In 3.10.x linux kernel, uImage can't be compiled by default. But zImage has been supported by the latest u-boot, so use zImage as the default kernel image file. In u-boot command, use "bootz", instead of "bootm", to boot the kernel. And add device tree files to support dtb in latest kernel. (From meta-yocto rev: ff6b4ae23ccd14cefdb94c561160fbdc8344793d) Signed-off-by: Liming Wang <liming.wang@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta-yocto-bsp/conf/machine/beagleboard.conf5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-yocto-bsp/conf/machine/beagleboard.conf b/meta-yocto-bsp/conf/machine/beagleboard.conf
index 5f4c55a7b5..dd0c222ef2 100644
--- a/meta-yocto-bsp/conf/machine/beagleboard.conf
+++ b/meta-yocto-bsp/conf/machine/beagleboard.conf
@@ -29,9 +29,10 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
29SERIAL_CONSOLE = "115200 ttyO2" 29SERIAL_CONSOLE = "115200 ttyO2"
30 30
31PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" 31PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
32PREFERRED_VERSION_linux-yocto ?= "3.4%" 32PREFERRED_VERSION_linux-yocto ?= "3.10%"
33 33
34KERNEL_IMAGETYPE = "uImage" 34KERNEL_IMAGETYPE = "zImage"
35KERNEL_DEVICETREE = "${S}/arch/powerpc/boot/dts/omap3-beagle.dts ${S}/arch/powerpc/boot/dts/omap3-beagle-xm.dts"
35 36
36SPL_BINARY = "MLO" 37SPL_BINARY = "MLO"
37UBOOT_SUFFIX = "img" 38UBOOT_SUFFIX = "img"