diff options
author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-02 14:14:47 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-02 14:14:47 +0000 |
commit | 5a0f4ca1fec6af093195d0b0d2dfffb463c815ea (patch) | |
tree | c321adef102d72e0d66c5e2d4785928a45c08824 /conf | |
parent | 7a5388e17be3a3d4b3789edf8ecbd4366740f8b7 (diff) | |
parent | 76fd07d9e9def4526f1fd47517e9d8822e555177 (diff) |
merge of '907b09122e18d1c5bf7d911edc9c19d8eff6cfe4'
and '9f9ee853372a36ca4890047d0472edcab6e5c2f3'
Diffstat (limited to 'conf')
-rw-r--r-- | conf/distro/angstrom-2007.1.conf | 2 | ||||
-rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 20 | ||||
-rw-r--r-- | conf/machine/akita.conf | 2 | ||||
-rw-r--r-- | conf/machine/er0100.conf | 46 | ||||
-rw-r--r-- | conf/machine/htcuniversal.conf | 1 | ||||
-rw-r--r-- | conf/machine/hx4700.conf | 2 | ||||
-rw-r--r-- | conf/machine/include/motorola-ezx-base.inc | 3 | ||||
-rw-r--r-- | conf/machine/magician.conf | 2 | ||||
-rw-r--r-- | conf/machine/palmld.conf | 1 | ||||
-rw-r--r-- | conf/machine/rokre2.conf | 2 | ||||
-rw-r--r-- | conf/machine/rokre6.conf | 2 | ||||
-rw-r--r-- | conf/machine/spitz.conf | 2 |
12 files changed, 72 insertions, 13 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 9b3c3fed11..3b14fd82a9 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -312,7 +312,7 @@ PREFERRED_VERSION_glibc-initial ?= "2.5" PREFERRED_VERSION_busybox = "1.2.1" PREFERRED_VERSION_dbus ?= "1.0.2" -PREFERRED_VERSION_dbus-glib ?= "0.72" +PREFERRED_VERSION_dbus-glib ?= "0.74" PREFERRED_VERSION_wpa-supplicant = "0.5.5" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 3330ecff4d..26ae145486 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -17,12 +17,12 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "606" SRCREV_pn-gnuradio ?= "6377" -SRCREV_pn-hildon-1 ?= "13708" +SRCREV_pn-hildon-1 ?= "14173" SRCREV_pn-libgsmd ?= "2957" SRCREV_pn-libmokogsmd2 ?= "2950" SRCREV_pn-libmokojournal2 ?= "2780" SRCREV_pn-libmokopanelui2 ?= "2958" -SRCREV_pn-libmokoui2 ?= "3032" +SRCREV_pn-libmokoui2 ?= "3053" SRCREV_pn-libowl ?= "277" SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-hackndev-2.6 ?= "1308" @@ -33,7 +33,7 @@ SRCREV_pn-matchbox-desktop-2 ?= "1649" SRCREV_pn-matchbox-keyboard ?= "1675" SRCREV_pn-matchbox-keyboard-inputmethod ?= "1675" SRCREV_pn-matchbox-panel-2 ?= "1626" -SRCREV_moko-gtk-engine ?= "3029" +SRCREV_pn-moko-gtk-engine ?= "3058" SRCREV_pn-neod ?= "2956" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" @@ -41,7 +41,7 @@ SRCREV_pn-osb-jscore ?= "117" SRCREV_pn-osb-nrcit ?= "125" SRCREV_pn-osb-nrcore ?= "126" SRCREV_pn-openmoko-appmanager ?= "1851" -SRCREV_pn-openmoko-browser2 ?= "3031" +SRCREV_pn-openmoko-browser2 ?= "3061" SRCREV_pn-openmoko-calculator ?= "2404" SRCREV_pn-openmoko-calculator2 ?= "2789" SRCREV_pn-openmoko-common ?= "397" @@ -49,15 +49,15 @@ SRCREV_pn-openmoko-common2 ?= "2679" SRCREV_pn-openmoko-contacts ?= "2298" SRCREV_pn-openmoko-contacts2 ?= "335" SRCREV_pn-openmoko-dates ?= "467" -SRCREV_pn-openmoko-dates2 ?= "563" +SRCREV_pn-openmoko-dates2 ?= "617" SRCREV_pn-openmoko-dialer ?= "2811" SRCREV_pn-openmoko-dialer2 ?= "2976" -SRCREV_pn-openmoko-feedreader2 ?= "2944" +SRCREV_pn-openmoko-feedreader2 ?= "3060" SRCREV_pn-openmoko-finger-demo ?= "1671" SRCREV_pn-openmoko-firststart2 ?= "2873" SRCREV_pn-openmoko-footer ?= "2354" SRCREV_pn-openmoko-icon-theme-standard ?= "2232" -SRCREV_pn-openmoko-icon-theme-standard2 ?= "2967" +SRCREV_pn-openmoko-icon-theme-standard2 ?= "3055" SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "2967" SRCREV_pn-openmoko-keyboard ?= "1631" SRCREV_pn-openmoko-libs ?= "2367" @@ -85,7 +85,7 @@ SRCREV_pn-openmoko-theme-standard ?= "2370" SRCREV_pn-openmoko-theme-standard-qvga ?= "2370" SRCREV_pn-openmoko-theme-standard2 ?= "2964" SRCREV_pn-openmoko-theme-standard2-qvga ?= "2964" -SRCREV_pn-openmoko-today ?= "2556" +SRCREV_pn-openmoko-today ?= "3056" SRCREV_pn-openmoko-today2 ?= "2955" SRCREV_pn-openmoko-today2-folders ?= "2680" SRCREV_pn-openocd ?= "206" @@ -94,7 +94,9 @@ SRCREV_pn-psplash ?= "249" SRCREV_pn-settings-daemon ?= "1615" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "44" -SRCREV_pn-webkit-gtk ?= "25615" +SRCREV_pn-webkit-gtk ?= "25808" SRCREV_pn-xoo ?= "1623" SRCREV_pn-mplayer ?= "24587" +SRCREV_pn-networkmanager ?= "2887" +SRCREV_pn-networkmanager-applet ?= "200" diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 06d5946523..0f5eaca9cc 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -6,6 +6,8 @@ require conf/machine/include/zaurus-2.6.inc require conf/machine/include/zaurus-clamshell.inc PACKAGE_EXTRA_ARCHS += "iwmmxt" +MACHINE_FEATURES += "iwmmxt" + IMAGE_FSTYPES ?= "jffs2" ROOT_FLASH_SIZE = "58" diff --git a/conf/machine/er0100.conf b/conf/machine/er0100.conf new file mode 100644 index 0000000000..211091d929 --- /dev/null +++ b/conf/machine/er0100.conf @@ -0,0 +1,46 @@ +#@TYPE: Machine +#@NAME: iRex Iliad e-ink reader +#@DESCRIPTION: Machine configuration for the iRex Iliad e-ink reader + +# +# Hardware-based properties +# + +# CPU: Intel (now Marvell) PXA255 + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te" + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +require conf/machine/include/tune-xscale.inc + +# Fix us: + +#ROOT_FLASH_SIZE = "80" +#VOLATILE_STORAGE_SIZE = "64" +MACHINE_GUI_CLASS = "bigscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "768" +MACHINE_DISPLAY_HEIGHT_PIXELS = "1024" +MACHINE_FEATURES = "kernel24 touchscreen apm alsa pcmcia wifi usbgadget usbhost screen" + +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "linux-er0100" +PCMCIA_MANAGER = "pcmcia-cs" +MODUTILS = "24" +XSERVER = "xserver-kdrive-fbdev" + + +# +# Modules autoload and other boot properties +# +module_autoload_evdev = "evdev" +module_autoload_pcmcia = "pcmcia" + +#FIXME: this should be controlled by a userspace utility later. +module_autoload_g_ether = "g_ether" + +USE_VT = "0" +SERIAL_CONSOLE = "-L ttyS2 115200 vt100" + diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf index 634b388f96..c3e7cf710e 100644 --- a/conf/machine/htcuniversal.conf +++ b/conf/machine/htcuniversal.conf @@ -18,6 +18,7 @@ MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_FEATURES = "kernel26 apm alsa irda usbgadget usbhost keyboard touchscreen screen wifi bluetooth phone" +MACHINE_FEATURES += "iwmmxt" # # Software/packages selection diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf index 141470b5a4..87e03a7bdd 100644 --- a/conf/machine/hx4700.conf +++ b/conf/machine/hx4700.conf @@ -20,6 +20,7 @@ MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "480" MACHINE_DISPLAY_HEIGHT_PIXELS = "640" MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen" +MACHINE_FEATURES += "iwmmxt" # # Software/packages selection @@ -29,7 +30,6 @@ PCMCIA_MANAGER = "pcmciautils" MODUTILS = "26" XSERVER = "xserver-kdrive-w100" -PREFERRED_VERSION_xserver-kdrive = "1.2.0" PREFERRED_VERSION_orinoco-modules = "0.15rc1" diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc index 3912d8fc9b..87571c0db0 100644 --- a/conf/machine/include/motorola-ezx-base.inc +++ b/conf/machine/include/motorola-ezx-base.inc @@ -12,6 +12,9 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-ezx" #mtd3: 00020000 00020000 "Logo" MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen" +MACHINE_FEATURES += "iwmmxt" + + MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_DISPLAY_ORIENTATION = "0" diff --git a/conf/machine/magician.conf b/conf/machine/magician.conf index 60cc9af3d1..f7451cccb0 100644 --- a/conf/machine/magician.conf +++ b/conf/machine/magician.conf @@ -20,6 +20,8 @@ MACHINE_GUI_CLASS = "smallscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "240" MACHINE_DISPLAY_HEIGHT_PIXELS = "320" MACHINE_FEATURES = "alsa apm bluetooth irda kernel26 phone screen touchscreen usbgadget usbhost" +MACHINE_FEATURES += "iwmmxt" + # # We don't support jffs2 installations (yet). diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf index 2f92eb4158..bbeaf3a4a2 100644 --- a/conf/machine/palmld.conf +++ b/conf/machine/palmld.conf @@ -10,6 +10,7 @@ MACHINE_GUI_CLASS = "bigscreen" MACHINE_DISPLAY_WIDTH_PIXELS = "320" MACHINE_DISPLAY_HEIGHT_PIXELS = "480" MACHINE_FEATURES += "pcmcia wifi" +MACHINE_FEATURES += "iwmmxt" MACHINE_EXTRA_RRECOMMENDS += "\ diff --git a/conf/machine/rokre2.conf b/conf/machine/rokre2.conf index 621e95f166..1a99c877ce 100644 --- a/conf/machine/rokre2.conf +++ b/conf/machine/rokre2.conf @@ -6,3 +6,5 @@ require conf/machine/include/motorola-ezx-base.inc # there is no touchscreen MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen" +MACHINE_FEATURES += "iwmmxt" + diff --git a/conf/machine/rokre6.conf b/conf/machine/rokre6.conf index 7b20091140..044a65c9fa 100644 --- a/conf/machine/rokre6.conf +++ b/conf/machine/rokre6.conf @@ -4,5 +4,3 @@ require conf/machine/include/motorola-ezx-base.inc -# there is no touchscreen -MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 3199065606..32060d090c 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -5,6 +5,8 @@ require conf/machine/include/zaurus-2.6.inc require conf/machine/include/zaurus-clamshell.inc +MACHINE_FEATURES += "iwmmxt" + PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" PACKAGE_EXTRA_ARCHS += "iwmmxt" |