From: Tom Zanussi Date: Mon, 4 Mar 2013 05:27:33 +0000 (-0600) Subject: yocto-bsp: update machine-standard.scc X-Git-Tag: rev_ivi_2015_02_04~13352 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=85f22f86949a765b4b9f3e21035429d4f84d9b56;p=scm%2Fbb%2Ftizen-distro.git 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 --- 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 04a3620..1cd976b 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}}