summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-09-27 12:06:07 -0700
committerTom Rini <trini@ti.com>2012-09-27 12:06:07 -0700
commitcec2655c3b3b86f14a6a5c2cbb01833f7e3974be (patch)
tree8428f50b579b3656fd24056ae3c6304f58aee620 /doc
parentc57b953da923c6402afc1c890c21fdc7d5a2cc4a (diff)
parentee0f60df0b71092cd632fc6651f4157a2d252598 (diff)
downloadu-boot-imx-cec2655c3b3b86f14a6a5c2cbb01833f7e3974be.zip
u-boot-imx-cec2655c3b3b86f14a6a5c2cbb01833f7e3974be.tar.gz
u-boot-imx-cec2655c3b3b86f14a6a5c2cbb01833f7e3974be.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'doc')
-rw-r--r--doc/README.NetConsole5
-rw-r--r--doc/README.pxe14
2 files changed, 17 insertions, 2 deletions
diff --git a/doc/README.NetConsole b/doc/README.NetConsole
index c8bcb90..af7fc60 100644
--- a/doc/README.NetConsole
+++ b/doc/README.NetConsole
@@ -6,11 +6,16 @@ serial and network input/output devices by adjusting the 'stdin' and
set either of these variables to "nc". Input and output can be
switched independently.
+CONFIG_NETCONSOLE_BUFFER_SIZE - Override the default buffer size
+
We use an environment variable 'ncip' to set the IP address and the
port of the destination. The format is <ip_addr>:<port>. If <port> is
omitted, the value of 6666 is used. If the env var doesn't exist, the
broadcast address and port 6666 are used. If it is set to an IP
address of 0 (or 0.0.0.0) then no messages are sent to the network.
+The source / listening port can be configured separately by setting
+the 'ncinport' environment variable and the destination port can be
+configured by setting the 'ncoutport' environment variable.
For example, if your server IP is 192.168.1.1, you could use:
diff --git a/doc/README.pxe b/doc/README.pxe
index 2bbf53d..f00f280 100644
--- a/doc/README.pxe
+++ b/doc/README.pxe
@@ -93,8 +93,13 @@ pxe boot
be passed to the bootm command to boot the kernel. These environment
variables are required to be set.
- fdt_addr - the location of a fdt blob. If this is set, it will be passed
- to bootm when booting a kernel.
+ fdt_addr_r - location in RAM at which 'pxe boot' will store the fdt blob it
+ retrieves from tftp. The retrieval is possible if 'fdt' label is defined in
+ pxe file and 'fdt_addr_r' is set. If retrieval is possible, 'fdt_addr_r'
+ will be passed to bootm command to boot the kernel.
+
+ fdt_addr - the location of a fdt blob. 'fdt_addr' will be passed to bootm
+ command if it is set and 'fdt_addr_r' is not passed to bootm command.
pxe file format
===============
@@ -156,6 +161,11 @@ initrd <path> - if this label is chosen, use tftp to retrieve the initrd
the initrd_addr_r environment variable, and that address
will be passed to bootm.
+fdt <path> - if this label is chosen, use tftp to retrieve the fdt blob
+ at <path>. it will be stored at the address indicated in
+ the fdt_addr_r environment variable, and that address will
+ be passed to bootm.
+
localboot <flag> - Run the command defined by "localcmd" in the environment.
<flag> is ignored and is only here to match the syntax of
PXELINUX config files.