diff options
| author | Jon Murphy <jpmurphy@google.com> | 2022-06-28 10:36:23 -0600 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-07-04 14:02:26 +0000 |
| commit | c4e90454f4e3787c9e5d0b7aa758ee9b5757df4b (patch) | |
| tree | ad1a49b4477d62eb6604e3332b6ffc4a64daed06 | |
| parent | dc86804a7db0ac67b81803d1662608320c8838a7 (diff) | |
| download | coreboot-c4e90454f4e3787c9e5d0b7aa758ee9b5757df4b.tar.gz | |
treewide: Unify Google branding
Branding changes to unify and update Chrome OS to ChromeOS (removing the
space).
This CL also includes changing Chromium OS to ChromiumOS as well.
BUG=None
TEST=N/A
Change-Id: I39af9f1069b62747dbfeebdd62d85fabfa655dcd
Signed-off-by: Jon Murphy <jpmurphy@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65479
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
82 files changed, 126 insertions, 126 deletions
diff --git a/Documentation/acronyms.md b/Documentation/acronyms.md index 7987e9f51e..32a6655b1b 100644 --- a/Documentation/acronyms.md +++ b/Documentation/acronyms.md @@ -185,7 +185,7 @@ Spec](https://uefi.org/specifications) for details, or run the tool Unit**](http://en.wikipedia.org/wiki/Central_processing_unit) * CPUID - x86: [**CPU Identification**](https://en.wikipedia.org/wiki/CPUID) opcode * Cr50 - Google: The first generation Google Security Chip (GSC) used on - Chrome OS devices. + ChromeOS devices. * CRB - Customer Reference Board * CRLF - Carriage Return, Line Feed - \\r\\n - The standard window EOL (End-of-Line) marker. @@ -914,7 +914,7 @@ Spec](https://uefi.org/specifications) for details, or run the tool * TGL - Intel: Tigerlake * THC - Touch Host Controller * Ti50 - Google: The next generation GSC (Google Security chip) on - Chrome OS devices after Cr50 + ChromeOS devices after Cr50 * TLA - Techtronics Logic Analyzer * TLA - Three Letter Acronym * TLB - [**Translation Lookside diff --git a/Documentation/lib/flashmap.md b/Documentation/lib/flashmap.md index 68d0ab5dc7..f0816cf493 100644 --- a/Documentation/lib/flashmap.md +++ b/Documentation/lib/flashmap.md @@ -4,7 +4,7 @@ [Flashmap](https://code.google.com/p/flashmap) (FMAP) is a binary format to describe partitions in a flash chip. It was added to coreboot to support the -requirements of Chromium OS firmware but then was also used in other scenarios +requirements of ChromiumOS firmware but then was also used in other scenarios where precise placement of data in flash was necessary, or for data that is written to at runtime, as CBFS is considered too fragile for such situations. The Flashmap implementation inside coreboot is the de facto standard today. diff --git a/Documentation/lib/fw_config.md b/Documentation/lib/fw_config.md index d5f0bb2d06..c9eaeecdab 100644 --- a/Documentation/lib/fw_config.md +++ b/Documentation/lib/fw_config.md @@ -8,8 +8,8 @@ BIOS image to be used across a wide variety of devices which may have key differ otherwise similar enough to use the same coreboot build target. The initial implementation is designed to take advantage of a bitmask returned by the Embedded -Controller on Google Chrome OS devices which allows the manufacturer to use the same firmware -image across multiple devices by selecting various options at runtime. See the Chromium OS +Controller on Google ChromeOS devices which allows the manufacturer to use the same firmware +image across multiple devices by selecting various options at runtime. See the ChromiumOS [Firmware Config][1] documentation for more information. This firmware configuration interface differs from the CMOS option interface in that this @@ -91,7 +91,7 @@ file in CBFS use the value it contains when matching fields and options. ### Embedded Controller -Google Chrome OS devices support an Embedded Controller interface for reading and writing the +Google ChromeOS devices support an Embedded Controller interface for reading and writing the firmware configuration value, along with other board-specific information. It is possible for coreboot to read this value at boot on systems that support this feature. @@ -101,9 +101,9 @@ possible by enabling the CBFS source and coreboot will look in CBFS first for a before asking the embedded controller. It is also possible to adjust the value in the embedded controller *(after disabling write -protection)* with the `ectool` command in a Chrome OS environment. +protection)* with the `ectool` command in a ChromeOS environment. -For more information on the firmware configuration field on Chrome OS devices see the Chromium +For more information on the firmware configuration field on ChromeOS devices see the Chromium documentation for [Firmware Config][1] and [Board Info][2]. [1]: http://chromium.googlesource.com/chromiumos/docs/+/master/design_docs/firmware_config.md diff --git a/Documentation/northbridge/intel/haswell/mrc.bin.md b/Documentation/northbridge/intel/haswell/mrc.bin.md index edfe4b8b84..c24305eb7e 100644 --- a/Documentation/northbridge/intel/haswell/mrc.bin.md +++ b/Documentation/northbridge/intel/haswell/mrc.bin.md @@ -3,7 +3,7 @@ All Haswell boards supported by coreboot currently require a proprietary blob in order to initialise the DRAM and a few other components. The blob, named `mrc.bin`, largely consists of Intel's memory reference code -(MRC), but it has been tailored specifically for Chrome OS. It is just +(MRC), but it has been tailored specifically for ChromeOS. It is just under 200 KiB in size. Another name for `mrc.bin` is the system agent binary. diff --git a/Documentation/security/vboot/index.md b/Documentation/security/vboot/index.md index 5ee0492486..1a17c20e63 100644 --- a/Documentation/security/vboot/index.md +++ b/Documentation/security/vboot/index.md @@ -328,7 +328,7 @@ Google's Chromebooks have some special features: ### Developer Mode Developer mode allows the user to use coreboot to boot another operating system. -This may be a another (beta) version of Chrome OS, or another flavor of +This may be a another (beta) version of ChromeOS, or another flavor of GNU/Linux. Use of developer mode does not void the system warranty. Upon entry into developer mode, all locally saved data on the system is lost. This prevents someone from entering developer mode to subvert the system diff --git a/Documentation/soc/intel/cse_fw_update/cse_fw_update.md b/Documentation/soc/intel/cse_fw_update/cse_fw_update.md index 98fe310113..54a5e615c8 100644 --- a/Documentation/soc/intel/cse_fw_update/cse_fw_update.md +++ b/Documentation/soc/intel/cse_fw_update/cse_fw_update.md @@ -8,7 +8,7 @@ power transition flows. ## Problem Statement -Currently, on Chromium OS Systems, CSE region is not updatable. So, new CSE FW +Currently, on ChromiumOS Systems, CSE region is not updatable. So, new CSE FW versions that are released by Intel to address important functional and security bugs post-product launch will not be available to the end-user. Hence, the proposed solution allows in-field CSE FW update to propagate those bug fixes diff --git a/Documentation/technotes/2015-11-rebuilding-coreboot-image-generation.md b/Documentation/technotes/2015-11-rebuilding-coreboot-image-generation.md index 9accbfe65d..a3f81bf4f1 100644 --- a/Documentation/technotes/2015-11-rebuilding-coreboot-image-generation.md +++ b/Documentation/technotes/2015-11-rebuilding-coreboot-image-generation.md @@ -3,7 +3,7 @@ Rebuilding coreboot image generation Current situation ----------------- -Chrome OS (CrOS) probably has the most complex image bundling process in the +ChromeOS (CrOS) probably has the most complex image bundling process in the coreboot ecosystem. To make CrOS features more accessible to the wider coreboot community, we want to move these capabilities into upstream coreboot’s build system. @@ -21,7 +21,7 @@ putting more data (eg. the bitmap data, keys) as raw data into other fmap regions. With the recent addition of more files to CBFS, both on the coreboot side -(dsdt, FSP, and so on) and with Chrome OS specifics (eg. more files describing +(dsdt, FSP, and so on) and with ChromeOS specifics (eg. more files describing boot screens) we either need to expand the scope of bundle\_firmware or move the capability to build complex images to upstream coreboot’s build system. This document proposes to do the latter and outlines how this could be @@ -41,14 +41,14 @@ images: variable to guarantee success if there’s enough room for the files. While that could be added, that becomes more make macro work indistinguishable from magic that people fail to understand, break and with good reason complain about - to work around such issues, Chrome OS firmware uses a custom tool with even + to work around such issues, ChromeOS firmware uses a custom tool with even more special cases to finally build the image it needs. If coreboot upstream is to support vboot, it should also be powerful enough not to need magic tools that only live within downstream projects. Requirements ------------ -A complete Chrome OS coreboot image consists of (depending on the device) +A complete ChromeOS coreboot image consists of (depending on the device) * platform specific data in raw fmap regions (eg IFD, ME firmware), * the bootblock (coming from the bootblock), * three copies of coreboot, consisting of the stages (verstage, romstage, @@ -68,7 +68,7 @@ using a yet to be implemented switching scheme based on fmaps) consists of * payload plus data (with each of the coreboot copies), Since a single platform is potentially built with different payload -configurations (eg. modding a Chromebook to not use the verified Chrome OS +configurations (eg. modding a Chromebook to not use the verified ChromeOS boot scheme), some concerns need to be kept separate: * Platform requirements that have nothing to do with the payload or boot schemes * IFD, ME, … need to copied to the right place @@ -111,11 +111,11 @@ Boot method manifest -------------------- The boot method manifest can subdivide the BIOS region, eg. using it directly (for coreboot’s “simple” bootblock), splitting it in two (for coreboot’s -fallback/normal) or in many parts (for Chrome OS, which requires two CBFS +fallback/normal) or in many parts (for ChromeOS, which requires two CBFS regions, one for GBB, several for VPD, …). It also specifies which of the file lists specified earlier belong in which region (eg. with verstage verifying romstage, verstage needs to be only in -Chrome OS’ RO region, while romstage belongs in RO and both RW regions). +ChromeOS’ RO region, while romstage belongs in RO and both RW regions). It can also specify a post processing step that is executed before the chipset’s. @@ -148,7 +148,7 @@ It specifies an IFD region, an ME, and the BIOS region. After the image is built, the entire image needs to be processed (although the tool likely works only on a small part of it) -It’s built in a Chrome OS-like configuration (simplified at places to avoid +It’s built in a ChromeOS-like configuration (simplified at places to avoid distracting from the important parts), so it has three CBFS regions, and several data regions for its own purpose (similar to GBB, FWID, VPD, …). After the regions are filled, one data region must be post-processed to contain diff --git a/Documentation/util.md b/Documentation/util.md index 3bdb6fafaf..9823a143ce 100644 --- a/Documentation/util.md +++ b/Documentation/util.md @@ -47,9 +47,9 @@ file `Python` * _rmodtool_ - Creates rmodules `C` * _ifwitool_ - For manipulating IFWI `C` * __cbmem__ - CBMEM parser to read e.g. timestamps and console log `C` -* __chromeos__ - These scripts can be used to access Chrome OS +* __chromeos__ - These scripts can be used to access ChromeOS resources, for example to extract System Agent reference code and other -blobs (e.g. mrc.bin, refcode, VGA option roms) from a Chrome OS +blobs (e.g. mrc.bin, refcode, VGA option roms) from a ChromeOS recovery image. `C` * __crossgcc__ - A cross toolchain builder for -elf toolchains (ie. no libc support) `Bash` diff --git a/Documentation/util/ifdtool/layout.md b/Documentation/util/ifdtool/layout.md index f89cc0308c..c898ce3828 100644 --- a/Documentation/util/ifdtool/layout.md +++ b/Documentation/util/ifdtool/layout.md @@ -29,7 +29,7 @@ way to categorize anything required by the SoC but not provided by coreboot. +------------+------------------+-----------+-------------------------------------------+ | 4 | Platform Data | SI_PDR | | +------------+------------------+-----------+-------------------------------------------+ -| 8 | EC Firmware | SI_EC | Most Chrome OS devices do not use this | +| 8 | EC Firmware | SI_EC | Most ChromeOS devices do not use this | | | | | region; EC firmware is stored in BIOS | | | | | region of flash | +------------+------------------+-----------+-------------------------------------------+ diff --git a/LICENSES/retained-copyrights.txt b/LICENSES/retained-copyrights.txt index bfa9ecccb8..a3183ab380 100644 --- a/LICENSES/retained-copyrights.txt +++ b/LICENSES/retained-copyrights.txt @@ -7,17 +7,17 @@ Copyright © 2012 Intel Corporation Copyright 2012 Red Hat Inc. Copyright 2013 Google Inc. Copyright 2014 Google Inc. -Copyright 2014 The Chromium OS Authors. All rights reserved. +Copyright 2014 The ChromiumOS Authors. All rights reserved. Copyright 2015 Google Inc. Copyright 2015, Google Inc. Copyright 2016 Jonathan Neuschäfer <j.neuschaefer@gmx.net> -Copyright 2016 The Chromium OS Authors. All rights reserved. +Copyright 2016 The ChromiumOS Authors. All rights reserved. Copyright 2017-2019 Eltan B.V. Copyright 2017 Google Inc. Copyright 2018 Generated Code Copyright 2018-present Facebook, Inc. Copyright 2019 9Elements Agency GmbH <patrick.rudolph@9elements.com> -Copyright 2019 The Chromium OS Authors. All rights reserved. +Copyright 2019 The ChromiumOS Authors. All rights reserved. Copyright (C) 2002 David S. Peterson. All rights reserved. Copyright (c) 2003-2016 Cavium Inc. (support@cavium.com). All rights Copyright (c) 2003-2017 Cavium Inc. (support@cavium.com). All rights @@ -35,7 +35,7 @@ Copyright (c) 2010-2017, The Regents of the University of California Copyright (c) 2010, Code Aurora Forum. All rights reserved. Copyright (C) 2010 coresystems GmbH Copyright (c) 2010 Per Odlund <per.odlund@armagedon.se> -Copyright (c) 2010 The Chromium OS Authors. All rights reserved. +Copyright (c) 2010 The ChromiumOS Authors. All rights reserved. Copyright (c) 2011-2012, Code Aurora Forum. All rights reserved. Copyright (c) 2011-2012 The Linux Foundation. All rights reserved. Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. @@ -52,14 +52,14 @@ Copyright (c) 2012, 2016-2019 Advanced Micro Devices, Inc. Copyright (c) 2012-2019 The Linux Foundation. All rights reserved. Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.* Copyright (c) 2012, Code Aurora Forum. All rights reserved. -Copyright (c) 2012 The Chromium OS Authors. All rights reserved. +Copyright (c) 2012 The ChromiumOS Authors. All rights reserved. Copyright (c) 2012 The Linux Foundation. All rights reserved. Copyright (c) 2012 The Linux Foundation. All rights reserved.* Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved. Copyright (c) 2013-2015 Intel Corporation. Copyright (c) 2013-2017 Intel Corporation. Copyright (C) 2013 Google Inc. -Copyright (c) 2013 The Chromium OS Authors. All rights reserved. +Copyright (c) 2013 The ChromiumOS Authors. All rights reserved. Copyright (c) 2013 The Linux Foundation. All rights reserved. Copyright (c) 2013, The Regents of the University of California (Regents). Copyright (C) 2014 - 2015, 2019 The Linux Foundation. All rights reserved. @@ -69,14 +69,14 @@ Copyright (C) 2014 - 2016 The Linux Foundation. All rights reserved. Copyright (c) 2014 Google Inc. Copyright (C) 2014 Google Inc. Copyright (c) 2014 Google Inc. All rights reserved. -Copyright (c) 2014 The Chromium OS Authors. All rights reserved. +Copyright (c) 2014 The ChromiumOS Authors. All rights reserved. Copyright (C) 2014 The Linux Foundation. All rights reserved. Copyright (C) 2015-2016 Intel Corporation. Copyright (C) 2015-2016, Intel Corporation Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved. Copyright (C) 2015 Google Inc. Copyright (c) 2015, Intel Corporation. All rights reserved. -Copyright (c) 2015 The Chromium OS Authors. All rights reserved. +Copyright (c) 2015 The ChromiumOS Authors. All rights reserved. Copyright (C) 2015 The Linux Foundation. All rights reserved. Copyright (c) 2015, The Linux Foundation. All rights reserved. Copyright (C) 2015 Timothy Pearson <tpearson@raptorengineeringinc.com>, Raptor Engineering diff --git a/configs/config.google_meep_cros b/configs/config.google_meep_cros index acb0e4cc59..97e23fd631 100644 --- a/configs/config.google_meep_cros +++ b/configs/config.google_meep_cros @@ -7,7 +7,7 @@ CONFIG_SPI_FLASH_SMM=y CONFIG_USE_BLOBS=y CONFIG_ANY_TOOLCHAIN=y -# Chrome OS +# ChromeOS CONFIG_CHROMEOS=y CONFIG_HAS_RECOVERY_MRC_CACHE=y CONFIG_MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN=y diff --git a/payloads/libpayload/Kconfig b/payloads/libpayload/Kconfig index 2ad3c00206..7c5a95bafd 100644 --- a/payloads/libpayload/Kconfig +++ b/payloads/libpayload/Kconfig @@ -56,10 +56,10 @@ config DEVELOPER libpayload developers. config CHROMEOS - bool "Chrome OS Options" + bool "ChromeOS Options" default n help - Select configuration defaults appropriate for Chrome OS boards. + Select configuration defaults appropriate for ChromeOS boards. choice prompt "Compiler to use" diff --git a/payloads/libpayload/arch/x86/string.c b/payloads/libpayload/arch/x86/string.c index fb290603d6..836d049831 100644 --- a/payloads/libpayload/arch/x86/string.c +++ b/payloads/libpayload/arch/x86/string.c @@ -1,6 +1,6 @@ /* * Copyright (C) 1991,1992,1993,1997,1998,2003, 2005 Free Software Foundation, Inc. - * Copyright (c) 2011 The Chromium OS Authors. + * Copyright (c) 2011 The ChromiumOS Authors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as diff --git a/payloads/libpayload/drivers/serial/ipq806x.c b/payloads/libpayload/drivers/serial/ipq806x.c index 93e2129185..e267d57a0e 100644 --- a/payloads/libpayload/drivers/serial/ipq806x.c +++ b/payloads/libpayload/drivers/serial/ipq806x.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Chromium OS authors + * Copyright (c) 2014 ChromiumOS authors */ #include <libpayload.h> diff --git a/payloads/libpayload/include/endian.h b/payloads/libpayload/include/endian.h index 8c4f5915f3..934bb6abba 100644 --- a/payloads/libpayload/include/endian.h +++ b/payloads/libpayload/include/endian.h @@ -1,6 +1,6 @@ /* * - * Copyright (c) 2012 The Chromium OS Authors. + * Copyright (c) 2012 The ChromiumOS Authors. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/payloads/libpayload/include/ipchksum.h b/payloads/libpayload/include/ipchksum.h index eb7c85681f..391fefbf2a 100644 --- a/payloads/libpayload/include/ipchksum.h +++ b/payloads/libpayload/include/ipchksum.h @@ -1,6 +1,6 @@ /* * - * Copyright (c) 2012 The Chromium OS Authors. + * Copyright (c) 2012 The ChromiumOS Authors. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/src/acpi/dsdt_top.asl b/src/acpi/dsdt_top.asl index b8be798117..4fbbec5659 100644 --- a/src/acpi/dsdt_top.asl +++ b/src/acpi/dsdt_top.asl @@ -3,7 +3,7 @@ #include <acpi/acpigen_extern.asl> #if CONFIG(CHROMEOS_NVS) -/* Chrome OS specific */ +/* ChromeOS specific */ #include <vendorcode/google/chromeos/acpi/chromeos.asl> #endif diff --git a/src/commonlib/bsd/include/commonlib/bsd/elog.h b/src/commonlib/bsd/include/commonlib/bsd/elog.h index 35a42e6b23..44f1051957 100644 --- a/src/commonlib/bsd/include/commonlib/bsd/elog.h +++ b/src/commonlib/bsd/include/commonlib/bsd/elog.h @@ -203,7 +203,7 @@ struct elog_event_data_wake { uint32_t instance; } __packed; -/* Chrome OS related events */ +/* ChromeOS related events */ #define ELOG_TYPE_CROS_DEVELOPER_MODE 0xa0 #define ELOG_TYPE_CROS_RECOVERY_MODE 0xa1 #define ELOG_CROS_RECOVERY_MODE_BUTTON 0x02 @@ -305,7 +305,7 @@ struct elog_event_mem_cache_update { #define ELOG_TYPE_MI_HRPC 0xb4 #define ELOG_TYPE_MI_HR 0xb5 -/* Chrome OS diagnostics-related events */ +/* ChromeOS diagnostics-related events */ #define ELOG_TYPE_CROS_DIAGNOSTICS 0xb6 #define ELOG_CROS_LAUNCH_DIAGNOSTICS 0x01 diff --git a/src/commonlib/include/commonlib/timestamp_serialized.h b/src/commonlib/include/commonlib/timestamp_serialized.h index 67b9656371..bc2152eab4 100644 --- a/src/commonlib/include/commonlib/timestamp_serialized.h +++ b/src/commonlib/include/commonlib/timestamp_serialized.h @@ -165,7 +165,7 @@ enum timestamp_id { TS_KERNEL_START = 1101, TS_KERNEL_DECOMPRESSION = 1102, - /* 1200-1300: Chrome OS Hypervisor */ + /* 1200-1300: ChromeOS Hypervisor */ TS_CRHV_BOOT = 1200, TS_CRHV_PLATFORM_INIT = 1201, TS_CRHV_SERVICES_STARTED = 1202, @@ -247,10 +247,10 @@ static const struct timestamp_id_to_name { TS_NAME_DEF(TS_EC_HASH_READY, 0, "EC vboot hash ready"), TS_NAME_DEF(TS_EC_POWER_LIMIT_WAIT, 0, "waiting for EC to allow higher power draw"), TS_NAME_DEF(TS_EC_SYNC_END, 0, "finished EC software sync"), - TS_NAME_DEF(TS_COPYVPD_START, TS_COPYVPD_RW_END, "starting to load Chrome OS VPD"), + TS_NAME_DEF(TS_COPYVPD_START, TS_COPYVPD_RW_END, "starting to load ChromeOS VPD"), TS_NAME_DEF(TS_COPYVPD_RO_END, TS_COPYVPD_RW_END, - "finished loading Chrome OS VPD (RO)"), - TS_NAME_DEF(TS_COPYVPD_RW_END, 0, "finished loading Chrome OS VPD (RW)"), + "finished loading ChromeOS VPD (RO)"), + TS_NAME_DEF(TS_COPYVPD_RW_END, 0, "finished loading ChromeOS VPD (RW)"), TS_NAME_DEF(TS_TPM_ENABLE_UPDATE_START, TS_TPM_ENABLE_UPDATE_END, "started TPM enable update"), TS_NAME_DEF(TS_TPM_ENABLE_UPDATE_END, 0, "finished TPM enable update"), @@ -344,7 +344,7 @@ static const struct timestamp_id_to_name { TS_NAME_DEF(TS_KERNEL_START, 0, "jumping to kernel"), TS_NAME_DEF(TS_KERNEL_DECOMPRESSION, 0, "starting kernel decompression/relocation"), - /* Chrome OS hypervisor */ + /* ChromeOS hypervisor */ TS_NAME_DEF(TS_CRHV_BOOT, 0, "hypervisor boot finished"), TS_NAME_DEF(TS_CRHV_PLATFORM_INIT, 0, "hypervisor platform initialized"), TS_NAME_DEF(TS_CRHV_SERVICES_STARTED, 0, "hypervisor services started"), diff --git a/src/drivers/camera/Kconfig b/src/drivers/camera/Kconfig index 1c0c0a3634..4956ca2b67 100644 --- a/src/drivers/camera/Kconfig +++ b/src/drivers/camera/Kconfig @@ -2,6 +2,6 @@ config CHROMEOS_CAMERA bool default n help - Camera with identifiers following Chrome OS Camera Info. The info is + Camera with identifiers following ChromeOS Camera Info. The info is usually available on MIPI camera EEPROM for identifying correct drivers and config. diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c index d6778b0846..f7aaed48b1 100644 --- a/src/drivers/intel/fsp2_0/memory_init.c +++ b/src/drivers/intel/fsp2_0/memory_init.c @@ -42,7 +42,7 @@ static void save_memory_training_data(bool s3wake, uint32_t fsp_version) /* * Save MRC Data to CBMEM. By always saving the data this forces - * a retrain after a trip through Chrome OS recovery path. The + * a retrain after a trip through ChromeOS recovery path. The * code which saves the data to flash doesn't write if the latest * training data matches this one. */ diff --git a/src/ec/google/chromeec/Kconfig b/src/ec/google/chromeec/Kconfig index 4bb0d65c86..1a4dcdb770 100644 --- a/src/ec/google/chromeec/Kconfig +++ b/src/ec/google/chromeec/Kconfig @@ -125,9 +125,9 @@ config EC_GOOGLE_CHROMEEC_PD_BOARDNAME config EC_GOOGLE_CHROMEEC_RTC depends on EC_GOOGLE_CHROMEEC - bool "Enable Chrome OS EC RTC" + bool "Enable ChromeOS EC RTC" help - Enable support for the real-time clock on the Chrome OS EC. This + Enable support for the real-time clock on the ChromeOS EC. This uses the EC_CMD_RTC_GET_VALUE command to read the current time. choice @@ -194,7 +194,7 @@ config EC_GOOGLE_CHROMEEC_SWITCHES depends on EC_GOOGLE_CHROMEEC && VBOOT bool help - Enable support for Chrome OS mode switches provided by the Chrome OS + Enable support for ChromeOS mode switches provided by the ChromeOS EC. config EC_GOOGLE_CHROMEEC_INCLUDE_SSFC_IN_FW_CONFIG diff --git a/src/ec/google/chromeec/acpi/superio.asl b/src/ec/google/chromeec/acpi/superio.asl index 0620e09576..84afa17ed1 100644 --- a/src/ec/google/chromeec/acpi/superio.asl +++ b/src/ec/google/chromeec/acpi/superio.asl @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* - * Chrome OS Embedded Controller interface + * ChromeOS Embedded Controller interface * * Constants that should be defined: * diff --git a/src/ec/google/chromeec/ec_message.h b/src/ec/google/chromeec/ec_message.h index f074ae8a27..4423bd87e2 100644 --- a/src/ec/google/chromeec/ec_message.h +++ b/src/ec/google/chromeec/ec_message.h @@ -1,5 +1,5 @@ /* - * Chromium OS Matrix Keyboard Message Protocol definitions + * ChromiumOS Matrix Keyboard Message Protocol definitions */ /* SPDX-License-Identifier: GPL-2.0-or-later */ @@ -9,7 +9,7 @@ /* * Command interface between EC and AP, for LPC, I2C and SPI interfaces. * - * This is copied from the Chromium OS Open Source Embedded Controller code. + * This is copied from the ChromiumOS Open Source Embedded Controller code. */ enum { /* The header byte, which follows the preamble */ diff --git a/src/mainboard/google/asurada/chromeos.fmd b/src/mainboard/google/asurada/chromeos.fmd index 7194632e36..bb2a95cd0f 100644 --- a/src/mainboard/google/asurada/chromeos.fmd +++ b/src/mainboard/google/asurada/chromeos.fmd @@ -1,4 +1,4 @@ -# Firmware Layout Description for Chrome OS. +# Firmware Layout Description for ChromeOS. # # The size and address of every section must be aligned to at least 4K, except: # RO_FRID, RW_FWID*, GBB, or any unused / padding / CBFS type sections. diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index b985be20a9..228aecdff7 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -97,7 +97,7 @@ config CHROMEOS select HAS_RECOVERY_MRC_CACHE config CHROMEOS_WIFI_SAR - bool "Enable SAR options for Chrome OS build" + bool "Enable SAR options for ChromeOS build" depends on CHROMEOS select DSAR_ENABLE select GEO_SAR_ENABLE diff --git a/src/mainboard/google/brya/dsdt.asl b/src/mainboard/google/brya/dsdt.asl index de3337f399..ab4d210551 100644 --- a/src/mainboard/google/brya/dsdt.asl +++ b/src/mainboard/google/brya/dsdt.asl @@ -36,7 +36,7 @@ DefinitionBlock( /* Chipset specific sleep states */ #include <southbridge/intel/common/acpi/sleepstates.asl> - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/google/brya/variants/anahera/overridetree.cb b/src/mainboard/google/brya/variants/anahera/overridetree.cb index 48a1fdd42d..e5c2e960b9 100644 --- a/src/mainboard/google/brya/variants/anahera/overridetree.cb +++ b/src/mainboard/google/brya/variants/anahera/overridetree.cb @@ -79,7 +79,7 @@ chip soc/intel/alderlake chip drivers/gfx/generic register "device_count" = "1" register "device[0].name" = ""LCD"" - # Use Chrome OS privacy screen _HID + # Use ChromeOS privacy screen _HID register "device[0].hid" = ""GOOG0010"" # Internal panel on the first port of the graphics chip register "device[0].addr" = "0x80010400" diff --git a/src/mainboard/google/brya/variants/anahera4es/overridetree.cb b/src/mainboard/google/brya/variants/anahera4es/overridetree.cb index cac72995bc..63fb2a901d 100644 --- a/src/mainboard/google/brya/variants/anahera4es/overridetree.cb +++ b/src/mainboard/google/brya/variants/anahera4es/overridetree.cb @@ -71,7 +71,7 @@ chip soc/intel/alderlake chip drivers/gfx/generic register "device_count" = "1" register "device[0].name" = ""LCD"" - # Use Chrome OS privacy screen _HID + # Use ChromeOS privacy screen _HID register "device[0].hid" = ""GOOG0010"" # Internal panel on the first port of the graphics chip register "device[0].addr" = "0x80010400" diff --git a/src/mainboard/google/brya/variants/brya0/overridetree.cb b/src/mainboard/google/brya/variants/brya0/overridetree.cb index a94410354b..6ac469af1f 100644 --- a/src/mainboard/google/brya/variants/brya0/overridetree.cb +++ b/src/mainboard/google/brya/variants/brya0/overridetree.cb @@ -570,7 +570,7 @@ chip soc/intel/alderlake end chip drivers/i2c/generic register "hid" = ""GOOG0020"" - register "desc" = ""Chrome OS HPS"" + register "desc" = ""ChromeOS HPS"" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E7)" # EN_HPS_PWR register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E3_IRQ)" # HPS_INT_ODL # HPS uses I2C addresses 0x30 and 0x51. diff --git a/src/mainboard/google/brya/variants/brya4es/overridetree.cb b/src/mainboard/google/brya/variants/brya4es/overridetree.cb index 9d9233b9d5..eed577710b 100644 --- a/src/mainboard/google/brya/variants/brya4es/overridetree.cb +++ b/src/mainboard/google/brya/variants/brya4es/overridetree.cb @@ -571,7 +571,7 @@ chip soc/intel/alderlake end chip drivers/i2c/generic register "hid" = ""GOOG0020"" - register "desc" = ""Chrome OS HPS"" + register "desc" = ""ChromeOS HPS"" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E7)" # EN_HPS_PWR register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E3_IRQ)" # HPS_INT_ODL # HPS uses I2C addresses 0x30 and 0x51. diff --git a/src/mainboard/google/brya/variants/redrix/overridetree.cb b/src/mainboard/google/brya/variants/redrix/overridetree.cb index 4d7d6a5d13..3b92b63b49 100644 --- a/src/mainboard/google/brya/variants/redrix/overridetree.cb +++ b/src/mainboard/google/brya/variants/redrix/overridetree.cb @@ -99,7 +99,7 @@ chip soc/intel/alderlake chip drivers/gfx/generic register "device_count" = "1" register "device[0].name" = ""LCD"" - # Use Chrome OS privacy screen _HID + # Use ChromeOS privacy screen _HID register "device[0].hid" = ""GOOG0010"" # Internal panel on the first port of the graphics chip register "device[0].addr" = "0x80010400" diff --git a/src/mainboard/google/brya/variants/redrix4es/overridetree.cb b/src/mainboard/google/brya/variants/redrix4es/overridetree.cb index 9a0eb1f6e8..60eb8a3d0d 100644 --- a/src/mainboard/google/brya/variants/redrix4es/overridetree.cb +++ b/src/mainboard/google/brya/variants/redrix4es/overridetree.cb @@ -85,7 +85,7 @@ chip soc/intel/alderlake chip drivers/gfx/generic register "device_count" = "1" register "device[0].name" = ""LCD"" - # Use Chrome OS privacy screen _HID + # Use ChromeOS privacy screen _HID register "device[0].hid" = ""GOOG0010"" # Internal panel on the first port of the graphics chip register "device[0].addr" = "0x80010400" diff --git a/src/mainboard/google/brya/variants/skolas4es/overridetree.cb b/src/mainboard/google/brya/variants/skolas4es/overridetree.cb index 6f0eb2168e..3280b4be4f 100644 --- a/src/mainboard/google/brya/variants/skolas4es/overridetree.cb +++ b/src/mainboard/google/brya/variants/skolas4es/overridetree.cb @@ -570,7 +570,7 @@ chip soc/intel/alderlake end chip drivers/i2c/generic register "hid" = ""GOOG0020"" - register "desc" = ""Chrome OS HPS"" + register "desc" = ""ChromeOS HPS"" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E7)" # EN_HPS_PWR register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E3_IRQ)" # HPS_INT_ODL # HPS uses I2C addresses 0x30 and 0x51. diff --git a/src/mainboard/google/brya/variants/taeko/overridetree.cb b/src/mainboard/google/brya/variants/taeko/overridetree.cb index 5a964c6672..9a4de9393c 100644 --- a/src/mainboard/google/brya/variants/taeko/overridetree.cb +++ b/src/mainboard/google/brya/variants/taeko/overridetree.cb @@ -416,7 +416,7 @@ chip soc/intel/alderlake device ref i2c2 on chip drivers/i2c/generic register "hid" = ""GOOG0020"" - register "desc" = ""Chrome OS HPS"" + register "desc" = ""ChromeOS HPS"" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E7)" # EN_HPS_PWR register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E3_IRQ)" # HPS_INT_ODL # HPS uses I2C addresses 0x30 and 0x51. diff --git a/src/mainboard/google/brya/variants/taeko4es/overridetree.cb b/src/mainboard/google/brya/variants/taeko4es/overridetree.cb index f1074de74d..3ec57e47c8 100644 --- a/src/mainboard/google/brya/variants/taeko4es/overridetree.cb +++ b/src/mainboard/google/brya/variants/taeko4es/overridetree.cb @@ -320,7 +320,7 @@ chip soc/intel/alderlake device ref i2c2 on chip drivers/i2c/generic register "hid" = ""GOOG0020"" - register "desc" = ""Chrome OS HPS"" + register "desc" = ""ChromeOS HPS"" register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E7)" # EN_HPS_PWR register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_E3_IRQ)" # HPS_INT_ODL # HPS uses I2C addresses 0x30 and 0x51. diff --git a/src/mainboard/google/brya/variants/vell/overridetree.cb b/src/mainboard/google/brya/variants/vell/overridetree.cb index 903b67f209..d8ef5096cc 100644 --- a/src/mainboard/google/brya/variants/vell/overridetree.cb +++ b/src/mainboard/google/brya/variants/vell/overridetree.cb @@ -94,7 +94,7 @@ chip soc/intel/alderlake chip drivers/gfx/generic register "device_count" = "1" register "device[0].name" = ""LCD"" - # Use Chrome OS privacy screen _HID + # Use ChromeOS privacy screen _HID register "device[0].hid" = ""GOOG0010"" # Internal panel on the first port of the graphics chip register "device[0].addr" = "0x80010400" diff --git a/src/mainboard/google/cherry/chromeos.fmd b/src/mainboard/google/cherry/chromeos.fmd index 7194632e36..bb2a95cd0f 100644 --- a/src/mainboard/google/cherry/chromeos.fmd +++ b/src/mainboard/google/cherry/chromeos.fmd @@ -1,4 +1,4 @@ -# Firmware Layout Description for Chrome OS. +# Firmware Layout Description for ChromeOS. # # The size and address of every section must be aligned to at least 4K, except: # RO_FRID, RW_FWID*, GBB, or any unused / padding / CBFS type sections. diff --git a/src/mainboard/google/corsola/chromeos.fmd b/src/mainboard/google/corsola/chromeos.fmd index a8c4dfe0af..5b2234d39e 100644 --- a/src/mainboard/google/corsola/chromeos.fmd +++ b/src/mainboard/google/corsola/chromeos.fmd @@ -1,4 +1,4 @@ -# Firmware Layout Description for Chrome OS. +# Firmware Layout Description for ChromeOS. # # The size and address of every section must be aligned to at least 4K, except: # RO_FRID, RW_FWID*, GBB, or any unused / padding / CBFS type sections. diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 396347d818..84626efee0 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -65,7 +65,7 @@ config CHROMEOS select VBOOT_LID_SWITCH config CHROMEOS_WIFI_SAR - bool "Enable SAR options for Chrome OS build" + bool "Enable SAR options for ChromeOS build" depends on CHROMEOS select DSAR_ENABLE select SAR_ENABLE diff --git a/src/mainboard/google/dedede/dsdt.asl b/src/mainboard/google/dedede/dsdt.asl index f88e2df55d..7b6066ef61 100644 --- a/src/mainboard/google/dedede/dsdt.asl +++ b/src/mainboard/google/dedede/dsdt.asl @@ -37,7 +37,7 @@ DefinitionBlock( #include <southbridge/intel/common/acpi/sleepstates.asl> - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/google/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig index 40afdf4851..916a235de0 100644 --- a/src/mainboard/google/drallion/Kconfig +++ b/src/mainboard/google/drallion/Kconfig @@ -39,7 +39,7 @@ config CHROMEOS select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC config CHROMEOS_WIFI_SAR - bool "Enable SAR options for Chrome OS build" + bool "Enable SAR options for ChromeOS build" depends on CHROMEOS select DSAR_ENABLE select GEO_SAR_ENABLE diff --git a/src/mainboard/google/drallion/dsdt.asl b/src/mainboard/google/drallion/dsdt.asl index 5556c989bb..62bed72961 100644 --- a/src/mainboard/google/drallion/dsdt.asl +++ b/src/mainboard/google/drallion/dsdt.asl @@ -33,7 +33,7 @@ DefinitionBlock( #include <southbridge/intel/common/acpi/sleepstates.asl> - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/google/eve/dsdt.asl b/src/mainboard/google/eve/dsdt.asl index 357f3bfe6f..a42e9dee82 100644 --- a/src/mainboard/google/eve/dsdt.asl +++ b/src/mainboard/google/eve/dsdt.asl @@ -34,7 +34,7 @@ DefinitionBlock( #include <southbridge/intel/common/acpi/sleepstates.asl> - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/google/fizz/dsdt.asl b/src/mainboard/google/fizz/dsdt.asl index 01e94f2f77..287e42649c 100644 --- a/src/mainboard/google/fizz/dsdt.asl +++ b/src/mainboard/google/fizz/dsdt.asl @@ -33,7 +33,7 @@ DefinitionBlock( #include <southbridge/intel/common/acpi/sleepstates.asl> - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/google/guybrush/dsdt.asl b/src/mainboard/google/guybrush/dsdt.asl index 9579ae36f9..6c208cf6c6 100644 --- a/src/mainboard/google/guybrush/dsdt.asl +++ b/src/mainboard/google/guybrush/dsdt.asl @@ -15,7 +15,7 @@ DefinitionBlock ( #include <acpi/dsdt_top.asl> #include <soc.asl> - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb b/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb index 8270b147bb..2fc416e775 100644 --- a/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb +++ b/src/mainboard/google/guybrush/variants/nipperkin/overridetree.cb @@ -182,7 +182,7 @@ chip soc/amd/cezanne chip drivers/gfx/generic register "device_count" = "1" register "device[0].name" = ""LCD"" - # Use Chrome OS privacy screen _HID + # Use ChromeOS privacy screen _HID register "device[0].hid" = ""GOOG0010"" # Internal panel on the first port of the graphics chip register "device[0].addr" = "0x80010400" diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig index 749b0df30a..712ed06e7c 100644 --- a/src/mainboard/google/hatch/Kconfig +++ b/src/mainboard/google/hatch/Kconfig @@ -166,7 +166,7 @@ config CHROMEOS select CHROMEOS_CSE_BOARD_RESET_OVERRIDE if SOC_INTEL_CSE_LITE_SKU config CHROMEOS_WIFI_SAR - bool "Enable SAR options for Chrome OS build" + bool "Enable SAR options for ChromeOS build" depends on CHROMEOS select DSAR_ENABLE select GEO_SAR_ENABLE diff --git a/src/mainboard/google/hatch/dsdt.asl b/src/mainboard/google/hatch/dsdt.asl index 022a607a1d..dad2267c33 100644 --- a/src/mainboard/google/hatch/dsdt.asl +++ b/src/mainboard/google/hatch/dsdt.asl @@ -35,7 +35,7 @@ DefinitionBlock( #include <southbridge/intel/common/acpi/sleepstates.asl> - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/google/kahlee/dsdt.asl b/src/mainboard/google/kahlee/dsdt.asl index be4033b270..7aa4ae01fe 100644 --- a/src/mainboard/google/kahlee/dsdt.asl +++ b/src/mainboard/google/kahlee/dsdt.asl @@ -52,7 +52,7 @@ DefinitionBlock ( /* Thermal handler */ #include <variant/acpi/thermal.asl> - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/google/kukui/chromeos.fmd b/src/mainboard/google/kukui/chromeos.fmd index 2635854866..61d45b0816 100644 --- a/src/mainboard/google/kukui/chromeos.fmd +++ b/src/mainboard/google/kukui/chromeos.fmd @@ -1,4 +1,4 @@ -# Firmware Layout Description for Chrome OS. +# Firmware Layout Description for ChromeOS. # # The size and address of every section must be aligned to at least 4K, except: # RO_FRID, RW_FWID*, GBB, or any unused / padding / CBFS type sections. diff --git a/src/mainboard/google/octopus/dsdt.asl b/src/mainboard/google/octopus/dsdt.asl index bebee41b15..7ae3cc810c 100644 --- a/src/mainboard/google/octopus/dsdt.asl +++ b/src/mainboard/google/octopus/dsdt.asl @@ -32,7 +32,7 @@ DefinitionBlock( #include <southbridge/intel/common/acpi/sleepstates.asl> - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/google/poppy/dsdt.asl b/src/mainboard/google/poppy/dsdt.asl index dbba8064e0..950ac2e592 100644 --- a/src/mainboard/google/poppy/dsdt.asl +++ b/src/mainboard/google/poppy/dsdt.asl @@ -41,7 +41,7 @@ DefinitionBlock( #include <southbridge/intel/common/acpi/sleepstates.asl> - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/google/reef/dsdt.asl b/src/mainboard/google/reef/dsdt.asl index fde3975521..79277c6380 100644 --- a/src/mainboard/google/reef/dsdt.asl +++ b/src/mainboard/google/reef/dsdt.asl @@ -32,7 +32,7 @@ DefinitionBlock( #include <southbridge/intel/common/acpi/sleepstates.asl> - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/google/sarien/dsdt.asl b/src/mainboard/google/sarien/dsdt.asl index fd91f64859..00def91566 100644 --- a/src/mainboard/google/sarien/dsdt.asl +++ b/src/mainboard/google/sarien/dsdt.asl @@ -34,7 +34,7 @@ DefinitionBlock( #include <southbridge/intel/common/acpi/sleepstates.asl> #if CONFIG(EC_GOOGLE_WILCO) - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/google/skyrim/dsdt.asl b/src/mainboard/google/skyrim/dsdt.asl index 3aec6baf3d..39399d8eb7 100644 --- a/src/mainboard/google/skyrim/dsdt.asl +++ b/src/mainboard/google/skyrim/dsdt.asl @@ -15,7 +15,7 @@ DefinitionBlock ( #include <acpi/dsdt_top.asl> #include <soc.asl> - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig index 8947cd8bcf..926a0ca4b1 100644 --- a/src/mainboard/google/volteer/Kconfig +++ b/src/mainboard/google/volteer/Kconfig @@ -140,7 +140,7 @@ config VBOOT_GSCVD default n config CHROMEOS_WIFI_SAR - bool "Enable SAR options for Chrome OS build" + bool "Enable SAR options for ChromeOS build" depends on CHROMEOS select DSAR_ENABLE select GEO_SAR_ENABLE diff --git a/src/mainboard/google/volteer/dsdt.asl b/src/mainboard/google/volteer/dsdt.asl index 66747d17c2..d4e9339954 100644 --- a/src/mainboard/google/volteer/dsdt.asl +++ b/src/mainboard/google/volteer/dsdt.asl @@ -36,7 +36,7 @@ DefinitionBlock( #include "mainboard.asl" } - // Chrome OS Embedded Controller + // ChromeOS Embedded Controller Scope (\_SB.PCI0.LPCB) { // ACPI code for EC SuperIO functions diff --git a/src/mainboard/google/zork/dsdt.asl b/src/mainboard/google/zork/dsdt.asl index c2df9b7310..e67a8dcfef 100644 --- a/src/mainboard/google/zork/dsdt.asl +++ b/src/mainboard/google/zork/dsdt.asl @@ -44,7 +44,7 @@ DefinitionBlock ( /* Thermal handler */ #include <variant/acpi/thermal.asl> - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/intel/adlrvp/dsdt.asl b/src/mainboard/intel/adlrvp/dsdt.asl index 4b41b22d6f..6449e26ca3 100644 --- a/src/mainboard/intel/adlrvp/dsdt.asl +++ b/src/mainboard/intel/adlrvp/dsdt.asl @@ -28,7 +28,7 @@ DefinitionBlock( } #if CONFIG(EC_GOOGLE_CHROMEEC) - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/intel/glkrvp/dsdt.asl b/src/mainboard/intel/glkrvp/dsdt.asl index f4169da46d..bc5f999f05 100644 --- a/src/mainboard/intel/glkrvp/dsdt.asl +++ b/src/mainboard/intel/glkrvp/dsdt.asl @@ -31,7 +31,7 @@ DefinitionBlock( #include <southbridge/intel/common/acpi/sleepstates.asl> - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/intel/icelake_rvp/dsdt.asl b/src/mainboard/intel/icelake_rvp/dsdt.asl index 2097b3e39c..236762d75f 100644 --- a/src/mainboard/intel/icelake_rvp/dsdt.asl +++ b/src/mainboard/intel/icelake_rvp/dsdt.asl @@ -31,7 +31,7 @@ DefinitionBlock( } #if CONFIG(EC_GOOGLE_CHROMEEC) - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/intel/jasperlake_rvp/dsdt.asl b/src/mainboard/intel/jasperlake_rvp/dsdt.asl index cebd048256..dd93b43da1 100644 --- a/src/mainboard/intel/jasperlake_rvp/dsdt.asl +++ b/src/mainboard/intel/jasperlake_rvp/dsdt.asl @@ -31,7 +31,7 @@ DefinitionBlock( } #if CONFIG(EC_GOOGLE_CHROMEEC) - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/mainboard/intel/shadowmountain/dsdt.asl b/src/mainboard/intel/shadowmountain/dsdt.asl index 57324b3656..3e8f6e2fa8 100644 --- a/src/mainboard/intel/shadowmountain/dsdt.asl +++ b/src/mainboard/intel/shadowmountain/dsdt.asl @@ -30,7 +30,7 @@ DefinitionBlock( } } - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { // ACPI code for EC SuperIO functions diff --git a/src/mainboard/intel/tglrvp/dsdt.asl b/src/mainboard/intel/tglrvp/dsdt.asl index ca1e441d10..785e985b6f 100644 --- a/src/mainboard/intel/tglrvp/dsdt.asl +++ b/src/mainboard/intel/tglrvp/dsdt.asl @@ -33,7 +33,7 @@ DefinitionBlock( } #if CONFIG(EC_GOOGLE_CHROMEEC) - /* Chrome OS Embedded Controller */ + /* ChromeOS Embedded Controller */ Scope (\_SB.PCI0.LPCB) { /* ACPI code for EC SuperIO functions */ diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig index 06f9e93485..a36510dee7 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -103,7 +103,7 @@ config VBOOT_DISABLE_DEV_ON_RECOVERY bool default n help - When this option is enabled, the Chrome OS device leaves the + When this option is enabled, the ChromeOS device leaves the developer mode as soon as recovery request is detected. This is handy on embedded devices with limited input capabilities. @@ -321,10 +321,10 @@ config GBB_HWID string "Hardware ID" default "" help - A hardware identifier for device. On Chrome OS this is used for auto + A hardware identifier for device. On ChromeOS this is used for auto update and recovery, and will be generated when manufacturing by the factory software, in a strictly defined format. - Leave empty to get a test-only Chrome OS HWID v2 string generated. + Leave empty to get a test-only ChromeOS HWID v2 string generated. config GBB_BMPFV_FILE string "Path to bmpfv image" @@ -339,7 +339,7 @@ config GBB_FLAG_LOAD_OPTION_ROMS default n config GBB_FLAG_ENABLE_ALTERNATE_OS - bool "Allow booting a non-Chrome OS kernel if dev switch is on" + bool "Allow booting a non-ChromeOS kernel if dev switch is on" default n config GBB_FLAG_FORCE_DEV_SWITCH_ON diff --git a/src/soc/amd/cezanne/Kconfig b/src/soc/amd/cezanne/Kconfig index bccd455a2a..d3a28413a8 100644 --- a/src/soc/amd/cezanne/Kconfig +++ b/src/soc/amd/cezanne/Kconfig @@ -434,7 +434,7 @@ config VBOOT_STARTS_BEFORE_BOOTBLOCK select ARCH_VERSTAGE_ARMV7 help Runs verstage on the PSP. Only available on - certain Chrome OS branded parts from AMD. + certain ChromeOS branded parts from AMD. config VBOOT_HASH_BLOCK_SIZE hex diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig index 88ae228fb5..2a056a2452 100644 --- a/src/soc/amd/picasso/Kconfig +++ b/src/soc/amd/picasso/Kconfig @@ -466,7 +466,7 @@ config VBOOT_STARTS_BEFORE_BOOTBLOCK select ARCH_VERSTAGE_ARMV7 help Runs verstage on the PSP. Only available on - certain Chrome OS branded parts from AMD. + certain ChromeOS branded parts from AMD. config VBOOT_HASH_BLOCK_SIZE hex diff --git a/src/soc/amd/sabrina/Kconfig b/src/soc/amd/sabrina/Kconfig index 2e9022f24c..654c6e3935 100644 --- a/src/soc/amd/sabrina/Kconfig +++ b/src/soc/amd/sabrina/Kconfig @@ -454,7 +454,7 @@ config VBOOT_STARTS_BEFORE_BOOTBLOCK select ARCH_VERSTAGE_ARMV7 help Runs verstage on the PSP. Only available on - certain Chrome OS branded parts from AMD. + certain ChromeOS branded parts from AMD. config VBOOT_HASH_BLOCK_SIZE hex diff --git a/src/soc/intel/common/block/include/intelblocks/cse.h b/src/soc/intel/common/block/include/intelblocks/cse.h index 322e9f3d02..f7aae1c0cd 100644 --- a/src/soc/intel/common/block/include/intelblocks/cse.h +++ b/src/soc/intel/common/block/include/intelblocks/cse.h @@ -490,7 +490,7 @@ uint8_t cse_wait_com_soft_temp_disable(void); /* * The CSE Lite SKU supports notion of RO and RW boot partitions. The function will set - * CSE's boot partition as per Chrome OS boot modes. In normal mode, the function allows CSE to + * CSE's boot partition as per ChromeOS boot modes. In normal mode, the function allows CSE to * boot from RW and triggers recovery mode if CSE fails to jump to RW. * In software triggered recovery mode, the function allows CSE to boot from whatever is * currently selected partition. diff --git a/src/soc/rockchip/rk3399/spi_bitbang.c b/src/soc/rockchip/rk3399/spi_bitbang.c index 27b23f1ea3..8bc45e50be 100644 --- a/src/soc/rockchip/rk3399/spi_bitbang.c +++ b/src/soc/rockchip/rk3399/spi_bitbang.c @@ -46,7 +46,7 @@ static void set_cs(const struct spi_bitbang_ops *ops, int value) gpio_set(slave->cs, value); } -/* Can't use GPIO() here because of bug in GCC version used by Chromium OS. */ +/* Can't use GPIO() here because of bug in GCC version used by ChromiumOS. */ static const struct rockchip_bitbang_slave slaves[] = { [0] = { .ops = { get_miso, set_mosi, set_clk, set_cs }, diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig index 32af5538ae..868492062e 100644 --- a/src/vendorcode/google/chromeos/Kconfig +++ b/src/vendorcode/google/chromeos/Kconfig @@ -23,7 +23,7 @@ config CHROMEOS if CHROMEOS config CHROMEOS_RAMOOPS - bool "Reserve space for Chrome OS ramoops" + bool "Reserve space for ChromeOS ramoops" default y config CHROMEOS_RAMOOPS_RAM_SIZE diff --git a/src/vendorcode/google/chromeos/acpi/amac.asl b/src/vendorcode/google/chromeos/acpi/amac.asl index 7d614f3433..18b9f28382 100644 --- a/src/vendorcode/google/chromeos/acpi/amac.asl +++ b/src/vendorcode/google/chromeos/acpi/amac.asl @@ -11,7 +11,7 @@ * The Linux kernel implementation can be found at * drivers/net/usb/r8152.c:vendor_mac_passthru_addr_read() * - * For Chrome OS, the policy which controls where the dock MAC address + * For ChromeOS, the policy which controls where the dock MAC address * comes from is written into RW_VPD property "dock_passthrough": * * "dock_mac" or empty: Use MAC address from RO_VPD value "dock_mac" diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h index 5db78671ce..98aa4faf9b 100644 --- a/src/vendorcode/google/chromeos/chromeos.h +++ b/src/vendorcode/google/chromeos/chromeos.h @@ -38,7 +38,7 @@ void chromeos_set_ramoops(void *ram_oops, size_t size); enum cb_err get_dsm_calibration_from_key(const char *key, uint64_t *value); /* - * Declaration for mainboards to use to generate ACPI-specific Chrome OS needs. + * Declaration for mainboards to use to generate ACPI-specific ChromeOS needs. */ void chromeos_acpi_gpio_generate(void); diff --git a/util/README.md b/util/README.md index 8be29d4b8d..8946bf2dc8 100644 --- a/util/README.md +++ b/util/README.md @@ -36,9 +36,9 @@ file `Python` * _rmodtool_ - Creates rmodules `C` * _ifwitool_ - For manipulating IFWI `C` * __cbmem__ - CBMEM parser to read e.g. timestamps and console log `C` -* __chromeos__ - These scripts can be used to access Chrome OS +* __chromeos__ - These scripts can be used to access ChromeOS resources, for example to extract System Agent reference code and other -blobs (e.g. mrc.bin, refcode, VGA option roms) from a Chrome OS +blobs (e.g. mrc.bin, refcode, VGA option roms) from a ChromeOS recovery image. `C` * __crossgcc__ - A cross toolchain builder for -elf toolchains (ie. no libc support) `Bash` diff --git a/util/abuild/abuild b/util/abuild/abuild index c8c56f8e31..8ec972723b 100755 --- a/util/abuild/abuild +++ b/util/abuild/abuild @@ -426,7 +426,7 @@ function build_config export HOSTCC='gcc' if [ "$chromeos" = true ] && [ "$(grep -c "^[[:space:]]*select[[:space:]]*MAINBOARD_HAS_CHROMEOS\>" "${ROOT}/src/mainboard/${board_srcdir}/Kconfig")" -eq 0 ]; then - echo "${BUILD_NAME} doesn't support Chrome OS, skipping." + echo "${BUILD_NAME} doesn't support ChromeOS, skipping." return fi @@ -450,7 +450,7 @@ function build_config # Skip this rule for configs created from templates that already # come with CHROMEOS enabled. grep -q "^CONFIG_CHROMEOS=y" ${config_file:-/dev/null} || \ - check_config "$build_dir" "Chrome OS" "CONFIG_CHROMEOS=y" negate + check_config "$build_dir" "ChromeOS" "CONFIG_CHROMEOS=y" negate local FORCE_ENABLED_CROS=$? else local FORCE_ENABLED_CROS=0 @@ -611,7 +611,7 @@ Options:\n" [-u|--update] Update existing image [-v|--verbose] Print more messages [-x|--chromeos] Build with CHROMEOS enabled - Skip boards without Chrome OS support + Skip boards without ChromeOS support [-X|--xmlfile <name>] Set JUnit XML log file filename (defaults to $XMLFILE) [-y|--ccache] Use ccache @@ -765,7 +765,7 @@ while true ; do -x|--chromeos) shift chromeos=true testclass=chromeos - customizing="${customizing}, chrome os" + customizing="${customizing}, chromeos" configoptions="${configoptions}CONFIG_CHROMEOS=y\nCONFIG_VBOOT_MEASURED_BOOT=y\n" ;; -X|--xmlfile) shift; XMLFILE=$1; REAL_XMLFILE=$1; shift;; diff --git a/util/cbfstool/eventlog.c b/util/cbfstool/eventlog.c index 1fd4113f52..120bb40e08 100644 --- a/util/cbfstool/eventlog.c +++ b/util/cbfstool/eventlog.c @@ -141,8 +141,8 @@ static void eventlog_print_type(const struct event_header *event) {ELOG_TYPE_S0IX_ENTER, "S0ix Enter"}, {ELOG_TYPE_S0IX_EXIT, "S0ix Exit"}, {ELOG_TYPE_WAKE_SOURCE, "Wake Source"}, - {ELOG_TYPE_CROS_DEVELOPER_MODE, "Chrome OS Developer Mode"}, - {ELOG_TYPE_CROS_RECOVERY_MODE, "Chrome OS Recovery Mode"}, + {ELOG_TYPE_CROS_DEVELOPER_MODE, "ChromeOS Developer Mode"}, + {ELOG_TYPE_CROS_RECOVERY_MODE, "ChromeOS Recovery Mode"}, {ELOG_TYPE_MANAGEMENT_ENGINE, "Management Engine"}, {ELOG_TYPE_MANAGEMENT_ENGINE_EXT, "Management Engine Extra"}, {ELOG_TYPE_LAST_POST_CODE, "Last post code in previous boot"}, diff --git a/util/cbfstool/flashrom.c b/util/cbfstool/flashrom.c index 64f73e420b..6e438bfe22 100644 --- a/util/cbfstool/flashrom.c +++ b/util/cbfstool/flashrom.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ diff --git a/util/cbfstool/flashrom.h b/util/cbfstool/flashrom.h index 0db2194973..a222d19ee8 100644 --- a/util/cbfstool/flashrom.h +++ b/util/cbfstool/flashrom.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * diff --git a/util/chromeos/README.md b/util/chromeos/README.md index 964c6c5a76..bbba044c05 100644 --- a/util/chromeos/README.md +++ b/util/chromeos/README.md @@ -1,16 +1,16 @@ -# Chrome OS Scripts +# ChromeOS Scripts -These scripts can be used to access or generate Chrome OS resources, for example +These scripts can be used to access or generate ChromeOS resources, for example to extract System Agent reference code and other blobs (e.g. `mrc.bin`, refcode, -VGA option roms) from a Chrome OS recovery image. +VGA option roms) from a ChromeOS recovery image. ## crosfirmware.sh -`crosfirmware.sh` downloads a Chrome OS recovery image from the recovery +`crosfirmware.sh` downloads a ChromeOS recovery image from the recovery image server, unpacks it, extracts the firmware update shell archive, extracts the firmware images from the shell archive. -To download all Chrome OS firmware images, run +To download all ChromeOS firmware images, run $ ./crosfirmware.sh @@ -21,14 +21,14 @@ To download, e.g. the Panther firmware image, run ## extract_blobs.sh -`extract_blobs.sh` extracts the blobs from a Chrome OS firmware image. +`extract_blobs.sh` extracts the blobs from a ChromeOS firmware image. Right now it will produce the ME firmware blob, IFD, VGA option rom, and `mrc.bin`. ## gen_test_hwid.sh -`gen_test_hwid.sh` generates a test-only identifier in Chrome OS HWID v2 +`gen_test_hwid.sh` generates a test-only identifier in ChromeOS HWID v2 compatible format. Usage: diff --git a/util/chromeos/description.md b/util/chromeos/description.md index 840e58927e..74096d2ad1 100644 --- a/util/chromeos/description.md +++ b/util/chromeos/description.md @@ -1,3 +1,3 @@ -These scripts can be used to access Chrome OS resources, for example to extract +These scripts can be used to access ChromeOS resources, for example to extract System Agent reference code and other blobs (e.g. mrc.bin, refcode, VGA option -roms) from a Chrome OS recovery image. `C` +roms) from a ChromeOS recovery image. `C` diff --git a/util/chromeos/gen_test_hwid.sh b/util/chromeos/gen_test_hwid.sh index 163a12aa0c..9dfbce5a85 100755 --- a/util/chromeos/gen_test_hwid.sh +++ b/util/chromeos/gen_test_hwid.sh @@ -8,7 +8,7 @@ main() { exit 1 fi - # Generate a test-only Chrome OS HWID v2 string + # Generate a test-only ChromeOS HWID v2 string local board="$1" local prefix="$(echo "${board}" | tr a-z A-Z) TEST" # gzip has second-to-last 4 bytes in CRC32. |