diff options
| author | Sergey Lapin <slapin@ossfans.org> | 2009-05-14 18:00:54 +0400 |
|---|---|---|
| committer | Sergey Lapin <slapin@ossfans.org> | 2009-05-14 18:00:54 +0400 |
| commit | cfbb95b3bb62ce2ada4fdd7897a0af0a38b4b628 (patch) | |
| tree | 79040e1fb929da52fd6e014468c7eea2e2464288 /conf/machine/include | |
| parent | d02457b03abe27767741f709a461e8d46294dd01 (diff) | |
| parent | b530076ad1209bceed621eec39e82397732afd6e (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into afeb9260-tmp
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..9f48f750e7 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 = "r33" 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 \ |