[meta-lsi] [PATCH 22/41] update 3.10 fragments to include the latest Axxia config options
Daniel Dragomir
daniel.dragomir at windriver.com
Thu Jan 28 04:29:25 PST 2016
From: Cristian Bercaru <cristian.bercaru at windriver.com>
Signed-off-by: Cristian Bercaru <cristian.bercaru at windriver.com>
---
recipes-kernel/linux/axxiaarm_preempt-rt_3.10.inc | 12 ----
recipes-kernel/linux/axxiaarm_standard_3.10.inc | 11 ---
.../linux/axxiapowerpc_preempt-rt_3.10.inc | 6 --
.../linux/axxiapowerpc_standard_3.10.inc | 5 --
.../linux-3.10/axxiaarm/common/common-non-hw.cfg | 7 +-
.../linux-3.10/axxiaarm/common/common.scc | 7 +-
.../linux-3.10/axxiaarm/common/dbg-non-hw.cfg | 57 +++++++++++++++
.../linux-yocto/linux-3.10/axxiaarm/common/dbg.scc | 1 +
.../linux-3.10/axxiaarm/common/full-power-L2.cfg | 13 ++++
.../linux-3.10/axxiaarm/common/full-power.cfg | 13 ++++
.../linux-3.10/axxiaarm/common/low-power.cfg | 13 ++++
.../linux-3.10/axxiaarm/common/testing.cfg | 14 +++-
.../axxiaarm/preempt-rt/big-endian-hw.cfg | 1 +
.../linux-3.10/axxiaarm/preempt-rt/big-endian.cfg | 1 -
.../linux-3.10/axxiaarm/preempt-rt/big-endian.scc | 2 +-
.../linux-3.10/axxiaarm/preempt-rt/dbg-hw.cfg | 5 --
.../linux-3.10/axxiaarm/preempt-rt/dbg-non-hw.cfg | 67 -----------------
.../linux-3.10/axxiaarm/preempt-rt/dbg.scc | 2 -
.../axxiaarm/preempt-rt/preempt-rt-non-hw.cfg | 1 -
.../linux-3.10/axxiaarm/preempt-rt/preempt-rt.scc | 2 +-
.../linux-3.10/axxiaarm/standard/big-endian-hw.cfg | 16 +++++
.../linux-3.10/axxiaarm/standard/big-endian.cfg | 3 -
.../linux-3.10/axxiaarm/standard/big-endian.scc | 2 +-
.../linux-3.10/axxiaarm/standard/dbg-hw.cfg | 5 --
.../linux-3.10/axxiaarm/standard/dbg-non-hw.cfg | 83 ----------------------
.../linux-3.10/axxiaarm/standard/dbg.scc | 2 -
.../linux-3.10/axxiaarm/standard/smmon.cfg | 13 ++++
.../axxiaarm/standard/standard-non-hw.cfg | 1 +
.../linux-3.10/axxiaarm/standard/standard.scc | 1 +
.../linux-3.10/axxiapowerpc/common/common-hw.cfg | 4 --
.../axxiapowerpc/common/common-non-hw.cfg | 19 ++---
.../linux-3.10/axxiapowerpc/common/common.scc | 6 +-
.../linux-3.10/axxiapowerpc/common/dbg-non-hw.cfg | 45 ++++++++++++
.../linux-3.10/axxiapowerpc/common/dbg.scc | 1 +
.../linux-3.10/axxiapowerpc/common/non-testing.cfg | 13 ++++
.../linux-3.10/axxiapowerpc/common/testing.cfg | 13 ++++
.../linux-3.10/axxiapowerpc/preempt-rt/dbg-hw.cfg | 5 --
.../axxiapowerpc/preempt-rt/dbg-non-hw.cfg | 63 ----------------
.../linux-3.10/axxiapowerpc/preempt-rt/dbg.scc | 2 -
.../axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg | 22 ------
.../axxiapowerpc/preempt-rt/preempt-rt.scc | 1 -
.../linux-3.10/axxiapowerpc/standard/dbg-hw.cfg | 5 --
.../axxiapowerpc/standard/dbg-non-hw.cfg | 52 --------------
.../linux-3.10/axxiapowerpc/standard/dbg.scc | 2 -
.../axxiapowerpc/standard/standard-non-hw.cfg | 22 ++++++
.../linux-3.10/axxiapowerpc/standard/standard.scc | 1 +
46 files changed, 258 insertions(+), 384 deletions(-)
delete mode 100644 recipes-kernel/linux/axxiaarm_preempt-rt_3.10.inc
delete mode 100644 recipes-kernel/linux/axxiaarm_standard_3.10.inc
delete mode 100644 recipes-kernel/linux/axxiapowerpc_preempt-rt_3.10.inc
delete mode 100644 recipes-kernel/linux/axxiapowerpc_standard_3.10.inc
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/dbg-non-hw.cfg
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/dbg.scc
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian-hw.cfg
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.cfg
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-hw.cfg
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-non-hw.cfg
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg.scc
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian-hw.cfg
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.cfg
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-hw.cfg
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-non-hw.cfg
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg.scc
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/standard-non-hw.cfg
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/standard.scc
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/dbg-non-hw.cfg
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/dbg.scc
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-hw.cfg
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-non-hw.cfg
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg.scc
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-hw.cfg
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-non-hw.cfg
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg.scc
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/standard-non-hw.cfg
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/standard.scc
diff --git a/recipes-kernel/linux/axxiaarm_preempt-rt_3.10.inc b/recipes-kernel/linux/axxiaarm_preempt-rt_3.10.inc
deleted file mode 100644
index 4c33080..0000000
--- a/recipes-kernel/linux/axxiaarm_preempt-rt_3.10.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-# adding fragments with kernel options to the final .config
-KERNEL_EXTRA_FEATURES = "features/taskstats/taskstats.scc"
-SRC_URI += "file://common.scc \
- file://preempt-rt.scc \
- ${@base_conditional('BIG_ENDIAN', 'yes', 'file://big-endian.scc', '', d)} \
- ${@base_conditional('DBG', 'yes', 'file://dbg.scc', '', d)} \
- ${@base_conditional('TESTING', 'yes', 'file://testing.scc', '', d)} "
-
-# cpu hotplug options: low power (default), full power down, full power down with L2 cache
-SRC_URI += "${@base_conditional('POWER_MANAGEMENT', 'full-power', 'file://full-power.scc', '', d)} \
- ${@base_conditional('POWER_MANAGEMENT', 'full-power-L2', 'file://full-power-L2.scc', '', d)} \
- ${@base_conditional('POWER_MANAGEMENT', 'low-power', 'file://low-power.scc', '', d)} "
diff --git a/recipes-kernel/linux/axxiaarm_standard_3.10.inc b/recipes-kernel/linux/axxiaarm_standard_3.10.inc
deleted file mode 100644
index 3a73963..0000000
--- a/recipes-kernel/linux/axxiaarm_standard_3.10.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-# adding fragments with kernel options to the final .config
-KERNEL_EXTRA_FEATURES = "features/taskstats/taskstats.scc"
-SRC_URI += "file://common.scc \
- ${@base_conditional('BIG_ENDIAN', 'yes', 'file://big-endian.scc', '', d)} \
- ${@base_conditional('DBG', 'yes', 'file://dbg.scc', '', d)} \
- ${@base_conditional('TESTING', 'yes', 'file://testing.scc', '', d)} "
-
-# cpu hotplug options: low power (default), full power down, full power down with L2 cache
-SRC_URI += "${@base_conditional('POWER_MANAGEMENT', 'full-power', 'file://full-power.scc', '', d)} \
- ${@base_conditional('POWER_MANAGEMENT', 'full-power-L2', 'file://full-power-L2.scc', '', d)} \
- ${@base_conditional('POWER_MANAGEMENT', 'low-power', 'file://low-power.scc', '', d)} "
diff --git a/recipes-kernel/linux/axxiapowerpc_preempt-rt_3.10.inc b/recipes-kernel/linux/axxiapowerpc_preempt-rt_3.10.inc
deleted file mode 100644
index f0d4bb6..0000000
--- a/recipes-kernel/linux/axxiapowerpc_preempt-rt_3.10.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# adding fragments with kernel options to the final .config
-KERNEL_EXTRA_FEATURES = ""
-SRC_URI += "file://common.scc \
- file://preempt-rt.scc \
- ${@base_conditional('DBG', 'yes', 'file://dbg.scc', '', d)} \
- ${@base_conditional('TESTING', 'yes', 'file://testing.scc', 'file://non-testing.scc', d)} "
diff --git a/recipes-kernel/linux/axxiapowerpc_standard_3.10.inc b/recipes-kernel/linux/axxiapowerpc_standard_3.10.inc
deleted file mode 100644
index bbed950..0000000
--- a/recipes-kernel/linux/axxiapowerpc_standard_3.10.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# adding fragments with kernel options to the final .config
-KERNEL_EXTRA_FEATURES = ""
-SRC_URI += "file://common.scc \
- ${@base_conditional('DBG', 'yes', 'file://dbg.scc', '', d)} \
- ${@base_conditional('TESTING', 'yes', 'file://testing.scc', 'file://non-testing.scc', d)} "
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-non-hw.cfg
index 9304fa9..3a22a93 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-non-hw.cfg
@@ -45,7 +45,7 @@ CONFIG_SYSCTL_SYSCALL=y
# Kernel Performance Events And Counters
#
# CONFIG_COMPAT_BRK is not set
-# CONFIG_OPROFILE is not set
+CONFIG_PROFILING=y
#
# IO Schedulers
@@ -325,8 +325,3 @@ CONFIG_CRYPTO_SHA256=y
# Random Number Generation
#
# CONFIG_CRYPTO_ANSI_CPRNG is not set
-
-#
-# Library routines
-#
-# CONFIG_LIBCRC32C is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common.scc
index 84a7420..60fe28b 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common.scc
@@ -1,2 +1,7 @@
-kconf non-hardware common-non-hw.cfg
+include features/taskstats/taskstats.scc
+include features/usb/ehci-hcd.scc
+include cfg/usb-mass-storage.scc
+include cfg/virtio.scc
+
kconf hardware common-hw.cfg
+kconf non-hardware common-non-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/dbg-non-hw.cfg
new file mode 100644
index 0000000..c6636c6
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/dbg-non-hw.cfg
@@ -0,0 +1,57 @@
+#.........................................................................
+# 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.
+#
+#.........................................................................
+
+#
+# Kernel hacking
+#
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_LOCKUP_DETECTOR=y
+# CONFIG_DETECT_HUNG_TASK is not set
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+CONFIG_DEBUG_OBJECTS=y
+CONFIG_DEBUG_OBJECTS_SELFTEST=y
+CONFIG_DEBUG_OBJECTS_FREE=y
+CONFIG_DEBUG_OBJECTS_TIMERS=y
+CONFIG_DEBUG_OBJECTS_WORK=y
+CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
+CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
+CONFIG_SLUB_DEBUG_ON=y
+CONFIG_SLUB_STATS=y
+CONFIG_DEBUG_KMEMLEAK=y
+CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_PROVE_LOCKING=y
+CONFIG_LOCK_STAT=y
+CONFIG_DEBUG_LOCKDEP=y
+CONFIG_DEBUG_ATOMIC_SLEEP=y
+CONFIG_DEBUG_STACK_USAGE=y
+CONFIG_DEBUG_KOBJECT=y
+CONFIG_DEBUG_HIGHMEM=y
+CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_VM_RB=y
+CONFIG_DEBUG_WRITECOUNT=y
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SG=y
+CONFIG_DEBUG_NOTIFIERS=y
+CONFIG_DEBUG_CREDENTIALS=y
+
+#
+# RCU Debugging
+#
+CONFIG_SPARSE_RCU_POINTER=y
+CONFIG_RCU_CPU_STALL_INFO=y
+CONFIG_RCU_TRACE=y
+CONFIG_DEBUG_PER_CPU_MAPS=y
+CONFIG_DEBUG_PAGEALLOC=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/dbg.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/dbg.scc
new file mode 100644
index 0000000..01fcbff
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/dbg.scc
@@ -0,0 +1 @@
+kconf non-hardware dbg-non-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power-L2.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power-L2.cfg
index 19b5cf4..1641a6b 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power-L2.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power-L2.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_HOTPLUG_CPU_COMPLETE_POWER_DOWN=y
# CONFIG_HOTPLUG_CPU_LOW_POWER is not set
CONFIG_HOTPLUG_CPU_L2_POWER_DOWN=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power.cfg
index 99025a2..cc921c0 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power.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_HOTPLUG_CPU_COMPLETE_POWER_DOWN=y
# CONFIG_HOTPLUG_CPU_LOW_POWER is not set
# CONFIG_HOTPLUG_CPU_L2_POWER_DOWN is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/low-power.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/low-power.cfg
index 5d3431b..6abe4b6 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/low-power.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/low-power.cfg
@@ -1,2 +1,15 @@
+#.........................................................................
+# 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_HOTPLUG_CPU_COMPLETE_POWER_DOWN is not set
CONFIG_HOTPLUG_CPU_LOW_POWER=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/testing.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/testing.cfg
index 93e2e30..38327ae 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/testing.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/testing.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_PROC_FS=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
@@ -24,4 +37,3 @@ CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_I2C_AXXIA=y
-
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian-hw.cfg
new file mode 100644
index 0000000..c5cdc99
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian-hw.cfg
@@ -0,0 +1 @@
+CONFIG_CPU_BIG_ENDIAN=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.cfg
deleted file mode 100644
index c5cdc99..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.cfg
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CPU_BIG_ENDIAN=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.scc
index 58521ec..c11e218 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.scc
@@ -1 +1 @@
-kconf non-hardware big-endian.cfg
+kconf hardware big-endian-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-hw.cfg
deleted file mode 100644
index de5be4a..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-hw.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Kernel Features
-#
-CONFIG_PREEMPT_COUNT=y
-CONFIG_SPLIT_PTLOCK_CPUS=999999
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-non-hw.cfg
deleted file mode 100644
index d15c658..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-non-hw.cfg
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU_TRACE=y
-
-#
-# Kernel hacking
-#
-CONFIG_LOCKUP_DETECTOR=y
-
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-CONFIG_DEBUG_OBJECTS=y
-CONFIG_SLUB_DEBUG_ON=y
-CONFIG_SLUB_STATS=y
-
-CONFIG_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_RT_MUTEXES=y
-
-CONFIG_PROVE_LOCKING=y
-CONFIG_LOCK_STAT=y
-CONFIG_DEBUG_LOCKDEP=y
-CONFIG_DEBUG_ATOMIC_SLEEP=y
-
-CONFIG_DEBUG_STACK_USAGE=y
-CONFIG_DEBUG_HIGHMEM=y
-
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_WRITECOUNT=y
-CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DEBUG_LIST=y
-
-CONFIG_DEBUG_SG=y
-CONFIG_DEBUG_NOTIFIERS=y
-CONFIG_DEBUG_CREDENTIALS=y
-CONFIG_FRAME_POINTER=y
-
-#
-# RCU Debugging
-#
-CONFIG_PROVE_RCU=y
-CONFIG_PROVE_RCU_DELAY=y
-CONFIG_SPARSE_RCU_POINTER=y
-CONFIG_RCU_CPU_STALL_INFO=y
-CONFIG_RCU_TRACE=y
-CONFIG_DEBUG_PER_CPU_MAPS=y
-CONFIG_DEBUG_PAGEALLOC=y
-CONFIG_FTRACE=y
-CONFIG_IRQSOFF_TRACER=y
-CONFIG_INTERRUPT_OFF_HIST=y
-CONFIG_PREEMPT_OFF_HIST=y
-CONFIG_PREEMPT_TRACER=y
-CONFIG_SCHED_TRACER=y
-CONFIG_STACK_TRACER=y
-CONFIG_WAKEUP_LATENCY_HIST=y
-CONFIG_MISSED_TIMER_OFFSETS_HIST=y
-CONFIG_FUNCTION_PROFILER=y
-CONFIG_OLD_MCOUNT=y
-
-#
-# Random Number Generation
-#
-CONFIG_BINARY_PRINTF=y
-
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg.scc
deleted file mode 100644
index b5cd0eb..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg.scc
+++ /dev/null
@@ -1,2 +0,0 @@
-kconf non-hardware dbg-non-hw.cfg
-kconf hardware dbg-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt-non-hw.cfg
index 4e080c5..46c542b 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt-non-hw.cfg
@@ -14,5 +14,4 @@
#
# RCU Subsystem
#
-# CONFIG_RCU_BOOST is not set
CONFIG_RELAY=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt.scc
index ab1dcde..b1670e6 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt.scc
@@ -1,2 +1,2 @@
-kconf non-hardware preempt-rt-non-hw.cfg
kconf hardware preempt-rt-hw.cfg
+kconf non-hardware preempt-rt-non-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian-hw.cfg
new file mode 100644
index 0000000..78c6ec7
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian-hw.cfg
@@ -0,0 +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_CPU_BIG_ENDIAN=y
+# CONFIG_ARM_CCN is not set
+# CONFIG_MFD_SYSCON is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.cfg
deleted file mode 100644
index 4c207e3..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_ARM_CCN is not set
-# CONFIG_MFD_SYSCON is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.scc
index 0271465..ca42c3f 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.scc
@@ -1,4 +1,4 @@
-kconf non-hardware big-endian.cfg
+kconf hardware big-endian-hw.cfg
# use SMMON instead of EDAC for big endian builds
kconf hardware smmon.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-hw.cfg
deleted file mode 100644
index de5be4a..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-hw.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Kernel Features
-#
-CONFIG_PREEMPT_COUNT=y
-CONFIG_SPLIT_PTLOCK_CPUS=999999
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-non-hw.cfg
deleted file mode 100644
index f5b4c1f..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-non-hw.cfg
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU_TRACE=y
-CONFIG_KALLSYMS_ALL=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_TRACEPOINTS=y
-# CONFIG_KPROBES is not set
-
-#
-# IO Schedulers
-#
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-
-#
-# Kernel hacking
-#
-CONFIG_DEBUG_SHIRQ=y
-CONFIG_LOCKUP_DETECTOR=y
-
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-CONFIG_DEBUG_OBJECTS=y
-CONFIG_SLUB_DEBUG_ON=y
-CONFIG_SLUB_STATS=y
-
-CONFIG_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_RT_MUTEXES=y
-
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_LOCK_ALLOC=y
-CONFIG_PROVE_LOCKING=y
-CONFIG_LOCKDEP=y
-CONFIG_LOCK_STAT=y
-CONFIG_TRACE_IRQFLAGS=y
-CONFIG_DEBUG_ATOMIC_SLEEP=y
-
-CONFIG_STACKTRACE=y
-CONFIG_DEBUG_STACK_USAGE=y
-CONFIG_DEBUG_KOBJECT=y
-CONFIG_DEBUG_HIGHMEM=y
-
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_VM_RB=y
-CONFIG_DEBUG_WRITECOUNT=y
-CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DEBUG_LIST=y
-
-CONFIG_DEBUG_SG=y
-CONFIG_DEBUG_NOTIFIERS=y
-CONFIG_DEBUG_CREDENTIALS=y
-CONFIG_FRAME_POINTER=y
-
-#
-# RCU Debugging
-#
-CONFIG_SPARSE_RCU_POINTER=y
-CONFIG_RCU_CPU_STALL_INFO=y
-CONFIG_RCU_TRACE=y
-CONFIG_DEBUG_PER_CPU_MAPS=y
-CONFIG_DEBUG_PAGEALLOC=y
-CONFIG_TRACER_MAX_TRACE=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_FTRACE=y
-CONFIG_IRQSOFF_TRACER=y
-CONFIG_SCHED_TRACER=y
-CONFIG_TRACER_SNAPSHOT=y
-CONFIG_STACK_TRACER=y
-CONFIG_FUNCTION_PROFILER=y
-CONFIG_OLD_MCOUNT=y
-
-#
-# Random Number Generation
-#
-CONFIG_BINARY_PRINTF=y
-
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg.scc
deleted file mode 100644
index b5cd0eb..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg.scc
+++ /dev/null
@@ -1,2 +0,0 @@
-kconf non-hardware dbg-non-hw.cfg
-kconf hardware dbg-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/smmon.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/smmon.cfg
index 77b89b6..dfd0836 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/smmon.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/smmon.cfg
@@ -1,2 +1,15 @@
+#.........................................................................
+# 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_LSI_SMMON=y
# CONFIG_EDAC is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/standard-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/standard-non-hw.cfg
new file mode 100644
index 0000000..0cbeb5a
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/standard-non-hw.cfg
@@ -0,0 +1 @@
+CONFIG_PREEMPT_NONE=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/standard.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/standard.scc
new file mode 100644
index 0000000..609308f
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/standard.scc
@@ -0,0 +1 @@
+kconf non-hardware standard-non-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-hw.cfg
index e21987b..8904f54 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-hw.cfg
@@ -12,10 +12,6 @@
#.........................................................................
#
-# Platform support
-#
-# CONFIG_EBONY is not set
-#
# Kernel options
#
# CONFIG_COMPACTION is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-non-hw.cfg
index 2d0ba14..3e3f452 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-non-hw.cfg
@@ -31,11 +31,16 @@ CONFIG_SYSCTL_SYSCALL=y
#
# Kernel options
#
-# CONFIG_SLUB_DEBUG is not set
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
# CONFIG_KPROBES is not set
#
+# Kernel Performance Events And Counters
+#
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=y
+
+#
# GCOV-based kernel profiling
#
CONFIG_MODULE_FORCE_LOAD=y
@@ -210,15 +215,9 @@ CONFIG_NFS_ACL_SUPPORT=y
# CONFIG_NLS_UTF8 is not set
#
-# Kernel hacking
-#
-# CONFIG_TIMER_STATS is not set
-
-#
# RCU Debugging
#
CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_LATENCYTOP is not set
# CONFIG_FUNCTION_TRACER is not set
# CONFIG_FTRACE_SYSCALLS is not set
# CONFIG_BLK_DEV_IO_TRACE is not set
@@ -249,7 +248,6 @@ CONFIG_CRYPTO_XCBC=y
#
# Digest
#
-# CONFIG_CRYPTO_CRC32C is not set
# CONFIG_CRYPTO_MD4 is not set
# CONFIG_CRYPTO_MICHAEL_MIC is not set
CONFIG_CRYPTO_SHA256=y
@@ -275,8 +273,3 @@ CONFIG_CRYPTO_SHA256=y
#
CONFIG_CRYPTO_DEV_PPC4XX=y
# CONFIG_CRYPTO_ANSI_CPRNG is not set
-
-#
-# Library routines
-#
-# CONFIG_LIBCRC32C is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common.scc
index 84a7420..3575a93 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common.scc
@@ -1,2 +1,6 @@
-kconf non-hardware common-non-hw.cfg
+include features/usb/ehci-hcd.scc
+include features/scsi/disk.scc
+include cfg/usb-mass-storage.scc
+
kconf hardware common-hw.cfg
+kconf non-hardware common-non-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/dbg-non-hw.cfg
new file mode 100644
index 0000000..4797ec3
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/dbg-non-hw.cfg
@@ -0,0 +1,45 @@
+#.........................................................................
+# 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.
+#
+#.........................................................................
+
+#
+# Kernel hacking
+#
+CONFIG_LOCKUP_DETECTOR=y
+# CONFIG_DETECT_HUNG_TASK is not set
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+CONFIG_DEBUG_OBJECTS=y
+CONFIG_DEBUG_OBJECTS_SELFTEST=y
+CONFIG_DEBUG_OBJECTS_FREE=y
+CONFIG_DEBUG_OBJECTS_TIMERS=y
+CONFIG_DEBUG_OBJECTS_WORK=y
+CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
+CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
+CONFIG_SLUB_STATS=y
+CONFIG_DEBUG_KMEMLEAK=y
+CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_LOCK_STAT=y
+CONFIG_DEBUG_ATOMIC_SLEEP=y
+CONFIG_DEBUG_STACK_USAGE=y
+CONFIG_DEBUG_HIGHMEM=y
+CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_VM_RB=y
+CONFIG_DEBUG_MEMORY_INIT=y
+
+#
+# RCU Debugging
+#
+CONFIG_DEBUG_PER_CPU_MAPS=y
+CONFIG_DEBUG_PAGEALLOC=y
+CONFIG_DEBUG_STACKOVERFLOW=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/dbg.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/dbg.scc
new file mode 100644
index 0000000..01fcbff
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/dbg.scc
@@ -0,0 +1 @@
+kconf non-hardware dbg-non-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/non-testing.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/non-testing.cfg
index ef58b5f..0f7f88d 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/non-testing.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/non-testing.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.
+#
+#.........................................................................
+
#
# Timers subsystem
#
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/testing.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/testing.cfg
index 93e2e30..6e2af3c 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/testing.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/testing.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_PROC_FS=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-hw.cfg
deleted file mode 100644
index de5be4a..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-hw.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Kernel Features
-#
-CONFIG_PREEMPT_COUNT=y
-CONFIG_SPLIT_PTLOCK_CPUS=999999
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-non-hw.cfg
deleted file mode 100644
index c83622b..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-non-hw.cfg
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU_TRACE=y
-
-#
-# Kernel hacking
-#
-CONFIG_DEBUG_SHIRQ=y
-CONFIG_LOCKUP_DETECTOR=y
-
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-CONFIG_DEBUG_OBJECTS=y
-CONFIG_SLUB_STATS=y
-CONFIG_SLUB_DEBUG_ON=y
-CONFIG_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_PROVE_LOCKING=y
-CONFIG_LOCK_STAT=y
-CONFIG_DEBUG_LOCKDEP=y
-CONFIG_DEBUG_ATOMIC_SLEEP=y
-CONFIG_DEBUG_STACK_USAGE=y
-CONFIG_DEBUG_KOBJECT=y
-CONFIG_DEBUG_HIGHMEM=y
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_VM_RB=y
-CONFIG_DEBUG_WRITECOUNT=y
-CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DEBUG_LIST=y
-CONFIG_DEBUG_SG=y
-CONFIG_DEBUG_NOTIFIERS=y
-CONFIG_DEBUG_CREDENTIALS=y
-
-#
-# RCU Debugging
-#
-CONFIG_PROVE_RCU=y
-CONFIG_PROVE_RCU_DELAY=y
-CONFIG_SPARSE_RCU_POINTER=y
-CONFIG_RCU_CPU_STALL_INFO=y
-CONFIG_RCU_TRACE=y
-CONFIG_DEBUG_PER_CPU_MAPS=y
-CONFIG_LATENCYTOP=y
-CONFIG_DEBUG_PAGEALLOC=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_FTRACE=y
-CONFIG_IRQSOFF_TRACER=y
-CONFIG_INTERRUPT_OFF_HIST=y
-CONFIG_PREEMPT_TRACER=y
-CONFIG_PREEMPT_OFF_HIST=y
-CONFIG_SCHED_TRACER=y
-CONFIG_WAKEUP_LATENCY_HIST=y
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_STACK_TRACER=y
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_UPROBE_EVENT=y
-CONFIG_FUNCTION_PROFILER=y
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DMA_API_DEBUG=y
-CONFIG_DEBUG_STACKOVERFLOW=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg.scc
deleted file mode 100644
index b5cd0eb..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg.scc
+++ /dev/null
@@ -1,2 +0,0 @@
-kconf non-hardware dbg-non-hw.cfg
-kconf hardware dbg-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg
deleted file mode 100644
index 7bbd1bf..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-#.........................................................................
-# 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.
-#
-#.........................................................................
-
-#
-# RCU Subsystem
-#
-# CONFIG_RCU_BOOST is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_SLUB_DEBUG=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt.scc
index ab1dcde..7a4ede9 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt.scc
@@ -1,2 +1 @@
-kconf non-hardware preempt-rt-non-hw.cfg
kconf hardware preempt-rt-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-hw.cfg
deleted file mode 100644
index de5be4a..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-hw.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Kernel Features
-#
-CONFIG_PREEMPT_COUNT=y
-CONFIG_SPLIT_PTLOCK_CPUS=999999
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-non-hw.cfg
deleted file mode 100644
index db1afba..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-non-hw.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU_TRACE=y
-
-#
-# Kernel hacking
-#
-CONFIG_DEBUG_SHIRQ=y
-CONFIG_LOCKUP_DETECTOR=y
-
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-CONFIG_DEBUG_OBJECTS=y
-CONFIG_SLUB_STATS=y
-
-CONFIG_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_RT_MUTEXES=y
-
-CONFIG_PROVE_LOCKING=y
-CONFIG_LOCK_STAT=y
-CONFIG_DEBUG_ATOMIC_SLEEP=y
-
-CONFIG_DEBUG_STACK_USAGE=y
-CONFIG_DEBUG_KOBJECT=y
-CONFIG_DEBUG_HIGHMEM=y
-
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_WRITECOUNT=y
-CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DEBUG_LIST=y
-
-CONFIG_DEBUG_SG=y
-CONFIG_DEBUG_NOTIFIERS=y
-CONFIG_DEBUG_CREDENTIALS=y
-
-#
-# RCU Debugging
-#
-CONFIG_SPARSE_RCU_POINTER=y
-CONFIG_RCU_CPU_STALL_INFO=y
-CONFIG_RCU_TRACE=y
-CONFIG_DEBUG_BLOCK_EXT_DEVT=y
-CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
-CONFIG_DEBUG_PER_CPU_MAPS=y
-CONFIG_DEBUG_PAGEALLOC=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_FTRACE=y
-CONFIG_DMA_API_DEBUG=y
-CONFIG_DEBUG_STACKOVERFLOW=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg.scc
deleted file mode 100644
index b5cd0eb..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg.scc
+++ /dev/null
@@ -1,2 +0,0 @@
-kconf non-hardware dbg-non-hw.cfg
-kconf hardware dbg-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/standard-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/standard-non-hw.cfg
new file mode 100644
index 0000000..5601f1d
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/standard-non-hw.cfg
@@ -0,0 +1,22 @@
+#.........................................................................
+# 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.
+#
+#.........................................................................
+
+#
+# Kernel Performance Events And Counters
+#
+# CONFIG_SLUB_DEBUG is not set
+
+#
+# Kernel options
+#
+CONFIG_PREEMPT_NONE=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/standard.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/standard.scc
new file mode 100644
index 0000000..609308f
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/standard.scc
@@ -0,0 +1 @@
+kconf non-hardware standard-non-hw.cfg
--
1.9.1
More information about the meta-lsi
mailing list