[meta-lsi] [PATCH 19/86] u-boot-lsi: Separate u-boot recipes for arm and ppc

[Daniel Dragomir]

From: Paul Butler <paul.butler at windriver.com>

Split ppc version of u-boot to use v2010.03 branch and
arm version to use v2013.01.01

Signed-off-by: Paul Butler <paul.butler at windriver.com>
---
 conf/machine/elpaso.conf                    |  2 +-
 recipes-bsp/u-boot/u-boot-emu_2013.01.01.bb |  3 +++
 recipes-bsp/u-boot/u-boot-lsi.inc           |  4 ----
 recipes-bsp/u-boot/u-boot-lsi_2010.03.bb    | 18 ++++++++++++++++++
 recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb |  4 +++-
 5 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 recipes-bsp/u-boot/u-boot-lsi_2010.03.bb

diff --git a/conf/machine/elpaso.conf b/conf/machine/elpaso.conf
index 4e3cb0c..077665c 100644
--- a/conf/machine/elpaso.conf
+++ b/conf/machine/elpaso.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the LSI elpaso systems
 
 PREFERRED_VERSION_linux-yocto ?= "3.4%"
-PREFERRED_VERSION_u-boot-lsi ?= "2013.01.01%"
+PREFERRED_VERSION_u-boot-lsi ?= "2010.03%"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 
 MACHINE_FEATURES += ""
diff --git a/recipes-bsp/u-boot/u-boot-emu_2013.01.01.bb b/recipes-bsp/u-boot/u-boot-emu_2013.01.01.bb
index 3941475..e61903b 100644
--- a/recipes-bsp/u-boot/u-boot-emu_2013.01.01.bb
+++ b/recipes-bsp/u-boot/u-boot-emu_2013.01.01.bb
@@ -1,5 +1,8 @@
 require u-boot-lsi.inc
 
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
+
 PROVIDES = "virtual/bootemu"
 
 UBOOT_EMU = "-emu"
diff --git a/recipes-bsp/u-boot/u-boot-lsi.inc b/recipes-bsp/u-boot/u-boot-lsi.inc
index df21df4..f8f865a 100644
--- a/recipes-bsp/u-boot/u-boot-lsi.inc
+++ b/recipes-bsp/u-boot/u-boot-lsi.inc
@@ -83,10 +83,6 @@ do_deploy () {
 
 addtask deploy before do_build after do_compile
 
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
-
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-bsp/u-boot/u-boot-lsi_2010.03.bb b/recipes-bsp/u-boot/u-boot-lsi_2010.03.bb
new file mode 100644
index 0000000..4105213
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-lsi_2010.03.bb
@@ -0,0 +1,18 @@
+require u-boot-lsi.inc
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b"
+
+PROVIDES = "virtual/bootloader"
+
+UBOOT_MACHINE_elpaso = "ACP344xV2_stage3_config"
+
+SPL_BINARY = ""
+
+# This revision corresponds to the tag "lsi_axxia_u-boot_4.8.1.83"
+SRCREV = "lsi_axxia_u-boot_4.8.1.83"
+
+PV = "2010.03+${SRCREV}"
+PR = "r1"
+
+SRC_URI = "git://github.com/lsigithub/lsi_axxia_uboot_public.git"
diff --git a/recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb b/recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb
index 6745b25..9cc0ede 100644
--- a/recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb
+++ b/recipes-bsp/u-boot/u-boot-lsi_2013.01.01.bb
@@ -1,8 +1,10 @@
 require u-boot-lsi.inc
 
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
+
 PROVIDES = "virtual/bootloader"
 
-UBOOT_MACHINE_elpaso = "axxia-344x_config"
 UBOOT_MACHINE_axm5500sim = "axxia-55xx_config"
 UBOOT_MACHINE_axm5500 = "axxia-55xx_config"
 
-- 
1.8.1.4