Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
Rk3576 Downstream U-Boot
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nicolas Frattaroli
Rk3576 Downstream U-Boot
Commits
0587597c
Commit
0587597c
authored
21 years ago
by
Stefan Roese
Browse files
Options
Downloads
Patches
Plain Diff
U-Boot version environment variable "ver" added (CONFIG_VERSION_VARIABLE).
parent
0db5bca8
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
common/cmd_nvedit.c
+6
-2
6 additions, 2 deletions
common/cmd_nvedit.c
common/main.c
+10
-0
10 additions, 0 deletions
common/main.c
with
16 additions
and
2 deletions
common/cmd_nvedit.c
+
6
−
2
View file @
0587597c
...
...
@@ -180,9 +180,13 @@ int _do_setenv (int flag, int argc, char *argv[])
#ifndef CONFIG_ENV_OVERWRITE
/*
* Ethernet Address and serial# can be set only once
* Ethernet Address and serial# can be set only once,
* ver is readonly.
*/
if
(
(
strcmp
(
name
,
"serial#"
)
==
0
)
||
#if defined(CONFIG_VERSION_VARIABLE)
(
strcmp
(
name
,
"ver"
)
==
0
)
||
#endif
/* CONFIG_VERSION_VARIABLE */
((
strcmp
(
name
,
"ethaddr"
)
==
0
)
#if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
&&
(
strcmp
(
env_get_addr
(
oldval
),
MK_STR
(
CONFIG_ETHADDR
))
!=
0
)
...
...
@@ -358,7 +362,7 @@ int _do_setenv (int flag, int argc, char *argv[])
}
#endif
/* CFG_CMD_NET */
#ifdef CONFIG_AMIGAONEG3SE
#ifdef CONFIG_AMIGAONEG3SE
if
(
strcmp
(
argv
[
1
],
"vga_fg_color"
)
==
0
||
strcmp
(
argv
[
1
],
"vga_bg_color"
)
==
0
)
{
extern
void
video_set_color
(
unsigned
char
attr
);
...
...
This diff is collapsed.
Click to expand it.
common/main.c
+
10
−
0
View file @
0587597c
...
...
@@ -279,6 +279,16 @@ void main_loop (void)
}
#endif
/* CONFIG_MODEM_SUPPORT */
#ifdef CONFIG_VERSION_VARIABLE
{
extern
char
version_string
[];
char
*
str
=
getenv
(
"ver"
);
if
(
!
str
)
setenv
(
"ver"
,
version_string
);
/* set version variable */
}
#endif
/* CONFIG_VERSION_VARIABLE */
#ifdef CFG_HUSH_PARSER
u_boot_hush_start
();
#endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment