From 3f37864d474912d680c2e6ee2a962e9fa61df39b Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 28 Aug 2012 22:01:34 -0500 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- .../recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc | 1 - .../recipes-kernel/linux/files/{{=machine}}-standard.scc | 1 - .../arch/i386/recipes-kernel/linux/files/{{=machine}}.scc | 7 ------- .../arch/qemu/recipes-kernel/linux/files/{{=machine}}.scc | 2 -- .../recipes-kernel/linux/files/{{=machine}}-preempt-rt.scc | 1 - .../recipes-kernel/linux/files/{{=machine}}-standard.scc | 1 - .../x86_64/recipes-kernel/linux/files/{{=machine}}.scc | 5 ----- 7 files changed, 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 6ee1c93a92a..2734d336bd1 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 # 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 c6f42db4cf8..e34882f93d0 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 # 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 15bda3cad09..d8d28cec7b0 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 {{ 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 e301b22ca24..0f20dcd6bea 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 @@ 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 5819dce1c44..de9906af864 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 # 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 9e5cf13e075..e500bad4b21 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 # 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 5b8ccba14f7..d8d3d3524d9 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 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 -- 2.47.3