summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/openslug.conf25
-rw-r--r--conf/machine/nslu2.conf8
-rw-r--r--conf/machine/tosa-2.4.conf3
3 files changed, 26 insertions, 10 deletions
diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 33e655dcb6..5efabd1cfc 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -2,19 +2,20 @@
#@NAME: OpenSlug
#@DESCRIPTION: OpenSlug Linux Distribution for the NSLU2
-# Add to the user's feeds from local.conf (there may be none)
-# not all available yet
-#FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross"
-#FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native"
-FEED_URIS_append_linux += "oe##http://ipkg.nslu2-linux.org/feeds/openslug/oe"
-#
-# if you are very very brave:
-#FEED_URIS_append_linux += "unstable##http://ipkg.nslu2-linux.org/feeds/openslug/unstable"
-
DISTRO_NAME = "OpenSlug"
DISTRO_VERSION = "2.2-beta"
DISTRO_TYPE ?= "beta"
+# Add to the user's feeds from local.conf (there may be none)
+FEED_URIS_append_linux += "cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/${DISTRO_VERSION}"
+FEED_URIS_append_linux += "native##http://ipkg.nslu2-linux.org/feeds/openslug/native/${DISTRO_VERSION}"
+
+#
+# Uncomment the following to get the unstable feeds
+#FEED_URIS_append_linux += "unstable_cross##http://ipkg.nslu2-linux.org/feeds/openslug/cross/unstable"
+#FEED_URIS_append_linux += "unstable_native##http://ipkg.nslu2-linux.org/feeds/openslug/native/unstable"
+
+
TARGET_FPU_local ?= "soft"
TARGET_FPU := "${TARGET_FPU_local}"
TARGET_OS_local ?= "linux"
@@ -32,6 +33,12 @@ EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DE
OPENSLUG_EXTRA_DEPENDS ?= "e2fsprogs reiserfsprogs upslug-native lrzsz"
+# CMDLINE* macros define the kernel command line. CMDLINE_DEBUG is provided
+# to enable/disable debugging in the distro. Here noirqdebug is used to
+# remove the messages about unhandled interrupts - people debugging interrupt
+# issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf)
+CMDLINE_DEBUG = "noirqdebug"
+
# Filesystem support modules are listed in here for easy removal,
# as is the lrzsz serial package and other kernel modules which are
# not absolutely required for boot.
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index 1484ac191c..2ce73ac836 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -19,6 +19,14 @@ IMAGE_ROOTFS_SIZE_ext2.gz = "10240"
TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
PACKAGE_ARCH = "armeb"
+# Optimization settings. Os works fine and is significantly
+# better than O2. The other settings are somewhat arbitrary.
+# The optimisations chosen here include the ones which 'break'
+# symbolic debugging (because the compiler does not include
+# enough information to allow the debugger to know where given
+# values are.)
+FULL_OPTIMIZATION = "-fomit-frame-pointer -frename-registers -fweb -funit-at-a-time -Os"
+
SERIAL_CONSOLE = "115200 ttyS0"
KERNEL_CONSOLE = "ttyS0,115200n8"
USE_VT = "0"
diff --git a/conf/machine/tosa-2.4.conf b/conf/machine/tosa-2.4.conf
index e33de0582e..22ade477e2 100644
--- a/conf/machine/tosa-2.4.conf
+++ b/conf/machine/tosa-2.4.conf
@@ -1,6 +1,7 @@
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
-BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel hostap-modules \
+
+BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules wlan-ng-utils virtual/kernel hostap-modules \
orinoco-modules sharp-sdmmc-support usbutils"
BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils kernel-module-acm \
kernel-module-evdev kernel-module-net-fd \