commit f138b92d86e274b860b27496a680a2aaa79803e7
author Jiyong Park <jiyong@google.com> Mon Feb 22 17:21:50 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 22 17:21:50 2021 +0000
tree 1120ed4f63f7f4ba0e6fffdae6f6f8af4ce405fa
parent 0ac9b482b6b6b2534bda285bbef374398d78adad
parent f677cfab844ec982ce4655f3098205d97a340203

Merge "Build uboot_env.img statically"

microdroid/Android.bp

diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 0ef7a52..137355c 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -112,3 +112,17 @@
     },
     type: "compressed_cpio",
 }
+
+prebuilt_etc {
+    name: "microdroid_uboot_env",
+    src: ":microdroid_uboot_env_gen",
+    filename: "uboot_env.img",
+}
+
+genrule {
+    name: "microdroid_uboot_env_gen",
+    tools: ["mkenvimage_host"],
+    srcs: ["uboot-env.txt"],
+    out: ["output.img"],
+    cmd: "$(location mkenvimage_host) -s 4096 -o $(out) $(in)",
+}

microdroid/uboot-env.txt

diff --git a/microdroid/uboot-env.txt b/microdroid/uboot-env.txt
new file mode 100644
index 0000000..0ef66b8
--- /dev/null
+++ b/microdroid/uboot-env.txt
@@ -0,0 +1,8 @@
+# Static u-boot environment variables for microdroid. See b/180481192
+
+bootcmd=boot_android virtio -
+
+# 0:2 is the misc partition
+bootdevice=0:2
+bootdelay=0
+fdtaddr=0x80000000