Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
u-boot-2015.04
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
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
vesta
u-boot-2015.04
Commits
3ba4c2d6
Commit
3ba4c2d6
authored
17 years ago
by
Stefan Roese
Browse files
Options
Downloads
Patches
Plain Diff
Coding style cleanup
Signed-off-by:
Stefan Roese
<
sr@denx.de
>
parent
a41de1f0
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
board/freescale/m5329evb/m5329evb.c
+0
-1
0 additions, 1 deletion
board/freescale/m5329evb/m5329evb.c
board/freescale/m5329evb/nand.c
+51
-52
51 additions, 52 deletions
board/freescale/m5329evb/nand.c
cpu/mcf532x/cpu_init.c
+5
-6
5 additions, 6 deletions
cpu/mcf532x/cpu_init.c
with
56 additions
and
59 deletions
board/freescale/m5329evb/m5329evb.c
+
0
−
1
View file @
3ba4c2d6
...
...
@@ -86,4 +86,3 @@ int testdram(void)
return
(
0
);
}
This diff is collapsed.
Click to expand it.
board/freescale/m5329evb/nand.c
+
51
−
52
View file @
3ba4c2d6
...
...
@@ -35,81 +35,80 @@ DECLARE_GLOBAL_DATA_PTR;
#include
<nand.h>
#include
<linux/mtd/mtd.h>
#define SET_CLE
0x10
#define CLR_CLE
~SET_CLE
#define SET_ALE
0x08
#define CLR_ALE
~SET_ALE
#define SET_CLE
0x10
#define CLR_CLE
~SET_CLE
#define SET_ALE
0x08
#define CLR_ALE
~SET_ALE
static
void
nand_hwcontrol
(
struct
mtd_info
*
mtdinfo
,
int
cmd
)
{
struct
nand_chip
*
this
=
mtdinfo
->
priv
;
volatile
fbcs_t
*
fbcs
=
(
fbcs_t
*
)
MMAP_FBCS
;
u32
nand_baseaddr
=
(
u32
)
this
->
IO_ADDR_W
;
struct
nand_chip
*
this
=
mtdinfo
->
priv
;
volatile
fbcs_t
*
fbcs
=
(
fbcs_t
*
)
MMAP_FBCS
;
u32
nand_baseaddr
=
(
u32
)
this
->
IO_ADDR_W
;
switch
(
cmd
)
{
case
NAND_CTL_SETNCE
:
case
NAND_CTL_CLRNCE
:
break
;
case
NAND_CTL_SETCLE
:
nand_baseaddr
|=
SET_CLE
;
break
;
case
NAND_CTL_CLRCLE
:
nand_baseaddr
&=
CLR_CLE
;
break
;
case
NAND_CTL_SETALE
:
nand_baseaddr
|=
SET_ALE
;
break
;
case
NAND_CTL_CLRALE
:
nand_baseaddr
|=
CLR_ALE
;
break
;
case
NAND_CTL_SETWP
:
fbcs
->
csmr2
|=
CSMR_WP
;
break
;
case
NAND_CTL_CLRWP
:
fbcs
->
csmr2
&=
~
CSMR_WP
;
break
;
}
this
->
IO_ADDR_W
=
(
void
__iomem
*
)(
nand_baseaddr
);
switch
(
cmd
)
{
case
NAND_CTL_SETNCE
:
case
NAND_CTL_CLRNCE
:
break
;
case
NAND_CTL_SETCLE
:
nand_baseaddr
|=
SET_CLE
;
break
;
case
NAND_CTL_CLRCLE
:
nand_baseaddr
&=
CLR_CLE
;
break
;
case
NAND_CTL_SETALE
:
nand_baseaddr
|=
SET_ALE
;
break
;
case
NAND_CTL_CLRALE
:
nand_baseaddr
|=
CLR_ALE
;
break
;
case
NAND_CTL_SETWP
:
fbcs
->
csmr2
|=
CSMR_WP
;
break
;
case
NAND_CTL_CLRWP
:
fbcs
->
csmr2
&=
~
CSMR_WP
;
break
;
}
this
->
IO_ADDR_W
=
(
void
__iomem
*
)(
nand_baseaddr
);
}
static
void
nand_write_byte
(
struct
mtd_info
*
mtdinfo
,
u_char
byte
)
{
struct
nand_chip
*
this
=
mtdinfo
->
priv
;
*
((
volatile
u8
*
)(
this
->
IO_ADDR_W
))
=
byte
;
struct
nand_chip
*
this
=
mtdinfo
->
priv
;
*
((
volatile
u8
*
)(
this
->
IO_ADDR_W
))
=
byte
;
}
static
u8
nand_read_byte
(
struct
mtd_info
*
mtdinfo
)
{
struct
nand_chip
*
this
=
mtdinfo
->
priv
;
return
(
u8
)
(
*
((
volatile
u8
*
)
this
->
IO_ADDR_R
));
struct
nand_chip
*
this
=
mtdinfo
->
priv
;
return
(
u8
)
(
*
((
volatile
u8
*
)
this
->
IO_ADDR_R
));
}
static
int
nand_dev_ready
(
struct
mtd_info
*
mtdinfo
)
{
return
1
;
return
1
;
}
int
board_nand_init
(
struct
nand_chip
*
nand
)
{
volatile
gpio_t
*
gpio
=
(
gpio_t
*
)
MMAP_GPIO
;
volatile
gpio_t
*
gpio
=
(
gpio_t
*
)
MMAP_GPIO
;
*
((
volatile
u16
*
)
CFG_LATCH_ADDR
)
|=
0x0004
;
*
((
volatile
u16
*
)
CFG_LATCH_ADDR
)
|=
0x0004
;
/* set up pin configuration */
gpio
->
par_timer
&=
~
GPIO_PAR_TIN3_TIN3
;
gpio
->
pddr_timer
|=
0x08
;
gpio
->
ppd_timer
|=
0x08
;
gpio
->
pclrr_timer
=
0
;
gpio
->
podr_timer
=
0
;
/* set up pin configuration */
gpio
->
par_timer
&=
~
GPIO_PAR_TIN3_TIN3
;
gpio
->
pddr_timer
|=
0x08
;
gpio
->
ppd_timer
|=
0x08
;
gpio
->
pclrr_timer
=
0
;
gpio
->
podr_timer
=
0
;
nand
->
chip_delay
=
50
;
nand
->
eccmode
=
NAND_ECC_SOFT
;
nand
->
hwcontrol
=
nand_hwcontrol
;
nand
->
read_byte
=
nand_read_byte
;
nand
->
write_byte
=
nand_write_byte
;
nand
->
dev_ready
=
nand_dev_ready
;
nand
->
chip_delay
=
50
;
nand
->
eccmode
=
NAND_ECC_SOFT
;
nand
->
hwcontrol
=
nand_hwcontrol
;
nand
->
read_byte
=
nand_read_byte
;
nand
->
write_byte
=
nand_write_byte
;
nand
->
dev_ready
=
nand_dev_ready
;
return
0
;
return
0
;
}
#endif
This diff is collapsed.
Click to expand it.
cpu/mcf532x/cpu_init.c
+
5
−
6
View file @
3ba4c2d6
...
...
@@ -71,35 +71,35 @@ void cpu_init_f(void)
#if (defined(CFG_CS1_BASE) && defined(CFG_CS1_MASK) && defined(CFG_CS1_CTRL))
/* Latch chipselect */
gpio
->
par_cs
|=
GPIO_PAR_CS1
;
gpio
->
par_cs
|=
GPIO_PAR_CS1
;
fbcs
->
csar1
=
CFG_CS1_BASE
;
fbcs
->
cscr1
=
CFG_CS1_CTRL
;
fbcs
->
csmr1
=
CFG_CS1_MASK
;
#endif
#if (defined(CFG_CS2_BASE) && defined(CFG_CS2_MASK) && defined(CFG_CS2_CTRL))
gpio
->
par_cs
|=
GPIO_PAR_CS2
;
gpio
->
par_cs
|=
GPIO_PAR_CS2
;
fbcs
->
csar2
=
CFG_CS2_BASE
;
fbcs
->
cscr2
=
CFG_CS2_CTRL
;
fbcs
->
csmr2
=
CFG_CS2_MASK
;
#endif
#if (defined(CFG_CS3_BASE) && defined(CFG_CS3_MASK) && defined(CFG_CS3_CTRL))
gpio
->
par_cs
|=
GPIO_PAR_CS3
;
gpio
->
par_cs
|=
GPIO_PAR_CS3
;
fbcs
->
csar3
=
CFG_CS3_BASE
;
fbcs
->
cscr3
=
CFG_CS3_CTRL
;
fbcs
->
csmr3
=
CFG_CS3_MASK
;
#endif
#if (defined(CFG_CS4_BASE) && defined(CFG_CS4_MASK) && defined(CFG_CS4_CTRL))
gpio
->
par_cs
|=
GPIO_PAR_CS4
;
gpio
->
par_cs
|=
GPIO_PAR_CS4
;
fbcs
->
csar4
=
CFG_CS4_BASE
;
fbcs
->
cscr4
=
CFG_CS4_CTRL
;
fbcs
->
csmr4
=
CFG_CS4_MASK
;
#endif
#if (defined(CFG_CS5_BASE) && defined(CFG_CS5_MASK) && defined(CFG_CS5_CTRL))
gpio
->
par_cs
|=
GPIO_PAR_CS5
;
gpio
->
par_cs
|=
GPIO_PAR_CS5
;
fbcs
->
csar5
=
CFG_CS5_BASE
;
fbcs
->
cscr5
=
CFG_CS5_CTRL
;
fbcs
->
csmr5
=
CFG_CS5_MASK
;
...
...
@@ -139,4 +139,3 @@ void uart_port_conf(void)
break
;
}
}
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