diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-18 20:43:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-18 20:43:21 +0000 |
| commit | b644b7e5879df0dcc65a542102c768d64aa51b84 (patch) | |
| tree | f0e99cad93893718a53fe5a132cf538424366d50 | |
| parent | 61c9a84871f705327e37883d4a637b7297766c43 (diff) | |
| parent | 637ca5991c8b7e5550afa56d567ed64556c7dccd (diff) | |
| download | crosvm-b644b7e5879df0dcc65a542102c768d64aa51b84.tar.gz | |
Merge "UPSTREAM: aarch64: fdt: Fix CPU compatible to "arm,armv8"" into main
| -rw-r--r-- | aarch64/src/fdt.rs | 2 | ||||
| -rw-r--r-- | cros_fdt/test-files/base.dtb | bin | 808 -> 808 bytes | |||
| -rw-r--r-- | cros_fdt/test-files/base.dts | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/aarch64/src/fdt.rs b/aarch64/src/fdt.rs index 36baca4fc..b01ffa186 100644 --- a/aarch64/src/fdt.rs +++ b/aarch64/src/fdt.rs @@ -152,7 +152,7 @@ fn create_cpu_nodes( let cpu_name = format!("cpu@{:x}", reg); let cpu_node = cpus_node.subnode_mut(&cpu_name)?; cpu_node.set_prop("device_type", "cpu")?; - cpu_node.set_prop("compatible", "arm,arm-v8")?; + cpu_node.set_prop("compatible", "arm,armv8")?; if num_cpus > 1 { cpu_node.set_prop("enable-method", "psci")?; } diff --git a/cros_fdt/test-files/base.dtb b/cros_fdt/test-files/base.dtb Binary files differindex c0884ed9d..84736d282 100644 --- a/cros_fdt/test-files/base.dtb +++ b/cros_fdt/test-files/base.dtb diff --git a/cros_fdt/test-files/base.dts b/cros_fdt/test-files/base.dts index abb90ce9c..6b081a4b7 100644 --- a/cros_fdt/test-files/base.dts +++ b/cros_fdt/test-files/base.dts @@ -17,14 +17,14 @@ cpu@0 { device_type = "cpu"; - compatible = "arm,arm-v8"; + compatible = "arm,armv8"; enable-method = "psci"; reg = <0x00>; }; cpu@1 { device_type = "cpu"; - compatible = "arm,arm-v8"; + compatible = "arm,armv8"; enable-method = "psci"; reg = <0x01>; }; |