V2020.02 net cmds #1
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gcc 10 will default to -fno-common, which causes this error at link
time:
(.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here
This is because both dtc-lexer as well as dtc-parser define the same
global symbol yyloc. Before with -fcommon those were merged into one
defintion. The proper solution would be to to mark this as "extern",
however that leads to:
dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls]
26 | extern YYLTYPE yylloc;
| ^~~~~~
In file included from dtc-lexer.l:24:
dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here
127 | extern YYLTYPE yylloc;
| ^~~~~~
cc1: all warnings being treated as errors
which means the declaration is completely redundant and can just be
dropped.
Signed-off-by: Dirk Mueller <[email protected]>
Signed-off-by: David Gibson <[email protected]>
[robh: cherry-pick from upstream]
Cc: [email protected]
Signed-off-by: Rob Herring <[email protected]>
SJLC
reviewed
Feb 7, 2023
net/Makefile
Outdated
| @@ -28,6 +28,7 @@ obj-$(CONFIG_CMD_SNTP) += sntp.o | |||
| obj-$(CONFIG_CMD_TFTPBOOT) += tftp.o | |||
| obj-$(CONFIG_UDP_FUNCTION_FASTBOOT) += fastboot.o | |||
| obj-$(CONFIG_CMD_WOL) += wol.o | |||
| obj-$(CONFIG_CMD_WOL) += swu.o | |||
SJLC
reviewed
Feb 7, 2023
net/net.c
Outdated
| @@ -526,6 +529,11 @@ int net_loop(enum proto_t protocol) | |||
| link_local_start(); | |||
| break; | |||
| #endif | |||
| #if defined(CONFIG_CMD_SWU) | |||
| case WOL: | |||
There was a problem hiding this comment.
Thx, you caught more typos than I did, and now it's at least what it was supposed to be...
SJLC
reviewed
Feb 7, 2023
| if (argc < 2) | ||
| return CMD_RET_USAGE; | ||
| swu_set_timeout(simple_strtol(argv[1], NULL, 10) * 1000); | ||
| if (net_loop(SWU) < 0) |
There was a problem hiding this comment.
I would like to see timeout stay in msec, instead of user specifying seconds and converting here from sec to msec
SJLC
reviewed
Feb 7, 2023
cmd/swu.c
Outdated
| U_BOOT_CMD( | ||
| swu, 2, 1, do_swu, | ||
| "wait for an incoming swupdate trigger packet", | ||
| "Timeout" |
There was a problem hiding this comment.
If timeout is changed to msec, that should be mentioned here (sec seems to be default time unit for u-boot, think they don't explicitly mention seconds)
There was a problem hiding this comment.
I think you're right, the default time units for console commands must be seconds, but the #define default values are millisec. Why do we want to be different than other u-boot cmds for console values?
There was a problem hiding this comment.
I was planning to waste less than a second pausing to listen, if possible
SJLC
requested changes
Feb 7, 2023
sarnold
force-pushed
the
v2020.02-net-cmds
branch
8 times, most recently
from
a913211
to
4bd2373
Compare
SJLC
approved these changes
Feb 14, 2023
sarnold
force-pushed
the
v2020.02-net-cmds
branch
from
0343890
to
6d922a0
Compare
* define a custom ether type and corresponding swu command to trigger a rescue boot for in-field software upgrades; the expected software upgrade framework is currently swupdate (but this is not a hard requirement) * add do_rescue to default u-boot env and set to 0. This fixes an env quirk (bug) where test <undefined> -eq N returns true * check for custom ethertype (0xb990) in main net loop and set do_rescue equal 1 in u-boot environment if detected. The full packet definition and a test tool can be found in radar-test-gui repo; see python code in protocols/radar_packet_proto.py for packet classes and the corresponding wiki docs for packet formats) https://github.com/goletastar/pcr-data-app/wiki Signed-off-by: Stephen L Arnold <[email protected]>
sarnold
force-pushed
the
v2020.02-net-cmds
branch
from
6d922a0
to
700a1ee
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add scaffolding to detect a custom ethernet protocol (pkt) type for triggering swupdate/rescue boot instead of normal rootfs.