summaryrefslogtreecommitdiffstats
path: root/meta-yocto
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-04-16 22:20:38 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-17 13:15:45 (GMT)
commit720fe9e371eef16da19df0885188aa0341ad2090 (patch)
treed6f536ff61ee7236e46e7a8c02ff63a4c9cfe355 /meta-yocto
parent8e0751a97ae3a0d02a839a0302438132c2298a89 (diff)
downloadpoky-720fe9e371eef16da19df0885188aa0341ad2090.tar.gz
meta-yocto: remove kernel26 machine feature usage
kernel26 is now obsolete so remove it from the machine configs that use it. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-yocto')
-rw-r--r--meta-yocto/conf/machine/atom-pc.conf3
-rw-r--r--meta-yocto/conf/machine/beagleboard.conf2
-rw-r--r--meta-yocto/conf/machine/mpc8315e-rdb.conf2
-rw-r--r--meta-yocto/conf/machine/routerstationpro.conf3
4 files changed, 4 insertions, 6 deletions
diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf
index 7cbe157..73aba58 100644
--- a/meta-yocto/conf/machine/atom-pc.conf
+++ b/meta-yocto/conf/machine/atom-pc.conf
@@ -5,8 +5,7 @@
5 5
6include conf/machine/include/tune-atom.inc 6include conf/machine/include/tune-atom.inc
7 7
8MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \ 8MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa"
9 acpi alsa"
10 9
11KERNEL_IMAGETYPE = "bzImage" 10KERNEL_IMAGETYPE = "bzImage"
12 11
diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
index 06a0ecd..aa8fa07 100644
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
@@ -37,4 +37,4 @@ UBOOT_MACHINE = "omap3_beagle_config"
37UBOOT_ENTRYPOINT = "0x80008000" 37UBOOT_ENTRYPOINT = "0x80008000"
38UBOOT_LOADADDRESS = "0x80008000" 38UBOOT_LOADADDRESS = "0x80008000"
39 39
40MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa" 40MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa"
diff --git a/meta-yocto/conf/machine/mpc8315e-rdb.conf b/meta-yocto/conf/machine/mpc8315e-rdb.conf
index d3a5b1c..03b5f34 100644
--- a/meta-yocto/conf/machine/mpc8315e-rdb.conf
+++ b/meta-yocto/conf/machine/mpc8315e-rdb.conf
@@ -9,7 +9,7 @@ KERNEL_IMAGETYPE = "uImage"
9 9
10SERIAL_CONSOLE = "115200 ttyS0" 10SERIAL_CONSOLE = "115200 ttyS0"
11 11
12MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" 12MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
13 13
14PREFERRED_VERSION_linux-yocto ?= "3.0%" 14PREFERRED_VERSION_linux-yocto ?= "3.0%"
15PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" 15PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
diff --git a/meta-yocto/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf
index a3d520d..3c2f56f 100644
--- a/meta-yocto/conf/machine/routerstationpro.conf
+++ b/meta-yocto/conf/machine/routerstationpro.conf
@@ -4,8 +4,7 @@
4 4
5require conf/machine/include/tune-mips32.inc 5require conf/machine/include/tune-mips32.inc
6 6
7MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 \ 7MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 serial"
8 serial"
9 8
10KERNEL_IMAGETYPE = "vmlinux" 9KERNEL_IMAGETYPE = "vmlinux"
11KERNEL_ALT_IMAGETYPE = "vmlinux.bin" 10KERNEL_ALT_IMAGETYPE = "vmlinux.bin"