diff options
| author | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-08-13 21:03:19 +0000 |
|---|---|---|
| committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2008-08-13 21:03:19 +0000 |
| commit | dca6669ef90362cd04fe00cd13d2fc3789da54db (patch) | |
| tree | 1d06a4c1ca9e112c3e3e3ac243cee9fa599b5f4f /conf | |
| parent | 4acf5f7f80476332ce559060194561b4be78a893 (diff) | |
| parent | ac79b51ec2d8cae059f63f4c87090d8e38e94f47 (diff) | |
merge of '11752201b0467d112cbc4a2fd6b4e3bafa1a66a2'
and '461b0f25ec4df76026bbc143ddf9a76a9690fd9e'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 7 | ||||
| -rw-r--r-- | conf/machine/om-gta01.conf | 4 | ||||
| -rw-r--r-- | conf/machine/om-gta02.conf | 5 |
3 files changed, 7 insertions, 9 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 3b86c2a539..71b5ee7e4a 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -71,7 +71,7 @@ SRCREV_pn-lightmediascanner ?= "68" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "1066" -SRCREV_pn-linux-openmoko ?= "241f69c55ee8f5dd067ebd2d51aa9fdedb212759" +SRCREV_pn-linux-openmoko ?= "88bf43840b9df0eb0a077a1394eb564be80a412e" SRCREV_pn-linux-openmoko-devel ?= "7a1370a816b9348dd8f36a667905dd3533cefc9b" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" @@ -146,13 +146,10 @@ SRCREV_pn-opkg-utils ?= "4534" SRCREV_pn-opkg-utils-native ?= "4534" SRCREV_pn-oprofileui ?= "173" SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5" +SRCREV_pn-portaudio-v19 ?= "1387" SRCREV_pn-psplash ?= "249" SRCREV_pn-pty-forward-native ?= "4214" SRCREV_pn-python-etk ?= "8b51535150cbc88467e3d8b578e54df27eac643" -SRCREV_pn-python-odeviced ?= "fcf6f975b18d478ce618284c0dcc2f28f5c43cc1" -SRCREV_pn-python-oeventd ?= "9053e5be847d694681c3664664ed669543a0a777" -SRCREV_pn-python-ophoned ?= "82c318b8592588bc7ce8bccdfc090e59cfc9b98c" -SRCREV_pn-python-ousaged ?= "836c091405eea3e29efdba3e1351befd1c96267b" SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141" SRCREV_pn-pylgrim ?= "20" SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a" diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf index 46bd42f2a2..57d81c2ade 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -1,7 +1,7 @@ #----------------------------------------------------------------------------- #@TYPE: Machine -#@NAME: FIC GTA01 (Neo1973) -#@DESCRIPTION: Machine configuration for the FIC Neo1973/1 GSM phone +#@NAME: FIC GTA01 (Neo 1973) +#@DESCRIPTION: Machine configuration for the FIC Neo 1973 GSM phone #----------------------------------------------------------------------------- TARGET_ARCH = "arm" diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index 45dc0518a4..88aa3881c7 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -1,7 +1,7 @@ #----------------------------------------------------------------------------- #@TYPE: Machine -#@NAME: FIC GTA02 (Neo1973) -#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone +#@NAME: Openmoko GTA02 (NeoFreerunner) +#@DESCRIPTION: Machine configuration for the Openmoko NeoFreerunner GSM phone #----------------------------------------------------------------------------- TARGET_ARCH = "arm" @@ -29,6 +29,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-snd-soc-neo1973-gta02-wm8753 \ " +# no need to bypass this as in om-gta01, since this model is not using a multiplexed ttySAC0 SERIAL_CONSOLE = "115200 ttySAC2" # used by some images |