[yocto] [PATCH 16/22] meta/common-pc-64: 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-64.cfg.

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

diff --git a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-preempt-rt.scc b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-preempt-rt.scc
index 8a79dd1..970808d 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-preempt-rt.scc
+++ b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-preempt-rt.scc
@@ -9,6 +9,7 @@ include bsp/common-pc-64/common-pc-64.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-64/common-pc-64-standard.scc b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-standard.scc
index dcb1949..d2e73f5 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-standard.scc
+++ b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64-standard.scc
@@ -9,6 +9,7 @@ include common-pc-64.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-64/common-pc-64.cfg b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.cfg
index 8d35931..ffb2cbc 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.cfg
+++ b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.cfg
@@ -35,8 +35,6 @@ CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
 CONFIG_ATA_PIIX=y
 
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 
 CONFIG_BLK_DEV_FD=m
@@ -59,7 +57,6 @@ CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
 
-CONFIG_USB_STORAGE=y
 # For /proc/bus/usb and lsusb.
 CONFIG_USB_DEVICEFS=y
 
-- 
1.7.0.4