diff options
| author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-05-11 02:17:19 +0400 |
|---|---|---|
| committer | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2009-05-11 02:17:19 +0400 |
| commit | 6cf180ff0c54193cf2dca1a222574c3501b9dad6 (patch) | |
| tree | 3698a063d07616e11335a05b341b7ccb9cdb5d36 /conf/machine/include | |
| parent | 0628081b0377b36a7db9e74e5a27a079978f2924 (diff) | |
| parent | 9b978539d86aaaf1189df2f740a33549946afe10 (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/omap3.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-clamshell.inc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 5d6d9ffbff..2e33e33606 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -1,7 +1,7 @@ require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = "linux-omap" # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = "r31" +MACHINE_KERNEL_PR = "r32" KERNEL_IMAGETYPE = "uImage" diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc index 34e803e418..4fa9f75eb3 100644 --- a/conf/machine/include/zaurus-clamshell.inc +++ b/conf/machine/include/zaurus-clamshell.inc @@ -1,7 +1,6 @@ include conf/machine/include/tune-xscale.inc EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" -KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime -m favourlzo \ --output=${T}/${IMAGE_NAME}.rootfs.jffs2 --pad --little-endian --eraseblock=${ERASEBLOCKSIZE} -n \ |