Revert "Move ramdisk to the new init_boot partition"
Revert "Update bootloader, u-boot tools to builds 8053389"
Revert submission 1941153-uboot_micro
Reason for revert: broke presubmit
Reverted Changes:
I9f6100f6a:Update bootloader, u-boot tools to builds 8053389
I7024f20eb:Move ramdisk to the new init_boot partition
Change-Id: Ib1166157d77f51f7aa3e3ebd71328b05ed461fde
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 6c96cbf..3eaf124 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -221,6 +221,7 @@
bootimg {
name: "microdroid_boot-5.10",
+ ramdisk_module: "microdroid_ramdisk-5.10",
// We don't have kernel for arm and x86. But Soong demands one when it builds for
// arm or x86 target. Satisfy that by providing an empty file as the kernel.
kernel_prebuilt: "empty_kernel",
@@ -250,16 +251,6 @@
avb_private_key: ":microdroid_sign_key",
}
-bootimg {
- name: "microdroid_init_boot",
- ramdisk_module: "microdroid_ramdisk-5.10",
- kernel_prebuilt: "empty_kernel",
- header_version: "4",
- partition_name: "init_boot",
- use_avb: true,
- avb_private_key: ":microdroid_sign_key",
-}
-
android_filesystem {
name: "microdroid_ramdisk-5.10",
deps: [
@@ -560,7 +551,6 @@
"microdroid_vendor_boot-5.10",
"microdroid",
"microdroid_boot-5.10",
- "microdroid_init_boot",
],
}
diff --git a/microdroid/microdroid.json b/microdroid/microdroid.json
index 9e630f8..8496052 100644
--- a/microdroid/microdroid.json
+++ b/microdroid/microdroid.json
@@ -8,10 +8,6 @@
"path": "/apex/com.android.virt/etc/fs/microdroid_boot-5.10.img"
},
{
- "label": "init_boot_a",
- "path": "/apex/com.android.virt/etc/fs/microdroid_init_boot.img"
- },
- {
"label": "vendor_boot_a",
"path": "/apex/com.android.virt/etc/fs/microdroid_vendor_boot-5.10.img"
},