summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>2017-06-13 12:48:18 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-14 11:52:01 +0100
commitcc9b77bab0b60b52e5887723784965a3e5a01d21 (patch)
tree4527de1721f58b0995749548a9e20f07cb15a526
parent014efb83d7f2205c5738926c7cc562fc810f2b41 (diff)
downloadpoky-cc9b77bab0b60b52e5887723784965a3e5a01d21.tar.gz
linux-yocto: remove user-specific description/config files from machine description
Remove user-specific descrition files and config fragments from main machine description file otherwise double patch/config inclusion may happen. These files/fragments are already included on the SRC_URI (see poky commit 2db8f3), so no need to reference these inside machine.scc files. [YOCTO #11586] (From meta-yocto rev: 86ab7ab6688f250bb5777371d2cbc28c770847d4) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.scc2
-rw-r--r--scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.scc2
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.scc2
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.scc2
-rw-r--r--scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.scc2
-rw-r--r--scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.scc2
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/recipes-kernel/linux/files/machine.scc2
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.scc2
8 files changed, 0 insertions, 16 deletions
diff --git a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.scc b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.scc
index 828400df40..fb3866f119 100644
--- a/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.scc
+++ b/scripts/lib/bsp/substrate/target/arch/arm/recipes-kernel/linux/files/machine.scc
@@ -4,5 +4,3 @@ kconf non-hardware {{machine}}-non_hardware.cfg
4 4
5include features/usb-net/usb-net.scc 5include features/usb-net/usb-net.scc
6 6
7kconf hardware {{=machine}}-user-config.cfg
8include {{=machine}}-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.scc b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.scc
index 0b6b413377..64d3ed181b 100644
--- a/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.scc
+++ b/scripts/lib/bsp/substrate/target/arch/common/recipes-kernel/linux/linux-yocto-custom/machine.scc
@@ -14,5 +14,3 @@ kconf hardware {{=machine}}.cfg
14# These are used by yocto-kernel to add config fragments and features. 14# These are used by yocto-kernel to add config fragments and features.
15# Don't remove if you plan on using yocto-kernel with this BSP. 15# Don't remove if you plan on using yocto-kernel with this BSP.
16 16
17kconf hardware {{=machine}}-user-config.cfg
18include {{=machine}}-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.scc
index 3d32f111b0..3e4c54fcf5 100644
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.scc
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/machine.scc
@@ -17,5 +17,3 @@ include cfg/usb-mass-storage.scc
17include cfg/boot-live.scc 17include cfg/boot-live.scc
18include features/power/intel.scc 18include features/power/intel.scc
19 19
20kconf hardware {{=machine}}-user-config.cfg
21include {{=machine}}-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.scc b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.scc
index f39dc3edf1..792fdc94a4 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.scc
+++ b/scripts/lib/bsp/substrate/target/arch/mips/recipes-kernel/linux/files/machine.scc
@@ -4,5 +4,3 @@ kconf hardware {{=machine}}.cfg
4include cfg/usb-mass-storage.scc 4include cfg/usb-mass-storage.scc
5include cfg/fs/vfat.scc 5include cfg/fs/vfat.scc
6 6
7kconf hardware {{=machine}}-user-config.cfg
8include {{=machine}}-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.scc b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.scc
index f39dc3edf1..792fdc94a4 100644
--- a/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.scc
+++ b/scripts/lib/bsp/substrate/target/arch/mips64/recipes-kernel/linux/files/machine.scc
@@ -4,5 +4,3 @@ kconf hardware {{=machine}}.cfg
4include cfg/usb-mass-storage.scc 4include cfg/usb-mass-storage.scc
5include cfg/fs/vfat.scc 5include cfg/fs/vfat.scc
6 6
7kconf hardware {{=machine}}-user-config.cfg
8include {{=machine}}-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.scc b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.scc
index 7aac8b0801..89bb97efd6 100644
--- a/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.scc
+++ b/scripts/lib/bsp/substrate/target/arch/powerpc/recipes-kernel/linux/files/machine.scc
@@ -6,5 +6,3 @@ include cfg/fs/vfat.scc
6 6
7include cfg/dmaengine.scc 7include cfg/dmaengine.scc
8 8
9kconf hardware {{=machine}}-user-config.cfg
10include {{=machine}}-user-patches.scc
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
index 8301e05f7d..d25d0a0377 100644
--- 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
@@ -1,5 +1,3 @@
1# yocto-bsp-filename {{=machine}}.scc 1# yocto-bsp-filename {{=machine}}.scc
2kconf hardware {{=machine}}.cfg 2kconf hardware {{=machine}}.cfg
3 3
4kconf hardware {{=machine}}-user-config.cfg
5include {{=machine}}-user-patches.scc
diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.scc
index 9b7c291a8f..9d20d199b2 100644
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.scc
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/machine.scc
@@ -10,5 +10,3 @@ include features/i915/i915.scc
10include cfg/usb-mass-storage.scc 10include cfg/usb-mass-storage.scc
11include features/power/intel.scc 11include features/power/intel.scc
12 12
13kconf hardware {{=machine}}-user-config.cfg
14include {{=machine}}-user-patches.scc