From: Tom Zanussi Date: Mon, 16 Apr 2012 01:37:24 +0000 (-0500) Subject: yocto-bsp: remove kernel26 machine feature from templates X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=040435c48a322e3a76c6320106b224439e87029f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git yocto-bsp: remove kernel26 machine feature from templates kernel26 is now obsolete so remove it from the templates that use it. Signed-off-by: Tom Zanussi --- diff --git a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf index 101dd60dc96..1cf609741c0 100644 --- a/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/arm/conf/machine/{{=machine}}.conf @@ -84,4 +84,4 @@ UBOOT_ENTRYPOINT = "{{=uboot_entrypoint}}" {{ input type:"edit" name:"uboot_loadaddress" prio:"40" msg:"Please specify a value for UBOOT_LOADADDRESS:" default:"0x80008000" }} UBOOT_LOADADDRESS = "{{=uboot_loadaddress}}" -MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa" +MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa" diff --git a/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf index 51157e5e22e..ae27fe6a660 100644 --- a/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf @@ -5,8 +5,7 @@ require conf/machine/include/tune-mips32.inc -MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 \ - serial" +MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 serial" KERNEL_IMAGETYPE = "vmlinux" KERNEL_ALT_IMAGETYPE = "vmlinux.bin" diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf index 4f83dbb588c..18f5247fad7 100644 --- a/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf +++ b/scripts/lib/bsp/substrate/target/arch/powerpc/conf/machine/{{=machine}}.conf @@ -32,7 +32,7 @@ KERNEL_IMAGETYPE = "uImage" SERIAL_CONSOLE = "115200 ttyS0" -MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" +MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" {{ preferred_kernel = kernel_choice.split('_')[0] }} {{ preferred_kernel_version = kernel_choice.split('_')[1] }}