diff --git a/brick/scripts/README.md b/brick/scripts/README.md index e6d0f3f0..d3d6a101 100644 --- a/brick/scripts/README.md +++ b/brick/scripts/README.md @@ -8,3 +8,7 @@ Additionally, the `edimax01.ko` is replaced by now much more popular `rtl8192cu. The init script has a hook for running a shell script from `/mnt/ramdisk/`. This can be used for testing different modules etc. + +The kernel command line has been modified to: +* disable DMA for the MUSB driver - otherwise the mass storage device is very unstable +* increase the size of dmesg buffer to 128k diff --git a/brick/scripts/ev3-fs.patch b/brick/scripts/ev3-fs.patch index 91b0288d..79e7b259 100644 --- a/brick/scripts/ev3-fs.patch +++ b/brick/scripts/ev3-fs.patch @@ -1,7 +1,15 @@ diff -ur orig-ev3/etc/init.d/ev3init.sh dev-ev3/etc/init.d/ev3init.sh --- orig-ev3/etc/init.d/ev3init.sh 1970-01-01 01:00:00.000000000 +0100 -+++ dev-ev3/etc/init.d/ev3init.sh 2017-07-25 15:55:03.642866971 +0100 -@@ -60,3 +60,6 @@ ++++ dev-ev3/etc/init.d/ev3init.sh 2017-07-27 12:19:43.195041798 +0100 +@@ -1,5 +1,7 @@ + #!/bin/sh + ++echo Y > /sys/module/printk/parameters/time ++ + bluetoothd -n > /dev/null 2>&1 & + + echo "Setting up VirtualDrive..."; +@@ -60,3 +62,6 @@ sleep 2 hciattach /dev/ttyS2 texas 2000000 "flow" "nosleep" $STRING sdptool add SP @@ -11,7 +19,7 @@ diff -ur orig-ev3/etc/init.d/ev3init.sh dev-ev3/etc/init.d/ev3init.sh Only in orig-ev3/home/root/lms2012/sys: exit~ diff -ur orig-ev3/home/root/lms2012/sys/init dev-ev3/home/root/lms2012/sys/init --- orig-ev3/home/root/lms2012/sys/init 1970-01-01 01:00:00.000000000 +0100 -+++ dev-ev3/home/root/lms2012/sys/init 2017-07-26 18:36:03.814459337 +0100 ++++ dev-ev3/home/root/lms2012/sys/init 2017-07-27 12:23:43.072605126 +0100 @@ -5,13 +5,15 @@ var=$(printf 'HostStr=%s SerialStr=%s' $(cat /home/root/lms2012/sys/settings/BrickName) $(cat /home/root/lms2012/sys/settings/BTser)) echo $var > /home/root/lms2012/sys/settings/UsbInfo.dat @@ -29,6 +37,15 @@ diff -ur orig-ev3/home/root/lms2012/sys/init dev-ev3/home/root/lms2012/sys/init insmod ${PWD}/mod/d_usbhost.ko insmod ${PWD}/mod/d_sound.ko `cat /home/root/lms2012/sys/settings/HwId` insmod ${PWD}/mod/d_bt.ko `cat /home/root/lms2012/sys/settings/HwId` +@@ -29,6 +31,8 @@ + chmod 666 /dev/lms_iic + chmod 666 /dev/lms_bt + ++echo 4 > /proc/sys/kernel/printk ++ + cd .. + ls -R > /dev/null + cd sys Binary files orig-ev3/home/root/lms2012/sys/mod/d_usbdev.ko and dev-ev3/home/root/lms2012/sys/mod/d_usbdev.ko differ Only in dev-ev3/home/root/lms2012/sys/mod: nbd.ko Only in dev-ev3/home/root/lms2012/sys: uf2d diff --git a/brick/scripts/img.js b/brick/scripts/img.js index 87844399..e1517cb8 100644 --- a/brick/scripts/img.js +++ b/brick/scripts/img.js @@ -1,8 +1,9 @@ #!/bin/sh let fs = require("fs") - let bootargs = "mem=${memsize} initrd=${filesysaddr},${filesyssize} root=/dev/ram0 rw rootfstype=cramfs console=${console} ip=${ipaddr} lpj=747520 quiet" -let bootnews = "mem=64M initrd=0xC1180000,10M root=/dev/ram0 rw rootfstype=cramfs console=${console} lpj=747520 quiet musb_hdrc.debug=2" +// we try to use shorter versions of all parameters for the additional parameters to fit +let bootargs = "mem=${memsize} initrd=${filesysaddr},${filesyssize} root=/dev/ram0 rw rootfstype=cramfs console=${console} ip=${ipaddr} lpj=747520 quiet" +let bootnews = "mem=64M initrd=0xC1180000,10M root=1:0 rw rootfstype=cramfs console=${console} lpj=747520 musb_hdrc.use_dma=0 log_buf_len=128k quiet" let piggy = true function build() {