diff options
| author | Philip Balister <philip@balister.org> | 2006-08-30 21:53:59 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2006-08-30 21:53:59 +0000 |
| commit | d8b9e3d8acf294a0a06ff93e5711007e938efa71 (patch) | |
| tree | a5bf3632fc49794d0e91cb8cce6715c820b4765f /conf | |
| parent | 589f8b60632116adca542320de2b834642dec25f (diff) | |
| parent | ac7135e9c90c73e8c3fab13b7209b8e2f64910e7 (diff) | |
merge of '8605731b4522785b2e02d610d5eb7f491cffad2d'
and 'e9ef89a380af1f7a8f347ac37b13679dc9dfe7b5'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/openomap.conf | 3 | ||||
| -rw-r--r-- | conf/machine/omap5912osk.conf | 4 |
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" |