yocto-bsp: prepend includes in machine.scc files with machine

The names of the -user files were changed to have the machine
prepended, but the includes weren't - fix the includes.

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>

diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
index 39f87f5e842603704b7658604d0bae47f0cf01fd..24196e6f67c1dfeb15c360179966abcb101921a1 100644 (file)
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
+++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
@@ -3,5 +3,5 @@ kconf non-hardware {{machine}}-non_hardware.cfg
 
 include features/usb-net/usb-net.scc
 
-kconf hardware user-config.cfg
-include user-patches.scc
+kconf hardware {{=machine}}-user-config.cfg
+include {{=machine}}-user-patches.scc

diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom/{{=machine}}.scc
index 8b94e588a457a3377659a96b8a93b7e68a9d8ed9..2e3ca90793b6958c0ce19c1e07c272388a1a79fc 100644 (file)
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom/{{=machine}}.scc
+++ b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/{{ if kernel_choice == "custom": }} linux-yocto-custom/{{=machine}}.scc
@@ -13,5 +13,5 @@ kconf hardware {{=machine}}.cfg
 # These are used by yocto-kernel to add config fragments and features.
 # Don't remove if you plan on using yocto-kernel with this BSP.
 
-kconf hardware user-config.cfg
-include user-patches.scc
+kconf hardware {{=machine}}-user-config.cfg
+include {{=machine}}-user-patches.scc

diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
index d8d28cec7b0e3885441cec50ca448da4db0ea7f4..41e16355bf93f061d7647874ccd5f3781f1cfb3d 100644 (file)
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
@@ -19,5 +19,5 @@ include cfg/usb-mass-storage.scc
 include cfg/boot-live.scc
 include features/power/intel.scc
 
-kconf hardware user-config.cfg
-include user-patches.scc
+kconf hardware {{=machine}}-user-config.cfg
+include {{=machine}}-user-patches.scc

diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
index e3daafb692d658215514fcce863760768a17f27a..1ebbc32d7e93cc025cb01649b95f780bd7f55c82 100644 (file)
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
+++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
@@ -6,5 +6,5 @@ include cfg/vfat.scc
 {{ if kernel_choice == "linux-yocto_3.4": }}
 include cfg/fs/vfat.scc
 
-kconf hardware user-config.cfg
-include user-patches.scc
+kconf hardware {{=machine}}-user-config.cfg
+include {{=machine}}-user-patches.scc

diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
index 1585fa4b1ce78c06ca3e4db7db5a8a191984c870..0d64f58a18b139ef1b8b30d92e4c86ab385fc6b3 100644 (file)
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
@@ -8,5 +8,5 @@ include cfg/fs/vfat.scc
 
 include cfg/dmaengine.scc
 
-kconf hardware user-config.cfg
-include user-patches.scc
+kconf hardware {{=machine}}-user-config.cfg
+include {{=machine}}-user-patches.scc

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
index 0f20dcd6beac762dfac751e30fe8dd26949b745b..f3739be1e69bf9b23155b268f23d68a33325a1a5 100644 (file)
--- 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
@@ -1,4 +1,4 @@
 kconf hardware {{=machine}}.cfg
 
-kconf hardware user-config.cfg
-include user-patches.scc
+kconf hardware {{=machine}}-user-config.cfg
+include {{=machine}}-user-patches.scc

diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
index d8d3d3524d932d86ba11c516d128face7628647e..61899319dad0a99158f4578143644a98f6b5954c 100644 (file)
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/{{ if kernel_choice != "custom": }} files/{{=machine}}.scc
@@ -8,5 +8,5 @@ include features/i915/i915.scc
 include cfg/usb-mass-storage.scc
 include features/power/intel.scc
 
-kconf hardware user-config.cfg
-include user-patches.scc
+kconf hardware {{=machine}}-user-config.cfg
+include {{=machine}}-user-patches.scc