From 6a103322f8ad752daf628d72c9334f0bf6145122 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 16 Dec 2014 18:41:04 -0600 Subject: yocto-bsp: Get rid of 'strange' filenames in mips templates For the mips templates, give all the 'strange' yocto-bsp template filenames 'normal' names, adding new yocto-bsp-filename and yocto-bsp-dirname tags for the new filename processing pass where needed. (From meta-yocto rev: afa61438aa31fbc5c87991c8b3ec88c228b9d2d1) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- .../target/arch/mips/conf/machine/machine.conf | 39 ++++++++++++++++++++++ .../arch/mips/conf/machine/{{=machine}}.conf | 38 --------------------- 2 files changed, 39 insertions(+), 38 deletions(-) create mode 100644 scripts/lib/bsp/substrate/target/arch/mips/conf/machine/machine.conf delete mode 100644 scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf (limited to 'scripts/lib/bsp/substrate/target/arch/mips/conf/machine') 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 new file mode 100644 index 0000000000..b319d626f4 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/machine.conf @@ -0,0 +1,39 @@ +# yocto-bsp-filename {{=machine}}.conf +#@TYPE: Machine +#@NAME: {{=machine}} + +#@DESCRIPTION: Machine configuration for {{=machine}} systems + +require conf/machine/include/tune-mips32.inc + +MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 serial" + +KERNEL_IMAGETYPE = "vmlinux" +KERNEL_ALT_IMAGETYPE = "vmlinux.bin" +KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" + +{{ if kernel_choice == "custom": preferred_kernel = "linux-yocto-custom" }} +{{ if kernel_choice == "linux-yocto-dev": preferred_kernel = "linux-yocto-dev" }} +{{ if kernel_choice == "custom" or kernel_choice == "linux-yocto-dev" : }} +PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" + +{{ if kernel_choice != "custom" and kernel_choice != "linux-yocto-dev": preferred_kernel = kernel_choice.split('_')[0] }} +{{ if kernel_choice != "custom" and kernel_choice != "linux-yocto-dev": preferred_kernel_version = kernel_choice.split('_')[1] }} +{{ if kernel_choice != "custom" and kernel_choice != "linux-yocto-dev": }} +PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" +PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" + +{{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} +{{ if xserver == "y": }} +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" +XSERVER ?= "xserver-xorg \ + xf86-input-evdev \ + xf86-video-fbdev" + +SERIAL_CONSOLE = "115200 ttyS0" +USE_VT ?= "0" + +MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" + +IMAGE_FSTYPES ?= "jffs2 tar.bz2" +JFFS2_ERASEBLOCK = "0x10000" 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 deleted file mode 100644 index 9ea411933c..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/mips/conf/machine/{{=machine}}.conf +++ /dev/null @@ -1,38 +0,0 @@ -#@TYPE: Machine -#@NAME: {{=machine}} - -#@DESCRIPTION: Machine configuration for {{=machine}} systems - -require conf/machine/include/tune-mips32.inc - -MACHINE_FEATURES = "screen keyboard pci usbhost ext2 ext3 serial" - -KERNEL_IMAGETYPE = "vmlinux" -KERNEL_ALT_IMAGETYPE = "vmlinux.bin" -KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" - -{{ if kernel_choice == "custom": preferred_kernel = "linux-yocto-custom" }} -{{ if kernel_choice == "linux-yocto-dev": preferred_kernel = "linux-yocto-dev" }} -{{ if kernel_choice == "custom" or kernel_choice == "linux-yocto-dev" : }} -PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" - -{{ if kernel_choice != "custom" and kernel_choice != "linux-yocto-dev": preferred_kernel = kernel_choice.split('_')[0] }} -{{ if kernel_choice != "custom" and kernel_choice != "linux-yocto-dev": preferred_kernel_version = kernel_choice.split('_')[1] }} -{{ if kernel_choice != "custom" and kernel_choice != "linux-yocto-dev": }} -PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}" -PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" - -{{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} -{{ if xserver == "y": }} -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -XSERVER ?= "xserver-xorg \ - xf86-input-evdev \ - xf86-video-fbdev" - -SERIAL_CONSOLE = "115200 ttyS0" -USE_VT ?= "0" - -MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" - -IMAGE_FSTYPES ?= "jffs2 tar.bz2" -JFFS2_ERASEBLOCK = "0x10000" -- cgit v1.2.3-54-g00ecf