diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2005-08-02 14:33:11 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-02 14:33:11 +0000 |
| commit | 6e9c13bef7bb3e61ce83bd73835981baef9bcf99 (patch) | |
| tree | c9e373709024812c70677dc91ea68f1bbc0212ff /conf/machine | |
| parent | e81b6c9a43a223c2f268a6b26b7b029d05d0f781 (diff) | |
| parent | 589dd12e17a7758a01668da58cbfd951d05c2808 (diff) | |
merge of 8d3e2ffe587553463ee2931a0a34ed3432e24242
and e352ade7802a08469abd04dfa8426f919d07c9e6
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/nokia770.conf | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index 7a39104c63..c928093855 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -11,10 +11,8 @@ XSERVER = "xserver-kdrive-omap" # 800x480 is big enough for me GUI_MACHINE_CLASS = "bigscreen" -GPE_EXTRA_DEPENDS += "gaim sylpheed" -GPE_EXTRA_INSTALL += "gaim sylpheed" - -include conf/machine/handheld-common.conf +GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser" +GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. include conf/machine/tune-arm926ejs.conf @@ -32,10 +30,10 @@ SERIAL_CONSOLE = "115200 ttyS0" #build omap1 till nokia releases the patches PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel sysfsutils nokia770-init \ +BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel sysfsutils nokia770-init \ pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin" -BOOTSTRAP_EXTRA_RDEPENDS = "sysfsutils nokia770-init \ +BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \ pcmcia-cs apm ppp wireless-tools console-tools" # NFS Modules @@ -56,3 +54,7 @@ pcmcia-cs apm ppp wireless-tools console-tools" #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \ # kernel-module-g-ether" +include conf/machine/handheld-common.conf + + + |