diff options
| author | Devin Moore <devinmoore@google.com> | 2021-06-22 17:52:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-22 17:52:47 +0000 |
| commit | c2a6b7a4dc0028afd5308a4f35bdc2ef6c80933d (patch) | |
| tree | f0d202c2fbf9f3be6b9e42d2c54180b2068c7ad1 | |
| parent | f942aeb4cdcbee7b27a11968f6169192a3f6d63e (diff) | |
| parent | 0be1c136960ef8104c1eff5e3aa28151faaf93e5 (diff) | |
| download | cuttlefish-c2a6b7a4dc0028afd5308a4f35bdc2ef6c80933d.tar.gz | |
Merge "Revert "Change androidboot.hardware parameter to hardware"" into sc-dev
| -rw-r--r-- | host/commands/assemble_cvd/boot_image_utils.cc | 5 | ||||
| -rw-r--r-- | shared/BoardConfig.mk | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/host/commands/assemble_cvd/boot_image_utils.cc b/host/commands/assemble_cvd/boot_image_utils.cc index fab9a9234..cfad23f6a 100644 --- a/host/commands/assemble_cvd/boot_image_utils.cc +++ b/host/commands/assemble_cvd/boot_image_utils.cc @@ -273,11 +273,6 @@ bool RepackVendorBootImage(const std::string& new_ramdisk, : " " + android::base::StringReplace(bootconfig, "\n", " ", true) + " " + android::base::Join(bootconfig_args, " ")); if (!bootconfig_supported) { - // "androidboot.hardware" kernel parameter has changed to "hardware" in - // bootconfig and needs to be replaced before being used in the kernel - // cmdline. - kernel_cmdline = android::base::StringReplace( - kernel_cmdline, " hardware=", " androidboot.hardware=", true); // TODO(b/182417593): Until we pass the module parameters through // modules.options, we pass them through bootconfig using // 'kernel.<key>=<value>' But if we don't support bootconfig, we need to diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk index 0a61cf29a..5f118b093 100644 --- a/shared/BoardConfig.mk +++ b/shared/BoardConfig.mk @@ -210,7 +210,7 @@ BOARD_KERNEL_CMDLINE += printk.devkmsg=on BOARD_KERNEL_CMDLINE += firmware_class.path=/vendor/etc/ BOARD_KERNEL_CMDLINE += init=/init -BOARD_BOOTCONFIG += hardware=cutf_cvm +BOARD_BOOTCONFIG += androidboot.hardware=cutf_cvm # TODO(b/179489292): Remove once kfence is enabled everywhere BOARD_KERNEL_CMDLINE += kfence.sample_interval=500 |