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>

8 files changed, 20 insertions, 20 deletions

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.