diff options
| author | David-John Willis <John.Willis@Distant-earth.com> | 2009-12-02 16:26:33 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-12-04 10:42:46 +0100 |
| commit | fdcd0cf2ee8999f88d7f044abf387133a0bfd3de (patch) | |
| tree | caba05002931f9ac8970c4b8001af056464ada47 /conf/machine | |
| parent | cbca9b79b750bfdfa8c2841b003fcca42465872c (diff) | |
omap3-pandora: Update machine config to define versions of x-load/u-boot to use.
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/omap3-pandora.conf | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf index c896fa0b02..b504723afa 100644 --- a/conf/machine/omap3-pandora.conf +++ b/conf/machine/omap3-pandora.conf @@ -29,14 +29,14 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "480" #IMAGE_FSTYPES += "tar.bz2 ubi" IMAGE_FSTYPES = "tar.bz2" -#EXTRA_IMAGECMD_jffs2 = "-lnp " SERIAL_CONSOLE = "115200 ttyS0" require conf/machine/include/omap3.inc -# Put it below omap3.inc as we override the kernel here +# Put it below omap3.inc as we override the kernel and PR here PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" +MACHINE_KERNEL_PR = "r2" # Use our 'Powered by Angstrom' splash for the images. PREFERRED_PROVIDER_virtual/psplash = "psplash-omap3pandora" @@ -65,10 +65,8 @@ UBOOT_MACHINE = "omap3_pandora_config" PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora" PREFERRED_PROVIDER_x-load = "x-load-omap3pandora" - -EXTRA_IMAGEDEPENDS += "u-boot" -EXTRA_IMAGEDEPENDS += "x-load" - -PREFERRED_VERSION_libgles-omap3 = "3.00.00.09" +PREFERRED_VERSION_u-boot-omap3pandora = "git" +PREFERRED_VERSION_x-load-omap3pandora = "git" +EXTRA_IMAGEDEPENDS += "u-boot x-load" MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio" |