From 37a6affc485e729ad4bcb1f1af278f56a0dbbd58 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 16 Dec 2014 18:41:03 -0600 Subject: yocto-bsp: Get rid of 'strange' filenames in x86 templates For the x86 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: 9fa30ad9cf1291a37d365515ec8d969fb4fd4aef) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- .../target/arch/i386/conf/machine/machine.conf | 77 ++++++++++++++++++++++ .../arch/i386/conf/machine/{{=machine}}.conf | 76 --------------------- 2 files changed, 77 insertions(+), 76 deletions(-) create mode 100644 scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf delete mode 100644 scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf (limited to 'scripts/lib/bsp/substrate/target/arch/i386/conf/machine') diff --git a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf new file mode 100644 index 0000000000..e13dabc1e5 --- /dev/null +++ b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/machine.conf @@ -0,0 +1,77 @@ +# yocto-bsp-filename {{=machine}}.conf +#@TYPE: Machine +#@NAME: {{=machine}} + +#@DESCRIPTION: Machine configuration for {{=machine}} systems + +{{ 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:"choicelist" name:"tunefile" prio:"40" msg:"Which machine tuning would you like to use?" default:"tune_core2" }} +{{ input type:"choice" val:"tune_i586" msg:"i586 tuning optimizations" }} +{{ input type:"choice" val:"tune_atom" msg:"Atom tuning optimizations" }} +{{ input type:"choice" val:"tune_core2" msg:"Core2 tuning optimizations" }} +{{ if tunefile == "tune_i586": }} +require conf/machine/include/tune-i586.inc +{{ if tunefile == "tune_atom": }} +require conf/machine/include/tune-atom.inc +{{ if tunefile == "tune_core2": }} +DEFAULTTUNE="core2-32" +require conf/machine/include/tune-core2.inc + +require conf/machine/include/x86-base.inc + +MACHINE_FEATURES += "wifi efi pcbios" + +{{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} + +{{ if xserver == "y" and (kernel_choice == "linux-yocto_3.17" or kernel_choice == "linux-yocto_3.14" or kernel_choice == "linux-yocto_3.10"): }} +{{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_vesa" }} +{{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} +{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} +{{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }} +{{ input type:"choice" val:"xserver_fbdev" msg:"fbdev xserver support" }} +{{ input type:"choice" val:"xserver_modesetting" msg:"modesetting xserver support" }} + +{{ if xserver == "y" and kernel_choice == "custom": }} +{{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_vesa" }} +{{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} +{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} +{{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }} +{{ input type:"choice" val:"xserver_fbdev" msg:"fbdev xserver support" }} +{{ input type:"choice" val:"xserver_modesetting" msg:"modesetting xserver support" }} + +{{ if xserver == "y" and kernel_choice != "linux-yocto_3.17" and kernel_choice != "linux-yocto_3.14" and kernel_choice != "linux-yocto_3.10" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} + +{{ if xserver == "y": }} +XSERVER ?= "${XSERVER_X86_BASE} \ + ${XSERVER_X86_EXT} \ +{{ if xserver == "y" and xserver_choice == "xserver_vesa": }} + ${XSERVER_X86_VESA} \ +{{ if xserver == "y" and xserver_choice == "xserver_i915": }} + ${XSERVER_X86_I915} \ +{{ if xserver == "y" and xserver_choice == "xserver_i965": }} + ${XSERVER_X86_I965} \ +{{ if xserver == "y" and xserver_choice == "xserver_fbdev": }} + ${XSERVER_X86_FBDEV} \ +{{ if xserver == "y" and xserver_choice == "xserver_modesetting": }} + ${XSERVER_X86_MODESETTING} \ +{{ if xserver == "y": }} + " + +MACHINE_EXTRA_RRECOMMENDS += "linux-firmware v86d eee-acpi-scripts" + +EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" + +GLIBC_ADDONS = "nptl" + +{{ if xserver == "y" and xserver_choice == "xserver_vesa": }} +APPEND += "video=vesafb vga=0x318" diff --git a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf deleted file mode 100644 index 660eb6d7c0..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/i386/conf/machine/{{=machine}}.conf +++ /dev/null @@ -1,76 +0,0 @@ -#@TYPE: Machine -#@NAME: {{=machine}} - -#@DESCRIPTION: Machine configuration for {{=machine}} systems - -{{ 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:"choicelist" name:"tunefile" prio:"40" msg:"Which machine tuning would you like to use?" default:"tune_core2" }} -{{ input type:"choice" val:"tune_i586" msg:"i586 tuning optimizations" }} -{{ input type:"choice" val:"tune_atom" msg:"Atom tuning optimizations" }} -{{ input type:"choice" val:"tune_core2" msg:"Core2 tuning optimizations" }} -{{ if tunefile == "tune_i586": }} -require conf/machine/include/tune-i586.inc -{{ if tunefile == "tune_atom": }} -require conf/machine/include/tune-atom.inc -{{ if tunefile == "tune_core2": }} -DEFAULTTUNE="core2-32" -require conf/machine/include/tune-core2.inc - -require conf/machine/include/x86-base.inc - -MACHINE_FEATURES += "wifi efi pcbios" - -{{ input type:"boolean" name:"xserver" prio:"50" msg:"Do you need support for X? (y/n)" default:"y" }} - -{{ if xserver == "y" and (kernel_choice == "linux-yocto_3.17" or kernel_choice == "linux-yocto_3.14" or kernel_choice == "linux-yocto_3.10"): }} -{{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_vesa" }} -{{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} -{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} -{{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }} -{{ input type:"choice" val:"xserver_fbdev" msg:"fbdev xserver support" }} -{{ input type:"choice" val:"xserver_modesetting" msg:"modesetting xserver support" }} - -{{ if xserver == "y" and kernel_choice == "custom": }} -{{ input type:"choicelist" name:"xserver_choice" prio:"50" msg:"Please select an xserver for this machine:" default:"xserver_vesa" }} -{{ input type:"choice" val:"xserver_vesa" msg:"VESA xserver support" }} -{{ input type:"choice" val:"xserver_i915" msg:"i915 xserver support" }} -{{ input type:"choice" val:"xserver_i965" msg:"i965 xserver support" }} -{{ input type:"choice" val:"xserver_fbdev" msg:"fbdev xserver support" }} -{{ input type:"choice" val:"xserver_modesetting" msg:"modesetting xserver support" }} - -{{ if xserver == "y" and kernel_choice != "linux-yocto_3.17" and kernel_choice != "linux-yocto_3.14" and kernel_choice != "linux-yocto_3.10" and kernel_choice != "custom": xserver_choice = "xserver_i915" }} - -{{ if xserver == "y": }} -XSERVER ?= "${XSERVER_X86_BASE} \ - ${XSERVER_X86_EXT} \ -{{ if xserver == "y" and xserver_choice == "xserver_vesa": }} - ${XSERVER_X86_VESA} \ -{{ if xserver == "y" and xserver_choice == "xserver_i915": }} - ${XSERVER_X86_I915} \ -{{ if xserver == "y" and xserver_choice == "xserver_i965": }} - ${XSERVER_X86_I965} \ -{{ if xserver == "y" and xserver_choice == "xserver_fbdev": }} - ${XSERVER_X86_FBDEV} \ -{{ if xserver == "y" and xserver_choice == "xserver_modesetting": }} - ${XSERVER_X86_MODESETTING} \ -{{ if xserver == "y": }} - " - -MACHINE_EXTRA_RRECOMMENDS += "linux-firmware v86d eee-acpi-scripts" - -EXTRA_OECONF_append_pn-matchbox-panel-2 = " --with-battery=acpi" - -GLIBC_ADDONS = "nptl" - -{{ if xserver == "y" and xserver_choice == "xserver_vesa": }} -APPEND += "video=vesafb vga=0x318" -- cgit v1.2.3-54-g00ecf