Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
reform-boundary-uboot
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Jack Humbert
reform-boundary-uboot
Commits
dedec4cf
Commit
dedec4cf
authored
16 years ago
by
Wolfgang Denk
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
git://git.denx.de/u-boot-at91
parents
61c5b8c6
f77d92a3
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
drivers/mtd/dataflash.c
+14
-1
14 additions, 1 deletion
drivers/mtd/dataflash.c
include/dataflash.h
+1
-1
1 addition, 1 deletion
include/dataflash.h
with
15 additions
and
2 deletions
drivers/mtd/dataflash.c
+
14
−
1
View file @
dedec4cf
...
@@ -56,7 +56,7 @@ int AT91F_DataflashInit (void)
...
@@ -56,7 +56,7 @@ int AT91F_DataflashInit (void)
switch
(
dfcode
)
{
switch
(
dfcode
)
{
case
AT45DB021
:
case
AT45DB021
:
dataflash_info
[
i
].
Device
.
pages_number
=
1024
;
dataflash_info
[
i
].
Device
.
pages_number
=
1024
;
dataflash_info
[
i
].
Device
.
pages_size
=
26
3
;
dataflash_info
[
i
].
Device
.
pages_size
=
26
4
;
dataflash_info
[
i
].
Device
.
page_offset
=
9
;
dataflash_info
[
i
].
Device
.
page_offset
=
9
;
dataflash_info
[
i
].
Device
.
byte_mask
=
0x300
;
dataflash_info
[
i
].
Device
.
byte_mask
=
0x300
;
dataflash_info
[
i
].
Device
.
cs
=
cs
[
i
].
cs
;
dataflash_info
[
i
].
Device
.
cs
=
cs
[
i
].
cs
;
...
@@ -65,6 +65,19 @@ int AT91F_DataflashInit (void)
...
@@ -65,6 +65,19 @@ int AT91F_DataflashInit (void)
dataflash_info
[
i
].
id
=
dfcode
;
dataflash_info
[
i
].
id
=
dfcode
;
found
[
i
]
+=
dfcode
;;
found
[
i
]
+=
dfcode
;;
break
;
break
;
case
AT45DB081
:
dataflash_info
[
i
].
Device
.
pages_number
=
4096
;
dataflash_info
[
i
].
Device
.
pages_size
=
264
;
dataflash_info
[
i
].
Device
.
page_offset
=
9
;
dataflash_info
[
i
].
Device
.
byte_mask
=
0x300
;
dataflash_info
[
i
].
Device
.
cs
=
cs
[
i
].
cs
;
dataflash_info
[
i
].
Desc
.
DataFlash_state
=
IDLE
;
dataflash_info
[
i
].
logical_address
=
cs
[
i
].
addr
;
dataflash_info
[
i
].
id
=
dfcode
;
found
[
i
]
+=
dfcode
;;
break
;
case
AT45DB161
:
case
AT45DB161
:
dataflash_info
[
i
].
Device
.
pages_number
=
4096
;
dataflash_info
[
i
].
Device
.
pages_number
=
4096
;
dataflash_info
[
i
].
Device
.
pages_size
=
528
;
dataflash_info
[
i
].
Device
.
pages_size
=
528
;
...
...
This diff is collapsed.
Click to expand it.
include/dataflash.h
+
1
−
1
View file @
dedec4cf
...
@@ -135,9 +135,9 @@ struct dataflash_addr {
...
@@ -135,9 +135,9 @@ struct dataflash_addr {
int
cs
;
int
cs
;
};
};
/*-------------------------------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------------------------------*/
#define AT45DB161 0x2c
#define AT45DB161 0x2c
#define AT45DB021 0x14
#define AT45DB021 0x14
#define AT45DB081 0x24
#define AT45DB321 0x34
#define AT45DB321 0x34
#define AT45DB642 0x3c
#define AT45DB642 0x3c
#define AT45DB128 0x10
#define AT45DB128 0x10
...
...
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