From d5aba072d2b080938d34643df4ea17a2b4014956 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 28 Nov 2007 10:37:27 +0000
Subject: sane-srcrevs.inc : increment gsmd and dialer2 in unison

---
 conf/distro/include/sane-srcrevs.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 11145fe330..f783d0993d 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -31,7 +31,7 @@ SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
 SRCREV_pn-libfakekey ?= "1455"
-SRCREV_pn-libgsmd ?= "3451"
+SRCREV_pn-libgsmd ?= "3519"
 SRCREV_pn-libgsmd-devel ?= "3293"
 SRCREV_pn-libjana ?= "697"
 SRCREV_pn-libmokogsmd2 ?= "3378"
@@ -71,7 +71,7 @@ SRCREV_pn-openmoko-contacts2 ?= "374"
 SRCREV_pn-openmoko-dates ?= "467"
 SRCREV_pn-openmoko-dates2 ?= "661"
 SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "3462"
+SRCREV_pn-openmoko-dialer2 ?= "3522"
 SRCREV_pn-openmoko-feedreader2 ?= "3080"
 SRCREV_pn-openmoko-finger-demo ?= "1671"
 SRCREV_pn-openmoko-firststart2 ?= "3158"
-- 
cgit 1.2.3-korg


From 8b7e242a7936122e1fd1b60fc46c0ce33b77f3d5 Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Wed, 28 Nov 2007 12:27:05 +0000
Subject: mpc8313e-rdb: use u-boot 1.3.0 instead of git

---
 conf/machine/mpc8313e-rdb.conf | 1 +
 packages/uboot/u-boot_git.bb   | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'conf')

diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf
index f32f78ee8a..3c47b53b56 100644
--- a/conf/machine/mpc8313e-rdb.conf
+++ b/conf/machine/mpc8313e-rdb.conf
@@ -10,6 +10,7 @@ PREFERRED_VERSION_u-boot = "git"
 
 MACHINE_FEATURES = "kernel26 usbhost ext2"
 
+PREFERRED_VERSION_u-boot = "1.3.0"
 UBOOT_MACHINE = "MPC8313ERDB_33_config"
 
 #don't try to access tty1
diff --git a/packages/uboot/u-boot_git.bb b/packages/uboot/u-boot_git.bb
index 55f56d841f..60ab0ab3f6 100644
--- a/packages/uboot/u-boot_git.bb
+++ b/packages/uboot/u-boot_git.bb
@@ -1,15 +1,10 @@
 require u-boot.inc
 PR="r1"
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
-DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
 
 SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git "
 SRC_URI_sequoia = "git://www.denx.de/git/u-boot.git;protocol=git;tag=cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 "
-SRC_URI_mpc8313e-rdb = "git://www.denx.de/git/u-boot.git;protocol=git;tag=c5441f61a3d8b7034f19fc1361183e936198e6dbb "
 
 S = "${WORKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-#inherit base
-- 
cgit 1.2.3-korg