diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-11-28 13:47:18 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-11-28 13:47:18 +0000 |
| commit | e62d4f8fe52a7f84ae5b17079b05403e9d1c8629 (patch) | |
| tree | 34ae102794781c7fe9c58ccdcaaa28f29cc4a9a3 /conf | |
| parent | c41b9e3684fcea46ba4199ea25b412401cdb1ae3 (diff) | |
| parent | 8b7e242a7936122e1fd1b60fc46c0ce33b77f3d5 (diff) | |
merge of '1e54b4f2db4e8ef4f33743de51d73d55e8b83a96'
and '33e5bd40976428aea7682da1e3cb6ed9c93af23e'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 4 | ||||
| -rw-r--r-- | conf/machine/mpc8313e-rdb.conf | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index d2a86da256..df8ebd2a74 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" @@ -72,7 +72,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" 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 |