From 2bae56cfdc0f797f6a680a37280ae8cbbdd45e7a Mon Sep 17 00:00:00 2001
From: Sam Nelson <sam.nelson@ti.com>
Date: Wed, 5 Feb 2014 17:52:07 -0500
Subject: linux-keystone: Update to linux kernel version 3.10

- Updated Source URL & version
- Added device tree file
- Added LOADADDR extra args
- Added PV 3.10.10

Signed-off-by: Sam Nelson <sam.nelson@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
 .../linux/linux-keystone-3.8.4/defconfig           |  1 -
 recipes-kernel/linux/linux-keystone/defconfig      |  1 +
 recipes-kernel/linux/linux-keystone_3.10.bb        | 32 ++++++++++++++++++++++
 recipes-kernel/linux/linux-keystone_3.8.4.bb       | 28 -------------------
 4 files changed, 33 insertions(+), 29 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-keystone-3.8.4/defconfig
 create mode 100644 recipes-kernel/linux/linux-keystone/defconfig
 create mode 100644 recipes-kernel/linux/linux-keystone_3.10.bb
 delete mode 100644 recipes-kernel/linux/linux-keystone_3.8.4.bb

diff --git a/recipes-kernel/linux/linux-keystone-3.8.4/defconfig b/recipes-kernel/linux/linux-keystone-3.8.4/defconfig
deleted file mode 100644
index 04e6b178..00000000
--- a/recipes-kernel/linux/linux-keystone-3.8.4/defconfig
+++ /dev/null
@@ -1 +0,0 @@
-use-kernel-config=keystone2_defconfig
diff --git a/recipes-kernel/linux/linux-keystone/defconfig b/recipes-kernel/linux/linux-keystone/defconfig
new file mode 100644
index 00000000..04e6b178
--- /dev/null
+++ b/recipes-kernel/linux/linux-keystone/defconfig
@@ -0,0 +1 @@
+use-kernel-config=keystone2_defconfig
diff --git a/recipes-kernel/linux/linux-keystone_3.10.bb b/recipes-kernel/linux/linux-keystone_3.10.bb
new file mode 100644
index 00000000..2384ede8
--- /dev/null
+++ b/recipes-kernel/linux/linux-keystone_3.10.bb
@@ -0,0 +1,32 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for TI Keystone devices"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
+
+COMPATIBLE_MACHINE = "keystone"
+
+inherit kernel
+
+require recipes-kernel/linux/linux-dtb.inc
+require recipes-kernel/linux/setup-defconfig.inc
+
+MACHINE_KERNEL_PR_append = "a+gitr${SRCPV}"
+PR = "${MACHINE_KERNEL_PR}"
+
+KERNEL_DEVICETREE_keystone-evm = "k2hk-evm.dtb"
+
+KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
+
+#This commit corresponds to "K2_LINUX_03.10.10_13.12"
+SRCREV = "335d14b1c2ce23585835243126c6acba89067ecf"
+PV = "3.10.10"
+
+BRANCH = "master"
+SRC_URI = "git://git.ti.com/keystone-linux/linux.git;protocol=git;branch=${BRANCH}\
+           file://defconfig\
+           "
+
+S = "${WORKDIR}/git"
+
+RDEPENDS_kernel-base = ""
+
diff --git a/recipes-kernel/linux/linux-keystone_3.8.4.bb b/recipes-kernel/linux/linux-keystone_3.8.4.bb
deleted file mode 100644
index d176f145..00000000
--- a/recipes-kernel/linux/linux-keystone_3.8.4.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-SECTION = "kernel"
-DESCRIPTION = "Linux kernel for TI Keystone devices"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-inherit kernel
-
-require recipes-kernel/linux/linux-dtb.inc
-require recipes-kernel/linux/setup-defconfig.inc
-
-KERNEL_DEVICETREE_keystone-evm = "k2hk-evm.dtb"
-
-COMPATIBLE_MACHINE = "keystone"
-
-S = "${WORKDIR}/git"
-
-BRANCH = "sept-2013/master"
-
-# This commit corresponds to K2_LINUX_03.08.04_13.09 tag
-SRCREV = "20a48dc5309c4434650baef2b6072b5f1016f946"
-
-# Append to the MACHINE_KERNEL_PR so that a new SRCREV will cause a rebuild
-MACHINE_KERNEL_PR_append = "a+gitr${SRCPV}"
-PR = "${MACHINE_KERNEL_PR}"
-
-SRC_URI = "git://arago-project.org/git/projects/linux-keystone.git;protocol=git;branch=${BRANCH}\
-           file://defconfig\
-          "
-- 
cgit v1.2.3-54-g00ecf