michaelh/zephyr
1
0
Fork 0
Code Releases Activity

doc: fix path to samples after restructering

Browse source 
Change-Id: I0366acd913188ddcdf626b95ff05b8c9c305b777
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2016-02-09 19:47:18 -05:00
commit 47db990d44
8 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/application/apps_code_dev.rst
View file

@ -128,7 +128,7 @@ Example src Makefile
This example is taken from the Philosopher's Sample. To
examine this file in context, navigate to:
:file:`rootDir/samples/microkernel/apps/philosophers/src`.
:file:`rootDir/samples/philosophers/microkernel/src`.
.. code-block:: make

4
doc/application/apps_object_conf.rst
View file

@ -79,14 +79,14 @@ Steps
defined in an :file:`.mdef` file.
The following example shows the content of the
:file:`samples/microkernel/apps/philosophers/proj.mdef`
:file:`samples/philosophers/microkernel/proj.mdef`
for the Philosophers' sample application. The sample
uses seven tasks and six mutexes.
Example MDEF
------------
.. literalinclude:: ../../samples/microkernel/apps/philosophers/prj.mdef
.. literalinclude:: ../../samples/philosophers/microkernel/prj.mdef
:linenos:
Related Topics

14
doc/board/arduino_101.rst
View file

@ -57,7 +57,7 @@ Flashing Arduino 101 for Zephyr
*******************************
For the use of this tutorial, the sample application hello_world will be
used found in :file:`$ZEPHYR_BASE/samples/nanokernel/apps/hello_world`.
used found in :file:`$ZEPHYR_BASE/samples/hello_world/nanokernel`.
Use the following procedures for booting an image on a Arduino 101 board.
@ -247,7 +247,7 @@ checkout copy of Zephyr, and run:
.. code-block:: console
$ source ./zephyr-env.sh
$ cd $ZEPHYR_BASE/samples/nanokernel/apps/hello_world
$ cd $ZEPHYR_BASE/samples/hello_world/nanokernel
$ make pristine && BOARD=arduino_101_sss ARCH=arc
$ make BOARD=arduino_101_sss flash
@ -269,7 +269,7 @@ Flashing an x86 Kernel
.. code-block:: console
$ source ./zephyr-env.sh
$ cd $ZEPHYR_BASE/samples/nanokernel/apps/hello_world
$ cd $ZEPHYR_BASE/samples/hello_world/nanokernel
$ make pristine && BOARD=arduino_101 ARCH=x86
$ make BOARD=arduino_101 flash
@ -298,7 +298,7 @@ for ARCH=x86 if you wish to debug on the x86 core.
at connecting and controlling the hardware.
This can be done by editing the
:file:`samples/nanokernel/apps/hello_world/prj.conf` to include:
:file:`samples/hello_world/nanokernel/prj.conf` to include:
.. code-block:: console
@ -317,7 +317,7 @@ for ARCH=x86 if you wish to debug on the x86 core.
.. code-block:: console
$ cd $ZEPHYR_BASE/samples/nanokernel/apps/hello_world
$ cd $ZEPHYR_BASE/samples/hello_world/nanokernel
$ make BOARD=arduino_101 debug
These commands will start an openocd session that creates a local telnet
@ -333,7 +333,7 @@ for ARCH=x86 if you wish to debug on the x86 core.
.. code-block:: console
$ cd $ZEPHYR_BASE/samples/nanokernel/apps/hello_world
$ cd $ZEPHYR_BASE/samples/hello_world/nanokernel
$ gdb outdir/zephyr.elf
gdb$ target remote :3333
@ -357,7 +357,7 @@ for ARCH=x86 if you wish to debug on the x86 core.
.. code-block:: console
$ cd $ZEPHYR_BASE/samples/nanokernel/apps/hello_world
$ cd $ZEPHYR_BASE/samples/hello_world/nanokernel
$ arc_gdb outdir/zephyr.elf
gdb$ target remote :3334

4
doc/board/arduino_due.rst
View file

@ -124,14 +124,14 @@ that the Arduino specific version is required (branch arduino on GitHub).
The sample application hello_world is being used in this tutorial, which can
be found in :file:`$ZEPHYR_BASE/samples/nanokernel/apps/hello_world`.
be found in :file:`$ZEPHYR_BASE/samples/hello_world/nanokernel`.
# To build the Zephyr kernel, enter:
.. code-block:: console
$ cd $ZEPHYR_BASE
$ make -C samples/nanokernel/apps/hello_world ARCH=arm BOARD=arduino_due
$ make -C samples/hello_world/nanokernel ARCH=arm BOARD=arduino_due
# Connect the Arduino Due to your host computer using the programming port.

2
doc/collaboration/code/doxygen/defines.rst
View file

@ -63,7 +63,7 @@ ensures that the comment is appropriately linked to the code.
Incorrect:
.. literalinclude::
../../../../samples/microkernel/apps/philosophers/src/phil.h
../../../../samples/philosophers/microkernel/src/phil.h
:language: c
:lines: 24-28

4
doc/collaboration/code/doxygen/functions.rst
View file

@ -79,7 +79,7 @@ Example 1
Take the very simple function :c:func:`taskA()`:
.. literalinclude:: ../../../../samples/microkernel/apps/hello_world/src/hello.c
.. literalinclude:: ../../../../samples/synchronization/microkernel/src/hello.c
:language: c
:lines: 77-85
:emphasize-lines: 3, 6
@ -105,7 +105,7 @@ Example 2
=========
Take the more complex function hello_loop():
.. literalinclude:: ../../../../samples/microkernel/apps/hello_world/src/hello.c
.. literalinclude:: ../../../../samples/synchronization/microkernel/src/hello.c
:language: c
:lines: 56-76
:emphasize-lines: 1, 3-5, 7, 8, 13, 16

2
doc/getting_started/building_zephyr.rst
View file

@ -29,7 +29,7 @@ To build an example application follow these steps:
.. code-block:: console
$ cd $ZEPHYR_BASE/samples/microkernel/apps/hello_world
$ cd $ZEPHYR_BASE/samples/hello_world/microkernel
$ make

2
doc/kernel/nanokernel/nanokernel_example.rst
View file

@ -4,7 +4,7 @@ Semaphore, Timer, and Fiber Example
###################################
The following example is pulled from the file:
:file:`samples/microkernel/apps/hello_world/src/hello.c`.
:file:`samples/synchronization/microkernel/src/hello.c`.
Example Code
************