summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/minimal-uclibc.conf4
-rw-r--r--conf/machine/omap3evm.conf2
-rw-r--r--conf/machine/vortex86sx.conf2
3 files changed, 4 insertions, 4 deletions
diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf
index 257d364292..f246bffa69 100644
--- a/conf/distro/minimal-uclibc.conf
+++ b/conf/distro/minimal-uclibc.conf
@@ -31,7 +31,7 @@ USE_NLS_glib-2.0 = "yes"
USE_NLS_glib-2.0-native = "yes"
USE_NLS_gcc-cross = "no"
-PREFERRED_VERSION_uclibc = "0.9.30.1"
-PREFERRED_VERSION_uclibc-initial = "0.9.30.1"
+PREFERRED_VERSION_uclibc ?= "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial ?= "0.9.30.1"
require conf/distro/minimal.conf
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
index 8780b827f5..ad410fae4c 100644
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -23,7 +23,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
SERIAL_CONSOLE = "115200 ttyS0"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-omap-pm"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-psp"
UBOOT_ARCH = "arm"
UBOOT_MACHINE = "omap3_evm_config"
diff --git a/conf/machine/vortex86sx.conf b/conf/machine/vortex86sx.conf
index b2a116d109..68a62cc4dc 100644
--- a/conf/machine/vortex86sx.conf
+++ b/conf/machine/vortex86sx.conf
@@ -3,7 +3,7 @@
require conf/machine/include/tune-i486sx.inc
-MACHINE_FEATURES += "x86"
+MACHINE_FEATURES = "kernel26 alsa vfat screen usbhost x86"
KERNEL_IMAGETYPE = "bzImage"