diff options
| author | Tom Zanussi <tom.zanussi@intel.com> | 2012-04-16 17:20:38 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-17 14:15:45 +0100 |
| commit | 720fe9e371eef16da19df0885188aa0341ad2090 (patch) | |
| tree | d6f536ff61ee7236e46e7a8c02ff63a4c9cfe355 /meta-yocto | |
| parent | 8e0751a97ae3a0d02a839a0302438132c2298a89 (diff) | |
| download | poky-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.conf | 3 | ||||
| -rw-r--r-- | meta-yocto/conf/machine/beagleboard.conf | 2 | ||||
| -rw-r--r-- | meta-yocto/conf/machine/mpc8315e-rdb.conf | 2 | ||||
| -rw-r--r-- | meta-yocto/conf/machine/routerstationpro.conf | 3 |
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 7cbe157b2c..73aba58291 100644 --- a/meta-yocto/conf/machine/atom-pc.conf +++ b/meta-yocto/conf/machine/atom-pc.conf | |||
| @@ -5,8 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | include conf/machine/include/tune-atom.inc | 6 | include conf/machine/include/tune-atom.inc |
| 7 | 7 | ||
| 8 | MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 wifi \ | 8 | MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 x86 wifi acpi alsa" |
| 9 | acpi alsa" | ||
| 10 | 9 | ||
| 11 | KERNEL_IMAGETYPE = "bzImage" | 10 | KERNEL_IMAGETYPE = "bzImage" |
| 12 | 11 | ||
diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf index 06a0ecd388..aa8fa07be4 100644 --- a/meta-yocto/conf/machine/beagleboard.conf +++ b/meta-yocto/conf/machine/beagleboard.conf | |||
| @@ -37,4 +37,4 @@ UBOOT_MACHINE = "omap3_beagle_config" | |||
| 37 | UBOOT_ENTRYPOINT = "0x80008000" | 37 | UBOOT_ENTRYPOINT = "0x80008000" |
| 38 | UBOOT_LOADADDRESS = "0x80008000" | 38 | UBOOT_LOADADDRESS = "0x80008000" |
| 39 | 39 | ||
| 40 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa" | 40 | MACHINE_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 d3a5b1cb01..03b5f34c67 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 | ||
| 10 | SERIAL_CONSOLE = "115200 ttyS0" | 10 | SERIAL_CONSOLE = "115200 ttyS0" |
| 11 | 11 | ||
| 12 | MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" | 12 | MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" |
| 13 | 13 | ||
| 14 | PREFERRED_VERSION_linux-yocto ?= "3.0%" | 14 | PREFERRED_VERSION_linux-yocto ?= "3.0%" |
| 15 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" | 15 | PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" |
diff --git a/meta-yocto/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf index a3d520d173..3c2f56ff51 100644 --- a/meta-yocto/conf/machine/routerstationpro.conf +++ b/meta-yocto/conf/machine/routerstationpro.conf | |||
| @@ -4,8 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | require conf/machine/include/tune-mips32.inc | 5 | require conf/machine/include/tune-mips32.inc |
| 6 | 6 | ||
| 7 | MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 \ | 7 | MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 serial" |
| 8 | serial" | ||
| 9 | 8 | ||
| 10 | KERNEL_IMAGETYPE = "vmlinux" | 9 | KERNEL_IMAGETYPE = "vmlinux" |
| 11 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" | 10 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" |
