diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2012-04-15 20:37:24 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-17 14:15:45 +0100 |
commit | 8e0751a97ae3a0d02a839a0302438132c2298a89 (patch) | |
tree | f337589ed1d1a2d7168646c56ce32daa5f4b9d8b /scripts/lib | |
parent | b9553be4d1fed445a738d0fa173dd562afc3f3fe (diff) | |
download | poky-8e0751a97ae3a0d02a839a0302438132c2298a89.tar.gz |
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 <tom.zanussi@intel.com>
Diffstat (limited to 'scripts/lib')
3 files changed, 3 insertions, 4 deletions
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 101dd60dc9..1cf609741c 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}}" | |||
84 | {{ input type:"edit" name:"uboot_loadaddress" prio:"40" msg:"Please specify a value for UBOOT_LOADADDRESS:" default:"0x80008000" }} | 84 | {{ input type:"edit" name:"uboot_loadaddress" prio:"40" msg:"Please specify a value for UBOOT_LOADADDRESS:" default:"0x80008000" }} |
85 | UBOOT_LOADADDRESS = "{{=uboot_loadaddress}}" | 85 | UBOOT_LOADADDRESS = "{{=uboot_loadaddress}}" |
86 | 86 | ||
87 | MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat alsa" | 87 | 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 51157e5e22..ae27fe6a66 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 @@ | |||
5 | 5 | ||
6 | require conf/machine/include/tune-mips32.inc | 6 | require conf/machine/include/tune-mips32.inc |
7 | 7 | ||
8 | MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 \ | 8 | MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 serial" |
9 | serial" | ||
10 | 9 | ||
11 | KERNEL_IMAGETYPE = "vmlinux" | 10 | KERNEL_IMAGETYPE = "vmlinux" |
12 | KERNEL_ALT_IMAGETYPE = "vmlinux.bin" | 11 | 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 4f83dbb588..18f5247fad 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" | |||
32 | 32 | ||
33 | SERIAL_CONSOLE = "115200 ttyS0" | 33 | SERIAL_CONSOLE = "115200 ttyS0" |
34 | 34 | ||
35 | MACHINE_FEATURES = "kernel26 keyboard pci ext2 ext3 serial" | 35 | MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" |
36 | 36 | ||
37 | {{ preferred_kernel = kernel_choice.split('_')[0] }} | 37 | {{ preferred_kernel = kernel_choice.split('_')[0] }} |
38 | {{ preferred_kernel_version = kernel_choice.split('_')[1] }} | 38 | {{ preferred_kernel_version = kernel_choice.split('_')[1] }} |