[meta-lsi] [PATCH 12/24] linux-yocto-3.10: Update and reorganize recipes

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


Redesign and update recipes to match lastest 3.10 recipes
from dora branch:

commit d00c0149fe3201efc617e3e55d518385a0df4038
linux-yocto-3.10: move config features back to meta branch

Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
---
 recipes-kernel/linux/axxiaarm_preempt-rt_3.10.inc  |  12 --
 recipes-kernel/linux/axxiaarm_standard_3.10.inc    |  11 --
 .../linux/axxiapowerpc_preempt-rt_3.10.inc         |   6 -
 .../linux/axxiapowerpc_standard_3.10.inc           |   5 -
 .../linux-3.10/axxiaarm/common/common-non-hw.cfg   |   8 +-
 .../linux-3.10/axxiaarm/common/common.scc          |   4 +-
 .../linux-3.10/axxiaarm/common/dbg-non-hw.cfg      |  57 ++++++++
 .../linux-yocto/linux-3.10/axxiaarm/common/dbg.scc |   1 +
 .../linux-3.10/axxiaarm/common/full-power-L2.cfg   |  13 ++
 .../linux-3.10/axxiaarm/common/full-power.cfg      |  13 ++
 .../linux-3.10/axxiaarm/common/low-power.cfg       |  13 ++
 .../linux-3.10/axxiaarm/common/no-smp-hw.cfg       |   1 +
 .../linux-3.10/axxiaarm/common/no-smp.scc          |   1 +
 .../linux-3.10/axxiaarm/common/smp-hw.cfg          |   1 +
 .../linux-yocto/linux-3.10/axxiaarm/common/smp.scc |   1 +
 .../linux-3.10/axxiaarm/common/testing.cfg         |  14 +-
 .../axxiaarm/preempt-rt/big-endian-hw.cfg          |   1 +
 .../linux-3.10/axxiaarm/preempt-rt/big-endian.cfg  |   1 -
 .../linux-3.10/axxiaarm/preempt-rt/big-endian.scc  |   2 +-
 .../linux-3.10/axxiaarm/preempt-rt/dbg-hw.cfg      |   5 -
 .../linux-3.10/axxiaarm/preempt-rt/dbg-non-hw.cfg  |  67 ---------
 .../linux-3.10/axxiaarm/preempt-rt/dbg.scc         |   2 -
 .../axxiaarm/preempt-rt/preempt-rt-non-hw.cfg      |   1 -
 .../linux-3.10/axxiaarm/preempt-rt/preempt-rt.scc  |   2 +-
 .../linux-3.10/axxiaarm/standard/big-endian-hw.cfg |  16 +++
 .../linux-3.10/axxiaarm/standard/big-endian.cfg    |   3 -
 .../linux-3.10/axxiaarm/standard/big-endian.scc    |   2 +-
 .../linux-3.10/axxiaarm/standard/dbg-hw.cfg        |   5 -
 .../linux-3.10/axxiaarm/standard/dbg-non-hw.cfg    |  83 ------------
 .../linux-3.10/axxiaarm/standard/dbg.scc           |   2 -
 .../linux-3.10/axxiaarm/standard/smmon.cfg         |  13 ++
 .../axxiaarm/standard/standard-non-hw.cfg          |   1 +
 .../linux-3.10/axxiaarm/standard/standard.scc      |   1 +
 .../linux-3.10/axxiapowerpc/common/common-hw.cfg   |   4 -
 .../axxiapowerpc/common/common-non-hw.cfg          |  20 +--
 .../linux-3.10/axxiapowerpc/common/common.scc      |   2 +-
 .../linux-3.10/axxiapowerpc/common/non-testing.cfg |  13 ++
 .../linux-3.10/axxiapowerpc/common/smp-hw.cfg      |   1 +
 .../linux-3.10/axxiapowerpc/common/smp.scc         |   1 +
 .../linux-3.10/axxiapowerpc/common/testing.cfg     |  13 ++
 .../linux-3.10/axxiapowerpc/preempt-rt/dbg-hw.cfg  |   5 -
 .../axxiapowerpc/preempt-rt/dbg-non-hw.cfg         |  44 +++---
 .../linux-3.10/axxiapowerpc/preempt-rt/dbg.scc     |   1 -
 .../axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg  |  22 ---
 .../axxiapowerpc/preempt-rt/preempt-rt.scc         |   1 -
 .../linux-3.10/axxiapowerpc/standard/dbg-hw.cfg    |   5 -
 .../axxiapowerpc/standard/dbg-non-hw.cfg           |  36 ++---
 .../linux-3.10/axxiapowerpc/standard/dbg.scc       |   1 -
 .../axxiapowerpc/standard/standard-non-hw.cfg      |  22 +++
 .../linux-3.10/axxiapowerpc/standard/standard.scc  |   1 +
 .../linux-3.10/axxiaarm/preempt-rt/defconfig       |   2 +-
 .../linux-3.10/axxiaarm/standard/defconfig         |   2 +-
 .../linux-3.10/axxiapowerpc/preempt-rt/defconfig   |   3 +-
 .../linux-3.10/axxiapowerpc/standard/defconfig     |   3 +-
 .../linux-3.10/axxiaarm/preempt-rt/defconfig       |   2 +-
 .../lsi-tip/linux-3.10/axxiaarm/standard/defconfig |   2 +-
 .../linux-3.10/axxiapowerpc/preempt-rt/defconfig   |   3 +-
 .../linux-3.10/axxiapowerpc/standard/defconfig     |   3 +-
 recipes-kernel/linux/dt-arm.inc                    |  42 ++++++
 recipes-kernel/linux/dt-axxia.inc                  |  37 +++++
 recipes-kernel/linux/dt-powerpc.inc                |  16 +++
 recipes-kernel/linux/frags-arm.inc                 |  12 ++
 recipes-kernel/linux/frags-powerpc.inc             |   6 +
 recipes-kernel/linux/linux-yocto-rt_3.10.bbappend  |   6 +-
 recipes-kernel/linux/linux-yocto-rt_3.10.inc       |  14 +-
 recipes-kernel/linux/linux-yocto.inc               | 150 ---------------------
 recipes-kernel/linux/linux-yocto_3.10.bbappend     |   6 +-
 recipes-kernel/linux/linux-yocto_3.10.inc          |  14 +-
 recipes-kernel/linux/lsi-public-rt_3.10.inc        |  15 +--
 recipes-kernel/linux/lsi-public_3.10.inc           |  15 +--
 recipes-kernel/linux/lsi-tip-rt_3.10.inc           |  15 +--
 recipes-kernel/linux/lsi-tip_3.10.inc              |  15 +--
 72 files changed, 413 insertions(+), 530 deletions(-)
 delete mode 100644 recipes-kernel/linux/axxiaarm_preempt-rt_3.10.inc
 delete mode 100644 recipes-kernel/linux/axxiaarm_standard_3.10.inc
 delete mode 100644 recipes-kernel/linux/axxiapowerpc_preempt-rt_3.10.inc
 delete mode 100644 recipes-kernel/linux/axxiapowerpc_standard_3.10.inc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/dbg-non-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/dbg.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-non-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-non-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/standard-non-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/standard.scc
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp.scc
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-hw.cfg
 delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg
 delete 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/standard-non-hw.cfg
 create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/standard.scc
 create mode 100644 recipes-kernel/linux/dt-arm.inc
 create mode 100644 recipes-kernel/linux/dt-axxia.inc
 create mode 100644 recipes-kernel/linux/dt-powerpc.inc
 create mode 100644 recipes-kernel/linux/frags-arm.inc
 create mode 100644 recipes-kernel/linux/frags-powerpc.inc
 delete mode 100644 recipes-kernel/linux/linux-yocto.inc

diff --git a/recipes-kernel/linux/axxiaarm_preempt-rt_3.10.inc b/recipes-kernel/linux/axxiaarm_preempt-rt_3.10.inc
deleted file mode 100644
index 4c33080..0000000
--- a/recipes-kernel/linux/axxiaarm_preempt-rt_3.10.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-# adding fragments with kernel options to the final .config
-KERNEL_EXTRA_FEATURES = "features/taskstats/taskstats.scc"
-SRC_URI += "file://common.scc \
-	file://preempt-rt.scc \
-	${@base_conditional('BIG_ENDIAN', 'yes', 'file://big-endian.scc', '', d)} \
-	${@base_conditional('DBG', 'yes', 'file://dbg.scc', '', d)} \
-	${@base_conditional('TESTING', 'yes', 'file://testing.scc', '', d)} "
-
-# cpu hotplug  options: low power (default), full power down, full power down with L2 cache
-SRC_URI += "${@base_conditional('POWER_MANAGEMENT', 'full-power', 'file://full-power.scc', '', d)} \
-	${@base_conditional('POWER_MANAGEMENT', 'full-power-L2', 'file://full-power-L2.scc', '', d)} \
-	${@base_conditional('POWER_MANAGEMENT', 'low-power', 'file://low-power.scc', '', d)} "
diff --git a/recipes-kernel/linux/axxiaarm_standard_3.10.inc b/recipes-kernel/linux/axxiaarm_standard_3.10.inc
deleted file mode 100644
index 3a73963..0000000
--- a/recipes-kernel/linux/axxiaarm_standard_3.10.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-# adding fragments with kernel options to the final .config
-KERNEL_EXTRA_FEATURES = "features/taskstats/taskstats.scc"
-SRC_URI += "file://common.scc \
-	${@base_conditional('BIG_ENDIAN', 'yes', 'file://big-endian.scc', '', d)} \
-	${@base_conditional('DBG', 'yes', 'file://dbg.scc', '', d)} \
-	${@base_conditional('TESTING', 'yes', 'file://testing.scc', '', d)} "
-
-# cpu hotplug  options: low power (default), full power down, full power down with L2 cache
-SRC_URI += "${@base_conditional('POWER_MANAGEMENT', 'full-power', 'file://full-power.scc', '', d)} \
-	${@base_conditional('POWER_MANAGEMENT', 'full-power-L2', 'file://full-power-L2.scc', '', d)} \
-	${@base_conditional('POWER_MANAGEMENT', 'low-power', 'file://low-power.scc', '', d)} "
diff --git a/recipes-kernel/linux/axxiapowerpc_preempt-rt_3.10.inc b/recipes-kernel/linux/axxiapowerpc_preempt-rt_3.10.inc
deleted file mode 100644
index f0d4bb6..0000000
--- a/recipes-kernel/linux/axxiapowerpc_preempt-rt_3.10.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-# adding fragments with kernel options to the final .config
-KERNEL_EXTRA_FEATURES = ""
-SRC_URI += "file://common.scc \
-	file://preempt-rt.scc \
-	${@base_conditional('DBG', 'yes', 'file://dbg.scc', '', d)} \
-	${@base_conditional('TESTING', 'yes', 'file://testing.scc', 'file://non-testing.scc', d)} "
diff --git a/recipes-kernel/linux/axxiapowerpc_standard_3.10.inc b/recipes-kernel/linux/axxiapowerpc_standard_3.10.inc
deleted file mode 100644
index bbed950..0000000
--- a/recipes-kernel/linux/axxiapowerpc_standard_3.10.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# adding fragments with kernel options to the final .config
-KERNEL_EXTRA_FEATURES = ""
-SRC_URI += "file://common.scc \
-	${@base_conditional('DBG', 'yes', 'file://dbg.scc', '', d)} \
-	${@base_conditional('TESTING', 'yes', 'file://testing.scc', 'file://non-testing.scc', d)} "
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-non-hw.cfg
index 9304fa9..5ac410b 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common-non-hw.cfg
@@ -14,7 +14,6 @@
 #
 # General setup
 #
-CONFIG_LOCALVERSION_AUTO=y
 CONFIG_AUDIT=y
 
 #
@@ -45,7 +44,7 @@ CONFIG_SYSCTL_SYSCALL=y
 # Kernel Performance Events And Counters
 #
 # CONFIG_COMPAT_BRK is not set
-# CONFIG_OPROFILE is not set
+CONFIG_PROFILING=y
 
 #
 # IO Schedulers
@@ -325,8 +324,3 @@ CONFIG_CRYPTO_SHA256=y
 # Random Number Generation
 #
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
-
-#
-# Library routines
-#
-# CONFIG_LIBCRC32C is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common.scc
index 84a7420..4ad2563 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/common.scc
@@ -1,2 +1,4 @@
-kconf non-hardware common-non-hw.cfg
+include features/taskstats/taskstats.scc
+
 kconf hardware common-hw.cfg
+kconf non-hardware common-non-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/dbg-non-hw.cfg
new file mode 100644
index 0000000..c6636c6
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/dbg-non-hw.cfg
@@ -0,0 +1,57 @@
+#.........................................................................
+#                                WARNING
+#
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file.  The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration).  For more information on kernel configuration, please
+# consult the product documentation.
+#
+#.........................................................................
+
+#
+# Kernel hacking
+#
+CONFIG_DEBUG_SHIRQ=y
+CONFIG_LOCKUP_DETECTOR=y
+# CONFIG_DETECT_HUNG_TASK is not set
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+CONFIG_DEBUG_OBJECTS=y
+CONFIG_DEBUG_OBJECTS_SELFTEST=y
+CONFIG_DEBUG_OBJECTS_FREE=y
+CONFIG_DEBUG_OBJECTS_TIMERS=y
+CONFIG_DEBUG_OBJECTS_WORK=y
+CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
+CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
+CONFIG_SLUB_DEBUG_ON=y
+CONFIG_SLUB_STATS=y
+CONFIG_DEBUG_KMEMLEAK=y
+CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_PROVE_LOCKING=y
+CONFIG_LOCK_STAT=y
+CONFIG_DEBUG_LOCKDEP=y
+CONFIG_DEBUG_ATOMIC_SLEEP=y
+CONFIG_DEBUG_STACK_USAGE=y
+CONFIG_DEBUG_KOBJECT=y
+CONFIG_DEBUG_HIGHMEM=y
+CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_VM_RB=y
+CONFIG_DEBUG_WRITECOUNT=y
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_DEBUG_LIST=y
+CONFIG_DEBUG_SG=y
+CONFIG_DEBUG_NOTIFIERS=y
+CONFIG_DEBUG_CREDENTIALS=y
+
+#
+# RCU Debugging
+#
+CONFIG_SPARSE_RCU_POINTER=y
+CONFIG_RCU_CPU_STALL_INFO=y
+CONFIG_RCU_TRACE=y
+CONFIG_DEBUG_PER_CPU_MAPS=y
+CONFIG_DEBUG_PAGEALLOC=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/dbg.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/dbg.scc
new file mode 100644
index 0000000..01fcbff
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/dbg.scc
@@ -0,0 +1 @@
+kconf non-hardware dbg-non-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power-L2.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power-L2.cfg
index 19b5cf4..1641a6b 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power-L2.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power-L2.cfg
@@ -1,3 +1,16 @@
+#.........................................................................
+#                                WARNING
+#
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file.  The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration).  For more information on kernel configuration, please
+# consult the product documentation.
+#
+#.........................................................................
+
 CONFIG_HOTPLUG_CPU_COMPLETE_POWER_DOWN=y
 # CONFIG_HOTPLUG_CPU_LOW_POWER is not set
 CONFIG_HOTPLUG_CPU_L2_POWER_DOWN=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power.cfg
index 99025a2..cc921c0 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/full-power.cfg
@@ -1,3 +1,16 @@
+#.........................................................................
+#                                WARNING
+#
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file.  The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration).  For more information on kernel configuration, please
+# consult the product documentation.
+#
+#.........................................................................
+
 CONFIG_HOTPLUG_CPU_COMPLETE_POWER_DOWN=y
 # CONFIG_HOTPLUG_CPU_LOW_POWER is not set
 # CONFIG_HOTPLUG_CPU_L2_POWER_DOWN is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/low-power.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/low-power.cfg
index 5d3431b..6abe4b6 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/low-power.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/low-power.cfg
@@ -1,2 +1,15 @@
+#.........................................................................
+#                                WARNING
+#
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file.  The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration).  For more information on kernel configuration, please
+# consult the product documentation.
+#
+#.........................................................................
+
 # CONFIG_HOTPLUG_CPU_COMPLETE_POWER_DOWN is not set
 CONFIG_HOTPLUG_CPU_LOW_POWER=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp-hw.cfg
new file mode 100644
index 0000000..74b49fd
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp-hw.cfg
@@ -0,0 +1 @@
+CONFIG_SWP_EMULATE=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp.scc
new file mode 100644
index 0000000..0134983
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/no-smp.scc
@@ -0,0 +1 @@
+kconf hardware no-smp-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp-hw.cfg
new file mode 100644
index 0000000..1cbf7ec
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp-hw.cfg
@@ -0,0 +1 @@
+CONFIG_SMP=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp.scc
new file mode 100644
index 0000000..c33e2da
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/smp.scc
@@ -0,0 +1 @@
+kconf hardware smp-hw.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
index 93e2e30..38327ae 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/testing.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/common/testing.cfg
@@ -1,3 +1,16 @@
+#.........................................................................
+#                                WARNING
+#
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file.  The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration).  For more information on kernel configuration, please
+# consult the product documentation.
+#
+#.........................................................................
+
 CONFIG_PROC_FS=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -24,4 +37,3 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 
 CONFIG_I2C_AXXIA=y
-
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian-hw.cfg
new file mode 100644
index 0000000..c5cdc99
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian-hw.cfg
@@ -0,0 +1 @@
+CONFIG_CPU_BIG_ENDIAN=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.cfg
deleted file mode 100644
index c5cdc99..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.cfg
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CPU_BIG_ENDIAN=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.scc
index 58521ec..c11e218 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/big-endian.scc
@@ -1 +1 @@
-kconf non-hardware big-endian.cfg
+kconf hardware big-endian-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-hw.cfg
deleted file mode 100644
index de5be4a..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-hw.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Kernel Features
-#
-CONFIG_PREEMPT_COUNT=y
-CONFIG_SPLIT_PTLOCK_CPUS=999999
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-non-hw.cfg
deleted file mode 100644
index d15c658..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg-non-hw.cfg
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU_TRACE=y
-
-#
-# Kernel hacking
-#
-CONFIG_LOCKUP_DETECTOR=y
-
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-CONFIG_DEBUG_OBJECTS=y
-CONFIG_SLUB_DEBUG_ON=y
-CONFIG_SLUB_STATS=y
-
-CONFIG_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_RT_MUTEXES=y
-
-CONFIG_PROVE_LOCKING=y
-CONFIG_LOCK_STAT=y
-CONFIG_DEBUG_LOCKDEP=y
-CONFIG_DEBUG_ATOMIC_SLEEP=y
-
-CONFIG_DEBUG_STACK_USAGE=y
-CONFIG_DEBUG_HIGHMEM=y
-
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_WRITECOUNT=y
-CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DEBUG_LIST=y
-
-CONFIG_DEBUG_SG=y
-CONFIG_DEBUG_NOTIFIERS=y
-CONFIG_DEBUG_CREDENTIALS=y
-CONFIG_FRAME_POINTER=y
-
-#
-# RCU Debugging
-#
-CONFIG_PROVE_RCU=y
-CONFIG_PROVE_RCU_DELAY=y
-CONFIG_SPARSE_RCU_POINTER=y
-CONFIG_RCU_CPU_STALL_INFO=y
-CONFIG_RCU_TRACE=y
-CONFIG_DEBUG_PER_CPU_MAPS=y
-CONFIG_DEBUG_PAGEALLOC=y
-CONFIG_FTRACE=y
-CONFIG_IRQSOFF_TRACER=y
-CONFIG_INTERRUPT_OFF_HIST=y
-CONFIG_PREEMPT_OFF_HIST=y
-CONFIG_PREEMPT_TRACER=y
-CONFIG_SCHED_TRACER=y
-CONFIG_STACK_TRACER=y
-CONFIG_WAKEUP_LATENCY_HIST=y
-CONFIG_MISSED_TIMER_OFFSETS_HIST=y
-CONFIG_FUNCTION_PROFILER=y
-CONFIG_OLD_MCOUNT=y
-
-#
-# Random Number Generation
-#
-CONFIG_BINARY_PRINTF=y
-
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg.scc
deleted file mode 100644
index b5cd0eb..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/dbg.scc
+++ /dev/null
@@ -1,2 +0,0 @@
-kconf non-hardware dbg-non-hw.cfg
-kconf hardware dbg-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt-non-hw.cfg
index 4e080c5..46c542b 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt-non-hw.cfg
@@ -14,5 +14,4 @@
 #
 # RCU Subsystem
 #
-# CONFIG_RCU_BOOST is not set
 CONFIG_RELAY=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt.scc
index ab1dcde..b1670e6 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/preempt-rt/preempt-rt.scc
@@ -1,2 +1,2 @@
-kconf non-hardware preempt-rt-non-hw.cfg
 kconf hardware preempt-rt-hw.cfg
+kconf non-hardware preempt-rt-non-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian-hw.cfg
new file mode 100644
index 0000000..78c6ec7
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian-hw.cfg
@@ -0,0 +1,16 @@
+#.........................................................................
+#                                WARNING
+#
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file.  The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration).  For more information on kernel configuration, please
+# consult the product documentation.
+#
+#.........................................................................
+
+CONFIG_CPU_BIG_ENDIAN=y
+# CONFIG_ARM_CCN is not set
+# CONFIG_MFD_SYSCON is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.cfg
deleted file mode 100644
index 4c207e3..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_CPU_BIG_ENDIAN=y
-# CONFIG_ARM_CCN is not set
-# CONFIG_MFD_SYSCON is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.scc
index 0271465..ca42c3f 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/big-endian.scc
@@ -1,4 +1,4 @@
-kconf non-hardware big-endian.cfg
+kconf hardware big-endian-hw.cfg
 
 # use SMMON instead of EDAC for big endian builds
 kconf hardware smmon.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-hw.cfg
deleted file mode 100644
index de5be4a..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-hw.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Kernel Features
-#
-CONFIG_PREEMPT_COUNT=y
-CONFIG_SPLIT_PTLOCK_CPUS=999999
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-non-hw.cfg
deleted file mode 100644
index f5b4c1f..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg-non-hw.cfg
+++ /dev/null
@@ -1,83 +0,0 @@
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU_TRACE=y
-CONFIG_KALLSYMS_ALL=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_TRACEPOINTS=y
-# CONFIG_KPROBES is not set
-
-#
-# IO Schedulers
-#
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-
-#
-# Kernel hacking
-#
-CONFIG_DEBUG_SHIRQ=y
-CONFIG_LOCKUP_DETECTOR=y
-
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-CONFIG_SCHED_DEBUG=y
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
-CONFIG_DEBUG_OBJECTS=y
-CONFIG_SLUB_DEBUG_ON=y
-CONFIG_SLUB_STATS=y
-
-CONFIG_DEBUG_KMEMLEAK=y
-CONFIG_DEBUG_RT_MUTEXES=y
-
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_LOCK_ALLOC=y
-CONFIG_PROVE_LOCKING=y
-CONFIG_LOCKDEP=y
-CONFIG_LOCK_STAT=y
-CONFIG_TRACE_IRQFLAGS=y
-CONFIG_DEBUG_ATOMIC_SLEEP=y
-
-CONFIG_STACKTRACE=y
-CONFIG_DEBUG_STACK_USAGE=y
-CONFIG_DEBUG_KOBJECT=y
-CONFIG_DEBUG_HIGHMEM=y
-
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_VM_RB=y
-CONFIG_DEBUG_WRITECOUNT=y
-CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_DEBUG_LIST=y
-
-CONFIG_DEBUG_SG=y
-CONFIG_DEBUG_NOTIFIERS=y
-CONFIG_DEBUG_CREDENTIALS=y
-CONFIG_FRAME_POINTER=y
-
-#
-# RCU Debugging
-#
-CONFIG_SPARSE_RCU_POINTER=y
-CONFIG_RCU_CPU_STALL_INFO=y
-CONFIG_RCU_TRACE=y
-CONFIG_DEBUG_PER_CPU_MAPS=y
-CONFIG_DEBUG_PAGEALLOC=y
-CONFIG_TRACER_MAX_TRACE=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_FTRACE=y
-CONFIG_IRQSOFF_TRACER=y
-CONFIG_SCHED_TRACER=y
-CONFIG_TRACER_SNAPSHOT=y
-CONFIG_STACK_TRACER=y
-CONFIG_FUNCTION_PROFILER=y
-CONFIG_OLD_MCOUNT=y
-
-#
-# Random Number Generation
-#
-CONFIG_BINARY_PRINTF=y
-
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg.scc
deleted file mode 100644
index b5cd0eb..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/dbg.scc
+++ /dev/null
@@ -1,2 +0,0 @@
-kconf non-hardware dbg-non-hw.cfg
-kconf hardware dbg-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/smmon.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/smmon.cfg
index 77b89b6..dfd0836 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/smmon.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/smmon.cfg
@@ -1,2 +1,15 @@
+#.........................................................................
+#                                WARNING
+#
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file.  The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration).  For more information on kernel configuration, please
+# consult the product documentation.
+#
+#.........................................................................
+
 CONFIG_LSI_SMMON=y
 # CONFIG_EDAC is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/standard-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/standard-non-hw.cfg
new file mode 100644
index 0000000..0cbeb5a
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/standard-non-hw.cfg
@@ -0,0 +1 @@
+CONFIG_PREEMPT_NONE=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/standard.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/standard.scc
new file mode 100644
index 0000000..609308f
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiaarm/standard/standard.scc
@@ -0,0 +1 @@
+kconf non-hardware standard-non-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-hw.cfg
index e21987b..8904f54 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-hw.cfg
@@ -12,10 +12,6 @@
 #.........................................................................
 
 #
-# Platform support
-#
-# CONFIG_EBONY is not set
-#
 # Kernel options
 #
 # CONFIG_COMPACTION is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-non-hw.cfg
index 2d0ba14..02e32f6 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common-non-hw.cfg
@@ -15,7 +15,6 @@
 # General setup
 #
 CONFIG_CROSS_COMPILE="powerpc-linux-"
-CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_FHANDLE is not set
 
 #
@@ -31,11 +30,16 @@ CONFIG_SYSCTL_SYSCALL=y
 #
 # Kernel options
 #
-# CONFIG_SLUB_DEBUG is not set
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 
 # CONFIG_KPROBES is not set
 
 #
+# Kernel Performance Events And Counters
+#
+CONFIG_PROFILING=y
+CONFIG_OPROFILE=y
+
+#
 # GCOV-based kernel profiling
 #
 CONFIG_MODULE_FORCE_LOAD=y
@@ -210,15 +214,9 @@ CONFIG_NFS_ACL_SUPPORT=y
 # CONFIG_NLS_UTF8 is not set
 
 #
-# Kernel hacking
-#
-# CONFIG_TIMER_STATS is not set
-
-#
 # RCU Debugging
 #
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_LATENCYTOP is not set
 # CONFIG_FUNCTION_TRACER is not set
 # CONFIG_FTRACE_SYSCALLS is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
@@ -249,7 +247,6 @@ CONFIG_CRYPTO_XCBC=y
 #
 # Digest
 #
-# CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_MD4 is not set
 # CONFIG_CRYPTO_MICHAEL_MIC is not set
 CONFIG_CRYPTO_SHA256=y
@@ -275,8 +272,3 @@ CONFIG_CRYPTO_SHA256=y
 #
 CONFIG_CRYPTO_DEV_PPC4XX=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
-
-#
-# Library routines
-#
-# CONFIG_LIBCRC32C is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common.scc
index 84a7420..464f307 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/common.scc
@@ -1,2 +1,2 @@
-kconf non-hardware common-non-hw.cfg
 kconf hardware common-hw.cfg
+kconf non-hardware common-non-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/non-testing.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/non-testing.cfg
index ef58b5f..0f7f88d 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/non-testing.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/non-testing.cfg
@@ -1,3 +1,16 @@
+#.........................................................................
+#                                WARNING
+#
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file.  The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration).  For more information on kernel configuration, please
+# consult the product documentation.
+#
+#.........................................................................
+
 #
 # Timers subsystem
 #
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp-hw.cfg
new file mode 100644
index 0000000..1cbf7ec
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp-hw.cfg
@@ -0,0 +1 @@
+CONFIG_SMP=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp.scc
new file mode 100644
index 0000000..c33e2da
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/smp.scc
@@ -0,0 +1 @@
+kconf hardware smp-hw.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
index 93e2e30..6e2af3c 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/testing.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/common/testing.cfg
@@ -1,3 +1,16 @@
+#.........................................................................
+#                                WARNING
+#
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file.  The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration).  For more information on kernel configuration, please
+# consult the product documentation.
+#
+#.........................................................................
+
 CONFIG_PROC_FS=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-hw.cfg
deleted file mode 100644
index de5be4a..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-hw.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Kernel Features
-#
-CONFIG_PREEMPT_COUNT=y
-CONFIG_SPLIT_PTLOCK_CPUS=999999
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/dbg-non-hw.cfg
index c83622b..c6636c6 100644
--- 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
@@ -1,22 +1,35 @@
+#.........................................................................
+#                                WARNING
 #
-# RCU Subsystem
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file.  The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration).  For more information on kernel configuration, please
+# consult the product documentation.
 #
-CONFIG_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_DETECT_HUNG_TASK is not set
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 CONFIG_DEBUG_OBJECTS=y
-CONFIG_SLUB_STATS=y
+CONFIG_DEBUG_OBJECTS_SELFTEST=y
+CONFIG_DEBUG_OBJECTS_FREE=y
+CONFIG_DEBUG_OBJECTS_TIMERS=y
+CONFIG_DEBUG_OBJECTS_WORK=y
+CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
+CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
 CONFIG_SLUB_DEBUG_ON=y
+CONFIG_SLUB_STATS=y
 CONFIG_DEBUG_KMEMLEAK=y
+CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 CONFIG_DEBUG_RT_MUTEXES=y
 CONFIG_PROVE_LOCKING=y
 CONFIG_LOCK_STAT=y
@@ -37,27 +50,8 @@ 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
index b5cd0eb..01fcbff 100644
--- 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
@@ -1,2 +1 @@
 kconf non-hardware dbg-non-hw.cfg
-kconf hardware dbg-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg
deleted file mode 100644
index 7bbd1bf..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-#.........................................................................
-#                                WARNING
-#
-# This file is a kernel configuration fragment, and not a full kernel
-# configuration file.  The final kernel configuration is made up of
-# an assembly of processed fragments, each of which is designed to
-# capture a specific part of the final configuration (e.g. platform
-# configuration, feature configuration, and board specific hardware
-# configuration).  For more information on kernel configuration, please
-# consult the product documentation.
-#
-#.........................................................................
-
-#
-# RCU Subsystem
-#
-# CONFIG_RCU_BOOST is not set
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_SLUB_DEBUG=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt.scc
index ab1dcde..7a4ede9 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/preempt-rt/preempt-rt.scc
@@ -1,2 +1 @@
-kconf non-hardware preempt-rt-non-hw.cfg
 kconf hardware preempt-rt-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-hw.cfg
deleted file mode 100644
index de5be4a..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-hw.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Kernel Features
-#
-CONFIG_PREEMPT_COUNT=y
-CONFIG_SPLIT_PTLOCK_CPUS=999999
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/dbg-non-hw.cfg
index db1afba..e7aa8d4 100644
--- 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
@@ -1,37 +1,47 @@
+#.........................................................................
+#                                WARNING
 #
-# RCU Subsystem
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file.  The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration).  For more information on kernel configuration, please
+# consult the product documentation.
 #
-CONFIG_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_DETECT_HUNG_TASK is not set
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
 CONFIG_DEBUG_OBJECTS=y
+CONFIG_DEBUG_OBJECTS_SELFTEST=y
+CONFIG_DEBUG_OBJECTS_FREE=y
+CONFIG_DEBUG_OBJECTS_TIMERS=y
+CONFIG_DEBUG_OBJECTS_WORK=y
+CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
+CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y
 CONFIG_SLUB_STATS=y
-
 CONFIG_DEBUG_KMEMLEAK=y
+CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
 CONFIG_DEBUG_RT_MUTEXES=y
-
 CONFIG_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
@@ -42,11 +52,5 @@ CONFIG_DEBUG_CREDENTIALS=y
 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
index b5cd0eb..01fcbff 100644
--- 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
@@ -1,2 +1 @@
 kconf non-hardware dbg-non-hw.cfg
-kconf hardware dbg-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/standard-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/standard-non-hw.cfg
new file mode 100644
index 0000000..5601f1d
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/standard-non-hw.cfg
@@ -0,0 +1,22 @@
+#.........................................................................
+#                                WARNING
+#
+# This file is a kernel configuration fragment, and not a full kernel
+# configuration file.  The final kernel configuration is made up of
+# an assembly of processed fragments, each of which is designed to
+# capture a specific part of the final configuration (e.g. platform
+# configuration, feature configuration, and board specific hardware
+# configuration).  For more information on kernel configuration, please
+# consult the product documentation.
+#
+#.........................................................................
+
+#
+# Kernel Performance Events And Counters
+#
+# CONFIG_SLUB_DEBUG is not set
+
+#
+# Kernel options
+#
+CONFIG_PREEMPT_NONE=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/standard.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/standard.scc
new file mode 100644
index 0000000..609308f
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.10/axxiapowerpc/standard/standard.scc
@@ -0,0 +1 @@
+kconf non-hardware standard-non-hw.cfg
diff --git a/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiaarm/preempt-rt/defconfig b/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiaarm/preempt-rt/defconfig
index 4ca7ff1..65e781b 100644
--- a/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiaarm/preempt-rt/defconfig
+++ b/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiaarm/preempt-rt/defconfig
@@ -2618,7 +2618,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
+CONFIG_LIBCRC32C=m
 # CONFIG_CRC8 is not set
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
diff --git a/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiaarm/standard/defconfig b/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiaarm/standard/defconfig
index 3710a31..f816d5d 100644
--- a/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiaarm/standard/defconfig
+++ b/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiaarm/standard/defconfig
@@ -2622,7 +2622,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
+CONFIG_LIBCRC32C=m
 # CONFIG_CRC8 is not set
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
diff --git a/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiapowerpc/preempt-rt/defconfig b/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiapowerpc/preempt-rt/defconfig
index ef902f7..ec98616 100644
--- a/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiapowerpc/preempt-rt/defconfig
+++ b/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiapowerpc/preempt-rt/defconfig
@@ -2038,7 +2038,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
+CONFIG_LIBCRC32C=m
 # CONFIG_CRC8 is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
@@ -2249,7 +2249,6 @@ CONFIG_CRYPTO_XCBC=y
 #
 # Digest
 #
-# CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CRC32 is not set
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_MD4 is not set
diff --git a/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiapowerpc/standard/defconfig b/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiapowerpc/standard/defconfig
index c319851..f60b289 100644
--- a/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiapowerpc/standard/defconfig
+++ b/recipes-kernel/linux/conf/lsi-public/linux-3.10/axxiapowerpc/standard/defconfig
@@ -2040,7 +2040,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
+CONFIG_LIBCRC32C=m
 # CONFIG_CRC8 is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
@@ -2253,7 +2253,6 @@ CONFIG_CRYPTO_XCBC=y
 #
 # Digest
 #
-# CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CRC32 is not set
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_MD4 is not set
diff --git a/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiaarm/preempt-rt/defconfig b/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiaarm/preempt-rt/defconfig
index 4ca7ff1..65e781b 100644
--- a/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiaarm/preempt-rt/defconfig
+++ b/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiaarm/preempt-rt/defconfig
@@ -2618,7 +2618,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
+CONFIG_LIBCRC32C=m
 # CONFIG_CRC8 is not set
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
diff --git a/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiaarm/standard/defconfig b/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiaarm/standard/defconfig
index 3710a31..f816d5d 100644
--- a/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiaarm/standard/defconfig
+++ b/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiaarm/standard/defconfig
@@ -2622,7 +2622,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
+CONFIG_LIBCRC32C=m
 # CONFIG_CRC8 is not set
 CONFIG_AUDIT_GENERIC=y
 CONFIG_ZLIB_INFLATE=y
diff --git a/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiapowerpc/preempt-rt/defconfig b/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiapowerpc/preempt-rt/defconfig
index ef902f7..ec98616 100644
--- a/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiapowerpc/preempt-rt/defconfig
+++ b/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiapowerpc/preempt-rt/defconfig
@@ -2038,7 +2038,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
+CONFIG_LIBCRC32C=m
 # CONFIG_CRC8 is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
@@ -2249,7 +2249,6 @@ CONFIG_CRYPTO_XCBC=y
 #
 # Digest
 #
-# CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CRC32 is not set
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_MD4 is not set
diff --git a/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiapowerpc/standard/defconfig b/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiapowerpc/standard/defconfig
index c319851..f60b289 100644
--- a/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiapowerpc/standard/defconfig
+++ b/recipes-kernel/linux/conf/lsi-tip/linux-3.10/axxiapowerpc/standard/defconfig
@@ -2040,7 +2040,7 @@ CONFIG_CRC32_SLICEBY8=y
 # CONFIG_CRC32_SARWATE is not set
 # CONFIG_CRC32_BIT is not set
 # CONFIG_CRC7 is not set
-# CONFIG_LIBCRC32C is not set
+CONFIG_LIBCRC32C=m
 # CONFIG_CRC8 is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
@@ -2253,7 +2253,6 @@ CONFIG_CRYPTO_XCBC=y
 #
 # Digest
 #
-# CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_CRC32 is not set
 CONFIG_CRYPTO_GHASH=y
 # CONFIG_CRYPTO_MD4 is not set
diff --git a/recipes-kernel/linux/dt-arm.inc b/recipes-kernel/linux/dt-arm.inc
new file mode 100644
index 0000000..3343812
--- /dev/null
+++ b/recipes-kernel/linux/dt-arm.inc
@@ -0,0 +1,42 @@
+require dt-axxia.inc
+
+do_compile_append() {
+	addr=0x00408000
+	if [ "${KV}" = "3.4" ]; then
+		mk_fit_images "axm55xx" ${addr}
+		mk_fit_images "axm55xxemu7" ${addr}
+		mk_fit_images "axm55xxemu" ${addr}
+		mk_fit_images "axm55xxsim16" ${addr}
+		mk_fit_images "axm55xxsim" ${addr}
+	elif [ "${KV}" = "3.10" ]; then
+		mk_fit_images "axm5504-emu" ${addr}
+		mk_fit_images "axm5507-emu" ${addr}
+		mk_fit_images "axm5508-amarillo" ${addr}
+		mk_fit_images "axm5512-amarillo" ${addr}
+		mk_fit_images "axm5516-amarillo" ${addr}
+		mk_fit_images "axm5504-sim-mmc" ${addr}
+		mk_fit_images "axm5504-sim-virtio" ${addr}
+		mk_fit_images "axm5516-sim-mmc" ${addr}
+		mk_fit_images "axm5516-sim-virtio" ${addr}
+	fi
+}
+
+do_deploy_append() {
+	if [ "${KV}" = "3.4" ]; then
+	    	install_fit_images "axm55xx"
+    		install_fit_images "axm55xxemu7"
+    		install_fit_images "axm55xxemu"
+    		install_fit_images "axm55xxsim16"
+    		install_fit_images "axm55xxsim"
+	elif [ "${KV}" = "3.10" ]; then
+		install_fit_images "axm5504-emu"
+		install_fit_images "axm5507-emu"
+		install_fit_images "axm5508-amarillo"
+		install_fit_images "axm5512-amarillo"
+		install_fit_images "axm5516-amarillo"
+		install_fit_images "axm5504-sim-mmc"
+		install_fit_images "axm5504-sim-virtio"
+		install_fit_images "axm5516-sim-mmc"
+		install_fit_images "axm5516-sim-virtio"
+    	fi
+}
diff --git a/recipes-kernel/linux/dt-axxia.inc b/recipes-kernel/linux/dt-axxia.inc
new file mode 100644
index 0000000..17cc002
--- /dev/null
+++ b/recipes-kernel/linux/dt-axxia.inc
@@ -0,0 +1,37 @@
+mk_fit_images() {
+	name=$1
+	addr=$2
+	oe_runmake ${name}.dtb
+	echo "pwd = `pwd`"
+	cd ../fit
+	if [ "${KARCH}" = "arm" ] && [ "${KV}" = "3.10" ]; then
+		oe_runmake "ARCH=${KARCH}" \
+				'DESCRIPTION=LSI Axxia Linux' \
+				"ADDRESS=${addr}" \
+				'VMLINUX=${B}/vmlinux' \
+				"DTB=${B}/arch/${KARCH}/boot/dts/${name}.dtb"
+	else
+		oe_runmake "ARCH=${KARCH}" \
+				'DESCRIPTION=LSI Axxia Linux' \
+				"ADDRESS=${addr}" \
+				'VMLINUX=${B}/vmlinux' \
+				"DTB=${B}/arch/${KARCH}/boot/${name}.dtb"
+	fi
+	mv linux.fit linux.fit-${name}
+	mv fdt.fit fdt.fit-${name}
+	mv multi.fit multi.fit-${name}
+	cd ${B}
+}
+
+install_fit_images() {
+	name=$1
+	if [ "${KARCH}" = "arm" ] && [ "${KV}" = "3.10" ]; then
+		install ${B}/arch/${KARCH}/boot/dts/${name}.dtb ${DEPLOYDIR}/${name}.dtb
+	else
+		install ${B}/arch/${KARCH}/boot/${name}.dtb ${DEPLOYDIR}/${name}.dtb
+	fi
+	install ${B}/../fit/linux.fit-${name} ${DEPLOYDIR}/linux.fit-${name}
+	install ${B}/../fit/fdt.fit-${name} ${DEPLOYDIR}/fdt.fit-${name}
+	install ${B}/../fit/multi.fit-${name} ${DEPLOYDIR}/multi.fit-${name}
+	
+}
diff --git a/recipes-kernel/linux/dt-powerpc.inc b/recipes-kernel/linux/dt-powerpc.inc
new file mode 100644
index 0000000..1c2e46e
--- /dev/null
+++ b/recipes-kernel/linux/dt-powerpc.inc
@@ -0,0 +1,16 @@
+require dt-axxia.inc
+
+do_compile_append() {
+	addr=0x00400000
+	mk_fit_images "acp25xx" ${addr}
+	mk_fit_images "acp342x" ${addr}
+	mk_fit_images "acp344x" ${addr}
+	mk_fit_images "acp35xx" ${addr}
+}
+
+do_deploy_append() {
+	install_fit_images "acp25xx"
+	install_fit_images "acp342x"
+	install_fit_images "acp344x"
+	install_fit_images "acp35xx"
+}
diff --git a/recipes-kernel/linux/frags-arm.inc b/recipes-kernel/linux/frags-arm.inc
new file mode 100644
index 0000000..017adbc
--- /dev/null
+++ b/recipes-kernel/linux/frags-arm.inc
@@ -0,0 +1,12 @@
+# adding fragments with kernel options to the final .config
+SRC_URI += "file://common.scc \
+	${@base_conditional('SMP', 'yes', 'file://smp.scc', 'file://no-smp.scc', d)} \
+	${@base_conditional('LINUX_KERNEL_TYPE', 'preempt-rt', 'file://preempt-rt.scc', 'file://standard.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://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/frags-powerpc.inc b/recipes-kernel/linux/frags-powerpc.inc
new file mode 100644
index 0000000..84f0d81
--- /dev/null
+++ b/recipes-kernel/linux/frags-powerpc.inc
@@ -0,0 +1,6 @@
+# adding fragments with kernel options to the final .config
+SRC_URI += "file://common.scc \
+	${@base_conditional('SMP', 'yes', 'file://smp.scc', '', d)} \
+	${@base_conditional('LINUX_KERNEL_TYPE', 'preempt-rt', 'file://preempt-rt.scc', 'file://standard.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/linux-yocto-rt_3.10.bbappend b/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
index eb8fcd8..4da2ce2 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_3.10.bbappend
@@ -1,7 +1,11 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}:"
 
-LINUX_KERNEL_TYPE = "preempt-rt"
+COMPATIBLE_MACHINE = "^axxiaarm$|^axxiapowerpc$"
+INSANE_SKIP_kernel-dev = "debug-files"
+PARALLEL_MAKE = ""
+
 LSI_SRC ?= "linux-yocto"
+SMP ?= "yes"
 POWER_MANAGEMENT ?= "low-power"
 BIG_ENDIAN ?= "no"
 DBG ?= "no"
diff --git a/recipes-kernel/linux/linux-yocto-rt_3.10.inc b/recipes-kernel/linux/linux-yocto-rt_3.10.inc
index d7595a3..fa74fb8 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.10.inc
+++ b/recipes-kernel/linux/linux-yocto-rt_3.10.inc
@@ -1,18 +1,12 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/common:\
 ${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
 
-require linux-yocto.inc
+require dt-${KARCH}.inc
 
 LINUX_VERSION = "3.10.65"
-
 KBRANCH = "standard/preempt-rt/axxia/base"
-KMETA = "meta"
-KREPO = "git://git.yoctoproject.org/linux-yocto-3.10.git"
-
-SRCREV_machine = "7511f4d2ce8049fcce67a76cb2cdc04edf4d8b72"
-SRCREV_meta = "1e670aaa446b3d6a72eb527bf9b8af04bc5a96ef"
-
-SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRCREV_machine = "${AUTOREV}"
+SRCREV_meta = "${AUTOREV}"
 SRC_URI += "file://fit"
 
-require ${MACHINE}_${LINUX_KERNEL_TYPE}_${KV}.inc
+require frags-${KARCH}.inc
diff --git a/recipes-kernel/linux/linux-yocto.inc b/recipes-kernel/linux/linux-yocto.inc
deleted file mode 100644
index bfcd71d..0000000
--- a/recipes-kernel/linux/linux-yocto.inc
+++ /dev/null
@@ -1,150 +0,0 @@
-
-LICENSE = "GPLv2"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-COMPATIBLE_MACHINE = "axxiaarm|axxiapowerpc"
-
-KMACHINE = "${MACHINE}"
-
-INSANE_SKIP_kernel-dev = "debug-files"
-
-PARALLEL_MAKE = ""
-
-mk_fit_images() {
-	name=$1
-	addr=$2
-	oe_runmake ${name}.dtb
-	echo "pwd = `pwd`"
-	cd ../fit
-	if [ "${KARCH}" = "arm" ] && [ "${KV}" = "3.10" ]
-	then
-		oe_runmake "ARCH=${KARCH}" \
-				'DESCRIPTION=LSI Axxia Linux' \
-				"ADDRESS=${addr}" \
-				'VMLINUX=${B}/vmlinux' \
-				"DTB=${B}/arch/${KARCH}/boot/dts/${name}.dtb"
-	elif [ "${KARCH}" = "arm" ] && [ "${KV}" = "3.14" ]
-	then
-		oe_runmake "ARCH=${KARCH}" \
-				'DESCRIPTION=LSI Axxia Linux' \
-				"ADDRESS=${addr}" \
-				'VMLINUX=${B}/vmlinux' \
-				"DTB=${B}/arch/${KARCH}/boot/dts/${name}.dtb"
-	else
-		oe_runmake "ARCH=${KARCH}" \
-       	                        'DESCRIPTION=LSI Axxia Linux' \
-               	                "ADDRESS=${addr}" \
-                       	        'VMLINUX=${B}/vmlinux' \
-                               	"DTB=${B}/arch/${KARCH}/boot/${name}.dtb"
-	fi
-	mv linux.fit linux.fit-${name}
-	mv fdt.fit fdt.fit-${name}
-	mv multi.fit multi.fit-${name}
-	cd ${B}
-}
-
-do_compile_append() {
-	if [ "${KARCH}" = "powerpc" ]
-	then
-    		addr=0x00400000
-		mk_fit_images "acp25xx" ${addr}
-		mk_fit_images "acp342x" ${addr}
-		mk_fit_images "acp344x" ${addr}
-		mk_fit_images "acp35xx" ${addr}
-	elif [ "${KARCH}" = "arm" ]
-	then
-		addr=0x00408000
-		if [ "${KV}" = "3.10" ]
-		then
-			mk_fit_images "axm5504-emu" ${addr}
-			mk_fit_images "axm5504-sim-mmc" ${addr}
-			mk_fit_images "axm5504-sim-virtio" ${addr}
-			mk_fit_images "axm5507-emu" ${addr}
-			mk_fit_images "axm5508-amarillo" ${addr}
-			mk_fit_images "axm5512-amarillo" ${addr}
-			mk_fit_images "axm5516-amarillo" ${addr}
-			mk_fit_images "axm5516-sim-mmc" ${addr}
-			mk_fit_images "axm5516-sim-virtio" ${addr}
-		elif [ "${KV}" = "3.14" ]
-		then
-			mk_fit_images "axm5504-emu" ${addr}
-			mk_fit_images "axm5504-sim-mmc" ${addr}
-			mk_fit_images "axm5504-sim-virtio" ${addr}
-			mk_fit_images "axm5504-sim" ${addr}
-			mk_fit_images "axm5507-emu" ${addr}
-			mk_fit_images "axm5508-amarillo" ${addr}
-			mk_fit_images "axm5512-amarillo" ${addr}
-			mk_fit_images "axm5516-amarillo" ${addr}
-			mk_fit_images "axm5516-sim-mmc" ${addr}
-			mk_fit_images "axm5516-sim-virtio" ${addr}
-			mk_fit_images "axm5516-sim" ${addr}
-		fi
-	fi
-}
-
-install_fit_images() {
-	name=$1
-	if [ "${KARCH}" = "arm" ] && [ "${KV}" = "3.10" ]
-	then
-		install ${B}/arch/${KARCH}/boot/dts/${name}.dtb ${DEPLOYDIR}/${name}.dtb
-	elif [ "${KARCH}" = "arm" ] && [ "${KV}" = "3.14" ]
-	then
-		install ${B}/arch/${KARCH}/boot/dts/${name}.dtb ${DEPLOYDIR}/${name}.dtb
-	else
-		install ${B}/arch/${KARCH}/boot/${name}.dtb ${DEPLOYDIR}/${name}.dtb
-	fi
-	install ${B}/../fit/linux.fit-${name} ${DEPLOYDIR}/linux.fit-${name}
-	install ${B}/../fit/fdt.fit-${name} ${DEPLOYDIR}/fdt.fit-${name}
-	install ${B}/../fit/multi.fit-${name} ${DEPLOYDIR}/multi.fit-${name}
-}
-
-do_deploy_append() {
-	if [ "${KARCH}" = "powerpc" ]
-	then
-		install_fit_images "acp25xx"
-		install_fit_images "acp342x"
-		install_fit_images "acp344x"
-		install_fit_images "acp35xx"
-    	elif [ "${KARCH}" = "arm" ]
-	then
-		if [ "${KV}" = "3.10" ]
-		then
-			install_fit_images "axm5504-emu"
-			install_fit_images "axm5504-sim-mmc"
-			install_fit_images "axm5504-sim-virtio"
-			install_fit_images "axm5507-emu"
-			install_fit_images "axm5508-amarillo"
-			install_fit_images "axm5512-amarillo"
-			install_fit_images "axm5516-amarillo"
-			install_fit_images "axm5516-sim-mmc"
-			install_fit_images "axm5516-sim-virtio"
-		elif [ "${KV}" = "3.14" ]
-		then
-			install_fit_images "axm5504-emu"
-			install_fit_images "axm5504-sim"
-			install_fit_images "axm5504-sim-mmc"
-			install_fit_images "axm5504-sim-virtio"
-			install_fit_images "axm5507-emu"
-			install_fit_images "axm5508-amarillo"
-			install_fit_images "axm5512-amarillo"
-			install_fit_images "axm5516-amarillo"
-			install_fit_images "axm5516-sim"
-			install_fit_images "axm5516-sim-mmc"
-			install_fit_images "axm5516-sim-virtio"
-		fi
-	fi
-}
-
-do_patch_append() {
-	if [ "${LSI_SRC}" != "linux-yocto" ]
-	then
-		if [ "${PN}" = "linux-yocto" ]
-		then
-			cp ${WORKDIR}/linux/arch/${KARCH}/configs/lsi_defconfig ${WORKDIR}/defconfig
-		elif [ "${PN}" = "linux-yocto-rt" ]
-		then
-			cp ${WORKDIR}/linux/arch/${KARCH}/configs/lsi_rt_defconfig ${WORKDIR}/defconfig
-		fi
-	fi
-}
diff --git a/recipes-kernel/linux/linux-yocto_3.10.bbappend b/recipes-kernel/linux/linux-yocto_3.10.bbappend
index b288249..ca5bda2 100644
--- a/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,7 +1,11 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}:"
 
-LINUX_KERNEL_TYPE = "standard"
+COMPATIBLE_MACHINE = "^axxiaarm$|^axxiapowerpc$"
+INSANE_SKIP_kernel-dev = "debug-files"
+PARALLEL_MAKE = ""
+
 LSI_SRC ?= "linux-yocto"
+SMP ?= "yes"
 POWER_MANAGEMENT ?= "low-power"
 BIG_ENDIAN ?= "no"
 DBG ?= "no"
diff --git a/recipes-kernel/linux/linux-yocto_3.10.inc b/recipes-kernel/linux/linux-yocto_3.10.inc
index 1b74b86..24ff05b 100644
--- a/recipes-kernel/linux/linux-yocto_3.10.inc
+++ b/recipes-kernel/linux/linux-yocto_3.10.inc
@@ -1,18 +1,12 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/common:\
 ${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
 
-require linux-yocto.inc
+require dt-${KARCH}.inc
 
 LINUX_VERSION = "3.10.65"
-
 KBRANCH = "standard/axxia/base"
-KMETA = "meta"
-KREPO = "git://git.yoctoproject.org/linux-yocto-3.10.git"
-
-SRCREV_machine = "87c1d0a694a7670b54e6e0e72e2f3614509ad333"
-SRCREV_meta = "1e670aaa446b3d6a72eb527bf9b8af04bc5a96ef"
-
-SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRCREV_machine = "${AUTOREV}"
+SRCREV_meta = "${AUTOREV}"
 SRC_URI += "file://fit"
 
-require ${MACHINE}_${LINUX_KERNEL_TYPE}_${KV}.inc
+require frags-${KARCH}.inc
diff --git a/recipes-kernel/linux/lsi-public-rt_3.10.inc b/recipes-kernel/linux/lsi-public-rt_3.10.inc
index 1f5e4d0..cd2c5ca 100644
--- a/recipes-kernel/linux/lsi-public-rt_3.10.inc
+++ b/recipes-kernel/linux/lsi-public-rt_3.10.inc
@@ -1,16 +1,13 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
 
-require linux-yocto.inc
+require dt-${KARCH}.inc
 
-LSI_KERNEL_TAG = "8.8.1.50"
+LSI_KERNEL_TAG = "8.8.1.53"
 LINUX_VERSION = "3.10.38-${LSI_KERNEL_TAG}"
-
 KBRANCH = "standard/preempt-rt/lsi/base"
-KREPO = "git://github.com/lsigithub/lsi_axxia_yocto_public_3.10.git"
-
-SRCREV_machine="560c64f461183102703fc60476db858f4bf4b25b"
-SRCREV_meta="d07bc7ba4ff00ddcd77db1026a63c327b81a35d8"
-
-SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+KMETA = ""
+KREPO = "git://git@github.com/lsigithub/lsi_axxia_yocto_public_3.10.git;protocol=ssh"
+SRCREV_machine = "a90ff87a3a3473aa19ca2ebe22af709cf5540ebd"
+SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH};name=machine"
 SRC_URI += "file://fit"
 SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/lsi-public_3.10.inc b/recipes-kernel/linux/lsi-public_3.10.inc
index 31f5f76..78bf88c 100644
--- a/recipes-kernel/linux/lsi-public_3.10.inc
+++ b/recipes-kernel/linux/lsi-public_3.10.inc
@@ -1,16 +1,13 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
 
-require linux-yocto.inc
+require dt-${KARCH}.inc
 
-LSI_KERNEL_TAG = "8.8.1.50"
+LSI_KERNEL_TAG = "8.8.1.53"
 LINUX_VERSION = "3.10.38-${LSI_KERNEL_TAG}"
-
 KBRANCH = "standard/lsi/base"
-KREPO = "git://github.com/lsigithub/lsi_axxia_yocto_public_3.10.git"
-
-SRCREV_machine="e8262c2980bebc353ec42b15186536bf73611a2d"
-SRCREV_meta="d07bc7ba4ff00ddcd77db1026a63c327b81a35d8"
-
-SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+KMETA = ""
+KREPO = "git://git@github.com/lsigithub/lsi_axxia_yocto_public_3.10.git;protocol=ssh"
+SRCREV_machine = "c01e54b3ced0224c8b32d3aab4a9b78d76fbac0e"
+SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH};name=machine"
 SRC_URI += "file://fit"
 SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/lsi-tip-rt_3.10.inc b/recipes-kernel/linux/lsi-tip-rt_3.10.inc
index 14db6cf..cb5a705 100644
--- a/recipes-kernel/linux/lsi-tip-rt_3.10.inc
+++ b/recipes-kernel/linux/lsi-tip-rt_3.10.inc
@@ -1,16 +1,13 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
 
-require linux-yocto.inc
+require dt-${KARCH}.inc
 
 LSI_KERNEL_TAG = "tip"
-LINUX_VERSION = "3.10.38-${LSI_KERNEL_TAG}"
-
-KBRANCH = "standard/preempt-rt/lsi/base"
+LINUX_VERSION = "3.10.65-${LSI_KERNEL_TAG}"
+KBRANCH = "standard/preempt-rt/axxia-dev/base"
+KMETA = ""
 KREPO = "git://git@github.com/lsigithub/lsi_axxia_yocto_3.10.git;protocol=ssh"
-
-SRCREV_machine="${AUTOREV}"
-SRCREV_meta="${AUTOREV}"
-
-SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRCREV_machine = "${AUTOREV}"
+SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH};name=machine"
 SRC_URI += "file://fit"
 SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/lsi-tip_3.10.inc b/recipes-kernel/linux/lsi-tip_3.10.inc
index da18f03..bb37693 100644
--- a/recipes-kernel/linux/lsi-tip_3.10.inc
+++ b/recipes-kernel/linux/lsi-tip_3.10.inc
@@ -1,16 +1,13 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/conf/${LSI_SRC}/linux-${KV}/${MACHINE}/${LINUX_KERNEL_TYPE}:"
 
-require linux-yocto.inc
+require dt-${KARCH}.inc
 
 LSI_KERNEL_TAG = "tip"
-LINUX_VERSION = "3.10.38-${LSI_KERNEL_TAG}"
-
-KBRANCH = "standard/lsi/base"
+LINUX_VERSION = "3.10.65-${LSI_KERNEL_TAG}"
+KBRANCH = "standard/axxia-dev/base"
+KMETA = ""
 KREPO = "git://git@github.com/lsigithub/lsi_axxia_yocto_3.10.git;protocol=ssh"
-
-SRCREV_machine="${AUTOREV}"
-SRCREV_meta="${AUTOREV}"
-
-SRC_URI = "${KREPO};nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRCREV_machine = "${AUTOREV}"
+SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH};name=machine"
 SRC_URI += "file://fit"
 SRC_URI += "file://defconfig"
-- 
1.9.1



More information about the meta-lsi mailing list