summaryrefslogtreecommitdiff
path: root/conf/machine/tosa.conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine/tosa.conf')
-rw-r--r--conf/machine/tosa.conf26
1 files changed, 6 insertions, 20 deletions
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index be495925c1..f742bed742 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -4,24 +4,9 @@
TARGET_ARCH = "arm"
IPKG_ARCHS = "all arm ${MACHINE}"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
-BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel hostap-modules \
- orinoco-modules sharp-sdmmc-support usbutils"
-BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm \
- kernel-module-evdev kernel-module-net-fd \
- kernel-module-pxa-bi kernel-module-registers \
- kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \
- kernel-module-usb-storage \
- kernel hostap-modules-cs orinoco-modules-cs \
- sharp-sdmmc-support kernel-module-pxa-bi \
- kernel-module-ip-gre \
- kernel-module-irnet kernel-module-ipip kernel-module-usbcore \
- kernel-module-usbdcore kernel-module-usbdmonitor"
-
-RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \
- kernel-module-usbmouse kernel-module-hid usbutils \
- kernel-module-evdev"
+
+KERNEL_VERSION ?= "2.4"
+include conf/machine/tosa-${KERNEL_VERSION}.conf
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
@@ -31,7 +16,8 @@ GUI_MACHINE_CLASS = "bigscreen"
GPE_EXTRA_DEPENDS += "gaim"
include conf/machine/handheld-common.conf
-# not using tune-xscale.conf so as to retain backwards compatibility
-include conf/machine/tune-strongarm.conf
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/tune-xscale.conf
SERIAL_CONSOLE = "115200 ttyS0"