[U-Boot-Users] PATCH: Declare load_serial_ymodem() for both CFG_CMD_LOAD{S,B}
Declare load_serial_ymodem() for both CFG_CMD_LOAD{S,B} as it appears to be needed by both the loadb and loads commands now.
Signed-off-by: Jon Loeliger jdl@freescale.com
---
load_serial_ymodem() seems oddly mis-named now. :-)
diff --git a/common/cmd_load.c b/common/cmd_load.c index 2432ee2..df5a022 100644 --- a/common/cmd_load.c +++ b/common/cmd_load.c @@ -33,9 +33,12 @@ #include <xyzModem.h>
DECLARE_GLOBAL_DATA_PTR;
+#if (CONFIG_COMMANDS & CFG_CMD_LOADB) | (CONFIG_COMMANDS & CFG_CMD_LOADS) +static ulong load_serial_ymodem (ulong offset); +#endif + #if (CONFIG_COMMANDS & CFG_CMD_LOADS) static ulong load_serial (ulong offset); -static ulong load_serial_ymodem (ulong offset); static int read_record (char *buf, ulong len); # if (CONFIG_COMMANDS & CFG_CMD_SAVES) static int save_serial (ulong offset, ulong size);
In message 1146511413.24239.16.camel@cashmere.sps.mot.com you wrote:
Declare load_serial_ymodem() for both CFG_CMD_LOAD{S,B} as it appears to be needed by both the loadb and loads commands now.
The only reference (call) to the load_serial_ymodem() function is in do_load_serial_bin() which in turn is only compiled if 'CONFIG_COMMANDS & CFG_CMD_LOADB' is true.
What makes you think it might be needed with CFG_CMD_LOADS ?
Signed-off-by: Jon Loeliger jdl@freescale.com
BTW: Changelog entry missing!
load_serial_ymodem() seems oddly mis-named now. :-)
Please elucidate...
Best regards,
Wolfgang Denk
On Mon, 2006-05-01 at 14:40, Wolfgang Denk wrote:
In message 1146511413.24239.16.camel@cashmere.sps.mot.com you wrote:
Declare load_serial_ymodem() for both CFG_CMD_LOAD{S,B} as it appears to be needed by both the loadb and loads commands now.
The only reference (call) to the load_serial_ymodem() function is in do_load_serial_bin() which in turn is only compiled if 'CONFIG_COMMANDS & CFG_CMD_LOADB' is true.
What makes you think it might be needed with CFG_CMD_LOADS ?
Hmmmm... Interesting point. It used to look like this:
#if (CONFIG_COMMANDS & CFG_CMD_LOADS) static ulong load_serial (ulong offset); static ulong load_serial_ymodem (ulong offset); static int read_record (char *buf, ulong len);
Drop my previous patch. New patch follows.
jdl
In message 1146512944.24239.38.camel@cashmere.sps.mot.com you wrote:
Hmmmm... Interesting point. It used to look like this:
#if (CONFIG_COMMANDS & CFG_CMD_LOADS) static ulong load_serial (ulong offset); static ulong load_serial_ymodem (ulong offset); static int read_record (char *buf, ulong len);
I see. Indeed. that will cause problems when CFG_CMD_LOADS is set but CFG_CMD_LOADB isn't (but anybody doing that should fix his configu- ration anyway :-)
Drop my previous patch. New patch follows.
Dropped.
Best regards,
Wolfgang Denk
participants (2)
-
Jon Loeliger -
Wolfgang Denk