-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 09/17/12 13:26, Ilya Yanok wrote: > 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.ya...@cogentembedded.com> [snip] > diff --git a/include/config_uncmd_spl.h > b/include/config_uncmd_spl.h new file mode 100644 index > 0000000..8ad6045 --- /dev/null +++ b/include/config_uncmd_spl.h @@ > -0,0 +1,24 @@ +/* + * We don't use any commands in SPL, but generic > networking code + * has some features enabled/disabled based on > CONFIG_CMD_* + * options. As we want a minimal set of features > included + * into network SPL image, we undefine some config > options here. + */ + +#ifndef __CONFIG_UNCMD_SPL_H__ +#define > __CONFIG_UNCMD_SPL_H__ + +#ifdef CONFIG_SPL_BUILD +/* SPL needs > only BOOTP + TFTP so undefine other stuff to save space */ +#undef > CONFIG_CMD_CDP +#undef CONFIG_CMD_DHCP +#undef CONFIG_CMD_DNS > +#undef CONFIG_CMD_LINK_LOCAL +#undef CONFIG_CMD_NFS +#undef > CONFIG_CMD_PING +#undef CONFIG_CMD_RARP +#undef CONFIG_CMD_SNTP > +#undef CONFIG_CMD_TFTPPUT +#undef CONFIG_CMD_TFTPSRV +#endif /* > CONFIG_SPL_BUILD */ +#endif /* __CONFIG_UNCMD_SPL_H__ */
Please add a GPLv2+ header to the file, thanks. > diff --git a/lib/vsprintf.c b/lib/vsprintf.c index e38a4b7..6bb819c > 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -784,7 +784,7 > @@ void panic(const char *fmt, ...) vprintf(fmt, args); > putc('\n'); va_end(args); -#if defined (CONFIG_PANIC_HANG) +#if > defined (CONFIG_PANIC_HANG) || defined(CONFIG_SPL_BUILD) hang(); > #else udelay (100000); /* allow messages to go out */ Oh no, this change... Do we still really need this? > diff --git a/net/tftp.c b/net/tftp.c index 59a8ebb..baba8f3 100644 > --- a/net/tftp.c +++ b/net/tftp.c @@ -7,6 +7,10 @@ */ > > #include <common.h> +#ifdef CONFIG_SPL_BUILD +#undef > CONFIG_CMD_TFTPPUT +#undef CONFIG_CMD_TFTPSRV +#endif #include > <command.h> #include <net.h> #include "tftp.h" Missed this. Also I saw a few manual inclusions of <config_uncmd_spl.h>, please fix those since mkconfig adds it always. Thanks. - -- Tom -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQIcBAEBAgAGBQJQV721AAoJENk4IS6UOR1WHnUP+wdiliv2T4GUH/Z39TYoW0uo WqAREC3pHZ9YMYKSZgGGOHwlAOuk2az5GPAqiCaXLLIgx43h5tkQnjbBHlB0T9rv R+uqy4LF0Lxyz86ITSf4nmpkn66gnd5L6ET2b46Siof+PFIzNLEnM0Z0sWpnsWAU ZlKnwS/Y/VAKDiwW5rxWiXTbs1vMHn8BWU+wTVrMLE80Sm3yE/C5mpzOBl42+O+V kmo/nUNIiTK4C8VmlvL7+w+mqMPDtB4nSFFmmjmH7z8991RBhLJ0Nmlg26wmtXDL Vyy5Jg6SQRSuyDJFplvoPu7FVhgI2umRxOIl6SEONKzSQQSBQmMqtIZV4pW4hFVZ 3RO5wrr0RKpJJy4Izb2MoGqvUv4fDIK9K2xiQihBUkc4X7UCpPMMqBpLwKVSoIdW 1y7o+2LzUAlBU9q/nP+ZHBzZFL9jYZHEDaYkuY+MT7i+tLcW2T6dV0Q4KsXTwHhx D9zbU6tEXbgRZr/n8gUMeSWu7r6F2tr3a4UiTMsAP8lkVyXUPmYnfUhpxQrUuIx/ yuGmpigYPNicvP1hiU/quX2Fxxx2kuy3gDLVIc7tZv0VSmW6NI+WZC8inGBhk4Bb GsZaYkoZnv799Z7GJy8wqCszSqb4BmI9wB3Hzz49jiwurvz/n7tDKEOtjjcIWCZc MXsKY53Ulu6dW0vk5qQK =2lLS -----END PGP SIGNATURE----- _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot