summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/migration-guides/migration-2.6.rst15
-rw-r--r--documentation/ref-manual/variables.rst13
2 files changed, 6 insertions, 22 deletions
diff --git a/documentation/migration-guides/migration-2.6.rst b/documentation/migration-guides/migration-2.6.rst
index 8e79a3edc9..356f720850 100644
--- a/documentation/migration-guides/migration-2.6.rst
+++ b/documentation/migration-guides/migration-2.6.rst
@@ -211,22 +211,19 @@ The following changes have been made:
211``SERIAL_CONSOLE`` Deprecated 211``SERIAL_CONSOLE`` Deprecated
212----------------------------- 212-----------------------------
213 213
214The :term:`SERIAL_CONSOLE` variable has been 214The ``SERIAL_CONSOLE`` variable has been functionally replaced by the
215functionally replaced by the 215:term:`SERIAL_CONSOLES` variable for some time. With the Yocto Project 2.6
216:term:`SERIAL_CONSOLES` variable for some time. 216release, ``SERIAL_CONSOLE`` has been officially deprecated.
217With the Yocto Project 2.6 release, :term:`SERIAL_CONSOLE` has been
218officially deprecated.
219 217
220:term:`SERIAL_CONSOLE` will continue to work as before for the 2.6 release. 218``SERIAL_CONSOLE`` will continue to work as before for the 2.6 release.
221However, for the sake of future compatibility, it is recommended that 219However, for the sake of future compatibility, it is recommended that
222you replace all instances of :term:`SERIAL_CONSOLE` with 220you replace all instances of ``SERIAL_CONSOLE`` with :term:`SERIAL_CONSOLES`.
223:term:`SERIAL_CONSOLES`.
224 221
225.. note:: 222.. note::
226 223
227 The only difference in usage is that :term:`SERIAL_CONSOLES` 224 The only difference in usage is that :term:`SERIAL_CONSOLES`
228 expects entries to be separated using semicolons as compared to 225 expects entries to be separated using semicolons as compared to
229 :term:`SERIAL_CONSOLE`, which expects spaces. 226 ``SERIAL_CONSOLE``, which expects spaces.
230 227
231.. _migration-2.6-poky-sets-unknown-configure-option-to-qa-error: 228.. _migration-2.6-poky-sets-unknown-configure-option-to-qa-error:
232 229
diff --git a/documentation/ref-manual/variables.rst b/documentation/ref-manual/variables.rst
index 8ed55ad7b3..5f5fea344e 100644
--- a/documentation/ref-manual/variables.rst
+++ b/documentation/ref-manual/variables.rst
@@ -7305,19 +7305,6 @@ system and gives an overview of their function and contents.
7305 :term:`FULL_OPTIMIZATION` unless :term:`DEBUG_BUILD` = "1", in which 7305 :term:`FULL_OPTIMIZATION` unless :term:`DEBUG_BUILD` = "1", in which
7306 case the value of :term:`DEBUG_OPTIMIZATION` is used. 7306 case the value of :term:`DEBUG_OPTIMIZATION` is used.
7307 7307
7308 :term:`SERIAL_CONSOLE`
7309 Defines a serial console (TTY) to enable using
7310 `getty <https://en.wikipedia.org/wiki/Getty_(Unix)>`__. Provide a
7311 value that specifies the baud rate followed by the TTY device name
7312 separated by a space. You cannot specify more than one TTY device::
7313
7314 SERIAL_CONSOLE = "115200 ttyS0"
7315
7316 .. note::
7317
7318 The :term:`SERIAL_CONSOLE` variable is deprecated. Please use the
7319 :term:`SERIAL_CONSOLES` variable.
7320
7321 :term:`SERIAL_CONSOLES` 7308 :term:`SERIAL_CONSOLES`
7322 Defines a serial console (TTY) to enable using 7309 Defines a serial console (TTY) to enable using
7323 `getty <https://en.wikipedia.org/wiki/Getty_(Unix)>`__. Provide a 7310 `getty <https://en.wikipedia.org/wiki/Getty_(Unix)>`__. Provide a