diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-08-04 22:59:04 +0000 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-08-04 22:59:04 +0000 |
| commit | 8466838635bbb50ecc61cde0e8fe11942bf3d93f (patch) | |
| tree | 954b05cf6da7d78a7233edbf06fdcbc3ac2aa3d9 /conf/machine | |
| parent | a90e9a08275bf5cdad4f439c66beca928e453cad (diff) | |
| parent | 2880b3877d38bfaa4056af6df7f122a64e955292 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/omap3evm.conf | 2 | ||||
| -rw-r--r-- | conf/machine/vortex86sx.conf | 2 |
2 files changed, 2 insertions, 2 deletions
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" |