summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-05-20 16:39:43 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-05-20 16:39:43 +0000
commit805db11121f7e1d4ba1d6fae44d2199d5f30f088 (patch)
treef2d0f5c2f67c42665ffeb498f51dfff8606dcde3 /conf
parent6ac77015a5c25b62ae74df0c70065e3a46f14c64 (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/05/20 09:26:10-07:00 amd.com!jcrouse Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into forsteri.amd.com:/users/jcrouse/bk/openembedded 2005/05/20 09:25:44-07:00 amd.com!jcrouse libxfce4util_4.2.2.bb: Stage .m4s needed by other XFCE apps delete unneeded 4.0.5 files 2005/05/20 17:53:28+02:00 hrw.one.pl!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into home.hrw.one.pl:/tmp/oe/openembedded 2005/05/20 17:09:33+02:00 hrw.one.pl!hrw Add flags to help build omniorb into site files (patch by Philip Balister) 2005/05/20 17:08:07+02:00 hrw.one.pl!hrw kernel changes for omap5912osk dev board (patch by Philip Balister) 2005/05/20 17:07:06+02:00 hrw.one.pl!hrw switched distro openomap to glibc (patch by Philip Balister) 2005/05/20 17:05:35+02:00 hrw.one.pl!hrw added xerces-c 2.6.0 (patch by Philip Balister) 2005/05/20 17:04:31+02:00 hrw.one.pl!hrw added linux-omap1 2.6.12-rc2 (patch by Philip Balister) 2005/05/20 17:02:43+02:00 hrw.one.pl!hrw added omnievents 2.6.1 (patch by Philip Balister) 2005/05/20 17:01:57+02:00 hrw.one.pl!hrw added omniorb 4.0.5 (patch by Philip Balister) 2005/05/19 11:43:11-07:00 amd.com!jcrouse Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into forsteri.amd.com:/users/jcrouse/bk/openembedded 2005/05/19 11:09:32-07:00 amd.com!jcrouse Remove xfce 4.0.5 etal, and add 4.2.2 (I hope) BKrev: 428e12cf4xX-FRlRWgIlZ-_FowE0HQ
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/openomap.conf2
-rw-r--r--conf/machine/omap5912osk.conf18
2 files changed, 18 insertions, 2 deletions
diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf
index af0f52a4a6..6f0bca9342 100644
--- a/conf/distro/openomap.conf
+++ b/conf/distro/openomap.conf
@@ -3,7 +3,7 @@
#@DESCRIPTION: OE Distribution for TI OMAP Development Boards
INHERIT += " package_ipk debian"
-TARGET_OS ?= "linux-uclibc"
+TARGET_OS = "linux"
TARGET_FPU ?= "soft"
# 2.4 vs 2.6 is a distro decision.
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index a01e970665..de21822b15 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -6,7 +6,7 @@ TARGET_ARCH = "arm"
IPKG_ARCHS = "all arm armv5te ${MACHINE}"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral"
@@ -15,4 +15,20 @@ BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
SERIAL_CONSOLE ?= "115200 ttyS0"
EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
+# PCMCIA Modules
+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"
+# 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"
+# 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"
+
include conf/machine/tune-arm926ejs.conf