doc: Convert bits and pieces to CMake

Convert leftover references to "Make" to CMake.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>

doc/glossary.rst

@@ -16,7 +16,7 @@ Glossary of Terms
       The set of user-supplied files that the Zephyr build system uses
       to build an application image for a specified board configuration.
       It can contain application-specific code, kernel configuration settings,
-      and at least one Makefile.
+      and at least one CMakeLists.txt file.
       The application's kernel configuration settings direct the build system
       to create a custom kernel that makes efficient use of the board's
       resources.

doc/subsystems/bluetooth/devel.rst

@@ -58,11 +58,13 @@ through a so-called user channel for QEMU to use:
 #. Choose one of the Bluetooth sample applications located in
    :literal:`samples/bluetooth`.
 
-#. To run Bluetooth application in QEMU, type:
+#. To run a Bluetooth application in QEMU, type:
 
-   .. code-block:: console
+.. zephyr-app-commands::
-
+   :zephyr-app: samples/bluetooth/<sample>
-      $ make run
+   :board: qemu_x86
+   :goals: run
+   :compact:
 
 Running QEMU now results in a connection with the second serial line to
 the :literal:`bt-server-bredr` UNIX socket, letting the application

doc/subsystems/networking/qemu_setup.rst

@@ -68,10 +68,11 @@ Build and start the ``echo_server`` sample application.
 
 In terminal #1, type:
 
-.. code-block:: console
+.. zephyr-app-commands::
-
+   :zephyr-app: samples/net/echo_server
-   $ cd samples/net/echo_server
+   :board: qemu_x86
-   $ make pristine && make run
+   :goals: run
+   :compact:
 
 If you see error from QEMU about unix:/tmp/slip.sock, it means you missed Step 1
 above.
@@ -162,20 +163,24 @@ samples, you will need 2 terminal windows, set up for Zephyr development.
 Terminal #1:
 ============
 
-.. code-block:: console
+.. zephyr-app-commands::
-
+   :zephyr-app: samples/net/echo_server
-   $ cd samples/net/echo_server
+   :board: qemu_x86
-   $ make server
+   :goals: build
+   :build-args: server
+   :compact:
 
 This will start QEMU, waiting for connection from a client QEMU.
 
 Terminal #2:
 ============
 
-.. code-block:: console
+.. zephyr-app-commands::
-
+   :zephyr-app: samples/net/echo_client
-   $ cd samples/net/echo_client
+   :board: qemu_x86
-   $ make client
+   :goals: build
+   :build-args: client
+   :compact:
 
 This will start 2nd QEMU instance, and you should see logging of data sent and
 received in both.

doc/subsystems/test/sanitycheck.rst

@@ -181,9 +181,9 @@ required for best test coverage for this specific board:
 
 identifier:
   A string that matches how the board is defined in the build system. This same
-  string is used when building, for example when calling 'make'::
+  string is used when building, for example when calling 'cmake'::
 
-  # make BOARD=quark_d2000_crb
+  # cmake -DBOARD=quark_d2000_crb ..
 
 name:
   The actual name of the board as it appears in marketing material.

doc/tools/nordic_segger.rst

@@ -196,7 +196,7 @@ Once downloaded you can install it and configure it like so:
 * Host Interface: USB
 
 Once configured, you can then use the File->Open menu to open the ``zephyr.elf``
-file that you can find in your ``outdir/<board>/`` folder.
+file that you can find in your build folder.
 
 References
 **********