diff options
| author | Stefano Babic <sbabic@denx.de> | 2014-07-16 08:51:30 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-07-16 08:51:30 +0200 |
| commit | dab5e3469d294a4e1ffed8407d296a78e02cc01f (patch) | |
| tree | c6378034591210b3142ca3add806d52c6ea22b3b /net | |
| parent | 14a1613140519a8d0a88e6054c302a8cb3e067a5 (diff) | |
| parent | 524123a70761110c5cf3ccc5f52f6d4da071b959 (diff) | |
| download | u-boot-imx-dab5e3469d294a4e1ffed8407d296a78e02cc01f.zip u-boot-imx-dab5e3469d294a4e1ffed8407d296a78e02cc01f.tar.gz u-boot-imx-dab5e3469d294a4e1ffed8407d296a78e02cc01f.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot
Signed-off-by: Stefano Babic <sbabic@denx.de>
Conflicts:
boards.cfg
Diffstat (limited to 'net')
| -rw-r--r-- | net/net.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -419,7 +419,7 @@ restart: CDPStart(); break; #endif -#ifdef CONFIG_NETCONSOLE +#if defined (CONFIG_NETCONSOLE) && !(CONFIG_SPL_BUILD) case NETCONS: NcStart(); break; @@ -1182,7 +1182,7 @@ NetReceive(uchar *inpkt, int len) #endif -#ifdef CONFIG_NETCONSOLE +#if defined (CONFIG_NETCONSOLE) && !(CONFIG_SPL_BUILD) nc_input_packet((uchar *)ip + IP_UDP_HDR_SIZE, src_ip, ntohs(ip->udp_dst), |