[meta-lsi] [PATCH 13/24] linux-yocto-3.14: Update and reorganize recipes
Daniel Dragomir
daniel.dragomir at windriver.com
Thu Jan 28 04:43:11 PST 2016
Redesign and update recipes to match lastest 3.14 recipes
from jethro branch:
commit 92b2aeb642bd2da84c9445703c87b65d49cbc56d
lsi-tip: quit using the meta branch
Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
---
recipes-kernel/linux/axxiaarm_preempt-rt_3.14.inc | 10 ---
recipes-kernel/linux/axxiaarm_standard_3.14.inc | 9 ---
.../linux/axxiapowerpc_preempt-rt_3.14.inc | 5 --
.../linux/axxiapowerpc_standard_3.14.inc | 4 --
.../linux-3.14/axxiaarm/common/common-hw.cfg | 2 -
.../linux-3.14/axxiaarm/common/common-non-hw.cfg | 11 +--
.../linux-3.14/axxiaarm/common/common.scc | 2 +
.../linux-3.14/axxiaarm/common/dbg-non-hw.cfg | 49 +++++++++++++
.../linux-yocto/linux-3.14/axxiaarm/common/dbg.scc | 1 +
.../linux-3.14/axxiaarm/common/full-power-L2.cfg | 13 ++++
.../linux-3.14/axxiaarm/common/full-power.cfg | 13 ++++
.../linux-3.14/axxiaarm/common/low-power.cfg | 13 ++++
.../linux-3.14/axxiaarm/common/smp-hw.cfg | 1 +
.../linux-yocto/linux-3.14/axxiaarm/common/smp.scc | 1 +
.../linux-3.14/axxiaarm/common/testing.cfg | 13 ++++
.../axxiaarm/preempt-rt/big-endian-hw.cfg | 23 ++++++
.../axxiaarm/preempt-rt/big-endian-non-hw.cfg | 23 ++++++
.../linux-3.14/axxiaarm/preempt-rt/big-endian.scc | 2 +
.../linux-3.14/axxiaarm/standard/big-endian-hw.cfg | 27 +++++++
.../linux-3.14/axxiaarm/standard/big-endian.scc | 4 ++
.../linux-3.14/axxiaarm/standard/smmon.cfg | 15 ++++
.../axxiaarm/standard/standard-non-hw.cfg | 1 +
.../linux-3.14/axxiaarm/standard/standard.scc | 1 +
.../axxiapowerpc/common/common-non-hw.cfg | 6 +-
.../linux-3.14/axxiapowerpc/common/smp-hw.cfg | 1 +
.../linux-3.14/axxiapowerpc/common/smp.scc | 1 +
.../linux-3.14/axxiapowerpc/common/testing.cfg | 13 ++++
.../linux-3.14/axxiapowerpc/preempt-rt/dbg-hw.cfg | 5 --
.../axxiapowerpc/preempt-rt/dbg-non-hw.cfg | 83 +++++++++-------------
.../linux-3.14/axxiapowerpc/preempt-rt/dbg.scc | 1 -
.../axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg | 11 ---
.../linux-3.14/axxiapowerpc/standard/dbg-hw.cfg | 5 --
.../axxiapowerpc/standard/dbg-non-hw.cfg | 75 ++++++++++++-------
.../linux-3.14/axxiapowerpc/standard/dbg.scc | 1 -
.../axxiapowerpc/standard/standard-non-hw.cfg | 22 ++++++
.../linux-3.14/axxiapowerpc/standard/standard.scc | 1 +
.../linux-3.14/axxiapowerpc/preempt-rt/defconfig | 2 +-
.../linux-3.14/axxiapowerpc/standard/defconfig | 2 +-
recipes-kernel/linux/dt-arm.inc | 52 +++++---------
recipes-kernel/linux/dt-axxia.inc | 7 +-
recipes-kernel/linux/frags-arm.inc | 2 +-
recipes-kernel/linux/linux-yocto-rt_3.14.bbappend | 7 +-
recipes-kernel/linux/linux-yocto-rt_3.14.inc | 14 ++--
recipes-kernel/linux/linux-yocto_3.14.bbappend | 7 +-
recipes-kernel/linux/linux-yocto_3.14.inc | 14 ++--
recipes-kernel/linux/lsi-public-rt_3.14.inc | 13 ----
recipes-kernel/linux/lsi-public_3.14.inc | 13 ----
recipes-kernel/linux/lsi-tip-rt_3.14.inc | 11 ++-
recipes-kernel/linux/lsi-tip_3.14.inc | 11 ++-
49 files changed, 383 insertions(+), 240 deletions(-)
delete mode 100644 recipes-kernel/linux/axxiaarm_preempt-rt_3.14.inc
delete mode 100644 recipes-kernel/linux/axxiaarm_standard_3.14.inc
delete mode 100644 recipes-kernel/linux/axxiapowerpc_preempt-rt_3.14.inc
delete mode 100644 recipes-kernel/linux/axxiapowerpc_standard_3.14.inc
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/dbg-non-hw.cfg
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/dbg.scc
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp-hw.cfg
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp.scc
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/preempt-rt/big-endian-hw.cfg
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/preempt-rt/big-endian-non-hw.cfg
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/preempt-rt/big-endian.scc
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/big-endian-hw.cfg
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/big-endian.scc
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/smmon.cfg
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/standard-non-hw.cfg
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/standard.scc
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp-hw.cfg
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp.scc
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg-hw.cfg
delete mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg-hw.cfg
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/standard-non-hw.cfg
create mode 100644 recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/standard.scc
delete mode 100644 recipes-kernel/linux/lsi-public-rt_3.14.inc
delete mode 100644 recipes-kernel/linux/lsi-public_3.14.inc
diff --git a/recipes-kernel/linux/axxiaarm_preempt-rt_3.14.inc b/recipes-kernel/linux/axxiaarm_preempt-rt_3.14.inc
deleted file mode 100644
index 3afc271..0000000
--- a/recipes-kernel/linux/axxiaarm_preempt-rt_3.14.inc
+++ /dev/null
@@ -1,10 +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('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.14.inc b/recipes-kernel/linux/axxiaarm_standard_3.14.inc
deleted file mode 100644
index 6391886..0000000
--- a/recipes-kernel/linux/axxiaarm_standard_3.14.inc
+++ /dev/null
@@ -1,9 +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('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.14.inc b/recipes-kernel/linux/axxiapowerpc_preempt-rt_3.14.inc
deleted file mode 100644
index 8bf68a0..0000000
--- a/recipes-kernel/linux/axxiapowerpc_preempt-rt_3.14.inc
+++ /dev/null
@@ -1,5 +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('TESTING', 'yes', 'file://testing.scc', 'file://non-testing.scc', d)} "
diff --git a/recipes-kernel/linux/axxiapowerpc_standard_3.14.inc b/recipes-kernel/linux/axxiapowerpc_standard_3.14.inc
deleted file mode 100644
index 5f66cd8..0000000
--- a/recipes-kernel/linux/axxiapowerpc_standard_3.14.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-# adding fragments with kernel options to the final .config
-KERNEL_EXTRA_FEATURES = ""
-SRC_URI += "file://common.scc \
- ${@base_conditional('TESTING', 'yes', 'file://testing.scc', 'file://non-testing.scc', d)} "
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/common-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/common-hw.cfg
index 5037891..96e8979 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/common-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/common-hw.cfg
@@ -105,7 +105,6 @@ 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
@@ -125,4 +124,3 @@ CONFIG_HID_ZEROPLUS=y
# I2C HID support
#
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/common-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/common-non-hw.cfg
index 683df46..18016cd 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/common-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/common-non-hw.cfg
@@ -35,10 +35,7 @@ CONFIG_LOG_BUF_SHIFT=14
# 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
@@ -46,7 +43,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
@@ -110,7 +107,6 @@ CONFIG_LLC=y
# CONFIG_NET_PKTGEN is not set
# CONFIG_RFKILL is not set
-
#
# Device Tree and Open Firmware support
#
@@ -174,11 +170,6 @@ CONFIG_VIRT_DRIVERS=y
# CONFIG_VIRTIO_BALLOON is not set
#
-# Common Clock Framework
-#
-CONFIG_COMMON_CLK_DEBUG=y
-
-#
# File systems
#
# CONFIG_EXT2_FS_XATTR is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/common.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/common.scc
index 84a7420..87d143b 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/common.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/common.scc
@@ -1,2 +1,4 @@
+include features/taskstats/taskstats.scc
+
kconf non-hardware common-non-hw.cfg
kconf hardware common-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/dbg-non-hw.cfg
new file mode 100644
index 0000000..a52ebbe
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/dbg-non-hw.cfg
@@ -0,0 +1,49 @@
+#.........................................................................
+# 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.
+#
+#.........................................................................
+
+#
+# Memory Debugging
+#
+CONFIG_DEBUG_PAGEALLOC=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_STACK_USAGE=y
+CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_VM_RB=y
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_DEBUG_PER_CPU_MAPS=y
+CONFIG_DEBUG_HIGHMEM=y
+
+#
+# Debug Lockups and Hangs
+#
+CONFIG_LOCKUP_DETECTOR=y
+# CONFIG_DETECT_HUNG_TASK is not set
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+
+#
+# Lock Debugging
+#
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
+CONFIG_LOCK_STAT=y
+CONFIG_DEBUG_ATOMIC_SLEEP=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/dbg.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/dbg.scc
new file mode 100644
index 0000000..01fcbff
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/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.14/axxiaarm/common/full-power-L2.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/full-power-L2.cfg
index 19b5cf4..1641a6b 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/full-power-L2.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/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.14/axxiaarm/common/full-power.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/full-power.cfg
index 99025a2..cc921c0 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/full-power.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/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.14/axxiaarm/common/low-power.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/low-power.cfg
index 5d3431b..6abe4b6 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/low-power.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/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.14/axxiaarm/common/smp-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp-hw.cfg
new file mode 100644
index 0000000..1cbf7ec
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp-hw.cfg
@@ -0,0 +1 @@
+CONFIG_SMP=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp.scc
new file mode 100644
index 0000000..c33e2da
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/smp.scc
@@ -0,0 +1 @@
+kconf hardware smp-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/testing.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/testing.cfg
index 93e2e30..6e2af3c 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/common/testing.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/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
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/preempt-rt/big-endian-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/preempt-rt/big-endian-hw.cfg
new file mode 100644
index 0000000..dee17a5
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/preempt-rt/big-endian-hw.cfg
@@ -0,0 +1,23 @@
+#.........................................................................
+# 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.
+#
+#.........................................................................
+
+#
+# Bus devices
+#
+# CONFIG_ARM_CCI is not set
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_NET_VENDOR_ARC=y
+# CONFIG_IGB_HWMON is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/preempt-rt/big-endian-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/preempt-rt/big-endian-non-hw.cfg
new file mode 100644
index 0000000..58c8bac
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/preempt-rt/big-endian-non-hw.cfg
@@ -0,0 +1,23 @@
+#.........................................................................
+# 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_KPROBES is not set
+
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/preempt-rt/big-endian.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/preempt-rt/big-endian.scc
new file mode 100644
index 0000000..c6da902
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/preempt-rt/big-endian.scc
@@ -0,0 +1,2 @@
+kconf hardware big-endian-hw.cfg
+kconf non-hardware big-endian-non-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/big-endian-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/big-endian-hw.cfg
new file mode 100644
index 0000000..bae44fa
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/big-endian-hw.cfg
@@ -0,0 +1,27 @@
+#.........................................................................
+# 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.
+#
+#.........................................................................
+
+#
+# Bus devices
+#
+# CONFIG_ARM_CCI is not set
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_NET_VENDOR_ARC=y
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SYSCON is not set
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/big-endian.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/big-endian.scc
new file mode 100644
index 0000000..ca42c3f
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/big-endian.scc
@@ -0,0 +1,4 @@
+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.14/axxiaarm/standard/smmon.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/smmon.cfg
new file mode 100644
index 0000000..dfd0836
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/smmon.cfg
@@ -0,0 +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.14/axxiaarm/standard/standard-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/standard-non-hw.cfg
new file mode 100644
index 0000000..0cbeb5a
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/standard-non-hw.cfg
@@ -0,0 +1 @@
+CONFIG_PREEMPT_NONE=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/standard.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiaarm/standard/standard.scc
new file mode 100644
index 0000000..609308f
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/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.14/axxiapowerpc/common/common-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/common-non-hw.cfg
index 5cd1e71..87d3b3d 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/common-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/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
#
@@ -36,6 +35,11 @@ CONFIG_SYSCTL_SYSCALL=y
# CONFIG_KPROBES is not set
#
+# Kernel Performance Events And Counters
+#
+CONFIG_PROFILING=y
+
+#
# GCOV-based kernel profiling
#
CONFIG_MODULE_FORCE_LOAD=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp-hw.cfg
new file mode 100644
index 0000000..1cbf7ec
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp-hw.cfg
@@ -0,0 +1 @@
+CONFIG_SMP=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp.scc
new file mode 100644
index 0000000..c33e2da
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/smp.scc
@@ -0,0 +1 @@
+kconf hardware smp-hw.cfg
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/testing.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/testing.cfg
index 93e2e30..6e2af3c 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/common/testing.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/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.14/axxiapowerpc/preempt-rt/dbg-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg-hw.cfg
deleted file mode 100644
index de5be4a..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/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.14/axxiapowerpc/preempt-rt/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg-non-hw.cfg
index c83622b..9ba0485 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg-non-hw.cfg
@@ -1,63 +1,50 @@
+#.........................................................................
+# 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
+# Memory Debugging
#
-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_PAGEALLOC=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_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_KMEMLEAK_DEFAULT_OFF=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_DEBUG_PER_CPU_MAPS=y
+CONFIG_DEBUG_HIGHMEM=y
+CONFIG_DEBUG_STACKOVERFLOW=y
#
-# RCU Debugging
+# Debug Lockups and Hangs
#
-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
+CONFIG_LOCKUP_DETECTOR=y
+# CONFIG_DETECT_HUNG_TASK is not set
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+
+#
+# Lock Debugging
+#
+CONFIG_DEBUG_RT_MUTEXES=y
+CONFIG_DEBUG_WW_MUTEX_SLOWPATH=y
+CONFIG_LOCK_STAT=y
+CONFIG_DEBUG_ATOMIC_SLEEP=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg.scc
index b5cd0eb..01fcbff 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/dbg.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/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.14/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg
index 7811f0a..7bbd1bf 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/preempt-rt/preempt-rt-non-hw.cfg
@@ -12,11 +12,6 @@
#.........................................................................
#
-# Processor support
-#
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-
-#
# RCU Subsystem
#
# CONFIG_RCU_BOOST is not set
@@ -25,9 +20,3 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
# Kernel Performance Events And Counters
#
CONFIG_SLUB_DEBUG=y
-
-#
-# IO Schedulers
-#
-CONFIG_UNINLINE_SPIN_UNLOCK=y
-CONFIG_MUTEX_SPIN_ON_OWNER=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg-hw.cfg
deleted file mode 100644
index de5be4a..0000000
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/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.14/axxiapowerpc/standard/dbg-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg-non-hw.cfg
index db1afba..08386e6 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg-non-hw.cfg
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg-non-hw.cfg
@@ -1,37 +1,68 @@
+#.........................................................................
+# 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
+# Kernel Performance Events And Counters
#
-CONFIG_DEBUG_SHIRQ=y
-CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_OPROFILE is not set
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
-CONFIG_SCHEDSTATS=y
-CONFIG_TIMER_STATS=y
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+CONFIG_MTD_NAND_EP501X_UBOOTENV=y
+
+#
+# Memory Debugging
+#
+CONFIG_DEBUG_PAGEALLOC=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_RT_MUTEXES=y
+CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
+CONFIG_DEBUG_STACK_USAGE=y
+CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_VM_RB=y
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_DEBUG_PER_CPU_MAPS=y
+
+#
+# Debug Lockups and Hangs
+#
+CONFIG_LOCKUP_DETECTOR=y
+# CONFIG_DETECT_HUNG_TASK is not set
+CONFIG_SCHEDSTATS=y
+CONFIG_TIMER_STATS=y
+#
+# Lock Debugging
+#
+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_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 +73,3 @@ 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.14/axxiapowerpc/standard/dbg.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg.scc
index b5cd0eb..01fcbff 100644
--- a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/dbg.scc
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/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.14/axxiapowerpc/standard/standard-non-hw.cfg b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/standard-non-hw.cfg
new file mode 100644
index 0000000..4995a26
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/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 options
+#
+CONFIG_PREEMPT_NONE=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_OPROFILE=y
diff --git a/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/standard.scc b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/standard.scc
new file mode 100644
index 0000000..609308f
--- /dev/null
+++ b/recipes-kernel/linux/conf/linux-yocto/linux-3.14/axxiapowerpc/standard/standard.scc
@@ -0,0 +1 @@
+kconf non-hardware standard-non-hw.cfg
diff --git a/recipes-kernel/linux/conf/lsi-tip/linux-3.14/axxiapowerpc/preempt-rt/defconfig b/recipes-kernel/linux/conf/lsi-tip/linux-3.14/axxiapowerpc/preempt-rt/defconfig
index f9a1113..fc0f0ce 100644
--- a/recipes-kernel/linux/conf/lsi-tip/linux-3.14/axxiapowerpc/preempt-rt/defconfig
+++ b/recipes-kernel/linux/conf/lsi-tip/linux-3.14/axxiapowerpc/preempt-rt/defconfig
@@ -83,7 +83,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE="powerpc-linux-"
# CONFIG_COMPILE_TEST is not set
CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
diff --git a/recipes-kernel/linux/conf/lsi-tip/linux-3.14/axxiapowerpc/standard/defconfig b/recipes-kernel/linux/conf/lsi-tip/linux-3.14/axxiapowerpc/standard/defconfig
index aca20e7..aae7bae 100644
--- a/recipes-kernel/linux/conf/lsi-tip/linux-3.14/axxiapowerpc/standard/defconfig
+++ b/recipes-kernel/linux/conf/lsi-tip/linux-3.14/axxiapowerpc/standard/defconfig
@@ -82,7 +82,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE="powerpc-linux-"
# CONFIG_COMPILE_TEST is not set
CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_LOCALVERSION_AUTO is not set
CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
diff --git a/recipes-kernel/linux/dt-arm.inc b/recipes-kernel/linux/dt-arm.inc
index 3343812..1d93f69 100644
--- a/recipes-kernel/linux/dt-arm.inc
+++ b/recipes-kernel/linux/dt-arm.inc
@@ -2,41 +2,25 @@ 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
+ 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}
}
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
+ 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"
}
diff --git a/recipes-kernel/linux/dt-axxia.inc b/recipes-kernel/linux/dt-axxia.inc
index 17cc002..c5e0cb8 100644
--- a/recipes-kernel/linux/dt-axxia.inc
+++ b/recipes-kernel/linux/dt-axxia.inc
@@ -4,7 +4,8 @@ mk_fit_images() {
oe_runmake ${name}.dtb
echo "pwd = `pwd`"
cd ../fit
- if [ "${KARCH}" = "arm" ] && [ "${KV}" = "3.10" ]; then
+ if [ "${KARCH}" = "arm" ]
+ then
oe_runmake "ARCH=${KARCH}" \
'DESCRIPTION=LSI Axxia Linux' \
"ADDRESS=${addr}" \
@@ -25,7 +26,8 @@ mk_fit_images() {
install_fit_images() {
name=$1
- if [ "${KARCH}" = "arm" ] && [ "${KV}" = "3.10" ]; then
+ if [ "${KARCH}" = "arm" ]
+ then
install ${B}/arch/${KARCH}/boot/dts/${name}.dtb ${DEPLOYDIR}/${name}.dtb
else
install ${B}/arch/${KARCH}/boot/${name}.dtb ${DEPLOYDIR}/${name}.dtb
@@ -33,5 +35,4 @@ install_fit_images() {
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/frags-arm.inc b/recipes-kernel/linux/frags-arm.inc
index 017adbc..c66f016 100644
--- a/recipes-kernel/linux/frags-arm.inc
+++ b/recipes-kernel/linux/frags-arm.inc
@@ -1,6 +1,6 @@
# 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('SMP', 'yes', 'file://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)} \
diff --git a/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend b/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
index f7caf79..a9698a6 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
+++ b/recipes-kernel/linux/linux-yocto-rt_3.14.bbappend
@@ -1,8 +1,13 @@
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"
+CHIPSET ?= "5500"
BIG_ENDIAN ?= "no"
DBG ?= "no"
TESTING ?= "no"
diff --git a/recipes-kernel/linux/linux-yocto-rt_3.14.inc b/recipes-kernel/linux/linux-yocto-rt_3.14.inc
index c873bce..572b719 100644
--- a/recipes-kernel/linux/linux-yocto-rt_3.14.inc
+++ b/recipes-kernel/linux/linux-yocto-rt_3.14.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.14.39"
-
KBRANCH = "standard/preempt-rt/axxia/base"
-KMETA = "meta"
-KREPO = "git://git.yoctoproject.org/linux-yocto-3.14.git"
-
-SRCREV_machine = "26e942373fbc26ec8a14492e4eff841221442b3e"
-SRCREV_meta = "288766d58bfdfd8b1cbfd4171a621fc44c1e1cf9"
-
-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_3.14.bbappend b/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 7e86155..5eca0b5 100644
--- a/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -1,8 +1,13 @@
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"
+CHIPSET ?= "5500"
BIG_ENDIAN ?= "no"
DBG ?= "no"
TESTING ?= "no"
diff --git a/recipes-kernel/linux/linux-yocto_3.14.inc b/recipes-kernel/linux/linux-yocto_3.14.inc
index 73a4edb..e22293a 100644
--- a/recipes-kernel/linux/linux-yocto_3.14.inc
+++ b/recipes-kernel/linux/linux-yocto_3.14.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.14.39"
-
KBRANCH = "standard/axxia/base"
-KMETA = "meta"
-KREPO = "git://git.yoctoproject.org/linux-yocto-3.14"
-
-SRCREV_machine = "f490412acb655a4573f7612a7fcfa806674a46f6"
-SRCREV_meta = "288766d58bfdfd8b1cbfd4171a621fc44c1e1cf9"
-
-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/lsi-public-rt_3.14.inc b/recipes-kernel/linux/lsi-public-rt_3.14.inc
deleted file mode 100644
index 42074ef..0000000
--- a/recipes-kernel/linux/lsi-public-rt_3.14.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#require linux-yocto.inc
-
-#LSI_KERNEL_TAG = "8.8.1.50"
-#LINUX_VERSION = "3.14.38-${LSI_KERNEL_TAG}"
-
-#KBRANCH = "standard/preempt-rt/lsi/base"
-#KREPO = "git://github.com/lsigithub/axxia_yocto_linux_3.14_private.git"
-
-#SRCREV_machine ?="560c64f461183102703fc60476db858f4bf4b25b"
-#SRCREV_meta ?="9c4ff467f66428488b1cd9798066a8cb5d6b4c3b"
-#SRCREV_machine = "${AUTOREV}"
-#SRCREV_meta = "${AUTOREV}"
diff --git a/recipes-kernel/linux/lsi-public_3.14.inc b/recipes-kernel/linux/lsi-public_3.14.inc
deleted file mode 100644
index 4025dbc..0000000
--- a/recipes-kernel/linux/lsi-public_3.14.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#require linux-yocto.inc
-
-#LSI_KERNEL_TAG = "8.8.1.50"
-#LINUX_VERSION = "3.14.38-${LSI_KERNEL_TAG}"
-
-#KBRANCH = "standard/axxia/base"
-#KREPO = "git://github.com/lsigithub/axxia_yocto_linux_3.14_private.git"
-
-#SRCREV_machine ?="e8262c2980bebc353ec42b15186536bf73611a2d"
-#SRCREV_meta ?="9c4ff467f66428488b1cd9798066a8cb5d6b4c3b"
-#SRCREV_machine = "${AUTOREV}"
-#SRCREV_meta = "${AUTOREV}"
diff --git a/recipes-kernel/linux/lsi-tip-rt_3.14.inc b/recipes-kernel/linux/lsi-tip-rt_3.14.inc
index 4445c8f..bcfa268 100644
--- a/recipes-kernel/linux/lsi-tip-rt_3.14.inc
+++ b/recipes-kernel/linux/lsi-tip-rt_3.14.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.14.39-${LSI_KERNEL_TAG}"
-
KBRANCH = "standard/preempt-rt/axxia/base"
-KREPO = "git://git@github.com/lsigithub/axxia_yocto_linux_3.14_private.git;protocol=ssh"
-
+KMETA = ""
+KREPO_KERNEL = "git://git@github.com/lsigithub/axxia_yocto_linux_3.14_private.git;protocol=ssh"
SRCREV_machine ="${AUTOREV}"
-SRCREV_meta ="${AUTOREV}"
-
-SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI = "${KREPO_KERNEL};branch=${KBRANCH};name=machine"
SRC_URI += "file://fit"
SRC_URI += "file://defconfig"
diff --git a/recipes-kernel/linux/lsi-tip_3.14.inc b/recipes-kernel/linux/lsi-tip_3.14.inc
index 3cfbaad..0dc4c06 100644
--- a/recipes-kernel/linux/lsi-tip_3.14.inc
+++ b/recipes-kernel/linux/lsi-tip_3.14.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.14.39-${LSI_KERNEL_TAG}"
-
KBRANCH = "standard/axxia/base"
-KREPO = "git://git@github.com/lsigithub/axxia_yocto_linux_3.14_private.git;protocol=ssh"
-
+KMETA = ""
+KREPO_KERNEL = "git://git@github.com/lsigithub/axxia_yocto_linux_3.14_private.git;protocol=ssh"
SRCREV_machine ="${AUTOREV}"
-SRCREV_meta ="${AUTOREV}"
-
-SRC_URI = "${KREPO};bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
+SRC_URI = "${KREPO_KERNEL};branch=${KBRANCH};name=machine"
SRC_URI += "file://fit"
SRC_URI += "file://defconfig"
--
1.9.1
More information about the meta-lsi
mailing list