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/apex/Android.bp b/apex/Android.bp
index 25cd480..f1eeed9 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -5,7 +5,6 @@
microdroid_filesystem_images = [
"microdroid_super",
"microdroid_boot-5.10",
- "microdroid_init_boot",
"microdroid_vendor_boot-5.10",
"microdroid_vbmeta",
"microdroid_vbmeta_bootconfig",
diff --git a/apex/sign_virt_apex.py b/apex/sign_virt_apex.py
index 9a0fe1a..153b5dd 100644
--- a/apex/sign_virt_apex.py
+++ b/apex/sign_virt_apex.py
@@ -282,8 +282,6 @@
boot_img = os.path.join(input_dir, 'etc', 'fs', 'microdroid_boot-5.10.img')
vendor_boot_img = os.path.join(
input_dir, 'etc', 'fs', 'microdroid_vendor_boot-5.10.img')
- init_boot_img = os.path.join(
- input_dir, 'etc', 'fs', 'microdroid_init_boot.img')
super_img = os.path.join(input_dir, 'etc', 'fs', 'microdroid_super.img')
vbmeta_img = os.path.join(input_dir, 'etc', 'fs', 'microdroid_vbmeta.img')
vbmeta_bootconfig_img = os.path.join(
@@ -299,11 +297,10 @@
# while it's okay to use different keys for other image files.
ReplaceBootloaderPubkey(args, key, bootloader, bootloader_pubkey)
- # re-sign bootloader, boot.img, vendor_boot.img, and init_boot.img
+ # re-sign bootloader, boot.img, vendor_boot.img
AddHashFooter(args, key, bootloader)
AddHashFooter(args, key, boot_img)
AddHashFooter(args, key, vendor_boot_img)
- AddHashFooter(args, key, init_boot_img)
# re-sign super.img
with TempDirectory() as work_dir:
@@ -323,12 +320,12 @@
# re-pack super.img
MakeSuperImage(args, partitions, super_img)
- # re-generate vbmeta from re-signed {boot, vendor_boot, init_boot, system_a, vendor_a}.img
+ # re-generate vbmeta from re-signed {boot, vendor_boot, system_a, vendor_a}.img
# Ideally, making VBmeta should be done out of TempDirectory block. But doing it here
# to avoid unpacking re-signed super.img for system/vendor images which are available
# in this block.
MakeVbmetaImage(args, key, vbmeta_img, images=[
- boot_img, vendor_boot_img, init_boot_img, system_a_img, vendor_a_img])
+ boot_img, vendor_boot_img, system_a_img, vendor_a_img])
# Re-sign bootconfigs with the same key
bootconfig_sign_key = key
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"
},