summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Nelson <eric.nelson@boundarydevices.com>2012-11-28 10:10:00 -0700
committerEric Nelson <eric.nelson@boundarydevices.com>2012-11-28 10:10:00 -0700
commitd8db92bcbea6f13084be0179f6536b0295435f91 (patch)
treedfdf80e8d0ee34bf1ad0cf26d66982b8b9fa7c74
parenta90f25765d478a00398ece0cf3361fd06ad33728 (diff)
clean up nitrogen6x android boot script
-rw-r--r--board/boundary/nitrogen6x/6x_bootscript_android.txt9
1 files changed, 3 insertions, 6 deletions
diff --git a/board/boundary/nitrogen6x/6x_bootscript_android.txt b/board/boundary/nitrogen6x/6x_bootscript_android.txt
index 154d3fb4df..1333372b06 100644
--- a/board/boundary/nitrogen6x/6x_bootscript_android.txt
+++ b/board/boundary/nitrogen6x/6x_bootscript_android.txt
@@ -2,7 +2,7 @@ ${dtype} dev ${disk}
setenv bootargs enable_wait_mode=off
setenv nextcon 0;
-setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=/dev/mmcblk0p1 rootwait consoleblank=0 ;
+setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M consoleblank=0 ;
i2c dev 2
@@ -59,9 +59,6 @@ while test "3" -ne $nextcon ; do
setexpr nextcon $nextcon + 1 ;
done
-setexpr bootargs $bootargs fbcon=$fbcon
-echo "bootargs == $bootargs" ;
-echo "fbcon == $fbcon" ;
-echo load cmd: ${fs}load mmc ${disk}:1 10800000 /boot/uImage && bootm 10800000
-${fs}load mmc ${disk}:1 10800000 uImage && ${fs}load mmc ${disk}:1 12800000 uramdisk.img && bootm 10800000 12800000; echo "Error loading kernel image"
+setenv bootargs $bootargs fbcon=$fbcon
+${fs}load ${dtype} ${disk}:2 10800000 uImage && ${fs}load ${dtype} ${disk}:2 12800000 uramdisk.img && bootm 10800000 12800000; echo "Error loading kernel image"