From 8499df9879d119a42ef0d9e433522de0d4c3d2e0 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Tue, 22 Jan 2019 00:00:00 +0000
Subject: [PATCH] readme: fix --gem5 references

---
 README.adoc | 16 ++++++++++------
 bench-boot  |  6 +++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/README.adoc b/README.adoc
index b4c5368..28b4bf3 100644
--- a/README.adoc
+++ b/README.adoc
@@ -84,7 +84,7 @@ See also: <<quit-qemu-from-text-mode>>.
 
 All available modules can be found in the link:kernel_modules[] directory.
 
-It is super easy to build for different CPU architectures, just use the `--arch` option:
+It is super easy to build for different <<cpu-architecture,CPU architectures>>, just use the `--arch` option:
 
 ....
 ./build --arch aarch64 --download-dependencies qemu-buildroot
@@ -93,8 +93,6 @@ It is super easy to build for different CPU architectures, just use the `--arch`
 
 To avoid typing `--arch aarch64` many times, you set the default arch as explained at: <<default-command-line-arguments>>
 
-See also: <<cpu-architecture,CPU architectures>>.
-
 I now urge you to read the following sections which contain widely applicable information:
 
 * <<run-command-after-boot>>
@@ -336,7 +334,7 @@ See <<gem5-vs-qemu>> for a more thorough comparison.
 
 ==== gem5 Buildroot setup getting started
 
-For the most part, if you just add the `--gem5` option or `*-gem5` suffix to all commands and everything should magically work.
+For the most part, if you just add the `--emulator gem5` option or `*-gem5` suffix to all commands and everything should magically work.
 
 If you haven't built Buildroot yet for <<qemu-buildroot-setup>>, you can build from the beginning with:
 
@@ -792,9 +790,15 @@ and then <<qemu-buildroot-setup,as usual>> open a shell with:
 ./gem5-shell
 ....
 
+Or as usualy, <<tmux>> users can do both in one go with:
+
+....
+./run --arch aarch64 --baremetal interactive/prompt --emulator gem5 --tmux
+....
+
 TODO: the carriage returns are a bit different than in QEMU, see: <<gem5-baremetal-carriage-return>>.
 
-Note that `./build-baremetal` requires the `--gem5` option, and generates separate executable images for both, as can be seen from:
+Note that `./build-baremetal` requires the `--emulator gem5` option, and generates separate executable images for both, as can be seen from:
 
 ....
 echo "$(./getvar --arch aarch64 --baremetal interactive/prompt        image)"
@@ -804,7 +808,7 @@ echo "$(./getvar --arch aarch64 --baremetal interactive/prompt --emulator gem5 i
 This is unlike the Linux kernel that has a single image for both QEMU and gem5:
 
 ....
-echo "$(./getvar --arch aarch64        image)"
+echo "$(./getvar --arch aarch64 --emulator qemu image)"
 echo "$(./getvar --arch aarch64 --emulator gem5 image)"
 ....
 
diff --git a/bench-boot b/bench-boot
index 82b249e..68b2354 100755
--- a/bench-boot
+++ b/bench-boot
@@ -54,7 +54,7 @@ newline
 if [ "$test_size" -ge 2 ]; then
   bench "${arch} --eval '/poweroff.out' --trace exec_tb"
   qemu_insts "$arch"
-  bench "$arch --eval 'm5 exit' --gem5"
+  bench "$arch --eval 'm5 exit' --emulator gem5"
   gem5_insts "$arch"
 fi
 #bench "$arch --eval 'm5 exit' --emulator gem5 -- --cpu-type=DerivO3CPU ${caches}"
@@ -65,7 +65,7 @@ bench "$arch --eval '/poweroff.out'"
 if [ "$test_size" -ge 2 ]; then
   bench "$arch --eval '/poweroff.out' --trace exec_tb"
   qemu_insts "$arch"
-  bench "$arch --eval 'm5 exit' --gem5"
+  bench "$arch --eval 'm5 exit' --emulator gem5"
   gem5_insts "$arch"
 fi
 if [ "$test_size" -ge 3 ]; then
@@ -79,7 +79,7 @@ newline
 if [ "$test_size" -ge 2 ]; then
   bench "$arch --eval '/poweroff.out' --trace exec_tb"
   qemu_insts "$arch"
-  bench "$arch --eval 'm5 exit' --gem5"
+  bench "$arch --eval 'm5 exit' --emulator gem5"
   gem5_insts "$arch"
 fi
 if [ "$test_size" -ge 3 ]; then