summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorPhilip Balister <philip@balister.org>2006-08-30 21:52:52 +0000
committerPhilip Balister <philip@balister.org>2006-08-30 21:52:52 +0000
commitac7135e9c90c73e8c3fab13b7209b8e2f64910e7 (patch)
tree1c644377a4ed55fa67a69aac01c6d832c41221e8 /conf
parentb777f492ed8bfd26d409f31cfafb724f1ed62848 (diff)
Update openomap distro and omap5912osk machine file with fixes to
allow the OSK to boot. Includes changes to the kernel config to add TMPFS to the kernel config. The deployed fstab may need some tweaking still.
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/openomap.conf3
-rw-r--r--conf/machine/omap5912osk.conf4
2 files changed, 5 insertions, 2 deletions
diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf
index fb06ca7f47..71690ac62f 100644
--- a/conf/distro/openomap.conf
+++ b/conf/distro/openomap.conf
@@ -8,10 +8,11 @@ TARGET_FPU ?= "soft"
# 2.4 vs 2.6 is a distro decision.
MODUTILS = "26"
-BOOTSTRAP_EXTRA_RDEPENDS += "udev"
PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+PREFERRED_PROVIDER_hotplug = "udev"
+
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf
index cf9e96ce19..fc17985233 100644
--- a/conf/machine/omap5912osk.conf
+++ b/conf/machine/omap5912osk.conf
@@ -5,6 +5,8 @@
TARGET_ARCH = "arm"
IPKG_EXTRA_ARCHS = "armv5te"
+HOTPLUG = "udev"
+
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
@@ -18,7 +20,7 @@ PREFERRED_VERSION_linux-omap1 = "2.6.x+git"
BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
SERIAL_CONSOLE ?= "115200 ttyS0"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
# PCMCIA Modules
#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcmcia-core kernel-module-pcmcia"