diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-02-23 16:07:24 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-02-23 16:07:24 +0100 |
| commit | 4e915278b31a1871378f328fd909a27600973e39 (patch) | |
| tree | 8e22d8c9be68802a92f693176071be834b8e3e34 /Documentation | |
| parent | 9a23c5d387a3a79995d2b946055e81054d16791f (diff) | |
| parent | f2031d006982539f1dd01c24a7fa42dcac9f8f8b (diff) | |
| download | barebox-4e915278b31a1871378f328fd909a27600973e39.tar.gz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devel/porting.rst | 2 | ||||
| -rw-r--r-- | Documentation/user/booting-linux.rst | 2 | ||||
| -rw-r--r-- | Documentation/user/networking.rst | 10 |
3 files changed, 9 insertions, 5 deletions
diff --git a/Documentation/devel/porting.rst b/Documentation/devel/porting.rst index 8af0456ab2..619c5e49e0 100644 --- a/Documentation/devel/porting.rst +++ b/Documentation/devel/porting.rst @@ -258,7 +258,7 @@ tree binding, you can write a driver that matches against your board's { /* sentinel */ }, }; - static struct driver_d my_board_driver = { + static struct driver my_board_driver = { .name = "board-mine", .probe = my_board_probe, .of_compatible = my_board_of_match, diff --git a/Documentation/user/booting-linux.rst b/Documentation/user/booting-linux.rst index 60babb513c..1a95f87e77 100644 --- a/Documentation/user/booting-linux.rst +++ b/Documentation/user/booting-linux.rst @@ -232,6 +232,8 @@ device where the entry is found on. This makes it possible to use the same rootf image on different devices without having to specify a different root= option each time. +.. _booting_linux_net: + Network boot ------------ diff --git a/Documentation/user/networking.rst b/Documentation/user/networking.rst index 9231ebde56..2306cb6a60 100644 --- a/Documentation/user/networking.rst +++ b/Documentation/user/networking.rst @@ -45,15 +45,17 @@ device: | | | any directly visible subnet. May be set | | | | automatically by DHCP. | +------------------------------+--------------+------------------------------------------------+ -| global.net.server | hostname or | The default server. If unspecified, may be set | -| | ipv4 address | by DHCP | +| global.net.server | hostname or | The default server used by the defaultenv boot | +| | ipv4 address | scripts for NFS and TFTP; see | +| | | :ref:`booting_linux_net`. | +| | | If unspecified, may be set by DHCP. | +------------------------------+--------------+------------------------------------------------+ | global.net.nameserver | ipv4 address | The DNS server used for resolving host names. | -| | | May be set by DHCP | +| | | May be set by DHCP. | +------------------------------+--------------+------------------------------------------------+ | global.net.ifup_force_detect | boolean | Set to true if your network device is not | | | | detected automatically during start (i.e. for | -| | | USB network adapters) | +| | | USB network adapters). | +------------------------------+--------------+------------------------------------------------+ The first step for networking is configuring the network device. The network |