From 7743ebd40d54bc0b3e2a14ff49ee9f5b292b9ce4 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Sun, 3 Mar 2013 23:27:33 -0600 Subject: yocto-bsp: update machine-standard.scc Simplify machine-standard.scc for all the templates. (From meta-yocto rev: ac8ec04c50bc8dbf716ff5746c8942566fd5c2bf) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- .../{{=machine}}-standard.scc" | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'scripts') diff --git "a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" "b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" index 04a36203d9..1cd976b275 100644 --- "a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" +++ "b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" @@ -1,26 +1,8 @@ define KMACHINE {{=machine}} define KTYPE standard -{{ if qemuarch == "i386": }} -define KARCH i386 -{{ if qemuarch == "x86_64": }} -define KARCH x86_64 -{{ if qemuarch == "arm": }} -define KARCH arm -{{ if qemuarch == "powerpc": }} -define KARCH powerpc -{{ if qemuarch == "mips": }} -define KARCH mips +define KARCH {{=qemuarch}} -{{ if qemuarch == "i386": }} include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} -{{ if qemuarch == "x86_64": }} -include {{=map_standard_kbranch(need_new_kbranch, new_kbranch, existing_kbranch)}} -{{ if qemuarch == "arm": }} -include bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard -{{ if qemuarch == "powerpc": }} -include bsp/qemu-ppc32/qemu-ppc32-standard -{{ if qemuarch == "mips": }} -include bsp/mti-malta32/mti-malta32-be-standard {{ if need_new_kbranch == "y": }} branch {{=machine}} -- cgit v1.2.3-54-g00ecf