[meta-lsi] [PATCH 06/24] linux-yocto-3.10: update fragments to match defconfigs

Daniel Dragomir daniel.dragomir at windriver.com
Thu Jan 28 04:43:04 PST 2016


From: Cristian Bercaru <cristian.bercaru at windriver.com>

This patch updates configuration fragments for linux-yocto-3.10 so
that the resulting defconfigs match the ones in the private
repositories.
With this patch, the fragments corresponding to the same configuration
options such as "DBG" or "BIG_ENDIAN" differ depending on the
architecture (arm/powerpc) and kernel type (standard/preempt-rt).

Signed-off-by: Cristian Bercaru <cristian.bercaru at windriver.com>
---
 recipes-kernel/linux/axxiaarm_3.10.inc             |  16 -
 recipes-kernel/linux/axxiaarm_preempt-rt_3.10.inc  |  12 +
 recipes-kernel/linux/axxiaarm_standard_3.10.inc    |  11 +
 recipes-kernel/linux/axxiapowerpc_3.10.inc         |   9 -
 .../linux/axxiapowerpc_preempt-rt_3.10.inc         |   6 +
 .../linux/axxiapowerpc_standard_3.10.inc           |   5 +
 .../linux-3.10/axxiaarm/axxiaarm-common-hw.cfg     | 127 --------
 .../linux-3.10/axxiaarm/axxiaarm-common-non-hw.cfg | 332 ---------------------
 .../linux-3.10/axxiaarm/axxiaarm-common.scc        |   2 -
 .../linux-3.10/axxiaarm/axxiaarm-preempt-rt-hw.cfg |  17 --
 .../axxiaarm/axxiaarm-preempt-rt-non-hw.cfg        |  18 --
 .../linux-3.10/axxiaarm/axxiaarm-preempt-rt.scc    |   2 -
 .../linux-3.10/axxiaarm/big-endian/big-endian.cfg  |   3 -
 .../linux-3.10/axxiaarm/big-endian/big-endian.scc  |   4 -
 .../linux-3.10/axxiaarm/big-endian/smmon.cfg       |   2 -
 .../linux-3.10/axxiaarm/common/common-hw.cfg       | 127 ++++++++
 .../linux-3.10/axxiaarm/common/common-non-hw.cfg   | 332 +++++++++++++++++++++
 .../linux-3.10/axxiaarm/common/common.scc          |   2 +
 .../linux-3.10/axxiaarm/common/full-power-L2.cfg   |   3 +
 .../linux-3.10/axxiaarm/common/full-power-L2.scc   |   1 +
 .../linux-3.10/axxiaarm/common/full-power.cfg      |   3 +
 .../linux-3.10/axxiaarm/common/full-power.scc      |   1 +
 .../linux-3.10/axxiaarm/common/low-power.cfg       |   2 +
 .../linux-3.10/axxiaarm/common/low-power.scc       |   1 +
 .../linux-3.10/axxiaarm/common/testing.cfg         |  27 ++
 .../linux-3.10/axxiaarm/common/testing.scc         |   1 +
 .../linux-3.10/axxiaarm/dbg-arm/dbg-hw.cfg         |   5 -
 .../linux-3.10/axxiaarm/dbg-arm/dbg-non-hw.cfg     |  83 ------
 .../linux-3.10/axxiaarm/dbg-arm/dbg.scc            |   2 -
 .../axxiaarm/power-management-full-power-L2.cfg    |   3 -
 .../axxiaarm/power-management-full-power-L2.scc    |   1 -
 .../axxiaarm/power-management-full-power.cfg       |   3 -
 .../axxiaarm/power-management-full-power.scc       |   1 -
 .../axxiaarm/power-management-low-power.cfg        |   2 -
 .../axxiaarm/power-management-low-power.scc        |   1 -
 .../linux-3.10/axxiaarm/preempt-rt/big-endian.cfg  |   1 +
 .../linux-3.10/axxiaarm/preempt-rt/big-endian.scc  |   1 +
 .../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-hw.cfg          |  17 ++
 .../axxiaarm/preempt-rt/preempt-rt-non-hw.cfg      |  18 ++
 .../linux-3.10/axxiaarm/preempt-rt/preempt-rt.scc  |   2 +
 .../linux-3.10/axxiaarm/standard/big-endian.cfg    |   3 +
 .../linux-3.10/axxiaarm/standard/big-endian.scc    |   4 +
 .../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         |   2 +
 .../linux-yocto/linux-3.10/axxiaarm/testing.cfg    |  27 --
 .../linux-yocto/linux-3.10/axxiaarm/testing.scc    |   1 -
 .../axxiapowerpc/axxiapowerpc-common-hw.cfg        |  72 -----
 .../axxiapowerpc/axxiapowerpc-common-non-hw.cfg    | 282 -----------------
 .../axxiapowerpc/axxiapowerpc-common.scc           |   2 -
 .../axxiapowerpc/axxiapowerpc-preempt-rt-hw.cfg    |  17 --
 .../axxiapowerpc-preempt-rt-non-hw.cfg             |  22 --
 .../axxiapowerpc/axxiapowerpc-preempt-rt.scc       |   2 -
 .../linux-3.10/axxiapowerpc/common/common-hw.cfg   |  72 +++++
 .../axxiapowerpc/common/common-non-hw.cfg          | 282 +++++++++++++++++
 .../linux-3.10/axxiapowerpc/common/common.scc      |   2 +
 .../linux-3.10/axxiapowerpc/common/non-testing.cfg |   9 +
 .../linux-3.10/axxiapowerpc/common/non-testing.scc |   1 +
 .../linux-3.10/axxiapowerpc/common/testing.cfg     |  27 ++
 .../linux-3.10/axxiapowerpc/common/testing.scc     |   1 +
 .../linux-3.10/axxiapowerpc/dbg-ppc/dbg-hw.cfg     |   5 -
 .../linux-3.10/axxiapowerpc/dbg-ppc/dbg-non-hw.cfg |  99 ------
 .../linux-3.10/axxiapowerpc/dbg-ppc/dbg.scc        |   2 -
 .../linux-3.10/axxiapowerpc/non-testing.cfg        |   9 -
 .../linux-3.10/axxiapowerpc/non-testing.scc        |   1 -
 .../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-hw.cfg      |  17 ++
 .../axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg  |  22 ++
 .../axxiapowerpc/preempt-rt/preempt-rt.scc         |   2 +
 .../linux-3.10/axxiapowerpc/standard/dbg-hw.cfg    |   5 +
 .../axxiapowerpc/standard/dbg-non-hw.cfg           |  52 ++++
 .../linux-3.10/axxiapowerpc/standard/dbg.scc       |   2 +
 .../linux-3.10/axxiapowerpc/testing.cfg            |  27 --
 .../linux-3.10/axxiapowerpc/testing.scc            |   2 -
 recipes-kernel/linux/linux-yocto-rt_3.10.inc       |   6 +-
 recipes-kernel/linux/linux-yocto_3.10.inc          |   6 +-
 82 files changed, 1318 insertions(+), 1207 deletions(-)
 delete mode 100644 recipes-kernel/linux/axxiaarm_3.10.inc
 create mode 100644 recipes-kernel/linux/axxiaarm_preempt-rt_3.10.inc
 create mode 100644 recipes-kernel/linux/axxiaarm_standard_3.10.inc
 delete mode 100644 recipes-kernel/linux/axxiapowerpc_3.10.inc
 create mode 100644 recipes-kernel/linux/axxiapowerpc_preempt-rt_3.10.inc
 create mode 100644 recipes-kernel/linux/axxiapowerpc_standard_3.10.inc
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-common-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-common-non-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-common.scc
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-preempt-rt-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-preempt-rt-non-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-preempt-rt.scc
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/big-endian/big-endian.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/big-endian/big-endian.scc
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/big-endian/smmon.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-non-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power-L2.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power-L2.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/low-power.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/low-power.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/testing.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/testing.scc
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/dbg-arm/dbg-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/dbg-arm/dbg-non-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/dbg-arm/dbg.scc
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-full-power-L2.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-full-power-L2.scc
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-full-power.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-full-power.scc
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-low-power.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-low-power.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-non-hw.cfg
 create 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/preempt-rt/preempt-rt-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt-non-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-non-hw.cfg
 create 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/smmon.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/testing.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/testing.scc
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-common-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-common-non-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-common.scc
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-preempt-rt-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-preempt-rt-non-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-preempt-rt.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-non-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/non-testing.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/non-testing.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/testing.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/testing.scc
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/dbg-ppc/dbg-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/dbg-ppc/dbg-non-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/dbg-ppc/dbg.scc
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/non-testing.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/non-testing.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-non-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-non-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg.scc
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/testing.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/testing.scc

diff --git a/recipes-kernel/linux/axxiaarm_3.10.inc b/recipes-kernel/linux/axxiaarm_3.10.inc
deleted file mode 100644
index c315e65..0000000
--- a/recipes-kernel/linux/axxiaarm_3.10.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/conf/linux-yocto/linux-3.10/${MACHINE}:\
-${THISDIR}/conf/linux-yocto/linux-3.10/${MACHINE}/big-endian:\
-${THISDIR}/conf/linux-yocto/linux-3.10/${MACHINE}/dbg-arm:"
-
-# adding fragments with kernel options to the final .config
-KERNEL_EXTRA_FEATURES = "features/taskstats/taskstats.scc"
-SRC_URI += "file://axxiaarm-common.scc \
-	${@base_conditional('LINUX_KERNEL_TYPE', 'preempt-rt', 'file://axxiaarm-preempt-rt.scc', '', d)} \
-	${@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://power-management-full-power.scc', '', d)} \
-	${@base_conditional('POWER_MANAGEMENT', 'full-power-L2', 'file://power-management-full-power-L2.scc', '', d)} \
-	${@base_conditional('POWER_MANAGEMENT', 'low-power', 'file://power-management-low-power.scc', '', d)} "
diff --git a/recipes-kernel/linux/axxiaarm_preempt-rt_3.10.inc b/recipes-kernel/linux/axxiaarm_preempt-rt_3.10.inc
new file mode 100644
index 0000000..4c33080
--- /dev/null
+++ b/recipes-kernel/linux/axxiaarm_preempt-rt_3.10.inc
@@ -0,0 +1,12 @@
+# 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
new file mode 100644
index 0000000..3a73963
--- /dev/null
+++ b/recipes-kernel/linux/axxiaarm_standard_3.10.inc
@@ -0,0 +1,11 @@
+# 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_3.10.inc b/recipes-kernel/linux/axxiapowerpc_3.10.inc
deleted file mode 100644
index dfaef20..0000000
--- a/recipes-kernel/linux/axxiapowerpc_3.10.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/conf/linux-yocto/linux-3.10/${MACHINE}:\
-${THISDIR}/conf/linux-yocto/linux-3.10/${MACHINE}/dbg-ppc:"
-
-# adding fragments with kernel options to the final .config
-KERNEL_EXTRA_FEATURES = ""
-SRC_URI += "file://axxiapowerpc-common.scc \
-	${@base_conditional('LINUX_KERNEL_TYPE', 'preempt-rt', 'file://axxiapowerpc-preempt-rt.scc', '', d)} \
-	${@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_preempt-rt_3.10.inc b/recipes-kernel/linux/axxiapowerpc_preempt-rt_3.10.inc
new file mode 100644
index 0000000..f0d4bb6
--- /dev/null
+++ b/recipes-kernel/linux/axxiapowerpc_preempt-rt_3.10.inc
@@ -0,0 +1,6 @@
+# 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
new file mode 100644
index 0000000..bbed950
--- /dev/null
+++ b/recipes-kernel/linux/axxiapowerpc_standard_3.10.inc
@@ -0,0 +1,5 @@
+# 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/axxiaarm-common-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-common-hw.cfg
deleted file mode 100644
index ffb056a..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-common-hw.cfg
+++ /dev/null
@@ -1,127 +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.
-#
-#.........................................................................
-
-#
-# Support for hot-pluggable CPUs
-#
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_SUSPEND is not set
-
-#
-# Distributed Switch Architecture drivers
-#
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
-# CONFIG_NET_VENDOR_AMD is not set
-# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_CADENCE is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_NET_VENDOR_CISCO is not set
-# CONFIG_NET_VENDOR_DEC is not set
-# CONFIG_NET_VENDOR_DLINK is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-# CONFIG_NET_VENDOR_EXAR is not set
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_HP is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_NET_PACKET_ENGINE is not set
-# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
-# CONFIG_NET_VENDOR_RDC is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUN is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-
-#
-# Userland interfaces
-#
-# CONFIG_INPUT_EVDEV is not set
-
-#
-# Input Device Drivers
-#
-# CONFIG_MOUSE_PS2_ALPS is not set
-# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
-# CONFIG_MOUSE_PS2_SYNAPTICS is not set
-# CONFIG_MOUSE_PS2_TRACKPOINT is not set
-
-#
-# Hardware I/O ports
-#
-# CONFIG_SERIO_SERPORT is not set
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_ARMCLCD=y
-
-#
-# Console display driver support
-#
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=y
-CONFIG_HID_APPLE=y
-CONFIG_HID_BELKIN=y
-CONFIG_HID_CHERRY=y
-CONFIG_HID_CHICONY=y
-CONFIG_HID_CYPRESS=y
-CONFIG_HID_DRAGONRISE=y
-CONFIG_HID_EZKEY=y
-CONFIG_HID_KYE=y
-CONFIG_HID_GYRATION=y
-CONFIG_HID_TWINHAN=y
-CONFIG_HID_KENSINGTON=y
-CONFIG_HID_LOGITECH=y
-CONFIG_HID_LOGITECH_DJ=y
-CONFIG_HID_MICROSOFT=y
-CONFIG_HID_MONTEREY=y
-CONFIG_HID_NTRIG=y
-CONFIG_HID_ORTEK=y
-CONFIG_HID_PANTHERLORD=y
-CONFIG_HID_PETALYNX=y
-CONFIG_HID_SAMSUNG=y
-CONFIG_HID_SONY=y
-CONFIG_HID_SUNPLUS=y
-CONFIG_HID_GREENASIA=y
-CONFIG_HID_SMARTJOYPLUS=y
-CONFIG_HID_TOPSEED=y
-CONFIG_HID_THRUSTMASTER=y
-CONFIG_HID_ZEROPLUS=y
-
-#
-# I2C HID support
-#
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-common-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-common-non-hw.cfg
deleted file mode 100644
index 9304fa9..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-common-non-hw.cfg
+++ /dev/null
@@ -1,332 +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.
-#
-#.........................................................................
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_AUDIT=y
-
-#
-# RCU Subsystem
-#
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CGROUP_DEBUG is not set
-# CONFIG_CGROUP_FREEZER is not set
-# CONFIG_CGROUP_DEVICE is not set
-# CONFIG_CPUSETS is not set
-# CONFIG_CGROUP_CPUACCT is not set
-# CONFIG_RESOURCE_COUNTERS is not set
-# CONFIG_RT_GROUP_SCHED is not set
-# CONFIG_BLK_CGROUP is not set
-# CONFIG_UTS_NS is not set
-# CONFIG_IPC_NS is not set
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-# CONFIG_NET_NS is not set
-
-# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
-CONFIG_SCHED_AUTOGROUP=y
-
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL_SYSCALL=y
-
-#
-# Kernel Performance Events And Counters
-#
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_OPROFILE is not set
-
-#
-# IO Schedulers
-#
-# CONFIG_IOSCHED_DEADLINE is not set
-
-#
-# Kernel Features
-#
-CONFIG_KSM=y
-
-#
-# Userspace binary formats
-#
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_BINFMT_MISC=y
-
-#
-# Networking options
-#
-CONFIG_XFRM_USER=y
-CONFIG_XFRM_MIGRATE=y
-CONFIG_XFRM_STATISTICS=y
-CONFIG_NET_KEY=y
-# CONFIG_NET_KEY_MIGRATE is not set
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_SYN_COOKIES is not set
-CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
-CONFIG_INET_XFRM_TUNNEL=y
-# CONFIG_INET_LRO is not set
-
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_IPV6_TUNNEL is not set
-
-# CONFIG_NETFILTER is not set
-
-# CONFIG_IP_SCTP is not set
-# CONFIG_TIPC is not set
-
-CONFIG_STP=y
-CONFIG_BRIDGE=y
-
-CONFIG_VLAN_8021Q=y
-CONFIG_LLC=y
-
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_RFKILL is not set
-
-
-#
-# Device Tree and Open Firmware support
-#
-# CONFIG_BLK_DEV_CRYPTOLOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_PLATFORM=y
-CONFIG_PATA_OF_PLATFORM=y
-
-#
-# Generic fallback / legacy drivers
-#
-# CONFIG_MD is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_BONDING is not set
-# CONFIG_DUMMY is not set
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-CONFIG_TUN=y
-CONFIG_VETH=y
-
-#
-# MII PHY device drivers
-#
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-
-#
-# Watchdog Device Drivers
-#
-# CONFIG_SOFT_WATCHDOG is not set
-
-#
-# Graphics support
-#
-CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-
-#
-# Console display driver support
-#
-CONFIG_FRAMEBUFFER_CONSOLE=y
-
-#
-# DMA Clients
-#
-CONFIG_VIRT_DRIVERS=y
-
-#
-# Virtio drivers
-#
-# CONFIG_VIRTIO_BALLOON is not set
-
-#
-# Common Clock Framework
-#
-CONFIG_COMMON_CLK_DEBUG=y
-
-#
-# File systems
-#
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
-# CONFIG_EXT4_FS_POSIX_ACL is not set
-# CONFIG_EXT4_FS_SECURITY is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_BTRFS_FS is not set
-# CONFIG_FS_POSIX_ACL is not set
-CONFIG_FUSE_FS=y
-CONFIG_CUSE=y
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=y
-CONFIG_UDF_FS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_NTFS_FS=y
-
-#
-# Pseudo filesystems
-#
-# CONFIG_CONFIGFS_FS is not set
-CONFIG_JFFS2_FS=y
-CONFIG_CRAMFS=y
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_AUFS_FS is not set
-CONFIG_NFS_FSCACHE=y
-CONFIG_NFS_DEBUG=y
-CONFIG_SUNRPC_DEBUG=y
-# CONFIG_CIFS is not set
-CONFIG_NLS_CODEPAGE_437=y
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
-
-#
-# Kernel hacking
-#
-# CONFIG_SCHED_DEBUG is not set
-# CONFIG_TIMER_STATS is not set
-
-#
-# RCU Debugging
-#
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_FTRACE is not set
-# CONFIG_KGDB is not set
-CONFIG_DEBUG_USER=y
-
-#
-# Security options
-#
-# CONFIG_SECURITY is not set
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_RNG=y
-CONFIG_CRYPTO_GF128MUL=y
-CONFIG_CRYPTO_NULL=y
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_GCM=y
-CONFIG_CRYPTO_SEQIV=y
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CTR=y
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_XCBC=y
-
-#
-# Digest
-#
-CONFIG_CRYPTO_GHASH=y
-# CONFIG_CRYPTO_MD4 is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-CONFIG_CRYPTO_SHA256=y
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_WP512 is not set
-
-#
-# Ciphers
-#
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-
-#
-# 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/axxiaarm-common.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-common.scc
deleted file mode 100644
index a08a6b2..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-common.scc
+++ /dev/null
@@ -1,2 +0,0 @@
-kconf non-hardware axxiaarm-common-non-hw.cfg
-kconf hardware axxiaarm-common-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-preempt-rt-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-preempt-rt-hw.cfg
deleted file mode 100644
index 24b12d8..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-preempt-rt-hw.cfg
+++ /dev/null
@@ -1,17 +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.
-#
-#.........................................................................
-
-#
-# Distributed Switch Architecture drivers
-#
-# CONFIG_IGB_HWMON is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-preempt-rt-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-preempt-rt-non-hw.cfg
deleted file mode 100644
index 4e080c5..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-preempt-rt-non-hw.cfg
+++ /dev/null
@@ -1,18 +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
-CONFIG_RELAY=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-preempt-rt.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-preempt-rt.scc
deleted file mode 100644
index 4bd3c7c..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/axxiaarm-preempt-rt.scc
+++ /dev/null
@@ -1,2 +0,0 @@
-kconf non-hardware axxiaarm-preempt-rt-non-hw.cfg
-kconf hardware axxiaarm-preempt-rt-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/big-endian/big-endian.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/big-endian/big-endian.cfg
deleted file mode 100644
index 4c207e3..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/big-endian/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/big-endian/big-endian.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/big-endian/big-endian.scc
deleted file mode 100644
index 0271465..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/big-endian/big-endian.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-kconf non-hardware big-endian.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/big-endian/smmon.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/big-endian/smmon.cfg
deleted file mode 100644
index 77b89b6..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/big-endian/smmon.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_LSI_SMMON=y
-# CONFIG_EDAC is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-hw.cfg
new file mode 100644
index 0000000..ffb056a
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-hw.cfg
@@ -0,0 +1,127 @@
+#.........................................................................
+#                                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.
+#
+#.........................................................................
+
+#
+# Support for hot-pluggable CPUs
+#
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_SUSPEND is not set
+
+#
+# Distributed Switch Architecture drivers
+#
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_VENDOR_ADAPTEC is not set
+# CONFIG_NET_VENDOR_ALTEON is not set
+# CONFIG_NET_VENDOR_AMD is not set
+# CONFIG_NET_VENDOR_ATHEROS is not set
+# CONFIG_NET_CADENCE is not set
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_CISCO is not set
+# CONFIG_NET_VENDOR_DEC is not set
+# CONFIG_NET_VENDOR_DLINK is not set
+# CONFIG_NET_VENDOR_EMULEX is not set
+# CONFIG_NET_VENDOR_EXAR is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_HP is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MELLANOX is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MYRI is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_NVIDIA is not set
+# CONFIG_NET_VENDOR_OKI is not set
+# CONFIG_NET_PACKET_ENGINE is not set
+# CONFIG_NET_VENDOR_QLOGIC is not set
+# CONFIG_NET_VENDOR_REALTEK is not set
+# CONFIG_NET_VENDOR_RDC is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SILAN is not set
+# CONFIG_NET_VENDOR_SIS is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
+# CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_TEHUTI is not set
+# CONFIG_NET_VENDOR_TI is not set
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_EVDEV is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_MOUSE_PS2_ALPS is not set
+# CONFIG_MOUSE_PS2_LOGIPS2PP is not set
+# CONFIG_MOUSE_PS2_SYNAPTICS is not set
+# CONFIG_MOUSE_PS2_TRACKPOINT is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO_SERPORT is not set
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_ARMCLCD=y
+
+#
+# Console display driver support
+#
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=y
+CONFIG_HID_APPLE=y
+CONFIG_HID_BELKIN=y
+CONFIG_HID_CHERRY=y
+CONFIG_HID_CHICONY=y
+CONFIG_HID_CYPRESS=y
+CONFIG_HID_DRAGONRISE=y
+CONFIG_HID_EZKEY=y
+CONFIG_HID_KYE=y
+CONFIG_HID_GYRATION=y
+CONFIG_HID_TWINHAN=y
+CONFIG_HID_KENSINGTON=y
+CONFIG_HID_LOGITECH=y
+CONFIG_HID_LOGITECH_DJ=y
+CONFIG_HID_MICROSOFT=y
+CONFIG_HID_MONTEREY=y
+CONFIG_HID_NTRIG=y
+CONFIG_HID_ORTEK=y
+CONFIG_HID_PANTHERLORD=y
+CONFIG_HID_PETALYNX=y
+CONFIG_HID_SAMSUNG=y
+CONFIG_HID_SONY=y
+CONFIG_HID_SUNPLUS=y
+CONFIG_HID_GREENASIA=y
+CONFIG_HID_SMARTJOYPLUS=y
+CONFIG_HID_TOPSEED=y
+CONFIG_HID_THRUSTMASTER=y
+CONFIG_HID_ZEROPLUS=y
+
+#
+# I2C HID support
+#
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
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
new file mode 100644
index 0000000..9304fa9
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-non-hw.cfg
@@ -0,0 +1,332 @@
+#.........................................................................
+#                                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.
+#
+#.........................................................................
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_AUDIT=y
+
+#
+# RCU Subsystem
+#
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUP_DEBUG is not set
+# CONFIG_CGROUP_FREEZER is not set
+# CONFIG_CGROUP_DEVICE is not set
+# CONFIG_CPUSETS is not set
+# CONFIG_CGROUP_CPUACCT is not set
+# CONFIG_RESOURCE_COUNTERS is not set
+# CONFIG_RT_GROUP_SCHED is not set
+# CONFIG_BLK_CGROUP is not set
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_NET_NS is not set
+
+# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
+CONFIG_SCHED_AUTOGROUP=y
+
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL_SYSCALL=y
+
+#
+# Kernel Performance Events And Counters
+#
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_OPROFILE is not set
+
+#
+# IO Schedulers
+#
+# CONFIG_IOSCHED_DEADLINE is not set
+
+#
+# Kernel Features
+#
+CONFIG_KSM=y
+
+#
+# Userspace binary formats
+#
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_BINFMT_MISC=y
+
+#
+# Networking options
+#
+CONFIG_XFRM_USER=y
+CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_SYN_COOKIES is not set
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_INET_XFRM_TUNNEL=y
+# CONFIG_INET_LRO is not set
+
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_IPV6_TUNNEL is not set
+
+# CONFIG_NETFILTER is not set
+
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+
+CONFIG_STP=y
+CONFIG_BRIDGE=y
+
+CONFIG_VLAN_8021Q=y
+CONFIG_LLC=y
+
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_RFKILL is not set
+
+
+#
+# Device Tree and Open Firmware support
+#
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_PLATFORM=y
+CONFIG_PATA_OF_PLATFORM=y
+
+#
+# Generic fallback / legacy drivers
+#
+# CONFIG_MD is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_BONDING is not set
+# CONFIG_DUMMY is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+CONFIG_TUN=y
+CONFIG_VETH=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+
+#
+# Console display driver support
+#
+CONFIG_FRAMEBUFFER_CONSOLE=y
+
+#
+# DMA Clients
+#
+CONFIG_VIRT_DRIVERS=y
+
+#
+# Virtio drivers
+#
+# CONFIG_VIRTIO_BALLOON is not set
+
+#
+# Common Clock Framework
+#
+CONFIG_COMMON_CLK_DEBUG=y
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4_FS_POSIX_ACL is not set
+# CONFIG_EXT4_FS_SECURITY is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_BTRFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+CONFIG_FUSE_FS=y
+CONFIG_CUSE=y
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_UDF_FS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_NTFS_FS=y
+
+#
+# Pseudo filesystems
+#
+# CONFIG_CONFIGFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_CRAMFS=y
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_AUFS_FS is not set
+CONFIG_NFS_FSCACHE=y
+CONFIG_NFS_DEBUG=y
+CONFIG_SUNRPC_DEBUG=y
+# CONFIG_CIFS is not set
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_TIMER_STATS is not set
+
+#
+# RCU Debugging
+#
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_FTRACE is not set
+# CONFIG_KGDB is not set
+CONFIG_DEBUG_USER=y
+
+#
+# Security options
+#
+# CONFIG_SECURITY is not set
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_SEQIV=y
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CTR=y
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_XCBC=y
+
+#
+# Digest
+#
+CONFIG_CRYPTO_GHASH=y
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_SHA256=y
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# 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
new file mode 100644
index 0000000..84a7420
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common.scc
@@ -0,0 +1,2 @@
+kconf non-hardware common-non-hw.cfg
+kconf hardware common-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
new file mode 100644
index 0000000..19b5cf4
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power-L2.cfg
@@ -0,0 +1,3 @@
+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-L2.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power-L2.scc
new file mode 100644
index 0000000..7a98204
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power-L2.scc
@@ -0,0 +1 @@
+kconf hardware full-power-L2.cfg
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
new file mode 100644
index 0000000..99025a2
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power.cfg
@@ -0,0 +1,3 @@
+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/full-power.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power.scc
new file mode 100644
index 0000000..33e7f6c
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power.scc
@@ -0,0 +1 @@
+kconf hardware full-power.cfg
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
new file mode 100644
index 0000000..5d3431b
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/low-power.cfg
@@ -0,0 +1,2 @@
+# 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/low-power.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/low-power.scc
new file mode 100644
index 0000000..67889e2
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/low-power.scc
@@ -0,0 +1 @@
+kconf hardware low-power.cfg
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
new file mode 100644
index 0000000..93e2e30
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/testing.cfg
@@ -0,0 +1,27 @@
+CONFIG_PROC_FS=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=y
+
+CONFIG_E1000=y
+CONFIG_E1000E=y
+
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_EVENTS=y
+
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_TICK_ONESHOT=y
+CONFIG_SCHED_HRTICK=y
+# CONFIG_MISSED_TIMER_OFFSETS_HIST is not set
+
+CONFIG_PROFILING=y
+
+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/common/testing.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/testing.scc
new file mode 100644
index 0000000..09a1069
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/testing.scc
@@ -0,0 +1 @@
+kconf non-hardware testing.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/dbg-arm/dbg-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/dbg-arm/dbg-hw.cfg
deleted file mode 100644
index de5be4a..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/dbg-arm/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/dbg-arm/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/dbg-arm/dbg-non-hw.cfg
deleted file mode 100644
index f5b4c1f..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/dbg-arm/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/dbg-arm/dbg.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/dbg-arm/dbg.scc
deleted file mode 100644
index b5cd0eb..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/dbg-arm/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/power-management-full-power-L2.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-full-power-L2.cfg
deleted file mode 100644
index 19b5cf4..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-full-power-L2.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-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/power-management-full-power-L2.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-full-power-L2.scc
deleted file mode 100644
index 3d7195f..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-full-power-L2.scc
+++ /dev/null
@@ -1 +0,0 @@
-kconf hardware power-management-full-power-L2.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-full-power.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-full-power.cfg
deleted file mode 100644
index 99025a2..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-full-power.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-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/power-management-full-power.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-full-power.scc
deleted file mode 100644
index 29275e3..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-full-power.scc
+++ /dev/null
@@ -1 +0,0 @@
-kconf hardware power-management-full-power.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-low-power.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-low-power.cfg
deleted file mode 100644
index 5d3431b..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-low-power.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-# 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/power-management-low-power.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-low-power.scc
deleted file mode 100644
index 3bf5224..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/power-management-low-power.scc
+++ /dev/null
@@ -1 +0,0 @@
-kconf hardware power-management-low-power.cfg
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
new file mode 100644
index 0000000..c5cdc99
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.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.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.scc
new file mode 100644
index 0000000..58521ec
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.scc
@@ -0,0 +1 @@
+kconf non-hardware big-endian.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
new file mode 100644
index 0000000..de5be4a
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-hw.cfg
@@ -0,0 +1,5 @@
+#
+# 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
new file mode 100644
index 0000000..d15c658
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-non-hw.cfg
@@ -0,0 +1,67 @@
+#
+# 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
new file mode 100644
index 0000000..b5cd0eb
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg.scc
@@ -0,0 +1,2 @@
+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-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt-hw.cfg
new file mode 100644
index 0000000..24b12d8
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt-hw.cfg
@@ -0,0 +1,17 @@
+#.........................................................................
+#                                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.
+#
+#.........................................................................
+
+#
+# Distributed Switch Architecture drivers
+#
+# CONFIG_IGB_HWMON is not set
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
new file mode 100644
index 0000000..4e080c5
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt-non-hw.cfg
@@ -0,0 +1,18 @@
+#.........................................................................
+#                                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
+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
new file mode 100644
index 0000000..ab1dcde
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt.scc
@@ -0,0 +1,2 @@
+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/axxiaarm/standard/big-endian.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.cfg
new file mode 100644
index 0000000..4c207e3
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.cfg
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..0271465
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.scc
@@ -0,0 +1,4 @@
+kconf non-hardware big-endian.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
new file mode 100644
index 0000000..de5be4a
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-hw.cfg
@@ -0,0 +1,5 @@
+#
+# 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
new file mode 100644
index 0000000..f5b4c1f
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-non-hw.cfg
@@ -0,0 +1,83 @@
+#
+# 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
new file mode 100644
index 0000000..b5cd0eb
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg.scc
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000..77b89b6
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/smmon.cfg
@@ -0,0 +1,2 @@
+CONFIG_LSI_SMMON=y
+# CONFIG_EDAC is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/testing.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/testing.cfg
deleted file mode 100644
index 93e2e30..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/testing.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-CONFIG_PROC_FS=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=y
-
-CONFIG_E1000=y
-CONFIG_E1000E=y
-
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_PERF_EVENTS=y
-
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_TICK_ONESHOT=y
-CONFIG_SCHED_HRTICK=y
-# CONFIG_MISSED_TIMER_OFFSETS_HIST is not set
-
-CONFIG_PROFILING=y
-
-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/testing.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/testing.scc
deleted file mode 100644
index 09a1069..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/testing.scc
+++ /dev/null
@@ -1 +0,0 @@
-kconf non-hardware testing.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-common-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-common-hw.cfg
deleted file mode 100644
index e21987b..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-common-hw.cfg
+++ /dev/null
@@ -1,72 +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.
-#
-#.........................................................................
-
-#
-# Platform support
-#
-# CONFIG_EBONY is not set
-#
-# Kernel options
-#
-# CONFIG_COMPACTION is not set
-
-#
-# Bus options
-#
-# CONFIG_PCIEAER is not set
-CONFIG_PCI_DEBUG=y
-
-#
-# Distributed Switch Architecture drivers
-#
-# CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NET_VENDOR_ADAPTEC=y
-CONFIG_NET_VENDOR_ALTEON=y
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_NET_CADENCE=y
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_NET_VENDOR_CISCO=y
-CONFIG_NET_VENDOR_DEC=y
-CONFIG_NET_VENDOR_DLINK=y
-CONFIG_NET_VENDOR_EMULEX=y
-CONFIG_NET_VENDOR_EXAR=y
-CONFIG_NET_VENDOR_HP=y
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_NET_VENDOR_MELLANOX=y
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_NET_VENDOR_MYRI=y
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NET_VENDOR_8390=y
-CONFIG_NET_VENDOR_NVIDIA=y
-CONFIG_NET_VENDOR_OKI=y
-CONFIG_NET_PACKET_ENGINE=y
-CONFIG_NET_VENDOR_QLOGIC=y
-CONFIG_NET_VENDOR_REALTEK=y
-CONFIG_NET_VENDOR_RDC=y
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_NET_VENDOR_SUN=y
-CONFIG_NET_VENDOR_TEHUTI=y
-CONFIG_NET_VENDOR_TI=y
-CONFIG_NET_VENDOR_VIA=y
-CONFIG_NET_VENDOR_WIZNET=y
-
-#
-# I2C HID support
-#
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-common-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-common-non-hw.cfg
deleted file mode 100644
index 2d0ba14..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-common-non-hw.cfg
+++ /dev/null
@@ -1,282 +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.
-#
-#.........................................................................
-
-#
-# General setup
-#
-CONFIG_CROSS_COMPILE="powerpc-linux-"
-CONFIG_LOCALVERSION_AUTO=y
-# CONFIG_FHANDLE is not set
-
-#
-# RCU Subsystem
-#
-CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CGROUPS is not set
-# CONFIG_NAMESPACES is not set
-CONFIG_KALLSYMS_ALL=y
-# CONFIG_RELAY is not set
-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
-
-#
-# GCOV-based kernel profiling
-#
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_MODVERSIONS=y
-CONFIG_MODULE_SRCVERSION_ALL=y
-# CONFIG_LBDAF is not set
-# CONFIG_BLK_DEV_BSG is not set
-
-#
-# Userspace binary formats
-#
-# CONFIG_BINFMT_MISC is not set
-
-#
-# Networking options
-#
-# CONFIG_XFRM_USER is not set
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-
-CONFIG_XFRM_IPCOMP=y
-CONFIG_NET_KEY=y
-# CONFIG_NET_KEY_MIGRATE is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-
-CONFIG_NET_IPIP=y
-# CONFIG_IP_MROUTE is not set
-
-CONFIG_INET_AH=y
-CONFIG_INET_ESP=y
-CONFIG_INET_IPCOMP=y
-CONFIG_INET_XFRM_TUNNEL=y
-# CONFIG_INET_LRO is not set
-
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_INET6_AH is not set
-# CONFIG_INET6_ESP is not set
-# CONFIG_INET6_IPCOMP is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_IPV6_TUNNEL is not set
-CONFIG_NETWORK_SECMARK=y
-
-CONFIG_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-# CONFIG_NETFILTER_XTABLES is not set
-
-#
-# IP: Netfilter Configuration
-#
-# CONFIG_IP_NF_IPTABLES is not set
-# CONFIG_IP_NF_ARPTABLES is not set
-
-#
-# IPv6: Netfilter Configuration
-#
-# CONFIG_IP6_NF_IPTABLES is not set
-# CONFIG_IP_SCTP is not set
-# CONFIG_TIPC is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_NET_SCHED is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_RFKILL is not set
-
-#
-# Device Tree and Open Firmware support
-#
-# CONFIG_BLK_DEV_LOOP is not set
-# CONFIG_BLK_DEV_NBD is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-# CONFIG_BONDING is not set
-CONFIG_DUMMY=y
-# CONFIG_NETCONSOLE is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-CONFIG_TUN=y
-
-#
-# MII PHY device drivers
-#
-# CONFIG_PPP is not set
-# CONFIG_SLIP is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_THERMAL=y
-# CONFIG_WATCHDOG is not set
-
-#
-# Graphics support
-#
-# CONFIG_VGA_ARB is not set
-
-#
-# File systems
-#
-# CONFIG_EXT2_FS_XATTR is not set
-# CONFIG_EXT3_FS is not set
-# CONFIG_EXT4_FS is not set
-# CONFIG_REISERFS_FS is not set
-# CONFIG_BTRFS_FS is not set
-
-# CONFIG_DNOTIFY is not set
-# CONFIG_FUSE_FS is not set
-
-#
-# DOS/FAT/NT Filesystems
-#
-# CONFIG_MSDOS_FS is not set
-# CONFIG_VFAT_FS is not set
-
-#
-# Pseudo filesystems
-#
-# CONFIG_PROC_KCORE is not set
-# CONFIG_CONFIGFS_FS is not set
-CONFIG_JFFS2_FS=y
-# CONFIG_MINIX_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_AUFS_FS is not set
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_ACL_SUPPORT=y
-# CONFIG_CIFS is not set
-# CONFIG_NLS_CODEPAGE_437 is not set
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-# CONFIG_NLS_ISO8859_1 is not set
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# 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
-# CONFIG_UPROBE_EVENT is not set
-# CONFIG_PROBE_EVENTS is not set
-# CONFIG_KGDB is not set
-
-#
-# Security options
-#
-# CONFIG_SECURITY is not set
-
-#
-# Crypto core or helper
-#
-# CONFIG_CRYPTO_TEST is not set
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_GCM=y
-
-#
-# Hash modes
-#
-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
-# CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_WP512 is not set
-
-#
-# Ciphers
-#
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_ARC4 is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_CAST5 is not set
-# CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_SERPENT is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-
-#
-# Random Number Generation
-#
-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/axxiapowerpc-common.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-common.scc
deleted file mode 100644
index 4370e44..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-common.scc
+++ /dev/null
@@ -1,2 +0,0 @@
-kconf non-hardware axxiapowerpc-common-non-hw.cfg
-kconf hardware axxiapowerpc-common-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-preempt-rt-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-preempt-rt-hw.cfg
deleted file mode 100644
index 85ae8a6..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-preempt-rt-hw.cfg
+++ /dev/null
@@ -1,17 +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.
-#
-#.........................................................................
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_NAND_EP501X_UBOOTENV=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-preempt-rt-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-preempt-rt-non-hw.cfg
deleted file mode 100644
index 7bbd1bf..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-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/axxiapowerpc-preempt-rt.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-preempt-rt.scc
deleted file mode 100644
index b90ecfa..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/axxiapowerpc-preempt-rt.scc
+++ /dev/null
@@ -1,2 +0,0 @@
-kconf non-hardware axxiapowerpc-preempt-rt-non-hw.cfg
-kconf hardware axxiapowerpc-preempt-rt-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
new file mode 100644
index 0000000..e21987b
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-hw.cfg
@@ -0,0 +1,72 @@
+#.........................................................................
+#                                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.
+#
+#.........................................................................
+
+#
+# Platform support
+#
+# CONFIG_EBONY is not set
+#
+# Kernel options
+#
+# CONFIG_COMPACTION is not set
+
+#
+# Bus options
+#
+# CONFIG_PCIEAER is not set
+CONFIG_PCI_DEBUG=y
+
+#
+# Distributed Switch Architecture drivers
+#
+# CONFIG_NET_VENDOR_3COM is not set
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_NET_CADENCE=y
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_NET_VENDOR_EXAR=y
+CONFIG_NET_VENDOR_HP=y
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NET_VENDOR_8390=y
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_NET_PACKET_ENGINE=y
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_NET_VENDOR_TI=y
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_NET_VENDOR_WIZNET=y
+
+#
+# I2C HID support
+#
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
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
new file mode 100644
index 0000000..2d0ba14
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-non-hw.cfg
@@ -0,0 +1,282 @@
+#.........................................................................
+#                                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.
+#
+#.........................................................................
+
+#
+# General setup
+#
+CONFIG_CROSS_COMPILE="powerpc-linux-"
+CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_FHANDLE is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_KALLSYMS_ALL=y
+# CONFIG_RELAY is not set
+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
+
+#
+# GCOV-based kernel profiling
+#
+CONFIG_MODULE_FORCE_LOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_LBDAF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# Userspace binary formats
+#
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Networking options
+#
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+
+CONFIG_XFRM_IPCOMP=y
+CONFIG_NET_KEY=y
+# CONFIG_NET_KEY_MIGRATE is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+
+CONFIG_NET_IPIP=y
+# CONFIG_IP_MROUTE is not set
+
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_INET_XFRM_TUNNEL=y
+# CONFIG_INET_LRO is not set
+
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_IPV6_TUNNEL is not set
+CONFIG_NETWORK_SECMARK=y
+
+CONFIG_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_XTABLES is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_IP6_NF_IPTABLES is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_RFKILL is not set
+
+#
+# Device Tree and Open Firmware support
+#
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_BONDING is not set
+CONFIG_DUMMY=y
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+CONFIG_TUN=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_THERMAL=y
+# CONFIG_WATCHDOG is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGA_ARB is not set
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_BTRFS_FS is not set
+
+# CONFIG_DNOTIFY is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+
+#
+# Pseudo filesystems
+#
+# CONFIG_PROC_KCORE is not set
+# CONFIG_CONFIGFS_FS is not set
+CONFIG_JFFS2_FS=y
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_AUFS_FS is not set
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_ACL_SUPPORT=y
+# CONFIG_CIFS is not set
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# 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
+# CONFIG_UPROBE_EVENT is not set
+# CONFIG_PROBE_EVENTS is not set
+# CONFIG_KGDB is not set
+
+#
+# Security options
+#
+# CONFIG_SECURITY is not set
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_GCM=y
+
+#
+# Hash modes
+#
+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
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Random Number Generation
+#
+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
new file mode 100644
index 0000000..84a7420
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common.scc
@@ -0,0 +1,2 @@
+kconf non-hardware common-non-hw.cfg
+kconf hardware common-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
new file mode 100644
index 0000000..ef58b5f
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/non-testing.cfg
@@ -0,0 +1,9 @@
+#
+# Timers subsystem
+#
+# CONFIG_HIGH_RES_TIMERS is not set
+
+#
+# RCU Subsystem
+#
+# CONFIG_IKCONFIG is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/non-testing.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/non-testing.scc
new file mode 100644
index 0000000..9273e5b
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/non-testing.scc
@@ -0,0 +1 @@
+kconf non-hardware non-testing.cfg
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
new file mode 100644
index 0000000..93e2e30
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/testing.cfg
@@ -0,0 +1,27 @@
+CONFIG_PROC_FS=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=y
+
+CONFIG_E1000=y
+CONFIG_E1000E=y
+
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PERF_EVENTS=y
+
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_TICK_ONESHOT=y
+CONFIG_SCHED_HRTICK=y
+# CONFIG_MISSED_TIMER_OFFSETS_HIST is not set
+
+CONFIG_PROFILING=y
+
+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/axxiapowerpc/common/testing.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/testing.scc
new file mode 100644
index 0000000..09a1069
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/testing.scc
@@ -0,0 +1 @@
+kconf non-hardware testing.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/dbg-ppc/dbg-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/dbg-ppc/dbg-hw.cfg
deleted file mode 100644
index de5be4a..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/dbg-ppc/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/dbg-ppc/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/dbg-ppc/dbg-non-hw.cfg
deleted file mode 100644
index 505a9be..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/dbg-ppc/dbg-non-hw.cfg
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU_TRACE=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_RELAY=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
-
-CONFIG_DEBUG_LOCKDEP=y
-
-#
-# RCU Debugging
-#
-CONFIG_PROVE_RCU=y
-CONFIG_PROVE_RCU_DELAY=y
-CONFIG_LATENCYTOP=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_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
-CONFIG_INTERRUPT_OFF_HIST=y
-CONFIG_PREEMPT_TRACER=y
-CONFIG_PREEMPT_OFF_HIST=y
-CONFIG_WAKEUP_LATENCY_HIST=y
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_UPROBE_EVENT=y
-CONFIG_PROBE_EVENTS=y
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DMA_API_DEBUG=y
-CONFIG_DEBUG_STACKOVERFLOW=y
-
-#
-# Random Number Generation
-#
-CONFIG_BINARY_PRINTF=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/dbg-ppc/dbg.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/dbg-ppc/dbg.scc
deleted file mode 100644
index b5cd0eb..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/dbg-ppc/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/non-testing.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/non-testing.cfg
deleted file mode 100644
index ef58b5f..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/non-testing.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Timers subsystem
-#
-# CONFIG_HIGH_RES_TIMERS is not set
-
-#
-# RCU Subsystem
-#
-# CONFIG_IKCONFIG is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/non-testing.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/non-testing.scc
deleted file mode 100644
index 9273e5b..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/non-testing.scc
+++ /dev/null
@@ -1 +0,0 @@
-kconf non-hardware non-testing.cfg
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
new file mode 100644
index 0000000..de5be4a
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-hw.cfg
@@ -0,0 +1,5 @@
+#
+# 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
new file mode 100644
index 0000000..c83622b
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-non-hw.cfg
@@ -0,0 +1,63 @@
+#
+# 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
new file mode 100644
index 0000000..b5cd0eb
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg.scc
@@ -0,0 +1,2 @@
+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-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt-hw.cfg
new file mode 100644
index 0000000..85ae8a6
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt-hw.cfg
@@ -0,0 +1,17 @@
+#.........................................................................
+#                                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.
+#
+#.........................................................................
+
+#
+# Disk-On-Chip Device Drivers
+#
+CONFIG_MTD_NAND_EP501X_UBOOTENV=y
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
new file mode 100644
index 0000000..7bbd1bf
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt-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.
+#
+#.........................................................................
+
+#
+# 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
new file mode 100644
index 0000000..ab1dcde
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt.scc
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000..de5be4a
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-hw.cfg
@@ -0,0 +1,5 @@
+#
+# 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
new file mode 100644
index 0000000..db1afba
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-non-hw.cfg
@@ -0,0 +1,52 @@
+#
+# 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
new file mode 100644
index 0000000..b5cd0eb
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg.scc
@@ -0,0 +1,2 @@
+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/testing.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/testing.cfg
deleted file mode 100644
index 93e2e30..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/testing.cfg
+++ /dev/null
@@ -1,27 +0,0 @@
-CONFIG_PROC_FS=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
-CONFIG_BLK_DEV_CRYPTOLOOP=y
-
-CONFIG_E1000=y
-CONFIG_E1000E=y
-
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_PERF_EVENTS=y
-
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_TICK_ONESHOT=y
-CONFIG_SCHED_HRTICK=y
-# CONFIG_MISSED_TIMER_OFFSETS_HIST is not set
-
-CONFIG_PROFILING=y
-
-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/axxiapowerpc/testing.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/testing.scc
deleted file mode 100644
index 4c1aaa7..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/testing.scc
+++ /dev/null
@@ -1,2 +0,0 @@
-kconf non-hardware testing.cfg
-kconf hardware testing-hw.cfg
diff --git a/recipes-kernel/linux/linux-yocto-rt_3.10.inc b/recipes-kernel/linux/linux-yocto-rt_3.10.inc
index 0a6a430..d7595a3 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.10.inc
+++ b/recipes-kernel/linux/linux-yocto-rt_3.10.inc
@@ -1,3 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/common:\
+${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
 
 require linux-yocto.inc
 
@@ -8,9 +10,9 @@ KMETA = "meta"
 KREPO = "git://git.yoctoproject.org/linux-yocto-3.10.git"
 
 SRCREV_machine = "7511f4d2ce8049fcce67a76cb2cdc04edf4d8b72"
-SRCREV_meta = "1b6394b7047e4b614e14145987463cb030dc81f9"
+SRCREV_meta = "1e670aaa446b3d6a72eb527bf9b8af04bc5a96ef"
 
 SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 SRC_URI += "file://fit"
 
-require ${MACHINE}_3.10.inc
+require ${MACHINE}_${LINUX_KERNEL_TYPE}_${KV}.inc
diff --git a/recipes-kernel/linux/linux-yocto_3.10.inc b/recipes-kernel/linux/linux-yocto_3.10.inc
index 29a8aa3..1b74b86 100644
--- a/recipes-kernel/linux/linux-yocto_3.10.inc
+++ b/recipes-kernel/linux/linux-yocto_3.10.inc
@@ -1,3 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/common:\
+${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
 
 require linux-yocto.inc
 
@@ -8,9 +10,9 @@ KMETA = "meta"
 KREPO = "git://git.yoctoproject.org/linux-yocto-3.10.git"
 
 SRCREV_machine = "87c1d0a694a7670b54e6e0e72e2f3614509ad333"
-SRCREV_meta = "1b6394b7047e4b614e14145987463cb030dc81f9"
+SRCREV_meta = "1e670aaa446b3d6a72eb527bf9b8af04bc5a96ef"
 
 SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 SRC_URI += "file://fit"
 
-require ${MACHINE}_3.10.inc
+require ${MACHINE}_${LINUX_KERNEL_TYPE}_${KV}.inc
-- 
1.9.1



More information about the meta-lsi mailing list