projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
board
/
freescale
/
mpc8360erdk
/
nand.c
diff --git
a/board/freescale/mpc8360erdk/nand.c
b/board/freescale/mpc8360erdk/nand.c
index
8b44a0f
..
8e22e13
100644
(file)
--- a/
board/freescale/mpc8360erdk/nand.c
+++ b/
board/freescale/mpc8360erdk/nand.c
@@
-18,7
+18,7
@@
#include <linux/mtd/fsl_upm.h>
#include <nand.h>
#include <linux/mtd/fsl_upm.h>
#include <nand.h>
-static struct immap *im = (struct immap *)C
FG
_IMMR;
+static struct immap *im = (struct immap *)C
ONFIG_SYS
_IMMR;
static const u32 upm_array[] = {
0x0ff03c30, 0x0ff03c30, 0x0ff03c34, 0x0ff33c30, /* Words 0 to 3 */
static const u32 upm_array[] = {
0x0ff03c30, 0x0ff03c30, 0x0ff03c34, 0x0ff33c30, /* Words 0 to 3 */
@@
-70,7
+70,7
@@
static int dev_ready(void)
static struct fsl_upm_nand fun = {
.upm = {
static struct fsl_upm_nand fun = {
.upm = {
- .io_addr = (void *)C
FG
_NAND_BASE,
+ .io_addr = (void *)C
ONFIG_SYS
_NAND_BASE,
},
.width = 8,
.upm_cmd_offset = 8,
},
.width = 8,
.upm_cmd_offset = 8,