From cab2058188acfd54a1ffa4692b0e60768500ced0 Mon Sep 17 00:00:00 2001 From: David-John Willis Date: Sun, 27 Feb 2011 15:10:00 +0000 Subject: [PATCH] omap3-pandora.conf: Move the machine config to use the in-tree 2.6.37 kernel. * This config 'was' using a kernel found in the OpenPandora OE overlay. It is now using the 2.6.37 recipe for the machine by default. --- conf/machine/omap3-pandora.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf index 5ce8b41181..d84ce6cf8f 100644 --- a/conf/machine/omap3-pandora.conf +++ b/conf/machine/omap3-pandora.conf @@ -5,7 +5,6 @@ TARGET_ARCH = "arm" - PREFERRED_PROVIDER_virtual/bootloader = "u-boot-omap3pandora" PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" @@ -35,7 +34,7 @@ SERIAL_CONSOLE = "115200 ttyS0" require conf/machine/include/omap3.inc # Put it below omap3.inc as we override the kernel and PR here -PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" +PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" MACHINE_KERNEL_PR = "r3" # Use our 'Powered by Angstrom' splash for the images. @@ -65,6 +64,6 @@ UBOOT_MACHINE = "omap3_pandora_config" PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora" PREFERRED_PROVIDER_x-load = "x-load-omap3pandora" -EXTRA_IMAGEDEPENDS += "u-boot x-load" +EXTRA_IMAGEDEPENDS += "virtual/bootloader x-load" MACHINE_FEATURES = "kernel26 apm usbgadget usbhost keyboard vfat ext2 screen touchscreen alsa bluetooth wifi sdio" -- 2.39.5