[yocto] [PATCH 14/22] meta/common-pc: use usb-mass-storage feature

[tom.zanussi at intel.com]

From: Tom Zanussi <tom.zanussi at intel.com>

Add the usb-mass-storage feature and remove the options available
in that feature from common-pc.cfg.

Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>
---
 .../bsp/common-pc/common-pc-preempt-rt.scc         |    1 +
 .../bsp/common-pc/common-pc-standard.scc           |    1 +
 meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg  |    3 ---
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-preempt-rt.scc b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-preempt-rt.scc
index 706f669..53e4d69 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-preempt-rt.scc
+++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-preempt-rt.scc
@@ -9,6 +9,7 @@ include bsp/common-pc/common-pc.scc
 
 # default policy for preempt-rt kernels
 include cfg/boot-live.scc
+include cfg/usb-mass-storage.scc
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.scc
 include cfg/virtio.scc
diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-standard.scc b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-standard.scc
index 83d49fd..a2f2520 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-standard.scc
+++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-standard.scc
@@ -9,6 +9,7 @@ include common-pc.scc
 
 # default policy for standard kernels
 include cfg/boot-live.scc
+include cfg/usb-mass-storage.scc
 include features/latencytop/latencytop.scc
 include features/profiling/profiling.scc
 include cfg/virtio.scc
diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg b/meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg
index db6ffb1..2293cfe 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg
+++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg
@@ -27,8 +27,6 @@ CONFIG_PCI=y
 CONFIG_PCI_GOANY=y
 CONFIG_PCIEPORTBUS=y
 
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
 CONFIG_ATA=y
 CONFIG_ATA_ACPI=y
 CONFIG_ATA_SFF=y
@@ -74,7 +72,6 @@ CONFIG_VT=y
 CONFIG_VGA_CONSOLE=y
 
 CONFIG_USB_DEVICEFS=y
-CONFIG_USB_STORAGE=y
 CONFIG_USB_HID=y
 CONFIG_USB_HIDDEV=y
 CONFIG_USB_SERIAL=y
-- 
1.7.0.4