summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorIlya Yanok <ilya.yanok@cogentembedded.com>2012-09-18 00:22:50 +0000
committerTom Rini <trini@ti.com>2012-10-01 10:02:14 -0700
commit7ac2fe2da21d292aeaf3af74e5c80de9ce9dab56 (patch)
tree6f85e4734fa8a41c6854c226088df4030b602050 /net
parent6feb4e9db10990ed56655602de8dd08564b7c245 (diff)
downloadu-boot-imx-7ac2fe2da21d292aeaf3af74e5c80de9ce9dab56.zip
u-boot-imx-7ac2fe2da21d292aeaf3af74e5c80de9ce9dab56.tar.gz
u-boot-imx-7ac2fe2da21d292aeaf3af74e5c80de9ce9dab56.tar.bz2
OMAP: networking support for SPL
This patch adds support for networking in SPL. Some devices are capable of loading SPL via network so it makes sense to load the main U-Boot binary via network too. This patch tries to use existing network code as much as possible. Unfortunately, it depends on environment which in turn depends on other code so SPL size is increased significantly. No effort was done to decouple network code and environment so far. Signed-off-by: Ilya Yanok <ilya.yanok@cogentembedded.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com> Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'net')
-rw-r--r--net/bootp.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/net/bootp.c b/net/bootp.c
index ccf9ee6..cd5c5dd 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -535,9 +535,14 @@ static int BootpExtended(u8 *e)
*e++ = (576 - 312 + OPT_FIELD_SIZE) & 0xff;
#endif
-#ifdef CONFIG_BOOTP_VCI_STRING
+#if defined(CONFIG_BOOTP_VCI_STRING) || \
+ (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_NET_VCI_STRING))
+#ifdef CONFIG_SPL_BUILD
+ put_vci(e, CONFIG_SPL_NET_VCI_STRING);
+#else
put_vci(e, CONFIG_BOOTP_VCI_STRING);
#endif
+#endif
#if defined(CONFIG_BOOTP_SUBNETMASK)
*e++ = 1; /* Subnet mask request */