Remove kernel commandline arguments fom bootimg rule
These are made part of prebuilt directly using CONFIG_CMDLINE, so we no
longer need it in the build rule.
panic=-1 is not required sice gki_deficonfig already sets
CONFIG_PANIC_TIMEOUT=-1
Bug: b/240235424
Test: atest MicrodroidTestCase
Change-Id: I0fabcbb41c2c7c7f659ad0c2c643a24e423e9ee2
diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 281416b..c6ba1db 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -238,14 +238,6 @@
],
}
-microdroid_boot_cmdline = [
- "panic=-1",
- "bootconfig",
- "ioremap_guard",
- // TODO(b/237381762) do this only when ramdump is enabled. (bootloader shall append this)
- "crashkernel=17M",
-]
-
bootimg {
name: "microdroid_boot",
// We don't have kernel for arm and x86. But Soong demands one when it builds for
@@ -254,19 +246,9 @@
arch: {
arm64: {
kernel_prebuilt: ":microdroid_kernel_prebuilts-5.15-arm64",
- cmdline: microdroid_boot_cmdline,
},
x86_64: {
kernel_prebuilt: ":microdroid_kernel_prebuilts-5.15-x86_64",
- cmdline: microdroid_boot_cmdline + [
- // console=none is to work around the x86 specific u-boot behavior which when
- // console= option is not found in the kernel commandline console=ttyS0 is
- // automatically added. By adding console=none, we can prevent u-boot from doing
- // that. Note that console is set to hvc0 by bootconfig if the VM is configured as
- // debuggable.
- "console=none",
- "acpi=noirq",
- ],
},
},