Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages

into home.(none):/home/openembedded/packages

2004/11/17 23:40:41+10:30 (none)!rwhitby
Reduced size of switchbox ramdisk to 1MB, and made the /linuxrc test for either /sbin/init or /bin/init to find a bootable jffs2 image.

BKrev: 419b4df8LXF_YsbCtpTCfDToaeGsig

3 files changed, 68 insertions, 1 deletions

diff --git a/busybox/switchbox-1.00/linuxrc b/busybox/switchbox-1.00/linuxrc
index 1368b418a7..70ad6855b6 100644
--- a/busybox/switchbox-1.00/linuxrc
+++ b/busybox/switchbox-1.00/linuxrc
@@ -37,7 +37,7 @@ fi
 
 if [ -z "$mounted" ] && /bin/mount -rt jffs2 /dev/mtdblock4 /mnt/tmpmnt ; then
 
-    if  [ -x /mnt/tmpmnt/bin/init ] ; then
+    if  [ -x /mnt/tmpmnt/sbin/init -o -x /mnt/tmpmnt/bin/init ] ; then
 	/bin/echo "Root filesystem will be mounted from /dev/mtdblock4 ..."
 	mounted=/mnt/tmpmnt
 	/bin/echo "0x1f04" > /proc/sys/kernel/real-root-dev
diff --git a/conf/distro/switchbox.conf b/conf/distro/switchbox.conf
index e69de29bb2..75b57388dc 100644
--- a/conf/distro/switchbox.conf
+++ b/conf/distro/switchbox.conf
@@ -0,0 +1,17 @@
+#@TYPE: Distribution
+#@NAME: SwitchBox
+#@DESCRIPTION: SwitchBox Linux Distribution for the NSLU2
+
+TARGET_FPU ?= "soft"
+TARGET_OS = "linux-uclibc"
+
+INHERIT += " package_ipk debian"
+
+IMAGE_FSTYPE = "ext2.gz"
+IMAGE_ROOTFS_SIZE_ext2 = "1024"
+IMAGE_ROOTFS_SIZE_ext2.gz = "1024"
+
+SWITCHBOX_DEVICE_TABLE = "${@oe.which(oe.data.getVar('OEPATH', d, 1), 'files/device_table-unslung.txt')}"
+EXTRA_IMAGECMD_ext2.gz = "-f ${SWITCHBOX_DEVICE_TABLE}"
+
+USE_NLS = "no"
diff --git a/linux/openslug-kernel_2.6.9.oe b/linux/openslug-kernel_2.6.9.oe
index e69de29bb2..d30d0968d3 100644
--- a/linux/openslug-kernel_2.6.9.oe
+++ b/linux/openslug-kernel_2.6.9.oe
@@ -0,0 +1,50 @@
+SECTION = "kernel"
+DESCRIPTION = "Linux kernel for the Linksys NSLU2 device"
+LICENSE = "GPL"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+PR = "r1"
+
+KERNEL_SUFFIX = "openslug"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2 \
+           file://nslu2_2.6.9.patch;patch=1 \
+           file://defconfig \
+           file://x1205-rtc.c \
+           file://nslu2-io.c \
+           file://nslu2-setup.c \
+           file://nslu2-pci.c \
+           file://nslu2-part.c \
+           file://nslu2.h" 
+S = "${WORKDIR}/linux-2.6.9"
+
+COMPATIBLE_HOST = 'arm.*-linux'
+
+inherit kernel
+
+ARCH = "arm"
+KERNEL_IMAGETYPE = "zImage"
+CMDLINE_CONSOLE ?= "ttyS0,115200n8"
+CMDLINE_ROOT = "root=/dev/slug initrd=0x01000000,10M mem=32M@0x00000000"
+CMDLINE = "${CMDLINE_ROOT} ${CMDLINE_CONSOLE}"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+        install -m 0644 ${WORKDIR}/x1205-rtc.c ${S}/drivers/i2c/chips/x1205-rtc.c
+        install -m 0644 ${WORKDIR}/nslu2-io.c ${S}/arch/arm/mach-ixp4xx/nslu2-io.c
+        install -m 0644 ${WORKDIR}/nslu2-setup.c ${S}/arch/arm/mach-ixp4xx/nslu2-setup.c
+        install -m 0644 ${WORKDIR}/nslu2-pci.c ${S}/arch/arm/mach-ixp4xx/nslu2-pci.c
+        install -m 0644 ${WORKDIR}/nslu2-part.c ${S}/arch/arm/mach-ixp4xx/nslu2-part.c
+        install -m 0644 ${WORKDIR}/nslu2.h ${S}/include/asm-arm/arch-ixp4xx/nslu2.h
+	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
+	rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \
+	       ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR}/images
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
+}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile