From 254bf8c5d9135185c7f8cbb27496056be589b4ff Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Wed, 12 Dec 2012 22:56:32 -0600 Subject: yocto-bsp: update existing templates for linux-yocto-custom Update existing templates to integrate with linux-yocto-custom. (From meta-yocto rev: 7a8b55bdf499d001b77bb87345eb4eeab6013b2e) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- .../recipes-kernel/linux/files/user-config.cfg | 0 .../recipes-kernel/linux/files/user-patches.scc | 0 .../linux/files/{{=machine}}-preempt-rt.scc | 27 ---------------------- .../linux/files/{{=machine}}-standard.scc | 27 ---------------------- .../recipes-kernel/linux/files/{{=machine}}.cfg | 0 .../recipes-kernel/linux/files/{{=machine}}.scc | 4 ---- .../recipes-kernel/linux/kernel-list.noinstall | 3 ++- .../user-config.cfg" | 0 .../user-patches.scc" | 0 .../{{=machine}}-preempt-rt.scc" | 27 ++++++++++++++++++++++ .../{{=machine}}-standard.scc" | 27 ++++++++++++++++++++++ .../{{=machine}}.cfg" | 0 .../{{=machine}}.scc" | 4 ++++ 13 files changed, 60 insertions(+), 59 deletions(-) delete mode 100644 scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/user-config.cfg delete mode 100644 scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/user-patches.scc delete mode 100644 scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc delete mode 100644 scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc delete mode 100644 scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}.cfg delete mode 100644 scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}.scc create mode 100644 "scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/user-config.cfg" create mode 100644 "scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/user-patches.scc" create mode 100644 "scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-preempt-rt.scc" create mode 100644 "scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" create mode 100644 "scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.cfg" create mode 100644 "scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" (limited to 'scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel') diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/user-config.cfg b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/user-config.cfg deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/user-patches.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/user-patches.scc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc deleted file mode 100644 index 0f5a582446..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc +++ /dev/null @@ -1,27 +0,0 @@ -define KMACHINE {{=machine}} -define KTYPE preempt-rt -{{ 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 - -{{ if qemuarch == "i386": }} -include bsp/common-pc/common-pc-preempt-rt -{{ if qemuarch == "x86_64": }} -include bsp/common-pc-64/common-pc-64-preempt-rt -{{ if qemuarch == "arm": }} -include bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt -{{ if qemuarch == "powerpc": }} -include bsp/qemu-ppc32/qemu-ppc32-rt -{{ if qemuarch == "mips": }} -include bsp/mti-malta32/mti-malta32-be-preempt-rt -{{ if need_new_kbranch == "y": }} -branch {{=machine}} - -include {{=machine}}.scc diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc deleted file mode 100644 index 04a36203d9..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}-standard.scc +++ /dev/null @@ -1,27 +0,0 @@ -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 - -{{ 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}} - -include {{=machine}}.scc diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}.cfg b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}.cfg deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}.scc deleted file mode 100644 index 0f20dcd6be..0000000000 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/{{=machine}}.scc +++ /dev/null @@ -1,4 +0,0 @@ -kconf hardware {{=machine}}.cfg - -kconf hardware user-config.cfg -include user-patches.scc diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/kernel-list.noinstall b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/kernel-list.noinstall index 13009cf3c2..e2b13ac5c7 100644 --- a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/kernel-list.noinstall +++ b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/kernel-list.noinstall @@ -1,4 +1,5 @@ +{{ if kernel_choice != "custom": }} {{ input type:"boolean" name:"use_default_kernel" prio:"10" msg:"Would you like to use the default (3.4) kernel? (y/n)" default:"y"}} -{{ if use_default_kernel == "n": }} +{{ if kernel_choice != "custom" and use_default_kernel == "n": }} {{ input type:"choicelist" name:"kernel_choice" gen:"bsp.kernel.kernels" prio:"10" msg:"Please choose the kernel to use in this BSP:" default:"linux-yocto_3.4"}} diff --git "a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/user-config.cfg" "b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/user-config.cfg" new file mode 100644 index 0000000000..e69de29bb2 diff --git "a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/user-patches.scc" "b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/user-patches.scc" new file mode 100644 index 0000000000..e69de29bb2 diff --git "a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-preempt-rt.scc" "b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-preempt-rt.scc" new file mode 100644 index 0000000000..0f5a582446 --- /dev/null +++ "b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-preempt-rt.scc" @@ -0,0 +1,27 @@ +define KMACHINE {{=machine}} +define KTYPE preempt-rt +{{ 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 + +{{ if qemuarch == "i386": }} +include bsp/common-pc/common-pc-preempt-rt +{{ if qemuarch == "x86_64": }} +include bsp/common-pc-64/common-pc-64-preempt-rt +{{ if qemuarch == "arm": }} +include bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt +{{ if qemuarch == "powerpc": }} +include bsp/qemu-ppc32/qemu-ppc32-rt +{{ if qemuarch == "mips": }} +include bsp/mti-malta32/mti-malta32-be-preempt-rt +{{ if need_new_kbranch == "y": }} +branch {{=machine}} + +include {{=machine}}.scc 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" new file mode 100644 index 0000000000..04a36203d9 --- /dev/null +++ "b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}-standard.scc" @@ -0,0 +1,27 @@ +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 + +{{ 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}} + +include {{=machine}}.scc diff --git "a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.cfg" "b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.cfg" new file mode 100644 index 0000000000..e69de29bb2 diff --git "a/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" "b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" new file mode 100644 index 0000000000..0f20dcd6be --- /dev/null +++ "b/scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/{{ if kernel_choice != \"custom\": }} files/{{=machine}}.scc" @@ -0,0 +1,4 @@ +kconf hardware {{=machine}}.cfg + +kconf hardware user-config.cfg +include user-patches.scc -- cgit v1.2.3-54-g00ecf