diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-07-19 20:19:04 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-19 20:19:04 +0000 |
| commit | 48cfa786504fc72c1ae2663374ef34233cbf448c (patch) | |
| tree | 831213c9900e904cada4991892dd5a4b32918ef9 /conf | |
| parent | 8b1c4a494721baaffe283cb55c204d444ca57770 (diff) | |
| parent | 4d0a097e128e46bd4c7616881f2b8a53acdd27c2 (diff) | |
propagate from branch 'org.openembedded.dev' (head 93d082d6c4a3db13947817853eef91fb326fc223)
to branch 'org.openembedded.nslu2-linux' (head 3d6cac6f54eff620f4ea72c01aace1b87353dca8)
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/c7x0.conf | 2 | ||||
| -rw-r--r-- | conf/machine/nokia770.conf | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 122f2de435..c5e42a2bed 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -2,7 +2,7 @@ #@NAME: Sharp Zaurus SL-C7x0 #@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices -KERNEL_VERSION ?= "2.4" +KERNEL_VERSION ?= "2.6" include conf/machine/zaurus-clamshell.conf include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index a922d5b4da..7a39104c63 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -6,7 +6,6 @@ IPKG_ARCHS = "all arm armv4 armv5te" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap" PREFERRED_PROVIDER_virtual/bootloader = "" -#PREFERRED_PROVIDER_virtual/tslib = "tslib-maemo" XSERVER = "xserver-kdrive-omap" @@ -26,17 +25,18 @@ ROOT_FLASH_SIZE = "123" EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 --no-cleanmarkers" # serial console port on devboard rev. B3 -SERIAL_CONSOLE = "115200 tts/0" +#SERIAL_CONSOLE = "115200 tts/0" +SERIAL_CONSOLE = "115200 ttyS0" #build omap1 till nokia releases the patches PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev 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 = "udev sysfsutils nokia770-init \ -pcmcia-cs apm ppp wireless-tools udev-utils console-tools" +BOOTSTRAP_EXTRA_RDEPENDS = "sysfsutils nokia770-init \ +pcmcia-cs apm ppp wireless-tools console-tools" # NFS Modules #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" |