diff options
| author | Peter Tyser <ptyser@xes-inc.com> | 2009-03-13 18:54:41 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-04-04 01:12:25 +0200 |
| commit | 1cd300de5e19c9e8383ee2eb2b6bd3b8b9378c78 (patch) | |
| tree | b0682679ead66dffb16ac5e10d549c747d3210e6 | |
| parent | 123c48a21ce08b4a33f36e96cc75f92324e761d7 (diff) | |
tools/Makefile: Compile ncb when CONFIG_NETCONSOLE
Also conditionally add ncb.o to OBJ_FILES list
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
| -rw-r--r-- | doc/README.NetConsole | 6 | ||||
| -rw-r--r-- | tools/Makefile | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/README.NetConsole b/doc/README.NetConsole index 94c8816762f..639cc12a565 100644 --- a/doc/README.NetConsole +++ b/doc/README.NetConsole @@ -55,10 +55,8 @@ Again, this script takes exactly one argument, which is interpreted as the target IP address (or host name, assuming DNS is working). The script can be interrupted by pressing ^T (CTRL-T). -The 'ncb' tool can be found in the tools directory; it will not be -built by default so you will ither have to adjust the Makefile or -build it manually. - +The 'ncb' tool can be found in the tools directory; it will be built +when compiling for a board which has CONFIG_NETCONSOLE defined. For Linux, the network-based console needs special configuration. Minimally, the host IP address needs to be specified. This can be diff --git a/tools/Makefile b/tools/Makefile index f648d349a6d..35e694dfd3e 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -81,6 +81,7 @@ BIN_FILES-$(CONFIG_CMD_NET) += gen_eth_addr$(SFX) BIN_FILES-$(CONFIG_LCD_LOGO) += bmp_logo$(SFX) BIN_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo$(SFX) BIN_FILES-$(CONFIG_INCA_IP) += inca-swap-bytes$(SFX) +BIN_FILES-$(CONFIG_NETCONSOLE) += ncb$(SFX) # Source files which are symlinked from elsewhere in U-Boot OBJ_LINKS-y += env_embedded.o @@ -97,6 +98,7 @@ OBJ_FILES-$(CONFIG_CMD_NET) += gen_eth_addr.o OBJ_FILES-$(CONFIG_LCD_LOGO) += bmp_logo.o OBJ_FILES-$(CONFIG_VIDEO_LOGO) += bmp_logo.o OBJ_FILES-$(CONFIG_INCA_IP) += inca-swap-bytes.o +OBJ_FILES-$(CONFIG_NETCONSOLE) += ncb.o # Don't build by default #ifeq ($(ARCH),ppc) |