summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2006-09-27 20:35:23 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2006-09-27 20:35:23 +0000
commit12ccaa08c41a76debd4f792db8d4704d3737ee5a (patch)
treee167e3e9ab6dccada4485e1c0fd87729b4ab77cb /conf/machine
parentcf572f9d2cc1949a0beeec264726ee1b8ecc44fe (diff)
omap5912osk.conf: transformed into task-base format (old config commented as part of it will probably need to be added into MACHINE_EXTRA_RRECOMMENDS)
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/omap5912osk.conf46
1 files changed, 30 insertions, 16 deletions
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index 3ae0064c46..ea86d0c5cc 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -7,8 +7,6 @@ IPKG_EXTRA_ARCHS = "armv5te"
HOTPLUG = "udev"
-#MACHINE_TASK_PROVIDER = "task-bootstrap"
-
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
@@ -19,25 +17,41 @@ PREFERRED_VERSION_u-boot = "LABEL.2006.06.30.2020"
PREFERRED_VERSION_linux-omap1 = "2.6.x+git"
#PREFERRED_VERSION_linux-omap1 = "2.6.12-rc2"
-BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
-
SERIAL_CONSOLE ?= "115200 ttyS0"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+MACHINE_FEATURES = "kernel26 pcmcia usbhost"
+
+MACHINE_TASK_PROVIDER = "task-base"
+
+MACHINE_EXTRA_RRECOMMENDS = "kernel-module-ide-cs \
+ kernel-module-ide-disk \
+ kernel-module-ide-core \
+ kernel-module-nls-iso8859-1 \
+ kernel-module-nls-cp437 \
+ kernel-module-nls-base \
+ kernel-module-vfat"
+
+include conf/machine/include/tune-arm926ejs.conf
+
+# old modules setup - partially need to be added into MACHINE_EXTRA_RRECOMMENDS
+
# PCMCIA Modules
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia"
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-omap-cf"
+##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia"
+##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-omap-cf"
+
# IDE modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-cs kernel-module-ide-disk"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-core"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-cs kernel-module-ide-disk"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ide-core"
+
# DOS and VFAT modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-msdos kernel-module-nls-iso8859-1"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nls-cp437 kernel-module-nls-base"
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-vfat kernel-module-fat"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-msdos kernel-module-nls-iso8859-1"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nls-cp437 kernel-module-nls-base"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-vfat kernel-module-fat"
+
# Video er LCD Driver
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-fb kernel-module-cfbimgblt kernel-module-cfbcopyarea"
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kernel-module-softcursor"
-# DSP Interface
-#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp"
+##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-fb kernel-module-cfbimgblt kernel-module-cfbcopyarea"
+##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kernel-module-softcursor"
-include conf/machine/include/tune-arm926ejs.conf
+# DSP Interface
+##BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp"