rename CFG_ macros to CONFIG_SYS

[karo-tx-uboot.git] / cpu / ppc4xx / ndfc.c

diff --git a/cpu/ppc4xx/ndfc.c b/cpu/ppc4xx/ndfc.c
index 72acfd01b5e6f685fc02fdfbfd5ebcad1a241605..3a5af12db9c005ee6e849d1ca011d0ef90d39e11 100644 (file)
--- a/cpu/ppc4xx/ndfc.c
+++ b/cpu/ppc4xx/ndfc.c
@@ -149,6 +149,10 @@ static int ndfc_verify_buf(struct mtd_info *mtdinfo, const uint8_t *buf, int len
 }
 #endif /* #ifndef CONFIG_NAND_SPL */
 
+#ifndef CONFIG_SYS_NAND_BCR
+#define CONFIG_SYS_NAND_BCR 0x80002222
+#endif
+
 void board_nand_select_device(struct nand_chip *nand, int chip)
 {
        /*
@@ -161,7 +165,14 @@ 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));
-       out_be32((u32 *)(base + NDFC_BCFG0 + (cs << 2)), 0x80002222);
+       out_be32((u32 *)(base + NDFC_BCFG0 + (cs << 2)), CONFIG_SYS_NAND_BCR);
+}
+
+static void ndfc_select_chip(struct mtd_info *mtd, int chip)
+{
+       /*
+        * Nothing to do here!
+        */
 }
 
 int board_nand_init(struct nand_chip *nand)
@@ -192,6 +203,7 @@ int board_nand_init(struct nand_chip *nand)
        nand->ecc.mode = NAND_ECC_HW;
        nand->ecc.size = 256;
        nand->ecc.bytes = 3;
+       nand->select_chip = ndfc_select_chip;
 
 #ifndef CONFIG_NAND_SPL
        nand->write_buf  = ndfc_write_buf;
@@ -202,8 +214,8 @@ int board_nand_init(struct nand_chip *nand)
         */
        mtebc(EBC0_CFG, 0xb8400000);
 
-       mtebc(pb0cr, CFG_EBC_PB0CR);
-       mtebc(pb0ap, CFG_EBC_PB0AP);
+       mtebc(pb0cr, CONFIG_SYS_EBC_PB0CR);
+       mtebc(pb0ap, CONFIG_SYS_EBC_PB0AP);
 #endif
 
        chip++;