summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorOyvind Repvik <nail@nslu2-linux.org>2007-03-16 23:41:18 +0000
committerOyvind Repvik <nail@nslu2-linux.org>2007-03-16 23:41:18 +0000
commitcefc55b39a8ab57a6d2441fc686e51af9393d15d (patch)
tree43bf82bc5ecb24e1b1d8d854725186dbb05d5bf6 /conf
parent6ab4ab90bbb405a076f6cfa04161a6d9a27900ef (diff)
foonas: Clean up distro/machines/image
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/foonas.conf7
-rw-r--r--conf/machine/n2100.conf9
-rw-r--r--conf/machine/turbostation.conf8
3 files changed, 12 insertions, 12 deletions
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index bd2a0e4e5e..b0f47c6dc0 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -30,10 +30,12 @@ IMAGE_FSTYPES = "jffs2"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
PREFERRED_PROVIDER_virtual/arm-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-#PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-#PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate"
PREFERRED_PROVIDER_virtual/powerpc-foonas-linux-libc-for-gcc = "glibc-intermediate"
+
+# not used yet
+#PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate"
+#PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
#PREFERRED_PROVIDER_virtual/mipsel-foonas-linux-libc-for-gcc = "glibc-intermediate"
#PREFERRED_PROVIDER_virtual/sparc-foonas-linux-libc-for-gcc = "glibc-intermediate"
@@ -83,7 +85,6 @@ PREFERRED_VERSION_glibc-intermediate = "2.5"
PREFERRED_VERSION_glibc-initial = "2.5"
GLIBC_EXTRA_OECONF = "--with-tls"
-PREFERRED_VERSION_glib-2.0 = "2.12.10"
PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
GLIBC_ADDONS ?= "ports,nptl,libidn"
diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf
index 619b0f4339..554157ca85 100644
--- a/conf/machine/n2100.conf
+++ b/conf/machine/n2100.conf
@@ -3,7 +3,6 @@ TARGET_OS = "linux"
TARGET_FPU = "soft"
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
-# terminal specs - console, but no other ports
SERIAL_CONSOLE="115200 console"
USE_VT="0"
@@ -13,15 +12,15 @@ PREFERRED_PROVIDER_virtual/kernel = "linux"
PREFERRED_VERSION_linux = "2.6.20"
# Do we need any kernel modules?
-#N2100_KERNEL = ""
+FOONAS_KERNEL = "kernel-module-ext2 kernel-module-usb-storage"
+
+FOONAS_SUPPORT += "fis"
# We want udev support in the image
udevdir = "/dev"
-N2100_SUPPORT ?= "cpio udev"
BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm"
-EXTRA_IMAGECMD_jffs2 += " --little-endian"
-# Hardware stuff used in image generation
+EXTRA_IMAGECMD_jffs2 += " --little-endian"
ERASEBLOCK_SIZE = "0x20000"
JFFS2_ROOTFS_SIZE = "0xC80000"
KERNEL_IMAGE_SIZE = "0x280000"
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index 7f7d24c1e9..41dfd8d09e 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -11,16 +11,16 @@ USE_VT="0"
MODUTILS=26
MACHINE_FEATURES= "kernel26 usbhost"
PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation"
-
-# Do we need any kernel modules?
-OPENTURBOSTATION_KERNEL = ""
+FOONAS_KERNEL = "kernel-module-ext3 kernel-module-minix \
+ kernel-module-usb-storage"
# We want udev support in the image
udevdir = "/dev"
-TURBOSTATION_SUPPORT ?= "cpio uboot-utils udev"
BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm"
+FOONAS_SUPPORT += "uboot-utils"
# Hardware stuff used in image generation
+EXTRA_IMAGECMD = "--big-endian"
ERASEBLOCK_SIZE = "0x20000"
JFFS2_ROOTFS_SIZE = "0xC80000"
KERNEL_IMAGE_SIZE = "0x280000"