diff options
| author | Koen Kooi <koen@openembedded.org> | 2005-10-03 18:46:08 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-10-03 18:46:08 +0000 |
| commit | 6b5075fa761e23d7e4e6550dcbcf3eb5fafdf7d2 (patch) | |
| tree | 2c9ebaff03ec3e629246c473d0e355902bd6aae9 | |
| parent | a87f32891d055ce760ae9b51604a362df4bd1545 (diff) | |
| parent | 3ff7b2a5cbb65798ab1257526ed09dd44f7e5ef3 (diff) | |
merge of 87173fb74721cf392e0e3b101c9f04c6b8e7f02d
and c3faa03a1a4d2231cb4f0f7fa31dac6d4b183100
| -rw-r--r-- | conf/machine/simpad-2.4.conf | 16 | ||||
| -rw-r--r-- | conf/machine/simpad-2.6.conf | 9 | ||||
| -rw-r--r-- | conf/machine/simpad.conf | 11 |
3 files changed, 7 insertions, 29 deletions
diff --git a/conf/machine/simpad-2.4.conf b/conf/machine/simpad-2.4.conf deleted file mode 100644 index a26bc5c04e..0000000000 --- a/conf/machine/simpad-2.4.conf +++ /dev/null @@ -1,16 +0,0 @@ -PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0" - -# Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" - -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules \ -pcmcia-cs apmd hostap-utils \ -wpa-supplicant-nossl" - -BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules orinoco-modules \ -orinoco-modules-cs pcmcia-cs apm hostap-utils \ -wpa-supplicant-nossl" - -BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \ -kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ -kernel-module-pcnet-cs kernel-module-8390" diff --git a/conf/machine/simpad-2.6.conf b/conf/machine/simpad-2.6.conf deleted file mode 100644 index 1a5bd38989..0000000000 --- a/conf/machine/simpad-2.6.conf +++ /dev/null @@ -1,9 +0,0 @@ -PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" - -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross" - -BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel hostap-modules hostap-utils orinoco-modules wpa-supplicant-nossl" -BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel" -BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \ -kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ -kernel-module-pcnet-cs kernel-module-8390" diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 0447099204..119e11b064 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -5,9 +5,14 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa-2.6" +PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod-2.6:module-init-tools-cross" -KERNEL_VERSION ?= "2.4" -include conf/machine/simpad-${KERNEL_VERSION}.conf +BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel hostap-modules orinoco-modules " +BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel" +BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs \ +kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ +kernel-module-pcnet-cs kernel-module-8390" # This is needed for the ramdisk script to work BOOTSTRAP_EXTRA_DEPENDS += "e2fsprogs" @@ -21,8 +26,6 @@ USE_DEVFS = "1" GUI_MACHINE_CLASS = "bigscreen" ROOT_FLASH_SIZE = "24" USE_VT = "0" -GPE_EXTRA_DEPENDS += "gaim sylpheed" -GPE_EXTRA_INSTALL += "gaim sylpheed" include conf/machine/handheld-common.conf include conf/machine/tune-strongarm.conf |