rokuflash main2 support.

san

@@ -76,10 +76,10 @@ set_image_dir()
     esac
 }
 
-download_from_main_buildarea()
+download_from_buildarea()
 {
     set_image_dir
-    ACRAMFS_URL="main/${IMAGE_DIR}/dist/image/acramfs/acramfs.bin"
+    ACRAMFS_URL="$1/${IMAGE_DIR}/dist/image/acramfs/acramfs.bin"
     download_firmware "${ACRAMFS_URL}"
 }
 
@@ -117,35 +117,40 @@ update_firmware()
     fi
 }
 
-descr "  rokuflash [active|both] [acramfs path] - empty flashes from build area"
+descr "  rokuflash [active|both] [main|main2|golden|<acramfs path>] - empty flashes from build area"
 rokuflash()
 {
-    if [ "$1" = "active" -o "$1" = "both" ]; then
+    REMOTE_ACRAMFS=""
-        UPDATE_PARTITION="$1"
-        shift
-    else
     UPDATE_PARTITION="update"
-    fi
+    BUILD_AREA="main"
+    while [ $# -gt 0 ]; do
+        case "$1" in
+        active|both)
+            UPDATE_PARTITION="$1"
+            ;;
+        main|main2)
+            BUILD_AREA="$1"
+            ;;
+        golden)
+            REMOTE_ACRAMFS="golden/acramfs.${ROKU_PLATFORM}.bin"
+            ;;
+        *)
+            REMOTE_ACRAMFS="$1"
+            ;;
+        esac
+        shift
+    done
 
-    if [ -z "$1" ]; then
+    if [ -z "$REMOTE_ACRAMFS" ]; then
-        download_from_main_buildarea
+        download_from_buildarea "$BUILD_AREA"
     else
-        download_firmware $1
+        download_firmware $REMOTE_ACRAMFS
     fi
 
     [ $? -eq 0 ] && update_firmware $UPDATE_PARTITION
     [ $? -eq 0 ] && fastboot_reset
 }
 
-descr "  rokuflashgold                  - "
-rokuflashgold()
-{
-    download_firmware "golden/acramfs.${ROKU_PLATFORM}.bin"
-    [ $? -eq 0 ] && update_firmware "update"
-    [ $? -eq 0 ] && fastboot_reset
-}
-
-
 ###############################################################################v
 #   Ddd to the start of the script
 #   export APP_GDBSERVER="/nvram/tools/gdbserver :5555"ebug Server
@@ -213,6 +218,12 @@ log_all()
     echo "+c *" >> $LOG_CONF
 }
 
+descr "  log_seconds                    - show seconds."
+log_seconds()
+{
+    echo "+e" >> $LOG_CONF
+}
+
 ################################################################################
 #
 #   Config