[vim2] Switch to booting as a native Fuchsia bootdata container
Change-Id: I39de68c5172ce9cd9080ac4b882eab3b10b81a62
diff --git a/kernel/target/arm64/board/vim2/rules.mk b/kernel/target/arm64/board/vim2/rules.mk
index a0221eb..804cfcd 100644
--- a/kernel/target/arm64/board/vim2/rules.mk
+++ b/kernel/target/arm64/board/vim2/rules.mk
@@ -6,9 +6,6 @@
LOCAL_DIR := $(GET_LOCAL_DIR)
-PLATFORM_VID := 4 # PDEV_VID_KHADAS
-PLATFORM_PID := 2 # PDEV_PID_VIM2
PLATFORM_BOARD_NAME := vim2
-PLATFORM_USE_SHIM := true
include make/board.mk
diff --git a/scripts/fastboot-flash-bootdata b/scripts/fastboot-flash-bootdata
new file mode 100755
index 0000000..68a23fd
--- /dev/null
+++ b/scripts/fastboot-flash-bootdata
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+
+# Copyright 2018 The Fuchsia Authors
+#
+# Use of this source code is governed by a MIT-style
+# license that can be found in the LICENSE file or at
+# https://opensource.org/licenses/MIT
+
+set -eo pipefail
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+BUILD_DIR="${DIR}/../build-arm64"
+
+CMDLINE="TERM=uart"
+
+function HELP {
+ echo "help:"
+ echo "-b <board> : Board to flash"
+ echo "-c <cmd line> : Extra command line options"
+ echo "-m : Add mexec option to command line"
+ echo "-o <dir> : Build directory"
+ echo "-h for help"
+ exit 1
+}
+
+while getopts "b:c:d:mo:h" FLAG; do
+ case $FLAG in
+ b) BOARD="${OPTARG}";;
+ c) CMDLINE+=" ${OPTARG}";;
+ d) RAMDISK="${OPTARG}";;
+ m) CMDLINE+=" netsvc.netboot=true";;
+ o) BUILD_DIR="${OPTARG}";;
+ h) HELP;;
+ \?)
+ echo unrecognized option
+ HELP
+ ;;
+ esac
+done
+shift $((OPTIND-1))
+
+if [[ -z "${BOARD}" ]]; then
+ echo must specify a board to flash
+ HELP
+fi
+
+MKBOOTFS="${BUILD_DIR}/tools/mkbootfs"
+BOOTDATA_BIN="${BUILD_DIR}/${BOARD}-combo-bootdata.bin"
+CMDLINE_FILE="${BUILD_DIR}/${BOARD}-cmdline.txt"
+OUT_IMAGE="${BUILD_DIR}/${BOARD}-boot.img"
+
+echo ${CMDLINE} > ${CMDLINE_FILE}
+${MKBOOTFS} ${BOOTDATA_BIN} -C ${CMDLINE_FILE} -o ${OUT_IMAGE}
+
+fastboot flash boot "${OUT_IMAGE}"
+fastboot reboot
diff --git a/scripts/flash-vim2 b/scripts/flash-vim2
index e981b39..56947c0 100755
--- a/scripts/flash-vim2
+++ b/scripts/flash-vim2
@@ -8,4 +8,4 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-exec $DIR/fastboot-flash -b vim2 "$@"
+exec $DIR/fastboot-flash-bootdata -b vim2 "$@"
