diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2010-02-10 18:31:55 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2010-02-10 18:31:55 +0000 |
| commit | 8e727767550c9d9ff658a2c869938b45a24beea8 (patch) | |
| tree | f17b6b4c1406695f08402fe2c594ded3fb49c518 /conf/machine | |
| parent | 6c94d48a45d1b5bcebacc87fdefdebfb4cd3c67e (diff) | |
| parent | ef4f13f1507d1696cb513a61b67a4831fb88e91a (diff) | |
Merge branch 'org.openembedded.dev' of git+ssh://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/nokia900.conf | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf index 4880ea47de..4ceb936c61 100644 --- a/conf/machine/nokia900.conf +++ b/conf/machine/nokia900.conf @@ -15,6 +15,9 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "480" require conf/machine/include/omap3.inc +# omap3.inc redefine it to uImage +KERNEL_IMAGETYPE = "zImage" + ROOT_FLASH_SIZE = "100" EXTRA_IMAGECMD_jffs2_nokia900 = "--pad --little-endian --eraseblock=0x20000 -n" @@ -28,3 +31,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux" ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat" + +# Copied from include/omap3.inc (as we do not use linux-omap recipes): +# +# Increase this everytime you change something in the kernel +MACHINE_KERNEL_PR = "r52" |