Skip to content

Proper fix for ethaddr, add missing option #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anphsw wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Proper fix for ethaddr, add missing option #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05ca042
do not store default mac address with quotes
anphsw Oct 11, 2024
8272e31
Add missing CONFIG_OVERWRITE_ETHADDR_ONCE option
anphsw Oct 11, 2024
8c37dce
Add missing CONFIG_ENV_OVERWRITE option
anphsw Oct 11, 2024
f06f288
Add dependency for CONFIG_OVERWRITE_ETHADDR_ONCE option
anphsw Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion uboot-5.x.x.x/common/cmd_nvedit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ int _do_setenv (int flag, int argc, char *argv[])
if ( (strcmp (name, "serial#") == 0) ||
((strcmp (name, "ethaddr") == 0)
#if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
&& (strcmp (env_get_addr(oldval),MK_STR(CONFIG_ETHADDR)) != 0)
&& (strcmp (env_get_addr(oldval),CONFIG_ETHADDR) != 0)
#endif /* CONFIG_OVERWRITE_ETHADDR_ONCE && CONFIG_ETHADDR */
) ) {
printf ("Can't overwrite \"%s\"\n", name);
Expand Down
8 changes: 4 additions & 4 deletions uboot-5.x.x.x/common/env_common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,16 +86,16 @@ uchar default_environment[] = {
"loads_echo=" MK_STR(CONFIG_LOADS_ECHO) "\0"
#endif
#ifdef CONFIG_ETHADDR
"ethaddr=" MK_STR(CONFIG_ETHADDR) "\0"
"ethaddr=" CONFIG_ETHADDR "\0"
#endif
#ifdef CONFIG_ETH1ADDR
"eth1addr=" MK_STR(CONFIG_ETH1ADDR) "\0"
"eth1addr=" CONFIG_ETH1ADDR "\0"
#endif
#ifdef CONFIG_ETH2ADDR
"eth2addr=" MK_STR(CONFIG_ETH2ADDR) "\0"
"eth2addr=" CONFIG_ETH2ADDR "\0"
#endif
#ifdef CONFIG_ETH3ADDR
"eth3addr=" MK_STR(CONFIG_ETH3ADDR) "\0"
"eth3addr=" CONFIG_ETH3ADDR "\0"
#endif
#ifdef CONFIG_IPADDR
"ipaddr=" MK_STR(CONFIG_IPADDR) "\0"
Expand Down
8 changes: 4 additions & 4 deletions uboot-5.x.x.x/common/environment.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,16 @@ env_t environment __PPCENV__ = {
"loads_echo=" MK_STR(CONFIG_LOADS_ECHO) "\0"
#endif
#ifdef CONFIG_ETHADDR
"ethaddr=" MK_STR(CONFIG_ETHADDR) "\0"
"ethaddr=" CONFIG_ETHADDR "\0"
#endif
#ifdef CONFIG_ETH1ADDR
"eth1addr=" MK_STR(CONFIG_ETH1ADDR) "\0"
"eth1addr=" CONFIG_ETH1ADDR "\0"
#endif
#ifdef CONFIG_ETH2ADDR
"eth2addr=" MK_STR(CONFIG_ETH2ADDR) "\0"
"eth2addr=" CONFIG_ETH2ADDR "\0"
#endif
#ifdef CONFIG_ETH3ADDR
"eth3addr=" MK_STR(CONFIG_ETH3ADDR) "\0"
"eth3addr=" CONFIG_ETH3ADDR "\0"
#endif
#ifdef CONFIG_ETHPRIME
"ethprime=" CONFIG_ETHPRIME "\0"
Expand Down
4 changes: 4 additions & 0 deletions uboot-5.x.x.x/config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1810,6 +1810,10 @@ else
define_hex TEXT_BASE 0xBC000000
fi

fi
bool 'Allow env overwriting' CONFIG_ENV_OVERWRITE y
if [ "$CONFIG_ENV_OVERWRITE" = "y" ]; then
bool 'Allow setting ethaddr env only once' CONFIG_OVERWRITE_ETHADDR_ONCE n
fi
##################################################################################################
comment ""
Expand Down