diff options
89 files changed, 59 insertions, 3250 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index a698fc2c62..701f564483 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -16,6 +16,7 @@ erich@erichl.mine.nu erich@erichv.mine.nu erich@mythtv.erich.mine.nu fontenot@chilli.conversagent.com +g2@giantshoulder.com gbritton@doomcom.org ggilbert@dreamland.(none) ggilbert@fastframe.brooks.edu diff --git a/linux/nslu2-unslung-kernel-able_2.3r25.oe b/busybox/switchbox-1.00/defconfig index e69de29bb2..e69de29bb2 100644 --- a/linux/nslu2-unslung-kernel-able_2.3r25.oe +++ b/busybox/switchbox-1.00/defconfig diff --git a/linux/nslu2-unslung-kernel-standard_2.3r25.oe b/busybox/switchbox-1.00/linuxrc index e69de29bb2..e69de29bb2 100644 --- a/linux/nslu2-unslung-kernel-standard_2.3r25.oe +++ b/busybox/switchbox-1.00/linuxrc diff --git a/meta/nslu2-image.oe b/busybox/switchbox-1.00/switchbox.patch index e69de29bb2..e69de29bb2 100644 --- a/meta/nslu2-image.oe +++ b/busybox/switchbox-1.00/switchbox.patch diff --git a/nslu2-binary-only/nslu2-unslung-ramdisk/ipkg.conf b/busybox/switchbox_1.00.oe index e69de29bb2..e69de29bb2 100644 --- a/nslu2-binary-only/nslu2-unslung-ramdisk/ipkg.conf +++ b/busybox/switchbox_1.00.oe diff --git a/classes/nslu2_flashimg.oeclass b/classes/nslu2_flashimg.oeclass index ed8bbf7e59..3e5fecf89d 100644 --- a/classes/nslu2_flashimg.oeclass +++ b/classes/nslu2_flashimg.oeclass @@ -11,5 +11,5 @@ nslu2_pack_image () { rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/slug } -EXTRA_IMAGEDEPENDS += 'slugtool-native nslu2-firmware-binary' +EXTRA_IMAGEDEPENDS += 'slugtool-native nslu2-linksys-firmware' IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; " diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf index 79f9681cbf..880790afbf 100644 --- a/conf/distro/openslug.conf +++ b/conf/distro/openslug.conf @@ -11,7 +11,7 @@ IMAGE_FSTYPE = "ext2.gz" BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel module-init-tools" BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbnet kernel-module-usbserial \ -kernel-module-usbcore kernel-module-usb-storage kernel-module-uhci-hcd \ +kernel-module-usbcore kernel-module-usb-storage kernel-module-ohci-hcd \ kernel-module-pegasus kernel-module-p8022 kernel-module-kaweth \ kernel-module-ehci-hcd \ kernel-module-scsi-mod kernel-module-sd-mod kernel-module-ext3 kernel-module-jbd \ diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index ceaf1108fc..ad4c3eea70 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -1,5 +1,5 @@ #@TYPE: Distribution -#@NAME: Unslung +#@NAME: Unslung #@DESCRIPTION: Unslung Linux Distribution for the NSLU2 TARGET_FPU = "soft" @@ -9,12 +9,17 @@ INHERIT += " package_ipk nslu2_flashimg" IMAGE_FSTYPE = "ext2.gz" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel" -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ax8817x kernel-module-catc \ -kernel-module-cdcether kernel-module-kaweth kernel-module-pegasus \ -kernel-module-rtl8150 kernel-module-usbnet kernel-module-mii" +UNSLUNG_EXTRA_PACKAGES += + +UNSLUNG_EXTRA_DEPENDS += -PREFERRED_PROVIDER_virtual/kernel ?= "nslu2-unslung-kernel-standard" +UNSLUNG_EXTRA_RDEPENDS += "kernel-module-ax8817x kernel-module-catc \ +kernel-module-cdcether kernel-module-kaweth kernel-module-pegasus \ +kernel-module-rtl8150 kernel-module-usbnet kernel-module-mii \ +kernel-module-md kernel-module-raid0 kernel-module-raid1 kernel-module-raid5 \ +kernel-module-usb-serial" + +UNSLUNG_EXTRA_RRECOMMENDS += PREFERRED_VERSION_glibc ?= "2.2.5" PREFERRED_VERSION_glibc-initial ?= "2.2.5" diff --git a/files/device_table-unslung.txt b/files/device_table-unslung.txt index 1ad44c30e9..1cf3f5108c 100644 --- a/files/device_table-unslung.txt +++ b/files/device_table-unslung.txt @@ -14,9 +14,9 @@ /dev/kmem c 640 0 0 1 2 - - - /dev/ledman c 644 0 0 126 0 - - - /dev/mem c 640 0 0 1 1 - - - -/dev/mtd c 664 0 0 90 0 0 2 4 -/dev/mtdblock b 644 0 0 31 0 0 1 4 -/dev/mtdr c 664 0 0 90 0 1 2 4 +/dev/mtd c 664 0 0 90 0 0 2 8 +/dev/mtdblock b 644 0 0 31 0 0 1 8 +/dev/mtdr c 664 0 0 90 0 1 2 8 /dev/null c 666 0 0 1 3 - - - /dev/pbuttons c 664 0 0 60 0 - - - /dev/ppp c 644 0 0 108 0 - - - diff --git a/libusb/libusb-0.1.8/configure.patch b/libusb/libusb-0.1.8/configure.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/libusb/libusb-0.1.8/configure.patch diff --git a/libusb/libusb_0.1.8.oe b/libusb/libusb_0.1.8.oe new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/libusb/libusb_0.1.8.oe diff --git a/linux/nslu2-linksys-2.4.22/gcc-registerparanoia.patch b/linux/nslu2-linksys-2.4.22/gcc-registerparanoia.patch deleted file mode 100644 index 7c3e538e1e..0000000000 --- a/linux/nslu2-linksys-2.4.22/gcc-registerparanoia.patch +++ /dev/null @@ -1,57 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.4.22/include/asm-arm/system.h~gcc-registerparanoia 2004-09-08 19:45:34.000000000 -0500 -+++ linux-2.4.22/include/asm-arm/system.h 2004-09-08 19:53:01.000000000 -0500 -@@ -3,6 +3,15 @@ - - #ifdef __KERNEL__ - -+/* -+ * This is used to ensure the compiler did actually allocate the register we -+ * asked it for some inline assembly sequences. Apparently we can't trust -+ * the compiler from one version to another so a bit of paranoia won't hurt. -+ * This string is meant to be concatenated with the inline asm string and -+ * will cause compilation to stop on mismatch. -+ */ -+#define __asmeq(x, y) ".ifnc " x "," y " ; .err ; .endif\n\t" -+ - #include <linux/config.h> - #include <linux/kernel.h> - ---- linux-2.4.22/include/asm-arm/uaccess.h~gcc-registerparanoia 2004-09-08 19:45:34.000000000 -0500 -+++ linux-2.4.22/include/asm-arm/uaccess.h 2004-09-08 19:59:20.000000000 -0500 -@@ -6,6 +6,7 @@ - */ - #include <linux/sched.h> - #include <asm/errno.h> -+#include <asm/system.h> - - #define VERIFY_READ 0 - #define VERIFY_WRITE 1 -@@ -71,7 +72,9 @@ - extern int __get_user_bad(void); - - #define __get_user_x(__r1,__p,__e,__s,__i...) \ -- __asm__ __volatile__ ("bl __get_user_" #__s \ -+ __asm__ __volatile__ ( \ -+ __asmeq("%0", "r0") __asmeq("%1", "r1") \ -+ "bl __get_user_" #__s \ - : "=&r" (__e), "=r" (__r1) \ - : "0" (__p) \ - : __i) -@@ -110,7 +113,9 @@ - extern int __put_user_bad(void); - - #define __put_user_x(__r1,__p,__e,__s,__i...) \ -- __asm__ __volatile__ ("bl __put_user_" #__s \ -+ __asm__ __volatile__ ( \ -+ __asmeq("%0", "r0") __asmeq("%2", "r1") \ -+ "bl __put_user_" #__s \ - : "=&r" (__e) \ - : "0" (__p), "r" (__r1) \ - : __i) ---- linux-2.4.22/-~gcc-registerparanoia -+++ linux-2.4.22/- diff --git a/linux/nslu2-linksys-2.4.22/gcc3-userfuncs.patch b/linux/nslu2-linksys-2.4.22/gcc3-userfuncs.patch deleted file mode 100644 index 54726bf740..0000000000 --- a/linux/nslu2-linksys-2.4.22/gcc3-userfuncs.patch +++ /dev/null @@ -1,134 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- linux-2.4.22/arch/arm/lib/getuser.S~gcc3-userfuncs 2004-09-08 19:14:05.000000000 -0500 -+++ linux-2.4.22/arch/arm/lib/getuser.S 2004-09-08 19:49:27.000000000 -0500 -@@ -42,17 +42,17 @@ - - .global __get_user_2 - __get_user_2: -- bic r2, sp, #0x1f00 -- bic r2, r2, #0x00ff -- ldr r2, [r2, #TSK_ADDR_LIMIT] -- sub r2, r2, #2 -- cmp r0, r2 -+ bic ip, sp, #0x1f00 -+ bic ip, ip, #0x00ff -+ ldr ip, [ip, #TSK_ADDR_LIMIT] -+ sub ip, ip, #2 -+ cmp r0, ip - 2: ldrlsbt r1, [r0], #1 --3: ldrlsbt r2, [r0] -+3: ldrlsbt ip, [r0] - #ifndef __ARMEB__ -- orrls r1, r1, r2, lsl #8 -+ orrls r1, r1, ip, lsl #8 - #else -- orrls r1, r2, r1, lsl #8 -+ orrls r1, ip, r1, lsl #8 - #endif - movls r0, #0 - movls pc, lr ---- linux-2.4.22/arch/arm/lib/putuser.S~gcc3-userfuncs 2004-09-08 19:14:05.000000000 -0500 -+++ linux-2.4.22/arch/arm/lib/putuser.S 2004-09-08 19:45:00.000000000 -0500 -@@ -18,7 +18,7 @@ - * Inputs: r0 contains the address - * r1, r2 contains the value - * Outputs: r0 is the error code -- * lr corrupted -+ * ip, lr corrupted - * - * No other registers must be altered. (see include/asm-arm/uaccess.h - * for specific ASM register usage). -@@ -30,11 +30,11 @@ - - .global __put_user_1 - __put_user_1: -- bic r2, sp, #0x1f00 -- bic r2, r2, #0x00ff -- ldr r2, [r2, #TSK_ADDR_LIMIT] -- sub r2, r2, #1 -- cmp r0, r2 -+ bic ip, sp, #0x1f00 -+ bic ip, ip, #0x00ff -+ ldr ip, [ip, #TSK_ADDR_LIMIT] -+ sub ip, ip, #1 -+ cmp r0, ip - 1: strlsbt r1, [r0] - movls r0, #0 - movls pc, lr -@@ -42,20 +42,20 @@ - - .global __put_user_2 - __put_user_2: -- bic r2, sp, #0x1f00 -- bic r2, r2, #0x00ff -- ldr r2, [r2, #TSK_ADDR_LIMIT] -- sub r2, r2, #2 -- cmp r0, r2 -+ bic ip, sp, #0x1f00 -+ bic ip, ip, #0x00ff -+ ldr ip, [ip, #TSK_ADDR_LIMIT] -+ sub ip, ip, #2 -+ cmp r0, ip - #ifndef __ARMEB__ - 2: strlsbt r1, [r0], #1 - movls r1, r1, lsr #8 - 3: strlsbt r1, [r0] - #else --2: movls r2, r1 -+2: movls ip, r1 - movls r1, r1, lsr #8 - strlsbt r1, [r0], #1 -- movls r1, r2 -+ movls r1, ip - 3: strlsbt r1, [r0] - #endif - movls r0, #0 -@@ -64,11 +64,11 @@ - - .global __put_user_4 - __put_user_4: -- bic r2, sp, #0x1f00 -- bic r2, r2, #0x00ff -- ldr r2, [r2, #TSK_ADDR_LIMIT] -- sub r2, r2, #4 -- cmp r0, r2 -+ bic ip, sp, #0x1f00 -+ bic ip, ip, #0x00ff -+ ldr ip, [ip, #TSK_ADDR_LIMIT] -+ sub ip, ip, #4 -+ cmp r0, ip - 4: strlst r1, [r0] - movls r0, #0 - movls pc, lr ---- linux-2.4.22/include/asm-arm/uaccess.h~gcc3-userfuncs 2004-09-08 19:36:03.000000000 -0500 -+++ linux-2.4.22/include/asm-arm/uaccess.h 2004-09-08 20:03:34.000000000 -0500 -@@ -86,7 +86,7 @@ - __get_user_x(__r1, __p, __e, 1, "lr"); \ - break; \ - case 2: \ -- __get_user_x(__r1, __p, __e, 2, "r2", "lr"); \ -+ __get_user_x(__r1, __p, __e, 2, "ip", "lr"); \ - break; \ - case 4: \ - __get_user_x(__r1, __p, __e, 4, "lr"); \ -@@ -122,13 +122,13 @@ - register int __e asm("r0"); \ - switch (sizeof(*(p))) { \ - case 1: \ -- __put_user_x(__r1, __p, __e, 1, "r2", "lr"); \ -+ __put_user_x(__r1, __p, __e, 1, "ip", "lr"); \ - break; \ - case 2: \ -- __put_user_x(__r1, __p, __e, 2, "r2", "lr"); \ -+ __put_user_x(__r1, __p, __e, 2, "ip", "lr"); \ - break; \ - case 4: \ -- __put_user_x(__r1, __p, __e, 4, "r2", "lr"); \ -+ __put_user_x(__r1, __p, __e, 4, "ip", "lr"); \ - break; \ - case 8: \ - __put_user_x(__r1, __p, __e, 8, "ip", "lr"); \ diff --git a/linux/nslu2-linksys-2.4.22/gl811e.patch b/linux/nslu2-linksys-2.4.22/gl811e.patch deleted file mode 100644 index 106c329b4c..0000000000 --- a/linux/nslu2-linksys-2.4.22/gl811e.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- linux-2.4.22/drivers/usb/storage/transport.c Fri Jul 9 10:56:27 2004 -+++ linux-2. |