[linux-yocto] [PATCH 2/2] bsp: axxiapowerpc: remove unnecesary options

[Cristian Bercaru]

This patch removes the unnecesary options from the Axxia 3000 config
fragments.

Signed-off-by: Cristian Bercaru <cristian.bercaru at windriver.com>
---
 bsp/axxiapowerpc/axxiapowerpc-standard.scc |    1 -
 bsp/axxiapowerpc/axxiapowerpc.cfg          |    4 +---
 bsp/axxiapowerpc/axxiapowerpc.scc          |    9 +++------
 bsp/axxiapowerpc/no-preempt.cfg            |    1 -
 bsp/axxiapowerpc/no-preempt.scc            |    1 -
 bsp/axxiapowerpc/rapidio.cfg               |   13 +++++++++++++
 6 files changed, 17 insertions(+), 12 deletions(-)
 delete mode 100644 bsp/axxiapowerpc/no-preempt.cfg
 delete mode 100644 bsp/axxiapowerpc/no-preempt.scc

diff --git a/bsp/axxiapowerpc/axxiapowerpc-standard.scc b/bsp/axxiapowerpc/axxiapowerpc-standard.scc
index 2af8ed7..1caa2dd 100644
--- a/bsp/axxiapowerpc/axxiapowerpc-standard.scc
+++ b/bsp/axxiapowerpc/axxiapowerpc-standard.scc
@@ -6,4 +6,3 @@ include ktypes/standard
 branch axxia
 
 include axxiapowerpc.scc
-include no-preempt.scc
diff --git a/bsp/axxiapowerpc/axxiapowerpc.cfg b/bsp/axxiapowerpc/axxiapowerpc.cfg
index ae23320..08adee4 100644
--- a/bsp/axxiapowerpc/axxiapowerpc.cfg
+++ b/bsp/axxiapowerpc/axxiapowerpc.cfg
@@ -80,9 +80,6 @@ CONFIG_MTD_NAND_EP501X=y
 
 CONFIG_LSI_NET=y
 
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-
 CONFIG_USB_CI13612_HCD=y
 
 CONFIG_LSI_USB_SW_WORKAROUND=y
@@ -130,6 +127,7 @@ CONFIG_IGBVF=y
 CONFIG_USB_DEBUG=y
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_MON=y
+CONFIG_USB_STORAGE=y
 
 # CONFIG_USB_EHCI_TT_NEWSCHED is not set
 CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
diff --git a/bsp/axxiapowerpc/axxiapowerpc.scc b/bsp/axxiapowerpc/axxiapowerpc.scc
index 938be1f..37b0c39 100644
--- a/bsp/axxiapowerpc/axxiapowerpc.scc
+++ b/bsp/axxiapowerpc/axxiapowerpc.scc
@@ -1,8 +1,5 @@
-kconf hardware axxiapowerpc.cfg
-
-include features/profiling/profiling.scc
-include features/latencytop/latencytop.scc
 include features/usb/ehci-hcd.scc
-include cfg/usb-mass-storage.scc
-
+include features/scsi/disk.scc
 include rapidio.scc
+
+kconf hardware axxiapowerpc.cfg
diff --git a/bsp/axxiapowerpc/no-preempt.cfg b/bsp/axxiapowerpc/no-preempt.cfg
deleted file mode 100644
index 0cbeb5a..0000000
--- a/bsp/axxiapowerpc/no-preempt.cfg
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PREEMPT_NONE=y
diff --git a/bsp/axxiapowerpc/no-preempt.scc b/bsp/axxiapowerpc/no-preempt.scc
deleted file mode 100644
index 1e75e15..0000000
--- a/bsp/axxiapowerpc/no-preempt.scc
+++ /dev/null
@@ -1 +0,0 @@
-kconf non-hardware no-preempt.cfg
diff --git a/bsp/axxiapowerpc/rapidio.cfg b/bsp/axxiapowerpc/rapidio.cfg
index 6327327..bbbd785 100644
--- a/bsp/axxiapowerpc/rapidio.cfg
+++ b/bsp/axxiapowerpc/rapidio.cfg
@@ -1,3 +1,16 @@
+#.........................................................................
+#                                WARNING
+#
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file.  The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration).  For more information on kernel configuration, please
+# consult the product documentation.
+#
+#.........................................................................
+
 CONFIG_RAPIDIO=y
 # CONFIG_AXXIA_RIO is not set
 CONFIG_RIO_MAINT_WIN_SIZE=0x400000
-- 
1.7.9.5