u-boot.git/common/cmd_pxe.c, branch v2013.07

pxe: add ipappend support

2013-06-25T00:10:14+00:00

Add ipappend support to pass network device information to the kernel.

Signed-off-by: Rob Herring

net: Fix build regression in cmd_pxe.c

2013-06-25T00:10:03+00:00

Not all boards define an SOC.  As a result, we can't depend on that.

This was introduced in 39f985536d3f0df5dba32c15b64ba2b5d32dd296

Signed-off-by: Joe Hershberger

pxe: add support for per arch and SoC default paths

2013-06-25T00:07:34+00:00

A pxelinux server setup for "default" menu is typically an x86 binary.
This does not work well with a mixed architecture setup. Extend the default
search to look for default-- and then default- before
falling back to just "default".

Signed-off-by: Rob Herring

pxe: add support for ontimeout token

2013-06-25T00:07:34+00:00

ontimeout is similar to default, but is the selection on menu timeout.
This is how cobbler sets a default. The label default is supposed to be
the default selection when  is pressed. If both default and
ontimeout are set, last one parsed wins.

Signed-off-by: Rob Herring

pxe: simplify menu display and selection

2013-06-25T00:07:34+00:00

Menus with lots of entries and long append lines are hard to read.
Just show a numbered list using the label or name and make the choice
by entering the number.

Signed-off-by: Rob Herring

pxe: always display a menu when present

2013-06-25T00:07:34+00:00

The prompt flag is for displaying a "boot:" prompt in pxelinux. This
doesn't make sense for u-boot as we don't support the pxelinux command
interface. So we should just ignore prompt statements and always show the
menu if a menu is present.

Signed-off-by: Rob Herring

pxe: try bootz if bootm fails to find a valid image

2013-06-25T00:07:34+00:00

Standard pxelinux servers will typically use a zImage rather than u-boot
image format, so fallback to bootz if bootm fails.

Signed-off-by: Rob Herring

pxe: fix handling of different localboot values

2013-06-25T00:07:33+00:00

Add support for value of -1 For localboot. A value of -1 means return to
u-boot prompt.

The localboot value is often 0, so we need to distinguish the value from
localboot being selected. A value of greater than or equal to 0 means
attempt local boot command.

If localboot is selected, we don't want to try other entries.

Signed-off-by: Rob Herring

pxe: make string parameters const

2013-06-25T00:07:33+00:00

Convert a bunch of string parameters to be const.

Signed-off-by: Rob Herring

pxe: Use ethact setting for pxe

2013-06-25T00:07:32+00:00

Get the MAC address using eth_getenv_enetaddr_by_index so that the MAC
address of ethact is used. This enables using the a NIC other than the
first one for PXE boot.

Signed-off-by: Rob Herring