diff --git a/content/boards/chromebooks/01-debugging_interfaces.md b/content/boards/chromebooks/01-debugging_interfaces.md
index 855f1468642949535363d871259612ef8523af87..29add922eeac8b1b005bd59581981c189e10f086 100644
--- a/content/boards/chromebooks/01-debugging_interfaces.md
+++ b/content/boards/chromebooks/01-debugging_interfaces.md
@@ -123,7 +123,7 @@ ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="18d1", ATTRS{idProduct}=="50
# Servo Micro
ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="18d1", ATTRS{idProduct}=="501a", ENV{MAJOR}=="189", TAG+="systemd", ENV{SYSTEMD_WANTS}+="google-servo@$name.service", ENV{ID_MODEL}="Google Servo Micro control board %n"
-# Cr50 (Case Close Debugging)
+# Cr50 (Closed Case Debugging)
ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="18d1", ATTRS{idProduct}=="5014", ENV{MAJOR}=="189", TAG+="systemd", ENV{SYSTEMD_WANTS}+="google-servo@$name.service", ENV{ID_MODEL}="Google Cr50 %n"
```
diff --git a/content/boards/chromebooks/02-ccd.md b/content/boards/chromebooks/02-ccd.md
index ca32210f100f61d019016336c96694f5141de0b2..17cfbabf01a4fa55540ea92a7e3e22656558d052 100644
--- a/content/boards/chromebooks/02-ccd.md
+++ b/content/boards/chromebooks/02-ccd.md
@@ -3,7 +3,7 @@ title: Closed Case Debugging (CCD)
weight: 2
---
-Early Chromebooks models have a special debug connector on their
+Early Chromebook models have a special debug connector on their
motherboard to interface with Servo Micro boards. This connector is not
fitted on production devices, so a rework is necessary to add it. Newer
models support the Closed Case Debugging (CCD) feature, using USB
@@ -27,7 +27,7 @@ purposefully wants to enable it.
## Connecting a CCD interface
The first step is to connect the host computer (laptop, NUC dispatcher...) to
-the Chromebook using a CCD-pcapable USB Type-C interface. Each type of
+the Chromebook using a CCD-capable USB Type-C interface. Each type of
interface has its own particularities as described below.
### Connecting with SuzyQ
@@ -43,7 +43,7 @@ Run the following command in terminal to watch for new devices:
sudo dmesg -w
```
-Connect the Type-A USB end of the Suzy-Q to the host (laptop, NUC
+Connect the Type-A USB end of the SuzyQ to the host (laptop, NUC
dispatcher...). A `SuzyQable` device should be detected as shown below:
```
[386753.698883] usb 1-2: new high-speed USB device number 49 using xhci_hcd
@@ -54,7 +54,7 @@ dispatcher...). A `SuzyQable` device should be detected as shown below:
[386753.867518] usb 1-2: SerialNumber: 0004002101BC
```
-Then connect the Type-C end of the Suzy-Q cable to the Chromebook. A `Cr50`
+Then connect the Type-C end of the SuzyQ cable to the Chromebook. A `Cr50`
device should be detected by the host in the format of the list below:
```
[387078.927146] usb 1-2.2: new full-speed USB device number 51 using xhci_hcd
diff --git a/content/boards/chromebooks/03-flashing.md b/content/boards/chromebooks/03-flashing.md
index 535f13087eca75641656fbaf240772ab9f6a1f89..113c6832cbccfcc0252da487eee298a483407d38 100644
--- a/content/boards/chromebooks/03-flashing.md
+++ b/content/boards/chromebooks/03-flashing.md
@@ -22,27 +22,13 @@ documentation. Typically, all the LAVA rack dispatchers in the lab will
have these packages automatically installed by Chef.
-### Install flash tools
+### Install the firmware tools
-To install the tools needed to flash the Chromebook firmware images:
-
-- Install the required dependency packages:
- ```
- apt install git-lfs
- ```
-
-- Clone the flash-tools repository and fetch binaries:
- ```
- git clone https://gitlab.collabora.com/chromium/flash-tools.git
- cd flash-tools
- git lfs fetch
- git lfs checkout
- ```
-
-This includes the `flashrom` binary with its library dependencies and
-the
-[`servoflash.py`](https://gitlab.collabora.com/chromium/firmware-tools/-/blob/master/servoflash.py)
-script to actually flash Chromebook firmware images via Servo boards.
+To install the tools needed to flash the Chromebook firmware images
+follow [these
+instructions](https://gitlab.collabora.com/chromium/firmware-tools/-/blob/master/README.md#installing)
+from the firmware tools README. This can be run on a dispatcher itself
+in the lab, to be able to then flash Chromebook devices directly.
## Flashing a firmware image
@@ -52,14 +38,19 @@ They are all currently all stored in
[images.collabora.co.uk](https://images.collabora.co.uk/lava/boot) and
need to be downloaded manually.
+See the general [flashing
+instructions](https://gitlab.collabora.com/chromium/firmware-tools/-/blob/master/README.md#flashing)
+from the firmware tools README, and the specific ones for the Collabora
+test lab below.
+
For example, to flash the firmware for a `rk3399-gru-kevin` device:
* SSH to the dispatcher where the device is attached and enter
- flash-tools
+ firmware-tools
```
ssh lava-rack-cbg-2
- cd flash-tools
+ cd firmware-tools
```
* Download the firmware file
@@ -72,7 +63,9 @@ For example, to flash the firmware for a `rk3399-gru-kevin` device:
and the matching firmware file:
```
- ./servoflash.py --device=rk3399-gru-kevin-cbg-0 --firmware=depthcharge-rk3399-gru-kevin-20180806.dev.bin
+ ./servoflash.py \
+ --device=rk3399-gru-kevin-cbg-0 \
+ --firmware=depthcharge-rk3399-gru-kevin-20180806.dev.bin
```
It can take a few minutes. There should be these messages around the
diff --git a/content/boards/chromebooks/04-bootloader_setup.md b/content/boards/chromebooks/04-bootloader_setup.md
index e51412f4f21afa3cce4864f32a780b7d2a0755e9..d651644e786ff666408f6de45b2f879bf99c4b5f 100644
--- a/content/boards/chromebooks/04-bootloader_setup.md
+++ b/content/boards/chromebooks/04-bootloader_setup.md
@@ -25,7 +25,7 @@ from the branch above. More info
[here](https://gitlab.collabora.com/chromium/firmware-tools).
-# Chromebook bootup in a LAVA setup
+## Chromebook bootup in a LAVA setup
Chromebooks used in a LAVA environment will boot a Linux kernel through
TFTP. In order to do this, LAVA will access the Depthcharge CLI through
diff --git a/content/boards/chromebooks/boards/coral.md b/content/boards/chromebooks/boards/coral.md
index 4e961c10a1dfb7d6b038a62f7a183b39d94ac0e3..8e17c7a9751694e63ed13c79c97a0808cc122d9d 100644
--- a/content/boards/chromebooks/boards/coral.md
+++ b/content/boards/chromebooks/boards/coral.md
@@ -15,6 +15,11 @@ The specs for these chromebooks vary in terms of display, connectivity
and devices, but they are based on Intel Apollo Lake 64 bit CPUs
(Celeron Dual-Core N3350 , N3450 or Quad-Core N4200).
+The Collabora LAVA lab contains the following `coral` devices:
+
+ - ASUS Chromebook C523NA
+ - `asus-C523NA-A20057-coral`
+
### Debugging interfaces
`coral` boards have been flashed and tested with both [SuzyQ and Servo
diff --git a/content/boards/chromebooks/boards/grunt.md b/content/boards/chromebooks/boards/grunt.md
index 68c602f7d1b660e1b69e219e3c1830735ddacaba..152ea8da9c78e43203141f0134e7f0540d7661a0 100644
--- a/content/boards/chromebooks/boards/grunt.md
+++ b/content/boards/chromebooks/boards/grunt.md
@@ -15,6 +15,17 @@ devices and CPU, some of them using Intel 64 bit processors such as the
Celeron N2940 (Bay Trail) and the Celeron N3350 (Apollo Lake) and some
others using AMD 64 bit Stoney Ridge processors like the AMD A4-9120.
+The Collabora LAVA lab contains the following `grunt` devices:
+
+ - HP Chromebook 11 G6 EE:
+ - [`hp-11A-G6-EE-grunt-cbg-0`](https://lava.collabora.co.uk/scheduler/device/hp-11A-G6-EE-grunt-cbg-0)
+ - [`hp-11A-G6-EE-grunt-cbg-1`](https://lava.collabora.co.uk/scheduler/device/hp-11A-G6-EE-grunt-cbg-1)
+ - [`hp-11A-G6-EE-grunt-cbg-2`](https://lava.collabora.co.uk/scheduler/device/hp-11A-G6-EE-grunt-cbg-2)
+ - [`hp-11A-G6-EE-grunt-cbg-3`](https://lava.collabora.co.uk/scheduler/device/hp-11A-G6-EE-grunt-cbg-3)
+ - [`hp-11A-G6-EE-grunt-cbg-4`](https://lava.collabora.co.uk/scheduler/device/hp-11A-G6-EE-grunt-cbg-4)
+ - [`hp-11A-G6-EE-grunt-cbg-5`](https://lava.collabora.co.uk/scheduler/device/hp-11A-G6-EE-grunt-cbg-5)
+ - [`hp-11A-G6-EE-grunt-cbg-6`](https://lava.collabora.co.uk/scheduler/device/hp-11A-G6-EE-grunt-cbg-6)
+
### Debugging interfaces
`grunt` boards have been flashed and tested with both [SuzyQ and Servo