summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-08-28 22:01:34 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-29 14:23:36 -0700
commit6b961470486b2dd4215f6753d4f155e6f279959c (patch)
treeb21ab77fa3fba47172feb160d98dec5bed5ad85b /scripts/lib
parent54a1665423e0a44b9a59a16d813b9fd381250ce7 (diff)
downloadpoky-6b961470486b2dd4215f6753d4f155e6f279959c.tar.gz
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. (From meta-yocto rev: 3f37864d474912d680c2e6ee2a962e9fa61df39b) Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}-standard.scc1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/i386/recipes-kernel/linux/files/{{=machine}}.scc7
-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}}-preempt-rt.scc1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}-standard.scc1
-rw-r--r--scripts/lib/bsp/substrate/target/arch/x86_64/recipes-kernel/linux/files/{{=machine}}.scc5
7 files changed, 0 insertions, 18 deletions
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 6ee1c93a92..2734d336bd 100644
--- 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
10# default policy for preempt-rt kernels 10# default policy for preempt-rt kernels
11include cfg/usb-mass-storage.scc 11include cfg/usb-mass-storage.scc
12include cfg/boot-live.scc 12include cfg/boot-live.scc
13include features/logbuf/size-normal.scc
14include features/latencytop/latencytop.scc 13include features/latencytop/latencytop.scc
15include features/profiling/profiling.scc 14include 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 c6f42db4cf..e34882f93d 100644
--- 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
15# default policy for standard kernels 15# default policy for standard kernels
16include cfg/usb-mass-storage.scc 16include cfg/usb-mass-storage.scc
17include cfg/boot-live.scc 17include cfg/boot-live.scc
18include features/logbuf/size-normal.scc
19include features/latencytop/latencytop.scc 18include features/latencytop/latencytop.scc
20include features/profiling/profiling.scc 19include 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 15bda3cad0..d8d28cec7b 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
@@ -9,9 +9,7 @@ include features/drm-emgd/drm-emgd.scc
9{{ if xserver == "y" and xserver_choice == "xserver_i915": }} 9{{ if xserver == "y" and xserver_choice == "xserver_i915": }}
10include features/i915/i915.scc 10include features/i915/i915.scc
11 11
12include features/dmaengine/dmaengine.scc
13include features/serial/8250.scc 12include features/serial/8250.scc
14include features/hpet/hpet.scc
15include features/ericsson-3g/f5521gw.scc 13include features/ericsson-3g/f5521gw.scc
16 14
17{{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }} 15{{ if xserver == "y" and xserver_choice == "xserver_vesa" or xserver_choice == "xserver_emgd": }}
@@ -21,10 +19,5 @@ include cfg/usb-mass-storage.scc
21include cfg/boot-live.scc 19include cfg/boot-live.scc
22include features/power/intel.scc 20include features/power/intel.scc
23 21
24include features/logbuf/size-normal.scc
25
26include features/latencytop/latencytop.scc
27include features/profiling/profiling.scc
28
29kconf hardware user-config.cfg 22kconf hardware user-config.cfg
30include user-patches.scc 23include 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 e301b22ca2..0f20dcd6be 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,6 +1,4 @@
1kconf hardware {{=machine}}.cfg 1kconf hardware {{=machine}}.cfg
2 2
3include features/logbuf/size-normal.scc
4
5kconf hardware user-config.cfg 3kconf hardware user-config.cfg
6include user-patches.scc 4include 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 5819dce1c4..de9906af86 100644
--- 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
10# default policy for preempt-rt kernels 10# default policy for preempt-rt kernels
11include cfg/usb-mass-storage.scc 11include cfg/usb-mass-storage.scc
12include cfg/boot-live.scc 12include cfg/boot-live.scc
13include features/logbuf/size-normal.scc
14include features/latencytop/latencytop.scc 13include features/latencytop/latencytop.scc
15include features/profiling/profiling.scc 14include 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 9e5cf13e07..e500bad4b2 100644
--- 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
11# default policy for standard kernels 11# default policy for standard kernels
12include cfg/usb-mass-storage.scc 12include cfg/usb-mass-storage.scc
13include cfg/boot-live.scc 13include cfg/boot-live.scc
14include features/logbuf/size-normal.scc
15include features/latencytop/latencytop.scc 14include features/latencytop/latencytop.scc
16include features/profiling/profiling.scc 15include 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 5b8ccba14f..d8d3d3524d 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
@@ -8,10 +8,5 @@ include features/i915/i915.scc
8include cfg/usb-mass-storage.scc 8include cfg/usb-mass-storage.scc
9include features/power/intel.scc 9include features/power/intel.scc
10 10
11include features/logbuf/size-normal.scc
12
13include features/latencytop/latencytop.scc
14include features/profiling/profiling.scc
15
16kconf hardware user-config.cfg 11kconf hardware user-config.cfg
17include user-patches.scc 12include user-patches.scc