linaro kernels overhaul

Some major refactoring to add LSK and open road for new hardware
models. Fix bigendian configuration as well.

5 files changed, 43 insertions, 18 deletions

diff --git a/meta-linaro/recipes-kernel/linux/linaro-kernel.inc b/meta-linaro/recipes-kernel/linux/linaro-kernel.inc
new file mode 100644
index 00000000..d79e6fac
--- /dev/null
+++ b/meta-linaro/recipes-kernel/linux/linaro-kernel.inc
@@ -0,0 +1,27 @@
+DESCRIPTION = "Linaro Kernel Basic support recipe"
+SECTION = "kernel"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+inherit kernel siteinfo
+require recipes-kernel/linux/linux-dtb.inc
+
+SRCREV = "${AUTOREV}"
+SRCREV_FORMAT = "kernel"
+S = "${WORKDIR}/git"
+
+COMPATIBLE_HOST = "arm.*"
+KERNEL_IMAGETYPE = "zImage"
+
+do_configure_prepend_arm() {
+    ARCH=arm scripts/kconfig/merge_config.sh -m linaro/configs/linaro-base.conf \
+      linaro/configs/distribution.conf linaro/configs/vexpress.conf \ 
+      linaro/configs/kvm-guest.conf linaro/configs/kvm-host.conf
+}
+
+do_configure_prepend_armeb() {
+    ARCH=arm scripts/kconfig/merge_config.sh -m linaro/configs/linaro-base.conf \
+      linaro/configs/distribution.conf linaro/configs/vexpress.conf \
+      linaro/configs/bigendian.conf
+}
+
diff --git a/meta-linaro/recipes-kernel/linux/linux-linaro_git.bb b/meta-linaro/recipes-kernel/linux/linux-linaro-aarch64.bb
index 6738d2ce..53800112 100644
--- a/meta-linaro/recipes-kernel/linux/linux-linaro_git.bb
+++ b/meta-linaro/recipes-kernel/linux/linux-linaro-aarch64.bb
@@ -1,4 +1,4 @@
-require linux-linaro.inc
+require linux-linaro-fastmodel.inc
 
 SRC_URI = " \
            git://git.linaro.org/kernel/linux-linaro-tracking.git;branch=linux-linaro;name=kernel \
diff --git a/meta-linaro/recipes-kernel/linux/linux-linaro.inc b/meta-linaro/recipes-kernel/linux/linux-linaro-fastmodel.inc
index a76ce5a2..284f912c 100644
--- a/meta-linaro/recipes-kernel/linux/linux-linaro.inc
+++ b/meta-linaro/recipes-kernel/linux/linux-linaro-fastmodel.inc
@@ -1,4 +1,4 @@
-DESCRIPTION = "Linaro Kernel For Aarch64"
+DESCRIPTION = "Linaro recipes for Aarch64 fast model kernels"
 SECTION = "kernel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
diff --git a/meta-linaro/recipes-kernel/linux/linux-linaro-stable-vexpress_git.bb b/meta-linaro/recipes-kernel/linux/linux-linaro-stable-vexpress_git.bb
new file mode 100644
index 00000000..bdd5f623
--- /dev/null
+++ b/meta-linaro/recipes-kernel/linux/linux-linaro-stable-vexpress_git.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Linaro Stable Kernel For Vexpress/KVM"
+
+require linaro-kernel.inc
+
+PV = "3.10+git${SRCPV}"
+
+KERNEL_DEVICETREE = "vexpress-v2p-ca15-tc1.dtb"
+
+BOOTARGS_COMMON = "root=/dev/mmcblk0p2 console=ttyAMA0 consolelog=9 mem=1024M rw rootwait"
+
+SRC_URI = "git://git.linaro.org/kernel/linux-linaro-stable.git;branch=lsk"
+
+
diff --git a/meta-linaro/recipes-kernel/linux/linux-linaro-vexpress_git.bb b/meta-linaro/recipes-kernel/linux/linux-linaro-vexpress_git.bb
index ea89b811..36a3624b 100644
--- a/meta-linaro/recipes-kernel/linux/linux-linaro-vexpress_git.bb
+++ b/meta-linaro/recipes-kernel/linux/linux-linaro-vexpress_git.bb
@@ -1,28 +1,13 @@
 DESCRIPTION = "Linaro Kernel For Vexpress/KVM"
-SECTION = "kernel"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-inherit kernel siteinfo
-require recipes-kernel/linux/linux-dtb.inc
+require linaro-kernel.inc
 
 PV = "3.11+git${SRCPV}"
 
-SRCREV = "${AUTOREV}"
-SRCREV_FORMAT = "kernel"
-S = "${WORKDIR}/git"
-
-COMPATIBLE_HOST = "arm.*"
-KERNEL_IMAGETYPE = "zImage"
 KERNEL_DEVICETREE = "vexpress-v2p-ca15-tc1.dtb"
 
 BOOTARGS_COMMON = "root=/dev/mmcblk0p2 console=ttyAMA0 consolelog=9 mem=1024M rw rootwait"
 
 SRC_URI = "git://git.linaro.org/kernel/linux-linaro-tracking.git;branch=linux-linaro"
 
-do_configure_prepend() {
-    ARCH=arm scripts/kconfig/merge_config.sh -m linaro/configs/linaro-base.conf \
-      linaro/configs/distribution.conf linaro/configs/vexpress.conf \ 
-      linaro/configs/kvm-guest.conf linaro/configs/kvm-host.conf
-}