Update snowball HOWTOs

Reflect the fact that the linaro android build now only supports
booting from sd card.

Remove incorrect info about adb only working over IP.

2 files changed, 13 insertions, 108 deletions

diff --git a/howto/snowball-jb-gcc47-igloo-stable-blob/HOWTO_install.txt b/howto/snowball-jb-gcc47-igloo-stable-blob/HOWTO_install.txt
index 721e22f..6973218 100644
--- a/howto/snowball-jb-gcc47-igloo-stable-blob/HOWTO_install.txt
+++ b/howto/snowball-jb-gcc47-igloo-stable-blob/HOWTO_install.txt
@@ -68,7 +68,7 @@ Restore automount
   $ dconf write /org/gnome/desktop/media-handling/automount-open $TMP2
 </pre>
 
-Remove the SD card from the device writer and plug it into the board.
+Remove the SD card from the device writer and plug it into the board. Note that the linaro android snowball build only supports booting from sdcard at this time.
 
 h2. Check console output
 
@@ -83,48 +83,13 @@ h2. Notes
 During the 12.05 cycle, U-Boot changed and must be upgraded in eMMC if your
 boot line is older than: U-boot 2012.04.01 (May 24 2012 - 19:50:12)
 
-If you only want to be able to boot from the SD card and don't care about
-booting from the eMMC (internal flash), the quick solution is to do:
+The solution is to do:
 
+If you don't have riff:
 <pre>
-   $ sudo linaro-android-media-create --image-file snowball.img --image-size 1500M --dev snowball_emmc --boot boot.tar.bz2 --system system.tar.bz2 --userdata userdata.tar.bz2
-   $ sudo riff -f snowball.img
-</pre>
-
-If you don't have riff, follow the instructions below to install it.
-
-If you want to be able to boot from the eMMC, you need to modify a few lines
-in init.partitions.rc file.
-
-<pre>
-   $ mkdir temp
-   $ cd temp
-   $ mv ../boot.tar.bz2 .
-   $ tar xjf boot.tar.bz2
-   $ cd boot
-   $ mkdir temp
-   $ cd temp
-   $ mv ../uInitrd .
-   $ dd if=uInitrd of=initrd.gz bs=64 skip=1
-   $ gunzip initrd.gz
-   $ mkdir init
-   $ cd init
-   $ cpio -i < ../initrd
-</pre>
-
-Open the init.partition.rc file and follow the instruction in the file
-
-<pre>
-   $ sudo find . | cpio -o -H newc | gzip > ../newinitrd.cpio.gz
-   $ mkimage -A arm -O linux -T ramdisk -C gzip -a 0 -e 0 -n initramfs -d ../newinitrd.cpio.gz ../uInitrd.new
-   $ cd ../..
-   $ cp temp/init/uInitrd.new uInitrd
-   $ rm -rf temp
-   $ cd ..
-   $ tar cjf boot.tar.bz2 boot
-   $ cd ..
-   $ mv temp/boot.tar.bz2 .
-   $ rm -rf temp
+   $ sudo add-apt-repository ppa:igloocommunity-maintainers/snowball-tools
+   $ sudo apt-get update
+   $ sudo apt-get install riff
 </pre>
 
 Download startupfiles from "http://www.igloocommunity.org/download/linaro/startupfiles/latest":http://www.igloocommunity.org/download/linaro/startupfiles/latest
@@ -133,9 +98,6 @@ Download startupfiles from "http://www.igloocommunity.org/download/linaro/startu
    $ tar -xvf startupfiles_3.0.8-0.tar.gz
    $ linaro-android-media-create --image-file snowball.img --image-size 1500M --dev snowball_emmc --boot boot.tar.bz2 --system system.tar.bz2 --userdata userdata.tar.bz2
 
-   $ sudo add-apt-repository ppa:igloocommunity-maintainers/snowball-tools
-   $ sudo apt-get update
-   $ sudo apt-get install riff
 </pre>
 
 (OPTIONAL) Remove the PPA
@@ -154,16 +116,3 @@ When execution is finalized riff will exit
 On the first boot, the user interface can take up to 10 minutes to come up.
 Please be patient. If the board doesn't come up, you might be affected by
 "bug 8823313":https://bugs.launchpad.net/bugs/823313
-
-* Note 2 - ADB only works over IP
-
-In the console type:
-<pre>
-     stop adbd
-     setprop service.adb.tcp.port 6565
-     start adbd
-     ifconfig eth0 # to get boardsIP
-</pre>
-
-On the host type:
-pre. adb connect boardsIP:6565
diff --git a/howto/snowball-jb-gcc47-igloo-stable-blob/HOWTO_prebuilt.txt b/howto/snowball-jb-gcc47-igloo-stable-blob/HOWTO_prebuilt.txt
index 5376b02..b4bd302 100644
--- a/howto/snowball-jb-gcc47-igloo-stable-blob/HOWTO_prebuilt.txt
+++ b/howto/snowball-jb-gcc47-igloo-stable-blob/HOWTO_prebuilt.txt
@@ -60,7 +60,7 @@ Instructions for https://android-build.linaro.org/builds/~linaro-android_snowbal
   $ dconf write /org/gnome/desktop/media-handling/automount $TMP1
   $ dconf write /org/gnome/desktop/media-handling/automount-open $TMP2
 
-  Remove the SD card from the device writer and plug it into the board.
+  Remove the SD card from the device writer and plug it into the board. Note that the linaro android snowball build only supports booting from sdcard at this time.
 
 = Check console output =
 
@@ -75,43 +75,13 @@ Instructions for https://android-build.linaro.org/builds/~linaro-android_snowbal
    During the 12.05 cycle, U-Boot changed and must be upgraded in eMMC if your
    boot line is older than: U-boot 2012.04.01 (May 24 2012 - 19:50:12)
 
-   If you only want to be able to boot from the SD card and don't care about
-   booting from the eMMC (internal flash), the quick solution is to do:
+   The solution is to do:
+ 
+   If you don't have riff:
 
-   $ sudo linaro-android-media-create --image-file snowball.img --image-size 1500M --dev snowball_emmc --boot boot.tar.bz2 --system system.tar.bz2 --userdata userdata.tar.bz2
-   $ sudo riff -f snowball.img
-
-   If you don't have riff, follow the instructions below to install it.
-
-   If you want to be able to boot from the eMMC, you need to modify a few lines
-   in init.partitions.rc file.
-
-   $ mkdir temp
-   $ cd temp
-   $ mv ../boot.tar.bz2 .
-   $ tar xjf boot.tar.bz2
-   $ cd boot
-   $ mkdir temp
-   $ cd temp
-   $ mv ../uInitrd .
-   $ dd if=uInitrd of=initrd.gz bs=64 skip=1
-   $ gunzip initrd.gz
-   $ mkdir init
-   $ cd init
-   $ cpio -i < ../initrd
-
-   Open the init.partition.rc file and follow the instruction in the file
-
-   $ sudo find . | cpio -o -H newc | gzip > ../newinitrd.cpio.gz
-   $ mkimage -A arm -O linux -T ramdisk -C gzip -a 0 -e 0 -n initramfs -d ../newinitrd.cpio.gz ../uInitrd.new
-   $ cd ../..
-   $ cp temp/init/uInitrd.new uInitrd
-   $ rm -rf temp
-   $ cd ..
-   $ tar cjf boot.tar.bz2 boot
-   $ cd ..
-   $ mv temp/boot.tar.bz2 .
-   $ rm -rf temp
+   $ sudo add-apt-repository ppa:igloocommunity-maintainers/snowball-tools
+   $ sudo apt-get update
+   $ sudo apt-get install riff
 
    Download startupfiles from
    http://www.igloocommunity.org/download/linaro/startupfiles/latest
@@ -119,10 +89,6 @@ Instructions for https://android-build.linaro.org/builds/~linaro-android_snowbal
    $ tar -xvf startupfiles_3.0.8-0.tar.gz
    $ linaro-android-media-create --image-file snowball.img --image-size 1500M --dev snowball_emmc --boot boot.tar.bz2 --system system.tar.bz2 --userdata userdata.tar.bz2
 
-   $ sudo add-apt-repository ppa:igloocommunity-maintainers/snowball-tools
-   $ sudo apt-get update
-   $ sudo apt-get install riff
-
    (OPTIONAL) Remove the PPA
 
    $ sudo add-apt-repository --remove ppa:igloocommunity-maintainers/snowball-tools
@@ -141,13 +107,3 @@ Instructions for https://android-build.linaro.org/builds/~linaro-android_snowbal
    Please be patient. If the board doesn't come up, you might be affected by
    https://bugs.launchpad.net/bugs/823313 bug.
 
- * Note 2 - ADB only works over IP
-
-   In the console type:
-     stop adbd
-     setprop service.adb.tcp.port 6565
-     start adbd
-     ifconfig eth0 # to get boardsIP
-
-   On the host type:
-     adb connect boardsIP:6565