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]
/
cpu
/
ppc4xx
/
ndfc.c
diff --git
a/cpu/ppc4xx/ndfc.c
b/cpu/ppc4xx/ndfc.c
index
7d96e79
..
3a5af12
100644
(file)
--- a/
cpu/ppc4xx/ndfc.c
+++ b/
cpu/ppc4xx/ndfc.c
@@
-149,8
+149,8
@@
static int ndfc_verify_buf(struct mtd_info *mtdinfo, const uint8_t *buf, int len
}
#endif /* #ifndef CONFIG_NAND_SPL */
}
#endif /* #ifndef CONFIG_NAND_SPL */
-#ifndef C
FG
_NAND_BCR
-#define C
FG
_NAND_BCR 0x80002222
+#ifndef C
ONFIG_SYS
_NAND_BCR
+#define C
ONFIG_SYS
_NAND_BCR 0x80002222
#endif
void board_nand_select_device(struct nand_chip *nand, int chip)
#endif
void board_nand_select_device(struct nand_chip *nand, int chip)
@@
-165,7
+165,7
@@
void board_nand_select_device(struct nand_chip *nand, int chip)
/* Set NandFlash Core Configuration Register */
/* 1 col x 2 rows */
out_be32((u32 *)(base + NDFC_CCR), 0x00000000 | (cs << 24));
/* Set NandFlash Core Configuration Register */
/* 1 col x 2 rows */
out_be32((u32 *)(base + NDFC_CCR), 0x00000000 | (cs << 24));
- out_be32((u32 *)(base + NDFC_BCFG0 + (cs << 2)), C
FG
_NAND_BCR);
+ out_be32((u32 *)(base + NDFC_BCFG0 + (cs << 2)), C
ONFIG_SYS
_NAND_BCR);
}
static void ndfc_select_chip(struct mtd_info *mtd, int chip)
}
static void ndfc_select_chip(struct mtd_info *mtd, int chip)
@@
-214,8
+214,8
@@
int board_nand_init(struct nand_chip *nand)
*/
mtebc(EBC0_CFG, 0xb8400000);
*/
mtebc(EBC0_CFG, 0xb8400000);
- mtebc(pb0cr, C
FG
_EBC_PB0CR);
- mtebc(pb0ap, C
FG
_EBC_PB0AP);
+ mtebc(pb0cr, C
ONFIG_SYS
_EBC_PB0CR);
+ mtebc(pb0ap, C
ONFIG_SYS
_EBC_PB0AP);
#endif
chip++;
#endif
chip++;