yocto-bsp: remove obsolete references

The logbuf-normal feature is obsolete, so remove any references to it.
The dmaengine and hpet features have changed, but don't really need to
be added by default to i386 - leave that to the BSP developer.  Also,
remove a couple duplicate feature references in the .scc files.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc
index 6ee1c93a92a5ccdb4fadc620b38f072618a86588..2734d336bd15be2c67e43abe04367a7982c643ae 100644 (file)
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc
@@ -10,6 +10,5 @@ include {{=machine}}.scc
 # default policy for preempt-rt kernels
 include cfg/usb-mass-storage.scc
 include cfg/boot-live.scc
-include features/logbuf/size-normal.scc
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.scc

diff --git a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc
index c6f42db4cf8ba16ccff4857d48e32ed4ee454468..e34882f93d0c61004a1606591cd93f031d4dbf53 100644 (file)
--- a/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc
+++ b/scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc
@@ -15,6 +15,5 @@ include {{=machine}}.scc
 # default policy for standard kernels
 include cfg/usb-mass-storage.scc
 include cfg/boot-live.scc
-include features/logbuf/size-normal.scc
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.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 15bda3cad098de1071ca70c8dc2e5e578654b496..d8d28cec7b0e3885441cec50ca448da4db0ea7f4 100644 (file)
--- 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
@@ -9,9 +9,7 @@ include features/drm-emgd/drm-emgd.scc
 {{ if xserver == "y" and xserver_choice == "xserver_i915": }}
 include features/i915/i915.scc
 
-include features/dmaengine/dmaengine.scc
 include features/serial/8250.scc
-include features/hpet/hpet.scc
 include features/ericsson-3g/f5521gw.scc
 
 {{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }}
@@ -21,10 +19,5 @@ include cfg/usb-mass-storage.scc
 include cfg/boot-live.scc
 include features/power/intel.scc
 
-include features/logbuf/size-normal.scc
-
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
-
 kconf hardware user-config.cfg
 include 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 e301b22ca2426f327df84ea615e7501476552165..0f20dcd6beac762dfac751e30fe8dd26949b745b 100644 (file)
--- 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,6 +1,4 @@
 kconf hardware {{=machine}}.cfg
 
-include features/logbuf/size-normal.scc
-
 kconf hardware user-config.cfg
 include user-patches.scc

diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc
index 5819dce1c44a81ee7e2407faf8af1c3f460bfadd..de9906af8640f4c4b3e78990de45521e9fb1c1a0 100644 (file)
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc
@@ -10,6 +10,5 @@ include {{=machine}}.scc
 # default policy for preempt-rt kernels
 include cfg/usb-mass-storage.scc
 include cfg/boot-live.scc
-include features/logbuf/size-normal.scc
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.scc

diff --git a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc
index 9e5cf13e075cf034761019db33b6dc76f59ed8ce..e500bad4b214a5fcaf6e4ca65b75999adbb642d3 100644 (file)
--- a/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc
+++ b/scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc
@@ -11,6 +11,5 @@ include {{=machine}}.scc
 # default policy for standard kernels
 include cfg/usb-mass-storage.scc
 include cfg/boot-live.scc
-include features/logbuf/size-normal.scc
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.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 5b8ccba14f79761e28f94871b9da62cdce200317..d8d3d3524d932d86ba11c516d128face7628647e 100644 (file)
--- 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
@@ -8,10 +8,5 @@ include features/i915/i915.scc
 include cfg/usb-mass-storage.scc
 include features/power/intel.scc
 
-include features/logbuf/size-normal.scc
-
-include features/latencytop/latencytop.scc
-include features/profiling/profiling.scc
-
 kconf hardware user-config.cfg
 include user-patches.scc